summaryrefslogtreecommitdiff
path: root/package/proftpd
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-02 00:19:51 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-02 00:19:51 +0200
commitb515254a71f42650a17b99586647da92395d393b (patch)
tree970d33fbe0b282719a686764547f203ac35f3d5f /package/proftpd
parent3e3e46cbe4e9e03518321e5e05834b27717ced2a (diff)
update to latest upstream and fix Cygwin cross-compile
Diffstat (limited to 'package/proftpd')
-rw-r--r--package/proftpd/Makefile4
-rw-r--r--package/proftpd/patches/patch-Make_rules_in8
-rw-r--r--package/proftpd/patches/patch-Makefile_in12
-rw-r--r--package/proftpd/patches/patch-modules_mod_auth_unix_c29
4 files changed, 41 insertions, 12 deletions
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index d74ff9e35..840cde048 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= proftpd
-PKG_VERSION:= 1.3.2b
+PKG_VERSION:= 1.3.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 4918908fcae9e591ba84c66edff73410
+PKG_MD5SUM:= 97ad29f31f4fe633a9f8d021bab2df20
PKG_DESCR:= An advanced and very configurable FTP server
PKG_SECTION:= utils
PKG_NOPARALLEL:= 1
diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in
index 6f12634fa..e305b0c38 100644
--- a/package/proftpd/patches/patch-Make_rules_in
+++ b/package/proftpd/patches/patch-Make_rules_in
@@ -1,7 +1,7 @@
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-27 23:00:19.000000000 +0100
-@@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
+--- proftpd-1.3.3.orig/Make.rules.in 2009-11-18 22:48:25.000000000 +0100
++++ proftpd-1.3.3/Make.rules.in 2010-05-30 12:47:38.265625000 +0200
+@@ -28,9 +28,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
INSTALL=@INSTALL@
INSTALL_USER=@install_user@
INSTALL_GROUP=@install_group@
@@ -13,4 +13,4 @@
+INSTALL_MAN=$(INSTALL) -m 0644
RM=rm -f
- SHELL=/bin/sh
+ SHELL=@CONFIG_SHELL@
diff --git a/package/proftpd/patches/patch-Makefile_in b/package/proftpd/patches/patch-Makefile_in
index 338a3b691..0f1bdd799 100644
--- a/package/proftpd/patches/patch-Makefile_in
+++ b/package/proftpd/patches/patch-Makefile_in
@@ -1,15 +1,15 @@
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:
+--- proftpd-1.3.3.orig/Makefile.in 2009-12-16 00:24:42.000000000 +0100
++++ proftpd-1.3.3/Makefile.in 2010-05-30 12:47:41.187500000 +0200
+@@ -79,7 +79,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)$(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
+@@ -89,7 +88,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
fi
ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
@@ -17,7 +17,7 @@
install-libs: $(DESTDIR)$(libdir)/proftpd
cd lib/ && $(MAKE) install
-@@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
+@@ -125,11 +123,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
$(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut
$(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop
$(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho
diff --git a/package/proftpd/patches/patch-modules_mod_auth_unix_c b/package/proftpd/patches/patch-modules_mod_auth_unix_c
new file mode 100644
index 000000000..a439d6b5a
--- /dev/null
+++ b/package/proftpd/patches/patch-modules_mod_auth_unix_c
@@ -0,0 +1,29 @@
+--- proftpd-1.3.3.orig/modules/mod_auth_unix.c 2009-10-14 20:49:31.000000000 +0200
++++ proftpd-1.3.3/modules/mod_auth_unix.c 2010-05-30 13:02:15.515625000 +0200
+@@ -77,6 +77,7 @@
+ # endif
+ #endif /* PR_USE_SIA */
+
++/*
+ #ifdef CYGWIN
+ typedef void *HANDLE;
+ typedef unsigned long DWORD;
+@@ -85,7 +86,8 @@ typedef unsigned long DWORD;
+ DWORD WINAPI GetVersion(void);
+ extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
+ extern void cygwin_set_impersonation_token (const HANDLE);
+-#endif /* CYGWIN */
++#endif
++*/
+
+ #ifdef SETGRENT_VOID
+ # define RETSETGRENTTYPE void
+@@ -738,7 +740,7 @@ MODRET pw_check(cmd_rec *cmd) {
+
+ #else /* !PR_USE_SIA */
+
+-# ifdef CYGWIN
++# if 0
+ /* We have to do special Windows NT voodoo with Cygwin in order to be
+ * able to switch UID/GID. More info at
+ * http://cygwin.com/cygwin-ug-net/ntsec.html#NTSEC-SETUID