summaryrefslogtreecommitdiff
path: root/package/proftpd/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/proftpd/patches')
-rw-r--r--package/proftpd/patches/patch-Make_rules_in16
-rw-r--r--package/proftpd/patches/patch-Makefile_in33
-rw-r--r--package/proftpd/patches/patch-locale_Makefile_in11
-rw-r--r--package/proftpd/patches/patch-modules_mod_auth_unix_c29
4 files changed, 0 insertions, 89 deletions
diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in
deleted file mode 100644
index e305b0c38..000000000
--- a/package/proftpd/patches/patch-Make_rules_in
+++ /dev/null
@@ -1,16 +0,0 @@
- do not try to set user or group id when installing
---- 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@
--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) -m 0755
-+INSTALL_SBIN=$(INSTALL) -m 0755
-+INSTALL_MAN=$(INSTALL) -m 0644
-
- RM=rm -f
- SHELL=@CONFIG_SHELL@
diff --git a/package/proftpd/patches/patch-Makefile_in b/package/proftpd/patches/patch-Makefile_in
deleted file mode 100644
index 0f1bdd799..000000000
--- a/package/proftpd/patches/patch-Makefile_in
+++ /dev/null
@@ -1,33 +0,0 @@
- hiding it won't help, we install as non-root so no chown possible
---- 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
-
-@@ -89,7 +88,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
-@@ -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
-- $(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
deleted file mode 100644
index 91f274ebd..000000000
--- a/package/proftpd/patches/patch-locale_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
- 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; \
diff --git a/package/proftpd/patches/patch-modules_mod_auth_unix_c b/package/proftpd/patches/patch-modules_mod_auth_unix_c
deleted file mode 100644
index a439d6b5a..000000000
--- a/package/proftpd/patches/patch-modules_mod_auth_unix_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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