Version bump and enhancements

Package-Manager: portage-2.0.51.19

10 files changed, 275 insertions, 16 deletions

diff --git a/net-misc/ser/ChangeLog b/net-misc/ser/ChangeLog
index ce6be42997cd..988d7a8dc073 100644
--- a/net-misc/ser/ChangeLog
+++ b/net-misc/ser/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/ser
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.9 2004/12/25 17:24:52 ticho Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.10 2005/06/12 15:48:26 stkn Exp $
+
+*ser-0.9.0 (12 Jun 2005)
+
+  12 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/ethz-1.0-ser-0.9.0.diff, +files/ldap-1.0-ser-0.9.0.diff,
+  +files/ldaps-1.0-ser-0.9.0.diff, +files/silomail-1.0-ser-0.9.0.diff,
+  +files/ser.confd, +files/ser.rc6, +ser-0.9.0.ebuild:
+  Version bump and enhancements.
 
 *ser-0.8.14 (25 Dec 2004)
 
diff --git a/net-misc/ser/Manifest b/net-misc/ser/Manifest
index 4ec9c6fc81d9..483558089b8a 100644
--- a/net-misc/ser/Manifest
+++ b/net-misc/ser/Manifest
@@ -1,19 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f8ffa23982e6919e7d12786c2c4e3458 ChangeLog 1657
-MD5 4f62326ce305054924e82ba3e7a372eb ser-0.8.11.ebuild 2510
 MD5 8dc5bb445065ac1d73ab59d970074692 ser-0.8.9.ebuild 1502
 MD5 922d6546e4ca772db657a8dc45743da6 ser-0.8.10.ebuild 1736
+MD5 1c31162cf3d16af59dc0f02ab3eef1d6 ChangeLog 1958
+MD5 4f62326ce305054924e82ba3e7a372eb ser-0.8.11.ebuild 2510
 MD5 298db3537f635f7512230937aced072e ser-0.8.14.ebuild 2517
-MD5 e9eb82d4237eadc1afda58dba2267aed files/digest-ser-0.8.14 67
+MD5 b4d541dec3aa1ddfaf746df47b944d24 ser-0.9.0.ebuild 3627
 MD5 978419896dcd1a055ff3da9c3bfbcdd0 files/digest-ser-0.8.9 65
-MD5 fed13355f56f22d0c86cb7d50b9cb7a0 files/digest-ser-0.8.10 66
+MD5 08495f4d275d4340fcb21b69cac7d38c files/digest-ser-0.9.0 343
+MD5 16fc6b4f457162a12869d1ac72dc86f5 files/ser.rc6 549
+MD5 731bfb3fccee7dbf639442d29948484c files/silomail-1.0-ser-0.9.0.diff 309
+MD5 15fa155bb1e13bb038e1f97814ac9cfc files/ser.confd 359
 MD5 cb00e866f91ec26e7767fd653a0623c1 files/digest-ser-0.8.11 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBzaJtQlM6RnzZP+IRAtuOAKCIf+R2OwxnIvcVRkqltFklm6Vi+wCffPYA
