[gentoo-commits] repo/gentoo:master commit in: net-misc/siproxd/files/, net-misc/siproxd/, profiles/

2018-12-01 Thread Michał Górny
commit: 827d9830a7027a23b5f1b99525748e4152b7f0eb
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec  1 18:15:07 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec  1 18:15:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827d9830

net-misc/siproxd: Remove last-rited pkg

Closes: https://bugs.gentoo.org/520626
Signed-off-by: Michał Górny  gentoo.org>

 net-misc/siproxd/Manifest  |   2 -
 .../files/siproxd-0.8.1-amd64_static_build.patch   |  26 -
 net-misc/siproxd/files/siproxd-libtool-2.4.patch   |  13 ---
 net-misc/siproxd/files/siproxd.rc6 |  30 --
 net-misc/siproxd/files/siproxd.rc8 |  21 
 net-misc/siproxd/metadata.xml  |   8 --
 net-misc/siproxd/siproxd-0.8.0-r3.ebuild   | 108 
 net-misc/siproxd/siproxd-0.8.1-r2.ebuild   | 109 -
 profiles/package.mask  |   5 -
 9 files changed, 322 deletions(-)

diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest
deleted file mode 100644
index 12cc618d022..000
--- a/net-misc/siproxd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST siproxd-0.8.0.tar.gz 824404 BLAKE2B 
5a53d80dfcfe81070c73a37de95290bce59a3a7d5aab61ce90da587daf422f87932f26d0007f07d4abefe2526b91db8914bdf1944316e58b99734d89d4918a33
 SHA512 
eb14a6f7a893e3347d316feedca89c1700e2977b9671da7d77c475993137b049e5caad5254e19dc00f5cb4f0f0c767188cdfb02bb16238dd7b56473886063440
-DIST siproxd-0.8.1.tar.gz 833170 BLAKE2B 
8e1ab78b98982140d3987a8383e91e1881e6ddd3645fc47d46747939391a3a0e10d457c10b41a526a478ca0969dd730be40103dc63db19c3593294c3b0070f66
 SHA512 
b47c7b74b4d3adeb4fd9536f82c014a123a6fcbe508a4982c9e77e53a8c68b05bc32799f57cf749e860b3e1f19f6502dbea561a410975f9f095754748515964f

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
deleted file mode 100644
index af491c167da..000
--- a/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
 siproxd-0.8.1/configure.in
-+++ siproxd-0.8.1/configure.in
-@@ -361,8 +361,9 @@
-dnl link statically to this lib
-dnl (this probably only will work on linux yet...)
-AC_MSG_CHECKING("where I can find libosip2.a")
--   libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \
--/usr/lib /usr/local/lib \
-+   libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \
-+  $libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \
-+/usr/lib /usr/local/lib64 /usr/local/lib \
- -name libosip2.a 2>/dev/null|head -1`
-if test "x$libosip_static" != "x"; then
-   LIBS="$libosip_static $LIBS"
-@@ -371,8 +372,9 @@
-   echo "*** ERROR: a static libosip library is required!";exit 1;
-fi
-AC_MSG_CHECKING("where I can find libosipparser2.a")
--   libosip_static=`find $extra_libs $libosip_prefix_dir/lib /lib \
--/usr/lib /usr/local/lib \
-+   libosip_static=`find $extra_libs $libosip_prefix_dir/lib64 \
-+  $libosip_prefix_dir/lib /lib64 /lib /usr/lib64 \
-+/usr/lib /ur/local/lib64 /usr/local/lib \
- -name libosipparser2.a 2>/dev/null|head -1`
-if test "x$libosip_static" != "x"; then
-   LIBS="$libosip_static $LIBS"

diff --git a/net-misc/siproxd/files/siproxd-libtool-2.4.patch 
b/net-misc/siproxd/files/siproxd-libtool-2.4.patch
deleted file mode 100644
index 189b32090f7..000
--- a/net-misc/siproxd/files/siproxd-libtool-2.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U 2 a/src/plugins.h b/src/plugins.h
 a/src/plugins.h2010-01-07 12:44:38.0 +0100
-+++ b/src/plugins.h2010-06-19 13:56:30.960679284 +0200
-@@ -25,4 +25,8 @@
- 
- 
-+#ifndef lt__PROGRAM__LTX_preloaded_symbols
-+#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
-+extern const void *lt_preloaded_symbols[];
-+#endif
-
- /* Plugins must return STS_SUCCESS / SUCCESS_FAILURE */
- 

