From 486ed6026a537cc6205d5d49cc66798b26558887 Mon Sep 17 00:00:00 2001 From: Bjarke Istrup Pedersen Date: Sun, 29 Apr 2007 14:50:41 +0000 Subject: [PATCH] Bumping to version 1.4.5, contains FreeBSD fix and some other fixes. Package-Manager: portage-2.1.2.4 --- net-misc/libupnp/ChangeLog | 8 ++- net-misc/libupnp/Manifest | 45 ++++---------- net-misc/libupnp/files/digest-libupnp-1.4.4 | 3 - .../libupnp/files/digest-libupnp-1.4.4-r1 | 3 - net-misc/libupnp/files/digest-libupnp-1.4.5 | 3 + .../libupnp/files/libupnp-1.4.4-r1-fbsd.patch | 60 ------------------- net-misc/libupnp/libupnp-1.4.4.ebuild | 36 ----------- ...p-1.4.4-r1.ebuild => libupnp-1.4.5.ebuild} | 4 +- 8 files changed, 23 insertions(+), 139 deletions(-) delete mode 100644 net-misc/libupnp/files/digest-libupnp-1.4.4 delete mode 100644 net-misc/libupnp/files/digest-libupnp-1.4.4-r1 create mode 100644 net-misc/libupnp/files/digest-libupnp-1.4.5 delete mode 100644 net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch delete mode 100644 net-misc/libupnp/libupnp-1.4.4.ebuild rename net-misc/libupnp/{libupnp-1.4.4-r1.ebuild => libupnp-1.4.5.ebuild} (91%) diff --git a/net-misc/libupnp/ChangeLog b/net-misc/libupnp/ChangeLog index da6766ce2b81..dd110ae0e3e0 100644 --- a/net-misc/libupnp/ChangeLog +++ b/net-misc/libupnp/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for net-misc/libupnp # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.12 2007/04/19 14:32:28 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.13 2007/04/29 14:50:41 gurligebis Exp $ + 29 Apr 2007; Bjarke Istrup Pedersen -libupnp-1.4.4-r1.ebuild, + -libupnp-1.4.4.ebuild +libupnp-1.4.5.ebuild: + Bumping to version 1.4.5, contains FreeBSD fix and some other fixes. + +*libupnp-1.4.5 (29 Apr 2007) + 19 Apr 2007; Timothy Redaelli libupnp-1.4.4-r1.ebuild: Keyworded ~x86-fbsd wrt bug #175201 and #175090 diff --git a/net-misc/libupnp/Manifest b/net-misc/libupnp/Manifest index dcfd9cafff18..4ba8f65c8a45 100644 --- a/net-misc/libupnp/Manifest +++ b/net-misc/libupnp/Manifest @@ -1,37 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX libupnp-1.4.4-r1-fbsd.patch 1668 RMD160 4eb56fb2ed0edbb619c31549e7397524c929836b SHA1 e3e9d4d42a6fbe220cbe8fb7eb48a124d6f2cbeb SHA256 41a1e27d556efad9e84f1881e62956f42b028ff9f027dd673a8048f1edce601f -MD5 04ebc106918d07b923aa9d05d2b237a2 files/libupnp-1.4.4-r1-fbsd.patch 1668 -RMD160 4eb56fb2ed0edbb619c31549e7397524c929836b files/libupnp-1.4.4-r1-fbsd.patch 1668 -SHA256 41a1e27d556efad9e84f1881e62956f42b028ff9f027dd673a8048f1edce601f files/libupnp-1.4.4-r1-fbsd.patch 1668 -DIST libupnp-1.4.4.tar.bz2 1098948 RMD160 3d0edbf93935a5371c8e951b459d3e1d81278f7e SHA1 59c1bb4cb9207ba482076dc8c8271521f27f320f SHA256 72e2069cd2541e7c4b5c8e1f2e9b3d02cbd93e94bfbac23e97d50045a6899001 -EBUILD libupnp-1.4.4-r1.ebuild 1091 RMD160 c8e7b7477449be6a759c8b2bd1153b67dc50dfcf SHA1 63f428657cc957f9d84ac3977ad63f30928d3327 SHA256 f11f97e1a4c02a742bc9493b022757e1f57c219d1cac4e80121d5725f651a7c4 -MD5 da727e909f122e3c78d365cb8cb141ff libupnp-1.4.4-r1.ebuild 1091 -RMD160 c8e7b7477449be6a759c8b2bd1153b67dc50dfcf libupnp-1.4.4-r1.ebuild 1091 -SHA256 f11f97e1a4c02a742bc9493b022757e1f57c219d1cac4e80121d5725f651a7c4 libupnp-1.4.4-r1.ebuild 1091 -EBUILD libupnp-1.4.4.ebuild 906 RMD160 db8ea92c969809f87d32af4f4c2348d78f0d8a9e SHA1 781352c2c0bef0c91b7bb95c093035e28578008a SHA256 e7de16f0b1796bbf395d1a82a4d459eb308eef9485abae5080efa49ea0d5e079 -MD5 e4a29b06bfbce49873a56291dddf13a2 libupnp-1.4.4.ebuild 906 -RMD160 db8ea92c969809f87d32af4f4c2348d78f0d8a9e libupnp-1.4.4.ebuild 906 -SHA256 e7de16f0b1796bbf395d1a82a4d459eb308eef9485abae5080efa49ea0d5e079 libupnp-1.4.4.ebuild 906 -MISC ChangeLog 2004 RMD160 3bc05804c7383eef455e297a30cf55e50795f1fd SHA1 95b551ed690d229b6f9373b6c3948b41a0ac55d8 SHA256 7970d0f322b1fc895ce8c11a9824aca92815e2faeb69bfab9033460ced44e54e -MD5 cb4a6188a2d7b2a30d4cba2a8b7d1291 ChangeLog 2004 -RMD160 3bc05804c7383eef455e297a30cf55e50795f1fd ChangeLog 2004 -SHA256 7970d0f322b1fc895ce8c11a9824aca92815e2faeb69bfab9033460ced44e54e ChangeLog 2004 +DIST libupnp-1.4.5.tar.bz2 1099659 RMD160 33130b6020d34867b0b468f9efb80a8825d82074 SHA1 2feae536d158507c047822938d67ba5fb9b5f31f SHA256 ed4f8b267f471facbc83a015156c24b3355ac713774c55f4812b94118df30e4e +EBUILD libupnp-1.4.5.ebuild 1045 RMD160 866e87e08766726bd7617f4e5ee476df7da8b1fe SHA1 d92c16bfa15e28c7bb486475014a7b2741aa9e7b SHA256 e5f96db334b69680ef57065803c1ddbe22ae48a61957cfaac9aa620573082c37 +MD5 a9d8b9b713bec82506b5a99881b92545 libupnp-1.4.5.ebuild 1045 +RMD160 866e87e08766726bd7617f4e5ee476df7da8b1fe libupnp-1.4.5.ebuild 1045 +SHA256 e5f96db334b69680ef57065803c1ddbe22ae48a61957cfaac9aa620573082c37 libupnp-1.4.5.ebuild 1045 +MISC ChangeLog 2247 RMD160 fbc482f3f86045fee17142c52b9a3840682ee257 SHA1 055f6a5e83c10f643197ffb900412f355921d3fb SHA256 9a94b754b7d9a1900b47ad164c1f34dbfb17dd25e10aa460be8f196321ac39a4 +MD5 f1735811740c0ae5169f6b9aed6e2d7f ChangeLog 2247 +RMD160 fbc482f3f86045fee17142c52b9a3840682ee257 ChangeLog 2247 +SHA256 9a94b754b7d9a1900b47ad164c1f34dbfb17dd25e10aa460be8f196321ac39a4 ChangeLog 2247 MISC metadata.xml 337 RMD160 4b96304608ebda0c9070bc6657fc52694f52e3d9 SHA1 181186b1aed6eacda0ce728048c900f10ae79f6b SHA256 e75f8af04c2deb2fe9616129baf04661e5a00c25d1e353146fe1ca7fd978d228 MD5 3fef076e99b34a5fbf6a38d6b2ed0863 metadata.xml 337 RMD160 4b96304608ebda0c9070bc6657fc52694f52e3d9 metadata.xml 337 SHA256 e75f8af04c2deb2fe9616129baf04661e5a00c25d1e353146fe1ca7fd978d228 metadata.xml 337 -MD5 869cf1804e040b9efd542c3639e4dc80 files/digest-libupnp-1.4.4 247 -RMD160 81a0612f35fa6d736e10d151795d642fe03a13bc files/digest-libupnp-1.4.4 247 -SHA256 003421ad4c52ff119cd963cd8f6a1084af75f9a2b3729001166b22b138b65f78 files/digest-libupnp-1.4.4 247 -MD5 869cf1804e040b9efd542c3639e4dc80 files/digest-libupnp-1.4.4-r1 247 -RMD160 81a0612f35fa6d736e10d151795d642fe03a13bc files/digest-libupnp-1.4.4-r1 247 -SHA256 003421ad4c52ff119cd963cd8f6a1084af75f9a2b3729001166b22b138b65f78 files/digest-libupnp-1.4.4-r1 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGJ32DjJyKLBkBVroRAn2vAJ0f3rJw+U4UcsiJDngtQtf11bvtagCZASzO -3di62BdhYyB19/ub70RGEjc= -=Cdn7 ------END PGP SIGNATURE----- +MD5 eb3c62b601623de6a07bb241b5bac304 files/digest-libupnp-1.4.5 247 +RMD160 c6f602d500bd916357d421cb9736a5cc7512eff2 files/digest-libupnp-1.4.5 247 +SHA256 714fa4c54ea0ba1b91a05e956d7d43c7db3c4ac33f490fbe265b4bea09cddbb0 files/digest-libupnp-1.4.5 247 diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.4 b/net-misc/libupnp/files/digest-libupnp-1.4.4 deleted file mode 100644 index 75614e901e50..000000000000 --- a/net-misc/libupnp/files/digest-libupnp-1.4.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 79d2beeb7d78a5e080a52a7e321b7f22 libupnp-1.4.4.tar.bz2 1098948 -RMD160 3d0edbf93935a5371c8e951b459d3e1d81278f7e libupnp-1.4.4.tar.bz2 1098948 -SHA256 72e2069cd2541e7c4b5c8e1f2e9b3d02cbd93e94bfbac23e97d50045a6899001 libupnp-1.4.4.tar.bz2 1098948 diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.4-r1 b/net-misc/libupnp/files/digest-libupnp-1.4.4-r1 deleted file mode 100644 index 75614e901e50..000000000000 --- a/net-misc/libupnp/files/digest-libupnp-1.4.4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 79d2beeb7d78a5e080a52a7e321b7f22 libupnp-1.4.4.tar.bz2 1098948 -RMD160 3d0edbf93935a5371c8e951b459d3e1d81278f7e libupnp-1.4.4.tar.bz2 1098948 -SHA256 72e2069cd2541e7c4b5c8e1f2e9b3d02cbd93e94bfbac23e97d50045a6899001 libupnp-1.4.4.tar.bz2 1098948 diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.5 b/net-misc/libupnp/files/digest-libupnp-1.4.5 new file mode 100644 index 000000000000..1ae80852cd09 --- /dev/null +++ b/net-misc/libupnp/files/digest-libupnp-1.4.5 @@ -0,0 +1,3 @@ +MD5 50b918b0d79bf4c7a9cd12b62b08fe96 libupnp-1.4.5.tar.bz2 1099659 +RMD160 33130b6020d34867b0b468f9efb80a8825d82074 libupnp-1.4.5.tar.bz2 1099659 +SHA256 ed4f8b267f471facbc83a015156c24b3355ac713774c55f4812b94118df30e4e libupnp-1.4.5.tar.bz2 1099659 diff --git a/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch b/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch deleted file mode 100644 index 6009ddb3f144..000000000000 --- a/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- threadutil/inc/ithread.h.orig 2007-03-13 03:19:24 +0000 -+++ threadutil/inc/ithread.h 2007-04-18 19:54:22 +0000 -@@ -47,6 +47,10 @@ - #include - #endif - -+#ifdef __FreeBSD__ -+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE -+#endif -+ - #ifdef PTHREAD_MUTEX_RECURSIVE - /* This system has SuS2-compliant mutex attributes. - * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols ---- upnp/src/genlib/net/uri/uri.c.orig 2007-04-18 20:46:43 +0000 -+++ upnp/src/genlib/net/uri/uri.c 2007-04-18 20:49:08 +0000 -@@ -34,8 +34,11 @@ - ************************************************************************/ - - #ifdef __FreeBSD__ -+#include -+#if __FreeBSD_version < 601103 - #include - #endif -+#endif - #include "config.h" - #include "uri.h" - -@@ -620,7 +623,7 @@ - &h, - temp_hostbyname_buff, - BUFFER_SIZE, &errcode ); --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) && __FreeBSD_version < 601103 - h = lwres_gethostbyname_r( temp_host_name, - &h_buf, - temp_hostbyname_buff, ---- configure.ac (revision 157) -+++ configure.ac (working copy) -@@ -163,13 +163,6 @@ - # - # Default compilation flags - # --if test x"$enable_debug" = xyes; then -- # AC_PROG_CC already sets CFLAGS to "-g -O2" by default -- : --else -- # add optimise for size -- AX_CFLAGS_GCC_OPTION([-Os]) --fi - AX_CFLAGS_WARN_ALL - - # -@@ -203,6 +196,7 @@ - AC_FUNC_VPRINTF - AC_FUNC_FSEEKO - -+AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)]) - - # - # Checks for POSIX Threads diff --git a/net-misc/libupnp/libupnp-1.4.4.ebuild b/net-misc/libupnp/libupnp-1.4.4.ebuild deleted file mode 100644 index 16f1ff4d13b0..000000000000 --- a/net-misc/libupnp/libupnp-1.4.4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.4.ebuild,v 1.2 2007/04/17 18:43:03 gurligebis Exp $ - -inherit eutils toolchain-funcs - -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="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug" - -RDEPEND="!net-misc/upnp" - -src_compile() { - # w/o docdir to avoid sandbox violations - econf \ - $(use_enable debug) \ - --without-docdir \ - || die "econf failed" - emake || die "emake failed" - - # fix tests - chmod +x ixml/test/test_document.sh -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - dobin upnp/.libs/upnp_tv_{ctrlpt,device} - dodoc NEWS README ChangeLog - dohtml upnp/doc/*.pdf -} - diff --git a/net-misc/libupnp/libupnp-1.4.4-r1.ebuild b/net-misc/libupnp/libupnp-1.4.5.ebuild similarity index 91% rename from net-misc/libupnp/libupnp-1.4.4-r1.ebuild rename to net-misc/libupnp/libupnp-1.4.5.ebuild index 2163fe8ca333..e25a9a570780 100644 --- a/net-misc/libupnp/libupnp-1.4.4-r1.ebuild +++ b/net-misc/libupnp/libupnp-1.4.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.4-r1.ebuild,v 1.2 2007/04/19 14:32:28 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.5.ebuild,v 1.1 2007/04/29 14:50:41 gurligebis Exp $ WANT_AUTOMAKE=1.9 @@ -21,8 +21,6 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-${PVR}-fbsd.patch - AT_M4DIR="m4" eautoreconf # fix tests -- 2.26.2