diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/proftpd/patches | |
parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/proftpd/patches')
-rw-r--r-- | package/proftpd/patches/patch-Make_rules_in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in index 028fd90b3..6f12634fa 100644 --- a/package/proftpd/patches/patch-Make_rules_in +++ b/package/proftpd/patches/patch-Make_rules_in @@ -1,6 +1,6 @@ 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 ++++ proftpd-1.3.2b/Make.rules.in 2010-01-27 23:00:19.000000000 +0100 @@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ INSTALL=@INSTALL@ INSTALL_USER=@install_user@ @@ -8,8 +8,8 @@ -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_BIN=$(INSTALL) -m 0755 ++INSTALL_SBIN=$(INSTALL) -m 0755 +INSTALL_MAN=$(INSTALL) -m 0644 RM=rm -f |