1 |
commit: 827d9830a7027a23b5f1b99525748e4152b7f0eb |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 1 18:15:07 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 1 18:15:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827d9830 |
7 |
|
8 |
net-misc/siproxd: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/520626 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
net-misc/siproxd/Manifest | 2 - |
14 |
.../files/siproxd-0.8.1-amd64_static_build.patch | 26 ----- |
15 |
net-misc/siproxd/files/siproxd-libtool-2.4.patch | 13 --- |
16 |
net-misc/siproxd/files/siproxd.rc6 | 30 ------ |
17 |
net-misc/siproxd/files/siproxd.rc8 | 21 ---- |
18 |
net-misc/siproxd/metadata.xml | 8 -- |
19 |
net-misc/siproxd/siproxd-0.8.0-r3.ebuild | 108 -------------------- |
20 |
net-misc/siproxd/siproxd-0.8.1-r2.ebuild | 109 --------------------- |
21 |
profiles/package.mask | 5 - |
22 |
9 files changed, 322 deletions(-) |
23 |
|
24 |
diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest |
25 |
deleted file mode 100644 |
26 |
index 12cc618d022..00000000000 |
27 |
--- a/net-misc/siproxd/Manifest |
28 |
+++ /dev/null |
29 |
@@ -1,2 +0,0 @@ |
30 |
-DIST siproxd-0.8.0.tar.gz 824404 BLAKE2B 5a53d80dfcfe81070c73a37de95290bce59a3a7d5aab61ce90da587daf422f87932f26d0007f07d4abefe2526b91db8914bdf1944316e58b99734d89d4918a33 SHA512 eb14a6f7a893e3347d316feedca89c1700e2977b9671da7d77c475993137b049e5caad5254e19dc00f5cb4f0f0c767188cdfb02bb16238dd7b56473886063440 |
31 |
-DIST siproxd-0.8.1.tar.gz 833170 BLAKE2B 8e1ab78b98982140d3987a8383e91e1881e6ddd3645fc47d46747939391a3a0e10d457c10b41a526a478ca0969dd730be40103dc63db19c3593294c3b0070f66 SHA512 b47c7b74b4d3adeb4fd9536f82c014a123a6fcbe508a4982c9e77e53a8c68b05bc32799f57cf749e860b3e1f19f6502dbea561a410975f9f095754748515964f |
32 |
|
33 |
diff --git a/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch b/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch |
34 |
deleted file mode 100644 |
35 |
index af491c167da..00000000000 |
36 |
--- a/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch |
37 |
+++ /dev/null |
38 |
@@ -1,26 +0,0 @@ |
39 |
---- siproxd-0.8.1/configure.in |
40 |
-+++ siproxd-0.8.1/configure.in |
41 |
-@@ -361,8 +361,9 @@ |
42 |
- dnl link statically to this lib |
43 |
- dnl (this probably only will work on linux yet...) |
44 |
- AC_MSG_CHECKING("where I can find libosip2.a") |
45 |
-- libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \ |
46 |
-- /usr/lib /usr/local/lib \ |
47 |
-+ libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \ |
48 |
-+ $libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \ |
49 |
-+ /usr/lib /usr/local/lib64 /usr/local/lib \ |
50 |
- -name libosip2.a 2>/dev/null|head -1` |
51 |
- if test "x$libosip_static" != "x"; then |
52 |
- LIBS="$libosip_static $LIBS" |
53 |
-@@ -371,8 +372,9 @@ |
54 |
- echo "*** ERROR: a static libosip library is required!";exit 1; |
55 |
- fi |
56 |
- AC_MSG_CHECKING("where I can find libosipparser2.a") |
57 |
-- libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \ |
58 |
-- /usr/lib /usr/local/lib \ |
59 |
-+ libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \ |
60 |
-+ $libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \ |
61 |
-+ /usr/lib /ur/local/lib64 /usr/local/lib \ |
62 |
- -name libosipparser2.a 2>/dev/null|head -1` |
63 |
- if test "x$libosip_static" != "x"; then |
64 |
- LIBS="$libosip_static $LIBS" |
65 |
|
66 |
diff --git a/net-misc/siproxd/files/siproxd-libtool-2.4.patch b/net-misc/siproxd/files/siproxd-libtool-2.4.patch |
67 |
deleted file mode 100644 |
68 |
index 189b32090f7..00000000000 |
69 |
--- a/net-misc/siproxd/files/siproxd-libtool-2.4.patch |
70 |
+++ /dev/null |
71 |
@@ -1,13 +0,0 @@ |
72 |
-diff -r -U 2 a/src/plugins.h b/src/plugins.h |
73 |
---- a/src/plugins.h 2010-01-07 12:44:38.000000000 +0100 |
74 |
-+++ b/src/plugins.h 2010-06-19 13:56:30.960679284 +0200 |
75 |
-@@ -25,4 +25,8 @@ |
76 |
- |
77 |
- |
78 |
-+#ifndef lt__PROGRAM__LTX_preloaded_symbols |
79 |
-+#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols |
80 |
-+extern const void *lt_preloaded_symbols[]; |
81 |
-+#endif |
82 |
- |
83 |
- /* Plugins must return STS_SUCCESS / SUCCESS_FAILURE */ |
84 |
- |
85 |
|
86 |
diff --git a/net-misc/siproxd/files/siproxd.rc6 b/net-misc/siproxd/files/siproxd.rc6 |
87 |
deleted file mode 100644 |
88 |
index 0ec75e159f7..00000000000 |
89 |
--- a/net-misc/siproxd/files/siproxd.rc6 |
90 |
+++ /dev/null |
91 |
@@ -1,30 +0,0 @@ |
92 |
-#!/sbin/openrc-run |
93 |
-# Copyright 1999-2016 Gentoo Foundation |
94 |
-# Distributed under the terms of the GNU General Public License v2 |
95 |
- |
96 |
-depend() { |
97 |
- need net |
98 |
-} |
99 |
- |
100 |
-check_config() { |
101 |
- if [[ ! -f /etc/siproxd.conf ]]; then |
102 |
- eerror "Please create /etc/siproxd.conf first!" |
103 |
- return 1 |
104 |
- fi |
105 |
- return 0 |
106 |
-} |
107 |
- |
108 |
-start() { |
109 |
- check_config || return 1 |
110 |
- |
111 |
- ebegin "Starting siproxd" |
112 |
- start-stop-daemon --start --exec /usr/sbin/siproxd -- \ |
113 |
- -p /var/run/siproxd/siproxd.pid -c /etc/siproxd.conf |
114 |
- eend $? |
115 |
-} |
116 |
- |
117 |
-stop() { |
118 |
- ebegin "Stopping siproxd" |
119 |
- start-stop-daemon --stop --pidfile /var/run/siproxd/siproxd.pid |
120 |
- eend $? |
121 |
-} |
122 |
|
123 |
diff --git a/net-misc/siproxd/files/siproxd.rc8 b/net-misc/siproxd/files/siproxd.rc8 |
124 |
deleted file mode 100644 |
125 |
index 017783025f1..00000000000 |
126 |
--- a/net-misc/siproxd/files/siproxd.rc8 |
127 |
+++ /dev/null |
128 |
@@ -1,21 +0,0 @@ |
129 |
-#!/sbin/openrc-run |
130 |
-# Copyright 1999-2016 Gentoo Foundation |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
- |
133 |
-config_file="/etc/siproxd.conf" |
134 |
- |
135 |
-pidfile="/var/run/siproxd/siproxd.pid" |
136 |
-command="/usr/sbin/siproxd" |
137 |
-command_args="-p ${pidfile} -c ${config_file}" |
138 |
- |
139 |
-depend() { |
140 |
- need net |
141 |
-} |
142 |
- |
143 |
-start_pre() { |
144 |
- if [ ! -f "${config_file}" ] ; then |
145 |
- eerror "Please create ${config_file} first!" |
146 |
- return 1 |
147 |
- fi |
148 |
- checkpath -q -d ${pidfile%/*} -o siproxd:siproxd |
149 |
-} |
150 |
|
151 |
diff --git a/net-misc/siproxd/metadata.xml b/net-misc/siproxd/metadata.xml |
152 |
deleted file mode 100644 |
153 |
index 91288ffa73c..00000000000 |
154 |
--- a/net-misc/siproxd/metadata.xml |
155 |
+++ /dev/null |
156 |
@@ -1,8 +0,0 @@ |
157 |
-<?xml version="1.0" encoding="UTF-8"?> |
158 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
159 |
-<pkgmetadata> |
160 |
- <!-- maintainer-needed --> |
161 |
- <upstream> |
162 |
- <remote-id type="sourceforge">siproxd</remote-id> |
163 |
- </upstream> |
164 |
-</pkgmetadata> |
165 |
|
166 |
diff --git a/net-misc/siproxd/siproxd-0.8.0-r3.ebuild b/net-misc/siproxd/siproxd-0.8.0-r3.ebuild |
167 |
deleted file mode 100644 |
168 |
index bb230657846..00000000000 |
169 |
--- a/net-misc/siproxd/siproxd-0.8.0-r3.ebuild |
170 |
+++ /dev/null |
171 |
@@ -1,108 +0,0 @@ |
172 |
-# Copyright 1999-2016 Gentoo Foundation |
173 |
-# Distributed under the terms of the GNU General Public License v2 |
174 |
- |
175 |
-EAPI="5" |
176 |
- |
177 |
-inherit eutils autotools user |
178 |
- |
179 |
-DESCRIPTION="A proxy/masquerading daemon for the SIP protocol" |
180 |
-HOMEPAGE="http://siproxd.sourceforge.net/" |
181 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
182 |
- |
183 |
-LICENSE="GPL-2" |
184 |
-SLOT="0" |
185 |
-KEYWORDS="amd64 x86" |
186 |
-IUSE="examples doc static" |
187 |
-# TODO: debug can be used but dmalloc is breaking the build |
188 |
-# upstream has been contacted, see bug 2649238 in their bugtracker |
189 |
- |
190 |
-RDEPEND=">=net-libs/libosip-3.0.0 |
191 |
- <net-libs/libosip-4.0.0" |
192 |
-# debug? ( dev-libs/dmalloc[threads] )" |
193 |
-DEPEND="${RDEPEND} |
194 |
- >=sys-devel/libtool-2.4 |
195 |
- doc? ( app-text/docbook-sgml-utils |
196 |
- app-text/docbook-sgml-dtd:4.2 )" |
197 |
-# docbook-sgml-utils is for building doc |
198 |
-# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it |
199 |
- |
200 |
-pkg_setup() { |
201 |
- enewgroup siproxd |
202 |
- enewuser siproxd -1 -1 /dev/null siproxd |
203 |
-} |
204 |
- |
205 |
-src_prepare() { |
206 |
- default |
207 |
- |
208 |
- # make the daemon run as user 'siproxd' by default |
209 |
- sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \ |
210 |
- || die "patching doc/siproxd.conf.example failed" |
211 |
- # do not fail when building with external libltdl |
212 |
- sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed" |
213 |
- epatch "${FILESDIR}/${PN}-libtool-2.4.patch" |
214 |
- # do not crash when building with external libltdl, bug 308495 |
215 |
- sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed" |
216 |
- |
217 |
- eautoreconf |
218 |
-} |
219 |
- |
220 |
-src_configure() { |
221 |
- # static-libosip2 make it link statically against libosip2 |
222 |
- # static build static version of plugins, forced to true |
223 |
- econf \ |
224 |
- $(use_enable doc) \ |
225 |
- $(use_enable static static-libosip2) \ |
226 |
- --enable-static |
227 |
- #$(use debug && use_enable debug dmalloc) \ |
228 |
- |
229 |
- # statically linked plugins to libosip2 causes a shared lib linking with |
230 |
- # static lib (gcc seems not to like it : portable issue it says). |
231 |
- # there was also DT_TEXREL issue and stripping of static plugins failed |
232 |
- # so shared lib has to be used for plugins |
233 |
- # upstream has been contacted, see bug 2649351 in their bugtracker |
234 |
- if use static; then |
235 |
- sed -i -r -e \ |
236 |
- "s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ ]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 -losipparser2:" \ |
237 |
- src/Makefile || die "patching src/Makefile failed" |
238 |
- sed -i -e \ |
239 |
- "s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) \$(LIBS_STATIC):" \ |
240 |
- src/Makefile || die "patching src/Makefile failed" |
241 |
- fi |
242 |
-} |
243 |
- |
244 |
-src_install() { |
245 |
- einstall |
246 |
- |
247 |
- newinitd "${FILESDIR}"/${PN}.rc6 ${PN} |
248 |
- |
249 |
- dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \ |
250 |
- doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS |
251 |
- |
252 |
- if use doc; then |
253 |
- dodoc doc/RFC3261_compliance.txt |
254 |
- # auto-generated doc is not auto-installed |
255 |
- # upstream has been contacted, see bug 2649333 in their bugtracker |
256 |
- dohtml -r doc/html/ |
257 |
- # pdf is not build all the time |
258 |
- if has_version app-text/docbook-sgml-utils[jadetex]; then |
259 |
- dodoc doc/pdf/*.pdf |
260 |
- fi |
261 |
- fi |
262 |
- |
263 |
- if use examples; then |
264 |
- docinto examples |
265 |
- dodoc doc/sample_*.txt |
266 |
- fi |
267 |
- |
268 |
- # set up siproxd directories |
269 |
- keepdir /var/{lib,run}/${PN} |
270 |
- fowners siproxd:siproxd /var/{lib,run}/${PN} |
271 |
-} |
272 |
- |
273 |
-pkg_postinst() { |
274 |
- if use static; then |
275 |
- elog "static USE flag does not build a _fully_ statically linked binary" |
276 |
- elog "only libosip2 and libosipparser2 are statically linked" |
277 |
- elog "In addition, plugins are dynamically linked with those libs" |
278 |
- fi |
279 |
-} |
280 |
|
281 |
diff --git a/net-misc/siproxd/siproxd-0.8.1-r2.ebuild b/net-misc/siproxd/siproxd-0.8.1-r2.ebuild |
282 |
deleted file mode 100644 |
283 |
index 664fe43e1ff..00000000000 |
284 |
--- a/net-misc/siproxd/siproxd-0.8.1-r2.ebuild |
285 |
+++ /dev/null |
286 |
@@ -1,109 +0,0 @@ |
287 |
-# Copyright 1999-2016 Gentoo Foundation |
288 |
-# Distributed under the terms of the GNU General Public License v2 |
289 |
- |
290 |
-EAPI=5 |
291 |
- |
292 |
-inherit eutils autotools user |
293 |
- |
294 |
-DESCRIPTION="A proxy/masquerading daemon for the SIP protocol" |
295 |
-HOMEPAGE="http://siproxd.sourceforge.net/" |
296 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
297 |
- |
298 |
-LICENSE="GPL-2" |
299 |
-SLOT="0" |
300 |
-KEYWORDS="~amd64 ~x86" |
301 |
-IUSE="examples doc static" |
302 |
-# TODO: debug can be used but dmalloc is breaking the build |
303 |
-# upstream has been contacted, see bug 2649238 in their bugtracker |
304 |
- |
305 |
-RDEPEND=">=net-libs/libosip-3.0.0 |
306 |
- <net-libs/libosip-4.0.0" |
307 |
-# debug? ( dev-libs/dmalloc[threads] )" |
308 |
-DEPEND="${RDEPEND} |
309 |
- >=sys-devel/libtool-2.4 |
310 |
- doc? ( app-text/docbook-sgml-utils |
311 |
- app-text/docbook-sgml-dtd:4.2 )" |
312 |
-# docbook-sgml-utils is for building doc |
313 |
-# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it |
314 |
- |
315 |
-pkg_setup() { |
316 |
- enewgroup siproxd |
317 |
- enewuser siproxd -1 -1 /dev/null siproxd |
318 |
-} |
319 |
- |
320 |
-src_prepare() { |
321 |
- # make the daemon run as user 'siproxd' by default |
322 |
- sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \ |
323 |
- || die "patching doc/siproxd.conf.example failed" |
324 |
- # do not fail when building with external libltdl |
325 |
- sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed" |
326 |
- epatch "${FILESDIR}/${PN}-libtool-2.4.patch" |
327 |
- # do not crash when building with external libltdl, bug 308495 |
328 |
- sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed" |
329 |
- |
330 |
- epatch "${FILESDIR}/${PN}-0.8.1-amd64_static_build.patch" #380835 |
331 |
- |
332 |
- eautoreconf |
333 |
-} |
334 |
- |
335 |
-src_configure() { |
336 |
- # static-libosip2 make it link statically against libosip2 |
337 |
- # static build static version of plugins, forced to true |
338 |
- econf \ |
339 |
- $(use_enable doc) \ |
340 |
- $(use_enable static static-libosip2) \ |
341 |
- $(use_enable !static shared) \ |
342 |
- --enable-static |
343 |
- #$(use debug && use_enable debug dmalloc) \ |
344 |
- |
345 |
- # statically linked plugins to libosip2 causes a shared lib linking with |
346 |
- # static lib (gcc seems not to like it : portable issue it says). |
347 |
- # there was also DT_TEXREL issue and stripping of static plugins failed |
348 |
- # so shared lib has to be used for plugins |
349 |
- # upstream has been contacted, see bug 2649351 in their bugtracker |
350 |
- if use static; then |
351 |
- sed -i -r -e \ |
352 |
- "s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ ]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 -losipparser2:" \ |
353 |
- src/Makefile || die "patching src/Makefile failed" |
354 |
- sed -i -e \ |
355 |
- "s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) \$(LIBS_STATIC):" \ |
356 |
- src/Makefile || die "patching src/Makefile failed" |
357 |
- fi |
358 |
-} |
359 |
- |
360 |
-src_install() { |
361 |
- default |
362 |
- |
363 |
- newinitd "${FILESDIR}"/${PN}.rc8 ${PN} |
364 |
- |
365 |
- dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \ |
366 |
- doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS |
367 |
- |
368 |
- if use doc; then |
369 |
- dodoc doc/RFC3261_compliance.txt |
370 |
- # auto-generated doc is not auto-installed |
371 |
- # upstream has been contacted, see bug 2649333 in their bugtracker |
372 |
- dohtml -r doc/html/ |
373 |
- # pdf is not build all the time |
374 |
- if has_version 'app-text/docbook-sgml-utils[jadetex]' ; then |
375 |
- dodoc doc/pdf/*.pdf |
376 |
- fi |
377 |
- fi |
378 |
- |
379 |
- if use examples; then |
380 |
- docinto examples |
381 |
- dodoc doc/sample_*.txt |
382 |
- fi |
383 |
- |
384 |
- # set up siproxd directories |
385 |
- keepdir /var/lib/${PN} |
386 |
- fowners siproxd:siproxd /var/lib/${PN} |
387 |
-} |
388 |
- |
389 |
-pkg_postinst() { |
390 |
- if use static; then |
391 |
- elog "static USE flag does not build a _fully_ statically linked binary" |
392 |
- elog "only libosip2 and libosipparser2 are statically linked" |
393 |
- elog "In addition, plugins are dynamically linked with those libs" |
394 |
- fi |
395 |
-} |
396 |
|
397 |
diff --git a/profiles/package.mask b/profiles/package.mask |
398 |
index 3b78e581a09..e8aeb523c8d 100644 |
399 |
--- a/profiles/package.mask |
400 |
+++ b/profiles/package.mask |
401 |
@@ -486,11 +486,6 @@ net-analyzer/nagvis |
402 |
# Removal in a month. |
403 |
media-plugins/alsaequal |
404 |
|
405 |
-# Pacho Ramos <pacho@g.o> (01 Nov 2018) |
406 |
-# Unmaintained, installs files in runtime dirs (#520626), requires old |
407 |
-# libosip. Removal in a month. |
408 |
-net-misc/siproxd |
409 |
- |
410 |
# Pacho Ramos <pacho@g.o> (01 Nov 2018) |
411 |
# All this packages are broken and need major version bumps to fix them. See |
412 |
# bug #504114, #486510, #510550, #511096, #517260, #551784, #616490, # |