sysklogd: update to 2.0.3

4 files changed, 37 insertions, 58 deletions

diff --git a/sysklogd/.footprint b/sysklogd/.footprint
index 7eb25d2e..c5a75f3a 100644
--- a/sysklogd/.footprint
+++ b/sysklogd/.footprint
@@ -6,17 +6,29 @@ drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/sysklogd
 -rw-r--r--	root/root	etc/syslog.conf
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/syslog/
+-rw-r--r--	root/root	usr/include/syslog/syslog.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libsyslog.a
+-rwxr-xr-x	root/root	usr/lib/libsyslog.la
+lrwxrwxrwx	root/root	usr/lib/libsyslog.so -> libsyslog.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libsyslog.so.0 -> libsyslog.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libsyslog.so.0.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libsyslog.pc
 drwxr-xr-x	root/root	usr/sbin/
--rwx------	root/root	usr/sbin/klogd
+-rwxr-xr-x	root/root	usr/sbin/klogd
 -rwxr-xr-x	root/root	usr/sbin/rotatelog
--rwx------	root/root	usr/sbin/syslogd
+-rwxr-xr-x	root/root	usr/sbin/syslogd
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/syslogp.3.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/syslog.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/klogd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/sysklogd.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/syslogd.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
diff --git a/sysklogd/.signature b/sysklogd/.signature
index e8223858..ea9aa355 100644
--- a/sysklogd/.signature
+++ b/sysklogd/.signature
@@ -1,9 +1,8 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVequbnWRjKXT9VGBTHcFerS3Bgwe+Ve7ompCwwh/Neo+FDo4rDNyu9g8+pAYb1GnOrFlzxVy8HhElSLWNSY99hewM=
-SHA256 (Pkgfile) = bd5dd49d103dcb97976aaa38d9302d30f8072c398ed5f474150f2b46d1fa83a7
-SHA256 (.footprint) = 14108d5e1b1e66327161c257f42221c914adff192896cbbe5ffe81a58d8dacdc
-SHA256 (sysklogd-1.5.1.tar.gz) = 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201
-SHA256 (sysklogd.diff) = 9e5772075428e2dd9d9f9c21eb64477a96bdf5424c3969f0be901073afc462a7
+RWRJc1FUaeVeqr8kB5Spry1HOHTfnTvXpYgamphB72HtCx/I4DcjheeXWsFV3kSHSW2gj9ee9D7xNFXqt8xIKokKzAvp56ja+g0=
+SHA256 (Pkgfile) = fa02093d9363040146c6cb96f95ff89894ee9e87e7f58533190e67f0a8ae3678
+SHA256 (.footprint) = 07f72577388f80061d0a843413d545f00cb4f51e53138613a096c50a8866c9e8
+SHA256 (sysklogd-2.0.3.tar.gz) = 26c2035d7d71fbd068523f8b2f04c098bbb33582b8bec8ee097569dda4a3a17f
 SHA256 (rotatelog) = 4f51230e8c371d61018d88f6d88d1c6bf6b9aee054302fbf4285c82084bdc98f
 SHA256 (syslog) = fc29247aaee9baec087d29a6ffef469d8301bddef913bb7eee67151fceba7112
 SHA256 (syslog.conf) = ee27b32b0aba103a8fc30b16ec441127d74a71cac9cd999cb082bdf4273f9f85
diff --git a/sysklogd/Pkgfile b/sysklogd/Pkgfile
index 6303766c..7ca2bf46 100644
--- a/sysklogd/Pkgfile
+++ b/sysklogd/Pkgfile
@@ -1,32 +1,36 @@
 # Description: Kernel and system logging daemons
-# URL:         http://www.infodrom.org/projects/sysklogd/
+# URL:         https://github.com/troglobit/sysklogd
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=sysklogd
-version=1.5.1
-release=8
-source=(http://www.infodrom.org/projects/$name/download/$name-$version.tar.gz \
-        sysklogd.diff rotatelog syslog syslog.conf sysklogd)
+version=2.0.3
+release=1
+source=(https://github.com/troglobit/sysklogd/releases/download/v$version/$name-$version.tar.gz \
+        rotatelog syslog syslog.conf sysklogd)
 
 build() {
     cd $name-$version
 
-    patch -p1 -i $SRC/sysklogd.diff
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --runstatedir=/var/run \
+        --with-klogd \
+        --without-logger \
 
-    install -d $PKG/usr/sbin \
-               $PKG/etc/{cron/weekly,rc.d} \
-               $PKG/var/log \
-               $PKG/usr/share/man/{man5,man8}
-
-    make RPM_OPT_FLAGS="$CFLAGS" all
-    make BINDIR=$PKG/usr/sbin MANDIR=$PKG/usr/share/man install
+    make
+    make DESTDIR=$PKG install
 
+    install -d $PKG/etc/{cron/weekly,rc.d}
     install -m 755 $SRC/rotatelog $PKG/usr/sbin
     install -m 755 $SRC/syslog $PKG/etc/cron/weekly
     install -m 644 $SRC/syslog.conf $PKG/etc
     install -m 755 $SRC/sysklogd $PKG/etc/rc.d
 
-    chmod -R +w $PKG
+    install -d $PKG/var/log
     touch $PKG/var/log/{messages,auth,mail,cron,kernel,debug}
     chmod 640 $PKG/var/log/{messages,auth,mail,cron,kernel,debug}
+
+    rm -r $PKG/usr/share/doc
 }
diff --git a/sysklogd/sysklogd.diff b/sysklogd/sysklogd.diff
deleted file mode 100644
index 105eeefc..00000000
--- a/sysklogd/sysklogd.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru sysklogd-1.5.1.orig/Makefile sysklogd-1.5.1/Makefile
---- sysklogd-1.5.1.orig/Makefile	2016-08-27 17:05:36.783075199 +0200
-+++ sysklogd-1.5.1/Makefile	2016-08-27 17:05:52.512526347 +0200
-@@ -20,7 +20,8 @@
- CC= gcc
- #SKFLAGS= -g -DSYSV -Wall
- #LDFLAGS= -g
--SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-+RPM_OPT_FLAGS ?= -O2
-+SKFLAGS= $(RPM_OPT_FLAGS) -DSYSV  -Wall
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
- # $(shell getconf LFS_SKFLAGS)
-diff -Nru sysklogd-1.5.1.orig/ksym_mod.c sysklogd-1.5.1/ksym_mod.c
---- sysklogd-1.5.1.orig/ksym_mod.c	2016-08-27 17:05:36.783075199 +0200
-+++ sysklogd-1.5.1/ksym_mod.c	2016-08-27 17:05:52.512526347 +0200
-@@ -189,7 +189,6 @@
- 		else
- 			Syslog(LOG_ERR, "Error loading kernel symbols " \
- 			       "- %s\n", strerror(errno));
--		fclose(ksyms);
- 		return(0);
- 	}
- 
-diff -Nru sysklogd-1.5.1.orig/syslogd.c sysklogd-1.5.1/syslogd.c
---- sysklogd-1.5.1.orig/syslogd.c	2016-08-27 17:05:36.783075199 +0200
-+++ sysklogd-1.5.1/syslogd.c	2016-08-27 17:08:12.964223932 +0200
-@@ -2094,7 +2094,7 @@
- 	(void) signal(SIGCHLD, reapchild);	/* reset signal handler -ASP */
- 	wait ((int *)0);
- #else
--	union wait status;
-+	int status;
- 
- 	while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
- 		;