Updated sip-router to v3.2.2

5 files changed, 270 insertions, 10 deletions

diff --git a/net-misc/sip-router/ChangeLog b/net-misc/sip-router/ChangeLog
index 4f72fb1..8cd97ba 100644
--- a/net-misc/sip-router/ChangeLog
+++ b/net-misc/sip-router/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-misc/sip-router
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sip-router-3.2.2 (15 Feb 2012)
+
+  15 Feb 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.2.2.ebuild:
+  Version bump.
+
 *sip-router-3.2.1 (25 Jan 2012)
 
   25 Jan 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.2.1.ebuild:
@@ -13,14 +18,16 @@
   Version bump.
 
   21 Sep 2011; Claudio G. Furrer <elcaio@gmail.com> -sip-router-3.1.2.ebuild,
-  -sip-router-3.1.3.ebuild:
-  Older versions than 3.1.4 are no longer packaged.
+  -sip-router-3.1.3.ebuild, -sip-router-3.1.4.ebuild, -sip-router-3.1.4-r1.ebuild,
+  -files/siprouter.confd, -files/siprouter.init:
+  Older versions than 3.1.4-r2 are no longer packaged.
 
 *sip-router-3.1.4 (13 Sep 2011)
   
-  13 Sep 2011; Claudio G. Furrer <elcaio@gmail.com> sip-router-3.1.4-r2.ebuild:
+  13 Sep 2011; Claudio G. Furrer <elcaio@gmail.com> +sip-router-3.1.4-r2.ebuild,
+  +files/ser.confd, +files/ser.initd:
   Fix installation paths and names based on flavour specified in the USE flag
-  (ser or kamailio). Backported also to 3.1.3 and 3.1.2.
+  (ser or kamailio).
 
   24 Aug 2011; Claudio G. Furrer <elcaio@gmail.com> sip-router-3.1.4-r1.ebuild:
   Added kamailio-specific groups (group_k*) in USE flags.
diff --git a/net-misc/sip-router/Manifest b/net-misc/sip-router/Manifest
index 77ab829..4324fb7 100644
--- a/net-misc/sip-router/Manifest
+++ b/net-misc/sip-router/Manifest
@@ -1,10 +1,12 @@
-AUX ser.confd 514 RMD160 3bed2bc682d4c4ac05d52f1d0bc9c76c09983ec8 SHA1 c7d1b38d778d1913f3099511db72479a6cc346f6 SHA256 5f06b166e3ed5a0627e5f5919511ec610b4ac1fa6906b49c52fcabef6a0cfb66
-AUX ser.initd 800 RMD160 7ccea24a25ff0bbbf799f18febe8ec3470850091 SHA1 b79975c2bf5ef43b52195b0a0f967eb968b05148 SHA256 46d9c47ac66d73fddf1cce743a2155b1b332af5b1a5a423fe5b7e86781aa9df0
+AUX ser.confd 514 RMD160 1e27c35d6a7ed944cec2d5d579ee7a62b44af28a SHA1 7574cdb34034c84cf8c5f8eba323fbfbd5df2a4e SHA256 fec2d2b5c1f222bfd413ece424c2ee6b7fdff2fc71f8b95abb6b31118f209770
+AUX ser.initd 800 RMD160 22797e05ff7a13b4ee2d080b20f14abadd8198ec SHA1 8f66d7312b23f5965e83dc93d19fc04e6d5b5f45 SHA256 c9b748c5756e1bf2ee72ff0350b5f9ad1b8489d41008a00d66e335b276252a44
 DIST kamailio-3.1.4_src.tar.gz 6959507 RMD160 d0f8746be3bda86c650486ac3a31186778e79dc4 SHA1 d663936e542969b63671dd514e7b368448fbe404 SHA256 669564fe3be9c8439749f6d435d39b5851c7fff61392924e2e6aeb60a8793956
 DIST kamailio-3.1.5_src.tar.gz 7025269 RMD160 b118e29d91303e0d84f7ebdb7d0d8641ce6f204c SHA1 62d32ceeddf29e6f279951cd329dc314bbc2b9bc SHA256 5d1a2db3f9bea3cfac76777646627be24e6033876a5bf60200882be00cefe9ca
 DIST kamailio-3.2.1_src.tar.gz 7252354 RMD160 9985c8de51fde8be081ab1da288d46421d87aa48 SHA1 ed9d27642429e94ed82ac89cf4dec71ef3177920 SHA256 4705711e19106268e300df3a4029dd3b94b0e57352de2766cb9ceb8c05c80afd
