diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2005-09-12 15:20:57 +0000 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2005-09-12 15:20:57 +0000 |
commit | 9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22 (patch) | |
tree | 0d464a39b648d44f8a8b2125cacf590afd2a1a98 /pkgs/servers/ftp/vsftpd/fix.patch | |
parent | 4d07cb8db5c5109902238c870243917590e9394c (diff) | |
download | nixpkgs-9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22.tar nixpkgs-9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22.tar.gz nixpkgs-9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22.tar.bz2 nixpkgs-9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22.tar.lz nixpkgs-9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22.tar.xz nixpkgs-9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22.tar.zst nixpkgs-9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22.zip |
vsftpd
svn path=/nixpkgs/trunk/; revision=3811
Diffstat (limited to 'pkgs/servers/ftp/vsftpd/fix.patch')
-rw-r--r-- | pkgs/servers/ftp/vsftpd/fix.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/pkgs/servers/ftp/vsftpd/fix.patch b/pkgs/servers/ftp/vsftpd/fix.patch new file mode 100644 index 00000000000..aefce939561 --- /dev/null +++ b/pkgs/servers/ftp/vsftpd/fix.patch @@ -0,0 +1,56 @@ +diff -rc vsftpd-2.0.3/Makefile vsftpd-2.0.3-new/Makefile +*** vsftpd-2.0.3/Makefile Fri Mar 11 20:34:15 2005 +--- vsftpd-2.0.3-new/Makefile Mon Sep 12 17:06:31 2005 +*************** +*** 5,11 **** + #CFLAGS = -g + CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion + +- LIBS = `./vsf_findlibs.sh` + LINK = -Wl,-s + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ +--- 5,10 ---- +*************** +*** 24,44 **** + $(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 + + clean: + rm -f *.o *.swp vsftpd +--- 23,41 ---- + $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) + + install: +! if [ -x $$out/sbin ]; then \ +! $(INSTALL) -m 755 vsftpd $$out/sbin/vsftpd; \ + else \ +! $(INSTALL) -m 755 vsftpd $$out/sbin/vsftpd; fi +! if [ -x $$out/man ]; then \ +! $(INSTALL) -m 644 vsftpd.8 $$out/man/man8/vsftpd.8; \ +! $(INSTALL) -m 644 vsftpd.conf.5 $$out/man/man5/vsftpd.conf.5; \ +! elif [ -x $$out/share/man ]; then \ +! $(INSTALL) -m 644 vsftpd.8 $$out/man/man8/vsftpd.8; \ +! $(INSTALL) -m 644 vsftpd.conf.5 $$out/share/man/man5/vsftpd.conf.5; \ + else \ +! $(INSTALL) -m 644 vsftpd.8 $$out/man/man8/vsftpd.8; \ +! $(INSTALL) -m 644 vsftpd.conf.5 $$out/man/man5/vsftpd.conf.5; fi + + clean: + rm -f *.o *.swp vsftpd |