-fH3p06Ahym4FUw6h6Es4EV4=
-=UgVf
------END PGP SIGNATURE-----
+MD5 13df81c549263be3a93c93095cac54c2 files/ethz-1.0-ser-0.9.0.diff 378
+MD5 e9eb82d4237eadc1afda58dba2267aed files/digest-ser-0.8.14 67
+MD5 6e319943ee713a85093870eb1c28a0d6 files/ldap-1.0-ser-0.9.0.diff 301
+MD5 60e8a72a005fd298e920e6746c788980 files/ldaps-1.0-ser-0.9.0.diff 342
+MD5 fed13355f56f22d0c86cb7d50b9cb7a0 files/digest-ser-0.8.10 66
diff --git a/net-misc/ser/files/digest-ser-0.9.0 b/net-misc/ser/files/digest-ser-0.9.0
new file mode 100644
index 000000000000..df2e4133460a
--- /dev/null
+++ b/net-misc/ser/files/digest-ser-0.9.0
@@ -0,0 +1,5 @@
+MD5 ae1f9b237f0006785ff22eafa1470ac4 ser-0.9.0_src.tar.gz 1853730
+MD5 4acc4f68df2894da79cbc4d697f22c8f silomail-1.0-ser-0.9.0.tar.gz 4762
+MD5 72ab86bde9715f4f712c5b6fb8909dd0 ethz-1.0-ser-0.9.0.tar.gz 5266
+MD5 f5741e12d060323eed40f1af978a1310 ldap-1.0-ser-0.9.0.tar.gz 5069
+MD5 b5500e4b2156eed20df1284e85190ae4 ldaps-1.0-ser-0.9.0.tar.gz 5051
diff --git a/net-misc/ser/files/ethz-1.0-ser-0.9.0.diff b/net-misc/ser/files/ethz-1.0-ser-0.9.0.diff
new file mode 100644
index 000000000000..239a37a34ac1
--- /dev/null
+++ b/net-misc/ser/files/ethz-1.0-ser-0.9.0.diff
@@ -0,0 +1,14 @@
+--- Makefile.orig	2005-06-12 04:07:56.000000000 +0200
++++ Makefile	2005-06-12 04:08:02.000000000 +0200
+@@ -12,11 +12,3 @@
+ CFLAGS=-Wall
+ 
+ include ../../Makefile.modules
+-
+-
+-install:
+-	-serctl stop
+-	-mv /usr/local/lib/ser/modules/ethz.so /usr/local/lib/ser/modules/ethz.so.OLD
+-	rm -f /usr/local/lib/ser/modules/ethz.so
+-	cp ethz.so /usr/local/lib/ser/modules
+-	-serctl start
diff --git a/net-misc/ser/files/ldap-1.0-ser-0.9.0.diff b/net-misc/ser/files/ldap-1.0-ser-0.9.0.diff
new file mode 100644
index 000000000000..cec03d2991b6
--- /dev/null
+++ b/net-misc/ser/files/ldap-1.0-ser-0.9.0.diff
@@ -0,0 +1,13 @@
+--- Makefile.orig	2005-06-12 04:06:33.000000000 +0200
++++ Makefile	2005-06-12 04:06:39.000000000 +0200
+@@ -12,10 +12,3 @@
+ CFLAGS=-Wall -g
+ 
+ include ../../Makefile.modules
+-
+-
+-install:
+-	-serctl stop
+-	rm -f /usr/local/lib/ser/modules/ldap.so
+-	cp ldap.so /usr/local/lib/ser/modules
+-	-serctl start
diff --git a/net-misc/ser/files/ldaps-1.0-ser-0.9.0.diff b/net-misc/ser/files/ldaps-1.0-ser-0.9.0.diff
new file mode 100644
index 000000000000..a8d00839465e
--- /dev/null
+++ b/net-misc/ser/files/ldaps-1.0-ser-0.9.0.diff
@@ -0,0 +1,17 @@
+--- Makefile.orig	2005-06-12 04:07:28.000000000 +0200
++++ Makefile	2005-06-12 04:07:35.000000000 +0200
+@@ -12,14 +12,3 @@
+ CFLAGS=-Wall
+ 
+ include ../../Makefile.modules
+-
+-
+-install:
+-	-serctl stop
+-	rm -f /usr/local/lib/ser/modules/ldaps.so
+-	cp ldaps.so /usr/local/lib/ser/modules
+-	-serctl start
+-
+-clean:
+-	rm -f *.c~ *.o *.d ldaps.so
+-
diff --git a/net-misc/ser/files/ser.confd b/net-misc/ser/files/ser.confd
new file mode 100644
index 000000000000..28594a2c6a74
--- /dev/null
+++ b/net-misc/ser/files/ser.confd
@@ -0,0 +1,11 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/files/ser.confd,v 1.1 2005/06/12 15:48:26 stkn Exp $
+
+# Additional options to start SER with
+#
+# see "ser -h" for a list of options
+#
+# default: run SER as user:group = ser:ser
+#
+SER_OPTS="-u ser -g ser"
diff --git a/net-misc/ser/files/ser.rc6 b/net-misc/ser/files/ser.rc6
new file mode 100755
index 000000000000..85b369d506ca
--- /dev/null
+++ b/net-misc/ser/files/ser.rc6
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 2002 Frauenhofer Gesellschaft FOKUS, Germany.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/files/ser.rc6,v 1.1 2005/06/12 15:48:26 stkn Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ser"
+	start-stop-daemon --start --quiet --pidfile /var/run/ser.pid \
+		--exec /usr/sbin/ser -- ${SER_OPTS} -P /var/run/ser.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ser"
+	start-stop-daemon --stop --quiet --pidfile /var/run/ser.pid
+	eend $?
+}
+
diff --git a/net-misc/ser/files/silomail-1.0-ser-0.9.0.diff b/net-misc/ser/files/silomail-1.0-ser-0.9.0.diff
new file mode 100644
index 000000000000..1aec0e0e1f42
--- /dev/null
+++ b/net-misc/ser/files/silomail-1.0-ser-0.9.0.diff
@@ -0,0 +1,13 @@
+--- Makefile.orig	2005-06-12 04:08:24.000000000 +0200
++++ Makefile	2005-06-12 04:08:29.000000000 +0200
+@@ -12,10 +12,3 @@
+ CFLAGS=-Wall -g
+ 
+ include ../../Makefile.modules
+-
+-
+-install:
+-	-serctl stop
+-	rm -f /usr/local/lib/ser/modules/silomail.so
+-	cp silomail.so /usr/local/lib/ser/modules
+-	-serctl start
diff --git a/net-misc/ser/ser-0.9.0.ebuild b/net-misc/ser/ser-0.9.0.ebuild
new file mode 100644
index 000000000000..739c9b6a90e6
--- /dev/null
+++ b/net-misc/ser/ser-0.9.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.0.ebuild,v 1.1 2005/06/12 15:48:26 stkn Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="ipv6 mysql radius postgres jabber ldap ssl"
+
+ETHZ_PV="1.0"
+LDAP_PV="1.0"
+LDAPS_PV="1.0"
+SILOMAIL_PV="1.0"
+
+DESCRIPTION="SIP Express Router"
+HOMEPAGE="http://www.iptel.org/ser"
+SRC_URI="ftp://ftp.berlios.de/pub/ser/${PV}/src/${P}_src.tar.gz
+	 mirror://gentoo/silomail-${SILOMAIL_PV}-${P}.tar.gz
+	 mirror://gentoo/ethz-${ETHZ_PV}-${P}.tar.gz
+	 ldap? ( mirror://gentoo/ldap-${LDAP_PV}-${P}.tar.gz
+		 mirror://gentoo/ldaps-${LDAPS_PV}-${P}.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-*"
+
+DEPEND=">=sys-devel/bison-1.35
+	>=sys-devel/flex-2.5.4a
+	mysql? ( >=dev-db/mysql-3.23.52 )
+	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
+	postgres? ( dev-db/postgresql )
+	jabber? ( dev-libs/expat )
+	ldap? ( net-nds/openldap
+		ssl? ( dev-libs/openssl ))"
+
+src_unpack() {
+	local modules extmodules MY_A
+
+	# unpack ser source
+	unpack ${P}_src.tar.gz
+
+	cd ${S}
+	use ipv6 || \
+		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs
+
+	# external modules
+	extmodules="silomail ethz"
+
+	use mysql && \
+		modules="${modules} mysql"
+
+	use radius && \
+		modules="${modules} auth_radius group_radius uri_radius avp_radius"
+
+	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
+
+	# fix ser.cfg
+	sed -i -e "/force_send_socket(smaug:5080);/ d" \
+		etc/ser.cfg
+
+	# unpack external modules
+	# ugly i know...
+	for x in ${extmodules}; do
+		MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${P})
+		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
+	done
+
+	# remove sasl if openldap hasn't been built with it
+	if use ldap && ! built_with_use openldap sasl; then
+		sed -i -e "s:-lsasl::g" \
+			${S}/modules/ldap/Makefile
+
+		if use ssl; then
+			sed -i -e "s:-lsasl::g" \
+				${S}/modules/ldaps/Makefile
+		fi
+	fi
+}
+
+src_compile() {
+	# add -fPIC
+	append-flags -fPIC
+
+	make all \
+		CFLAGS="${CFLAGS}" \
+		cfg-prefix=/ \
+		cfg-target=/etc/ser \
+		${myconf} || die
+}
+
+src_install () {
+	make install \
+		prefix="" \
+		bin-prefix=${D}/usr/sbin \
+		bin-dir="" \
+		cfg-prefix=${D}/etc \
+		cfg-dir=ser/ \
+		cfg-target=/etc/ser/ \
+		modules-prefix=${D}/usr/lib/ser \
+		modules-dir=modules \
+		modules-target=/usr/lib/ser/modules/ \
+		man-prefix=${D}/usr/share/man \
+		man-dir="" \
+		doc-prefix=${D}/usr/share/doc \
+		doc-dir=${P} || die
+
+	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
+
+	#
+	# non-root
+	#
+	enewgroup ser
+	enewuser  ser -1 /bin/false /dev/null ser
+
+	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/*/*
+}
+
+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
+}