From 9a6ce709fa1f4f6e21ec46ae1389ee4f2eb8bc22 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 12 Sep 2005 15:20:57 +0000
Subject: vsftpd

svn path=/nixpkgs/trunk/; revision=3811
---
 pkgs/servers/ftp/vsftpd/builder.sh   |  9 ++++++
 pkgs/servers/ftp/vsftpd/default.nix  | 16 +++++++++++
 pkgs/servers/ftp/vsftpd/fix.patch    | 56 ++++++++++++++++++++++++++++++++++++
 pkgs/system/all-packages-generic.nix |  6 +++-
 4 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/ftp/vsftpd/builder.sh
 create mode 100644 pkgs/servers/ftp/vsftpd/default.nix
 create mode 100644 pkgs/servers/ftp/vsftpd/fix.patch

diff --git a/pkgs/servers/ftp/vsftpd/builder.sh b/pkgs/servers/ftp/vsftpd/builder.sh
new file mode 100644
index 00000000000..323b6d1699a
--- /dev/null
+++ b/pkgs/servers/ftp/vsftpd/builder.sh
@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+ensureDir "$out/bin"
+ensureDir "$out/sbin"
+
+ensureDir "$out/man/man8"
+ensureDir "$out/man/man5"
+
+genericBuild
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
new file mode 100644
index 00000000000..a6a5afcfd6f
--- /dev/null
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -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 ];
+}
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
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 621ba7d7d6a..fb5a6498d8c 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -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;
-- 
cgit 1.4.1