merge of aa755a637d4d88b529d18e8a8944d3db40a48daa

     and e6e39921b062d03c77147b22e3d7394bdb39a97d

7 files changed, 65 insertions, 3 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 28523f52b7..4df804800b 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -172,6 +172,7 @@ ${PKGDIR}/packages/upslug/*.bb \
 ${PKGDIR}/packages/usbutils/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/vsftpd/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
 ${PKGDIR}/packages/watchdog/*.bb \
 ${PKGDIR}/packages/wireless-tools/*.bb \
diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb
new file mode 100644
index 0000000000..a67df35806
--- /dev/null
+++ b/packages/iptables/iptables_1.3.3.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "iptables network filtering tools"
+HOMEPAGE = "http://www.netfilter.org/"
+SECTION = "console/utils"
+LICENSE = "GPL"
+PR = "r1"
+
+PACKAGES =+ "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/iptables-save ${bindir}/iptables-restore"
+
+SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
+
+S = "${WORKDIR}/iptables-${PV}"
+
+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 () {
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
+}
+
+FILES_${PN}-doc += "${mandir}"
+
diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb
new file mode 100644
index 0000000000..0d8dcf23cf
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.103.bb
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+PR = "r2"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+inherit pkgconfig autotools
+
+EXTRA_OECONF = "--enable-cairo"
+
+do_stage () {
+	oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
+	autotools_stage_includes
+}
+
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 36a7836683..0a209fce0a 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -111,6 +111,7 @@ OPENSLUG_PACKAGES = "\
 	usbutils \
 	util-linux \
 	vlan \
+	vsftpd \
 	wakelan \
 	watchdog \
 	wireless-tools \
diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc
index 279d1e61ee..7251bcdb4a 100644
--- a/packages/sudo/sudo.inc
+++ b/packages/sudo/sudo.inc
@@ -18,3 +18,7 @@ do_configure_prepend () {
 		cat aclocal.m4 > acinclude.m4
 	fi
 }
+
+pkg_postinst() {
+	chmod 0440 ${sysconfdir}/sudoers
+}
diff --git a/packages/sudo/sudo_1.6.8p8.bb b/packages/sudo/sudo_1.6.8p8.bb
index 087bcee541..cc8ae4081c 100644
--- a/packages/sudo/sudo_1.6.8p8.bb
+++ b/packages/sudo/sudo_1.6.8p8.bb
@@ -5,4 +5,4 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
 	   file://noexec-link.patch;patch=1"
 
 include sudo.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/vsftpd/vsftpd_2.0.3.bb b/packages/vsftpd/vsftpd_2.0.3.bb
index 52be1d6285..ac54a96ed9 100644
--- a/packages/vsftpd/vsftpd_2.0.3.bb
+++ b/packages/vsftpd/vsftpd_2.0.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 DEPENDS = "openssl"
-PR = "r2"
+PR = "r3"
 LICENSE = "GPL"
 SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
@@ -9,6 +9,13 @@ SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
 	   file://init \
 	   file://vsftpd.conf"
 
+do_configure() {
+	# Fix hardcoded /usr, /etc, /var mess.
+	cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \
+	|sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new
+	mv tunables.c.new tunables.c
+}
+
 do_compile() {
 	oe_runmake "LIBS=-lssl -lcrypto -lcrypt -L${STAGING_LIBDIR}"
 }
@@ -32,4 +39,5 @@ INITSCRIPT_PARAMS = "defaults"
 pkg_postinst() {
 	addgroup ftp
 	adduser --system --home /var/tmp/ftp --no-create-home --ingroup ftp --disabled-password -s /bin/false ftp
-}
\ No newline at end of file
+	mkdir -p ${localstatedir}/share/empty
+}