diff options
| -rw-r--r-- | net-im/silc-server/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/silc-server/files/1.1-execstack.patch | 10 | ||||
| -rw-r--r-- | net-im/silc-server/files/silcd.initd | 21 | ||||
| -rw-r--r-- | net-im/silc-server/silc-server-1.1.14.ebuild | 67 |
4 files changed, 6 insertions, 100 deletions
diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog index 7988cd5ecacf..346f167f87ba 100644 --- a/net-im/silc-server/ChangeLog +++ b/net-im/silc-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/silc-server -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.45 2014/08/05 18:34:18 mrueg Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.46 2015/03/09 20:55:41 mrueg Exp $ + + 09 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -files/1.1-execstack.patch, + -files/silcd.initd, -silc-server-1.1.14.ebuild: + Remove old. 05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> silc-server-1.1.14.ebuild, silc-server-1.1.18.ebuild: diff --git a/net-im/silc-server/files/1.1-execstack.patch b/net-im/silc-server/files/1.1-execstack.patch deleted file mode 100644 index a7b2d41946a2..000000000000 --- a/net-im/silc-server/files/1.1-execstack.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/silcd.initd b/net-im/silc-server/files/silcd.initd deleted file mode 100644 index 0173ecdbba3e..000000000000 --- a/net-im/silc-server/files/silcd.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# 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.initd,v 1.2 2009/02/24 17:33:34 drizzt Exp $ - -depend() { - need net - use dns -} - -start() { - ebegin "Starting silcd" - start-stop-daemon --start --quiet --exec /usr/sbin/silcd -- -f /etc/silc/silcd.conf >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Shutting down silcd" - start-stop-daemon --stop --pidfile /var/run/silcd.pid - eend $? -} diff --git a/net-im/silc-server/silc-server-1.1.14.ebuild b/net-im/silc-server/silc-server-1.1.14.ebuild deleted file mode 100644 index 1582b4d97c76..000000000000 --- a/net-im/silc-server/silc-server-1.1.14.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2014 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.14.ebuild,v 1.3 2014/01/08 06:41:24 vapier Exp $ - -inherit eutils flag-o-matic user - -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="~amd64 ~ppc ~sparc ~x86" -IUSE="ipv6 debug" - -RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1 - !<=net-im/silc-client-1.0.1" - -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 -} |