diff --git a/net-misc/siproxd/files/siproxd.rc6 
b/net-misc/siproxd/files/siproxd.rc6
deleted file mode 100644
index 0ec75e159f7..000
--- a/net-misc/siproxd/files/siproxd.rc6
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   need net
-}
-
-check_config() {
-   if [[ ! -f /etc/siproxd.conf ]]; then
-   eerror "Please create /etc/siproxd.conf first!"
-   return 1
-   fi
-   return 0
-}
-
-start() {
-   check_config || return 1
-
-   ebegin "Starting siproxd"
-   start-stop-daemon --start --exec /usr/sbin/siproxd -- \
-   -p /var/run/siproxd/siproxd.pid -c /etc/siproxd.conf
-   eend $?
-}
-
-stop() {
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/siproxd/files/, net-misc/siproxd/

2016-05-03 Thread Austin English
commit: 0f1a5374b9792e20672f222fc38b2cbb8b5ef5f8
Author: Austin English  gentoo  org>
AuthorDate: Wed May  4 00:48:20 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed May  4 00:48:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1a5374

net-misc/siproxd: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

 net-misc/siproxd/files/siproxd.rc6   |   4 +-
 net-misc/siproxd/files/siproxd.rc7   |  31 -
 net-misc/siproxd/files/siproxd.rc8   |   4 +-
 net-misc/siproxd/siproxd-0.8.0-r3.ebuild | 109 ++
 net-misc/siproxd/siproxd-0.8.1-r2.ebuild | 110 +++
 5 files changed, 223 insertions(+), 35 deletions(-)

diff --git a/net-misc/siproxd/files/siproxd.rc6 
b/net-misc/siproxd/files/siproxd.rc6
index 9d7fae7..63ffe15 100644
--- a/net-misc/siproxd/files/siproxd.rc6
+++ b/net-misc/siproxd/files/siproxd.rc6
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-misc/siproxd/files/siproxd.rc7 
b/net-misc/siproxd/files/siproxd.rc7
deleted file mode 100644
index 88ba033..000
--- a/net-misc/siproxd/files/siproxd.rc7
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-   need net
-}
-
-check_config() {
-   if [[ ! -f /etc/siproxd.conf ]]; then
-   eerror "Please create /etc/siproxd.conf first!"
-   return 1
-   fi
-   return 0
-}
-
-start() {
-   check_config || return 1
-   checkpath -q -d /var/run/siproxd -o siproxd:siproxd
-   ebegin "Starting siproxd"
-   start-stop-daemon --start --exec /usr/sbin/siproxd -- \
-   -p /var/run/siproxd/siproxd.pid -c /etc/siproxd.conf
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping siproxd"
-   start-stop-daemon --stop --pidfile /var/run/siproxd/siproxd.pid
-   eend $?
-}

diff --git a/net-misc/siproxd/files/siproxd.rc8 
b/net-misc/siproxd/files/siproxd.rc8
index d85b32f..146fefb 100644
--- a/net-misc/siproxd/files/siproxd.rc8
+++ b/net-misc/siproxd/files/siproxd.rc8
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-misc/siproxd/siproxd-0.8.0-r3.ebuild 
b/net-misc/siproxd/siproxd-0.8.0-r3.ebuild
new file mode 100644
index 000..211c605
--- /dev/null
+++ b/net-misc/siproxd/siproxd-0.8.0-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools user
+
+DESCRIPTION="A proxy/masquerading daemon for the SIP protocol"
+HOMEPAGE="http://siproxd.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples doc static"
+# TODO: debug can be used but dmalloc is breaking the build
+# upstream has been contacted, see bug 2649238 in their bugtracker
+
+RDEPEND=">=net-libs/libosip-3.0.0
+   |' src/plugins.h || die "patching 
plugins.h failed"
+
+   eautoreconf
+}
+
+src_configure() {
+   # static-libosip2 make it link statically against libosip2
+   # static build static version of plugins, forced to true
+   econf \
+   $(use_enable doc) \
+   $(use_enable static static-libosip2) \
+   --enable-static
+   #$(use debug && use_enable debug dmalloc) \
+
+   # statically linked plugins to libosip2 causes a shared lib linking with
+   # static lib (gcc seems not to like it : portable issue it says).
+   # there was also DT_TEXREL issue and stripping of static plugins failed
+   # so shared lib has to be used for plugins
+   # upstream has been contacted, see bug 2649351 in their bugtracker
+   if use static; then
+   sed -i -r -e \
+   "s:LIBS =(.*)( \/[^ ]*libosip[^ ]*\.a)( \/[^ 
]*libosip[^ ]*\.a)(.*):LIBS_STATIC =\1\2\3\4\nLIBS = \1\4 -losip2 
-losipparser2:" \
+   src/Makefile || die "patching src/Makefile failed"
+   sed -i -e \
+   "s:\$(siproxd_LDADD) \$(LIBS):\$(siproxd_LDADD) 
\$(LIBS_STATIC):" \
+   src/Makefile || die "patching src/Makefile failed"
+   fi
+}
+
+src_install() {
+   einstall
+
+   newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
+
+   dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
+   doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS
+
+   if use doc; then
+   dodoc