propagate from branch 'org.openembedded.dev' (head 2d8db2772931911d5ac3027499e33219f7a60fe3)

            to branch 'org.openembedded.nslu2-linux' (head 9726cc2116293dfa15f6158657ae5a2cd4d2fcfd)

5 files changed, 27 insertions, 8 deletions

diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index c82a0a13c3..410e3b6477 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -83,6 +83,7 @@ OPENSLUG_PACKAGES = "\
 	vlan \
 	wget \
 	unionfs-modules unionfs-utils \
+	xinetd \
 	"
 
 # These packages only build on TARGET_OS=linux, not
diff --git a/packages/sane-backends/sane-backends-1.0.15/saned.xinetd b/packages/sane-backends/sane-backends-1.0.15/saned.xinetd
new file mode 100644
index 0000000000..f4e890fdbe
--- /dev/null
+++ b/packages/sane-backends/sane-backends-1.0.15/saned.xinetd
@@ -0,0 +1,10 @@
+service sane-port
+{
+	socket_type = stream
+	server = /usr/sbin/saned
+	protocol = tcp
+	user = nobody
+	group = nogroup
+	wait = no
+	disable = no
+}
diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb
index 30c4c75b2e..187b996439 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.15.bb
@@ -1,18 +1,22 @@
 MAINTAINER="Oyvind Repvik <nail@nslu2-linux.org>"
 DESCRIPTION="Scanner drivers for SANE"
-PR="r2"
+PR="r4"
 DEPENDS="jpeg libusb"
 
 SRC_URI="ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
-	file://sane-plustek.patch;patch=1\
-	file://Makefile.in.patch;patch=1"
+	file://sane-plustek.patch;patch=1 \
+	file://Makefile.in.patch;patch=1 \
+	file://saned.xinetd \
+	"
 	
-EXTRA_OECONF="--prefix=/usr --sysconfdir=/etc --disable-translations"
+EXTRA_OECONF="--disable-translations"
 
 inherit autotools
 
 do_install_append() {
+	install -d "${D}/${sysconfdir}/xinetd.d"
 	install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}"
+	install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned"
 }
 
 PACKAGES = "libsane saned sane-utils"
@@ -23,9 +27,11 @@ RCONFLICTS = "sane-backends"
 RRECOMMENDS_libsane = "saned sane-utils"
 
 RDEPENDS_saned = "libsane"
+RRECOMMENDS_saned = "xinetd"
 FILES_saned = "/usr/sbin/saned"
 
 RDEPENDS_sane-utils = "libsane"
 FILES_sane-utils = "/usr/bin"
 
+CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf  ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf"
 
diff --git a/packages/xinetd/xinetd/xinetd.init b/packages/xinetd/xinetd/xinetd.init
index 2a84131adc..26dbea7415 100644
--- a/packages/xinetd/xinetd/xinetd.init
+++ b/packages/xinetd/xinetd/xinetd.init
@@ -30,18 +30,18 @@ case "$1" in
 	;;
     stop)
 	echo -n "Stopping internet superserver: xinetd"
-	start-stop-daemon --stop --signal 3 --quiet --oknodo --exec /usr/sbin/xinetd
+	start-stop-daemon --stop --signal 3 --quiet --exec /usr/sbin/xinetd
 	echo "."
 	;;
     reload)
 	echo -n "Reloading internet superserver configuration: xinetd"
-	start-stop-daemon --stop --signal 1 --quiet --oknodo --exec /usr/sbin/xinetd
+	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd
 	echo "."
 	;;
     force-reload)
 	echo "$0 force-reload: Force Reload is deprecated"
 	echo -n "Forcefully reloading internet superserver configuration: xinetd"
-	start-stop-daemon --stop --signal 1 --quiet --oknodo --exec /usr/sbin/xinetd
+	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd
 	echo "."
 	;;
     restart)
diff --git a/packages/xinetd/xinetd_2.3.13.bb b/packages/xinetd/xinetd_2.3.13.bb
index 07a517b029..b0643c7d76 100644
--- a/packages/xinetd/xinetd_2.3.13.bb
+++ b/packages/xinetd/xinetd_2.3.13.bb
@@ -1,7 +1,7 @@
 DEPENDS = ""
 DESCRIPTION = "Highly configurable, modular and secure inetd"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
 	  file://xinetd.init \
@@ -34,3 +34,5 @@ do_install() {
 	install -m 755 "${S}/xinetd/itox" "${D}/usr/sbin"
 
 }
+
+CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"