non-maintainer commit: version bump for security bug #284561

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 147 insertions, 3 deletions

diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index 71f00c122109..aedfb1dfccb5 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/silc-client
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.55 2008/11/27 10:29:18 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.56 2010/04/19 20:45:53 polynomial-c Exp $
+
+*silc-client-1.1.8 (19 Apr 2010)
+
+  19 Apr 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +silc-client-1.1.8.ebuild, +files/silc-client-1.1.8-docdir.patch:
+  non-maintainer commit: version bump for security bug #284561
+  Converted ebuild to EAPI-2 and did some cleanups but there are still some
+  QA warnings about LDFLAGS.
 
 *silc-client-1.1.6 (27 Nov 2008)
 
diff --git a/net-im/silc-client/Manifest b/net-im/silc-client/Manifest
index d334ce96bf3f..f884965c70b1 100644
--- a/net-im/silc-client/Manifest
+++ b/net-im/silc-client/Manifest
@@ -1,7 +1,10 @@
 AUX silc-client-1.1-docdir.patch 1913 RMD160 b3efd82ab5d5cf4ad8d128f99a03ef31837ac72d SHA1 4676b64a74c144f20b31b1338a2e73376e33e227 SHA256 8d90646881289606e2ef65c28d320226bd170968e081d099d1251ba3bf11e1b2
+AUX silc-client-1.1.8-docdir.patch 1792 RMD160 bb32ea6265ba68f29ad1481d4435d3fa5116151d SHA1 96bbdbbc5958af1084a14c2727cf108120155c18 SHA256 149f2dbe89c7c38b3802ae779cf1242bcfd0b06090f2f8b874ff1fb99030bf00
 DIST silc-client-1.1.4.tar.bz2 1624696 RMD160 519ba59912da4bb514330ca8e87979844f957ad0 SHA1 043fd02ffc0bb420d411c4ca14ad307b48beaa06 SHA256 87deb7d8db4eed91768ff6f198d763fee60036024df214264dab9bf3e4012c08
 DIST silc-client-1.1.6.tar.bz2 1529970 RMD160 ce5a026c37c30ac489310562436f3cfa9a8d9df6 SHA1 a88fa84883adf094e8857d89fbd7b76a4d67ecd7 SHA256 2a991b05df223f16b85ca24275e944b4a4aafc220b1200984d1dc82de3b7c576
+DIST silc-client-1.1.8.tar.bz2 1532816 RMD160 a010384b5e498a62cc6cd69e97602f3118b64d2f SHA1 5936ab682e746ae413f938ce9c9b72215d6524c0 SHA256 623fec16aef312cc98a8a97c640b9451d3ea81d7690abc86bece2e8d5e19d3e2
 EBUILD silc-client-1.1.4.ebuild 2181 RMD160 a16fdff842705a31903ba91cbd24833693939243 SHA1 5babe06e5ca7a6b27cf61761bb98dd548daac3a7 SHA256 3e990b34bd5047a9172b46ef5faafeb08beb012edcdfda450bbebdae1fb176ff
 EBUILD silc-client-1.1.6.ebuild 2188 RMD160 840b11fe1b84366fa0ce8cc3c2032fc2e3e724cd SHA1 dc97c8056e34c3e4272c9caafe2aafc4d81e2910 SHA256 8a0533a5f4eceffa2e5924a6d24b411e756d8c5e0a187ec5a763d031e428f6c6
