Version bump

(Portage version: 2.1.4_rc7)

4 files changed, 95 insertions, 1 deletions

diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog
index 746709458456..19f430213f9f 100644
--- a/net-im/silc-server/ChangeLog
+++ b/net-im/silc-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/silc-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.27 2007/07/23 11:55:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.28 2007/12/06 11:38:25 armin76 Exp $
+
+*silc-server-1.1 (06 Dec 2007)
+
+  06 Dec 2007; Raúl Porcel <armin76@gentoo.org> +files/1.1-execstack.patch,
+  +silc-server-1.1.ebuild:
+  Version bump
 
   23 Jul 2007; Raúl Porcel <armin76@gentoo.org>
   -silc-server-1.0.2-r1.ebuild, -silc-server-1.0.3.ebuild:
diff --git a/net-im/silc-server/files/1.1-execstack.patch b/net-im/silc-server/files/1.1-execstack.patch
new file mode 100644
index 000000000000..a7b2d41946a2
--- /dev/null
+++ b/net-im/silc-server/files/1.1-execstack.patch
@@ -0,0 +1,10 @@
+--- lib/silccrypt/aes_x86.asm.orig	2007-12-05 19:43:16.000000000 +0100
++++ lib/silccrypt/aes_x86.asm	2007-12-05 19:43:31.000000000 +0100
+@@ -595,3 +595,7 @@
+ %endif
+ 
+     end
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
diff --git a/net-im/silc-server/files/digest-silc-server-1.1 b/net-im/silc-server/files/digest-silc-server-1.1
new file mode 100644
index 000000000000..7fabc6702e01
--- /dev/null
+++ b/net-im/silc-server/files/digest-silc-server-1.1
@@ -0,0 +1,3 @@
+MD5 0729ac04c10154b2e464ae0cf37fd1a1 silc-server-1.1.tar.bz2 996148
+RMD160 dc5c7a3979a6407e6efb3375864fe708035749e9 silc-server-1.1.tar.bz2 996148
+SHA256 feb00bc2dafccaf7558ed55b86850a473aa2d6531b0c2b649d19f81e2501dba4 silc-server-1.1.tar.bz2 996148
diff --git a/net-im/silc-server/silc-server-1.1.ebuild b/net-im/silc-server/silc-server-1.1.ebuild
new file mode 100644
index 000000000000..faec49327bfb
--- /dev/null
+++ b/net-im/silc-server/silc-server-1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.ebuild,v 1.1 2007/12/06 11:38:26 armin76 Exp $
+
+inherit eutils autotools flag-o-matic
+
+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="~ppc ~sparc ~x86"
+IUSE="ipv6 debug"
+
+RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
+	!<=net-im/silc-client-1.0.1"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/1.1-execstack.patch
+}
+
+src_compile() {
+	econf \
+		--datadir=/usr/share/${PN} \
+		--datarootdir=/usr/share/${PN} \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/silc \
+		--with-helpdir=/usr/share/${PN}/help \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-optimizations \
+		--with-logsdir=/var/log/${PN} \
+		--with-silcd-pid-file=/var/run/silcd.pid \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	insinto /usr/share/doc/${PF}/examples
+	doins doc/examples/*.conf
+
+	fperms 600 /etc/silc
+	keepdir /var/log/${PN}
+
+	rm -rf \
+		"${D}"/usr/libsilc* \
+		"${D}"/usr/include \
+		"${D}"/etc/silc/silcd.{pub,prv}
+
+	newinitd "${FILESDIR}/silcd.initd" silcd
+
+	sed -i \
+		-e 's:10.2.1.6:0.0.0.0:' \
+		-e 's:User = "nobody";:User = "silcd";:' \
+		"${D}"/etc/silc/silcd.conf
+}
+
+pkg_postinst() {
+	enewuser silcd
+
+	if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
+		einfo "Creating key pair in /etc/silc"
+		silcd -C "${ROOT}"/etc/silc
+		chmod 600 "${ROOT}"/etc/silc/silcd.{prv,pub}
+	fi
+}