summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/meta/openslug-packages.bb1
-rw-r--r--packages/sudo/sudo.inc4
-rw-r--r--packages/sudo/sudo_1.6.8p8.bb2
-rw-r--r--packages/vsftpd/vsftpd_2.0.3.bb12
4 files changed, 16 insertions, 3 deletions
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
+}