-MISC ChangeLog 8037 RMD160 6c28db403876f40b2b9a2aa3e46209ad1b06eaaa SHA1 10df9b790b24e673805cbbecbde57fb6b419cc50 SHA256 7edde886b37fd8ae9c50abd4cb36cec19d98860de727ea75c40d350a22dc9cd7
+EBUILD silc-client-1.1.8.ebuild 2042 RMD160 ab4979434a3b840c0a5d72c3986d3e1797d638e7 SHA1 dd7e20e5d7482313364643617dc7286873bd321d SHA256 939441ebf09a8f205ea23935723d3816b7cad563c26c123ab5bebf3326c5ea47
+MISC ChangeLog 8367 RMD160 cdca35dc370e6b388ea9204203ecab2305233442 SHA1 2be1ddea5cf3558f03f95ccb914988b433e06eeb SHA256 4bc157fffaf91d8e932846ce5f2ed73fa3e5726d97ec17598159b15030106807
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
diff --git a/net-im/silc-client/files/silc-client-1.1.8-docdir.patch b/net-im/silc-client/files/silc-client-1.1.8-docdir.patch
new file mode 100644
index 000000000000..b22546821c84
--- /dev/null
+++ b/net-im/silc-client/files/silc-client-1.1.8-docdir.patch
@@ -0,0 +1,55 @@
+--- silc-client-1.1.8/apps/irssi/docs/help/Makefile.in
++++ silc-client-1.1.8/apps/irssi/docs/help/Makefile.in
+@@ -356,15 +356,7 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-install-helpDATA: $(help_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(helpdir)" || $(MKDIR_P) "$(DESTDIR)$(helpdir)"
+-	@list='$(help_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(helpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(helpdir)/$$f'"; \
+-	  $(helpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(helpdir)/$$f"; \
+-	done
++install-helpDATA:
+ 
+ uninstall-helpDATA:
+ 	@$(NORMAL_UNINSTALL)
+--- silc-client-1.1.8/apps/irssi/docs/Makefile.in
++++ silc-client-1.1.8/apps/irssi/docs/Makefile.in
+@@ -256,15 +256,7 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-install-docDATA: $(doc_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+-	@list='$(doc_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+-	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+-	done
++install-docDATA:
+ 
+ uninstall-docDATA:
+ 	@$(NORMAL_UNINSTALL)
+--- silc-client-1.1.8/doc/Makefile.in
++++ silc-client-1.1.8/doc/Makefile.in
+@@ -454,14 +454,6 @@
+ 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
+ 
+ doc-install:
+-	-mkdir -p $(docdir)
+-	-$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/
+-	-$(INSTALL_DATA) $(top_srcdir)/COPYING $(docdir)/
+-	-$(INSTALL_DATA) $(top_srcdir)/ChangeLog $(docdir)/
+-	-$(INSTALL_DATA) $(top_srcdir)/CREDITS $(docdir)/
+-	-$(INSTALL_DATA) $(top_srcdir)/README* $(docdir)/
+-	-$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/
+-	-$(INSTALL_DATA) $(top_srcdir)/TODO $(docdir)/
+ 
+ install-data-hook:	doc-install
+ 
diff --git a/net-im/silc-client/silc-client-1.1.8.ebuild b/net-im/silc-client/silc-client-1.1.8.ebuild
new file mode 100644
index 000000000000..8d9ddcf1d24d
--- /dev/null
+++ b/net-im/silc-client/silc-client-1.1.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.8.ebuild,v 1.1 2010/04/19 20:45:53 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
+SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
+HOMEPAGE="http://silcnet.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 perl debug"
+
+COMMONDEPEND="perl? ( dev-lang/perl )
+	sys-libs/ncurses
+	>=dev-libs/glib-2.8
+	!<=net-im/silc-toolkit-0.9.12-r1"
+
+DEPEND="${COMMONDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	perl? (
+		!net-irc/irssi
+		!net-irc/irssi-svn
+	)"
+
+src_prepare() {
+	sed -i -e "s:-g -O2:${CFLAGS}:g" configure
+	use amd64 && sed -i -e 's:felf\([^6]\):felf64\1:g' configure
+	epatch "${FILESDIR}/${PN}-1.1.8-docdir.patch"
+}
+
+src_configure() {
+	econf \
+		--datadir=/usr/share/${PN} \
+		--datarootdir=/usr/share/${PN} \
+		--mandir=/usr/share/man \
+		--includedir=/usr/include/${PN} \
+		--sysconfdir=/etc/silc \
+		--with-helpdir=/usr/share/${PN}/help \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-optimizations \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with perl)
+}
+
+src_install() {
+	local myflags=""
+
+	if use perl
+	then
+		perl_sitearch="`perl -V:installsitearch | sed "s|.*'\(.*\)'.*|\1|"`"
+		myflags="INSTALLPRIVLIB=/usr/$(get_libdir)"
+		myflags+=" INSTALLARCHLIB=${perl_sitearch}"
+		myflags+=" INSTALLSITELIB=${perl_sitearch}"
+		myflags+=" INSTALLSITEARCH=${perl_sitearch}"
+	fi
+
+	make DESTDIR="${D}" ${myflags} install || die "make install failed"
+
+	rm -rf "${D}"/etc
+
+	dodoc ChangeLog CREDITS README TODO || die
+	cd "${S}/apps/irssi" || die
+	dodoc silc.conf docs/formats.txt docs/manual.txt docs/signals.txt docs/special_vars.txt || die
+	dohtml docs/startup-HOWTO.html || die
+
+	insinto /usr/share/silc-client/help
+	rm docs/help/Make* || die
+	doins docs/help/* || die
+}