Version bump, security bug #94794.

Package-Manager: portage-2.0.51.22-r1

13 files changed, 66 insertions, 197 deletions

diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog
index f4b0c7e72381..5d5d7b927dd8 100644
--- a/net-im/silc-server/ChangeLog
+++ b/net-im/silc-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/silc-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.7 2005/05/07 17:56:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.8 2005/06/08 21:15:40 swegener Exp $
+
+*silc-server-1.0 (08 Jun 2005)
+
+  08 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.0-banlist-fix.patch, +files/1.0-fPIC.patch,
+  -files/silc-server.rc6, files/silcd.rc6, -silc-server-0.9.18.ebuild,
+  -silc-server-0.9.19.ebuild, -silc-server-0.9.21.ebuild,
+  +silc-server-1.0.ebuild:
+  Version bump, security bug #94794.
 
 *silc-server-0.9.21 (07 May 2005)
 
diff --git a/net-im/silc-server/Manifest b/net-im/silc-server/Manifest
index a6ef228ab92f..2948847efac6 100644
--- a/net-im/silc-server/Manifest
+++ b/net-im/silc-server/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 002a7849448a24be8cd795dbf246cca4 silc-server-0.9.19.ebuild 2089
-MD5 c4f37b1c8f05537c7d299426e5b3b918 silc-server-0.9.18.ebuild 1512
-MD5 ce1bd124e0bcee76c5189b10eeb8e820 ChangeLog 1352
+MD5 ef6c532bedbf92c222ac6dcc3852a4df silc-server-1.0.ebuild 1785
+MD5 1e4aacdf746cb72edac611fa8ead78db ChangeLog 1683
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 4614d32e0ab4be376c9510aed8076198 silc-server-0.9.21.ebuild 1767
-MD5 1d6f438fd4db0224ebc00a4aedbf03b8 files/silcd.rc6 516
-MD5 35c2cb3f96d044d2fa789fdaee59b960 files/digest-silc-server-0.9.18 72
-MD5 daa76cd2004c198217562515888c3bd6 files/digest-silc-server-0.9.19 74
-MD5 da6c0f6df31ae15bfb1c1cb0eea16c08 files/digest-silc-server-0.9.21 71
-MD5 98a0c24ebb4913a10047dc242aa60a3a files/silc-server.rc6 541
+MD5 bc8dbf4b64aee6fb4265bc1834e8fc6f files/1.0-banlist-fix.patch 428
+MD5 e6e284a15d071cfdf8df8a2b7bff775a files/silcd.rc6 519
+MD5 16f7bf5863b8fe1ce3293e158882ee35 files/digest-silc-server-1.0 68
+MD5 1d2c979312a0f446a2c84f2b3a98f76b files/1.0-fPIC.patch 296
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCfQF7I1lqEGTUzyQRAhgUAJ4wZUT38YWrFmOEaexhR2zL7ZSRzACg2iLB
-j97XlcvRY12WBGiRwzcjOYw=
-=d4Zu
+iD8DBQFCp2AJI1lqEGTUzyQRAj2/AJwML7fuT5rnx6f/eZ7scJFGpr6gPwCfYi3m
+RWe2kwmtnekupUXJplI8TMQ=
+=BmmN
 -----END PGP SIGNATURE-----