+DIST kamailio-3.2.2_src.tar.gz 7220916 RMD160 8581e020e0c1a168c57268bd782f2e3badb6ac51 SHA1 118c4e1c05165da84b2f91865c23c5f81c403689 SHA256 823653fcf5edf27d01adc4af4af5d515b7ccaa95039bc3eb71c28474e75ce44e
 EBUILD sip-router-3.1.4.ebuild 8024 RMD160 604e7f73449afcd0659ad0b7628a41f95aca16bf SHA1 012566e917c412e90e2addec3d5f83f895e337c1 SHA256 1adb67682eaa5a9dfee306473023bf7403068199a0e8916db521e230452b1e78
 EBUILD sip-router-3.1.5.ebuild 8024 RMD160 604e7f73449afcd0659ad0b7628a41f95aca16bf SHA1 012566e917c412e90e2addec3d5f83f895e337c1 SHA256 1adb67682eaa5a9dfee306473023bf7403068199a0e8916db521e230452b1e78
 EBUILD sip-router-3.2.1.ebuild 8115 RMD160 7654b54c122b27eb7237598c983cc8c6eaf1e45b SHA1 6188216b0a553dd38113781bdb83f38b77651bcc SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b452689d78fac8d8596b4e2966864f
-MISC ChangeLog 1547 RMD160 b1caafc47ca9fe146c8685781552179596c4efc6 SHA1 56787ec7863af911d466967e46fe403f5064b715 SHA256 d1fcc09c20b0a075ae99b8dfcf5fd3b0f5b53fc2e2f2baaf283657f5f3edf1c1
+EBUILD sip-router-3.2.2.ebuild 8115 RMD160 7654b54c122b27eb7237598c983cc8c6eaf1e45b SHA1 6188216b0a553dd38113781bdb83f38b77651bcc SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b452689d78fac8d8596b4e2966864f
+MISC ChangeLog 1785 RMD160 a3ecd99a28cd9627187d0b3d1b9b12bd466938c9 SHA1 9bb42ebd43d9db1c8decc6749b19325a81641f1d SHA256 c653c7ac7cc798a1ce734ae9ad485df65e87c8255b7696dd21110e64ab814321
 MISC metadata.xml 234 RMD160 7e65eb5a9a08368288fc1e3608ddb9a4677defdd SHA1 93c38407f533f522647683eb7b7c2121bc6f3707 SHA256 4009ad9d312db0ece6fd53e9dfabda98e2c1037ec540eb64d6ab43fe318c1a25
