Bug#697005: marked as done (unblock: freebsd-utils/9.0+ds1-9)

Debian Bug Tracking System Tue, 01 Jan 2013 05:00:21 -0800

Your message dated Tue, 1 Jan 2013 13:56:05 +0100
with message-id <[email protected]>
and subject line Re: Bug#697005: unblock: freebsd-utils/9.0+ds1-9
has caused the Debian Bug report #697005,
regarding unblock: freebsd-utils/9.0+ds1-9
to be marked as done.


This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
697005: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697005
Debian Bug Tracking System
Contact [email protected] with problems

--- Begin Message ---

Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock

Please unblock package freebsd-utils

  Fixing several issues, including a failed release upgrade and a
  segfault. The implicit declarations problem is not fixing any hard
  known problems, however has a probability that there are problems it
  fixes (including the rpc.lockd bug #664812) but I can take it out
  again if you prefer.

diff -Nru freebsd-utils-9.0+ds1/debian/changelog 
freebsd-utils-9.0+ds1/debian/changelog
--- freebsd-utils-9.0+ds1/debian/changelog      2012-09-23 08:20:50.000000000 
-0700
+++ freebsd-utils-9.0+ds1/debian/changelog      2012-12-29 16:08:30.000000000 
-0800
@@ -1,3 +1,21 @@
+freebsd-utils (9.0+ds1-9) unstable; urgency=low
+
+  [ Steven Chamberlain ]
+  * Fix geli initscript to support more than one geli_device as intended.
+    (Closes: #694374)
+  * If devfs is unavailable (for example in a jail environment) the
+    freebsd-utils start action would exit with non-zero status, causing 
postinst
+    to fail.  Instead, return zero exit status but print a warning.
+    (Closes: #695679)
+
+  [ Christoph Egger ]
+  * Import patch from Steven Chamberlain to fix segfault getting bridge
+    status (Closes: #696514)
+  * Import patch from Steven Chamberlain fixing implicit declarations
+  * Upload to unstable
+
+ -- Steven Chamberlain <[email protected]>  Tue, 11 Dec 2012 20:28:30 +0000
+
 freebsd-utils (9.0+ds1-8) unstable; urgency=low
 
    * Team upload.
diff -Nru freebsd-utils-9.0+ds1/debian/freebsd-utils.init 
freebsd-utils-9.0+ds1/debian/freebsd-utils.init
--- freebsd-utils-9.0+ds1/debian/freebsd-utils.init     2012-09-15 
14:29:07.000000000 -0700
+++ freebsd-utils-9.0+ds1/debian/freebsd-utils.init     2012-12-29 
14:00:54.000000000 -0800
@@ -24,13 +24,17 @@
     fi
 
     log_action_begin_msg "Loading devfs rules"
-    devfs ruleset 1
-    devfs rule delset
-    for rule in /etc/devfs.d/*.rules ; do
-      egrep -v '^[[:space:]]*(#|$)' $rule | devfs rule add -
-    done
-    devfs rule applyset
-    log_action_end_msg $?
+    if devfs ruleset 1 ; then
+      devfs rule delset
+      for rule in /etc/devfs.d/*.rules ; do
+        egrep -v '^[[:space:]]*(#|$)' $rule | devfs rule add -
+      done
+      devfs rule applyset
+      log_action_end_msg $?
+    else
+      # devfs unavailable, probably in a jail environment;  no point proceeding
+      log_end_msg 255 || exit 0 # (warning)
+    fi
 
     log_action_begin_msg "Setting up /dev links"
     # setup /dev/cdrom symlink
diff -Nru freebsd-utils-9.0+ds1/debian/geom.geli.init 
freebsd-utils-9.0+ds1/debian/geom.geli.init
--- freebsd-utils-9.0+ds1/debian/geom.geli.init 2012-09-15 14:29:07.000000000 
-0700
+++ freebsd-utils-9.0+ds1/debian/geom.geli.init 2012-12-29 14:00:54.000000000 
-0800
@@ -141,8 +141,10 @@
                                fi
                                count=$((count+1))
                        done
-                       log_end_msg $RET
-                       exit $RET
+                       if ! [ "$RET" = 0 ]; then
+                               log_end_msg $RET
+                               exit $RET
+                       fi
                fi
        done
 
diff -Nru freebsd-utils-9.0+ds1/debian/patches/044_ifbridge.diff 
freebsd-utils-9.0+ds1/debian/patches/044_ifbridge.diff
--- freebsd-utils-9.0+ds1/debian/patches/044_ifbridge.diff      1969-12-31 
16:00:00.000000000 -0800
+++ freebsd-utils-9.0+ds1/debian/patches/044_ifbridge.diff      2012-12-29 
16:06:43.000000000 -0800
@@ -0,0 +1,13 @@
+Index: freebsd-utils-9.0+ds1/sbin/ifconfig/ifbridge.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/ifconfig/ifbridge.c        2007-11-04 
08:32:27.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/ifconfig/ifbridge.c     2012-12-29 
20:27:46.888636491 +0000
+@@ -46,6 +46,8 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include <netinet/ether.h> /* for ether_aton, etherntoa */
++
+ #include <net/ethernet.h>
+ #include <net/if.h>
+ #include <net/if_bridgevar.h>
diff -Nru freebsd-utils-9.0+ds1/debian/patches/045_implicit-declaration.diff 
freebsd-utils-9.0+ds1/debian/patches/045_implicit-declaration.diff
--- freebsd-utils-9.0+ds1/debian/patches/045_implicit-declaration.diff  
1969-12-31 16:00:00.000000000 -0800
+++ freebsd-utils-9.0+ds1/debian/patches/045_implicit-declaration.diff  
2012-12-29 16:10:01.000000000 -0800
@@ -0,0 +1,324 @@
+Index: freebsd-utils-9.0+ds1/usr.sbin/mountd/mountd.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/mountd/mountd.c        2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/usr.sbin/mountd/mountd.c     2012-12-29 
20:05:01.478673213 +0000
+@@ -80,6 +80,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <bsd/stdio.h>
++
+ #include "pathnames.h"
+ #include "mntopts.h"
+ 
+Index: freebsd-utils-9.0+ds1/usr.sbin/vidcontrol/vidcontrol.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/vidcontrol/vidcontrol.c        
2010-03-29 21:12:44.000000000 +0100
++++ freebsd-utils-9.0+ds1/usr.sbin/vidcontrol/vidcontrol.c     2012-12-29 
20:05:04.610607859 +0000
+@@ -48,6 +48,8 @@
+ #include <sys/errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <bsd/err.h>
++
+ #include "path.h"
+ #include "decode.h"
+ 
+Index: freebsd-utils-9.0+ds1/usr.sbin/ppp/defs.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/ppp/defs.c     2004-09-05 
02:46:52.000000000 +0100
++++ freebsd-utils-9.0+ds1/usr.sbin/ppp/defs.c  2012-12-29 20:00:01.091748618 
+0000
+@@ -47,6 +47,7 @@
+ #include <time.h>
+ #endif
+ #include <unistd.h>
++#include <bsd/unistd.h>
+ 
+ #if defined(__FreeBSD__) && !defined(NOKLDLOAD)
+ #include "id.h"
+Index: freebsd-utils-9.0+ds1/usr.sbin/nfsd/nfsd.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/nfsd/nfsd.c    2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/usr.sbin/nfsd/nfsd.c 2012-12-29 20:00:04.194641584 
+0000
+@@ -71,6 +71,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <bsd/unistd.h>
+ 
+ /* Global defs */
+ #ifdef DEBUG
+Index: freebsd-utils-9.0+ds1/usr.sbin/arp/arp.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/arp/arp.c      2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/usr.sbin/arp/arp.c   2012-12-29 20:00:07.442606898 
+0000
+@@ -80,6 +80,7 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <unistd.h>
++#include <bsd/stdlib.h>
+ 
+ typedef void (action_fn)(struct sockaddr_dl *sdl,
+       struct sockaddr_inarp *s_in, struct rt_msghdr *rtm);
+Index: freebsd-utils-9.0+ds1/usr.sbin/rpc.lockd/kern.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/rpc.lockd/kern.c       2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/usr.sbin/rpc.lockd/kern.c    2012-12-29 
20:00:14.848822213 +0000
+@@ -52,6 +52,7 @@
+ #include <unistd.h>
+ #include <netdb.h>
+ #include <signal.h>
++#include <bsd/unistd.h>
+ 
+ #include <nlm_prot.h>
+ #include <nfs/nfsproto.h>
+Index: freebsd-utils-9.0+ds1/usr.sbin/pppctl/pppctl.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/pppctl/pppctl.c        2004-12-13 
14:50:13.000000000 +0000
++++ freebsd-utils-9.0+ds1/usr.sbin/pppctl/pppctl.c     2012-12-29 
20:00:17.754640690 +0000
+@@ -48,6 +48,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <bsd/unistd.h>
+ 
+ #define LINELEN 2048
+ 
+Index: freebsd-utils-9.0+ds1/usr.bin/kdump/kdump.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.bin/kdump/kdump.c   2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/usr.bin/kdump/kdump.c        2012-12-29 
20:05:19.540626059 +0000
+@@ -83,6 +83,8 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <vis.h>
++#include <bsd/string.h>
++
+ #include "ktrace.h"
+ #include "kdump_subr.h"
+ 
+Index: freebsd-utils-9.0+ds1/sbin/geom/core/geom.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/geom/core/geom.c   2011-03-24 
19:11:05.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/geom/core/geom.c        2012-12-29 
20:06:16.428605677 +0000
+@@ -46,6 +46,8 @@
+ #include <inttypes.h>
+ #include <dlfcn.h>
+ #include <assert.h>
++#include <bsd/err.h>
++
+ #include <libgeom.h>
+ #include <geom.h>
+ 
+Index: freebsd-utils-9.0+ds1/sbin/geom/class/eli/geom_eli.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/geom/class/eli/geom_eli.c  2010-11-22 
20:10:48.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/geom/class/eli/geom_eli.c       2012-12-29 
20:00:30.210625738 +0000
+@@ -43,6 +43,7 @@
+ #include <paths.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <bsd/stdlib.h>
+ 
+ #include <sys/param.h>
+ #include <sys/mman.h>
+Index: freebsd-utils-9.0+ds1/sbin/geom/class/stripe/geom_stripe.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/geom/class/stripe/geom_stripe.c    
2010-10-09 21:20:27.000000000 +0100
++++ freebsd-utils-9.0+ds1/sbin/geom/class/stripe/geom_stripe.c 2012-12-29 
20:02:33.016673155 +0000
+@@ -36,6 +36,8 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <assert.h>
++#include <bsd/stdlib.h>
++
+ #include <libgeom.h>
+ #include <geom/stripe/g_stripe.h>
+ 
+Index: freebsd-utils-9.0+ds1/sbin/geom/class/concat/geom_concat.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/geom/class/concat/geom_concat.c    
2010-10-09 21:20:27.000000000 +0100
++++ freebsd-utils-9.0+ds1/sbin/geom/class/concat/geom_concat.c 2012-12-29 
20:02:36.477613023 +0000
+@@ -35,6 +35,8 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <assert.h>
++#include <bsd/stdlib.h>
++
+ #include <libgeom.h>
+ #include <geom/concat/g_concat.h>
+ 
+Index: freebsd-utils-9.0+ds1/sbin/geom/class/raid3/geom_raid3.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/geom/class/raid3/geom_raid3.c      
2011-01-12 13:55:01.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/geom/class/raid3/geom_raid3.c   2012-12-29 
20:02:42.593673584 +0000
+@@ -36,6 +36,8 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <assert.h>
++#include <bsd/stdlib.h>
++
+ #include <libgeom.h>
+ #include <geom/raid3/g_raid3.h>
+ #include <core/geom.h>
+Index: freebsd-utils-9.0+ds1/sbin/geom/class/mirror/geom_mirror.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/geom/class/mirror/geom_mirror.c    
2010-10-09 21:20:27.000000000 +0100
++++ freebsd-utils-9.0+ds1/sbin/geom/class/mirror/geom_mirror.c 2012-12-29 
20:02:47.384726078 +0000
+@@ -36,6 +36,8 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <assert.h>
++#include <bsd/stdlib.h>
++
+ #include <libgeom.h>
+ #include <geom/mirror/g_mirror.h>
+ #include <core/geom.h>
+Index: freebsd-utils-9.0+ds1/sbin/geom/class/shsec/geom_shsec.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/geom/class/shsec/geom_shsec.c      
2010-10-09 21:20:27.000000000 +0100
++++ freebsd-utils-9.0+ds1/sbin/geom/class/shsec/geom_shsec.c   2012-12-29 
20:02:51.019638336 +0000
+@@ -36,6 +36,8 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <assert.h>
++#include <bsd/stdlib.h>
++
+ #include <libgeom.h>
+ #include <geom/shsec/g_shsec.h>
+ 
+Index: freebsd-utils-9.0+ds1/sbin/swapon/swapon.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/swapon/swapon.c    2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/swapon/swapon.c 2012-12-29 20:03:04.126649982 
+0000
+@@ -55,6 +55,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <bsd/stdlib.h>
++
+ #include <libutil.h>
+ 
+ static void usage(void);
+Index: freebsd-utils-9.0+ds1/sbin/camcontrol/modeedit.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/camcontrol/modeedit.c      2010-06-11 
18:02:57.000000000 +0100
++++ freebsd-utils-9.0+ds1/sbin/camcontrol/modeedit.c   2012-12-29 
20:01:06.245613425 +0000
+@@ -41,6 +41,7 @@
+ #include <stdio.h>
+ #include <sysexits.h>
+ #include <unistd.h>
++#include <bsd/stdio.h>
+ 
+ #include <cam/scsi/scsi_all.h>
+ #include <cam/cam.h>
+Index: freebsd-utils-9.0+ds1/sbin/devfs/rule.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/devfs/rule.c       2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/devfs/rule.c    2012-12-29 20:01:12.238673437 
+0000
+@@ -44,6 +44,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <bsd/stdlib.h>
++#include <bsd/unistd.h>
+ 
+ #include "extern.h"
+ 
+Index: freebsd-utils-9.0+ds1/sbin/devfs/devfs.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/devfs/devfs.c      2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/devfs/devfs.c   2012-12-29 20:01:15.870628336 
+0000
+@@ -43,6 +43,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <bsd/stdio.h>
+ 
+ #include "extern.h"
+ 
+Index: freebsd-utils-9.0+ds1/sbin/ifconfig/af_inet.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/sbin/ifconfig/af_inet.c 2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/sbin/ifconfig/af_inet.c      2012-12-29 
20:01:18.523614679 +0000
+@@ -43,6 +43,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <bsd/stdlib.h>
+ 
+ #include <netinet/in.h>
+ #include <net/if_var.h>               /* for struct ifaddr */
+Index: freebsd-utils-9.0+ds1/contrib/pf/authpf/authpf.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/contrib/pf/authpf/authpf.c      2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/contrib/pf/authpf/authpf.c   2012-12-29 
20:03:24.975681073 +0000
+@@ -17,6 +17,8 @@
+  */
+ 
+ #include <stdio.h>
++#include <bsd/stdio.h>
++
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ 
+Index: freebsd-utils-9.0+ds1/contrib/pf/pfctl/parse.y
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/contrib/pf/pfctl/parse.y        2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/contrib/pf/pfctl/parse.y     2012-12-29 
20:01:42.634649462 +0000
+@@ -61,6 +61,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <md5.h>
++#include <bsd/stdlib.h>
+ 
+ #include "pfctl_parser.h"
+ #include "pfctl.h"
+Index: freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/contrib/pf/pfctl/pfctl.c        2012-12-29 
19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl.c     2012-12-29 
20:01:46.279635068 +0000
+@@ -60,6 +60,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <bsd/stdlib.h>
+ 
+ #include "pfctl_parser.h"
+ #include "pfctl.h"
+Index: freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl_osfp.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/contrib/pf/pfctl/pfctl_osfp.c   2011-06-28 
12:57:25.000000000 +0100
++++ freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl_osfp.c        2012-12-29 
20:01:49.600683134 +0000
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <bsd/stdio.h>
+ 
+ #include "pfctl_parser.h"
+ #include "pfctl.h"
+Index: freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl_table.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/contrib/pf/pfctl/pfctl_table.c  2011-06-28 
12:57:25.000000000 +0100
++++ freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl_table.c       2012-12-29 
20:01:52.597709013 +0000
+@@ -50,6 +50,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#include <bsd/stdlib.h>
+ 
+ #include "pfctl_parser.h"
+ #include "pfctl.h"
+Index: freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl_optimize.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/contrib/pf/pfctl/pfctl_optimize.c       
2012-12-29 19:56:58.000000000 +0000
++++ freebsd-utils-9.0+ds1/contrib/pf/pfctl/pfctl_optimize.c    2012-12-29 
20:01:55.921692089 +0000
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <bsd/stdlib.h>
+ 
+ #include "pfctl_parser.h"
+ #include "pfctl.h"
diff -Nru freebsd-utils-9.0+ds1/debian/patches/series 
freebsd-utils-9.0+ds1/debian/patches/series
--- freebsd-utils-9.0+ds1/debian/patches/series 2012-09-15 14:57:27.000000000 
-0700
+++ freebsd-utils-9.0+ds1/debian/patches/series 2012-12-29 16:10:18.000000000 
-0800
@@ -45,5 +45,7 @@
 039_geom.diff
 041_delete_key.diff
 043_ppp.diff
+044_ifbridge.diff
+045_implicit-declaration.diff
 devd_link_c++_statically.diff
 stablerestart-fhs-compliance.diff
diff -Nru 
freebsd-utils-9.0+ds1/debian/patches/stablerestart-fhs-compliance.diff 
freebsd-utils-9.0+ds1/debian/patches/stablerestart-fhs-compliance.diff
--- freebsd-utils-9.0+ds1/debian/patches/stablerestart-fhs-compliance.diff      
2012-09-15 15:05:41.000000000 -0700
+++ freebsd-utils-9.0+ds1/debian/patches/stablerestart-fhs-compliance.diff      
2012-12-29 16:10:26.000000000 -0800
@@ -1,6 +1,8 @@
---- a/usr.sbin/nfsd/nfsd.c
-+++ b/usr.sbin/nfsd/nfsd.c
-@@ -80,8 +80,8 @@
+Index: freebsd-utils/usr.sbin/nfsd/nfsd.c
+===================================================================
+--- freebsd-utils.orig/usr.sbin/nfsd/nfsd.c    2012-12-29 16:10:21.593803321 
-0800
++++ freebsd-utils/usr.sbin/nfsd/nfsd.c 2012-12-29 16:10:21.623802558 -0800
+@@ -81,8 +81,8 @@
  int   debug = 0;
  #endif
  
@@ -11,8 +13,10 @@
  #define       MAXNFSDCNT      256
  #define       DEFNFSDCNT       4
  pid_t children[MAXNFSDCNT];   /* PIDs of children */
---- a/usr.sbin/nfsd/nfsv4.4
-+++ b/usr.sbin/nfsd/nfsv4.4
+Index: freebsd-utils/usr.sbin/nfsd/nfsv4.4
+===================================================================
+--- freebsd-utils.orig/usr.sbin/nfsd/nfsv4.4   2012-12-29 16:10:09.000000000 
-0800
++++ freebsd-utils/usr.sbin/nfsd/nfsv4.4        2012-12-29 16:10:21.623802558 
-0800
 @@ -288,10 +288,10 @@
  .Xr rc.conf 5
  variables.
@@ -27,8 +31,10 @@
  backup copy of the file
  .El
  .Sh SEE ALSO
---- a/usr.sbin/nfsd/stablerestart.5
-+++ b/usr.sbin/nfsd/stablerestart.5
+Index: freebsd-utils/usr.sbin/nfsd/stablerestart.5
+===================================================================
+--- freebsd-utils.orig/usr.sbin/nfsd/stablerestart.5   2012-12-29 
16:10:09.000000000 -0800
++++ freebsd-utils/usr.sbin/nfsd/stablerestart.5        2012-12-29 
16:10:21.623802558 -0800
 @@ -75,10 +75,10 @@
  has returned. This might require hardware level caching to be disabled for
  a local disk drive that holds the file, or similar.
diff -Nru freebsd-utils-9.0+ds1/debian/rules freebsd-utils-9.0+ds1/debian/rules
--- freebsd-utils-9.0+ds1/debian/rules  2012-09-15 14:29:06.000000000 -0700
+++ freebsd-utils-9.0+ds1/debian/rules  2012-12-29 14:00:54.000000000 -0800
@@ -8,6 +8,7 @@
 CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D__va_list=__builtin_va_list \
        -isystem /usr/include/tirpc \
        -D__FreeBSD_version=__FreeBSD_kernel_version
+#      -Werror=implicit-function-declaration
 CXXFLAGS = $(CFLAGS)
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
@@ -101,7 +102,7 @@
                 usr.bin/showmount \
                 usr.sbin/powerd \
        ; do \
-           svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+           svn export $(SVN)/$$i $(ORIGDIR)/$$i || exit ; \
        done
        tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
        rm -rf $(ORIGDIR)


unblock freebsd-utils/9.0+ds1-9

-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 10.0-0-amd64
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

--- End Message ---

--- Begin Message ---

On Tue, Jan  1, 2013 at 04:50:10 +0100, Cyril Brulebois wrote:

> Julien Cristau <[email protected]> (30/12/2012):
> > On Sun, Dec 30, 2012 at 10:54:34 -0800, Christoph Egger wrote:
> > > Please unblock package freebsd-utils
> > > 
> > >   Fixing several issues, including a failed release upgrade and a
> > >   segfault. The implicit declarations problem is not fixing any hard
> > >   known problems, however has a probability that there are problems it
> > >   fixes (including the rpc.lockd bug #664812) but I can take it out
> > >   again if you prefer.
> > > 
> > Unblocked.  Needs a d-i ack for the unblock-udeb.
> 
> ACK.
> 
Thanks, added.

Cheers,
Julien

signature.asc
Description: Digital signature

--- End Message ---

Bug#697005: marked as done (unblock: freebsd-utils/9.0+ds1-9)

Reply via email to