diff --git a/net-im/silc-server/files/1.0-banlist-fix.patch b/net-im/silc-server/files/1.0-banlist-fix.patch
new file mode 100644
index 000000000000..dab1ab70c062
--- /dev/null
+++ b/net-im/silc-server/files/1.0-banlist-fix.patch
@@ -0,0 +1,11 @@
+--- silc-server-1.0/lib/silcutil/unix/silcunixutil.c	2005-04-30 17:31:27.000000000 +0200
++++ silc-server-test/lib/silcutil/unix/silcunixutil.c	2005-05-24 21:23:08.035680920 +0200
+@@ -98,7 +98,7 @@
+   regex_t preg;
+   int ret = FALSE;
+   
+-  if (regcomp(&preg, regex, REG_NOSUB | REG_EXTENDED) < 0)
++  if (regcomp(&preg, regex, REG_NOSUB | REG_EXTENDED) != 0)
+     return FALSE;
+ 
+   if (regexec(&preg, string, 0, NULL, 0) == 0)
diff --git a/net-im/silc-server/files/1.0-fPIC.patch b/net-im/silc-server/files/1.0-fPIC.patch
new file mode 100644
index 000000000000..f8faee6ec966
--- /dev/null
+++ b/net-im/silc-server/files/1.0-fPIC.patch
@@ -0,0 +1,11 @@
+--- silc-server-1.0.orig/lib/silccrypt/Makefile.am	2005-06-08 20:59:07.877340006 +0000
++++ silc-server-1.0/lib/silccrypt/Makefile.am	2005-06-08 20:59:54.936564721 +0000
+@@ -36,7 +36,7 @@
+ LTFLAGS =
+ endif
+ 
+-CFLAGS = $(LTFLAGS)
++CFLAGS = $(LTFLAGS) -fPIC
+ 
+ 
+ EXTRA_DIST = *.h $(SILC_EXTRA_DIST)
diff --git a/net-im/silc-server/files/digest-silc-server-0.9.18 b/net-im/silc-server/files/digest-silc-server-0.9.18
deleted file mode 100644
index 78f07feb2ed7..000000000000
--- a/net-im/silc-server/files/digest-silc-server-0.9.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c74b2ba088a81b670a64d350239cde62 silc-server-0.9.18.tar.bz2 1169331
diff --git a/net-im/silc-server/files/digest-silc-server-0.9.19 b/net-im/silc-server/files/digest-silc-server-0.9.19
deleted file mode 100644
index 02c20ee41aa4..000000000000
--- a/net-im/silc-server/files/digest-silc-server-0.9.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 075dc16218fa3e81f314bdcebe0c962f silc-server-0.9.19p1.tar.bz2 1182404
diff --git a/net-im/silc-server/files/digest-silc-server-0.9.21 b/net-im/silc-server/files/digest-silc-server-0.9.21
deleted file mode 100644
index 51c9b908b4fd..000000000000
--- a/net-im/silc-server/files/digest-silc-server-0.9.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80b3c29f33de766ea8ecebe867accbc8 silc-server-0.9.21.tar.bz2 975944
diff --git a/net-im/silc-server/files/digest-silc-server-1.0 b/net-im/silc-server/files/digest-silc-server-1.0
new file mode 100644
index 000000000000..164ebf8878e0
--- /dev/null
+++ b/net-im/silc-server/files/digest-silc-server-1.0
@@ -0,0 +1 @@
+MD5 f292fe97f3a25b76182e1c808f1c2d0d silc-server-1.0.tar.bz2 969309
diff --git a/net-im/silc-server/files/silc-server.rc6 b/net-im/silc-server/files/silc-server.rc6
deleted file mode 100644
index bd1d3c2ae929..000000000000
--- a/net-im/silc-server/files/silc-server.rc6
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/files/silc-server.rc6,v 1.1 2005/04/07 13:37:22 ticho Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	ebegin "Starting silc-server"
-	start-stop-daemon --start --quiet --exec /usr/sbin/silcd -- -f /etc/silc-server/silcd.conf &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Shutting down silc-server"
-	start-stop-daemon --stop --pidfile /var/run/silcd.pid
-	eend $?
-}
diff --git a/net-im/silc-server/files/silcd.rc6 b/net-im/silc-server/files/silcd.rc6
index e9e3d39a6ac5..17efe126f788 100644
--- a/net-im/silc-server/files/silcd.rc6
+++ b/net-im/silc-server/files/silcd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/files/silcd.rc6,v 1.1 2005/04/07 13:37:22 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/files/silcd.rc6,v 1.2 2005/06/08 21:15:40 swegener Exp $
 
 depend() {
 	need net
diff --git a/net-im/silc-server/silc-server-0.9.18.ebuild b/net-im/silc-server/silc-server-0.9.18.ebuild
deleted file mode 100644
index 17671bcffa6f..000000000000
--- a/net-im/silc-server/silc-server-0.9.18.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-0.9.18.ebuild,v 1.4 2005/05/03 20:15:36 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="Server for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/server/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="ipv6 debug"
-
-DEPEND="!<=net-im/silc-toolkit-0.9.12-r1
-	!<=net-im/silc-client-1.0.1"
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-helpdir=/usr/share/${PN}/help \
-		--with-logsdir=/var/log/${PN} \
-		--with-simdir=/usr/lib/${PN} \
-		--with-mandir=/usr/share/man \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 all || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	fperms 600 /etc/${PN}
-	keepdir /var/log/${PN}
-
-	rm -rf \
-		${D}/usr/libsilc* \
-		${D}/usr/include \
-		${D}/etc/${PN}/silcd.{pub,prv}
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/silc-server.rc6 silc-server
-
-	sed -i \
-		-e 's:/var/lib/silcd.pid:/var/run/silcd.pid:' \
-		-e 's:ip = "10.2.1.6";:ip = "0.0.0.0";:' \
-		-e 's:User = "nobody";:User = "silcd";:' \
-		${D}/etc/${PN}/silcd.conf
-}
-
-pkg_postinst() {
-	enewuser silcd
-
-	if [ ! -f ${ROOT}/etc/${PN}/silcd.prv ] ; then
-		einfo "Creating key pair in ${ROOT}/etc/${PN}"
-		silcd -C ${ROOT}/etc/${PN}
-	fi
-}
diff --git a/net-im/silc-server/silc-server-0.9.19.ebuild b/net-im/silc-server/silc-server-0.9.19.ebuild
deleted file mode 100644
index 4053ea687967..000000000000
--- a/net-im/silc-server/silc-server-0.9.19.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-0.9.19.ebuild,v 1.2 2005/05/03 20:15:36 swegener Exp $
-
-inherit eutils
-
-MY_P="${P}p1"
-DESCRIPTION="Server for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/server/sources/${MY_P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="ipv6 debug"
-
-DEPEND="!<=net-im/silc-toolkit-0.9.12-r1
-	!<=net-im/silc-client-1.0.1"
-
-src_compile() {
-	local toolkit_conf=""
-	has_version '>=net-im/silc-toolkit-0.9.13' && { \
-		toolkit_conf="${toolkit_conf} --with-silc-libs=/usr$(get_libdir) --with-silc-includes=/usr/include/silc-toolkit"
-		toolkit_conf="${toolkit_conf} --with-simdir=/usr/lib/silc-toolkit"
-	} || \
-		toolkit_conf="${toolkit_conf} --with-simdir=/usr/lib/${PN}"
-
-	econf ${toolkit_conf} \
-		--sysconfdir=/etc/silc \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-helpdir=/usr/share/${PN}/help \
-		--with-logsdir=/var/log/${PN} \
-		--with-mandir=/usr/share/man \
-		--with-silcd-pid-file=/var/run/silcd.pid \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 all || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/examples/*.conf
-
-	fperms 600 /etc/${PN}
-	keepdir /var/log/${PN}
-
-	rm -rf \
-		${D}/usr/libsilc* \
-		${D}/usr/include \
-		${D}/etc/silc/silcd.{pub,prv}
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/silcd.rc6 silcd
-
-	sed -i \
-		-e 's:10.2.1.6:0.0.0.0:' \
-		-e 's:User = "nobody";:User = "silcd";:' \
-		-e 's:${D}::g' \
-		${D}/etc/silc/silcd.conf
-}
-
-pkg_postinst() {
-	enewuser silcd
-
-	if [ ! -f ${ROOT}/etc/${PN}/silcd.prv ] ; then
-		einfo "Creating key pair in ${ROOT}etc/silc"
-		silcd -C ${ROOT}etc/silc
-	fi
-
-	echo
-	ewarn "Configuration and server keys have been moved to /etc/silc, please check"
-	ewarn "your files."
-	echo
-	ewarn "Initscript name has changed from silc-server to silcd in this version."
-	echo
-}
diff --git a/net-im/silc-server/silc-server-0.9.21.ebuild b/net-im/silc-server/silc-server-1.0.ebuild
index 31fe27dac0f4..35c4438262d3 100644
--- a/net-im/silc-server/silc-server-0.9.21.ebuild
+++ b/net-im/silc-server/silc-server-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-0.9.21.ebuild,v 1.1 2005/05/07 17:56:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.0.ebuild,v 1.1 2005/06/08 21:15:40 swegener Exp $
 
 inherit eutils
 
@@ -13,8 +13,20 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 IUSE="ipv6 debug"
 
-DEPEND="!<=net-im/silc-toolkit-0.9.12-r1
+RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
 	!<=net-im/silc-client-1.0.1"
+DEPEND="${RDEPEND}
+	=sys-devel/automake-1.9*"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-banlist-fix.patch
+	epatch "${FILESDIR}"/${PV}-fPIC.patch
+
+	WANT_AUTOMAKE=1.9 automake || die "automake failed"
+}
 
 src_compile() {
 	econf \
@@ -33,7 +45,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	insinto /usr/share/doc/${PF}/examples
 	doins doc/examples/*.conf
@@ -42,31 +54,23 @@ src_install() {
 	keepdir /var/log/${PN}
 
 	rm -rf \
-		${D}/usr/libsilc* \
-		${D}/usr/include \
-		${D}/etc/silc/silcd.{pub,prv}
+		"${D}"/usr/libsilc* \
+		"${D}"/usr/include \
+		"${D}"/etc/silc/silcd.{pub,prv}
 
-	newinitd ${FILESDIR}/silcd.rc6 silcd
+	newinitd "${FILESDIR}"/silcd.rc6 silcd
 
 	sed -i \
 		-e 's:10.2.1.6:0.0.0.0:' \
 		-e 's:User = "nobody";:User = "silcd";:' \
-		-e 's:${D}::g' \
-		${D}/etc/silc/silcd.conf
+		"${D}"/etc/silc/silcd.conf
 }
 
 pkg_postinst() {
 	enewuser silcd
 
-	if [ ! -f ${ROOT}/etc/silc/silcd.prv ] ; then
+	if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
 		einfo "Creating key pair in /etc/silc"
-		silcd -C ${ROOT}/etc/silc
+		silcd -C "${ROOT}"/etc/silc
 	fi
-
-	ewarn
-	ewarn "Configuration and server keys have been moved to /etc/silc, please check"
-	ewarn "your files."
-	ewarn
-	ewarn "Initscript name has changed from silc-server to silcd in this version."
-	ewarn
 }