Version bump, closes #183912 and fixes ldap(s) module to use libsasl2 now.

(Portage version: 2.1.3.19)

7 files changed, 248 insertions, 2 deletions

diff --git a/net-misc/ser/ChangeLog b/net-misc/ser/ChangeLog
index bb54313dfd26..88c03325a995 100644
--- a/net-misc/ser/ChangeLog
+++ b/net-misc/ser/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/ser
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.27 2007/08/11 03:28:29 beandog Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.28 2008/01/09 00:22:11 stkn Exp $
+
+*ser-0.9.7 (09 Jan 2008)
+
+  09 Jan 2008; Stefan Knoblich <stkn@gentoo.org>
+  +files/ser-0.9.7-extmod-ldap.diff, +files/ser-0.9.7-extmod-ldaps.diff,
+  +files/ser-0.9.7-mysql.diff, +files/ser-0.9.7-radius.diff,
+  +ser-0.9.7.ebuild:
+  Version bump. Includes fixes from #183912 sent by Stefan Gula.
+  Added patches for ldap and ldaps module to link against
+  libsasl2.
 
   10 Aug 2007; Steve Dibb <beandog@gentoo.org> ser-0.9.6.ebuild:
   add ~amd64, multilib, bug 188292
diff --git a/net-misc/ser/files/digest-ser-0.9.7 b/net-misc/ser/files/digest-ser-0.9.7
new file mode 100644
index 000000000000..8b320adcc2a3
--- /dev/null
+++ b/net-misc/ser/files/digest-ser-0.9.7
@@ -0,0 +1,15 @@
+MD5 72ab86bde9715f4f712c5b6fb8909dd0 ethz-1.0-ser-0.9.0.tar.gz 5266
+RMD160 fe7bf58ecde23af103f6dba9571e2278d5415406 ethz-1.0-ser-0.9.0.tar.gz 5266
+SHA256 0d019caf9e19a51387f95dd511c1930ca8b521a8e9df4fdc042caa8678c371ea ethz-1.0-ser-0.9.0.tar.gz 5266
+MD5 f5741e12d060323eed40f1af978a1310 ldap-1.0-ser-0.9.0.tar.gz 5069
+RMD160 346b50b309f5e172d9cc71a526c6179b414f9825 ldap-1.0-ser-0.9.0.tar.gz 5069
+SHA256 244817715cf26411820a45c5197346fe4d39407f64b2d05d81bfcf4117ca02b2 ldap-1.0-ser-0.9.0.tar.gz 5069
+MD5 b5500e4b2156eed20df1284e85190ae4 ldaps-1.0-ser-0.9.0.tar.gz 5051
+RMD160 e31495405b518107a57a34b0e771188a6a1712c7 ldaps-1.0-ser-0.9.0.tar.gz 5051
+SHA256 83e8e54423969dc72a71c71a22c59d4a1e4fe29aa1b886e68acf98d45a8c5126 ldaps-1.0-ser-0.9.0.tar.gz 5051
+MD5 829bf390aab8fbad6db2d4af9570d16d ser-0.9.7_src.tar.gz 1888122
+RMD160 6f608e1f40edf43f7adf41416335b96c6964155b ser-0.9.7_src.tar.gz 1888122
+SHA256 0fbbfd70d3e4b48665f7ae3ca0045a1421d3e1255ef8fc04b8fbe8168fb4e56f ser-0.9.7_src.tar.gz 1888122
+MD5 4acc4f68df2894da79cbc4d697f22c8f silomail-1.0-ser-0.9.0.tar.gz 4762
+RMD160 999d127a3ebad42cb207e2d2519e485588595f9a silomail-1.0-ser-0.9.0.tar.gz 4762
+SHA256 18d60d987246d4b188e8c2b78d721a43e61eb8c50402b19352edada2d2f98826 silomail-1.0-ser-0.9.0.tar.gz 4762
diff --git a/net-misc/ser/files/ser-0.9.7-extmod-ldap.diff b/net-misc/ser/files/ser-0.9.7-extmod-ldap.diff
new file mode 100644
index 000000000000..1fb76cadd2b4
--- /dev/null
+++ b/net-misc/ser/files/ser-0.9.7-extmod-ldap.diff
@@ -0,0 +1,11 @@
+--- ser-0.9.7/modules/ldap/Makefile.orig	2008-01-09 00:52:06.000000000 +0100
++++ ser-0.9.7/modules/ldap/Makefile	2008-01-09 00:52:13.000000000 +0100
+@@ -8,7 +8,7 @@
+ include ../../Makefile.defs
+ auto_gen=
+ NAME=ldap.so
+-LIBS=-lssl -lsasl -lcrypto -lcrypt -lldap -llber
++LIBS=-lssl -lsasl2 -lcrypto -lcrypt -lldap -llber
+ CFLAGS=-Wall -g
+ 
+ include ../../Makefile.modules
diff --git a/net-misc/ser/files/ser-0.9.7-extmod-ldaps.diff b/net-misc/ser/files/ser-0.9.7-extmod-ldaps.diff
new file mode 100644
index 000000000000..7e13d54fb0c4
--- /dev/null
+++ b/net-misc/ser/files/ser-0.9.7-extmod-ldaps.diff
@@ -0,0 +1,11 @@
+--- ser-0.9.7/modules/ldaps/Makefile.orig	2008-01-09 00:52:18.000000000 +0100
++++ ser-0.9.7/modules/ldaps/Makefile	2008-01-09 00:52:24.000000000 +0100
+@@ -8,7 +8,7 @@
+ include ../../Makefile.defs
+ auto_gen=
+ NAME=ldaps.so
+-LIBS=-lssl -lsasl -lcrypto -lcrypt -lldap -llber
++LIBS=-lssl -lsasl2 -lcrypto -lcrypt -lldap -llber
+ CFLAGS=-Wall
+ 
+ include ../../Makefile.modules
diff --git a/net-misc/ser/files/ser-0.9.7-mysql.diff b/net-misc/ser/files/ser-0.9.7-mysql.diff
new file mode 100644
index 000000000000..fb725f72d251
--- /dev/null
+++ b/net-misc/ser/files/ser-0.9.7-mysql.diff
@@ -0,0 +1,11 @@
+--- modules/acc/Makefile.orig	2007-07-02 01:42:09.000000000 +0200
++++ modules/acc/Makefile	2005-09-07 18:23:00.000000000 +0200
+@@ -13,7 +13,7 @@
+ LIBS=
+ 
+ # uncomment the next line if you wish to enable SQL accounting
+-#DEFS+=-DSQL_ACC
++DEFS+=-DSQL_ACC
+ 
+ # uncomment the next two lines if you wish to enable RADIUS accounting
+ #DEFS+=-DRAD_ACC
diff --git a/net-misc/ser/files/ser-0.9.7-radius.diff b/net-misc/ser/files/ser-0.9.7-radius.diff
new file mode 100644
index 000000000000..f0e2ce582676
--- /dev/null
+++ b/net-misc/ser/files/ser-0.9.7-radius.diff
@@ -0,0 +1,13 @@
+--- modules/acc/Makefile.orig	2007-07-02 01:42:31.000000000 +0200
++++ modules/acc/Makefile	2005-09-07 18:23:00.000000000 +0200
+@@ -16,8 +16,8 @@
+ #DEFS+=-DSQL_ACC
+ 
+ # uncomment the next two lines if you wish to enable RADIUS accounting
+-#DEFS+=-DRAD_ACC
+-#include ../../Makefile.radius
++DEFS+=-DRAD_ACC
++include ../../Makefile.radius
+ 
+ # uncomment the next two lines if you wish to enable DIAMETER accounting
+ #DEFS+=-DDIAM_ACC
diff --git a/net-misc/ser/ser-0.9.7.ebuild b/net-misc/ser/ser-0.9.7.ebuild
new file mode 100644
index 000000000000..68ed29c16583
--- /dev/null
+++ b/net-misc/ser/ser-0.9.7.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.7.ebuild,v 1.1 2008/01/09 00:22:11 stkn Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+IUSE="ipv6 mysql radius postgres jabber ldap ssl"
+
+ETHZ_PV="1.0"
+LDAP_PV="1.0"
+LDAPS_PV="1.0"
+SILOMAIL_PV="1.0"
+MODULES_PV="0.9.0"
+
+DESCRIPTION="SIP Express Router"
+HOMEPAGE="http://www.iptel.org/ser"
+SRC_URI="http://ftp.iptel.org/pub/ser/${PV}/src/${P}_src.tar.gz
+	 mirror://gentoo/silomail-${SILOMAIL_PV}-${PN}-${MODULES_PV}.tar.gz
+	 mirror://gentoo/ethz-${ETHZ_PV}-${PN}-${MODULES_PV}.tar.gz
+	 ldap? ( mirror://gentoo/ldap-${LDAP_PV}-${PN}-${MODULES_PV}.tar.gz
+		 mirror://gentoo/ldaps-${LDAPS_PV}-${PN}-${MODULES_PV}.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	mysql? ( virtual/mysql )
+	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
+	postgres? ( dev-db/postgresql )
+	jabber? ( dev-libs/expat )
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.35
+	>=sys-devel/flex-2.5.4a"
+
+pkg_setup() {
+	enewgroup ser
+	enewuser  ser -1 -1 /dev/null ser
+}
+
+src_unpack() {
+	local modules extmodules MY_A MY_PATCH_A x
+
+	# unpack ser source
+	unpack ${P}_src.tar.gz
+
+	cd "${S}"
+	use ipv6 || \
+		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs || die
+	sed -i -e 's/\(CFLAGS+=-mcpu=ultrasparc\) -minline-all-stringops/\1/g' \
+		Makefile.defs || die	#157109
+
+	# external modules
+	extmodules="silomail ethz"
+
+	if use mysql; then
+		modules="${modules} mysql"
+		epatch "${FILESDIR}/${P}-mysql.diff"
+	fi
+
+	if use radius; then
+		modules="${modules} auth_radius group_radius uri_radius avp_radius"
+		epatch "${FILESDIR}/${P}-radius.diff"
+	fi
+
+	use jabber && \
+		modules="${modules} jabber"
+
+	use postgres && \
+		modules="${modules} postgres"
+
+	use ldap && \
+		extmodules="${extmodules} ldap"
+
+	use ldap && use ssl && \
+		extmodules="${extmodules} ldaps"
+
+	# put list of modules into Makefile, we need the list
+	# during compile and install phase...
+	sed -i -e "s:^\(include_modules.*\):\1 ${modules} ${extmodules}:" \
+		Makefile || die
+
+	# fix ser.cfg
+	sed -i -e "/force_send_socket(smaug:5080);/ d" \
+		etc/ser.cfg || die
+
+	# unpack external modules
+	# ugly i know...
+	for x in ${extmodules}; do
+		MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${PN}-${MODULES_PV})
+		MY_PATCH_A="${P}-extmod-${x}"
+		mkdir -p "${S}"/modules/${x}
+		cd "${S}"/modules/${x}
+		unpack ${MY_A}.tar.gz
+		# fix makefiles
+		if [[ -f "${FILESDIR}"/${MY_A}.diff ]]; then
+			epatch "${FILESDIR}"/${MY_A}.diff
+		fi
+
+		# additional patches
+		if [[ -f "${FILESDIR}"/${MY_PATCH_A}.diff ]]; then
+			epatch "${FILESDIR}"/${MY_PATCH_A}.diff
+		fi
+	done
+
+	# remove sasl if openldap hasn't been built with it
+	if use ldap && ! built_with_use net-nds/openldap sasl; then
+		sed -i -e "s:-lsasl::g" \
+			"${S}"/modules/ldap/Makefile || die
+
+		if use ssl; then
+			sed -i -e "s:-lsasl::g" \
+			 "${S}"/modules/ldaps/Makefile || die
+		fi
+	fi
+}
+
+src_compile() {
+	# add -fPIC
+	append-flags -fPIC
+
+	emake all \
+		CC="`tc-getCC`" \
+		CFLAGS="${CFLAGS}" \
+		cfg-prefix=/ \
+		cfg-target=/etc/ser/ || die "emake failed"
+}
+
+src_install () {
+	emake install \
+		prefix="" \
+		bin-prefix="${D}"/usr/sbin \
+		bin-dir="" \
+		cfg-prefix="${D}"/etc \
+		cfg-dir=ser/ \
+		cfg-target=/etc/ser/ \
+		modules-prefix="${D}"/usr/$(get_libdir)/ser \
+		modules-dir=modules \
+		modules-target=/usr/$(get_libdir)/ser/modules/ \
+		man-prefix="${D}"/usr/share/man \
+		man-dir="" \
+		doc-prefix="${D}"/usr/share/doc \
+		doc-dir="${P}" || die "emake install failed"
+
+	newinitd "${FILESDIR}"/ser.rc6 ser
+	newconfd "${FILESDIR}"/ser.confd ser
+	exeinto /usr/sbin
+	newexe scripts/harv_ser.sh harv_ser.sh
+	newexe scripts/sc serctl
+	newexe scripts/ser_mysql.sh ser_mysql.sh
+
+	chown -R root:ser "${D}"/etc/ser
+	chmod 750 "${D}"/etc/ser
+	chmod 640 "${D}"/etc/ser/*
+
+	# fix manpages
+	sed -i	-e "s:^.B /ser-${PV}AUTHORS:.B /usr/share/doc/${PF}/AUTHORS:" \
+		-e "s:^.B /ser:.B /usr/sbin/ser:" \
+		"${D}"/usr/share/man/*/*  || die
+}
+
+pkg_postinst() {
+	if has_version ${CATEGORY}/${PN}; then
+		einfo "Changing permissions on ${ROOT}etc/ser"
+
+		chown -R root:ser "${ROOT}"/etc/ser
+		chmod 750 "${ROOT}"/etc/ser
+		chmod 640 "${ROOT}"/etc/ser/*
+	fi
+}