1 |
commit: b766b3df55a0c3c9221f5a2e5f86cfd19c6de029 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 3 12:33:48 2019 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 3 12:35:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b766b3df |
7 |
|
8 |
net-proxy/squid: Drop old |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
net-proxy/squid/Manifest | 2 - |
14 |
net-proxy/squid/files/squid-2018-1.patch | 28 -- |
15 |
net-proxy/squid/files/squid-2018-2.patch | 23 -- |
16 |
net-proxy/squid/files/squid-3.5.7-gentoo.patch | 100 ------ |
17 |
net-proxy/squid/files/squid-cppunit-1.14.patch | 417 ------------------------- |
18 |
net-proxy/squid/files/squid.confd-r1 | 12 - |
19 |
net-proxy/squid/files/squid.initd-r4 | 117 ------- |
20 |
net-proxy/squid/squid-3.5.27-r1.ebuild | 270 ---------------- |
21 |
net-proxy/squid/squid-3.5.28.ebuild | 267 ---------------- |
22 |
9 files changed, 1236 deletions(-) |
23 |
|
24 |
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest |
25 |
index ec29169dcdf..a01c50e0163 100644 |
26 |
--- a/net-proxy/squid/Manifest |
27 |
+++ b/net-proxy/squid/Manifest |
28 |
@@ -1,3 +1 @@ |
29 |
-DIST squid-3.5.27.tar.xz 2303468 BLAKE2B 448dbb703469bdd38a0e88da8e473510e9652fc7c7ae2e48bf687a4c2e1698f3baa92c212631fd3734ee51bead89980d31af58d64654418a7c4c4a16e1be751e SHA512 4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817 |
30 |
-DIST squid-3.5.28.tar.xz 2304680 BLAKE2B 9b41a191210ea441ebd2847e9dc2cfacf3ba9fa8ceb81513b4cb449b13f7e81d28e3f3c9c46003db6d3d8a936fbd2275e42e18c23bd9d7667b9bd6890a1627a8 SHA512 da8367d364725c7fd6330e7588b0ff70d32978a17ca0bc5fe58fa6d12c9d2adb42ade0a492c835761bc7fd67c1a55300b4b7402ad939cf2a2aa5104233bbb74b |
31 |
DIST squid-4.6.tar.xz 2439792 BLAKE2B 1344acfd4ba135d5ec6881612614f735c6e4791f9b15dcc2f572b93e7f7c9e39585aa0b30aef5b09e40a9599e7fe7d3a118f878adac8f272b014ac3d65a83fae SHA512 dbe2b02b83d53d67459e22a19e71cbf99b66d74a2ddc4bc69310f03a0a6092e5840766ad699fc43893516e97ef89799ef2147dd40f76b0bd688c1e271fd20d06 |
32 |
|
33 |
diff --git a/net-proxy/squid/files/squid-2018-1.patch b/net-proxy/squid/files/squid-2018-1.patch |
34 |
deleted file mode 100644 |
35 |
index 9392219a9ed..00000000000 |
36 |
--- a/net-proxy/squid/files/squid-2018-1.patch |
37 |
+++ /dev/null |
38 |
@@ -1,28 +0,0 @@ |
39 |
-commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5) |
40 |
-Author: Amos Jeffries <yadij@××××××××××××××××××××.com> |
41 |
-Date: 2018-01-19 13:54:14 +1300 |
42 |
- |
43 |
- ESI: make sure endofName never exceeds tagEnd (#130) |
44 |
- |
45 |
-diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc |
46 |
-index d86d2d3..db634d9 100644 |
47 |
---- a/src/esi/CustomParser.cc |
48 |
-+++ b/src/esi/CustomParser.cc |
49 |
-@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool |
50 |
- |
51 |
- char * endofName = strpbrk(const_cast<char *>(tag), w_space); |
52 |
- |
53 |
-- if (endofName > tagEnd) |
54 |
-+ if (!endofName || endofName > tagEnd) |
55 |
- endofName = const_cast<char *>(tagEnd); |
56 |
- |
57 |
- *endofName = '\0'; |
58 |
-@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool |
59 |
- |
60 |
- char * endofName = strpbrk(const_cast<char *>(tag), w_space); |
61 |
- |
62 |
-- if (endofName > tagEnd) |
63 |
-+ if (!endofName || endofName > tagEnd) |
64 |
- endofName = const_cast<char *>(tagEnd); |
65 |
- |
66 |
- *endofName = '\0'; |
67 |
|
68 |
diff --git a/net-proxy/squid/files/squid-2018-2.patch b/net-proxy/squid/files/squid-2018-2.patch |
69 |
deleted file mode 100644 |
70 |
index 9ecd8a5b7cb..00000000000 |
71 |
--- a/net-proxy/squid/files/squid-2018-2.patch |
72 |
+++ /dev/null |
73 |
@@ -1,23 +0,0 @@ |
74 |
-commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5) |
75 |
-Author: squidadm <squidadm@××××××××××××××××××××.com> |
76 |
-Date: 2018-01-21 08:07:08 +1300 |
77 |
- |
78 |
- Fix indirect IP logging for transactions without a client connection (#129) (#136) |
79 |
- |
80 |
-diff --git a/src/client_side_request.cc b/src/client_side_request.cc |
81 |
-index be124f3..203f89d 100644 |
82 |
---- a/src/client_side_request.cc |
83 |
-+++ b/src/client_side_request.cc |
84 |
-@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data) |
85 |
- * Ensure that the access log shows the indirect client |
86 |
- * instead of the direct client. |
87 |
- */ |
88 |
-- ConnStateData *conn = http->getConn(); |
89 |
-- conn->log_addr = request->indirect_client_addr; |
90 |
-- http->al->cache.caddr = conn->log_addr; |
91 |
-+ http->al->cache.caddr = request->indirect_client_addr; |
92 |
-+ if (ConnStateData *conn = http->getConn()) |
93 |
-+ conn->log_addr = request->indirect_client_addr; |
94 |
- } |
95 |
- request->x_forwarded_for_iterator.clean(); |
96 |
- request->flags.done_follow_x_forwarded_for = true; |
97 |
|
98 |
diff --git a/net-proxy/squid/files/squid-3.5.7-gentoo.patch b/net-proxy/squid/files/squid-3.5.7-gentoo.patch |
99 |
deleted file mode 100644 |
100 |
index c4def050a2d..00000000000 |
101 |
--- a/net-proxy/squid/files/squid-3.5.7-gentoo.patch |
102 |
+++ /dev/null |
103 |
@@ -1,100 +0,0 @@ |
104 |
-diff --git a/configure.ac b/configure.ac |
105 |
-index a863327..deb44ed 100644 |
106 |
---- a/configure.ac |
107 |
-+++ b/configure.ac |
108 |
-@@ -26,9 +26,9 @@ PRESET_CFLAGS="$CFLAGS" |
109 |
- PRESET_LDFLAGS="$LDFLAGS" |
110 |
- |
111 |
- dnl Set default LDFLAGS |
112 |
--if test "x$LDFLAGS" = "x" ; then |
113 |
-- LDFLAGS="-g" |
114 |
--fi |
115 |
-+dnl if test "x$LDFLAGS" = "x" ; then |
116 |
-+dnl LDFLAGS="-g" |
117 |
-+dnl fi |
118 |
- |
119 |
- # Check for GNU cc |
120 |
- AC_PROG_CC |
121 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
122 |
-index 6b69267..10f506a 100644 |
123 |
---- a/src/Makefile.am |
124 |
-+++ b/src/Makefile.am |
125 |
-@@ -867,8 +867,8 @@ DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR) |
126 |
- DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log |
127 |
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log |
128 |
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log |
129 |
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state |
130 |
--DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db |
131 |
-+DEFAULT_NETDB_FILE = $(localstatedir)/lib/squid/netdb.state |
132 |
-+DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db |
133 |
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` |
134 |
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` |
135 |
- DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'` |
136 |
-diff --git a/src/debug.cc b/src/debug.cc |
137 |
-index 64ab0ba..062119a 100644 |
138 |
---- a/src/debug.cc |
139 |
-+++ b/src/debug.cc |
140 |
-@@ -450,7 +450,7 @@ _db_init(const char *logfile, const char *options) |
141 |
- #if HAVE_SYSLOG && defined(LOG_LOCAL4) |
142 |
- |
143 |
- if (Debug::log_syslog) |
144 |
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); |
145 |
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); |
146 |
- |
147 |
- #endif /* HAVE_SYSLOG */ |
148 |
- |
149 |
-diff --git a/src/main.cc b/src/main.cc |
150 |
-index d6eb01a..0b93f0e 100644 |
151 |
---- a/src/main.cc |
152 |
-+++ b/src/main.cc |
153 |
-@@ -1657,7 +1657,7 @@ watch_child(char *argv[]) |
154 |
- if (!IamMasterProcess()) |
155 |
- return; |
156 |
- |
157 |
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
158 |
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); |
159 |
- |
160 |
- if ((pid = fork()) < 0) |
161 |
- syslog(LOG_ALERT, "fork failed: %s", xstrerror()); |
162 |
-@@ -1720,7 +1720,7 @@ watch_child(char *argv[]) |
163 |
- |
164 |
- if ((pid = fork()) == 0) { |
165 |
- /* child */ |
166 |
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
167 |
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); |
168 |
- prog = argv[0]; |
169 |
- argv[0] = const_cast<char*>(kid.name().termedBuf()); |
170 |
- execvp(prog, argv); |
171 |
-@@ -1733,7 +1733,7 @@ watch_child(char *argv[]) |
172 |
- } |
173 |
- |
174 |
- /* parent */ |
175 |
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
176 |
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); |
177 |
- |
178 |
- squid_signal(SIGINT, SIG_IGN, SA_RESTART); |
179 |
- |
180 |
---- a/src/cf.data.pre 2013-04-29 11:17:59.256167134 +0300 |
181 |
-+++ b/src/cf.data.pre 2013-04-29 11:20:17.043924313 +0300 |
182 |
-@@ -1019,6 +1019,7 @@ |
183 |
- acl Safe_ports port 488 # gss-http |
184 |
- acl Safe_ports port 591 # filemaker |
185 |
- acl Safe_ports port 777 # multiling http |
186 |
-+acl Safe_ports port 901 # SWAT |
187 |
- acl CONNECT method CONNECT |
188 |
- NOCOMMENT_END |
189 |
- DOC_END |
190 |
-@@ -5300,11 +5301,11 @@ |
191 |
- |
192 |
- NAME: cache_mgr |
193 |
- TYPE: string |
194 |
--DEFAULT: webmaster |
195 |
-+DEFAULT: root |
196 |
- LOC: Config.adminEmail |
197 |
- DOC_START |
198 |
- Email-address of local cache manager who will receive |
199 |
-- mail if the cache dies. The default is "webmaster". |
200 |
-+ mail if the cache dies. The default is "root". |
201 |
- DOC_END |
202 |
- |
203 |
- NAME: mail_from |
204 |
|
205 |
diff --git a/net-proxy/squid/files/squid-cppunit-1.14.patch b/net-proxy/squid/files/squid-cppunit-1.14.patch |
206 |
deleted file mode 100644 |
207 |
index f31268fc61d..00000000000 |
208 |
--- a/net-proxy/squid/files/squid-cppunit-1.14.patch |
209 |
+++ /dev/null |
210 |
@@ -1,417 +0,0 @@ |
211 |
-# backport rev 14707 from trunk |
212 |
---- Makefile.am 2016-01-30 09:09:25 +0000 |
213 |
-+++ Makefile.am 2016-06-13 07:46:59 +0000 |
214 |
-@@ -48,7 +48,7 @@ |
215 |
- check: have-cppunit check-recursive |
216 |
- |
217 |
- have-cppunit: |
218 |
-- @if test "$(SQUID_CPPUNIT_INC)$(SQUID_CPPUNIT_LA)$(SQUID_CPPUNIT_LIBS)" = "" ; then \ |
219 |
-+ @if test "$(LIBCPPUNIT_CFLAGS)$(LIBCPPUNIT_LIBS)" = "" ; then \ |
220 |
- echo "FATAL: 'make check' requires cppunit and cppunit development packages. They do not appear to be installed." ; \ |
221 |
- exit 1 ; \ |
222 |
- fi |
223 |
- |
224 |
---- compat/Makefile.am 2016-02-09 08:57:33 +0000 |
225 |
-+++ compat/Makefile.am 2016-06-13 07:46:59 +0000 |
226 |
-@@ -94,7 +94,7 @@ |
227 |
- testPreCompiler_SOURCES= \ |
228 |
- testPreCompiler.h \ |
229 |
- testPreCompiler.cc |
230 |
--testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) |
231 |
-+testPreCompiler_LDADD= $(LIBCPPUNIT_LIBS) |
232 |
- testPreCompiler_LDFLAGS= |
233 |
- |
234 |
- # os/ subdir prevents us using src/TestHeaders.am |
235 |
- |
236 |
---- configure.ac 2016-06-11 05:28:18 +0000 |
237 |
-+++ configure.ac 2016-06-13 07:46:59 +0000 |
238 |
-@@ -115,10 +115,11 @@ |
239 |
- AC_PATH_PROG(CHMOD, chmod, $FALSE) |
240 |
- AC_PATH_PROG(TR, tr, $FALSE) |
241 |
- AC_PATH_PROG(RM, rm, $FALSE) |
242 |
--AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false) |
243 |
- dnl Libtool 2.2.6 requires: rm -f |
244 |
- RM="$RM -f" |
245 |
- |
246 |
-+PKG_PROG_PKG_CONFIG |
247 |
-+ |
248 |
- AC_PATH_PROG(PERL, perl, none) |
249 |
- if test "x$ac_cv_path_PERL" = "xnone"; then |
250 |
- AC_MSG_FAILURE([Perl is required to compile Squid. Please install Perl and then re-run configure ]) |
251 |
-@@ -984,9 +985,6 @@ |
252 |
- ] |
253 |
- ) |
254 |
- |
255 |
--dnl Necessary if the first PKG_CHECK_MODULES call is conditional |
256 |
--PKG_PROG_PKG_CONFIG |
257 |
-- |
258 |
- dnl Perform configuration consistency checks for eCAP |
259 |
- if test "x$squid_opt_use_ecap" != "xno"; |
260 |
- then |
261 |
-@@ -2725,45 +2723,29 @@ |
262 |
- [Enable support for the X-Accelerator-Vary HTTP header]) |
263 |
- AC_MSG_NOTICE([X-Accelerator-Vary support enabled: $enable_x_accelerator_vary]) |
264 |
- |
265 |
-- |
266 |
--if $CPPUNITCONFIG --help >/dev/null; then |
267 |
-- squid_cv_cppunit_version="`$CPPUNITCONFIG --version`" |
268 |
-- AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version]) |
269 |
-- unset squid_cv_cppunit_version |
270 |
-- SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`" |
271 |
-- SQUID_CPPUNIT_LA='' |
272 |
-- SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`" |
273 |
--else |
274 |
-- AC_MSG_WARN([cppunit does not appear to be installed. squid does not require this, but code testing with 'make check' will fail.]) |
275 |
-- SQUID_CPPUNIT_LA='' |
276 |
-- SQUID_CPPUNIT_LIBS='' |
277 |
-- SQUID_CPPUNIT_INC='' |
278 |
--fi |
279 |
-- |
280 |
--AC_ARG_WITH(cppunit-basedir, |
281 |
-- AS_HELP_STRING([--with-cppunit-basedir=PATH], |
282 |
-- [Path where the cppunit headers are libraries can be found ]), [ |
283 |
--if test -f "$withval/include/cppunit/TestCase.h"; then |
284 |
-- AC_MSG_NOTICE([Using cppunit includes from $withval]) |
285 |
-- SQUID_CPPUNIT_INC="-I${withval}/include" |
286 |
--else |
287 |
-- AC_MSG_ERROR(Cannot find cppunit at $withval) |
288 |
--fi |
289 |
--if test -f "$withval/lib/libcppunit.la"; then |
290 |
-- AC_MSG_NOTICE([Using cppunit lib from $withval]) |
291 |
-- SQUID_CPPUNIT_LA="${withval}/lib/libcppunit.la" |
292 |
-- SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)' |
293 |
--else |
294 |
-- AC_MSG_ERROR(Cannot find cppunit at $withval) |
295 |
--fi |
296 |
--]) |
297 |
--SQUID_STATE_SAVE(squid_cppunit_state) |
298 |
--CXXFLAGS="$CXXFLAGS $SQUID_CPPUNIT_INC" |
299 |
--AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h) |
300 |
--SQUID_STATE_ROLLBACK(squid_cppunit_state) |
301 |
--AC_SUBST(SQUID_CPPUNIT_LIBS) |
302 |
--AC_SUBST(SQUID_CPPUNIT_LA) |
303 |
--AC_SUBST(SQUID_CPPUNIT_INC) |
304 |
-+AC_ARG_WITH([cppunit], AS_HELP_STRING([--without-cppunit],[Do not use cppunit test framework]),[ |
305 |
-+ AS_CASE($with_cppunit, [yes|no],[], |
306 |
-+ [ |
307 |
-+ AS_IF([test ! -d "$withval"],AC_MSG_ERROR([--with-cppunit PATH does not point to a directory])) |
308 |
-+ LIBCPPUNIT_CFLAGS="-I$with_cppunit/include" |
309 |
-+ LIBCPPUNIT_LIBS="-L$with_cppunit/lib -lcppunit" |
310 |
-+ ]) |
311 |
-+]) |
312 |
-+AS_IF([test "x$with_cppunit" != "xno"],[ |
313 |
-+ PKG_CHECK_MODULES([LIBCPPUNIT],[cppunit],[ |
314 |
-+ squid_cv_cppunit_version="`pkg-config cppunit --version`" |
315 |
-+ AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version]) |
316 |
-+ AS_UNSET(squid_cv_cppunit_version) |
317 |
-+ |
318 |
-+ SQUID_STATE_SAVE(squid_cppunit_state) |
319 |
-+ AS_VAR_APPEND(CXXFLAGS,[$LIBCPPUNIT_CFLAGS]) |
320 |
-+ AS_VAR_APPEND(LIBS,[$LIBCPPUNIT_LIBS]) |
321 |
-+ AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h) |
322 |
-+ SQUID_STATE_ROLLBACK(squid_cppunit_state) |
323 |
-+ ],[ |
324 |
-+ AC_MSG_WARN([cppunit does not appear to be installed. Squid does not require this, but code testing with 'make check' will fail.]) |
325 |
-+ ]) |
326 |
-+]) |
327 |
- |
328 |
- # Force some compilers to use ANSI features |
329 |
- # |
330 |
- |
331 |
---- src/Common.am 2017-06-01 16:49:00.000000000 +0300 |
332 |
-+++ src/Common.am 2017-06-15 16:10:20.000000000 +0300 |
333 |
-@@ -26,7 +26,7 @@ |
334 |
- -I$(top_srcdir)/lib \ |
335 |
- -I$(top_srcdir)/src \ |
336 |
- -I$(top_builddir)/include \ |
337 |
-- $(SQUID_CPPUNIT_INC) |
338 |
-+ $(LIBCPPUNIT_CFLAGS) |
339 |
- |
340 |
- ## Kerberos headers require their include path. |
341 |
- ## Because we use libcompat for comm_err.h header protections ... |
342 |
---- src/Makefile.am 2017-06-01 16:49:00.000000000 +0300 |
343 |
-+++ src/Makefile.am 2017-06-15 16:38:40.000000000 +0300 |
344 |
-@@ -1112,9 +1112,9 @@ |
345 |
- # $(TESTSOURCES) |
346 |
- #tests_testX_LDFLAGS = $(LIBADD_DL) |
347 |
- #tests_testX_LDADD=\ |
348 |
--# $(SQUID_CPPUNIT_LIBS) \ |
349 |
--# $(SQUID_CPPUNIT_LA) \ |
350 |
--# $(COMPAT_LIB) \ |
351 |
-+# $(LIBCPPUNIT_LIBS) \ |
352 |
-+# $(COMPAT_LIB) \ |
353 |
-+# $(XTRA_LIBS) |
354 |
- #tests_testX_DEPENDENCIES= $(SQUID_CPPUNIT_LA) |
355 |
- |
356 |
- |
357 |
-@@ -1221,8 +1221,7 @@ |
358 |
- $(top_builddir)/lib/libmisccontainers.la \ |
359 |
- $(top_builddir)/lib/libmiscencoding.la \ |
360 |
- $(top_builddir)/lib/libmiscutil.la \ |
361 |
-- $(SQUID_CPPUNIT_LIBS) \ |
362 |
-- $(SQUID_CPPUNIT_LA) \ |
363 |
-+ $(LIBCPPUNIT_LIBS) \ |
364 |
- $(NETTLELIB) \ |
365 |
- $(SSLLIB) \ |
366 |
- $(COMPAT_LIB) \ |
367 |
-@@ -1363,7 +1362,7 @@ |
368 |
- $(DISK_OS_LIBS) \ |
369 |
- $(NETTLELIB) \ |
370 |
- $(REGEXLIB) \ |
371 |
-- $(SQUID_CPPUNIT_LIBS) \ |
372 |
-+ $(LIBCPPUNIT_LIBS) \ |
373 |
- $(SSLLIB) \ |
374 |
- $(COMPAT_LIB) \ |
375 |
- $(XTRA_LIBS) |
376 |
-@@ -1383,14 +1382,14 @@ |
377 |
- tests/stub_MemBuf.cc \ |
378 |
- $(TESTSOURCES) |
379 |
- tests_testBoilerplate_LDADD= \ |
380 |
-- $(SQUID_CPPUNIT_LIBS) \ |
381 |
- $(SSLLIB) \ |
382 |
- base/libbase.la \ |
383 |
-+ $(LIBCPPUNIT_LIBS) \ |
384 |
- $(COMPAT_LIB) \ |
385 |
- $(XTRA_LIBS) |
386 |
- tests_testBoilerplate_LDFLAGS = $(LIBADD_DL) |
387 |
- tests_testBoilerplate_DEPENDENCIES = \ |
388 |
-- $(SQUID_CPPUNIT_LA) |
389 |
-+ $(LIBCPPUNIT_LIBS) |
390 |
- |
391 |
- ## Tests of base/libbase.la objects |
392 |
- tests_testCharacterSet_SOURCES = \ |
393 |
-@@ -1405,9 +1404,8 @@ |
394 |
- tests_testCharacterSet_LDFLAGS = $(LIBADD_DL) |
395 |
- tests_testCharacterSet_LDADD= \ |
396 |
- base/libbase.la \ |
397 |
-+ $(LIBCPPUNIT_LIBS) \ |
398 |
- $(COMPAT_LIB) \ |
399 |
-- $(SQUID_CPPUNIT_LA) \ |
400 |
-- $(SQUID_CPPUNIT_LIBS) \ |
401 |
- $(XTRA_LIBS) |
402 |
- |
403 |
- ## Tests of the CacheManager module. |
404 |
-@@ -1646,8 +1644,7 @@ |
405 |
- $(top_builddir)/lib/libmiscutil.la \ |
406 |
- $(NETTLELIB) \ |
407 |
- $(REGEXLIB) \ |
408 |
-- $(SQUID_CPPUNIT_LIBS) \ |
409 |
-- $(SQUID_CPPUNIT_LA) \ |
410 |
-+ $(LIBCPPUNIT_LIBS) \ |
411 |
- $(SSLLIB) \ |
412 |
- $(KRB5LIBS) \ |
413 |
- $(COMPAT_LIB) \ |
414 |
-@@ -1829,8 +1826,8 @@ |
415 |
- $(top_builddir)/lib/libmiscutil.la \ |
416 |
- $(NETTLELIB) \ |
417 |
- $(REGEXLIB) \ |
418 |
-- $(SQUID_CPPUNIT_LIBS) \ |
419 |
- $(SSLLIB) \ |
420 |
-+ $(LIBCPPUNIT_LIBS) \ |
421 |
- $(COMPAT_LIB) \ |
422 |
- $(XTRA_LIBS) |
423 |
- |
424 |
-@@ -2076,9 +2073,8 @@ |
425 |
- $(SNMP_LIBS) \ |
426 |
- $(NETTLELIB) \ |
427 |
- $(REGEXLIB) \ |
428 |
-- $(SQUID_CPPUNIT_LIBS) \ |
429 |
-- $(SQUID_CPPUNIT_LA) \ |
430 |
- $(SSLLIB) \ |
431 |
-+ $(LIBCPPUNIT_LIBS) \ |
432 |
- $(KRB5LIBS) \ |
433 |
- $(COMPAT_LIB) \ |
434 |
- $(XTRA_LIBS) |
435 |
-@@ -2323,10 +2319,9 @@ |
436 |
- $(SNMP_LIBS) \ |
437 |
- $(NETTLELIB) \ |
438 |
- $(REGEXLIB) \ |
439 |
-- $(SQUID_CPPUNIT_LIBS) \ |
440 |
-- $(SQUID_CPPUNIT_LA) \ |
441 |
- $(SSLLIB) \ |
442 |
- $(KRB5LIBS) \ |
443 |
-+ $(LIBCPPUNIT_LIBS) \ |
444 |
- $(COMPAT_LIB) \ |
445 |
- $(XTRA_LIBS) |
446 |
- tests_testEventLoop_LDFLAGS = $(LIBADD_DL) |
447 |
-@@ -2564,10 +2559,9 @@ |
448 |
- $(top_builddir)/lib/libmiscutil.la \ |
449 |
- $(NETTLELIB) \ |
450 |
- $(REGEXLIB) \ |
451 |
-- $(SQUID_CPPUNIT_LIBS) \ |
452 |
-- $(SQUID_CPPUNIT_LA) \ |
453 |
- $(SSLLIB) \ |
454 |
- $(KRB5LIBS) \ |
455 |
-+ $(LIBCPPUNIT_LIBS) \ |
456 |
- $(COMPAT_LIB) \ |
457 |
- $(XTRA_LIBS) |
458 |
- tests_test_http_range_LDFLAGS = $(LIBADD_DL) |
459 |
-@@ -2613,7 +2607,7 @@ |
460 |
- base/libbase.la \ |
461 |
- ip/libip.la \ |
462 |
- $(top_builddir)/lib/libmiscutil.la \ |
463 |
-- $(SQUID_CPPUNIT_LIBS) \ |
464 |
-+ $(LIBCPPUNIT_LIBS) \ |
465 |
- $(COMPAT_LIB) \ |
466 |
- $(XTRA_LIBS) |
467 |
- tests_testHttpParser_LDFLAGS = $(LIBADD_DL) |
468 |
-@@ -2639,9 +2633,8 @@ |
469 |
- parser/libsquid-parser.la \ |
470 |
- base/libbase.la \ |
471 |
- $(top_builddir)/lib/libmiscutil.la \ |
472 |
-+ $(LIBCPPUNIT_LIBS) \ |
473 |
- $(COMPAT_LIB) \ |
474 |
-- $(SQUID_CPPUNIT_LA) \ |
475 |
-- $(SQUID_CPPUNIT_LIBS) \ |
476 |
- $(XTRA_LIBS) |
477 |
- |
478 |
- ## Tests of the HttpRequest module. |
479 |
-@@ -2875,10 +2868,9 @@ |
480 |
- $(DISK_OS_LIBS) \ |
481 |
- $(NETTLELIB) \ |
482 |
- $(REGEXLIB) \ |
483 |
-- $(SQUID_CPPUNIT_LIBS) \ |
484 |
-- $(SQUID_CPPUNIT_LA) \ |
485 |
- $(SSLLIB) \ |
486 |
- $(KRB5LIBS) \ |
487 |
-+ $(LIBCPPUNIT_LIBS) \ |
488 |
- $(COMPAT_LIB) \ |
489 |
- $(XTRA_LIBS) |
490 |
- tests_testHttpRequest_LDFLAGS = $(LIBADD_DL) |
491 |
-@@ -2902,9 +2894,8 @@ |
492 |
- icmp/libicmp-core.la \ |
493 |
- ip/libip.la \ |
494 |
- base/libbase.la \ |
495 |
-+ $(LIBCPPUNIT_LIBS) \ |
496 |
- $(COMPAT_LIB) \ |
497 |
-- $(SQUID_CPPUNIT_LA) \ |
498 |
-- $(SQUID_CPPUNIT_LIBS) \ |
499 |
- $(XTRA_LIBS) |
500 |
- |
501 |
- ## Tests for ip/* objects |
502 |
-@@ -2918,9 +2909,8 @@ |
503 |
- tests_testIpAddress_LDADD= \ |
504 |
- ip/libip.la \ |
505 |
- base/libbase.la \ |
506 |
-+ $(LIBCPPUNIT_LIBS) \ |
507 |
- $(COMPAT_LIB) \ |
508 |
-- $(SQUID_CPPUNIT_LA) \ |
509 |
-- $(SQUID_CPPUNIT_LIBS) \ |
510 |
- $(XTRA_LIBS) |
511 |
- tests_testIpAddress_LDFLAGS= $(LIBADD_DL) |
512 |
- |
513 |
-@@ -3087,10 +3077,10 @@ |
514 |
- $(top_builddir)/lib/libmiscutil.la \ |
515 |
- $(NETTLELIB) \ |
516 |
- $(REGEXLIB) \ |
517 |
-- $(SQUID_CPPUNIT_LIBS) \ |
518 |
- $(SSLLIB) \ |
519 |
- CommCalls.o \ |
520 |
- DnsLookupDetails.o \ |
521 |
-+ $(LIBCPPUNIT_LIBS) \ |
522 |
- $(COMPAT_LIB) \ |
523 |
- $(XTRA_LIBS) |
524 |
- tests_testStore_LDFLAGS = $(LIBADD_DL) |
525 |
-@@ -3130,8 +3120,8 @@ |
526 |
- ip/libip.la \ |
527 |
- $(top_builddir)/lib/libmiscutil.la \ |
528 |
- $(REGEXLIB) \ |
529 |
-- $(SQUID_CPPUNIT_LIBS) \ |
530 |
- $(SSLLIB) \ |
531 |
-+ $(LIBCPPUNIT_LIBS) \ |
532 |
- $(COMPAT_LIB) \ |
533 |
- $(XTRA_LIBS) |
534 |
- tests_testString_LDFLAGS = $(LIBADD_DL) |
535 |
-@@ -3326,8 +3316,8 @@ |
536 |
- $(top_builddir)/lib/libmiscutil.la \ |
537 |
- $(NETTLELIB) \ |
538 |
- $(REGEXLIB) \ |
539 |
-- $(SQUID_CPPUNIT_LIBS) \ |
540 |
- $(SSLLIB) \ |
541 |
-+ $(LIBCPPUNIT_LIBS) \ |
542 |
- $(COMPAT_LIB) \ |
543 |
- $(XTRA_LIBS) |
544 |
- tests_testUfs_LDFLAGS = $(LIBADD_DL) |
545 |
-@@ -3506,8 +3496,8 @@ |
546 |
- $(top_builddir)/lib/libmiscutil.la \ |
547 |
- $(NETTLELIB) \ |
548 |
- $(REGEXLIB) \ |
549 |
-- $(SQUID_CPPUNIT_LIBS) \ |
550 |
- $(SSLLIB) \ |
551 |
-+ $(LIBCPPUNIT_LIBS) \ |
552 |
- $(COMPAT_LIB) \ |
553 |
- $(XTRA_LIBS) |
554 |
- tests_testRock_LDFLAGS = $(AM_CPPFLAGS) $(LIBADD_DL) |
555 |
-@@ -3751,10 +3741,9 @@ |
556 |
- $(top_builddir)/lib/libmiscutil.la \ |
557 |
- $(NETTLELIB) \ |
558 |
- $(COMPAT_LIB) \ |
559 |
-- $(SQUID_CPPUNIT_LIBS) \ |
560 |
-- $(SQUID_CPPUNIT_LA) \ |
561 |
- $(SSLLIB) \ |
562 |
- $(KRB5LIBS) \ |
563 |
-+ $(LIBCPPUNIT_LIBS) \ |
564 |
- $(COMPAT_LIB) \ |
565 |
- $(XTRA_LIBS) |
566 |
- tests_testURL_LDFLAGS = $(LIBADD_DL) |
567 |
-@@ -3794,7 +3783,7 @@ |
568 |
- mgr/libmgr.la \ |
569 |
- $(top_builddir)/lib/libmiscutil.la \ |
570 |
- $(REGEXLIB) \ |
571 |
-- $(SQUID_CPPUNIT_LIBS) \ |
572 |
-+ $(LIBCPPUNIT_LIBS) \ |
573 |
- $(COMPAT_LIB) \ |
574 |
- $(XTRA_LIBS) |
575 |
- tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA) |
576 |
-@@ -3838,7 +3827,7 @@ |
577 |
- ip/libip.la \ |
578 |
- mgr/libmgr.la \ |
579 |
- $(top_builddir)/lib/libmiscutil.la \ |
580 |
-- $(SQUID_CPPUNIT_LIBS) \ |
581 |
-+ $(LIBCPPUNIT_LIBS) \ |
582 |
- $(COMPAT_LIB) \ |
583 |
- $(XTRA_LIBS) |
584 |
- tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA) |
585 |
-@@ -3876,8 +3865,8 @@ |
586 |
- ip/libip.la \ |
587 |
- $(top_builddir)/lib/libmiscutil.la \ |
588 |
- $(REGEXLIB) \ |
589 |
-- $(SQUID_CPPUNIT_LIBS) \ |
590 |
- $(SSLLIB) \ |
591 |
-+ $(LIBCPPUNIT_LIBS) \ |
592 |
- $(COMPAT_LIB) \ |
593 |
- $(XTRA_LIBS) |
594 |
- tests_testConfigParser_LDFLAGS = $(LIBADD_DL) |
595 |
-@@ -3922,9 +3911,9 @@ |
596 |
- base/libbase.la \ |
597 |
- $(top_builddir)/lib/libmiscutil.la \ |
598 |
- $(top_builddir)/lib/libmisccontainers.la \ |
599 |
-- $(SQUID_CPPUNIT_LIBS) \ |
600 |
-- $(SQUID_CPPUNIT_LA) \ |
601 |
-- $(COMPAT_LIB) |
602 |
-+ $(LIBCPPUNIT_LIBS) \ |
603 |
-+ $(COMPAT_LIB) \ |
604 |
-+ $(XTRA_LIBS) |
605 |
- tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA) |
606 |
- |
607 |
- TESTS += testHeaders |
608 |
---- lib/Makefile.am 2017-06-01 16:49:00.000000000 +0300 |
609 |
-+++ lib/Makefile.am 2017-06-16 07:19:54.000000000 +0300 |
610 |
-@@ -91,7 +91,7 @@ |
611 |
- tests/testRFC1035.cc |
612 |
- |
613 |
- tests_testRFC1035_LDADD= \ |
614 |
-- $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \ |
615 |
-+ $(LIBCPPUNIT_LIBS) \ |
616 |
- $(top_builddir)/lib/libmiscencoding.la \ |
617 |
- $(top_builddir)/lib/libmiscutil.la \ |
618 |
- $(COMPAT_LIB) |
619 |
-@@ -103,7 +103,7 @@ |
620 |
- tests/testRFC1738.cc |
621 |
- |
622 |
- tests_testRFC1738_LDADD= \ |
623 |
-- $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \ |
624 |
-+ $(LIBCPPUNIT_LIBS) \ |
625 |
- $(top_builddir)/lib/libmiscencoding.la \ |
626 |
- $(top_builddir)/lib/libmiscutil.la \ |
627 |
- $(COMPAT_LIB) |
628 |
|
629 |
diff --git a/net-proxy/squid/files/squid.confd-r1 b/net-proxy/squid/files/squid.confd-r1 |
630 |
deleted file mode 100644 |
631 |
index a29d33defb0..00000000000 |
632 |
--- a/net-proxy/squid/files/squid.confd-r1 |
633 |
+++ /dev/null |
634 |
@@ -1,12 +0,0 @@ |
635 |
-# Copyright 1999-2013 Gentoo Foundation |
636 |
-# Distributed under the terms of the GNU General Public License v2 |
637 |
- |
638 |
-# Config file for /etc/init.d/squid |
639 |
- |
640 |
-SQUID_OPTS="-YC" |
641 |
- |
642 |
-# Kerberos keytab file to use. This is required if you enable kerberos authentication. |
643 |
-SQUID_KEYTAB="" |
644 |
- |
645 |
-# Use max_filedescriptors setting in squid.conf to determine the maximum number |
646 |
-# of filedescriptors squid can open. |
647 |
|
648 |
diff --git a/net-proxy/squid/files/squid.initd-r4 b/net-proxy/squid/files/squid.initd-r4 |
649 |
deleted file mode 100644 |
650 |
index 3e84eda38a6..00000000000 |
651 |
--- a/net-proxy/squid/files/squid.initd-r4 |
652 |
+++ /dev/null |
653 |
@@ -1,117 +0,0 @@ |
654 |
-#!/sbin/openrc-run |
655 |
-# Copyright 1999-2014 Gentoo Foundation |
656 |
-# Distributed under the terms of the GNU General Public License v2 |
657 |
- |
658 |
-extra_started_commands="reload rotate" |
659 |
- |
660 |
-depend() { |
661 |
- use dns net |
662 |
-} |
663 |
- |
664 |
-checkconfig() { |
665 |
- if [ ! -f /etc/squid/${SVCNAME}.conf ]; then |
666 |
- eerror "You need to create /etc/squid/${SVCNAME}.conf first." |
667 |
- eerror "An example can be found in /etc/squid/squid.conf.default" |
668 |
- return 1 |
669 |
- fi |
670 |
- |
671 |
- local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf) |
672 |
- [ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid |
673 |
- if [ /run/${SVCNAME}.pid != ${PIDFILE} ]; then |
674 |
- eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to" |
675 |
- eerror " /run/${SVCNAME}.pid" |
676 |
- eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" |
677 |
- eerror " in any other instance of squid." |
678 |
- return 1 |
679 |
- fi |
680 |
- |
681 |
- # Maximum file descriptors squid can open is determined by: |
682 |
- # a basic default of N=1024 |
683 |
- # ... altered by ./configure --with-filedescriptors=N |
684 |
- # ... overridden on production by squid.conf max_filedescriptors (if, |
685 |
- # and only if, setrlimit() RLIMIT_NOFILE is able to be built+used). |
686 |
- # Since we do not configure hard coded # of filedescriptors anymore, |
687 |
- # there is no need for ulimit calls in the init script. |
688 |
- # Use max_filedescriptors in squid.conf instead. |
689 |
- |
690 |
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf) |
691 |
- [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" |
692 |
- |
693 |
- local x |
694 |
- for x in $CACHE_SWAP ; do |
695 |
- if [ ! -e $x ] ; then |
696 |
- ebegin "Initializing cache directory ${x%/*}" |
697 |
- local ORIG_UMASK=$(umask) |
698 |
- umask 027 |
699 |
- |
700 |
- if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then |
701 |
- eend 1 |
702 |
- return 1 |
703 |
- fi |
704 |
- |
705 |
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)" |
706 |
- if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then |
707 |
- umask $ORIG_UMASK |
708 |
- eend 1 |
709 |
- echo "$INIT_CACHE_RESPONSE" |
710 |
- return 1 |
711 |
- fi |
712 |
- |
713 |
- umask $ORIG_UMASK |
714 |
- eend 0 |
715 |
- break |
716 |
- fi |
717 |
- done |
718 |
- |
719 |
- return 0 |
720 |
-} |
721 |
- |
722 |
-start() { |
723 |
- checkconfig || return 1 |
724 |
- checkpath -d -q -m 0750 -o squid:squid /run/${SVCNAME} |
725 |
- |
726 |
- ebegin "Starting ${SVCNAME}" |
727 |
- KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf |
728 |
- eend $? && sleep 1 |
729 |
-} |
730 |
- |
731 |
-stop() { |
732 |
- ebegin "Stopping ${SVCNAME}" |
733 |
- if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then |
734 |
- # Now we have to wait until squid has _really_ stopped. |
735 |
- sleep 1 |
736 |
- if [ -f /run/${SVCNAME}.pid ] ; then |
737 |
- einfon "Waiting for squid to shutdown ." |
738 |
- cnt=0 |
739 |
- while [ -f /run/${SVCNAME}.pid ] ; do |
740 |
- cnt=$(expr $cnt + 1) |
741 |
- if [ $cnt -gt 60 ] ; then |
742 |
- # Waited 120 seconds now. Fail. |
743 |
- echo |
744 |
- eend 1 "Failed." |
745 |
- break |
746 |
- fi |
747 |
- sleep 2 |
748 |
- echo -n "." |
749 |
- done |
750 |
- echo |
751 |
- fi |
752 |
- else |
753 |
- eerror "Squid shutdown failed, probably service is already down." |
754 |
- fi |
755 |
- eend 0 |
756 |
-} |
757 |
- |
758 |
-reload() { |
759 |
- checkconfig || return 1 |
760 |
- ebegin "Reloading ${SVCNAME}" |
761 |
- /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf |
762 |
- eend $? |
763 |
-} |
764 |
- |
765 |
-rotate() { |
766 |
- service_started ${SVCNAME} || return 1 |
767 |
- ebegin "Rotating ${SVCNAME} logs" |
768 |
- /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf |
769 |
- eend $? |
770 |
-} |
771 |
|
772 |
diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild b/net-proxy/squid/squid-3.5.27-r1.ebuild |
773 |
deleted file mode 100644 |
774 |
index ff2d870e4cc..00000000000 |
775 |
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild |
776 |
+++ /dev/null |
777 |
@@ -1,270 +0,0 @@ |
778 |
-# Copyright 1999-2019 Gentoo Authors |
779 |
-# Distributed under the terms of the GNU General Public License v2 |
780 |
- |
781 |
-EAPI=6 |
782 |
- |
783 |
-WANT_AUTOMAKE="1.15" |
784 |
- |
785 |
-inherit autotools linux-info pam toolchain-funcs user |
786 |
- |
787 |
-DESCRIPTION="A full-featured web proxy cache" |
788 |
-HOMEPAGE="http://www.squid-cache.org/" |
789 |
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz" |
790 |
- |
791 |
-LICENSE="GPL-2" |
792 |
-SLOT="0" |
793 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd" |
794 |
-IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \ |
795 |
- ecap esi ssl-crtd \ |
796 |
- mysql postgres sqlite \ |
797 |
- perl qos tproxy \ |
798 |
- +htcp +wccp +wccpv2 \ |
799 |
- pf-transparent ipf-transparent kqueue \ |
800 |
- elibc_uclibc kernel_linux" |
801 |
- |
802 |
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
803 |
- pam? ( virtual/pam ) |
804 |
- ldap? ( net-nds/openldap ) |
805 |
- kerberos? ( virtual/krb5 ) |
806 |
- qos? ( net-libs/libnetfilter_conntrack ) |
807 |
- ssl? ( |
808 |
- libressl? ( dev-libs/libressl:0 ) |
809 |
- !libressl? ( dev-libs/openssl:0 ) |
810 |
- dev-libs/nettle >=net-libs/gnutls-3.1.5 ) |
811 |
- sasl? ( dev-libs/cyrus-sasl ) |
812 |
- ecap? ( net-libs/libecap:1 ) |
813 |
- esi? ( dev-libs/expat dev-libs/libxml2 ) |
814 |
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
815 |
- >=sys-libs/db-4:* |
816 |
- dev-libs/libltdl:0" |
817 |
-DEPEND="${COMMON_DEPEND} |
818 |
- dev-lang/perl |
819 |
- ecap? ( virtual/pkgconfig ) |
820 |
- test? ( dev-util/cppunit )" |
821 |
-RDEPEND="${COMMON_DEPEND} |
822 |
- samba? ( net-fs/samba ) |
823 |
- perl? ( dev-lang/perl ) |
824 |
- mysql? ( dev-perl/DBD-mysql ) |
825 |
- postgres? ( dev-perl/DBD-Pg ) |
826 |
- selinux? ( sec-policy/selinux-squid ) |
827 |
- sqlite? ( dev-perl/DBD-SQLite ) |
828 |
- !<=sci-biology/meme-4.8.1-r1" |
829 |
- |
830 |
-REQUIRED_USE="tproxy? ( caps ) |
831 |
- qos? ( caps )" |
832 |
- |
833 |
-pkg_pretend() { |
834 |
- if use tproxy; then |
835 |
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" |
836 |
- linux-info_pkg_setup |
837 |
- fi |
838 |
-} |
839 |
- |
840 |
-pkg_setup() { |
841 |
- enewgroup squid |
842 |
- enewuser squid -1 -1 /var/cache/squid squid |
843 |
-} |
844 |
- |
845 |
-src_prepare() { |
846 |
- eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch" |
847 |
- eapply -p0 "${FILESDIR}/${PN}-cppunit-1.14.patch" |
848 |
- eapply "${FILESDIR}/${PN}-2018-1.patch" |
849 |
- eapply "${FILESDIR}/${PN}-2018-2.patch" |
850 |
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
851 |
- INSTALL QUICKSTART \ |
852 |
- scripts/fileno-to-pathname.pl \ |
853 |
- scripts/check_cache.pl \ |
854 |
- tools/cachemgr.cgi.8 \ |
855 |
- tools/purge/conffile.hh \ |
856 |
- tools/purge/README || die |
857 |
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ |
858 |
- INSTALL QUICKSTART || die |
859 |
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ |
860 |
- QUICKSTART || die |
861 |
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \ |
862 |
- QUICKSTART \ |
863 |
- src/log/access_log.cc || die |
864 |
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ |
865 |
- src/log/access_log.cc || die |
866 |
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ |
867 |
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \ |
868 |
- helpers/external_acl/session/ext_session_acl.8 \ |
869 |
- src/ssl/ssl_crtd.8 || die |
870 |
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ |
871 |
- scripts/check_cache.pl || die |
872 |
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ |
873 |
- src/ssl/ssl_crtd.8 || die |
874 |
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
875 |
- src/ssl/ssl_crtd.8 || die |
876 |
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
877 |
- src/ssl/ssl_crtd.8 || die |
878 |
- # /var/run/squid to /run/squid |
879 |
- sed -i -e 's:$(localstatedir)::' \ |
880 |
- src/ipc/Makefile.am || die |
881 |
- sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \ |
882 |
- libltdl/configure.ac || die |
883 |
- |
884 |
- eapply_user |
885 |
- eautoreconf |
886 |
-} |
887 |
- |
888 |
-src_configure() { |
889 |
- local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam" |
890 |
- use samba && basic_modules+=",SMB" |
891 |
- use ldap && basic_modules+=",LDAP" |
892 |
- use pam && basic_modules+=",PAM" |
893 |
- use sasl && basic_modules+=",SASL" |
894 |
- use nis && ! use elibc_uclibc && basic_modules+=",NIS" |
895 |
- use radius && basic_modules+=",RADIUS" |
896 |
- if use mysql || use postgres || use sqlite ; then |
897 |
- basic_modules+=",DB" |
898 |
- fi |
899 |
- |
900 |
- local digest_modules="file" |
901 |
- use ldap && digest_modules+=",LDAP,eDirectory" |
902 |
- |
903 |
- local negotiate_modules="none" |
904 |
- local myconf="--without-mit-krb5 --without-heimdal-krb5" |
905 |
- if use kerberos ; then |
906 |
- negotiate_modules="kerberos,wrapper" |
907 |
- if has_version app-crypt/heimdal ; then |
908 |
- myconf="--without-mit-krb5 --with-heimdal-krb5" |
909 |
- else |
910 |
- myconf="--with-mit-krb5 --without-heimdal-krb5" |
911 |
- fi |
912 |
- fi |
913 |
- |
914 |
- local ntlm_modules="none" |
915 |
- use samba && ntlm_modules="smb_lm" |
916 |
- |
917 |
- local ext_helpers="file_userip,session,unix_group" |
918 |
- use samba && ext_helpers+=",wbinfo_group" |
919 |
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" |
920 |
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" |
921 |
- |
922 |
- local storeio_modules="aufs,diskd,rock,ufs" |
923 |
- |
924 |
- local transparent |
925 |
- if use kernel_linux ; then |
926 |
- transparent+=" --enable-linux-netfilter" |
927 |
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
928 |
- fi |
929 |
- |
930 |
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
931 |
- transparent+=" $(use_enable kqueue)" |
932 |
- if use pf-transparent; then |
933 |
- transparent+=" --enable-pf-transparent" |
934 |
- elif use ipf-transparent; then |
935 |
- transparent+=" --enable-ipf-transparent" |
936 |
- fi |
937 |
- fi |
938 |
- |
939 |
- tc-export_build_env BUILD_CXX |
940 |
- export BUILDCXX=${BUILD_CXX} |
941 |
- export BUILDCXXFLAGS=${BUILD_CXXFLAGS} |
942 |
- tc-export CC AR |
943 |
- |
944 |
- # Should be able to drop this workaround with newer versions. |
945 |
- # https://bugs.squid-cache.org/show_bug.cgi?id=4224 |
946 |
- tc-is-cross-compiler && export squid_cv_gnu_atomics=no |
947 |
- |
948 |
- econf \ |
949 |
- --sysconfdir=/etc/squid \ |
950 |
- --libexecdir=/usr/libexec/squid \ |
951 |
- --localstatedir=/var \ |
952 |
- --with-pidfile=/run/squid.pid \ |
953 |
- --datadir=/usr/share/squid \ |
954 |
- --with-logdir=/var/log/squid \ |
955 |
- --with-default-user=squid \ |
956 |
- --enable-removal-policies="lru,heap" \ |
957 |
- --enable-storeio="${storeio_modules}" \ |
958 |
- --enable-disk-io \ |
959 |
- --enable-auth-basic="${basic_modules}" \ |
960 |
- --enable-auth-digest="${digest_modules}" \ |
961 |
- --enable-auth-ntlm="${ntlm_modules}" \ |
962 |
- --enable-auth-negotiate="${negotiate_modules}" \ |
963 |
- --enable-external-acl-helpers="${ext_helpers}" \ |
964 |
- --enable-log-daemon-helpers \ |
965 |
- --enable-url-rewrite-helpers \ |
966 |
- --enable-cache-digests \ |
967 |
- --enable-delay-pools \ |
968 |
- --enable-eui \ |
969 |
- --enable-icmp \ |
970 |
- --enable-follow-x-forwarded-for \ |
971 |
- --with-large-files \ |
972 |
- --with-build-environment=default \ |
973 |
- --disable-strict-error-checking \ |
974 |
- --disable-arch-native \ |
975 |
- --with-ltdl-includedir=/usr/include \ |
976 |
- --with-ltdl-libdir=/usr/$(get_libdir) \ |
977 |
- $(use_with caps libcap) \ |
978 |
- $(use_enable ipv6) \ |
979 |
- $(use_enable snmp) \ |
980 |
- $(use_with ssl openssl) \ |
981 |
- $(use_with ssl nettle) \ |
982 |
- $(use_with ssl gnutls) \ |
983 |
- $(use_enable ssl-crtd) \ |
984 |
- $(use_enable ecap) \ |
985 |
- $(use_enable esi) \ |
986 |
- $(use_enable htcp) \ |
987 |
- $(use_enable wccp) \ |
988 |
- $(use_enable wccpv2) \ |
989 |
- ${transparent} \ |
990 |
- ${myconf} |
991 |
-} |
992 |
- |
993 |
-src_install() { |
994 |
- emake DESTDIR="${D}" install |
995 |
- |
996 |
- # need suid root for looking into /etc/shadow |
997 |
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth |
998 |
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth |
999 |
- if use pam; then |
1000 |
- fowners root:squid /usr/libexec/squid/basic_pam_auth |
1001 |
- fperms 4750 /usr/libexec/squid/basic_pam_auth |
1002 |
- fi |
1003 |
- # pinger needs suid as well |
1004 |
- fowners root:squid /usr/libexec/squid/pinger |
1005 |
- fperms 4750 /usr/libexec/squid/pinger |
1006 |
- |
1007 |
- # these scripts depend on perl |
1008 |
- if ! use perl; then |
1009 |
- local f |
1010 |
- local PERL_SCRIPTS=( |
1011 |
- "${D}"/usr/libexec/squid/basic_pop3_auth |
1012 |
- "${D}"/usr/libexec/squid/log_db_daemon |
1013 |
- "${D}"/usr/libexec/squid/basic_msnt_multi_domain_auth |
1014 |
- "${D}"/usr/libexec/squid/storeid_file_rewrite |
1015 |
- "${D}"/usr/libexec/squid/helper-mux.pl |
1016 |
- ) |
1017 |
- for f in "${PERL_SCRIPTS[@]}"; do |
1018 |
- rm -v "${f}" || die |
1019 |
- done |
1020 |
- fi |
1021 |
- |
1022 |
- # cleanup |
1023 |
- rm -f "${D}"/usr/bin/Run* |
1024 |
- rm -rf "${D}"/run/squid "${D}"/var/cache/squid |
1025 |
- |
1026 |
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt |
1027 |
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos |
1028 |
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS |
1029 |
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group |
1030 |
- newdoc tools/purge/README README.purge |
1031 |
- newdoc tools/helper-mux.README README.helper-mux |
1032 |
- dodoc RELEASENOTES.html |
1033 |
- |
1034 |
- newpamd "${FILESDIR}/squid.pam" squid |
1035 |
- newconfd "${FILESDIR}/squid.confd-r1" squid |
1036 |
- newinitd "${FILESDIR}/squid.initd-r4" squid |
1037 |
- if use logrotate; then |
1038 |
- insinto /etc/logrotate.d |
1039 |
- newins "${FILESDIR}/squid.logrotate" squid |
1040 |
- else |
1041 |
- exeinto /etc/cron.weekly |
1042 |
- newexe "${FILESDIR}/squid.cron" squid.cron |
1043 |
- fi |
1044 |
- |
1045 |
- diropts -m0750 -o squid -g squid |
1046 |
- keepdir /var/log/squid /etc/ssl/squid /var/lib/squid |
1047 |
-} |
1048 |
|
1049 |
diff --git a/net-proxy/squid/squid-3.5.28.ebuild b/net-proxy/squid/squid-3.5.28.ebuild |
1050 |
deleted file mode 100644 |
1051 |
index c0af6b07ce1..00000000000 |
1052 |
--- a/net-proxy/squid/squid-3.5.28.ebuild |
1053 |
+++ /dev/null |
1054 |
@@ -1,267 +0,0 @@ |
1055 |
-# Copyright 1999-2018 Gentoo Foundation |
1056 |
-# Distributed under the terms of the GNU General Public License v2 |
1057 |
- |
1058 |
-EAPI=7 |
1059 |
-inherit autotools linux-info pam toolchain-funcs user |
1060 |
- |
1061 |
-DESCRIPTION="A full-featured web proxy cache" |
1062 |
-HOMEPAGE="http://www.squid-cache.org/" |
1063 |
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz" |
1064 |
- |
1065 |
-LICENSE="GPL-2" |
1066 |
-SLOT="0" |
1067 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
1068 |
-IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \ |
1069 |
- ecap esi ssl-crtd \ |
1070 |
- mysql postgres sqlite \ |
1071 |
- perl qos tproxy \ |
1072 |
- +htcp +wccp +wccpv2 \ |
1073 |
- pf-transparent ipf-transparent kqueue \ |
1074 |
- elibc_uclibc kernel_linux" |
1075 |
- |
1076 |
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
1077 |
- pam? ( virtual/pam ) |
1078 |
- ldap? ( net-nds/openldap ) |
1079 |
- kerberos? ( virtual/krb5 ) |
1080 |
- qos? ( net-libs/libnetfilter_conntrack ) |
1081 |
- ssl? ( |
1082 |
- libressl? ( dev-libs/libressl:0 ) |
1083 |
- !libressl? ( dev-libs/openssl:0 ) |
1084 |
- dev-libs/nettle >=net-libs/gnutls-3.1.5 ) |
1085 |
- sasl? ( dev-libs/cyrus-sasl ) |
1086 |
- ecap? ( net-libs/libecap:1 ) |
1087 |
- esi? ( dev-libs/expat dev-libs/libxml2 ) |
1088 |
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
1089 |
- >=sys-libs/db-4:* |
1090 |
- dev-libs/libltdl:0" |
1091 |
-DEPEND="${COMMON_DEPEND} |
1092 |
- dev-lang/perl |
1093 |
- ecap? ( virtual/pkgconfig ) |
1094 |
- test? ( dev-util/cppunit )" |
1095 |
-RDEPEND="${COMMON_DEPEND} |
1096 |
- samba? ( net-fs/samba ) |
1097 |
- perl? ( dev-lang/perl ) |
1098 |
- mysql? ( dev-perl/DBD-mysql ) |
1099 |
- postgres? ( dev-perl/DBD-Pg ) |
1100 |
- selinux? ( sec-policy/selinux-squid ) |
1101 |
- sqlite? ( dev-perl/DBD-SQLite ) |
1102 |
- !<=sci-biology/meme-4.8.1-r1" |
1103 |
- |
1104 |
-REQUIRED_USE="tproxy? ( caps ) |
1105 |
- qos? ( caps )" |
1106 |
- |
1107 |
-pkg_pretend() { |
1108 |
- if use tproxy; then |
1109 |
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" |
1110 |
- linux-info_pkg_setup |
1111 |
- fi |
1112 |
-} |
1113 |
- |
1114 |
-pkg_setup() { |
1115 |
- enewgroup squid |
1116 |
- enewuser squid -1 -1 /var/cache/squid squid |
1117 |
-} |
1118 |
- |
1119 |
-src_prepare() { |
1120 |
- eapply "${FILESDIR}/${PN}-3.5.7-gentoo.patch" |
1121 |
- eapply -p0 "${FILESDIR}/${PN}-cppunit-1.14.patch" |
1122 |
- #eapply "${FILESDIR}/${PN}-2018-1.patch" |
1123 |
- #eapply "${FILESDIR}/${PN}-2018-2.patch" |
1124 |
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
1125 |
- INSTALL QUICKSTART \ |
1126 |
- scripts/fileno-to-pathname.pl \ |
1127 |
- scripts/check_cache.pl \ |
1128 |
- tools/cachemgr.cgi.8 \ |
1129 |
- tools/purge/conffile.hh \ |
1130 |
- tools/purge/README || die |
1131 |
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ |
1132 |
- INSTALL QUICKSTART || die |
1133 |
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ |
1134 |
- QUICKSTART || die |
1135 |
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \ |
1136 |
- QUICKSTART \ |
1137 |
- src/log/access_log.cc || die |
1138 |
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ |
1139 |
- src/log/access_log.cc || die |
1140 |
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ |
1141 |
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \ |
1142 |
- helpers/external_acl/session/ext_session_acl.8 \ |
1143 |
- src/ssl/ssl_crtd.8 || die |
1144 |
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ |
1145 |
- scripts/check_cache.pl || die |
1146 |
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ |
1147 |
- src/ssl/ssl_crtd.8 || die |
1148 |
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
1149 |
- src/ssl/ssl_crtd.8 || die |
1150 |
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
1151 |
- src/ssl/ssl_crtd.8 || die |
1152 |
- # /var/run/squid to /run/squid |
1153 |
- sed -i -e 's:$(localstatedir)::' \ |
1154 |
- src/ipc/Makefile.am || die |
1155 |
- sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \ |
1156 |
- libltdl/configure.ac || die |
1157 |
- |
1158 |
- eapply_user |
1159 |
- eautoreconf |
1160 |
-} |
1161 |
- |
1162 |
-src_configure() { |
1163 |
- local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam" |
1164 |
- use samba && basic_modules+=",SMB" |
1165 |
- use ldap && basic_modules+=",LDAP" |
1166 |
- use pam && basic_modules+=",PAM" |
1167 |
- use sasl && basic_modules+=",SASL" |
1168 |
- use nis && ! use elibc_uclibc && basic_modules+=",NIS" |
1169 |
- use radius && basic_modules+=",RADIUS" |
1170 |
- if use mysql || use postgres || use sqlite ; then |
1171 |
- basic_modules+=",DB" |
1172 |
- fi |
1173 |
- |
1174 |
- local digest_modules="file" |
1175 |
- use ldap && digest_modules+=",LDAP,eDirectory" |
1176 |
- |
1177 |
- local negotiate_modules="none" |
1178 |
- local myconf="--without-mit-krb5 --without-heimdal-krb5" |
1179 |
- if use kerberos ; then |
1180 |
- negotiate_modules="kerberos,wrapper" |
1181 |
- if has_version app-crypt/heimdal ; then |
1182 |
- myconf="--without-mit-krb5 --with-heimdal-krb5" |
1183 |
- else |
1184 |
- myconf="--with-mit-krb5 --without-heimdal-krb5" |
1185 |
- fi |
1186 |
- fi |
1187 |
- |
1188 |
- local ntlm_modules="none" |
1189 |
- use samba && ntlm_modules="smb_lm" |
1190 |
- |
1191 |
- local ext_helpers="file_userip,session,unix_group" |
1192 |
- use samba && ext_helpers+=",wbinfo_group" |
1193 |
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" |
1194 |
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" |
1195 |
- |
1196 |
- local storeio_modules="aufs,diskd,rock,ufs" |
1197 |
- |
1198 |
- local transparent |
1199 |
- if use kernel_linux ; then |
1200 |
- transparent+=" --enable-linux-netfilter" |
1201 |
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
1202 |
- fi |
1203 |
- |
1204 |
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
1205 |
- transparent+=" $(use_enable kqueue)" |
1206 |
- if use pf-transparent; then |
1207 |
- transparent+=" --enable-pf-transparent" |
1208 |
- elif use ipf-transparent; then |
1209 |
- transparent+=" --enable-ipf-transparent" |
1210 |
- fi |
1211 |
- fi |
1212 |
- |
1213 |
- tc-export_build_env BUILD_CXX |
1214 |
- export BUILDCXX=${BUILD_CXX} |
1215 |
- export BUILDCXXFLAGS=${BUILD_CXXFLAGS} |
1216 |
- tc-export CC AR |
1217 |
- |
1218 |
- # Should be able to drop this workaround with newer versions. |
1219 |
- # https://bugs.squid-cache.org/show_bug.cgi?id=4224 |
1220 |
- tc-is-cross-compiler && export squid_cv_gnu_atomics=no |
1221 |
- |
1222 |
- econf \ |
1223 |
- --sysconfdir=/etc/squid \ |
1224 |
- --libexecdir=/usr/libexec/squid \ |
1225 |
- --localstatedir=/var \ |
1226 |
- --with-pidfile=/run/squid.pid \ |
1227 |
- --datadir=/usr/share/squid \ |
1228 |
- --with-logdir=/var/log/squid \ |
1229 |
- --with-default-user=squid \ |
1230 |
- --enable-removal-policies="lru,heap" \ |
1231 |
- --enable-storeio="${storeio_modules}" \ |
1232 |
- --enable-disk-io \ |
1233 |
- --enable-auth-basic="${basic_modules}" \ |
1234 |
- --enable-auth-digest="${digest_modules}" \ |
1235 |
- --enable-auth-ntlm="${ntlm_modules}" \ |
1236 |
- --enable-auth-negotiate="${negotiate_modules}" \ |
1237 |
- --enable-external-acl-helpers="${ext_helpers}" \ |
1238 |
- --enable-log-daemon-helpers \ |
1239 |
- --enable-url-rewrite-helpers \ |
1240 |
- --enable-cache-digests \ |
1241 |
- --enable-delay-pools \ |
1242 |
- --enable-eui \ |
1243 |
- --enable-icmp \ |
1244 |
- --enable-follow-x-forwarded-for \ |
1245 |
- --with-large-files \ |
1246 |
- --with-build-environment=default \ |
1247 |
- --disable-strict-error-checking \ |
1248 |
- --disable-arch-native \ |
1249 |
- --with-ltdl-includedir=/usr/include \ |
1250 |
- --with-ltdl-libdir=/usr/$(get_libdir) \ |
1251 |
- $(use_with caps libcap) \ |
1252 |
- $(use_enable ipv6) \ |
1253 |
- $(use_enable snmp) \ |
1254 |
- $(use_with ssl openssl) \ |
1255 |
- $(use_with ssl nettle) \ |
1256 |
- $(use_with ssl gnutls) \ |
1257 |
- $(use_enable ssl-crtd) \ |
1258 |
- $(use_enable ecap) \ |
1259 |
- $(use_enable esi) \ |
1260 |
- $(use_enable htcp) \ |
1261 |
- $(use_enable wccp) \ |
1262 |
- $(use_enable wccpv2) \ |
1263 |
- ${transparent} \ |
1264 |
- ${myconf} |
1265 |
-} |
1266 |
- |
1267 |
-src_install() { |
1268 |
- emake DESTDIR="${D}" install |
1269 |
- |
1270 |
- # need suid root for looking into /etc/shadow |
1271 |
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth |
1272 |
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth |
1273 |
- if use pam; then |
1274 |
- fowners root:squid /usr/libexec/squid/basic_pam_auth |
1275 |
- fperms 4750 /usr/libexec/squid/basic_pam_auth |
1276 |
- fi |
1277 |
- # pinger needs suid as well |
1278 |
- fowners root:squid /usr/libexec/squid/pinger |
1279 |
- fperms 4750 /usr/libexec/squid/pinger |
1280 |
- |
1281 |
- # these scripts depend on perl |
1282 |
- if ! use perl; then |
1283 |
- local f |
1284 |
- local PERL_SCRIPTS=( |
1285 |
- "${D}"/usr/libexec/squid/basic_pop3_auth |
1286 |
- "${D}"/usr/libexec/squid/log_db_daemon |
1287 |
- "${D}"/usr/libexec/squid/basic_msnt_multi_domain_auth |
1288 |
- "${D}"/usr/libexec/squid/storeid_file_rewrite |
1289 |
- "${D}"/usr/libexec/squid/helper-mux.pl |
1290 |
- ) |
1291 |
- for f in "${PERL_SCRIPTS[@]}"; do |
1292 |
- rm -v "${f}" || die |
1293 |
- done |
1294 |
- fi |
1295 |
- |
1296 |
- # cleanup |
1297 |
- rm -f "${D}"/usr/bin/Run* |
1298 |
- rm -rf "${D}"/run/squid "${D}"/var/cache/squid |
1299 |
- |
1300 |
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt |
1301 |
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos |
1302 |
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS |
1303 |
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group |
1304 |
- newdoc tools/purge/README README.purge |
1305 |
- newdoc tools/helper-mux.README README.helper-mux |
1306 |
- dodoc RELEASENOTES.html |
1307 |
- |
1308 |
- newpamd "${FILESDIR}/squid.pam" squid |
1309 |
- newconfd "${FILESDIR}/squid.confd-r1" squid |
1310 |
- newinitd "${FILESDIR}/squid.initd-r4" squid |
1311 |
- if use logrotate; then |
1312 |
- insinto /etc/logrotate.d |
1313 |
- newins "${FILESDIR}/squid.logrotate" squid |
1314 |
- else |
1315 |
- exeinto /etc/cron.weekly |
1316 |
- newexe "${FILESDIR}/squid.cron" squid.cron |
1317 |
- fi |
1318 |
- |
1319 |
- diropts -m0750 -o squid -g squid |
1320 |
- keepdir /var/log/squid /etc/ssl/squid /var/lib/squid |
1321 |
-} |