From: Bjarke Istrup Pedersen Date: Fri, 8 May 2015 19:14:18 +0000 (+0000) Subject: Bumping to 1.6.19, fixing #545490 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1afc9da0a597192b4b1294c9634c9363f0fd40df;p=gentoo.git Bumping to 1.6.19, fixing #545490 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x15AE484C --- diff --git a/net-libs/libupnp/ChangeLog b/net-libs/libupnp/ChangeLog index a1d9ee9f6d99..1afccf6052bb 100644 --- a/net-libs/libupnp/ChangeLog +++ b/net-libs/libupnp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/libupnp # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.58 2015/04/28 09:46:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.59 2015/05/08 19:14:11 gurligebis Exp $ + +*libupnp-1.6.19 (08 May 2015) + + 08 May 2015; +libupnp-1.6.19.ebuild, + +files/libupnp-1.6.19-suse.patch: + Bumping to 1.6.19, fixing #545490 28 Apr 2015; Agostino Sarubbo libupnp-1.6.18-r1.ebuild: Stable for sparc, wrt bug #545206 diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest index 56edd05c0714..45e7411d64f8 100644 --- a/net-libs/libupnp/Manifest +++ b/net-libs/libupnp/Manifest @@ -2,25 +2,18 @@ Hash: SHA256 AUX libupnp-1.6.18-suse.patch 3428 SHA256 e7ba59cee885d122dd7ef34781880fa0592b0d3fbf7da7656d7ab7f091a7fbb6 SHA512 87636106cae24b64737d3ba6ed8a02fab505a30028380448fa58f5fddcdd02361e169e20271ef271147da6089873aecf763d87a8ae9f7580d904c1e4d67cb844 WHIRLPOOL aa5bd504ac176a3f50f98b6e498563c17dca4a8baa22a846df1bae3b169d001084c04f6aafea6e24b69c02a26bbc434187804219074363f51667c8141a0e701f +AUX libupnp-1.6.19-suse.patch 3429 SHA256 1989c124c3a295d9e87dc521d887eb7b27eb94a1902cce7e416790c164efeb38 SHA512 e6975c4d25f43e9a8f96f9b549e8f543e296f5b4f31764502de8daa4c487121876d7cd4c6989e941b319c4e45cd162796f4a43e9f3b07d32064ef4f77d2f6df4 WHIRLPOOL bd50d8c371538e51913c6ef91dfb89c105c90471fc0c3c1f81d849214562601c92933adf2829c890b4dd41e84c8fe2c6aa688be305bc1be14aacfebf0cc4ec2b DIST libupnp-1.6.18.tar.bz2 1201056 SHA256 b21bc676365622d3ace1b25292dab8d4d23f6e6a80ddc8f029b765d39797e934 SHA512 2ce9b637a7edf544ae272aea137f735b03761a7925da0578e0073cf6429389f7f2af6cb05f666a02faa839caba3e1798ad31657afd287626b88905a5c45f3cb4 WHIRLPOOL b575b517fb668c5e3af78dc1bc95c1a202404beb42966400b3b1313a1fe0e6cb8437ce392af6ad6de4ccc90715c8df7cc34bf3d0b3b828af4e14f1cc8a5e0eda +DIST libupnp-1.6.19.tar.bz2 1213439 SHA256 b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a SHA512 97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661 WHIRLPOOL fe3ed0115c76872b45eb3f16909e23c61b004f028b745be17346b94dffd7c90108420cf71f50f73aa4ef241403b65b9d1c72926af3044ffacdae11f9649dad68 EBUILD libupnp-1.6.18-r1.ebuild 1382 SHA256 18525463f50bac867ce24ee3ad573c816c04827698eec4f582c69c1ad5316fa4 SHA512 994ad3b62eb2a84eedd5dd089bfaf471ca7aec4083772a14420c7e6399cfaeb84b22ccbbd75ad10e782c3b3f9b90cd819a67d0027edd81b5ca7c0fe511518270 WHIRLPOOL 3e9ea9054a5c23846fcda299b87daf61d169af6abd11732fb1310f1d787d25f135e934efba172007bac2bb4f3648748d564797a07b0d5e04f14410a59ede5f14 EBUILD libupnp-1.6.18.ebuild 1443 SHA256 6adaee821b94f70751bd872be3ac0398596e455f3403c6ac7debff393e571509 SHA512 1d0f232aef49c43defe0adf3fa0532c24787eac42a622a7dfbcd2d72763cb8619f3a5e85e5cd019c9a8ee5e6890a0a365687b8e74de14ba852388926797aeb38 WHIRLPOOL a480cf0b687dda02919f39c5acbeeba16399b613b5fff389064364ff70b5d34e63e5ecf0e1af889234b778860c517ad50440f289a2f304e31c846d822af5b2f4 -MISC ChangeLog 9374 SHA256 c0e839fcf26d37f7cac0b18f7c331d5281e6b3e090553a02a2ff0cbd6d500f0b SHA512 e04ae880c4deccd673d0f252f4fb87c9753cfc423cb2650199a2225d28367a1d24ad10e500b108d3e7d9dc525128a7aefcdd08bba57beebcb36b0a8468f84ba8 WHIRLPOOL 4a7987298af650cb32c894c9fe1d6a559354d7fc141a6930a953ce71aff65c63c7e47668da42e2810a7c15d122e1156901553440b4ed0ae88da20dce3085c25a +EBUILD libupnp-1.6.19.ebuild 1392 SHA256 9a1f0f5553d85747cf77f048120d07feec4ee18b6fa414ef130a33400b78fbed SHA512 55a7d3d6e5fda5cc7ee31a4baca37fb12973e36f63b78d33e6292027e8d19e337936fc159ba1281ea97a55b59a623bebfe56b426e5d898b0b3ff3f7482426d93 WHIRLPOOL 3036284c21ecbca45225d8ecd944a974ce6b3404885a6a37fd885448bf037ffbce069f8648dfc4fa53bd5496923612ed717f031476de989da3077bfad08cafaf +MISC ChangeLog 9548 SHA256 ba6c152a3af76ee854bec7360d0adcc82dc50820d43898eb85662c717e75ac46 SHA512 d1b4919aa595a1c298ac3c14c1256f47206b6330b4ae2194cee82ceabcee1678d95f917ba12ef7124a3f478719d6fd9378354bf28933999b2fbbe19b6b049469 WHIRLPOOL a8750d7c11c2111ef33f9f7e61b987c8bd8b93b230182b414589eea4b0eff1d6c01edd19230d1c86f8c4e6bff71428e0d00951702ba75e3692e2d9e453bf6c7b MISC metadata.xml 386 SHA256 0344f103da52b54161d48d24945e93958140c37be21fd49640f901f58098c318 SHA512 26fb506745919e63ce2b1fc3f49ba15c48720501a7fbb73cb80507c019027bc8af079626fbf4ff6a0d2cd3091cf7f682ee51ccbb4727eb068ee2e850388e920e WHIRLPOOL 1a40b2f786ef694121b806555757ac2616d88c8ecbccefb852d8e4be17cdd34df27511be6afd8cde9a7f69e04df8308fc7a7d640ae97af26893fa6a7123e3bdf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVP1cDAAoJELp701BxlEWfeHQP/20aZAK+VlyqzLWWnWVSejO6 -lXLIEWTys+rhIWDJE2T5tW+bgdrEIqJ+oX7tww5q3M1Dd5eIV1eNqPJdgdEfV7hK -jH4jZx/o5kuqueVEgyftZewSSOkZrvVTNl7OCheHfWIghSCUvEEzZARwfdfd0Y0b -EEBb7BpqljXuHma5Me6wC8Gok0dWkYkLMbWXHzKtJKzyW1JzHTYSemM9A9c8IRo6 -vuKUbou7qoqDFeBmJtPbp3RS+v8RSys9og0BHu7kgfEoJhIz4iQ18LW8VAzpbR8R -rKU0wn0wqergLg2KFePu0v5WgQn9Mq0aGEjuxE3S6rfCklMmhCnb/T4KnNVz224h -LhSnRoyz3HCzFTqMQ8yNkUDokB+zYyElmCICZ6OVQIAcKdSTdJEcg3qb1EfKVfGf -D4lFgj2RGA49FLsKESl4Ofl6FjhdZ6CU7FJJmUoI9lbE28Qdk+OlmkwN+5Q+5TLv -4TCZK2Xnt8CFUQbGzFAJxNarx3lHztrFGUhJFr6m6uaizRq2zLY16i8syLAXpBhH -VbfSzlf/LZXlOG0Qjpk9fs9GasGUrTH9p6cOAf9NNK8R0Y604PZxZc7nG7PFtI7A -OhUazawjyFs5GdzR4yNUh8k7Deq0/wwTOuWGXbDGi6V7y6Wcg1plFNiYh24knezo -HkB3q8V6l0s6/P49SD+j -=x/0O +iEYEAREIAAYFAlVNCwQACgkQsR7PQhRXYEnRxQCeOEIN5xT9YAM24lZaoz0KFDrO +nQ0AnRJ6QBfgT/XwuKAIt5T3Sm11Sf+2 +=zwP9 -----END PGP SIGNATURE----- diff --git a/net-libs/libupnp/files/libupnp-1.6.19-suse.patch b/net-libs/libupnp/files/libupnp-1.6.19-suse.patch new file mode 100644 index 000000000000..75a7f0dac75c --- /dev/null +++ b/net-libs/libupnp/files/libupnp-1.6.19-suse.patch @@ -0,0 +1,132 @@ +--- configure.ac 2013-01-29 16:39:56.000000000 +0100 ++++ configure.ac 2013-02-17 10:40:53.680021913 +0100 +@@ -7,9 +7,9 @@ + # (C) Copyright 2005-2007 Rémi Turboult + # + +-AC_PREREQ(2.60) ++AC_PREREQ([2.60]) + +-AC_INIT([libupnp], [1.6.19], [mroberto@users.sourceforge.net]) ++AC_INIT([libupnp],[1.6.19],[mroberto@users.sourceforge.net]) + dnl ############################################################################ + dnl # *Independently* of the above libupnp package version, the libtool version + dnl # of the 3 libraries need to be updated whenever there is a change released: +@@ -366,7 +366,6 @@ + # installed libraries. + # + AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) +-#AC_SYS_LARGEFILE_SENSITIVE + + AC_REVISION([$Revision: 1.1 $]) + +@@ -519,10 +519,12 @@ + # + # Checks for programs + # +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AM_PROG_CC_C_O + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +-AC_PROG_LIBTOOL ++LT_INIT + AC_PROG_INSTALL + AC_PROG_MAKE_SET + AC_PROG_EGREP +@@ -532,9 +534,7 @@ + #: + # Use -O0 in debug so that variables do not get optimized out + AX_CFLAGS_GCC_OPTION([-O0, -g]) +- else +- # add optimise for size +- AX_CFLAGS_GCC_OPTION([-Os]) ++ + fi + ;; + esac +@@ -548,8 +548,7 @@ + # + AC_TYPE_SIZE_T + AC_TYPE_OFF_T +-AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support]) +-AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size]) ++ + + + # +--- ixml/Makefile.am.orig ++++ ixml/Makefile.am +@@ -7,7 +7,7 @@ + + SUBDIRS = doc + +-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc ++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc + AM_CFLAGS = + + LDADD = libixml.la +--- threadutil/Makefile.am.orig ++++ threadutil/Makefile.am +@@ -4,7 +4,7 @@ + # (C) Copyright 2005 Remi Turboult + # + +-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc ++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc + + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG -DSTATS +--- upnp/src/api/UpnpString.c.orig ++++ upnp/src/api/UpnpString.c +@@ -28,38 +28,6 @@ + /* Other systems have strncasecmp */ + #endif + +-#ifndef UPNP_USE_MSVCPP +- /* VC has strnlen which is already included but with (potentially) different linkage */ +- /* strnlen() is a GNU extension. */ +- #if HAVE_STRNLEN +- extern size_t strnlen(const char *s, size_t maxlen); +- #else /* HAVE_STRNLEN */ +- static size_t strnlen(const char *s, size_t n) +- { +- const char *p = (const char *)memchr(s, 0, n); +- return p ? p - s : n; +- } +- #endif /* HAVE_STRNLEN */ +-#endif /* WIN32 */ +- +-/* strndup() is a GNU extension. */ +-#if HAVE_STRNDUP && !defined(WIN32) +- extern char *strndup(__const char *__string, size_t __n); +-#else /* HAVE_STRNDUP && !defined(WIN32) */ +- static char *strndup(const char *__string, size_t __n) +- { +- size_t strsize = strnlen(__string, __n); +- char *newstr = (char *)malloc(strsize + 1); +- if (newstr == NULL) +- return NULL; +- +- strncpy(newstr, __string, strsize); +- newstr[strsize] = 0; +- +- return newstr; +- } +-#endif /* HAVE_STRNDUP && !defined(WIN32) */ +- + /*! + * \brief Internal implementation of the class UpnpString. + * +--- upnp/Makefile.am.orig ++++ upnp/Makefile.am +@@ -6,7 +6,7 @@ + + SUBDIRS = doc . sample + +-AM_CPPFLAGS = \ ++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \ + -I$(srcdir)/inc \ + -I$(top_srcdir)/threadutil/inc \ + -I$(top_srcdir)/ixml/inc diff --git a/net-libs/libupnp/libupnp-1.6.19.ebuild b/net-libs/libupnp/libupnp-1.6.19.ebuild new file mode 100644 index 000000000000..1021c231a296 --- /dev/null +++ b/net-libs/libupnp/libupnp-1.6.19.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.19.ebuild,v 1.1 2015/05/08 19:14:11 gurligebis Exp $ + +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 + + # 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." +}