[Glibc-bsd-commits] r4386 - in trunk/freebsd-utils/debian: . patches

[Christoph Egger]

Author: christoph
Date: 2013-03-18 11:06:52 +0000 (Mon, 18 Mar 2013)
New Revision: 4386

Added:
   trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/series
Log:
* Import patch by Steven Chamberlain to make rpc.lockd start without
  `-h' arguments (Closes: #664812)
* Add me to uploaders

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-03-07 03:48:48 UTC (rev 4385)
+++ trunk/freebsd-utils/debian/changelog	2013-03-18 11:06:52 UTC (rev 4386)
@@ -1,3 +1,11 @@
+freebsd-utils (9.0+ds1-10) unstable; urgency=low
+
+  * Import patch by Steven Chamberlain to make rpc.lockd start without
+    `-h' arguments (Closes: #664812)
+  * Add me to uploaders
+
+ -- Christoph Egger <christoph at debian.org>  Mon, 18 Mar 2013 11:54:48 +0100
+
 freebsd-utils (9.0+ds1-9) unstable; urgency=low
 
   [ Steven Chamberlain ]

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2013-03-07 03:48:48 UTC (rev 4385)
+++ trunk/freebsd-utils/debian/control	2013-03-18 11:06:52 UTC (rev 4386)
@@ -2,7 +2,10 @@
 Section: utils
 Priority: important
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>, Robert Millan <rmh at debian.org>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>,
+ Guillem Jover <guillem at debian.org>,
+ Robert Millan <rmh at debian.org>,
+ Christoph Egger <christoph at debian.org>
 Build-Depends: debhelper (>= 7), po-debconf, sharutils,
  flex | flex-old,
  freebsd-buildutils (>= 9.0-8~),

Added: trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff	2013-03-18 11:06:52 UTC (rev 4386)
@@ -0,0 +1,20 @@
+Index: freebsd-utils-9.0+ds1/usr.sbin/rpc.lockd/lockd.c
+===================================================================
+--- freebsd-utils-9.0+ds1.orig/usr.sbin/rpc.lockd/lockd.c	2013-03-17 22:48:52.157285000 +0000
++++ freebsd-utils-9.0+ds1/usr.sbin/rpc.lockd/lockd.c	2013-03-18 01:24:08.588303578 +0000
+@@ -906,6 +906,7 @@
+ 						sin->sin_family = AF_INET;
+ 						sin->sin_port = htons(0);
+ 						sin->sin_addr.s_addr = htonl(INADDR_ANY);
++						sin->sin_len = sizeof(struct sockaddr_in);
+ 						res->ai_addr = (struct sockaddr*) sin;
+ 						res->ai_addrlen = (socklen_t)
+ 						    sizeof(res->ai_addr);
+@@ -917,6 +918,7 @@
+ 						sin6->sin6_family = AF_INET6;
+ 						sin6->sin6_port = htons(0);
+ 						sin6->sin6_addr = in6addr_any;
++						sin6->sin6_len = sizeof(struct sockaddr_in6);
+ 						res->ai_addr = (struct sockaddr*) sin6;
+ 						res->ai_addrlen = (socklen_t) sizeof(res->ai_addr);
+ 						break;

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2013-03-07 03:48:48 UTC (rev 4385)
+++ trunk/freebsd-utils/debian/patches/series	2013-03-18 11:06:52 UTC (rev 4386)
@@ -49,3 +49,4 @@
 045_implicit-declaration.diff
 devd_link_c++_statically.diff
 stablerestart-fhs-compliance.diff
+rpc.lockd-startup-fix.diff