Fix building with libtool-2.4, bug #349777

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

5 files changed, 134 insertions, 6 deletions

diff --git a/net-misc/siproxd/ChangeLog b/net-misc/siproxd/ChangeLog
index 851a656bd1aa..5a38e3f6d412 100644
--- a/net-misc/siproxd/ChangeLog
+++ b/net-misc/siproxd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/siproxd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.20 2010/06/22 09:09:05 chithanh Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.21 2011/01/20 16:39:28 chithanh Exp $
+
+*siproxd-0.8.0-r2 (20 Jan 2011)
+
+  20 Jan 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  siproxd-0.8.0-r1.ebuild, +siproxd-0.8.0-r2.ebuild,
+  +files/siproxd-libtool-2.4.patch:
+  Fix building with libtool-2.4, bug #349777
 
   22 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   -siproxd-0.8.0.ebuild:
diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest
index 84d8fae9320d..d30aba227790 100644
--- a/net-misc/siproxd/Manifest
+++ b/net-misc/siproxd/Manifest
@@ -1,6 +1,8 @@
 AUX siproxd-libtool-2.2.patch 369 RMD160 094f3c681f7bf0bad89ad2389325d3ba92892812 SHA1 4212f1f12347256152975d67e7e3c04a0fd39c92 SHA256 c9172450ea4853ec7efc8d1e941731afa18f619c8448ac8e8bbab8f441d83f82
+AUX siproxd-libtool-2.4.patch 412 RMD160 e6d9da36b4de7d8b260b19b6fdb08e3759d56551 SHA1 b3d7c8afee69c0f3625acf0d39967b376f15abfb SHA256 3455d3a324758d2f719f515a5a1c7950fb605502c5af2d1cbd3cb49dace854bc
 AUX siproxd.rc6 691 RMD160 42c969dc0d7306bb81b2f51eb4bf9b11a845470c SHA1 1565b7fad43cf0ead77ff7826478cb9500178f50 SHA256 b0e41722da2ce7b97abe2663d1b83fe764edd69c810d24708a8ab7f938811b26
 DIST siproxd-0.8.0.tar.gz 824404 RMD160 447bc8891632dc23a7685af8d2e958fb5ee9cfb2 SHA1 d2f23a01ea60e3648efd46136e02bc84d1e934a1 SHA256 1a0306dbf5dd65f2c6d779bd449cbabba8c1a4cc79ca034e9cc83836c60f8542
-EBUILD siproxd-0.8.0-r1.ebuild 3584 RMD160 c3ad9792553575e59b8828ae53bdb4b3bdaaede0 SHA1 f3924a8fc57b60d841a7c77db17975b7340b3afb SHA256 52152c8e06b0e207b9010be82d6781d80bebf040452321886ed70ef1fc759d3c
-MISC ChangeLog 3063 RMD160 d04c94e3af55c798b8be1eb6c85281cad4013987 SHA1 7b5a5bc067c415fd6c4c38d0cd1fcc0bf86705d7 SHA256 a87dfe67164485d8003cd38de5c956bdb3816560d9b0bd380822d4a360649244
+EBUILD siproxd-0.8.0-r1.ebuild 3612 RMD160 75044e0c919c4ed1ddf702734f1a0856f94a1add SHA1 f668092c9dded52bb2765ab9c3ce0d29d55a901b SHA256 3a783c08e5220fa1af4f890fde330fe17bd12ccdf7122e93f276b8832f09a883
+EBUILD siproxd-0.8.0-r2.ebuild 3611 RMD160 e41d6159ca356d36a9476e727fd47fd5b62c722f SHA1 7f3612cfac8e66a4163f00c39090447fbc3b10a1 SHA256 c6bb3b19bafaab03e947917724b327346d3f8a1e9e105acc088778354d6dc0af
+MISC ChangeLog 3300 RMD160 1812659ee0b6d143c797939e13ea3a62355ebce4 SHA1 b3ed59772685f1140d900ac7409c0957e77978dc SHA256 b6014542557a495f4f25226342c139656e27eea17623765e7283672e7fefe319
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
diff --git a/net-misc/siproxd/files/siproxd-libtool-2.4.patch b/net-misc/siproxd/files/siproxd-libtool-2.4.patch
new file mode 100644
index 000000000000..189b32090f7b
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd-libtool-2.4.patch
@@ -0,0 +1,13 @@
+diff -r -U 2 a/src/plugins.h b/src/plugins.h
+--- a/src/plugins.h	2010-01-07 12:44:38.000000000 +0100
++++ b/src/plugins.h	2010-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/siproxd-0.8.0-r1.ebuild b/net-misc/siproxd/siproxd-0.8.0-r1.ebuild
index 61cdc457758f..82ec5bf28ea5 100644
--- a/net-misc/siproxd/siproxd-0.8.0-r1.ebuild
+++ b/net-misc/siproxd/siproxd-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.0-r1.ebuild,v 1.3 2010/06/21 20:14:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.0-r1.ebuild,v 1.4 2011/01/20 16:39:28 chithanh Exp $
 
 EAPI="2"
 
@@ -20,6 +20,7 @@ IUSE="examples doc static"
 RDEPEND=">=net-libs/libosip-3.0.0"
 #	debug? ( dev-libs/dmalloc[threads] )"
 DEPEND="${RDEPEND}
+	<sys-devel/libtool-2.4:2
 	doc? ( app-text/docbook-sgml-utils
 		app-text/docbook-sgml-dtd:4.2 )"
 # docbook-sgml-utils is for building doc
diff --git a/net-misc/siproxd/siproxd-0.8.0-r2.ebuild b/net-misc/siproxd/siproxd-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..5b9f95f9e823
--- /dev/null
+++ b/net-misc/siproxd/siproxd-0.8.0-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.0-r2.ebuild,v 1.1 2011/01/20 16:39:28 chithanh Exp $
+
+EAPI="2"
+
+inherit eutils
+
+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"
+#	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.in 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"
+}
+
+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 || die "einstall failed"
+
+	newinitd "${FILESDIR}"/${PN}.rc6 ${PN} || die "newinitd failed"
+
+	dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
+		doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS \
+		|| die "dodoc failed"
+
+	if use doc; then
+		dodoc doc/RFC3261_compliance.txt || die "dodoc failed"
+		# auto-generated doc is not auto-installed
+		# upstream has been contacted, see bug 2649333 in their bugtracker
+		dohtml -r doc/html/ || die "dohtml failed"
+		# pdf is not build all the time
+		if has_version app-text/docbook-sgml-utils[jadetex]; then
+			dodoc doc/pdf/*.pdf || die "dodoc failed"
+		fi
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/sample_*.txt || die "dodoc failed"
+	fi
+
+	# set up siproxd directories
+	keepdir /var/{lib,run}/${PN} || die "keepdir failed"
+	fowners siproxd:siproxd /var/{lib,run}/${PN} || die "fowners failed"
+}
+
+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
+}