[oe-commits] org.oe.dev merge of 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'

[mickeyl commit]

merge of 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'
     and 'f9f4aeef69ea9d929a612c025e1e90a2de52faca'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4a23d34de7fbd115b50bd9e897587aa0af8a56a5
ViewMTN: http://monotone.openembedded.org/revision/info/4a23d34de7fbd115b50bd9e897587aa0af8a56a5
Files:
1
packages/sysklogd/sysklogd_1.4.1.bb
packages/sysklogd/sysklogd.inc
packages/tree/tree_1.5.1.bb
packages/tree/tree_1.5.2.bb
packages/sysklogd/sysklogd-1.5
packages/sysklogd/sysklogd-1.5/nonrootinstall.patch
packages/sysklogd/sysklogd_1.5.bb
conf/checksums.ini
packages/iptables/iptables_1.2.11.bb
packages/iptables/iptables_1.2.9.bb
packages/iptables/iptables_1.3.3.bb
packages/iptables/iptables_1.3.8.bb
Diffs:

#
# mt diff -rbb80418f92c2db8734eda06db4ea527fdc5c84b0 -r4a23d34de7fbd115b50bd9e897587aa0af8a56a5
#
#
#
# rename "packages/sysklogd/sysklogd_1.4.1.bb"
#     to "packages/sysklogd/sysklogd.inc"
# 
# rename "packages/tree/tree_1.5.1.bb"
#     to "packages/tree/tree_1.5.2.bb"
# 
# add_dir "packages/sysklogd/sysklogd-1.5"
# 
# add_file "packages/sysklogd/sysklogd-1.5/nonrootinstall.patch"
#  content [dc677af868f20420c873c556c16de499d4415731]
# 
# add_file "packages/sysklogd/sysklogd_1.4.1.bb"
#  content [53f95f12807ff20b58391e9899a2f60584910eeb]
# 
# add_file "packages/sysklogd/sysklogd_1.5.bb"
#  content [53f95f12807ff20b58391e9899a2f60584910eeb]
# 
# patch "conf/checksums.ini"
#  from [a32f9d6b76e298611be8524a49e7fc8cf87e8d90]
#    to [333135eef838ab36d646041242da71b428e199bb]
#
============================================================
--- packages/sysklogd/sysklogd-1.5/nonrootinstall.patch	dc677af868f20420c873c556c16de499d4415731
+++ packages/sysklogd/sysklogd-1.5/nonrootinstall.patch	dc677af868f20420c873c556c16de499d4415731
@@ -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
+ 
============================================================
--- packages/sysklogd/sysklogd_1.4.1.bb	53f95f12807ff20b58391e9899a2f60584910eeb
+++ packages/sysklogd/sysklogd_1.4.1.bb	53f95f12807ff20b58391e9899a2f60584910eeb
@@ -0,0 +1 @@
+require sysklogd.inc
============================================================
--- packages/sysklogd/sysklogd_1.5.bb	53f95f12807ff20b58391e9899a2f60584910eeb
+++ packages/sysklogd/sysklogd_1.5.bb	53f95f12807ff20b58391e9899a2f60584910eeb
@@ -0,0 +1 @@
+require sysklogd.inc
============================================================
--- conf/checksums.ini	a32f9d6b76e298611be8524a49e7fc8cf87e8d90
+++ conf/checksums.ini	333135eef838ab36d646041242da71b428e199bb
@@ -12310,9 +12310,9 @@ sha256=522ded5292b80289e13dc8af9a0c11d35
 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


#
# mt diff -rf9f4aeef69ea9d929a612c025e1e90a2de52faca -r4a23d34de7fbd115b50bd9e897587aa0af8a56a5
#
#
#
# delete "packages/iptables/iptables_1.2.11.bb"
# 
# delete "packages/iptables/iptables_1.2.9.bb"
# 
# delete "packages/iptables/iptables_1.3.3.bb"
# 
# patch "packages/iptables/iptables_1.3.8.bb"
#  from [1aaec8093c54dfedc012edf2063335ac084950cd]
#    to [378c457280c7e7598672d9a4d4eb53a84894c568]
#
============================================================
--- packages/iptables/iptables_1.3.8.bb	1aaec8093c54dfedc012edf2063335ac084950cd
+++ packages/iptables/iptables_1.3.8.bb	378c457280c7e7598672d9a4d4eb53a84894c568
@@ -1,32 +1,8 @@
-DESCRIPTION = "iptables network filtering tools"
-HOMEPAGE = "http://www.netfilter.org/"
-SECTION = "console/utils"
-LICENSE = "GPL"
-RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r2"
-SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
-          file://getsockopt-failed.patch;patch=1 \
-          file://iptables-use-s6_addr32.patch;patch=1 \
-          "
+require iptables.inc
+PR = "r3"
 
-S = "${WORKDIR}/iptables-${PV}"
+SRC_URI += "\
+  file://getsockopt-failed.patch;patch=1 \
+  file://iptables-use-s6_addr32.patch;patch=1 \
+"
 
-PARALLEL_MAKE=""
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
-}
-
-do_install () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
-}
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
-FILES_${PN}-doc += "${mandir}"
-