merge of 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'

     and 'f9f4aeef69ea9d929a612c025e1e90a2de52faca'

7 files changed, 43 insertions, 20 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6c63dff5d7..b3d2f441a3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12310,9 +12310,9 @@ sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
 md5=84ab290758d2c177df5924e10bff4835
 sha256=522ded5292b80289e13dc8af9a0c11d35417f7079779969835cc8af55a38d006
 
-[ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz]
-md5=274ca4d36ee6fb216fa6cf01ad5eaa84
-sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c
+[ftp://mama.indstate.edu/linux/tree/tree-1.5.2.tgz]
+md5=b86a3091ec93e1e13e81020fa33b6270
+sha256=d830f5c79fa86bd5b40ce99e70408e7e734361a14dc0bea5bffa0586cfde9715
 
 [http://www.southern-storm.com.au/download/treecc-0.3.6.tar.gz]
 md5=56426279e6017af909353176e582fb28
diff --git a/packages/sysklogd/sysklogd-1.5/.mtn2git_empty b/packages/sysklogd/sysklogd-1.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sysklogd/sysklogd-1.5/.mtn2git_empty
diff --git a/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch b/packages/sysklogd/sysklogd-1.5/nonrootinstall.patch
new file mode 100644
index 0000000000..1f15fa5a46
--- /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
index 0000000000..da05c0e02e
--- /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 da05c0e02e..31843d603f 100644
--- 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
index 0000000000..31843d603f
--- /dev/null
+++ b/packages/sysklogd/sysklogd_1.5.bb
@@ -0,0 +1 @@
+require sysklogd.inc
diff --git a/packages/tree/tree_1.5.1.bb b/packages/tree/tree_1.5.2.bb
index 8bca919b22..8bca919b22 100644
--- a/packages/tree/tree_1.5.1.bb
+++ b/packages/tree/tree_1.5.2.bb