From d1dcd83d374ccafc891627d2ea8aa0fea7d0d925 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Thu, 7 Apr 2005 13:37:22 +0000 Subject: Version bump. Some changes, see changelog. (Portage version: 2.0.51.19) --- net-im/silc-server/ChangeLog | 12 +++- net-im/silc-server/Manifest | 14 +--- net-im/silc-server/files/digest-silc-server-0.9.19 | 1 + net-im/silc-server/files/silc-server.init.d | 21 ------ net-im/silc-server/files/silc-server.rc6 | 21 ++++++ net-im/silc-server/files/silcd.rc6 | 21 ++++++ net-im/silc-server/silc-server-0.9.18.ebuild | 6 +- net-im/silc-server/silc-server-0.9.19.ebuild | 79 ++++++++++++++++++++++ 8 files changed, 138 insertions(+), 37 deletions(-) create mode 100644 net-im/silc-server/files/digest-silc-server-0.9.19 delete mode 100644 net-im/silc-server/files/silc-server.init.d create mode 100644 net-im/silc-server/files/silc-server.rc6 create mode 100644 net-im/silc-server/files/silcd.rc6 create mode 100644 net-im/silc-server/silc-server-0.9.19.ebuild (limited to 'net-im/silc-server') diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog index ffe8b04abfd5..735fd30eaf5a 100644 --- a/net-im/silc-server/ChangeLog +++ b/net-im/silc-server/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-im/silc-server -# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.3 2004/12/04 23:05:28 swegener Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.4 2005/04/07 13:37:22 ticho Exp $ + +*silc-server-0.9.19 (07 Apr 2005) + + 07 Apr 2005; Andrej Kacian -files/silc-server.init.d, + +files/silc-server.rc6, +files/silcd.rc6, silc-server-0.9.18.ebuild, + +silc-server-0.9.19.ebuild: + Version bump. Moved configuration to /etc/silc. Renamed initscript to silcd. + Link against existing silc-toolkit if found. 05 Dec 2004; Sven Wegener files/silc-server.init.d: Added a &>/dev/null output redirection to the init script. Closes bug #72656. diff --git a/net-im/silc-server/Manifest b/net-im/silc-server/Manifest index d4bf38cc4d59..d5782dcda61a 100644 --- a/net-im/silc-server/Manifest +++ b/net-im/silc-server/Manifest @@ -1,15 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 29b763c07c6a6ca761954040a32ffce8 silc-server-0.9.18.ebuild 1510 MD5 26577cacc509f394a66a46286424b4ac ChangeLog 656 +MD5 29b763c07c6a6ca761954040a32ffce8 silc-server-0.9.18.ebuild 1510 +MD5 527080399ed3f2f63605f928c981d21d silc-server-0.9.19.ebuild 1415 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 +MD5 daa76cd2004c198217562515888c3bd6 files/digest-silc-server-0.9.19 74 MD5 4d46fea728c7503261d8cdb4c8889b12 files/silc-server.init.d 547 MD5 35c2cb3f96d044d2fa789fdaee59b960 files/digest-silc-server-0.9.18 72 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBskLBI1lqEGTUzyQRAjOOAKCHwXcaoV/rdNC6B7Av97lvP4XqawCg25Cz -Ixh4sfBoQX+yV9IT+CEch0I= -=wV03 ------END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..02c20ee41aa4 --- /dev/null +++ b/net-im/silc-server/files/digest-silc-server-0.9.19 @@ -0,0 +1 @@ +MD5 075dc16218fa3e81f314bdcebe0c962f silc-server-0.9.19p1.tar.bz2 1182404 diff --git a/net-im/silc-server/files/silc-server.init.d b/net-im/silc-server/files/silc-server.init.d deleted file mode 100644 index 25ee515c4497..000000000000 --- a/net-im/silc-server/files/silc-server.init.d +++ /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.init.d,v 1.2 2004/12/04 23:05:28 swegener 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/silc-server.rc6 b/net-im/silc-server/files/silc-server.rc6 new file mode 100644 index 000000000000..bd1d3c2ae929 --- /dev/null +++ b/net-im/silc-server/files/silc-server.rc6 @@ -0,0 +1,21 @@ +#!/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 new file mode 100644 index 000000000000..e9e3d39a6ac5 --- /dev/null +++ b/net-im/silc-server/files/silcd.rc6 @@ -0,0 +1,21 @@ +#!/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/silcd.rc6,v 1.1 2005/04/07 13:37:22 ticho 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 + 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-0.9.18.ebuild b/net-im/silc-server/silc-server-0.9.18.ebuild index 615040ee129e..ca1d41253838 100644 --- a/net-im/silc-server/silc-server-0.9.18.ebuild +++ b/net-im/silc-server/silc-server-0.9.18.ebuild @@ -1,6 +1,6 @@ -# 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/silc-server-0.9.18.ebuild,v 1.2 2004/07/17 19:10:43 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-0.9.18.ebuild,v 1.3 2005/04/07 13:37:22 ticho Exp $ inherit eutils @@ -42,7 +42,7 @@ src_install() { ${D}/etc/${PN}/silcd.{pub,prv} exeinto /etc/init.d - newexe ${FILESDIR}/silc-server.init.d silc-server + newexe ${FILESDIR}/silc-server.rc6 silc-server sed -i \ -e 's:/var/lib/silcd.pid:/var/run/silcd.pid:' \ diff --git a/net-im/silc-server/silc-server-0.9.19.ebuild b/net-im/silc-server/silc-server-0.9.19.ebuild new file mode 100644 index 000000000000..58a9eab761de --- /dev/null +++ b/net-im/silc-server/silc-server-0.9.19.ebuild @@ -0,0 +1,79 @@ +# 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.1 2005/04/07 13:37:22 ticho 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 +} -- cgit v1.2.3-65-gdbad