diff options
author | Raúl Porcel <armin76@gentoo.org> | 2008-03-30 09:52:33 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2008-03-30 09:52:33 +0000 |
commit | cf2951220a68ed6a72f9d39d2114ed4d77fccf72 (patch) | |
tree | 18724f5c5d01fc322659f4dc0c0031618d1b6d1e /net-im | |
parent | old (diff) | |
download | gentoo-2-cf2951220a68ed6a72f9d39d2114ed4d77fccf72.tar.gz gentoo-2-cf2951220a68ed6a72f9d39d2114ed4d77fccf72.tar.bz2 gentoo-2-cf2951220a68ed6a72f9d39d2114ed4d77fccf72.zip |
old
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/silc-server/files/1.0-fPIC.patch | 11 | ||||
-rw-r--r-- | net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch | 84 | ||||
-rw-r--r-- | net-im/silc-server/silc-server-1.0.4.ebuild | 79 | ||||
-rw-r--r-- | net-im/silc-server/silc-server-1.1.ebuild | 75 |
4 files changed, 0 insertions, 249 deletions
diff --git a/net-im/silc-server/files/1.0-fPIC.patch b/net-im/silc-server/files/1.0-fPIC.patch deleted file mode 100644 index f8faee6ec966..000000000000 --- a/net-im/silc-server/files/1.0-fPIC.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/silc-server-1.0.2-join-hmac.patch b/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch deleted file mode 100644 index b5e6061c1590..000000000000 --- a/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur silc-server-1.0.2.orig/apps/silcd/command.c silc-server-1.0.2/apps/silcd/command.c ---- silc-server-1.0.2.orig/apps/silcd/command.c 2007-03-06 11:21:40.000000000 +0100 -+++ silc-server-1.0.2/apps/silcd/command.c 2007-03-06 13:33:28.000000000 +0100 -@@ -2441,10 +2441,22 @@ - channel = silc_server_create_new_channel(server, server->id, cipher, - hmac, channel_name, TRUE); - if (!channel) { -- silc_server_command_send_status_data( -- cmd, SILC_COMMAND_JOIN, -- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -- 0, 2, cipher, strlen(cipher)); -+ if (cipher) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, cipher, strlen(cipher)); -+ } else if (hmac) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, hmac, strlen(hmac)); -+ } else { -+ silc_server_command_send_status_reply( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_RESOURCE_LIMIT, -+ 0); -+ } - silc_free(client_id); - goto out; - } -@@ -2505,10 +2517,22 @@ - channel = silc_server_create_new_channel(server, server->id, cipher, - hmac, channel_name, TRUE); - if (!channel) { -- silc_server_command_send_status_data( -- cmd, SILC_COMMAND_JOIN, -- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0, -- 2, cipher, strlen(cipher)); -+ if (cipher) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, cipher, strlen(cipher)); -+ } else if (hmac) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, hmac, strlen(hmac)); -+ } else { -+ silc_server_command_send_status_reply( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_RESOURCE_LIMIT, -+ 0); -+ } - silc_free(client_id); - goto out; - } -@@ -2541,10 +2565,22 @@ - channel = silc_server_create_new_channel(server, server->id, cipher, - hmac, channel_name, TRUE); - if (!channel) { -- silc_server_command_send_status_data( -- cmd, SILC_COMMAND_JOIN, -- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0, -- 2, cipher, strlen(cipher)); -+ if (cipher) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, cipher, strlen(cipher)); -+ } else if (hmac) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, hmac, strlen(hmac)); -+ } else { -+ silc_server_command_send_status_reply( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_RESOURCE_LIMIT, -+ 0); -+ } - silc_free(client_id); - goto out; - } diff --git a/net-im/silc-server/silc-server-1.0.4.ebuild b/net-im/silc-server/silc-server-1.0.4.ebuild deleted file mode 100644 index d51335431525..000000000000 --- a/net-im/silc-server/silc-server-1.0.4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# 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.0.4.ebuild,v 1.4 2007/07/20 08:48:25 nixnut 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} - =sys-devel/automake-1.9*" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/1.0-fPIC.patch - - eautoreconf -} - -src_compile() { - ### Append -fsigned-char for platforms without this as default - ### Fixes runtime conf parsing bug on ppc - append-flags -fsigned-char - - econf \ - --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 \ - --with-simdir=/usr/$(get_libdir)/${PN} \ - --without-silc-libs \ - $(use_enable ipv6) \ - $(use_enable debug) \ - || die "econf failed" - emake -j1 || 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/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 - fi -} diff --git a/net-im/silc-server/silc-server-1.1.ebuild b/net-im/silc-server/silc-server-1.1.ebuild deleted file mode 100644 index da9f5b8127e7..000000000000 --- a/net-im/silc-server/silc-server-1.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2008 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.3 2008/02/14 21:52:02 coldwind 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="~amd64 ~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 -} |