Maybe you would like unified diff's better? Sorry . . .
jmc
# misc/113825 # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # STEP 2: Run the 'patch' program with this file as input. # #### End of Preamble #### #### Patch data follows #### diff -ruN 'contrib/csup/proto.c.old' 'contrib/csup/proto.c' Index: ./contrib/csup/proto.c.old --- ./contrib/csup/proto.c.old Tue Jun 19 04:29:42 2007 +++ ./contrib/csup/proto.c Tue Jun 19 05:31:31 2007 @@ -68,7 +68,7 @@ }; static void killer_start(struct killer *, struct mux *); -static void *killer_run(void *); +static void killer_run(void *); static void killer_stop(struct killer *); static int proto_waitconnect(int); @@ -963,6 +963,8 @@ /* Start the killer thread. It is used to protect against some signals during the multi-threaded run so that we can gracefully fail. */ +typedef void *(*start_routine)(void *); + static void killer_start(struct killer *k, struct mux *m) { @@ -976,13 +978,14 @@ sigaddset(&k->sigset, SIGTERM); sigaddset(&k->sigset, SIGPIPE); pthread_sigmask(SIG_BLOCK, &k->sigset, NULL); - error = pthread_create(&k->thread, NULL, killer_run, k); + error = pthread_create(&k->thread, NULL, (start_routine)killer_run, k); if (error) err(1, "pthread_create"); } /* The main loop of the killer thread. */ -static void * + +static void killer_run(void *arg) { struct killer *k; #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Tue Jun 19 07:31:02 2007 # Generated by : makepatch 2.03 # Recurse directories : Yes # Excluded files : (\A|/).*\~\Z # (\A|/).*\.a\Z # (\A|/).*\.bak\Z # (\A|/).*\.BAK\Z # (\A|/).*\.elc\Z # (\A|/).*\.exe\Z # (\A|/).*\.gz\Z # (\A|/).*\.ln\Z # (\A|/).*\.o\Z # (\A|/).*\.obj\Z # (\A|/).*\.olb\Z # (\A|/).*\.old\Z # (\A|/).*\.orig\Z # (\A|/).*\.rej\Z # (\A|/).*\.so\Z # (\A|/).*\.Z\Z # (\A|/)\.del\-.*\Z # (\A|/)\.make\.state\Z # (\A|/)\.nse_depinfo\Z # (\A|/)core\Z # (\A|/)tags\Z # (\A|/)TAGS\Z # p 'contrib/csup/proto.c.old' 25477 1182245491 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Tue Jun 19 07:31:02 2007] #### #### Patch checksum: 73 2412 32655 #### #### Checksum: 91 3047 19426 ####
# misc/113825 # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # STEP 2: Run the 'patch' program with this file as input. # #### End of Preamble #### #### Patch data follows #### diff -ruN 'sbin/ggate/ggated/ggated.c.old' 'sbin/ggate/ggated/ggated.c' Index: ./sbin/ggate/ggated/ggated.c.old --- ./sbin/ggate/ggated/ggated.c.old Mon Jun 18 23:05:16 2007 +++ ./sbin/ggate/ggated/ggated.c Mon Jun 18 23:08:02 2007 @@ -756,6 +756,7 @@ error = pthread_mutex_unlock(&outqueue_mtx); assert(error == 0); } + return arg; } static void * @@ -810,6 +811,7 @@ } free(req); } + return arg; } static void #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Tue Jun 19 07:35:00 2007 # Generated by : makepatch 2.03 # Recurse directories : Yes # Excluded files : (\A|/).*\~\Z # (\A|/).*\.a\Z # (\A|/).*\.bak\Z # (\A|/).*\.BAK\Z # (\A|/).*\.elc\Z # (\A|/).*\.exe\Z # (\A|/).*\.gz\Z # (\A|/).*\.ln\Z # (\A|/).*\.o\Z # (\A|/).*\.obj\Z # (\A|/).*\.olb\Z # (\A|/).*\.old\Z # (\A|/).*\.orig\Z # (\A|/).*\.rej\Z # (\A|/).*\.so\Z # (\A|/).*\.Z\Z # (\A|/)\.del\-.*\Z # (\A|/)\.make\.state\Z # (\A|/)\.nse_depinfo\Z # (\A|/)core\Z # (\A|/)tags\Z # (\A|/)TAGS\Z # p 'sbin/ggate/ggated/ggated.c.old' 25474 1182222482 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Tue Jun 19 07:35:00 2007] #### #### Patch checksum: 54 1705 38343 #### #### Checksum: 72 2340 25117 ####
# misc/113825 # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # STEP 2: Run the 'patch' program with this file as input. # #### End of Preamble #### #### Patch data follows #### diff -ruN 'sbin/ip6fw/ip6fw.c.old' 'sbin/ip6fw/ip6fw.c' Index: ./sbin/ip6fw/ip6fw.c.old Prereq: 1.1.2.2.2.2 --- ./sbin/ip6fw/ip6fw.c.old Tue Jun 19 00:59:48 2007 +++ ./sbin/ip6fw/ip6fw.c Tue Jun 19 01:14:33 2007 @@ -1112,7 +1112,7 @@ if (!ac) show_usage("missing argument" " for ``icmptypes''"); - fill_icmptypes(rule.fw_icmp6types, + fill_icmptypes((u_long *)rule.fw_icmp6types, av, &rule.fw_flg); av++; ac--; continue; } #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Tue Jun 19 07:36:03 2007 # Generated by : makepatch 2.03 # Recurse directories : Yes # Excluded files : (\A|/).*\~\Z # (\A|/).*\.a\Z # (\A|/).*\.bak\Z # (\A|/).*\.BAK\Z # (\A|/).*\.elc\Z # (\A|/).*\.exe\Z # (\A|/).*\.gz\Z # (\A|/).*\.ln\Z # (\A|/).*\.o\Z # (\A|/).*\.obj\Z # (\A|/).*\.olb\Z # (\A|/).*\.old\Z # (\A|/).*\.orig\Z # (\A|/).*\.rej\Z # (\A|/).*\.so\Z # (\A|/).*\.Z\Z # (\A|/)\.del\-.*\Z # (\A|/)\.make\.state\Z # (\A|/)\.nse_depinfo\Z # (\A|/)core\Z # (\A|/)tags\Z # (\A|/)TAGS\Z # p 'sbin/ip6fw/ip6fw.c.old' 35300 1182230073 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Tue Jun 19 07:36:03 2007] #### #### Patch checksum: 48 1731 38403 #### #### Checksum: 66 2366 25176 ####
# misc/113825 # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # STEP 2: Run the 'patch' program with this file as input. # #### End of Preamble #### #### Patch data follows #### diff -ruN 'lib/libc/rpc/getpublickey.c.old' 'lib/libc/rpc/getpublickey.c' Index: ./lib/libc/rpc/getpublickey.c.old Prereq: 1.10 --- ./lib/libc/rpc/getpublickey.c.old Mon Jun 18 18:25:14 2007 +++ ./lib/libc/rpc/getpublickey.c Mon Jun 18 18:31:07 2007 @@ -65,7 +65,7 @@ */ int __getpublickey_real(netname, publickey) - char *netname; + const char *netname; char *publickey; { char lookup[3 * HEXKEYBYTES]; @@ -92,7 +92,7 @@ int getpublicandprivatekey(key, ret) - char *key; + const char *key; char *ret; { char buf[1024]; /* big enough */ #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Tue Jun 19 07:34:09 2007 # Generated by : makepatch 2.03 # Recurse directories : Yes # Excluded files : (\A|/).*\~\Z # (\A|/).*\.a\Z # (\A|/).*\.bak\Z # (\A|/).*\.BAK\Z # (\A|/).*\.elc\Z # (\A|/).*\.exe\Z # (\A|/).*\.gz\Z # (\A|/).*\.ln\Z # (\A|/).*\.o\Z # (\A|/).*\.obj\Z # (\A|/).*\.olb\Z # (\A|/).*\.old\Z # (\A|/).*\.orig\Z # (\A|/).*\.rej\Z # (\A|/).*\.so\Z # (\A|/).*\.Z\Z # (\A|/)\.del\-.*\Z # (\A|/)\.make\.state\Z # (\A|/)\.nse_depinfo\Z # (\A|/)core\Z # (\A|/)tags\Z # (\A|/)TAGS\Z # p 'lib/libc/rpc/getpublickey.c.old' 4227 1182205867 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Tue Jun 19 07:34:09 2007] #### #### Patch checksum: 57 1826 48921 #### #### Checksum: 75 2461 35705 ####
# misc/113825 # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # STEP 2: Run the 'patch' program with this file as input. # #### End of Preamble #### #### Patch data follows #### diff -ruN 'include/rpc/auth.h.old' 'include/rpc/auth.h' Index: ./include/rpc/auth.h.old Prereq: 1.17 --- ./include/rpc/auth.h.old Mon Jun 18 19:54:59 2007 +++ ./include/rpc/auth.h Mon Jun 18 21:07:43 2007 @@ -299,7 +299,7 @@ */ __BEGIN_DECLS extern int getpublickey (const char *, char *); -extern int getpublicandprivatekey (char *, char *); +extern int getpublicandprivatekey (const char *, char *); extern int getsecretkey (char *, char *, char *); __END_DECLS #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Tue Jun 19 07:33:09 2007 # Generated by : makepatch 2.03 # Recurse directories : Yes # Excluded files : (\A|/).*\~\Z # (\A|/).*\.a\Z # (\A|/).*\.bak\Z # (\A|/).*\.BAK\Z # (\A|/).*\.elc\Z # (\A|/).*\.exe\Z # (\A|/).*\.gz\Z # (\A|/).*\.ln\Z # (\A|/).*\.o\Z # (\A|/).*\.obj\Z # (\A|/).*\.olb\Z # (\A|/).*\.old\Z # (\A|/).*\.orig\Z # (\A|/).*\.rej\Z # (\A|/).*\.so\Z # (\A|/).*\.Z\Z # (\A|/)\.del\-.*\Z # (\A|/)\.make\.state\Z # (\A|/)\.nse_depinfo\Z # (\A|/)core\Z # (\A|/)tags\Z # (\A|/)TAGS\Z # p 'include/rpc/auth.h.old' 10401 1182215263 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Tue Jun 19 07:33:09 2007] #### #### Patch checksum: 48 1735 41901 #### #### Checksum: 66 2370 28675 ####
_______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "[EMAIL PROTECTED]"
