Fri May 6 20:17:18 UTC 2011

2 files changed, 50 insertions, 21 deletions

diff --git a/extra/sysklogd/PKGBUILD b/extra/sysklogd/PKGBUILD
index a548a165c..76a376889 100644
--- a/extra/sysklogd/PKGBUILD
+++ b/extra/sysklogd/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 122666 2011-05-05 23:43:52Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sysklogd
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="System and kernel log daemons"
 arch=('i686' 'x86_64')
 url="http://www.infodrom.org/projects/sysklogd/"
 license=('GPL' 'BSD')
 depends=('glibc' 'logrotate')
 provides=('logger')
-backup=(etc/syslog.conf)
-source=(http://www.infodrom.org/projects/sysklogd/download/$pkgname-$pkgver.tar.gz \
-        syslog.conf syslog.logrotate syslogd klogd LICENSE)
-md5sums=('e053094e8103165f98ddafe828f6ae4b' 'b8bc568494359fa932b7a5e17c4ba4de'\
-         'fb3fdb03959ff62ede00487c853bb950' '92531ee64cdc0ca978bbe9a81c269211'\
-         'c2fe75c82c35371972b6ceda72d6a861' '7930f7ff5038e1318511624e348581cc')
+backup=('etc/syslog.conf' 'etc/logrotate.d/syslog')
+source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz \
+        sysklogd-debian.patch syslog.conf syslog.logrotate syslogd klogd LICENSE)
+md5sums=('e053094e8103165f98ddafe828f6ae4b'
+         '1759e667ecf07ba23297f2c05b8dbe3f'
+         'b8bc568494359fa932b7a5e17c4ba4de'
+         'fb3fdb03959ff62ede00487c853bb950'
+         '92531ee64cdc0ca978bbe9a81c269211'
+         'c2fe75c82c35371972b6ceda72d6a861'
+         '7930f7ff5038e1318511624e348581cc')
 sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236'
+          '7a7320b8e4e21d85cfc9a5aa478a8b013b8afe96'
           '35b4cb76109a6ffe9269021a6bfb4f8da614a4eb'
           'e67c0f78f13c94507d3f686b4e5b8340db4624fd'
           '848beb23b9ca4de19c6022df03878dbe57e04c0a'
@@ -25,15 +29,19 @@ sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236'
           'c416bcefd3d3d618139cc7912310caddf34c0c0b')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" Makefile || return 1
-  make || return 1
-  install -d $startdir/pkg/usr/sbin
-  install -d $startdir/pkg/usr/share/man/{man5,man8}
-  make INSTALL=/bin/install prefix=$startdir/pkg install
-  install -D -m644 ../syslog.conf $startdir/pkg/etc/syslog.conf
-  install -D -m644 ../syslog.logrotate $startdir/pkg/etc/logrotate.d/syslog
-  install -D -m755 ../syslogd $startdir/pkg/etc/rc.d/syslogd
-  install -D -m755 ../klogd $startdir/pkg/etc/rc.d/klogd
-  install -D -m644 ../LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../sysklogd-debian.patch
+  sed -i "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" Makefile
+  make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/sbin" "${pkgdir}"/usr/share/man/{man5,man8}
+  make INSTALL=/bin/install prefix="${pkgdir}" install
+  install -D -m644 ../syslog.conf "${pkgdir}/etc/syslog.conf"
+  install -D -m644 ../syslog.logrotate "${pkgdir}/etc/logrotate.d/syslog"
+  install -D -m755 ../syslogd "${pkgdir}/etc/rc.d/syslogd"
+  install -D -m755 ../klogd "${pkgdir}/etc/rc.d/klogd"
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/sysklogd/sysklogd-debian.patch b/extra/sysklogd/sysklogd-debian.patch
new file mode 100644
index 000000000..0117af5f2
--- /dev/null
+++ b/extra/sysklogd/sysklogd-debian.patch
@@ -0,0 +1,21 @@
+--- sysklogd-1.5.orig/syslogd.c
++++ sysklogd-1.5/syslogd.c
+@@ -2392,7 +2392,7 @@
+ 		if (*p == '\0' || *p == '#')
+ 			continue;
+ #if CONT_LINE
+-		strcpy(cline, p);
++		memmove(cline, p, strlen(p)+1);
+ #endif
+ 		for (p = strchr(cline, '\0'); isspace(*--p););
+ #if CONT_LINE
+--- sysklogd-1.5.orig/ksym_mod.c
++++ sysklogd-1.5/ksym_mod.c
+@@ -189,7 +189,6 @@
+ 		else
+ 			Syslog(LOG_ERR, "Error loading kernel symbols " \
+ 			       "- %s\n", strerror(errno));
+-		fclose(ksyms);
+ 		return(0);
+ 	}
+