From 11bbfa2ad250fc7af97ecc95100fe45dcd86356f Mon Sep 17 00:00:00 2001 From: Ian Whyman Date: Thu, 15 Sep 2016 21:09:51 +0100 Subject: net-libs/libupnp: Apply patch for #589136 (CVE-2016-6255) --- net-libs/libupnp/libupnp-1.6.18-r2.ebuild | 53 ++++++++++++++++++++++++++++++ net-libs/libupnp/libupnp-1.6.19-r1.ebuild | 54 +++++++++++++++++++++++++++++++ net-libs/libupnp/libupnp-1.6.19.ebuild | 53 ------------------------------ 3 files changed, 107 insertions(+), 53 deletions(-) create mode 100644 net-libs/libupnp/libupnp-1.6.18-r2.ebuild create mode 100644 net-libs/libupnp/libupnp-1.6.19-r1.ebuild delete mode 100644 net-libs/libupnp/libupnp-1.6.19.ebuild (limited to 'net-libs') diff --git a/net-libs/libupnp/libupnp-1.6.18-r2.ebuild b/net-libs/libupnp/libupnp-1.6.18-r2.ebuild new file mode 100644 index 00000000000..655b6b60144 --- /dev/null +++ b/net-libs/libupnp/libupnp-1.6.18-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic autotools + +DESCRIPTION="An Portable Open Source UPnP Development Kit" +HOMEPAGE="http://pupnp.sourceforge.net/" +SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux" +IUSE="debug doc ipv6 static-libs" + +DOCS="NEWS README ChangeLog" + +src_prepare() { + epatch "${FILESDIR}"/${P}-suse.patch + epatch "${FILESDIR}"/CVE-2016-6255.patch + + # fix tests + chmod +x ixml/test/test_document.sh || die + + eautoreconf +} + +src_configure() { + use x86-fbsd && append-flags -O1 + # w/o docdir to avoid sandbox violations + econf \ + $(use_enable debug) \ + $(use_enable ipv6) \ + $(use_enable static-libs static) \ + $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}") +} + +src_install () { + default + dobin upnp/sample/.libs/tv_{combo,ctrlpt,device} + use static-libs || prune_libtool_files +} + +pkg_postinst() { + ewarn "Please remember to run revdep-rebuild when upgrading" + ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages" + ewarn "gets linked with the new library." + echo "" + ewarn "The revdep-rebuild script is part of the" + ewarn "app-portage/gentoolkit package." +} diff --git a/net-libs/libupnp/libupnp-1.6.19-r1.ebuild b/net-libs/libupnp/libupnp-1.6.19-r1.ebuild new file mode 100644 index 00000000000..6fb8c2102c1 --- /dev/null +++ b/net-libs/libupnp/libupnp-1.6.19-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic autotools + +DESCRIPTION="An Portable Open Source UPnP Development Kit" +HOMEPAGE="http://pupnp.sourceforge.net/" +SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux" +IUSE="debug doc ipv6 static-libs" + +DOCS="NEWS README ChangeLog" + +src_prepare() { + epatch "${FILESDIR}"/${P}-suse.patch \ + "${FILESDIR}"/${P}-docs-install.patch \ + "${FILESDIR}"/CVE-2016-6255.patch + + # fix tests + chmod +x ixml/test/test_document.sh || die + + eautoreconf +} + +src_configure() { + use x86-fbsd && append-flags -O1 + # w/o docdir to avoid sandbox violations + econf \ + $(use_enable debug) \ + $(use_enable ipv6) \ + $(use_enable static-libs static) \ + $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}") +} + +src_install () { + default + dobin upnp/sample/.libs/tv_{combo,ctrlpt,device} + use static-libs || prune_libtool_files +} + +pkg_postinst() { + ewarn "Please remember to run revdep-rebuild when upgrading" + ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages" + ewarn "gets linked with the new library." + echo "" + ewarn "The revdep-rebuild script is part of the" + ewarn "app-portage/gentoolkit package." +} diff --git a/net-libs/libupnp/libupnp-1.6.19.ebuild b/net-libs/libupnp/libupnp-1.6.19.ebuild deleted file mode 100644 index c589c65c4df..00000000000 --- a/net-libs/libupnp/libupnp-1.6.19.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic autotools - -DESCRIPTION="An Portable Open Source UPnP Development Kit" -HOMEPAGE="http://pupnp.sourceforge.net/" -SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux" -IUSE="debug doc ipv6 static-libs" - -DOCS="NEWS README ChangeLog" - -src_prepare() { - epatch "${FILESDIR}"/${P}-suse.patch \ - "${FILESDIR}"/${P}-docs-install.patch - - # fix tests - chmod +x ixml/test/test_document.sh || die - - eautoreconf -} - -src_configure() { - use x86-fbsd && append-flags -O1 - # w/o docdir to avoid sandbox violations - econf \ - $(use_enable debug) \ - $(use_enable ipv6) \ - $(use_enable static-libs static) \ - $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}") -} - -src_install () { - default - dobin upnp/sample/.libs/tv_{combo,ctrlpt,device} - use static-libs || prune_libtool_files -} - -pkg_postinst() { - ewarn "Please remember to run revdep-rebuild when upgrading" - ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages" - ewarn "gets linked with the new library." - echo "" - ewarn "The revdep-rebuild script is part of the" - ewarn "app-portage/gentoolkit package." -} -- cgit v1.2.1