[arch-commits] CVS update of extra/lib/libdaemon (PKGBUILD libdaemon.patch)

[Travis Willard]

    Date: Tuesday, July 10, 2007 @ 08:17:54
  Author: travis
    Path: /home/cvs-extra/extra/lib/libdaemon

   Added: libdaemon.patch (1.1)
Modified: PKGBUILD (1.14 -> 1.15)

upgpkg: libdaemon 0.11-2
Patch to fix known segfault bug - thanks Damjan. FS7556


-----------------+
 PKGBUILD        |   13 +++++++++----
 libdaemon.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)


Index: extra/lib/libdaemon/PKGBUILD
diff -u extra/lib/libdaemon/PKGBUILD:1.14 extra/lib/libdaemon/PKGBUILD:1.15
--- extra/lib/libdaemon/PKGBUILD:1.14	Mon Jul  2 16:18:24 2007
+++ extra/lib/libdaemon/PKGBUILD	Tue Jul 10 08:17:54 2007
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD,v 1.14 2007/07/02 20:18:24 travis Exp $
+# $Id: PKGBUILD,v 1.15 2007/07/10 12:17:54 travis Exp $
 # Maintainer: Mark Rosenstand <mark at archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=libdaemon
 pkgver=0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight C library which eases the writing of UNIX daemons."
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://0pointer.de/lennart/projects/libdaemon/"
 depends=('glibc')
-source=(http://0pointer.de/lennart/projects/libdaemon/$pkgname-$pkgver.tar.gz)
-md5sums=('b99a608ae9a762e809b667bfa20d86dd')
+source=(http://0pointer.de/lennart/projects/libdaemon/$pkgname-$pkgver.tar.gz libdaemon.patch)
+md5sums=('b99a608ae9a762e809b667bfa20d86dd'
+         '68967a367c9043d9b892b54416c656c1')
+sha1sums=('b20c048f6d36f6f72e320e2660d80df7c21ff48e'
+          '60e2e8d8f0579da6eec744964f32ca5c1fac76b4')
 options=('!libtool')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np0 -i $startdir/src/libdaemon.patch
   ./configure --prefix=/usr --disable-doxygen --disable-lynx
   make || return 1
   make DESTDIR=$startdir/pkg install
 }
+
Index: extra/lib/libdaemon/libdaemon.patch
diff -u /dev/null extra/lib/libdaemon/libdaemon.patch:1.1
--- /dev/null	Tue Jul 10 08:17:54 2007
+++ extra/lib/libdaemon/libdaemon.patch	Tue Jul 10 08:17:54 2007
@@ -0,0 +1,38 @@
+Index: libdaemon/dfork.c
+===================================================================
+--- libdaemon/dfork.c	(revision 126)
++++ libdaemon/dfork.c	(working copy)
+@@ -354,15 +354,15 @@
+ 
+ int daemon_close_all(int except_fd, ...) {
+     va_list original_ap, ap;
+-    int n, i, r;
++    int n = 0, i, r;
+     int *p;
+ 
+     va_start(original_ap, except_fd);
+     va_copy(ap, original_ap);
+ 
+-    for (n = 0; va_arg(ap, int) >= 0; n++)
+-        ;
+-
++    if (except_fd >= 0)
++      for (n = 1; va_arg(ap, int) >= 0; n++)
++          ;
+     va_end(ap);
+ 
+     if (!(p = malloc(sizeof(int) * (n+1)))) {
+@@ -371,8 +371,11 @@
+     }
+ 
+     i = 0;
+-    while ((p[i++] = va_arg(original_ap, int)) >= 0)
+-        ;
++    if (except_fd >= 0) {
++      p[i++] = except_fd;
++      while ((p[i++] = va_arg(original_ap, int)) >= 0)
++          ;
++    }
+ 
+     p[i] = -1;
+