5 files changed, 104 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in
index 8f9204176..c42a75728 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -230,6 +230,7 @@ source "package/curl/Config.in"
 source "package/gatling/Config.in"
 source "package/lighttpd/Config.in"
 source "package/mini_httpd/Config.in"
+source "package/proftpd/Config.in"
 source "package/tntnet/Config.in"
 source "package/vsftpd/Config.in"
 source "package/wget/Config.in"
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
new file mode 100644
index 000000000..e4662c8da
--- /dev/null
+++ b/package/proftpd/Makefile
@@ -0,0 +1,43 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		proftpd
+PKG_VERSION:=		1.3.2b
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4918908fcae9e591ba84c66edff73410
+PKG_DESCR:=		An advanced and very configurable FTP server
+PKG_SECTION:=		utils
+PKG_DEPENDS:=
+PKG_URL:=		http://www.proftpd.org/
+PKG_SITES:=		ftp://ftp.proftpd.org/distrib/source/
+
+# if downloaded package is not ending with .tar.gz use following
+#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PROFTPD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+# use following to add ./configure options
+#CONFIGURE_ARGS+=	--disable-foo
+# overwrite any configure variables
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
+			ac_cv_func_setgrent_void=yes
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+# please install all files and directories to the package dir
+post-install:
+	$(INSTALL_DIR) $(IDIR_PROFTPD)/etc
+	$(INSTALL_DATA) $(WRKINST)/etc/proftpd.conf $(IDIR_PROFTPD)/etc/
+	$(INSTALL_DIR) $(IDIR_PROFTPD)/usr/{s,}bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ftp{count,dctl,top,who} $(IDIR_PROFTPD)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/prxs $(IDIR_PROFTPD)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} $(IDIR_PROFTPD)/usr/sbin/
+	# XXX: maybe this should be a symlink to /tmp or so
+	$(INSTALL_DIR) $(IDIR_PROFTPD)/var/proftpd
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in
new file mode 100644
index 000000000..028fd90b3
--- /dev/null
+++ b/package/proftpd/patches/patch-Make_rules_in
@@ -0,0 +1,16 @@
+	do not try to set user or group id when installing
+--- proftpd-1.3.2b.orig/Make.rules.in	2008-11-19 04:51:38.000000000 +0100
++++ proftpd-1.3.2b/Make.rules.in	2010-01-20 17:52:24.864178426 +0100
+@@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
+ INSTALL=@INSTALL@
+ INSTALL_USER=@install_user@
+ INSTALL_GROUP=@install_group@
+-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
++INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
++INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
++INSTALL_MAN=$(INSTALL) -m 0644
+ 
+ RM=rm -f
+ SHELL=/bin/sh
diff --git a/package/proftpd/patches/patch-Makefile_in b/package/proftpd/patches/patch-Makefile_in
new file mode 100644
index 000000000..338a3b691
--- /dev/null
+++ b/package/proftpd/patches/patch-Makefile_in
@@ -0,0 +1,33 @@
+	hiding it won't help, we install as non-root so no chown possible
+--- proftpd-1.3.2b.orig/Makefile.in	2008-11-19 04:51:38.000000000 +0100
++++ proftpd-1.3.2b/Makefile.in	2010-01-20 18:03:40.552178286 +0100
+@@ -76,7 +76,6 @@ check: proftpd$(EXEEXT)
+ $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(rundir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
+ 	@if [ ! -d $@ ]; then \
+ 		mkdir -p $@; \
+-		chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
+ 		chmod 0755 $@; \
+ 	fi
+ 
+@@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
+ 		rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
+ 	fi
+ 	ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
+-	-chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
+ 
+ install-libs: $(DESTDIR)$(libdir)/proftpd
+ 	cd lib/ && $(MAKE) install
+@@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
+ 	$(INSTALL_SBIN) ftpshut  $(DESTDIR)$(sbindir)/ftpshut
+ 	$(INSTALL_BIN)  ftptop   $(DESTDIR)$(bindir)/ftptop
+ 	$(INSTALL_BIN)  ftpwho   $(DESTDIR)$(bindir)/ftpwho
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
++	$(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
+ 
+ install-conf: $(DESTDIR)$(sysconfdir)
+ 	if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
+-		$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
++		$(INSTALL) -m 0644 \
+ 		           $(top_srcdir)/sample-configurations/basic.conf \
+ 	       	           $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
+ 	fi
diff --git a/package/proftpd/patches/patch-locale_Makefile_in b/package/proftpd/patches/patch-locale_Makefile_in
new file mode 100644
index 000000000..91f274ebd
--- /dev/null
+++ b/package/proftpd/patches/patch-locale_Makefile_in
@@ -0,0 +1,11 @@
+	drop anything that has to do with owner/group changing *grrr*
+--- proftpd-1.3.2b.orig/locale/Makefile.in	2009-04-29 00:50:22.000000000 +0200
++++ proftpd-1.3.2b/locale/Makefile.in	2010-01-20 18:03:53.909480484 +0100
+@@ -51,7 +51,6 @@ install: $(LANGS)
+ 		if [ -f $$lang.mo ]; then \
+  			if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \
+ 				mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+-				chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ 				chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ 			fi; \
+ 			$(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \