projects/guix·blob python-team · refs

192 lines · 8.1 KiB

1Remove all references to INSTALLL_USER and INSTALL_GROUP.
2Source: https://github.com/NixOS/nixpkgs/blob/8a7be1eebc03840bceab5c8d30872e0dbd2672af/pkgs/by-name/pr/proftpd/no-install-user.patch
3
4diff --git a/Make.rules.in b/Make.rules.in
5index 2666b2c..bce4b2b 100644
6--- a/Make.rules.in
7+++ b/Make.rules.in
8@@ -30,9 +30,9 @@ INSTALL=@INSTALL@
9 INSTALL_STRIP=@INSTALL_STRIP@
10 INSTALL_USER=@install_user@
11 INSTALL_GROUP=@install_group@
12-INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
13-INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
14-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
15+INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -m 0755
16+INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -m 0755
17+INSTALL_MAN=$(INSTALL) -m 0644
18
19 RM=rm -f
20 SHELL=@CONFIG_SHELL@
21diff --git a/Makefile.in b/Makefile.in
22index 32fd5f3..37c8907 100644
23--- a/Makefile.in
24+++ b/Makefile.in
25@@ -129,7 +129,6 @@ check: proftpd$(EXEEXT)
26 $(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:
27 @if [ ! -d $@ ]; then \
28 mkdir -p $@; \
29- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
30 chmod 0755 $@; \
31 fi
32
33@@ -139,7 +138,6 @@ install-proftpd: $(DESTDIR)$(includedir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(
34 rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
35 fi
36 ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd
37- -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
38
39 install-libs: $(DESTDIR)$(libdir)/proftpd
40 cd lib/ && $(MAKE) install
41@@ -177,11 +175,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
42 $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut
43 $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop
44 $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho
45- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs
46+ $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs
47
48 install-conf: $(DESTDIR)$(sysconfdir)
49 if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
50- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
51+ $(INSTALL) -m 0644 \
52 $(top_srcdir)/sample-configurations/basic.conf \
53 $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
54 fi
55diff --git a/contrib/Makefile.in b/contrib/Makefile.in
56index d1a31af..65d2abc 100644
57--- a/contrib/Makefile.in
58+++ b/contrib/Makefile.in
59@@ -17,6 +17,6 @@ Makefile: Makefile.in ../config.status
60 cd ../ && ./config.status
61
62 install-utils:
63- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd
64- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail
65- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota
66+ $(INSTALL) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd
67+ $(INSTALL) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail
68+ $(INSTALL) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota
69diff --git a/contrib/mod_auth_otp/Makefile.in b/contrib/mod_auth_otp/Makefile.in
70index 4026969..f07914c 100644
71--- a/contrib/mod_auth_otp/Makefile.in
72+++ b/contrib/mod_auth_otp/Makefile.in
73@@ -52,7 +52,6 @@ install: install-headers install-man install-utils
74 $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
75 @if [ ! -d $@ ]; then \
76 mkdir -p $@; \
77- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
78 chmod 0755 $@; \
79 fi
80
81diff --git a/contrib/mod_dnsbl/Makefile.in b/contrib/mod_dnsbl/Makefile.in
82index 4bb54c4..7d70972 100644
83--- a/contrib/mod_dnsbl/Makefile.in
84+++ b/contrib/mod_dnsbl/Makefile.in
85@@ -46,7 +46,6 @@ install: install-headers
86 $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd:
87 @if [ ! -d $@ ]; then \
88 mkdir -p $@; \
89- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
90 chmod 0755 $@; \
91 fi
92
93diff --git a/contrib/mod_load/Makefile.in b/contrib/mod_load/Makefile.in
94index 5ec575e..e7e41cc 100644
95--- a/contrib/mod_load/Makefile.in
96+++ b/contrib/mod_load/Makefile.in
97@@ -47,7 +47,6 @@ install: install-headers
98 $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd:
99 @if [ ! -d $@ ]; then \
100 mkdir -p $@; \
101- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
102 chmod 0755 $@; \
103 fi
104
105diff --git a/contrib/mod_sftp/Makefile.in b/contrib/mod_sftp/Makefile.in
106index 4b8df1f..f7526b9 100644
107--- a/contrib/mod_sftp/Makefile.in
108+++ b/contrib/mod_sftp/Makefile.in
109@@ -65,7 +65,6 @@ install: install-headers install-misc
110 $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd:
111 @if [ ! -d $@ ]; then \
112 mkdir -p $@; \
113- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
114 chmod 0755 $@; \
115 fi
116
117@@ -73,7 +72,6 @@ $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd:
118 $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME):
119 @if [ ! -d $@ ]; then \
120 mkdir -p $@; \
121- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
122 chmod 0755 $@; \
123 fi
124
125@@ -83,8 +81,8 @@ install-headers: $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(includedir)/proftpd
126 $(RM) $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME)/$(MODULE_NAME).h
127
128 install-misc:
129- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem
130- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
131+ $(INSTALL) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem
132+ $(INSTALL) -m 0644 $(top_srcdir)/blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
133
134 clean:
135 $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o
136diff --git a/contrib/mod_snmp/Makefile.in b/contrib/mod_snmp/Makefile.in
137index 7de4c1c..5987896 100644
138--- a/contrib/mod_snmp/Makefile.in
139+++ b/contrib/mod_snmp/Makefile.in
140@@ -45,7 +45,6 @@ install: install-headers install-misc
141 $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd:
142 @if [ ! -d $@ ]; then \
143 mkdir -p $@; \
144- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
145 chmod 0755 $@; \
146 fi
147
148@@ -53,7 +52,7 @@ install-headers: $(DESTDIR)$(includedir)/proftpd
149 $(INSTALL_MAN) $(MODULE_NAME).h $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME).h
150
151 install-misc:
152- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/PROFTPD-MIB.txt $(DESTDIR)$(sysconfdir)/PROFTPD-MIB.txt
153+ $(INSTALL) -m 0644 $(top_srcdir)/PROFTPD-MIB.txt $(DESTDIR)$(sysconfdir)/PROFTPD-MIB.txt
154
155 clean:
156 $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o
157diff --git a/contrib/mod_wrap2/Makefile.in b/contrib/mod_wrap2/Makefile.in
158index 7da015f..d912d23 100644
159--- a/contrib/mod_wrap2/Makefile.in
160+++ b/contrib/mod_wrap2/Makefile.in
161@@ -46,7 +46,6 @@ install: install-headers
162 $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd:
163 @if [ ! -d $@ ]; then \
164 mkdir -p $@; \
165- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
166 chmod 0755 $@; \
167 fi
168
169diff --git a/include/Makefile.in b/include/Makefile.in
170index 1b69d93..b7e8f5a 100644
171--- a/include/Makefile.in
172+++ b/include/Makefile.in
173@@ -24,7 +24,6 @@ Makefile: Makefile.in ../config.status
174 $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd:
175 @if [ ! -d $@ ]; then \
176 mkdir -p $@; \
177- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
178 chmod 0755 $@; \
179 fi
180
181diff --git a/locale/Makefile.in b/locale/Makefile.in
182index 77fd787..1c41c0e 100644
183--- a/locale/Makefile.in
184+++ b/locale/Makefile.in
185@@ -52,7 +52,6 @@ install: $(LANGS)
186 if [ -f $(top_builddir)/locale/$$lang.mo ]; then \
187 if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \
188 mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
189- chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
190 chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
191 fi; \
192 $(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \