WAS: misc/113825: WARN Error in FreeBSD 6.2-STABLE (/usr/src/lib/libc/rpc/getpublickey.c)
Sigh . . .
Here are the patches I was trying to upload when the PR was closed
without mercy. :)
jmc
# 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 voidkiller_start(struct killer *, struct mux *);
! static void *killer_run(void *);
static voidkiller_stop(struct killer *);
static int proto_waitconnect(int);
--- 68,74
};
static voidkiller_start(struct killer *, struct mux *);
! static voidkiller_run(void *);
static voidkiller_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
ApplyPatch data follows
# Data version: 1.0
# Date generated : Tue Jun 19 06:52:53 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 06:52:53 2007]
Patch checksum: 96 2948 4469
Checksum: 114 3601 58469
# 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.oldMon Jun 18 23:05:16 2007
--- ./sbin/ggate/ggated/ggated.cMon 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
WAS: misc/113825: WARN Error in FreeBSD 6.2-STABLE (/usr/src/lib/libc/rpc/getpublickey.c)
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.oldMon Jun 18 23:05:16 2007
+++ ./sbin/ggate/ggated/ggated.cMon 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
#
