[arch-commits] Commit in syslog-ng/repos (3 files)

[Tobias Powalowski]

    Date: Friday, March 13, 2009 @ 02:53:16
  Author: tpowa
Revision: 29899

Merged revisions 29890,29895 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/syslog-ng/trunk

........
  r29890 | tpowa | 2009-03-13 06:39:18 +0000 (Fr, 13 M?\195?\164r 2009) | 1 line
  
  upgpkg: syslog-ng 3.0.1-6
........
  r29895 | tpowa | 2009-03-13 06:45:59 +0000 (Fr, 13 M?\195?\164r 2009) | 1 line
  
  upgpkg: syslog-ng 3.0.1-6
........

Added:
  syslog-ng/repos/testing-i686/uid.patch
    (from rev 29895, syslog-ng/trunk/uid.patch)
Modified:
  syslog-ng/repos/testing-i686/	(properties)
  syslog-ng/repos/testing-i686/PKGBUILD

-----------+
 PKGBUILD  |    9 ++++++---
 uid.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)


Property changes on: syslog-ng/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /syslog-ng/trunk:1-29773
   + /syslog-ng/trunk:1-29896

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-13 06:53:09 UTC (rev 29898)
+++ testing-i686/PKGBUILD	2009-03-13 06:53:16 UTC (rev 29899)
@@ -4,7 +4,7 @@
 
 pkgname=syslog-ng
 pkgver=3.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,15 +16,18 @@
 provides=('logger')
 backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
 source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/$pkgname\_$pkgver.tar.gz
-        syslog-ng.conf syslog-ng.logrotate syslog-ng.rc)
+        syslog-ng.conf syslog-ng.logrotate syslog-ng.rc uid.patch)
 install=syslog-ng.install
 md5sums=('14e13519bad47d0a6308905292385321'
          'c42c6b19bfe784e41c1d4f99c9e7d600'
          '9714c7479119922b55a7992677ebecb5'
-         '9bd98250cfa49e13fa3fa731b6040549')
+         '9bd98250cfa49e13fa3fa731b6040549'
+         '675a92c583932468e5424f9afaacc032')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
+    # fix http://bugs.archlinux.org/task/13760
+    patch -Np0 -i ../uid.patch || return 1
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --localstatedir=/var/lib/syslog-ng \

Copied: syslog-ng/repos/testing-i686/uid.patch (from rev 29895, syslog-ng/trunk/uid.patch)
===================================================================
--- testing-i686/uid.patch	                        (rev 0)
+++ testing-i686/uid.patch	2009-03-13 06:53:16 UTC (rev 29899)
@@ -0,0 +1,11 @@
+--- src/misc.c~	2009-03-13 07:33:56.000000000 +0100
++++ src/misc.c	2009-03-13 07:33:56.000000000 +0100
+@@ -274,7 +274,7 @@
+   struct passwd *pw;
+ 
+   *uid = 0;
+-  if (*user)
++  if (!*user)
+     return FALSE;
+     
+   pw = getpwnam(user);