1 |
commit: 4ef6b79ce1ed8862e4d3bc6e04c68242a4b33f7b |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 29 00:25:41 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 29 00:25:41 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef6b79c |
7 |
|
8 |
sys-fs/quota: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/quota/Manifest | 1 - |
14 |
.../quota/files/quota-4.03-default_fpic_fpie.patch | 32 -------- |
15 |
.../files/quota-4.03-distribute_ldap-scripts.patch | 23 ------ |
16 |
.../files/quota-4.03-dont_override_cflags.patch | 22 ------ |
17 |
...a-4.03-explicitely_print_disabled_options.patch | 69 ------------------ |
18 |
.../files/quota-4.03-fix_build_without_ldap.patch | 85 ---------------------- |
19 |
sys-fs/quota/files/quota-4.03-no_rpc.patch | 57 --------------- |
20 |
sys-fs/quota/files/quota-4.03-noldap_linking.patch | 75 ------------------- |
21 |
.../files/quota-4.03-repqouta_F_option_arg.patch | 27 ------- |
22 |
sys-fs/quota/files/quota-4.03-respect_docdir.patch | 21 ------ |
23 |
sys-fs/quota/quota-4.03.ebuild | 83 --------------------- |
24 |
sys-fs/quota/quota-4.04-r1.ebuild | 81 --------------------- |
25 |
12 files changed, 576 deletions(-) |
26 |
|
27 |
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest |
28 |
index a33aab6419d..43911e834b7 100644 |
29 |
--- a/sys-fs/quota/Manifest |
30 |
+++ b/sys-fs/quota/Manifest |
31 |
@@ -1,3 +1,2 @@ |
32 |
-DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727f4ff12e960da3251091b026c1458adecc0ed3a803da3bfcef6c857f612c44c7800ecc53c9ae53450d10338 SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8 |
33 |
DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad |
34 |
DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2 |
35 |
|
36 |
diff --git a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch b/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch |
37 |
deleted file mode 100644 |
38 |
index 2ff519f2b84..00000000000 |
39 |
--- a/sys-fs/quota/files/quota-4.03-default_fpic_fpie.patch |
40 |
+++ /dev/null |
41 |
@@ -1,32 +0,0 @@ |
42 |
-commit cd9dff0b5b53279442458360003831b6c14adc22 |
43 |
-Author: Tomáš Chvátal <tchvatal@××××.com> |
44 |
-Date: Tue Jan 5 11:20:52 2016 +0100 |
45 |
- |
46 |
- Set -fPIC and -pie as default params when building |
47 |
- |
48 |
- Signed-off-by: Tomáš Chvátal <tchvatal@××××.cz> |
49 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
50 |
- |
51 |
-diff --git a/Makefile.am b/Makefile.am |
52 |
-index 7c7a866..77f8400 100644 |
53 |
---- a/Makefile.am |
54 |
-+++ b/Makefile.am |
55 |
-@@ -1,4 +1,5 @@ |
56 |
- ACLOCAL_AMFLAGS = -I m4 |
57 |
-+AM_LDFLAGS = -pie |
58 |
- |
59 |
- BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c |
60 |
- |
61 |
-diff --git a/configure.ac b/configure.ac |
62 |
-index 1552c15..68d5924 100644 |
63 |
---- a/configure.ac |
64 |
-+++ b/configure.ac |
65 |
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [ |
66 |
- # ================ |
67 |
- # Check for cflags |
68 |
- # ================ |
69 |
--CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
70 |
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC" |
71 |
- AC_ARG_ENABLE([werror], |
72 |
- [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], |
73 |
- [enable_werror="$enableval"], |
74 |
|
75 |
diff --git a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch b/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch |
76 |
deleted file mode 100644 |
77 |
index 83339159e0f..00000000000 |
78 |
--- a/sys-fs/quota/files/quota-4.03-distribute_ldap-scripts.patch |
79 |
+++ /dev/null |
80 |
@@ -1,23 +0,0 @@ |
81 |
-commit 861154efb90ed049e0473cc36935b8d03c78a869 |
82 |
-Author: Tomáš Chvátal <tchvatal@××××.com> |
83 |
-Date: Mon Jan 4 13:01:36 2016 +0100 |
84 |
- |
85 |
- Distribute ldap-scripts directory too |
86 |
- |
87 |
- Signed-off-by: Tomáš Chvátal <tchvatal@××××.com> |
88 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
89 |
- |
90 |
-diff --git a/Makefile.am b/Makefile.am |
91 |
-index eb62617..a880ebe 100644 |
92 |
---- a/Makefile.am |
93 |
-+++ b/Makefile.am |
94 |
-@@ -52,7 +52,8 @@ EXTRA_DIST = \ |
95 |
- $(man_MANS) \ |
96 |
- $(rpcsvc_DATA) \ |
97 |
- autogen.sh \ |
98 |
-- Changelog |
99 |
-+ Changelog \ |
100 |
-+ ldap-scripts |
101 |
- |
102 |
- noinst_LIBRARIES = \ |
103 |
- libquota.a \ |
104 |
|
105 |
diff --git a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch b/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch |
106 |
deleted file mode 100644 |
107 |
index e59341a702a..00000000000 |
108 |
--- a/sys-fs/quota/files/quota-4.03-dont_override_cflags.patch |
109 |
+++ /dev/null |
110 |
@@ -1,22 +0,0 @@ |
111 |
-commit 776757a23e9930588950c7fcbc7827ec7a3e51c4 |
112 |
-Author: Tomáš Chvátal <tchvatal@××××.com> |
113 |
-Date: Mon Jan 4 15:48:19 2016 +0100 |
114 |
- |
115 |
- Do not accidentaly override commandline passed CFLAGS. |
116 |
- |
117 |
- Signed-off-by: Tomáš Chvátal <tchvatal@××××.com> |
118 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
119 |
- |
120 |
-diff --git a/configure.ac b/configure.ac |
121 |
-index 3ba1386..1552c15 100644 |
122 |
---- a/configure.ac |
123 |
-+++ b/configure.ac |
124 |
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [ |
125 |
- # ================ |
126 |
- # Check for cflags |
127 |
- # ================ |
128 |
--CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
129 |
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
130 |
- AC_ARG_ENABLE([werror], |
131 |
- [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], |
132 |
- [enable_werror="$enableval"], |
133 |
|
134 |
diff --git a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch b/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch |
135 |
deleted file mode 100644 |
136 |
index 29627c03ab3..00000000000 |
137 |
--- a/sys-fs/quota/files/quota-4.03-explicitely_print_disabled_options.patch |
138 |
+++ /dev/null |
139 |
@@ -1,69 +0,0 @@ |
140 |
-commit 6ccb66159a9eee6ca114b11b70eb06f4ac6900d7 |
141 |
-Author: Jan Kara <jack@××××.cz> |
142 |
-Date: Mon Jan 4 15:36:27 2016 +0100 |
143 |
- |
144 |
- Print explicitely disabled options properly |
145 |
- |
146 |
- Currently we printed only an empty string when some build option was |
147 |
- disabled explicitely via --disable-foo. Print 'no' in that case as well. |
148 |
- |
149 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
150 |
- |
151 |
-diff --git a/configure.ac b/configure.ac |
152 |
-index 39631c4..3ba1386 100644 |
153 |
---- a/configure.ac |
154 |
-+++ b/configure.ac |
155 |
-@@ -74,7 +74,7 @@ AC_ARG_ENABLE([ldapmail], |
156 |
- AS_IF([test "x$enable_ldapmail" != "xno"], [ |
157 |
- build_ldap="yes" |
158 |
- AC_CHECK_LIB([ldap], [ldap_initialize], [], [ |
159 |
-- build_ldap=no |
160 |
-+ build_ldap="no" |
161 |
- AS_IF([test "x$enable_ldapmail" = "xyes"], [ |
162 |
- AC_MSG_ERROR([LDAP support required but library not found.]); |
163 |
- ]) |
164 |
-@@ -84,6 +84,8 @@ AS_IF([test "x$enable_ldapmail" != "xno"], [ |
165 |
- AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP]) |
166 |
- COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP" |
167 |
- ]) |
168 |
-+], [ |
169 |
-+ build_ldap="no" |
170 |
- ]) |
171 |
- AC_SUBST(LDAP_LIBS) |
172 |
- |
173 |
-@@ -113,6 +115,8 @@ AS_IF([test "x$enable_ext2direct" != "xno"], [ |
174 |
- AC_DEFINE([EXT2_DIRECT], 1, [Scanning of ext? filesystems using e2fslib]) |
175 |
- COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT" |
176 |
- ]) |
177 |
-+], [ |
178 |
-+ build_ext2direct="no" |
179 |
- ]) |
180 |
- AC_SUBST(EXT2FS_CFLAGS) |
181 |
- AC_SUBST(EXT2FS_LIBS) |
182 |
-@@ -141,6 +145,8 @@ AS_IF([test "x$enable_netlink" != "xno"], [ |
183 |
- AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.]) |
184 |
- ]) |
185 |
- ]) |
186 |
-+], [ |
187 |
-+ build_netlink="no" |
188 |
- ]) |
189 |
- AM_CONDITIONAL([WITH_NETLINK], [test "x$build_netlink" != "xno"]) |
190 |
- AC_SUBST(DBUS_CFLAGS) |
191 |
-@@ -171,6 +177,8 @@ AS_IF([test "x$enable_libwrap" != "xno"], [ |
192 |
- AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad]) |
193 |
- COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS" |
194 |
- ]) |
195 |
-+], [ |
196 |
-+ build_libwrap="no" |
197 |
- ]) |
198 |
- AC_SUBST(WRAP_LIBS) |
199 |
- |
200 |
-@@ -199,6 +207,8 @@ AS_IF([test x"$enable_rpc" != "xno"], [ |
201 |
- AC_DEFINE([RPC], 1, [Support for RPC]) |
202 |
- COMPILE_OPTS="$COMPILE_OPTS RPC" |
203 |
- ]) |
204 |
-+], [ |
205 |
-+ build_rpc="no" |
206 |
- ]) |
207 |
- AM_CONDITIONAL([WITH_RPC], [test x"$build_rpc" != "xno"]) |
208 |
- |
209 |
|
210 |
diff --git a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch b/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch |
211 |
deleted file mode 100644 |
212 |
index ba838bfe283..00000000000 |
213 |
--- a/sys-fs/quota/files/quota-4.03-fix_build_without_ldap.patch |
214 |
+++ /dev/null |
215 |
@@ -1,85 +0,0 @@ |
216 |
-commit 39fd30ce57e3c34c3649866bf9345a71f0b78667 |
217 |
-Author: Jan Kara <jack@××××.cz> |
218 |
-Date: Mon Jan 4 15:10:53 2016 +0100 |
219 |
- |
220 |
- Fix build with disabled ldap |
221 |
- |
222 |
- Reported-by: Tomas Chvatal <tchvatal@××××.com> |
223 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
224 |
- |
225 |
-diff --git a/warnquota.c b/warnquota.c |
226 |
-index 3734f0e..e9868c1 100644 |
227 |
---- a/warnquota.c |
228 |
-+++ b/warnquota.c |
229 |
-@@ -109,13 +109,13 @@ struct configparams { |
230 |
- char *user_signature; |
231 |
- char *group_message; |
232 |
- char *group_signature; |
233 |
-+ time_t cc_before; |
234 |
-+#ifdef USE_LDAP_MAIL_LOOKUP |
235 |
- int use_ldap_mail; /* 0 */ |
236 |
-+ int ldap_is_setup; /* 0 */ |
237 |
- int ldap_starttls; /* 0 */ |
238 |
- int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */ |
239 |
- int ldap_vers; /* LDAP_VERSION3 */ |
240 |
-- time_t cc_before; |
241 |
--#ifdef USE_LDAP_MAIL_LOOKUP |
242 |
-- int ldap_is_setup; /* 0 */ |
243 |
- char ldap_host[CNF_BUFFER]; |
244 |
- int ldap_port; |
245 |
- char ldap_uri[CNF_BUFFER]; |
246 |
-@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config) |
247 |
- } |
248 |
- maildev[0] = 0; |
249 |
- config->user_signature = config->user_message = config->group_signature = config->group_message = NULL; |
250 |
-+ config->cc_before = -1; |
251 |
-+ |
252 |
-+#ifdef USE_LDAP_MAIL_LOOKUP |
253 |
- config->use_ldap_mail = 0; |
254 |
- config->ldap_starttls = 0; |
255 |
- config->ldap_tls = LDAP_OPT_X_TLS_NEVER; |
256 |
- config->ldap_vers = LDAP_VERSION3; |
257 |
-- config->cc_before = -1; |
258 |
-- |
259 |
--#ifdef USE_LDAP_MAIL_LOOKUP |
260 |
- config->ldap_port = config->ldap_is_setup = 0; |
261 |
- config->ldap_host[0] = 0; |
262 |
- config->ldap_uri[0] = 0; |
263 |
-@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config) |
264 |
- create_eoln(config->group_signature); |
265 |
- verify_format(config->group_signature, "GROUP_SIGNATURE"); |
266 |
- } |
267 |
-+ else if (!strcmp(var, "CC_BEFORE")) { |
268 |
-+ int num; |
269 |
-+ char unit[10]; |
270 |
-+ |
271 |
-+ if (sscanf(value, "%d%s", &num, unit) != 2) |
272 |
-+ goto cc_parse_err; |
273 |
-+ if (str2timeunits(num, unit, &config->cc_before) < 0) { |
274 |
-+cc_parse_err: |
275 |
-+ die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); |
276 |
-+ } |
277 |
-+ } |
278 |
-+#ifdef USE_LDAP_MAIL_LOOKUP |
279 |
- else if (!strcmp(var, "LDAP_MAIL")) { |
280 |
- if(strcasecmp(value, "true") == 0) |
281 |
- config->use_ldap_mail = 1; |
282 |
-@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config) |
283 |
- else |
284 |
- config->ldap_starttls = 0; |
285 |
- } |
286 |
-- else if (!strcmp(var, "CC_BEFORE")) { |
287 |
-- int num; |
288 |
-- char unit[10]; |
289 |
-- |
290 |
-- if (sscanf(value, "%d%s", &num, unit) != 2) |
291 |
-- goto cc_parse_err; |
292 |
-- if (str2timeunits(num, unit, &config->cc_before) < 0) { |
293 |
--cc_parse_err: |
294 |
-- die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); |
295 |
-- } |
296 |
-- } |
297 |
--#ifdef USE_LDAP_MAIL_LOOKUP |
298 |
- else if (!strcmp(var, "LDAP_HOST")) |
299 |
- sstrncpy(config->ldap_host, value, CNF_BUFFER); |
300 |
- else if (!strcmp(var, "LDAP_PORT")) |
301 |
|
302 |
diff --git a/sys-fs/quota/files/quota-4.03-no_rpc.patch b/sys-fs/quota/files/quota-4.03-no_rpc.patch |
303 |
deleted file mode 100644 |
304 |
index c4f5007fca5..00000000000 |
305 |
--- a/sys-fs/quota/files/quota-4.03-no_rpc.patch |
306 |
+++ /dev/null |
307 |
@@ -1,57 +0,0 @@ |
308 |
-From 07ec5c783ac16ed20735d6cb8ab167833f5877ee Mon Sep 17 00:00:00 2001 |
309 |
-From: Lars Wendler <polynomial-c@g.o> |
310 |
-Date: Mon, 15 Feb 2016 14:36:28 +0100 |
311 |
-Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested. |
312 |
- |
313 |
-This fixes a buch of undefined references: |
314 |
- |
315 |
-x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa |
316 |
-ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st |
317 |
-yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_ |
318 |
-svc.o svc_socket.o libquota.a |
319 |
-rquota_svc.o: In function `rquotaprog_2': |
320 |
-rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt' |
321 |
-rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args' |
322 |
-rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt' |
323 |
-rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args' |
324 |
-rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt' |
325 |
-rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args' |
326 |
-rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt' |
327 |
-rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args' |
328 |
-rquota_svc.o: In function `rquotaprog_1': |
329 |
-rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt' |
330 |
-rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args' |
331 |
-rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt' |
332 |
-rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args' |
333 |
-rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt' |
334 |
-rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args' |
335 |
-rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt' |
336 |
-rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args' |
337 |
-collect2: error: ld returned 1 exit status |
338 |
-Makefile:901: recipe for target 'rpc.rquotad' failed |
339 |
- |
340 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
341 |
---- |
342 |
- Makefile.am | 5 ++++- |
343 |
- 1 file changed, 4 insertions(+), 1 deletion(-) |
344 |
- |
345 |
-diff --git a/Makefile.am b/Makefile.am |
346 |
-index 77f8400..6d7ea0e 100644 |
347 |
---- a/Makefile.am |
348 |
-+++ b/Makefile.am |
349 |
-@@ -116,8 +116,11 @@ sbin_PROGRAMS = \ |
350 |
- xqmstats \ |
351 |
- edquota \ |
352 |
- setquota \ |
353 |
-- convertquota \ |
354 |
-+ convertquota |
355 |
-+if WITH_RPC |
356 |
-+sbin_PROGRAMS += \ |
357 |
- rpc.rquotad |
358 |
-+endif |
359 |
- if WITH_NETLINK |
360 |
- sbin_PROGRAMS += \ |
361 |
- quota_nld |
362 |
--- |
363 |
-2.7.1 |
364 |
- |
365 |
|
366 |
diff --git a/sys-fs/quota/files/quota-4.03-noldap_linking.patch b/sys-fs/quota/files/quota-4.03-noldap_linking.patch |
367 |
deleted file mode 100644 |
368 |
index dbaca69bb7d..00000000000 |
369 |
--- a/sys-fs/quota/files/quota-4.03-noldap_linking.patch |
370 |
+++ /dev/null |
371 |
@@ -1,75 +0,0 @@ |
372 |
-commit 1d9542df5d2ae5c21a1e96d100f899b3d7b2f27c |
373 |
-Author: Jan Kara <jack@××××.cz> |
374 |
-Date: Tue Jan 19 11:40:15 2016 +0100 |
375 |
- |
376 |
- Don't link all binaries with ldap library |
377 |
- |
378 |
- The default action-if-found of AC_CHECK_LIB() is to append checked |
379 |
- library to LIBS. Thus check for ldap library resulted in unwanted |
380 |
- addition of -lldap to LIBS as [] is an empty string in M4 and the |
381 |
- default action is used. |
382 |
- |
383 |
- Fix the problem by providing proper action-if-found which was currently |
384 |
- just hidden behind the check. Also do similar cleanup for |
385 |
- AC_CHECK_HEADER check although there it didn't have any undesired |
386 |
- side-effect. |
387 |
- |
388 |
- Reported-by: Petr Písař <petrp@××××××××.net> |
389 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
390 |
- |
391 |
-diff --git a/configure.ac b/configure.ac |
392 |
-index 68d5924..d17b18c 100644 |
393 |
---- a/configure.ac |
394 |
-+++ b/configure.ac |
395 |
-@@ -72,18 +72,17 @@ AC_ARG_ENABLE([ldapmail], |
396 |
- [enable_ldapmail=auto] |
397 |
- ) |
398 |
- AS_IF([test "x$enable_ldapmail" != "xno"], [ |
399 |
-- build_ldap="yes" |
400 |
-- AC_CHECK_LIB([ldap], [ldap_initialize], [], [ |
401 |
-+ AC_CHECK_LIB([ldap], [ldap_initialize], [ |
402 |
-+ build_ldap="yes" |
403 |
-+ LDAP_LIBS="-lldap -llber" |
404 |
-+ AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP]) |
405 |
-+ COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP" |
406 |
-+ ], [ |
407 |
- build_ldap="no" |
408 |
- AS_IF([test "x$enable_ldapmail" = "xyes"], [ |
409 |
- AC_MSG_ERROR([LDAP support required but library not found.]); |
410 |
- ]) |
411 |
- ]) |
412 |
-- AS_IF([test "x$build_ldap" = "xyes"], [ |
413 |
-- LDAP_LIBS="-lldap -llber" |
414 |
-- AC_DEFINE([USE_LDAP_MAIL_LOOKUP], 1, [Lookup email address using LDAP]) |
415 |
-- COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP" |
416 |
-- ]) |
417 |
- ], [ |
418 |
- build_ldap="no" |
419 |
- ]) |
420 |
-@@ -163,8 +162,12 @@ AC_ARG_ENABLE([libwrap], |
421 |
- [enable_libwrap=auto] |
422 |
- ) |
423 |
- AS_IF([test "x$enable_libwrap" != "xno"], [ |
424 |
-- build_libwrap="yes" |
425 |
-- AC_CHECK_HEADER([tcpd.h],[], [ |
426 |
-+ AC_CHECK_HEADER([tcpd.h], [ |
427 |
-+ build_libwrap="yes" |
428 |
-+ WRAP_LIBS="-lwrap" |
429 |
-+ AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad]) |
430 |
-+ COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS" |
431 |
-+ ], [ |
432 |
- build_libwrap="no" |
433 |
- AS_IF([test "x$enable_libwrap" = "xyes"] , [ |
434 |
- AC_MSG_ERROR([tcpd.h not found and requested]) |
435 |
-@@ -172,11 +175,6 @@ AS_IF([test "x$enable_libwrap" != "xno"], [ |
436 |
- AC_MSG_WARN([tcpd.h not found]) |
437 |
- ]) |
438 |
- ]) |
439 |
-- AS_IF([test "x$build_libwrap" != "xno"], [ |
440 |
-- WRAP_LIBS="-lwrap" |
441 |
-- AC_DEFINE([HOSTS_ACCESS], 1, [Use hosts.allow and hosts.deny for access checking of rpc.rquotad]) |
442 |
-- COMPILE_OPTS="$COMPILE_OPTS HOSTS_ACCESS" |
443 |
-- ]) |
444 |
- ], [ |
445 |
- build_libwrap="no" |
446 |
- ]) |
447 |
|
448 |
diff --git a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch b/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch |
449 |
deleted file mode 100644 |
450 |
index d4fffd4f03f..00000000000 |
451 |
--- a/sys-fs/quota/files/quota-4.03-repqouta_F_option_arg.patch |
452 |
+++ /dev/null |
453 |
@@ -1,27 +0,0 @@ |
454 |
-commit ab2bf5b51a1ca14cef63e8a7a88b039f173a210a |
455 |
-Author: Eric Sandeen <sandeen@××××××.com> |
456 |
-Date: Mon Jan 18 20:11:01 2016 -0600 |
457 |
- |
458 |
- repquota: -F option takes an arg |
459 |
- |
460 |
- Commit a5876145 added a new -O option which takes an |
461 |
- argument, but in the process lost the argument specifier |
462 |
- for "F". As a result, the use of "-F" segfaults when NULL |
463 |
- is sent to name2fmt() instead of the provided argument. |
464 |
- |
465 |
- Signed-off-by: Eric Sandeen <sandeen@××××××.com> |
466 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
467 |
- |
468 |
-diff --git a/repquota.c b/repquota.c |
469 |
-index 744af70..6fe9f0c 100644 |
470 |
---- a/repquota.c |
471 |
-+++ b/repquota.c |
472 |
-@@ -90,7 +90,7 @@ static void parse_options(int argcnt, char **argstr) |
473 |
- { NULL, 0, NULL, 0 } |
474 |
- }; |
475 |
- |
476 |
-- while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiFO:", long_opts, NULL)) != -1) { |
477 |
-+ while ((ret = getopt_long(argcnt, argstr, "VavughtspncCiF:O:", long_opts, NULL)) != -1) { |
478 |
- switch (ret) { |
479 |
- case '?': |
480 |
- case 'h': |
481 |
|
482 |
diff --git a/sys-fs/quota/files/quota-4.03-respect_docdir.patch b/sys-fs/quota/files/quota-4.03-respect_docdir.patch |
483 |
deleted file mode 100644 |
484 |
index 214b3ad1f17..00000000000 |
485 |
--- a/sys-fs/quota/files/quota-4.03-respect_docdir.patch |
486 |
+++ /dev/null |
487 |
@@ -1,21 +0,0 @@ |
488 |
-commit cac9a60c29106763cc6abd6f372f25f97d4122a3 |
489 |
-Author: Tomáš Chvátal <tchvatal@××××.com> |
490 |
-Date: Mon Jan 4 15:26:36 2016 +0100 |
491 |
- |
492 |
- Respect the docdir declaration and do not override. |
493 |
- |
494 |
- Signed-off-by: Tomáš Chvátal <tchvatal@××××.com> |
495 |
- Signed-off-by: Jan Kara <jack@××××.cz> |
496 |
- |
497 |
-diff --git a/Makefile.am b/Makefile.am |
498 |
-index a880ebe..7c7a866 100644 |
499 |
---- a/Makefile.am |
500 |
-+++ b/Makefile.am |
501 |
-@@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 |
502 |
- |
503 |
- BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c |
504 |
- |
505 |
--docdir = $(datadir)/doc/@PACKAGE@ |
506 |
- doc_DATA = \ |
507 |
- README.mailserver \ |
508 |
- README.ldap-support \ |
509 |
|
510 |
diff --git a/sys-fs/quota/quota-4.03.ebuild b/sys-fs/quota/quota-4.03.ebuild |
511 |
deleted file mode 100644 |
512 |
index 2bab377c69b..00000000000 |
513 |
--- a/sys-fs/quota/quota-4.03.ebuild |
514 |
+++ /dev/null |
515 |
@@ -1,83 +0,0 @@ |
516 |
-# Copyright 1999-2018 Gentoo Foundation |
517 |
-# Distributed under the terms of the GNU General Public License v2 |
518 |
- |
519 |
-EAPI=5 |
520 |
- |
521 |
-inherit autotools eutils |
522 |
- |
523 |
-DESCRIPTION="Linux quota tools" |
524 |
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/" |
525 |
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz" |
526 |
- |
527 |
-LICENSE="GPL-2" |
528 |
-SLOT="0" |
529 |
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86" |
530 |
-IUSE="ldap netlink nls rpc tcpd" |
531 |
- |
532 |
-RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 ) |
533 |
- netlink? ( |
534 |
- sys-apps/dbus |
535 |
- dev-libs/libnl:3 |
536 |
- ) |
537 |
- rpc? ( net-nds/rpcbind ) |
538 |
- tcpd? ( sys-apps/tcp-wrappers )" |
539 |
-DEPEND="${RDEPEND} |
540 |
- nls? ( sys-devel/gettext )" |
541 |
- |
542 |
-PATCHES=( |
543 |
- # Patches from upstream |
544 |
- "${FILESDIR}/${P}-fix_build_without_ldap.patch" |
545 |
- "${FILESDIR}/${P}-distribute_ldap-scripts.patch" |
546 |
- "${FILESDIR}/${P}-explicitely_print_disabled_options.patch" |
547 |
- "${FILESDIR}/${P}-respect_docdir.patch" |
548 |
- "${FILESDIR}/${P}-dont_override_cflags.patch" |
549 |
- "${FILESDIR}/${P}-default_fpic_fpie.patch" |
550 |
- "${FILESDIR}/${P}-repqouta_F_option_arg.patch" |
551 |
- "${FILESDIR}/${P}-noldap_linking.patch" |
552 |
- |
553 |
- # Patches not (yet) upstreamed |
554 |
- "${FILESDIR}/${P}-no_rpc.patch" |
555 |
-) |
556 |
- |
557 |
-src_prepare() { |
558 |
- epatch "${PATCHES[@]}" |
559 |
- |
560 |
- eautoreconf |
561 |
-} |
562 |
- |
563 |
-src_configure() { |
564 |
- econf \ |
565 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
566 |
- $(use_enable nls) \ |
567 |
- $(use_enable ldap ldapmail) \ |
568 |
- $(use_enable netlink) \ |
569 |
- $(use_enable rpc) \ |
570 |
- $(use_enable rpc rpcsetquota) |
571 |
-} |
572 |
- |
573 |
-src_install() { |
574 |
- emake DESTDIR="${D}" install |
575 |
- dodoc doc/* README.* Changelog |
576 |
- rm -r "${ED}"/usr/include || die #70938 |
577 |
- |
578 |
- insinto /etc |
579 |
- insopts -m0644 |
580 |
- doins warnquota.conf quotatab |
581 |
- |
582 |
- newinitd "${FILESDIR}"/quota.rc7 quota |
583 |
- newconfd "${FILESDIR}"/quota.confd quota |
584 |
- |
585 |
- if use rpc ; then |
586 |
- newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad |
587 |
- fi |
588 |
- |
589 |
- if use ldap ; then |
590 |
- insinto /etc/openldap/schema |
591 |
- insopts -m0644 |
592 |
- doins "${FILESDIR}"/ldap-scripts/quota.schema |
593 |
- |
594 |
- exeinto /usr/share/quota/ldap-scripts |
595 |
- doexe "${FILESDIR}"/ldap-scripts/*.pl |
596 |
- doexe "${FILESDIR}"/ldap-scripts/edquota_editor |
597 |
- fi |
598 |
-} |
599 |
|
600 |
diff --git a/sys-fs/quota/quota-4.04-r1.ebuild b/sys-fs/quota/quota-4.04-r1.ebuild |
601 |
deleted file mode 100644 |
602 |
index 9b5fdbca442..00000000000 |
603 |
--- a/sys-fs/quota/quota-4.04-r1.ebuild |
604 |
+++ /dev/null |
605 |
@@ -1,81 +0,0 @@ |
606 |
-# Copyright 1999-2018 Gentoo Foundation |
607 |
-# Distributed under the terms of the GNU General Public License v2 |
608 |
- |
609 |
-EAPI=6 |
610 |
- |
611 |
-inherit autotools |
612 |
- |
613 |
-DESCRIPTION="Linux quota tools" |
614 |
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/" |
615 |
-SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz" |
616 |
- |
617 |
-LICENSE="GPL-2" |
618 |
-SLOT="0" |
619 |
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86" |
620 |
-IUSE="ldap netlink nls rpc tcpd" |
621 |
- |
622 |
-RDEPEND=" |
623 |
- ldap? ( >=net-nds/openldap-2.3.35 ) |
624 |
- netlink? ( |
625 |
- sys-apps/dbus |
626 |
- dev-libs/libnl:3 |
627 |
- ) |
628 |
- rpc? ( |
629 |
- net-nds/rpcbind |
630 |
- elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) |
631 |
- net-libs/libtirpc |
632 |
- net-libs/rpcsvc-proto |
633 |
- ) |
634 |
- tcpd? ( sys-apps/tcp-wrappers ) |
635 |
-" |
636 |
-DEPEND=" |
637 |
- ${RDEPEND} |
638 |
- nls? ( sys-devel/gettext ) |
639 |
-" |
640 |
- |
641 |
-PATCHES=( |
642 |
- "${FILESDIR}/${P}-glibc226.patch" |
643 |
-) |
644 |
- |
645 |
-src_prepare() { |
646 |
- default |
647 |
- eautoreconf |
648 |
-} |
649 |
- |
650 |
-src_configure() { |
651 |
- local myeconfargs=( |
652 |
- --docdir="${EPREFIX%/}/usr/share/doc/${PF}" |
653 |
- $(use_enable nls) |
654 |
- $(use_enable ldap ldapmail) |
655 |
- $(use_enable netlink) |
656 |
- $(use_enable rpc) |
657 |
- $(use_enable rpc rpcsetquota) |
658 |
- ) |
659 |
- econf "${myeconfargs[@]}" |
660 |
-} |
661 |
- |
662 |
-src_install() { |
663 |
- emake DESTDIR="${D}" install |
664 |
- dodoc doc/* README.* Changelog |
665 |
- |
666 |
- insinto /etc |
667 |
- insopts -m0644 |
668 |
- doins warnquota.conf quotatab |
669 |
- |
670 |
- newinitd "${FILESDIR}"/quota.rc7 quota |
671 |
- newconfd "${FILESDIR}"/quota.confd quota |
672 |
- |
673 |
- if use rpc ; then |
674 |
- newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad |
675 |
- fi |
676 |
- |
677 |
- if use ldap ; then |
678 |
- insinto /etc/openldap/schema |
679 |
- insopts -m0644 |
680 |
- doins "${FILESDIR}"/ldap-scripts/quota.schema |
681 |
- |
682 |
- exeinto /usr/share/quota/ldap-scripts |
683 |
- doexe "${FILESDIR}"/ldap-scripts/*.pl |
684 |
- doexe "${FILESDIR}"/ldap-scripts/edquota_editor |
685 |
- fi |
686 |
-} |