From 90b1f18c1eec6e77f54de1c29a4cdbde83bd8f34 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 11 Sep 2006 08:33:55 +0000 Subject: vsftpd: clean up proper --- packages/vsftpd/vsftpd-2.0.5/.mtn2git_empty | 0 packages/vsftpd/vsftpd-2.0.5/makefile.patch | 47 +++++++++++++++++++++++++++++ packages/vsftpd/vsftpd-2.0.5/nopam.patch | 12 ++++++++ packages/vsftpd/vsftpd_2.0.1.bb | 22 -------------- packages/vsftpd/vsftpd_2.0.3.bb | 44 --------------------------- 5 files changed, 59 insertions(+), 66 deletions(-) create mode 100644 packages/vsftpd/vsftpd-2.0.5/.mtn2git_empty create mode 100644 packages/vsftpd/vsftpd-2.0.5/makefile.patch create mode 100644 packages/vsftpd/vsftpd-2.0.5/nopam.patch delete mode 100644 packages/vsftpd/vsftpd_2.0.1.bb delete mode 100644 packages/vsftpd/vsftpd_2.0.3.bb (limited to 'packages/vsftpd') diff --git a/packages/vsftpd/vsftpd-2.0.5/.mtn2git_empty b/packages/vsftpd/vsftpd-2.0.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/vsftpd/vsftpd-2.0.5/makefile.patch b/packages/vsftpd/vsftpd-2.0.5/makefile.patch new file mode 100644 index 0000000000..3bf8f97671 --- /dev/null +++ b/packages/vsftpd/vsftpd-2.0.5/makefile.patch @@ -0,0 +1,47 @@ +diff -ur vsftpd-2.0.1_org/Makefile vsftpd-2.0.1_patch/Makefile +--- vsftpd-2.0.1_org/Makefile 2004-06-06 18:21:27.000000000 +0200 ++++ vsftpd-2.0.1_patch/Makefile 2004-07-21 09:50:25.245576352 +0200 +@@ -5,7 +5,7 @@ + #CFLAGS = -g + CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion + +-LIBS = `./vsf_findlibs.sh` ++LIBS = -lssl -lcrypto -lnsl -lresolv + LINK = -Wl,-s + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ +@@ -24,21 +24,21 @@ + $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) + + install: +- if [ -x /usr/local/sbin ]; then \ +- $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \ ++ if [ -x ${DESTDIR}/usr/local/sbin ]; then \ ++ $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/local/sbin/vsftpd; \ + else \ +- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi +- if [ -x /usr/local/man ]; then \ +- $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \ +- elif [ -x /usr/share/man ]; then \ +- $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \ ++ $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/sbin/vsftpd; fi ++ if [ -x ${DESTDIR}/usr/local/man ]; then \ ++ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/local/man/man8/vsftpd.8; \ ++ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/local/man/man5/vsftpd.conf.5; \ ++ elif [ -x ${DESTDIR}/usr/share/man ]; then \ ++ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/share/man/man8/vsftpd.8; \ ++ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/share/man/man5/vsftpd.conf.5; \ + else \ +- $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi +- if [ -x /etc/xinetd.d ]; then \ +- $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi ++ $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/man/man8/vsftpd.8; \ ++ $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/man/man5/vsftpd.conf.5; fi ++ if [ -x ${DESTDIR}/etc/xinetd.d ]; then \ ++ $(INSTALL) -m 644 xinetd.d/vsftpd ${DESTDIR}/etc/xinetd.d/vsftpd; fi + + clean: + rm -f *.o *.swp vsftpd diff --git a/packages/vsftpd/vsftpd-2.0.5/nopam.patch b/packages/vsftpd/vsftpd-2.0.5/nopam.patch new file mode 100644 index 0000000000..8e0559cad1 --- /dev/null +++ b/packages/vsftpd/vsftpd-2.0.5/nopam.patch @@ -0,0 +1,12 @@ +diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h +--- vsftpd-2.0.1_org/builddefs.h 2004-07-02 16:36:59.000000000 +0200 ++++ vsftpd-2.0.1_patch/builddefs.h 2004-07-21 09:34:49.044900488 +0200 +@@ -2,7 +2,7 @@ + #define VSF_BUILDDEFS_H + + #undef VSF_BUILD_TCPWRAPPERS +-#define VSF_BUILD_PAM ++#undef VSF_BUILD_PAM + #undef VSF_BUILD_SSL + + #endif /* VSF_BUILDDEFS_H */ diff --git a/packages/vsftpd/vsftpd_2.0.1.bb b/packages/vsftpd/vsftpd_2.0.1.bb deleted file mode 100644 index b77ce2e1d5..0000000000 --- a/packages/vsftpd/vsftpd_2.0.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Secure ftp daemon" -SECTION = "console/network" -DEPENDS = "openssl" -PR = "r1" -LICENSE = "GPL" -SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.1.tar.gz \ - file://makefile.patch;patch=1 \ - file://nopam.patch;patch=1" - -do_compile() { - oe_runmake "LIBS=-lssl -lcrypto -lcrypt -L${STAGING_LIBDIR}" -} - -do_install() { - install -d ${D}${sbindir} - install -d ${D}${mandir}/man8 - install -d ${D}${mandir}/man5 - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${sysconfdir} - install -m 0755 ${S}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf -} - diff --git a/packages/vsftpd/vsftpd_2.0.3.bb b/packages/vsftpd/vsftpd_2.0.3.bb deleted file mode 100644 index 1cb4c55534..0000000000 --- a/packages/vsftpd/vsftpd_2.0.3.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Secure ftp daemon" -SECTION = "console/network" -DEPENDS = "openssl" -MAINTAINER = "Oyvind Repvik " -PR = "r3" -LICENSE = "GPL" -SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \ - file://makefile.patch;patch=1 \ - file://nopam.patch;patch=1 \ - 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}" -} - -do_install() { - install -d ${D}${sbindir} - install -d ${D}${mandir}/man8 - install -d ${D}${mandir}/man5 - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf - install -d ${D}${sysconfdir}/init.d/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd -} - -inherit update-rc.d - -INITSCRIPT_NAME = "vsftpd" -INITSCRIPT_PARAMS = "defaults" - -pkg_postinst() { - addgroup ftp - adduser --system --home /var/tmp/ftp --no-create-home --ingroup ftp --disabled-password -s /bin/false ftp - mkdir -p ${localstatedir}/share/empty -} -- cgit v1.2.3