EAPI-bump. Rewrote init script. Fixed static build on amd64 (bug #380835)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 182 insertions, 15 deletions

diff --git a/net-misc/siproxd/ChangeLog b/net-misc/siproxd/ChangeLog
index d87d1385ea7c..f5e535c17c11 100644
--- a/net-misc/siproxd/ChangeLog
+++ b/net-misc/siproxd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/siproxd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.27 2014/01/08 06:37:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.28 2014/03/03 13:47:10 polynomial-c Exp $
+
+*siproxd-0.8.1-r1 (03 Mar 2014)
+
+  03 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> +siproxd-0.8.1-r1.ebuild,
+  +files/siproxd-0.8.1-amd64_static_build.patch, +files/siproxd.rc8:
+  EAPI-bump. Rewrote init script. Fixed static build on amd64 (bug #380835).
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> siproxd-0.8.0-r2.ebuild,
   siproxd-0.8.1.ebuild:
diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest
index 09ac2ae6c310..0ad73c040d23 100644
--- a/net-misc/siproxd/Manifest
+++ b/net-misc/siproxd/Manifest
@@ -1,29 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX siproxd-0.8.1-amd64_static_build.patch 1280 SHA256 37cb3e54c6bb42ad1ad68b46f53e8b66f1d0d58af70af0017edab4693762457e SHA512 d29f9d48127fa10e17a50c364ca2a50886a88e3b449ff2ef68ac08596d8f1cb84a5b088d888a76c79391c571ed506934fd2add6136ba10ee6718ce686ae99bd7 WHIRLPOOL 304f80a82b0b98f462d2bc20b0240f074c4e0bed76d43b699faae327c3172c7b3c02af5f764b7325464fbf728f6a9008af279f751f7a9e2dc096e37feb0c2df5
 AUX siproxd-libtool-2.4.patch 412 SHA256 3455d3a324758d2f719f515a5a1c7950fb605502c5af2d1cbd3cb49dace854bc SHA512 7ea24a99d65ecc8586473d49b7d485f27634c54290b23821313b1698bb495cf96db0b997d8cb48673a6291a538d5d31d1ee3089187c3d4f500727bc857de5f0c WHIRLPOOL 9bc6ea1b01c4726a6673535026ecba1fe2b21e2bcad459d689825445a1485e0f52d89034e8485b89560f89b28c7b3965db56bfa7237878640c45723b1159ceb9
 AUX siproxd.rc6 691 SHA256 b0e41722da2ce7b97abe2663d1b83fe764edd69c810d24708a8ab7f938811b26 SHA512 40fd7f0fa25d4e20a2a66456b516a6f1a1e139ba993696792c1f88e672860fca5f92966718b77ae2a253107d180dcacb3e12c026708a703cc6e93bd9729986a7 WHIRLPOOL 7e4136389a15be0024772ef1a38fff7031d4e787275172c91ab6dbd5e617df091ef3dbc63a0638715ed8f6a8714cbb216007e3fbfceb3a022cd0b01b99210520
 AUX siproxd.rc7 747 SHA256 9706ab45a36d7ae5ace552b73869c3506da4a4998aef1ef4eac62c671d1802ca SHA512 ffcf323ea2e934e5499a6e2826553c00a82bf9a8d95bccdf4737ec64acd79835d85ba040479ca42b2324ef554d747b6b238cb92b21f46840ff8d33d318b71a0f WHIRLPOOL d2b10ae886cd8f7491cfb1ed7a183e971131ba265b820bf0d16cf6ecaa967d76ad8ba2e8c81e29474065df48aa12c4c8e0a915eb925654f0b551e8672eb67bf0
+AUX siproxd.rc8 574 SHA256 b347dd6d86bc8de85514a208cca2eb29ec948f6b0abbb2e60fe5db94d4a2041e SHA512 441efa94313fcf165e2ce0e543c4e45338910f2643f54bb4a673f6d3a6c0d2741a89366514a886a90c980a9f684a8567c861a0679048c2ffa94e3fda44c1b8d8 WHIRLPOOL 41af576e966e39f5e09c822bce5bdf5581db52646d9164a3375a9172ad3513e4a19e6c7fae355e8b4809db113485ddc60a833d77b022817ec0dfa8f3dfe0f13c
 DIST siproxd-0.8.0.tar.gz 824404 SHA256 1a0306dbf5dd65f2c6d779bd449cbabba8c1a4cc79ca034e9cc83836c60f8542 SHA512 eb14a6f7a893e3347d316feedca89c1700e2977b9671da7d77c475993137b049e5caad5254e19dc00f5cb4f0f0c767188cdfb02bb16238dd7b56473886063440 WHIRLPOOL a9e618d14b5a5cd9ed954baf121f905c8024ecd069b95db730d4bff0c19590fbc8928b8d4fe51f37959d9ce506136662aaea50590038e01de96d844f41280554
 DIST siproxd-0.8.1.tar.gz 833170 SHA256 df2df04faf5bdb4980cbdfd5516a47898fc47ca1ebc2c628aa48305b20a09dad SHA512 b47c7b74b4d3adeb4fd9536f82c014a123a6fcbe508a4982c9e77e53a8c68b05bc32799f57cf749e860b3e1f19f6502dbea561a410975f9f095754748515964f WHIRLPOOL e70e79113af3fa0e0a00154c474ca89b7587202ef806c31df5fa9d79d2a813ba6fa3fa006fe8971bac5fed54b85540ae44116a8eb0c262a6bb29e5dcc3a4c612
 EBUILD siproxd-0.8.0-r2.ebuild 3649 SHA256 84fa3e42d4c0ae9307350660be08d417998c672bd63b8132a31a622ecae0550c SHA512 3ec533aa08b8c23f22570c6c21c69a1dfbeb0d705b337f40a020f0b1f82ba077c3c02ac362c7980e86790b57b4ee736fdf1d74da8b0d511d811788319a467aa0 WHIRLPOOL 287e9a85b773848187fc226560873d1571a3a3e3faa56c557c609fb8e747f62c91af8387bbfd92dca436b9950abed263bd187692a8268cdcf16110eccd7a65ca
+EBUILD siproxd-0.8.1-r1.ebuild 3533 SHA256 540fb41a4576862ab1cdaa0cfd66de651a7f068d19f0363fc68d857cbd3ad826 SHA512 d2929cc59cdcff61fb78648793fce5ca544352cf384f29579f548fe41da744606a756c9ed3159e2f9da008a8d2be66ff7f82e7741fc68daf05b75ee94e093f96 WHIRLPOOL 9c24a3b9d2428e741208b6c617df8d6afc9ed578e9f018b399a415880454577341683548a5e6e02c30ff60bd0c0ab51bc6bf903351869d94da78a551edec7e8a
 EBUILD siproxd-0.8.1.ebuild 3636 SHA256 fc10c87c5c1d2593b2b52b841aa8f8b58f1468b2efee821a15f92a8f4bb43982 SHA512 0e4121d401664f38cc2e0092231ffc1a8c4c4110f14f493e8c53441e5b095e7959c08e3007681e8e618b1db8d7593d062761049d54817429d2336fef4785be3d WHIRLPOOL 0cd3cb93c8e0f75825ce462da73990b3727b7b1d1911f4c4a6a3bb21d5d13552c906a17d2654e12f21aa861a6a5175d51d5f627beb104fae6c381dbfd20d4475
-MISC ChangeLog 4375 SHA256 0201de17462d6a07c1b340ec1682d154bd060e46bf1ce30a75cf753adc01a076 SHA512 ba58ac8f0e0adcc1e824b670e89bfad6fef070caecffc76c061facaafce1b979be2141de63f06baf0abc1dcca9d5dea70fbce4b53c4561ee8d55f7dd6c137559 WHIRLPOOL 949a03c52651ae24ff28197bbf3a3ce0cd42d4a32b0d2d52b814af432cb3304321dd0aff489ae506b0717a504b0ba409dbb4bb53d5b308abc76a0aaba021005f
+MISC ChangeLog 4641 SHA256 1983d9c2502159a7c497dc1aa4e94edf92f07ed3f01fa89720efd6e26320cd8f SHA512 c2292fe5cd916c2b4368a54fa005b7bd1b3303f725f429cffac63626b491c28b51835a2d1de052398294b6aa5bbf3e00e86fffba7a0133ef5622fd945ed3efb7 WHIRLPOOL c66d479e88f5873045830e2ecdf7d7ef685260fd699144b015416ebd922255e811b3c269c825d491552731e64d2a182f85ed770be8c2899d2737e9dc0590c48f
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzPIaAAoJEPGu1DbS6WIAPp0QAJW4Bc1/JvztrzgVvFWNW9WV
-aHz09VkJxwl50rU59rUM70fAlg8bTdWJOCeJNPAeUgSC7XdBsuut3Af7bnRZZF0a
-qciwTqypos7Hj69xwtHFZmWFpockPaqf8wgSa5hvsAAxf4+2lHmSe2mPPDY8CVb/
-Y17um8Npe2P0uD7icknyruPfkEE0ZC11DgfNP4cmh4+rNMQTJ52sz7ewOr72qLJP
-v/siwScv30cZAuhaRuSM55nXdi7oPZkBNEhgVGgWe7/AXZgqqM6Rja6iCtvOkpxG
-7k+x1/rYNw1oNGhIOwmEjmC2XI15AUmYiB53u2Yeyuzj3cgn1ZTZGwU5BVHutpdi
-lfU4/pblv28M2pLQ8AqxIr7jZGaXbiTmFztpg8I6FU+2jb7YQZJw/r7QtfUpAvr9
-6I+qN4vLt4xI7iu3BaP1ar5F0Hn3qCuaM4FIGQ7LVPO+8WBhTeGnRbjb3YS+65xN
-IwKXrsUHfBwibnGSnK3z/fs9+YdR+R3GH7FxtIvKfDuQQHoXFGe4bQVRAobwiThq
-WwxzgJ8C9Z3G2sb4YkBdcks2tj+fU2iPVOr4PIHlPdJCelf1ATazRNRedsiOFyvm
-yYSksVpwbCJSmkQMLTLwetQshR6QnZF2C4zih77PyAJ3aagMqP4B6z7+ZFY+fe4T
-ofIglKZ4hCkG2npPb6V7
-=U66d
+iQIcBAEBCAAGBQJTFIffAAoJEPiazRVxLXTFMBkP/ithcP8k+v5vAnSBBnagzc7Z
+FRblZv5XpMx91Et0pgMO/zwF9J3DbZOjLLAHQvKn+Y+zqde3aNBHb3bAfJpN+FAF
+hSKOQA5r83eqbaXdrdQKGudX18fgjSwTvJusDE7RdZAErK5zWs+jfwYBZRv77q2y
+ZN9niRKxBqYYLD2Tvumsms6NnE98FLDARWFl5wZz3Pb853ttzOsYUjzxGcD0xL8G
+lxekZrzi7mAruiinp1Hja3qCnH7svx60U7+3Ut1p/URH6R+bV4AR0nj7+kDHTd7w
+TJpywg8APuLfxb60rIlleH+Uc4pxHNEte9gWXo8qXDS/OqUlVa0gmIs6kyJxqyBZ
+s+8yp1AAUSF4jitaUIchS2NULjcqV2qn/E/fgb7dmuNJvJvt5vYKgiz8AFMSGhwl
+z6UnHd8GQqp8OG/dLmmQaMlp3HaZQHNkCCn1TTpLJA071PX3RoKs+MlX+uEhHyAQ
+wxQk5Tik/rGDQZwcV4hXjOPAUku1ftKMyArUhWGiC9VLRdOgFZXJ8ycgGXJPz/vC
+8iLmQrblBCAmiUtgcHxdlUJUBhSNJBHJIq9pc/8Pzs4IaJEWtxq5tyv9kNup7pan
+2FU3cRb7Y0/cP4tG8Z/YFJzA4r5JaUwECnC5pl4og7jf2lDzvP2bOub8UfjqCMTS
+/ITDEwIM4XP5Dv/bJzSc
+=4Xx+
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..af491c167da1
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd-0.8.1-amd64_static_build.patch
@@ -0,0 +1,26 @@
+--- 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.rc8 b/net-misc/siproxd/files/siproxd.rc8
new file mode 100644
index 000000000000..821bf46634b5
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd.rc8
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/files/siproxd.rc8,v 1.1 2014/03/03 13:47:10 polynomial-c Exp $
+
+config_file="/etc/siproxd.conf"
+
+pidfile="/run/siproxd/siproxd.pid"
+command="/usr/sbin/siproxd"
+command_args="-p ${pidfile} -c ${config_file}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ ! -f "${config_file}" ] ; then
+		eerror "Please create ${config_file} first!"
+		return 1
+	fi
+	checkpath -q -d ${pidfile%/*} -o siproxd:siproxd
+}
diff --git a/net-misc/siproxd/siproxd-0.8.1-r1.ebuild b/net-misc/siproxd/siproxd-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..b1b4d50937b8
--- /dev/null
+++ b/net-misc/siproxd/siproxd-0.8.1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.1-r1.ebuild,v 1.1 2014/03/03 13:47:10 polynomial-c Exp $
+
+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
+	<net-libs/libosip-4.0.0"
+#	debug? ( dev-libs/dmalloc[threads] )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.4
+	doc? ( app-text/docbook-sgml-utils
+		app-text/docbook-sgml-dtd:4.2 )"
+# docbook-sgml-utils is for building doc
+# docbook-sgml-dtd is for the doc dtd even if docbook-sgml-utils depends on it
+
+pkg_setup() {
+	enewgroup siproxd
+	enewuser siproxd -1 -1 /dev/null siproxd
+}
+
+src_prepare() {
+	# make the daemon run as user 'siproxd' by default
+	sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \
+		|| die "patching doc/siproxd.conf.example failed"
+	# do not fail when building with external libltdl
+	sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed"
+	epatch "${FILESDIR}/${PN}-libtool-2.4.patch"
+	# do not crash when building with external libltdl, bug 308495
+	sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed"
+
+	epatch "${FILESDIR}/${PN}-0.8.1-amd64_static_build.patch" #380835
+
+	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) \
+		$(use_enable !static shared) \
+		--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() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.rc8 ${PN}
+
+	dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
+		doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS
+
+	if use doc; then
+		dodoc doc/RFC3261_compliance.txt
+		# auto-generated doc is not auto-installed
+		# upstream has been contacted, see bug 2649333 in their bugtracker
+		dohtml -r doc/html/
+		# pdf is not build all the time
+		if has_version 'app-text/docbook-sgml-utils[jadetex]' ; then
+			dodoc doc/pdf/*.pdf
+		fi
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/sample_*.txt
+	fi
+
+	# set up siproxd directories
+	keepdir /var/lib/${PN}
+	fowners siproxd:siproxd /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use static; then
+		elog "static USE flag does not build a _fully_ statically linked binary"
+		elog "only libosip2 and libosipparser2 are statically linked"
+		elog "In addition, plugins are dynamically linked with those libs"
+	fi
+}