diff options
Diffstat (limited to 'package/vsftpd/patches')
| -rw-r--r-- | package/vsftpd/patches/chroot.patch | 12 | ||||
| -rw-r--r-- | package/vsftpd/patches/destdir.patch | 48 | ||||
| -rw-r--r-- | package/vsftpd/patches/find-libs.patch | 14 |
3 files changed, 74 insertions, 0 deletions
diff --git a/package/vsftpd/patches/chroot.patch b/package/vsftpd/patches/chroot.patch new file mode 100644 index 0000000000..4c25736242 --- /dev/null +++ b/package/vsftpd/patches/chroot.patch @@ -0,0 +1,12 @@ +diff -ruN vsftpd-1.2.2-orig/tunables.c vsftpd-1.2.2-3/tunables.c +--- vsftpd-1.2.2-orig/tunables.c 2004-04-20 02:25:05.000000000 +0200 ++++ vsftpd-1.2.2-3/tunables.c 2005-03-09 21:12:35.000000000 +0100 +@@ -78,7 +78,7 @@ + unsigned int tunable_max_per_ip = 0; + unsigned int tunable_trans_chunk_size = 0; + +-const char* tunable_secure_chroot_dir = "/usr/share/empty"; ++const char* tunable_secure_chroot_dir = "/var/run/vsftpd"; + const char* tunable_ftp_username = "ftp"; + const char* tunable_chown_username = "root"; + const char* tunable_xferlog_file = "/var/log/xferlog"; diff --git a/package/vsftpd/patches/destdir.patch b/package/vsftpd/patches/destdir.patch new file mode 100644 index 0000000000..c4fb40f4e0 --- /dev/null +++ b/package/vsftpd/patches/destdir.patch @@ -0,0 +1,48 @@ +diff -ruN vsftpd-1.2.2-orig/Makefile vsftpd-1.2.2-3/Makefile +--- vsftpd-1.2.2-orig/Makefile 2003-09-15 13:41:58.000000000 +0200 ++++ vsftpd-1.2.2-3/Makefile 2005-03-09 22:23:12.000000000 +0100 +@@ -16,6 +16,8 @@ + tcpwrap.o ipv6parse.o access.o \ + sysutil.o sysdeputil.o + ++DESTDIR = ++ + .c.o: + $(CC) -c $*.c $(CFLAGS) $(IFLAGS) + +@@ -23,21 +25,20 @@ + $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) + + install: +- if [ -x /usr/local/sbin ]; then \ +- $(INSTALL) -m 755 vsftpd /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; \ +- 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 ++ mkdir -p $(DESTDIR)/usr/sbin ++ $(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/ ++ mkdir -p $(DESTDIR)/usr/share/man/man8 ++ $(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/usr/share/man/man8/ ++ mkdir -p $(DESTDIR)/usr/share/man/man5 ++ $(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/usr/share/man/man5/ ++ mkdir -p $(DESTDIR)/etc/xinetd.d ++ $(INSTALL) -m 644 xinetd.d/vsftpd $(DESTDIR)/etc/xinetd.d/ ++ ++uninstall: ++ rm -f $(DESTDIR)/usr/sbin/vsftpd ++ rm -f $(DESTDIR)/usr/share/man/man8/vsftpd.8 ++ rm -f $(DESTDIR)/usr/share/man/man5/vsftpd.conf.5 ++ rm -f $(DESTDIR)/etc/xinetd.d/vsftpd + + clean: + rm -f *.o *.swp vsftpd diff --git a/package/vsftpd/patches/find-libs.patch b/package/vsftpd/patches/find-libs.patch new file mode 100644 index 0000000000..ae8e9f7dbf --- /dev/null +++ b/package/vsftpd/patches/find-libs.patch @@ -0,0 +1,14 @@ +diff -ruN vsftpd-1.2.2-orig/Makefile vsftpd-1.2.2-3/Makefile +--- vsftpd-1.2.2-orig/Makefile 2003-09-15 13:41:58.000000000 +0200 ++++ vsftpd-1.2.2-3/Makefile 2005-03-09 22:23:12.000000000 +0100 +@@ -5,8 +5,8 @@ + #CFLAGS = -g + CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion + +-LIBS = `./vsf_findlibs.sh` +-LINK = -Wl,-s ++LIBS = -lcrypt -lnsl ++LINK = + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ + tunables.o ftpdataio.o secbuf.o ls.o \ |