sysklogd: update to version 1.5 and unify. Hopefully closes 2691.

diff --git a/packages/sysklogd/sysklogd-1.5/.mtn2git_empty b/packages/sysklogd/sysklogd-1.5/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch b/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch
new file mode 100644 (file)
index 0000000..1f15fa5
--- /dev/null
+++ b/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch
@@ -0,0 +1,21 @@
+upstream: not applicable.  It seems upstream has made a conscious choice here.  See lines 56-61 in the Makefile.
+
+Index: tmp/sysklogd-1.5/Makefile
+===================================================================
+--- sysklogd-1.5.orig/Makefile 2008-07-19 13:33:35.793734746 +0200
++++ sysklogd-1.5/Makefile      2008-07-19 13:34:07.351535636 +0200
+@@ -131,10 +131,10 @@
+       ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd
+ 
+ install_man:
+-      ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
+-      ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8
+-      ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5
+-      ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} klogd.8 ${MANDIR}/man8/klogd.8
++      ${INSTALL} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
++      ${INSTALL} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8
++      ${INSTALL} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5
++      ${INSTALL} -m ${MAN_PERMS} klogd.8 ${MANDIR}/man8/klogd.8
+ 
+ obj-m += oops.o
+ 

diff --git a/packages/sysklogd/sysklogd.inc b/packages/sysklogd/sysklogd.inc
new file mode 100644 (file)
index 0000000..da05c0e
--- /dev/null
+++ b/packages/sysklogd/sysklogd.inc
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "base"
+DESCRIPTION = "The sysklogd package implements \
+two system log daemons."
+
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz \
+          file://nonrootinstall.patch;patch=1"
+
+CFLAGS_append = " -DSYSV"
+
+do_install () {
+       install -d ${D}${mandir}/man8 \
+                  ${D}${mandir}/man5 \
+                  ${D}${bindir}
+       oe_runmake 'BINDIR=${D}${bindir}' \
+                  'MANDIR=${D}${mandir}' install
+}

diff --git a/packages/sysklogd/sysklogd_1.4.1.bb b/packages/sysklogd/sysklogd_1.4.1.bb
index da05c0e..31843d6 100644 (file)
--- a/packages/sysklogd/sysklogd_1.4.1.bb
+++ b/packages/sysklogd/sysklogd_1.4.1.bb
@@ -1,17 +1 @@
-LICENSE = "GPL"
-SECTION = "base"
-DESCRIPTION = "The sysklogd package implements \
-two system log daemons."
-
-SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz \
-          file://nonrootinstall.patch;patch=1"
-
-CFLAGS_append = " -DSYSV"
-
-do_install () {
-       install -d ${D}${mandir}/man8 \
-                  ${D}${mandir}/man5 \
-                  ${D}${bindir}
-       oe_runmake 'BINDIR=${D}${bindir}' \
-                  'MANDIR=${D}${mandir}' install
-}
+require sysklogd.inc

diff --git a/packages/sysklogd/sysklogd_1.5.bb b/packages/sysklogd/sysklogd_1.5.bb
new file mode 100644 (file)
index 0000000..31843d6
--- /dev/null
+++ b/packages/sysklogd/sysklogd_1.5.bb
@@ -0,0 +1 @@
+require sysklogd.inc