svn path=/nixpkgs/trunk/; revision=3811
This commit is contained in:
Rob Vermaas 2005-09-12 15:20:57 +00:00
parent 4d07cb8db5
commit 9a6ce709fa
4 changed files with 86 additions and 1 deletions

View file

@ -0,0 +1,9 @@
. $stdenv/setup
ensureDir "$out/bin"
ensureDir "$out/sbin"
ensureDir "$out/man/man8"
ensureDir "$out/man/man5"
genericBuild

View file

@ -0,0 +1,16 @@
{stdenv, fetchurl, openssl}:
stdenv.mkDerivation {
name = "vsftpd-2.0.3";
src = fetchurl {
url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz;
md5 = "74936cbd8e8251deb1cd99c5fb18b6f8" ;
};
NIX_LDFLAGS = [ "-lcrypt" "-lssl" "-lcrypto" ];
builder = ./builder.sh ;
patches = [ ./fix.patch ] ;
buildInputs = [ openssl ];
}

View file

@ -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

View file

@ -640,7 +640,11 @@ rec {
dovecot = (import ../servers/mail/dovecot) {
inherit fetchurl stdenv ;
};
vsftpd = (import ../servers/ftp/vsftpd) {
inherit fetchurl stdenv openssl ;
};
tomcat5 = (import ../servers/http/tomcat) {
inherit fetchurl stdenv ;
j2sdk = blackdown;