diff options
9 files changed, 745 insertions, 16 deletions
diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog index cacefb8d3ae7..573aa0ca8341 100644 --- a/net-p2p/transmission/ChangeLog +++ b/net-p2p/transmission/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-p2p/transmission # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.162 2012/01/03 07:59:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.163 2012/01/25 14:33:01 scarabeus Exp $ + +*transmission-2.42 (25 Jan 2012) + + 25 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +transmission-2.42.ebuild, +files/transmission-2.42-0001-configure.ac.patch, + +files/transmission-2.42-0003-system-miniupnpc.patch, + +files/transmission-2.42-0005-build-with-natpmp1.patch, + +files/transmission-2.42-natpmp-system.patch, + +files/transmission-2.42-respect-cflags.patch, metadata.xml: + Initial commit of 2.42. Fixes bugs #389167 and #376647. 03 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> transmission-2.41.ebuild: diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest index 8e07ed4d3394..55834bfbeac6 100644 --- a/net-p2p/transmission/Manifest +++ b/net-p2p/transmission/Manifest @@ -11,6 +11,11 @@ AUX transmission-2.33-0002-config.in-4-qt.pro.patch 2434 RMD160 eff545e8416f2bb9 AUX transmission-2.33-0003-system-miniupnpc.patch 10483 RMD160 bce3fce6ed161dd476acc24118c29242a3eaecd2 SHA1 8aad4fcc81c67bec5ce50c9b6a7a09c3cfa1e580 SHA256 bedf15cca0b63f97da62dbb1164b432ada1f08d34335feb0ef05d907c9898b16 AUX transmission-2.41-0003-system-miniupnpc.patch 9639 RMD160 e23714576aa12d6a79ca8ca64793f549cc4d6534 SHA1 1d21efda014426ff4c34a30a7beadf7c730496c2 SHA256 9949347aa2dec92ef73b3dfc00d49618572b397e66d8415cca15933cce2f63f0 AUX transmission-2.41-noutp.patch 323 RMD160 cc1504552af58a67e3d98ead530bf3fffeb37bd8 SHA1 3f36855323742a920dc25351427a156a73086478 SHA256 d7f3eb4fa094bc1af3a9d83085332523648a5cc7079d99fe2bd2ac5585f0bf20 +AUX transmission-2.42-0001-configure.ac.patch 1211 RMD160 f712539374b80d4042bfa03a269f78ccfcbe5d86 SHA1 fcd7873cbec8329cb4d684d1683ceeefa5acd7f6 SHA256 e65929a083685ec99db29a1b64ac2cb07197de85beeaed83f805f7351e291eb5 +AUX transmission-2.42-0003-system-miniupnpc.patch 6850 RMD160 23fea4e81b482ab1915043479f261176203a2796 SHA1 1f6b43aee2edd7cfc89bb9ed51e3d256909d85e8 SHA256 e03d95e13af1a2bdcb6137845336d7e8aab3ac2c96976cfae8bf8c3f11a50bde +AUX transmission-2.42-0005-build-with-natpmp1.patch 591 RMD160 d36754ac843e24e1b1d5b2c7fe4acee98e7bae6f SHA1 272be3b176ad9e225af5b872d45569ee2876e14d SHA256 bd22f3a9fe950f222387723fc90225854afc7079a6030ae08447447b362b63e5 +AUX transmission-2.42-natpmp-system.patch 9261 RMD160 6c4239cc349a82101a2a244b981db67b580d5e82 SHA1 6acc52fe82c0a833bade2e25b3d7917a4d994dac SHA256 d47de749bc0408f2e94d3ccbb4ec889c07c856a1d2c5496049ed145022dd44f7 +AUX transmission-2.42-respect-cflags.patch 905 RMD160 8a8832dc3bbf2ee2c3f5a72c7529cd8aefc91c21 SHA1 fb1e4bef42b85e05b782c2012abcb47b372fb585 SHA256 0c7a06c158b22a44bb0c0b2c646e147472a039e7171c94b6f3c6a0d6c346be87 AUX transmission-daemon.confd.3 703 RMD160 482953d2bd8e9c69300af3389615764649954a63 SHA1 a4d16dde4e2408b48620cc89c4a8759b042797f2 SHA256 4b47acf195a14a322550cfcaa735a59aac38410d1c2c63ffa824ff131c55ca70 AUX transmission-daemon.initd.6 2221 RMD160 4283421f0e0794161c07544b2dd87a960585d3d8 SHA1 e249a01c7e6e7c909d56be7c704d3b3567e6e85c SHA256 85f41c6f2ab1a13667d8b1db343ac8864aa92c4d064d1782f2033a5abec70e00 AUX transmission-daemon.initd.7 2208 RMD160 8b3b70f7340d20c23c661403a2f46231b2fd7e38 SHA1 21def58b4775a8bbdefde4618b699cd88909694d SHA256 9e5d41ddef95269b9938866ac84395464a01aedd24976e34add7b214b5864796 @@ -19,28 +24,30 @@ DIST transmission-2.22.tar.bz2 4802843 RMD160 e87b560f81fc8bc422dc7071a4b27bdcf2 DIST transmission-2.31.tar.xz 2558880 RMD160 e777e32e5d02e8a93a64e4821ea0f9ccd8724f2c SHA1 84cfbc4e6a8db437d3c5b7eb983ce763b2879b62 SHA256 82cd04c93c65df818d38dcec154f5864520ab3147fac372e11d8e9d12506deba DIST transmission-2.33.tar.xz 2583032 RMD160 8b8228a2fad55a64d46314f1bf879a8b89fa150d SHA1 a5502723e9b8fdc982cc4d3c052e4839cb45b1a8 SHA256 c15a7f9d82743fb329ee12e41bf242070ddbaa8c6741da7ce0bb91d8d399a072 DIST transmission-2.41.tar.xz 2623344 RMD160 a2c9c80cff444978dff305d573007473af5b3084 SHA1 dd9531587778dc46757b1520accacf6afa20c370 SHA256 f31bf798f620b436b2f5ed7047fa27fab78ce4b229d6d02f8c71f9867277685a +DIST transmission-2.42.tar.xz 2629072 RMD160 c74688a61c2a8489f878363046ac705f1ce3f005 SHA1 78903095842fe1331c0b6ae214a9e99b0f112951 SHA256 ca94d8de5338178c2210e86e31aa522f559cac87da33a85199fbd81b7e8b04eb EBUILD transmission-2.22.ebuild 3905 RMD160 fa3fb412e80762df5ea9f586e306d3d78f7940a2 SHA1 c8abfcb6c950ebe7946b912fc5246d6f950f7bd1 SHA256 bc88d99b145cd04958b0b7c34533e2e730a247d3b87423010886178e542b0a4d EBUILD transmission-2.31-r1.ebuild 4186 RMD160 b73a2ad82fc17b03adf6f622cf984f0616d467f9 SHA1 34e11a0f03e0d1623f2e8d2a5ff1fd5d51f748fe SHA256 988da632a1b272360ba679091dc9b7764e8033cd4b765ae7fa36b6e17589c9c4 EBUILD transmission-2.31.ebuild 3614 RMD160 6aea3b61e03e52aa67dc93a3fad133e9b4804aa1 SHA1 1efec7a48458a81996572e4e18eb9c336a37b66f SHA256 46928432ead81af791d9f5f258d34ec8cfbc767f91dd7b6e458713dfa765fd2f EBUILD transmission-2.33-r1.ebuild 4360 RMD160 adde6fb9821b740584a38d2163be3318db8c1d5c SHA1 ce5bb8596dd783762e9534b7029d44e3408eae63 SHA256 e26d046d0076e792889702821c4ef06a6d00d5a5014c8c8613d67cd386238939 EBUILD transmission-2.33.ebuild 4356 RMD160 f04825ed475243c6a5673ce8e0055665f5c083d3 SHA1 a02e5d5c44f08bbf4a31893a8f5b08516ea061b9 SHA256 30e201d4880d55e6562ed348b5a2a240b0387248a83ee4ee0ad90e62eac5909e EBUILD transmission-2.41.ebuild 4088 RMD160 acefdcf1f9cc71d3df8bbb9c33e4b9bee11b408f SHA1 a6eeaa8aa734d7fb9d0475dd44bd9d208874ebfb SHA256 500728a16fe5a8872d02015aea9e61608f7dfc501b1021180308e580d25da5d1 -MISC ChangeLog 28071 RMD160 925d470c813e0ec235e77eea112aaf71b20699da SHA1 b45f9485b7512a3d56c4eec5cc59abc0b55afbaf SHA256 c82a53707ed7b413d9474e213b05c8314716f0b0ceb535438013d28542ae38d4 -MISC metadata.xml 444 RMD160 eb5aae9bdea645819e40b675f8372ded120d5783 SHA1 4b0f30908cea35a0fc8aca9cbe29599a0f833ab4 SHA256 ae66598063f3fa803005a3daf431d4dc4171e6988c38c128e6565910855dfaa9 +EBUILD transmission-2.42.ebuild 4626 RMD160 0a13ca4e5b01f72c76fdfbd9213e97616f0d0b47 SHA1 7b8222ed6d28eba68ea09f02c009483e16d17714 SHA256 7db456457eada21868d9a3619a2107a0bfed0e3357364328d7927b8c497ee3cc +MISC ChangeLog 28523 RMD160 f158adeeaf7b3f8ba8446596b3effb5c489e5d84 SHA1 00babe0c16bf3e7485d7a3800ef2bf5a1a0b9071 SHA256 fade9641448244e2cad47cf1cf72e8312a0eb447156e44d511ff255f785cc3cd +MISC metadata.xml 511 RMD160 b11330845a7f696e355443d7d9bb98e96c12c1b7 SHA1 5fed92119a7effcdfc3705666ff47fbb321c4cc6 SHA256 769efb2c32743c91a234a50929d223b5831e5406d3ae1c624e4356f0218d01b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPArV5AAoJEOSiRoyO7jvogeMQAIKnZfEVRJoUw5VliBWyt+He -3xjTBC/YIVsazz/fBzghvHIEBdk5yvPEf6Fk2Gb9LA9bcVOnawjzN9dN/pjCAGND -hUrPvz0g7LFY262Dt+GMCqS7wPsZ/Z0gzt0mG0Tz79hjbFw/4ufCRj2TigwVbs6X -Tpjqkt6iyq+52o7XsuVJgo9k457Clzj7gxNpyT7Ti31pvqewyCf9k0Szm/NCZwd1 -y0PJ+cgt7sqYr1h3EvIRsnnSMxsQ7gAlnTuw0cLrKOveFxoxLOGwFQnMCTsfZQZK -jq/x0RDZsAgyHgz9WB5bNHfA83XB3Q9f0wx/PTOyCyYo52o7saARtoqPriFpCT3c -ZsCRACXt6sckFWmDzhLy+xiFjy3cWoZmxLMm7ee+eVEoCMXyO1gADXQAMwEhTNgA -8ufF+OY8X0qK4mWrzD7YbcQG7FMKWbDLgL0XLX3pOoD7UhWv9whmpVz6HPwqjCZT -kD836BVSPqfXhPwPW/Drb7egRw+G6bEUJyaxiQBpfo3FSIpELv5FqgrQ1Oyf8vk+ -XaPF9bbDzXCwlQu2czKYHGQ3zncBh24bHWWtJkbNdGMkkyGHDcYMJV8H2jgE+Z1L -B6DfN++J2mmSo2QDTP95pqSvVg4yiFd4rROemmoVG+mPr5Xz0xBz8rJni9S/FVii -FQo5CLjcm5YwHyOS46FD -=e0MR +iQIcBAEBAgAGBQJPIBNLAAoJEOSiRoyO7jvotSQP+gIb328sKb2Z3GNKDx/wTzpO +84XfBEP+NCDBLJ7sZuksgeyKe3vEQnjieRQRQ46mu9oteRUsAeoUrkRvDvQP1qcu +aIuSn5VWdONCZwQIXxyW7yLaxn32Sj6gY9aImYOA9saO5E47lpfnS/Xozg98TYVM +GHdERXIP0Jlt1Oab2M2Yr/GtpPYjuho0jn4UHJr9dpxk/Qir+QK9V67LrNJ3jJhW +Xtb1aO8cUGD+eTYZg/aBIeBNiLJcojM83d0QiyFXlaSKviGg/unXsqCh05h5rD/s +W66E+abBAuSWjsaTdl5/l43ml7BENM3/i0LjEI0mGCB2tSOqK3DB1yRmmFmDB0xN ++nDePtTHzDKbwvDR1o1tfhFAj0slLXzHt6YipImKqQVzmlixPmPfhoCdz2pPoPlg +zA1pOZLSy+WS0zlku0VLoNkRguH+s0+S776WONbz/oCLXqL3p3u1nRYmYUGYoun5 +s45gfSqZgVpSvbskVy4//bG6OfOajQAP0lXHppUC387Fpve7IhaAqinZyoWGf0G2 +VRksLh746mYsOtbgosIQRmbjfpz9aQseFUWM6pyvJVda11JBt2qqQt7RK2hpadR1 +OTRSGrH3Iw5q17kuqH/RwqcFgY851dxw/bxJ9i0EUDkWi3IsBg+p7pTQoLvIq/VD +WVfeelu8p9y9KNC3sIEx +=pWRS -----END PGP SIGNATURE----- diff --git a/net-p2p/transmission/files/transmission-2.42-0001-configure.ac.patch b/net-p2p/transmission/files/transmission-2.42-0001-configure.ac.patch new file mode 100644 index 000000000000..57d0649fdeac --- /dev/null +++ b/net-p2p/transmission/files/transmission-2.42-0001-configure.ac.patch @@ -0,0 +1,33 @@ +--- configure.ac.old 2011-11-01 12:26:58.384182367 +0100 ++++ configure.ac 2011-11-01 12:31:59.779150140 +0100 +@@ -209,26 +209,18 @@ + + AC_MSG_CHECKING([µTP]) + build_utp="no" +-if test "x$HAVE_CXX" = "xyes" ; then +- have_utp="yes" +-else +- have_utp="no" +-fi + AC_ARG_ENABLE([utp], + AS_HELP_STRING([--enable-utp],[build µTP support]), + [want_utp=${enableval}], +- [want_utp=${have_utp}]) ++ [want_utp="yes"]) + if test "x$want_utp" = "xyes" ; then +- if test "x$have_utp" = "xyes"; then ++ if test "x$HAVE_CXX" = "xyes"; then + LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" +- LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a" +- if test "x$libutp_extra_libs" != "x" ; then +- LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs" +- fi ++ LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs" + AC_DEFINE([WITH_UTP],[1]) + build_utp="yes" + else +- AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") ++ AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found; consider --disable-utp") + fi + fi + AC_SUBST(LIBUTP_CFLAGS) diff --git a/net-p2p/transmission/files/transmission-2.42-0003-system-miniupnpc.patch b/net-p2p/transmission/files/transmission-2.42-0003-system-miniupnpc.patch new file mode 100644 index 000000000000..501ca8ec8949 --- /dev/null +++ b/net-p2p/transmission/files/transmission-2.42-0003-system-miniupnpc.patch @@ -0,0 +1,208 @@ +From: Leo 'costela' Antunes <costela@debian.org> +Date: Sat, 12 Jun 2011 23:24:11 +0200 +Subject: use system libminiupnpc and libnatpmp + +TODO: make this optional before forwarding upstream + +Forwarded: no + +Index: repo/configure.ac +=================================================================== +--- repo.orig/configure.ac 2011-11-05 00:55:07.000000000 +0100 ++++ repo/configure.ac 2011-11-05 00:55:24.000000000 +0100 +@@ -18,7 +18,7 @@ + + dnl AM_CONFIG_HEADER(config.h) + AC_CONFIG_SRCDIR(libtransmission/transmission.h) +-AM_INIT_AUTOMAKE([1.9 tar-pax]) ++AM_INIT_AUTOMAKE([1.9 tar-pax nostdinc]) + AC_PROG_LIBTOOL + + if test m4_substr(peer_id_prefix,6,1) = "0"; then +@@ -197,6 +197,20 @@ + AC_SUBST(DHT_CFLAGS) + AC_SUBST(DHT_LIBS) + ++dnl ---------------------------------------------------------------------------- ++dnl ++dnl miniupnp ++ ++MINIUPNPC_LIBS="-lminiupnpc" ++AC_SUBST(MINIUPNPC_LIBS) ++ ++dnl ---------------------------------------------------------------------------- ++dnl ++dnl natpmp ++ ++NATPMP_LIBS="-lnatpmp" ++AC_SUBST(NATPMP_LIBS) ++ + + dnl ---------------------------------------------------------------------------- + dnl +@@ -416,8 +430,6 @@ + libtransmission/Makefile + utils/Makefile + third-party/Makefile +- third-party/miniupnp/Makefile +- third-party/libnatpmp/Makefile + third-party/libutp/Makefile + third-party/dht/Makefile + macosx/Makefile +Index: repo/libtransmission/Makefile.am +=================================================================== +--- repo.orig/libtransmission/Makefile.am 2011-11-05 00:55:07.000000000 +0100 ++++ repo/libtransmission/Makefile.am 2011-11-05 00:55:24.000000000 +0100 +@@ -1,7 +1,5 @@ + AM_CPPFLAGS = \ +- -I. \ + -I$(top_srcdir) \ +- -I$(top_srcdir)/third-party/ \ + -D__TRANSMISSION__ \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" + +@@ -68,6 +66,8 @@ + webseed.c \ + wildmat.c + ++libtransmission_a_LDFLAGS = @MINIUPNPC_LIBS@ @NATPMP_LIBS@ ++ + noinst_HEADERS = \ + announcer.h \ + announcer-common.h \ +@@ -139,8 +139,8 @@ + + apps_ldadd = \ + ./libtransmission.a \ +- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @MINIUPNPC_LIBS@ \ ++ @NATPMP_LIBS@ \ + @INTLLIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ +Index: repo/third-party/Makefile.am +=================================================================== +--- repo.orig/third-party/Makefile.am 2011-11-05 00:55:07.000000000 +0100 ++++ repo/third-party/Makefile.am 2011-11-05 00:55:24.000000000 +0100 +@@ -4,8 +4,6 @@ + + SUBDIRS = \ + dht \ +- libnatpmp \ +- miniupnp \ + $(UTP_DIR) + + EXTRA_DIST = \ +Index: repo/utils/Makefile.am +=================================================================== +--- repo.orig/utils/Makefile.am 2011-11-05 00:55:07.000000000 +0100 ++++ repo/utils/Makefile.am 2011-11-05 00:55:24.000000000 +0100 +@@ -26,8 +26,8 @@ + + transmission_create_LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ +- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @MINIUPNPC_LIBS@ \ ++ @NATPMP_LIBS@ \ + @INTLLIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ +Index: repo/daemon/Makefile.am +=================================================================== +--- repo.orig/daemon/Makefile.am 2011-11-05 00:55:07.000000000 +0100 ++++ repo/daemon/Makefile.am 2011-11-05 00:55:24.000000000 +0100 +@@ -20,8 +20,8 @@ + + LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ +- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @MINIUPNPC_LIBS@ \ ++ @NATPMP_LIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ + @LIBEVENT_LIBS@ \ +Index: repo/gtk/Makefile.am +=================================================================== +--- repo.orig/gtk/Makefile.am 2011-11-05 00:55:07.000000000 +0100 ++++ repo/gtk/Makefile.am 2011-11-05 00:55:24.000000000 +0100 +@@ -84,8 +84,8 @@ + + transmission_gtk_LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ +- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @MINIUPNPC_LIBS@ \ ++ @NATPMP_LIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ + @GTK_LIBS@ \ +Index: repo/qt/qtr.pro +=================================================================== +--- repo.orig/qt/qtr.pro 2011-11-05 00:55:07.000000000 +0100 ++++ repo/qt/qtr.pro 2011-11-05 00:55:24.000000000 +0100 +@@ -23,8 +23,7 @@ + LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a + } + LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a +-LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a +-LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a ++LIBS += -lminiupnpc -lnatpmp + unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt + win32:DEFINES += QT_DBUS + win32:LIBS += -levent-2.0 -lws2_32 -lintl +Index: repo/cli/Makefile.am +=================================================================== +--- repo.orig/cli/Makefile.am 2011-11-05 00:55:07.000000000 +0100 ++++ repo/cli/Makefile.am 2011-11-05 00:55:24.000000000 +0100 +@@ -18,8 +18,8 @@ + + transmission_cli_LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ +- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ ++ @NATPMP_LIBS@ \ ++ @MINIUPNPC_LIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ + @LIBEVENT_LIBS@ \ +Index: repo/libtransmission/upnp.c +=================================================================== +--- repo.orig/libtransmission/upnp.c 2011-11-05 00:55:07.000000000 +0100 ++++ repo/libtransmission/upnp.c 2011-11-05 00:55:24.000000000 +0100 +@@ -13,8 +13,8 @@ + #include <assert.h> + #include <errno.h> + +-#include <miniupnp/miniupnpc.h> +-#include <miniupnp/upnpcommands.h> ++#include <miniupnpc/miniupnpc.h> ++#include <miniupnpc/upnpcommands.h> + + #include "transmission.h" + #include "port-forwarding.h" +Index: repo/libtransmission/natpmp.c +=================================================================== +--- repo.orig/libtransmission/natpmp.c 2011-11-05 00:55:07.000000000 +0100 ++++ repo/libtransmission/natpmp.c 2011-11-05 00:55:24.000000000 +0100 +@@ -17,7 +17,7 @@ + #include <event2/util.h> /* evutil_inet_ntop() */ + + #define ENABLE_STRNATPMPERR +-#include <libnatpmp/natpmp.h> ++#include <natpmp.h> + + #include "transmission.h" + #include "natpmp.h" +Index: repo/third-party/libutp/utp.cpp +=================================================================== +--- repo.orig/third-party/libutp/utp.cpp 2011-11-05 00:55:07.000000000 +0100 ++++ repo/third-party/libutp/utp.cpp 2011-11-05 00:55:24.000000000 +0100 +@@ -1,4 +1,4 @@ +-#include <StdAfx.h> ++#include "StdAfx.h" + + #include "utp.h" + #include "templates.h" diff --git a/net-p2p/transmission/files/transmission-2.42-0005-build-with-natpmp1.patch b/net-p2p/transmission/files/transmission-2.42-0005-build-with-natpmp1.patch new file mode 100644 index 000000000000..87071762f54c --- /dev/null +++ b/net-p2p/transmission/files/transmission-2.42-0005-build-with-natpmp1.patch @@ -0,0 +1,13 @@ +Index: repo/libtransmission/natpmp.c +=================================================================== +--- repo.orig/libtransmission/natpmp.c 2011-08-22 14:08:37.000000000 +0200 ++++ repo/libtransmission/natpmp.c 2011-08-22 14:14:39.000000000 +0200 +@@ -120,7 +120,7 @@ + + if( is_enabled && ( nat->state == TR_NATPMP_DISCOVER ) ) + { +- int val = initnatpmp( &nat->natpmp ); ++ int val = initnatpmp( &nat->natpmp, 0, NULL ); + logVal( "initnatpmp", val ); + val = sendpublicaddressrequest( &nat->natpmp ); + logVal( "sendpublicaddressrequest", val ); diff --git a/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch b/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch new file mode 100644 index 000000000000..cdf1872d7131 --- /dev/null +++ b/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch @@ -0,0 +1,260 @@ +diff -urN transmission-2.42.old/cli/Makefile.am transmission-2.42/cli/Makefile.am +--- transmission-2.42.old/cli/Makefile.am 2012-01-25 12:30:32.737406480 +0100 ++++ transmission-2.42/cli/Makefile.am 2012-01-25 15:25:14.903209957 +0100 +@@ -19,7 +19,7 @@ + transmission_cli_LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ + @LIBUPNP_LIBS@ \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @LIBNATPMP_LIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ + @LIBEVENT_LIBS@ \ +diff -urN transmission-2.42.old/configure.ac transmission-2.42/configure.ac +--- transmission-2.42.old/configure.ac 2012-01-25 12:30:32.742406446 +0100 ++++ transmission-2.42/configure.ac 2012-01-25 14:45:14.264515474 +0100 +@@ -302,6 +302,29 @@ + AC_SUBST(LIBUPNP_CFLAGS) + AC_SUBST(LIBUPNP_LIBS) + AC_SUBST(LIBUPNP_LIBS_QT) ++ ++dnl ---------------------------------------------------------------------------- ++dnl ++dnl Allow usage of system natpmp library ++LIBNATPMP_CFLAGS="-I\$(top_srcdir)/third-party/libnatpmp/" ++LIBNATPMP_LIBS="\$(top_builddir)/third-party/natpmp/libnatpmp.a" ++LIBNATPMP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/natpmp/libnatpmp.a" ++build_bundled_natpmp="yes" ++AC_ARG_ENABLE([external-natpmp], ++ AS_HELP_STRING([--enable-external-natpmp],[Use system external-natpmp]), ++ [want_external_natpmp=${enableval}], ++ [want_external_natpmp=no]) ++if test "x$want_external_natpmp" != "xno" ; then ++ dnl Would be lovely if it had pkgconfig ++ LIBNATPMP_CFLAGS="" ++ LIBNATPMP_LIBS="-lnatpmp" ++ LIBNATPMP_LIBS_QT="-lnatpmp" ++ build_bundled_natpmp="no" ++fi ++AM_CONDITIONAL([BUILD_NATPMP],[test "x$build_bundled_natpmp" = "xyes"]) ++AC_SUBST(LIBNATPMP_CFLAGS) ++AC_SUBST(LIBNATPMP_LIBS) ++AC_SUBST(LIBNATPMP_LIBS_QT) + dnl ---------------------------------------------------------------------------- + dnl + dnl detection for the GTK+ client +diff -urN transmission-2.42.old/daemon/Makefile.am transmission-2.42/daemon/Makefile.am +--- transmission-2.42.old/daemon/Makefile.am 2012-01-25 12:30:32.742406446 +0100 ++++ transmission-2.42/daemon/Makefile.am 2012-01-25 12:48:10.476222152 +0100 +@@ -21,7 +21,7 @@ + LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ + @LIBUPNP_LIBS@ \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @LIBNATPMP_LIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ + @LIBEVENT_LIBS@ \ +diff -urN transmission-2.42.old/gtk/Makefile.am transmission-2.42/gtk/Makefile.am +--- transmission-2.42.old/gtk/Makefile.am 2012-01-25 12:30:32.742406446 +0100 ++++ transmission-2.42/gtk/Makefile.am 2012-01-25 14:46:46.797886956 +0100 +@@ -85,7 +85,7 @@ + transmission_gtk_LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ + @LIBUPNP_LIBS@ \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @LIBNATPMP_LIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ + @GTK_LIBS@ \ +diff -urN transmission-2.42.old/libtransmission/Makefile.am transmission-2.42/libtransmission/Makefile.am +--- transmission-2.42.old/libtransmission/Makefile.am 2012-01-25 12:30:32.739406466 +0100 ++++ transmission-2.42/libtransmission/Makefile.am 2012-01-25 15:10:54.507053909 +0100 +@@ -1,7 +1,5 @@ + AM_CPPFLAGS = \ +- -I. \ + -I$(top_srcdir) \ +- -I$(top_srcdir)/third-party/ \ + -D__TRANSMISSION__ \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" + +@@ -9,6 +7,7 @@ + @DHT_CFLAGS@ \ + @LIBUTP_CFLAGS@ \ + @LIBUPNP_CFLAGS@ \ ++ @LIBNATPMP_CFLAGS@ \ + @LIBEVENT_CFLAGS@ \ + @LIBCURL_CFLAGS@ \ + @OPENSSL_CFLAGS@ \ +@@ -91,7 +90,7 @@ + magnet.h \ + makemeta.h \ + metainfo.h \ +- natpmp.h \ ++ natpmp_local.h \ + net.h \ + peer-common.h \ + peer-io.h \ +@@ -141,7 +140,7 @@ + apps_ldadd = \ + ./libtransmission.a \ + @LIBUPNP_LIBS@ \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @LIBNATPMP_LIBS@ \ + @INTLLIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ +diff -urN transmission-2.42.old/libtransmission/natpmp.c transmission-2.42/libtransmission/natpmp.c +--- transmission-2.42.old/libtransmission/natpmp.c 2012-01-25 12:30:32.739406466 +0100 ++++ transmission-2.42/libtransmission/natpmp.c 2012-01-25 15:11:10.186947403 +0100 +@@ -17,10 +17,10 @@ + #include <event2/util.h> /* evutil_inet_ntop() */ + + #define ENABLE_STRNATPMPERR +-#include <libnatpmp/natpmp.h> ++#include "natpmp.h" + + #include "transmission.h" +-#include "natpmp.h" ++#include "natpmp_local.h" + #include "net.h" /* tr_netCloseSocket */ + #include "port-forwarding.h" + #include "utils.h" +diff -urN transmission-2.42.old/libtransmission/natpmp.h transmission-2.42/libtransmission/natpmp.h +--- transmission-2.42.old/libtransmission/natpmp.h 2012-01-25 12:30:32.739406466 +0100 ++++ transmission-2.42/libtransmission/natpmp.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,34 +0,0 @@ +-/* +- * This file Copyright (C) Mnemosyne LLC +- * +- * This file is licensed by the GPL version 2. Works owned by the +- * Transmission project are granted a special exemption to clause 2(b) +- * so that the bulk of its code can remain under the MIT license. +- * This exemption does not extend to derived works not owned by +- * the Transmission project. +- * +- * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $ +- */ +- +-#ifndef __TRANSMISSION__ +-#error only libtransmission should #include this header. +-#endif +- +-#ifndef TR_NATPMP_H +-#define TR_NATPMP_H 1 +- +-/** +- * @addtogroup port_forwarding Port Forwarding +- * @{ +- */ +- +-typedef struct tr_natpmp tr_natpmp; +- +-tr_natpmp * tr_natpmpInit( void ); +- +-void tr_natpmpClose( tr_natpmp * ); +- +-int tr_natpmpPulse( tr_natpmp *, tr_port port, bool isEnabled, tr_port * public_port ); +- +-/* @} */ +-#endif +diff -urN transmission-2.42.old/libtransmission/natpmp_local.h transmission-2.42/libtransmission/natpmp_local.h +--- transmission-2.42.old/libtransmission/natpmp_local.h 1970-01-01 01:00:00.000000000 +0100 ++++ transmission-2.42/libtransmission/natpmp_local.h 2012-01-25 12:27:55.513474369 +0100 +@@ -0,0 +1,34 @@ ++/* ++ * This file Copyright (C) Mnemosyne LLC ++ * ++ * This file is licensed by the GPL version 2. Works owned by the ++ * Transmission project are granted a special exemption to clause 2(b) ++ * so that the bulk of its code can remain under the MIT license. ++ * This exemption does not extend to derived works not owned by ++ * the Transmission project. ++ * ++ * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $ ++ */ ++ ++#ifndef __TRANSMISSION__ ++#error only libtransmission should #include this header. ++#endif ++ ++#ifndef TR_NATPMP_H ++#define TR_NATPMP_H 1 ++ ++/** ++ * @addtogroup port_forwarding Port Forwarding ++ * @{ ++ */ ++ ++typedef struct tr_natpmp tr_natpmp; ++ ++tr_natpmp * tr_natpmpInit( void ); ++ ++void tr_natpmpClose( tr_natpmp * ); ++ ++int tr_natpmpPulse( tr_natpmp *, tr_port port, bool isEnabled, tr_port * public_port ); ++ ++/* @} */ ++#endif +diff -urN transmission-2.42.old/libtransmission/port-forwarding.c transmission-2.42/libtransmission/port-forwarding.c +--- transmission-2.42.old/libtransmission/port-forwarding.c 2012-01-25 12:30:32.739406466 +0100 ++++ transmission-2.42/libtransmission/port-forwarding.c 2012-01-25 15:19:34.684520801 +0100 +@@ -18,7 +18,7 @@ + #include <event2/event.h> + + #include "transmission.h" +-#include "natpmp.h" ++#include "natpmp_local.h" + #include "net.h" + #include "peer-mgr.h" + #include "port-forwarding.h" +diff -urN transmission-2.42.old/qt/config.in transmission-2.42/qt/config.in +--- transmission-2.42.old/qt/config.in 2012-01-25 12:30:32.741406452 +0100 ++++ transmission-2.42/qt/config.in 2012-01-25 14:47:43.390502589 +0100 +@@ -1,3 +1,4 @@ + LIBUTP_LIBS = @LIBUTP_LIBS_QT@ + MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@ ++NATPNP_LIBS = @LIBNATPNP_LIBS_QT@ + +diff -urN transmission-2.42.old/qt/qtr.pro transmission-2.42/qt/qtr.pro +--- transmission-2.42.old/qt/qtr.pro 2012-01-25 12:30:32.742406446 +0100 ++++ transmission-2.42/qt/qtr.pro 2012-01-25 14:47:32.270578114 +0100 +@@ -24,7 +24,7 @@ + LIBS += $${LIBUTP_LIBS} + LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a + LIBS += $${MINIUPNP_LIBS} +-LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a ++LIBS += $${NATPNP_LIBS} + unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt + win32:DEFINES += QT_DBUS + win32:LIBS += -levent-2.0 -lws2_32 -lintl +diff -urN transmission-2.42.old/third-party/Makefile.am transmission-2.42/third-party/Makefile.am +--- transmission-2.42.old/third-party/Makefile.am 2012-01-25 12:30:32.702406719 +0100 ++++ transmission-2.42/third-party/Makefile.am 2012-01-25 14:45:04.312583068 +0100 +@@ -4,10 +4,13 @@ + if BUILD_MINIUPNP + MINIUPNP_DIR = miniupnp + endif ++if BUILD_NATPMP ++ NATPMP_DIR = libnatpmp ++endif + + SUBDIRS = \ + dht \ +- libnatpmp \ ++ $(NATPMP_DIR) \ + $(MINIUPNP_DIR) \ + $(UTP_DIR) + +diff -urN transmission-2.42.old/utils/Makefile.am transmission-2.42/utils/Makefile.am +--- transmission-2.42.old/utils/Makefile.am 2012-01-25 12:30:32.744406434 +0100 ++++ transmission-2.42/utils/Makefile.am 2012-01-25 12:48:14.787192871 +0100 +@@ -27,7 +27,7 @@ + transmission_create_LDADD = \ + $(top_builddir)/libtransmission/libtransmission.a \ + @LIBUPNP_LIBS@ \ +- $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ ++ @LIBNATPMP_LIBS@ \ + @INTLLIBS@ \ + @DHT_LIBS@ \ + @LIBUTP_LIBS@ \ diff --git a/net-p2p/transmission/files/transmission-2.42-respect-cflags.patch b/net-p2p/transmission/files/transmission-2.42-respect-cflags.patch new file mode 100644 index 000000000000..bbd0678cf30b --- /dev/null +++ b/net-p2p/transmission/files/transmission-2.42-respect-cflags.patch @@ -0,0 +1,12 @@ +diff -urN transmission-2.42.old/configure.ac transmission-2.42/configure.ac +--- transmission-2.42.old/configure.ac 2011-10-20 03:57:56.703752495 +0200 ++++ transmission-2.42/configure.ac 2012-01-25 12:03:05.754593046 +0100 +@@ -77,7 +77,7 @@ + AC_C_INLINE + if test "x$GCC" = "xyes" ; then + +- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith -Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal" ++ CFLAGS="$CFLAGS -std=gnu99 -W -Wpointer-arith -Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal" + + dnl figure out gcc version + AC_MSG_CHECKING([gcc version]) diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml index f937a8550640..7407c9c58a70 100644 --- a/net-p2p/transmission/metadata.xml +++ b/net-p2p/transmission/metadata.xml @@ -9,5 +9,6 @@ <use> <flag name="libcanberra">Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag> <flag name="utp">Adds support for µTP (Micro Transport Protocol)</flag> + <flag name="gtk3">Enable gtk3 frontend instead of gtk2 one</flag> </use> </pkgmetadata> diff --git a/net-p2p/transmission/transmission-2.42.ebuild b/net-p2p/transmission/transmission-2.42.ebuild new file mode 100644 index 000000000000..090297581b0e --- /dev/null +++ b/net-p2p/transmission/transmission-2.42.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.42.ebuild,v 1.1 2012/01/25 14:33:01 scarabeus Exp $ + +EAPI=4 +inherit eutils fdo-mime gnome2-utils qt4-r2 autotools + +MY_P="${P/_beta/b}" + +DESCRIPTION="A Fast, Easy and Free BitTorrent client" +HOMEPAGE="http://www.transmissionbt.com/" +SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz" + +LICENSE="MIT GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk gtk3 kde nls qt4 utp" + +RDEPEND=" + >=dev-libs/libevent-2.0.10 + >=dev-libs/openssl-0.9.4 + >=net-misc/curl-7.16.3[ssl] + >=net-libs/miniupnpc-1.6 + net-libs/libnatpmp + sys-libs/zlib + gtk? ( + >=dev-libs/dbus-glib-0.70 + >=dev-libs/glib-2.28:2 + dev-libs/libappindicator:0 + >=x11-libs/gtk+-2.22:2 + ) + gtk3? ( + >=dev-libs/dbus-glib-0.70 + >=dev-libs/glib-2.28:2 + dev-libs/libappindicator:3 + >=x11-libs/gtk+-3.2:3 + ) + qt4? ( x11-libs/qt-gui:4[dbus] )" +DEPEND="${RDEPEND} + dev-util/intltool + dev-util/pkgconfig + sys-apps/sed + sys-devel/gettext + >=sys-devel/libtool-2.2.6b + nls? ( + >=dev-util/intltool-0.40 + sys-devel/gettext + )" +# Intltool/gettext are required as far as we eautoreconf for +# its autotools macros. +# If the source is not eautoreconfed we can keep it in nls. + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + gtk? ( nls !gtk3 ) + gtk3? ( nls !gtk ) +" + +DOCS="AUTHORS NEWS qt/README.txt" + +pkg_setup() { + enewgroup transmission + enewuser transmission -1 -1 -1 transmission +} + +src_prepare() { + # https://trac.transmissionbt.com/ticket/4323 + epatch "${FILESDIR}/${PN}-2.42-0001-configure.ac.patch" + epatch "${FILESDIR}/${PN}-2.33-0002-config.in-4-qt.pro.patch" + epatch "${FILESDIR}/${PN}-2.41-0003-system-miniupnpc.patch" + epatch "${FILESDIR}/${PN}-2.42-0005-build-with-natpmp1.patch" + + # Fix build failure with USE=-utp, bug #290737 + epatch "${FILESDIR}/${PN}-2.41-noutp.patch" + + # Use system cflags + epatch "${FILESDIR}/${PN}-2.42-respect-cflags.patch" + + # Use system natpmp + epatch "${FILESDIR}/${PN}-2.42-natpmp-system.patch" + + # Upstream is not interested in this: https://trac.transmissionbt.com/ticket/4324 + sed -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' -i libtransmission/Makefile.am || die + + eautoreconf + + # Magnet link support + if use kde; then + cat > qt/transmission-magnet.protocol <<-EOF + [Protocol] + exec=transmission-qt '%u' + protocol=magnet + Icon=transmission + input=none + output=none + helper=true + listing= + reading=false + writing=false + makedir=false + deleting=false + EOF + fi +} + +src_configure() { + local gtkver + + use gtk && gtkver="--with-gtk=2" + use gtk3 && gtkver="--with-gtk=3" + use gtk || use gtk3 || gtkver="--without-gtk" + + # cli and daemon doesn't have external deps and are enabled by default + econf \ + ${gtkver} \ + $(use_enable nls) \ + $(use_enable utp) \ + --enable-external-miniupnp \ + --enable-external-natpmp + + use qt4 && cd qt && eqmake4 qtr.pro +} + +src_compile() { + emake + use qt4 && cd qt && emake +} + +src_install() { + default + + rm -f "${ED}"/usr/share/${PN}/web/LICENSE + + newinitd "${FILESDIR}"/${PN}-daemon.initd.8 ${PN}-daemon + newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon + + keepdir /var/{transmission/{config,downloads},log/transmission} + fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission} + + if use qt4; then + cd qt + emake INSTALL_ROOT="${D}/usr" install + insinto /usr/share/applications/ + doins transmission-qt.desktop + mv icons/transmission{,-qt}.png + doicon icons/transmission-qt.png + if use kde; then + insinto /usr/share/kde4/services/ + doins transmission-magnet.protocol + fi + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + + ewarn "If you use transmission-daemon, please, set 'rpc-username' and" + ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on" + ewarn "start) in settings.json file located at /var/transmission/config or" + ewarn "any other appropriate config directory." + elog + elog "To enable sound emerge media-libs/libcanberra and check that at least" + elog "some sound them is selected. For this go:" + elog "Gnome/system/preferences/sound themes tab and 'sound theme: default'" + elog + if use utp; then + ewarn + ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket." + ewarn "Please, add into /etc/sysctl.conf following lines:" + ewarn " net.core.rmem_max = 4194304" + ewarn " net.core.wmem_max = 1048576" + ewarn "and run sysctl -p" + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} |