diff --git a/net-misc/sip-router/files/ser.confd b/net-misc/sip-router/files/ser.confd
index 1d76370..4b1f248 100644
--- a/net-misc/sip-router/files/ser.confd
+++ b/net-misc/sip-router/files/ser.confd
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/net-misc/sip-router/files/ser.initd b/net-misc/sip-router/files/ser.initd
index f692395..99d0fbe 100644
--- a/net-misc/sip-router/files/ser.initd
+++ b/net-misc/sip-router/files/ser.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/net-misc/sip-router/sip-router-3.2.2.ebuild b/net-misc/sip-router/sip-router-3.2.2.ebuild
new file mode 100644
index 0000000..6b00f62
--- /dev/null
+++ b/net-misc/sip-router/sip-router-3.2.2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Sip-Router (Kamailio/SER) is an Open Source SIP Server"
+HOMEPAGE="http://sip-router.org/"
+MY_P="${P/sip-router/kamailio}"
+SRC_URI="http://www.kamailio.org/pub/kamailio/${PV}/src/${MY_P}_src.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+#Documentation can be found here: http://www.kamailio.org/docs/modules/3.2.x/
+IUSE="flavour_kamailio flavour_ser debug ipv6 sctp
+group_standard group_standard_dep group_mysql group_radius group_postgres group_presence group_stable group_experimental
+group_kstandard group_kmysql group_kradius group_kpostgres group_kpresence
+group_kxml group_kperl group_kldap group_kjson
+acc acc_radius alias_db app_lua app_python async auth auth_identity auth_db auth_diameter auth_radius avpops
+benchmark blst
+call_control carrierroute cfg_db cfg_rpc cfgutils counters cpl-c ctl
+db_berkeley db_flatstore db_mysql db_oracle db_postgres db_text db_unixodbc
+db_sqlite ndb_redis
+debugger dialog dialplan dispatcher diversion domain domainpolicy drouting dmq
+enum exec geoip group
+h350 htable imc ipops iptrtpproxy jabber json jsonrpc-c kex
+lcr ldap
+matrix maxfwd mediaproxy memcached misc_radius mi_datagram mi_fifo mi_rpc mi_xmlrpc mqueue msilo mtree
+nathelper nat_traversal
+osp
+p_usrloc
+path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route
+presence presence_conference presence_dialoginfo presence_mwi presence_reginfo presence_xml
+pua pua_bla pua_dialoginfo pua_mi pua_reginfo pua_usrloc pua_xmpp purple pv
+qos
+ratelimit regex registrar rls rtimer rr rtpproxy
+sanity sdpops seas sipcapture siptrace siputils sl sms snmpstats speeddial sqlops statistics sst
+textops textopsx tls tm tmx topoh
+uac uac_redirect uri_db userblacklist usrloc utils
+xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp"
+
+#pdb? ( pdb-server )
+#seas? ( www.wesip.eu )
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7
+	>=sys-libs/readline-6.1_p2
+	group_experimental? ( dev-libs/openssl dev-db/redis )
+	group_mysql? ( >=dev-db/mysql-5.1.50 sys-libs/zlib )
+	group_radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
+	group_presence? ( dev-libs/libxml2 net-misc/curl )
+	group_postgres? ( dev-db/postgresql-base )
+	group_standard? ( dev-libs/libxml2 dev-libs/openssl net-misc/curl )
+	group_kmysql? ( >=dev-db/mysql-5.1.50 sys-libs/zlib )
+	group_kradius? ( >=net-dialup/radiusclient-ng-0.5.0 )
+	group_kpresence? ( dev-libs/libxml2 net-misc/curl )
+	group_kpostgres? ( dev-db/postgresql-base )
+	group_kstandard? ( dev-libs/libxml2 dev-libs/openssl net-misc/curl )
+	group_kxml? ( dev-libs/libxml2 dev-libs/xmlrpc-c )
+	group_kperl? ( dev-lang/perl dev-perl/perl-ldap )
+	group_kldap? ( net-nds/openldap )
+	group_kjson? ( dev-libs/json-c dev-libs/libevent )
+	acc_radius? ( net-dialup/radiusclient-ng )
+	app_lua? ( dev-lang/lua )
+	app_python? ( dev-lang/python )
+	auth_identity? ( dev-libs/openssl net-misc/curl )
+	carrierroute? ( dev-libs/confuse )
+	cpl-c? ( dev-libs/libxml2 )
+	db_berkeley? ( >=sys-libs/db-4.6 )
+	db_mysql? ( >=dev-db/mysql-5.1.50 )
+	db_oracle? ( dev-db/oracle-instantclient-basic )
+	db_postgres? ( dev-db/postgresql-base )
+	db_sqlite? ( >=dev-db/sqlite-3 )
+	db_unixodbc? ( dev-db/unixODBC )
+	ndb_redis? ( dev-db/redis )
+	dialplan? ( dev-libs/libpcre )
+	geoip? ( dev-libs/geoip )
+	h350? ( net-nds/openldap )
+	jabber? ( dev-libs/expat )
+	lcr? ( dev-libs/libpcre )
+	ldap? ( net-nds/openldap )
+	memcached? ( dev-libs/libmemcache net-misc/memcached )
+	mi_xmlrpc? ( dev-libs/libxml2 dev-libs/xmlrpc-c )
+	osp? ( net-libs/osptoolkit )
+	peering? ( net-dialup/radiusclient-ng )
+	perl? ( dev-lang/perl dev-perl/perl-ldap )
+	presence? ( dev-libs/libxml2 )
+	presence_conference? ( dev-libs/libxml2 )
+	presence_xml? ( dev-libs/libxml2 )
+	pua? ( dev-libs/libxml2 )
+	pua_bla? ( dev-libs/libxml2 )
+	pua_dialoginfo? ( dev-libs/libxml2 )
+	pua_usrloc? ( dev-libs/libxml2 )
+	pua_xmpp? ( dev-libs/libxml2 )
+	purple? ( net-im/pidgin )
+	regex? ( dev-libs/libpcre )
+	rls? ( dev-libs/libxml2 )
+	snmpstats? ( net-analyzer/net-snmp sys-apps/lm_sensors )
+	tls? (
+		sys-libs/zlib
+		>=dev-libs/openssl-1.0.0a-r1
+	)
+	utils? ( net-misc/curl )
+	xcap_client? ( dev-libs/libxml2 net-misc/curl )
+	xcap_server? ( dev-libs/libxml2 )
+	xmlops? ( dev-libs/libxml2 )
+	xmpp? ( dev-libs/expat )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.35
+	>=sys-devel/flex-2.5.4a
+	app-text/docbook2X"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use ipv6 || \
+		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs || die
+}
+
+src_compile() {
+	# iptrtpproxy broken as the needed netfilter module is not supported
+	local mod_exc="iptrtpproxy"
+	local group_inc=""
+	local k=""
+	if use flavour_kamailio; then
+		k="k"
+		use group_kxml && group_inc="${group_inc} kxml"
+		use group_kperl && group_inc="${group_inc} kperl"
+		use group_kldap && group_inc="${group_inc} kldap"
+		use group_kjson && group_inc="${group_inc} kjson"
+	fi
+	# you can USE flavour=kamailio but also group_standard. It will be converted to group_kstandard
+	# same as mysql/kmysql, postgres/kpostgres, radius/kradius, presence/kpresence
+	(use group_standard || use group_kstandard) && group_inc="${group_inc} ${k}standard"
+	use group_standard_dep && group_inc="${group_inc} standard_dep"
+	(use group_mysql || use group_kmysql) && group_inc="${group_inc} ${k}mysql"
+	(use group_radius || use group_kradius) && group_inc="${group_inc} ${k}radius"
+	(use group_postgres || use group_kpostgres) && group_inc="${group_inc} ${k}postgres"
+	(use group_presence || use group_kpresence) && group_inc="${group_inc} ${k}presence"
+	use group_stable && group_inc="${group_inc} stable"
+	use group_experimental && group_inc="${group_inc} experimental"
+	# TODO: skip_modules?
+
+	local mod_inc=""
+	# some IUSE flags must not be included here in mod_inc
+	# e.g.: flavour_kamailio, flavour_ser, debug, sctp, ipv6
+	for i in ${IUSE[@]}; do
+		for j in ${i[@]}; do
+			[[ ! "${i}" =~ "flavour_" ]] && \
+				[ ! "${i}" == "debug" ] && \
+				[ ! "${i}" == "ipv6" ] && \
+				[ ! "${i}" == "sctp" ] && \
+				[[ ! "${i}" =~ "group_" ]] && \
+			use "${i}" && mod_inc="${mod_inc} ${i}"
+		done
+	done
+
+	if use tls; then
+		tls_hooks=1
+	else
+		tls_hooks=0
+	fi
+
+	if use debug; then
+		mode=debug
+	else
+		mode=release
+	fi
+
+	if use flavour_kamailio; then
+		flavour=kamailio
+	else
+		flavour=ser # defaults to SER compatibility names
+	fi
+
+	if use sctp; then
+		sctp=1
+	else
+		sctp=0
+	fi
+
+	emake \
+		CC="$(tc-getCC)" \
+		CPU_TYPE="$(get-flag march)" \
+		SCTP="${sctp}" \
+		CC_EXTRA_OPTS=-I/usr/gnu/include \
+		mode="${mode}" \
+		TLS_HOOKS="${tls_hooks}" \
+		FLAVOUR="${flavour}" \
+		group_include="${group_inc}" \
+		include_modules="${mod_inc}" \
+		exclude_modules="${mod_exc}" \
+		prefix="/" \
+		all || die "emake all failed"
+}
+
+src_install() {
+	emake -j1 \
+		BASEDIR="${D}" \
+		FLAVOUR="${flavour}" \
+		prefix="/" \
+		bin_dir=/usr/sbin/ \
+		cfg_dir=/etc/${flavour}/ \
+		lib_dir=/usr/$(get_libdir)/${flavour}/ \
+		modules_dir="/usr/$(get_libdir)/${flavour}/" \
+		man_dir="/usr/share/man/" \
+		doc_dir="/usr/share/doc/${flavour}/" \
+		share_dir="/usr/share/${flavour}/" \
+		data_dir="/usr/share/${flavour}/" \
+		install || die "emake install failed"
+
+	sed -e "s/sip-router/${flavour}/g" \
+		${FILESDIR}/ser.initd > ${flavour}.initd || die
+	sed -e "s/sip-router/${flavour}/g" \
+		${FILESDIR}/ser.confd > ${flavour}.confd || die
+
+	newinitd "${flavour}".initd "${flavour}"
+	newconfd "${flavour}".confd "${flavour}"
+}
+
+pkg_preinst() {
+	if [[ -z "$(egetent passwd ${flavour})" ]]; then
+		einfo "Adding ${flavour} user and group"
+		enewgroup "${flavour}"
+		enewuser  "${flavour}" -1 -1 /dev/null "${flavour}"
+	fi
+
+	chown -R root:"${flavour}"  "${D}/etc/${flavour}"
+	chmod -R u=rwX,g=rX,o= "${D}/etc/${flavour}"
+
+}
+
+pkg_postinst() {
+	if [ use mediaproxy ]; then
+		einfo "You have enabled mediaproxy support. In order to use it, you have
+		to run it somewhere."
+	fi
+	if [ use rtpproxy ]; then
+		einfo "You have enabled rtpproxy support. In order to use it, you have
+		to run it somewhere."
+	fi
+}
+
+pkg_prerm () {
+	/etc/init.d/"${flavour}" stop >/dev/null
+}