Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.

Dismiss

WAS: misc/113825: WARN Error in FreeBSD 6.2-STABLE

0 views

Skip to first unread message

John Merryweather Cooper

unread,

Jun 19, 2007, 7:46:42 AM6/19/07

This is a multi-part message in MIME format.
--------------010506010500090606010305
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Sigh . . .

Here are the patches I was trying to upload when the PR was closed
without mercy. :)

jmc

--------------010506010500090606010305
Content-Type: text/plain;
name="patch-csup"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-csup"

# Patch for misc/113825 for csup
#
# 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 -c '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,74 ****
};

static void killer_start(struct killer *, struct mux *);
! static void *killer_run(void *);
static void killer_stop(struct killer *);

static int proto_waitconnect(int);
--- 68,74 ----
};

static void killer_start(struct killer *, struct mux *);
! static void killer_run(void *);
static void killer_stop(struct killer *);

static int proto_waitconnect(int);
***************
*** 963,968 ****
--- 963,970 ----

/* 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,988 ****
sigaddset(&k->sigset, SIGTERM);
sigaddset(&k->sigset, SIGPIPE);
pthread_sigmask(SIG_BLOCK, &k->sigset, NULL);
! error = pthread_create(&k->thread, NULL, killer_run, k);
if (error)
err(1, "pthread_create");
}

/* The main loop of the killer thread. */
! static void *
killer_run(void *arg)
{
struct killer *k;
--- 978,991 ----
sigaddset(&k->sigset, SIGTERM);
sigaddset(&k->sigset, SIGPIPE);
pthread_sigmask(SIG_BLOCK, &k->sigset, NULL);
! 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
killer_run(void *arg)
{
struct killer *k;
#### End of Patch data ####

#### End of Patch kit [created: Tue Jun 19 06:52:53 2007] ####
#### Patch checksum: 96 2948 4469 ####
#### Checksum: 114 3601 58469 ####

--------------010506010500090606010305
Content-Type: text/plain;
name="patch-ggated"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-ggated"

# Patch for misc/113825 for ggated
#
# 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 -c '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,761 ****
--- 756,762 ----
error = pthread_mutex_unlock(&outqueue_mtx);
assert(error == 0);
}
+ return arg;
}

static void *
***************
*** 810,815 ****
--- 811,817 ----
}
free(req);
}
+ return arg;
}

static void
#### End of Patch data ####

#### End of Patch kit [created: Tue Jun 19 06:56:44 2007] ####
#### Patch checksum: 58 1777 40909 ####
#### Checksum: 76 2433 29595 ####

--------------010506010500090606010305
Content-Type: text/plain;
name="patch-ip6fw"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-ip6fw"

# Patch for misc/113825 for ip6fw
#
# 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 -c '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,1118 ****
if (!ac)
show_usage("missing argument"
" for ``icmptypes''");
! fill_icmptypes(rule.fw_icmp6types,
av, &rule.fw_flg);
av++; ac--; continue;
}
--- 1112,1118 ----
if (!ac)
show_usage("missing argument"
" for ``icmptypes''");
! fill_icmptypes((u_long *)rule.fw_icmp6types,
av, &rule.fw_flg);
av++; ac--; continue;
}
#### End of Patch data ####

#### End of Patch kit [created: Tue Jun 19 06:57:45 2007] ####
#### Patch checksum: 56 1919 49188 ####
#### Checksum: 74 2574 37750 ####

--------------010506010500090606010305
Content-Type: text/plain;
name="patch-rpc"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-rpc"

# Second patch for misc/113825 for rpc (getpublickey.c)
#
# 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 -c '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,71 ****
*/
int
__getpublickey_real(netname, publickey)
! char *netname;
char *publickey;
{
char lookup[3 * HEXKEYBYTES];
--- 65,71 ----
*/
int
__getpublickey_real(netname, publickey)
! const char *netname;
char *publickey;
{
char lookup[3 * HEXKEYBYTES];
***************
*** 92,98 ****

int
getpublicandprivatekey(key, ret)
! char *key;
char *ret;
{
char buf[1024]; /* big enough */
--- 92,98 ----

int
getpublicandprivatekey(key, ret)
! const char *key;
char *ret;
{
char buf[1024]; /* big enough */
#### End of Patch data ####

#### End of Patch kit [created: Tue Jun 19 06:55:31 2007] ####
#### Patch checksum: 73 2105 1931 ####
#### Checksum: 91 2781 57998 ####

--------------010506010500090606010305
Content-Type: text/plain;
name="patch-rpc-auth"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-rpc-auth"

# First patch for misc/113825 for rpc (auth.h)
#
# 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 -c '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,305 ****
*/
__BEGIN_DECLS
extern int getpublickey (const char *, char *);
! extern int getpublicandprivatekey (char *, char *);
extern int getsecretkey (char *, char *, char *);
__END_DECLS

--- 299,305 ----
*/
__BEGIN_DECLS
extern int getpublickey (const char *, char *);
! extern int getpublicandprivatekey (const char *, char *);
extern int getsecretkey (char *, char *, char *);
__END_DECLS

#### End of Patch data ####

#### End of Patch kit [created: Tue Jun 19 06:54:14 2007] ####
#### Patch checksum: 56 1912 53784 ####
#### Checksum: 74 2580 43450 ####

--------------010506010500090606010305
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
freebsd...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stabl...@freebsd.org"
--------------010506010500090606010305--

John Merryweather Cooper

unread,

Jun 19, 2007, 8:16:28 AM6/19/07

This is a multi-part message in MIME format.

--------------040409080507080403040202

Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Maybe you would like unified diff's better? Sorry . . .

jmc

--------------040409080507080403040202

Content-Type: text/plain;
name="patch-csup"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-csup"

# 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

#### End of Patch kit [created: Tue Jun 19 07:31:02 2007] ####
#### Patch checksum: 73 2412 32655 ####
#### Checksum: 91 3047 19426 ####

--------------040409080507080403040202

Content-Type: text/plain;
name="patch-ggated"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-ggated"

# misc/113825

#### 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

#### End of Patch kit [created: Tue Jun 19 07:35:00 2007] ####
#### Patch checksum: 54 1705 38343 ####
#### Checksum: 72 2340 25117 ####

--------------040409080507080403040202

Content-Type: text/plain;
name="patch-ip6fw"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-ip6fw"

# misc/113825

#### 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

#### End of Patch kit [created: Tue Jun 19 07:36:03 2007] ####
#### Patch checksum: 48 1731 38403 ####
#### Checksum: 66 2366 25176 ####

--------------040409080507080403040202

Content-Type: text/plain;
name="patch-rpc"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-rpc"

# misc/113825

#### 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

#### End of Patch kit [created: Tue Jun 19 07:34:09 2007] ####
#### Patch checksum: 57 1826 48921 ####
#### Checksum: 75 2461 35705 ####

--------------040409080507080403040202

Content-Type: text/plain;
name="patch-rpc-auth"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-rpc-auth"

# misc/113825

#### 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

#### End of Patch kit [created: Tue Jun 19 07:33:09 2007] ####
#### Patch checksum: 48 1735 41901 ####
#### Checksum: 66 2370 28675 ####

--------------040409080507080403040202

Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--------------040409080507080403040202--

0 new messages