diff options
Diffstat (limited to 'net-p2p/transmission/files')
12 files changed, 0 insertions, 1341 deletions
diff --git a/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch b/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch deleted file mode 100644 index 1ccaf4392559..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5ca762c520be7e0182ed3cb8371c227d6e38d93a Mon Sep 17 00:00:00 2001 -From: Peter Volkov <pva@gentoo.org> -Date: Thu, 16 Jun 2011 12:46:48 +0400 -Subject: [PATCH 1/3] configure.ac: Drop redudant code/indentation. - ---- - configure.ac | 16 ++++------------ - 1 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7e239bf..7f17a55 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -217,26 +217,18 @@ AC_CHECK_LIB([rt], - - AC_MSG_CHECKING([µTP]) - build_utp="no" --if test "x$CXX" = "x" ; then -- have_utp="no" --else -- have_utp="yes" --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$CXX" != "x" ; 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) --- -1.7.3.4 - diff --git a/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch b/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch deleted file mode 100644 index eeef9d87e8a2..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f742757aa1e4419d2d5cb77425bc6b694e511ad6 Mon Sep 17 00:00:00 2001 -From: Peter Volkov <pva@gentoo.org> -Date: Thu, 16 Jun 2011 12:48:11 +0400 -Subject: [PATCH 2/3] Add qt/config to make qmake aware about ./configure results. This simplifies use of system third-party tools. Fixes build issue caused by ordering of make/qmake run: bugs.gentoo.org/368523. - ---- - configure.ac | 5 ++++- - qt/config.in | 1 + - qt/qtr.pro | 6 +++--- - 3 files changed, 8 insertions(+), 4 deletions(-) - create mode 100644 qt/config.in - -diff --git a/configure.ac b/configure.ac -index 7f17a55..f4ec7d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -225,6 +225,7 @@ if test "x$want_utp" = "xyes" ; then - if test "x$CXX" != "x" ; then - LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" - LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs" -+ LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a $libutp_extra_libs" - AC_DEFINE([WITH_UTP],[1]) - build_utp="yes" - else -@@ -233,6 +234,7 @@ if test "x$want_utp" = "xyes" ; then - fi - AC_SUBST(LIBUTP_CFLAGS) - AC_SUBST(LIBUTP_LIBS) -+AC_SUBST(LIBUTP_LIBS_QT) - AM_CONDITIONAL([BUILD_UTP],[test "x$build_utp" = "xyes"]) - AC_MSG_RESULT([$build_utp]) - -@@ -505,7 +507,8 @@ AC_CONFIG_FILES([Makefile - web/javascript/Makefile - web/javascript/jquery/Makefile - web/stylesheets/Makefile -- po/Makefile.in]) -+ po/Makefile.in -+ qt/config]) - - AC_OUTPUT - -diff --git a/qt/config.in b/qt/config.in -new file mode 100644 -index 0000000..3340d1a ---- /dev/null -+++ b/qt/config.in -@@ -0,0 +1 @@ -+LIBUTP_LIBS = @LIBUTP_LIBS_QT@ -diff --git a/qt/qtr.pro b/qt/qtr.pro -index ce138a2..4e28e98 100644 ---- a/qt/qtr.pro -+++ b/qt/qtr.pro -@@ -16,12 +16,12 @@ QT += network - PKGCONFIG = fontconfig libcurl openssl libevent - - TRANSMISSION_TOP = .. -+include(config) -+ - INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH} - INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a --exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) { -- LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a --} -+LIBS += $${LIBUTP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a - LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a --- -1.7.3.4 - diff --git a/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch b/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch deleted file mode 100644 index 6a022f8c2782..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch +++ /dev/null @@ -1,290 +0,0 @@ -From efd40a3adc1568c2494ce51845accd9d94f8e527 Mon Sep 17 00:00:00 2001 -From: Peter Volkov <pva@gentoo.org> -Date: Thu, 16 Jun 2011 12:58:04 +0400 -Subject: [PATCH 3/3] Allow usage of system miniupnp. Rename miniupnp -> miniupnpc since upstream suggests miniupnpc name for headers. - ---- - Transmission.xcodeproj/project.pbxproj | 50 ++++++++++++++++---------------- - cli/Makefile.am | 2 +- - configure.ac | 27 ++++++++++++++++- - daemon/Makefile.am | 2 +- - gtk/Makefile.am | 2 +- - libtransmission/Makefile.am | 3 +- - libtransmission/upnp.c | 4 +- - qt/config.in | 2 + - qt/qtr.pro | 2 +- - third-party/Makefile.am | 5 ++- - utils/Makefile.am | 2 +- - 11 files changed, 66 insertions(+), 35 deletions(-) - -diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj -index 99febe7..e477df4 100644 ---- a/Transmission.xcodeproj/project.pbxproj -+++ b/Transmission.xcodeproj/project.pbxproj -@@ -620,8 +620,8 @@ - A223AA830D220CEB00840069 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/PrefsWindow.xib; sourceTree = "<group>"; }; - A2265F3F0B5EF5F40093DDA5 /* FileNameCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileNameCell.h; path = macosx/FileNameCell.h; sourceTree = "<group>"; }; - A2265F400B5EF5F40093DDA5 /* FileNameCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileNameCell.m; path = macosx/FileNameCell.m; sourceTree = "<group>"; }; -- A22B00AE116A9E90003315FC /* connecthostport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = connecthostport.c; path = "third-party/miniupnp/connecthostport.c"; sourceTree = "<group>"; }; -- A22B00AF116A9E90003315FC /* connecthostport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = connecthostport.h; path = "third-party/miniupnp/connecthostport.h"; sourceTree = "<group>"; }; -+ A22B00AE116A9E90003315FC /* connecthostport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = connecthostport.c; path = "third-party/miniupnpc/connecthostport.c"; sourceTree = "<group>"; }; -+ A22B00AF116A9E90003315FC /* connecthostport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = connecthostport.h; path = "third-party/miniupnpc/connecthostport.h"; sourceTree = "<group>"; }; - A22CF7AC0FA3505F0009BD3E /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = macosx/it.lproj/GroupRules.xib; sourceTree = "<group>"; }; - A22CF7B90FA352740009BD3E /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = macosx/fr.lproj/GroupRules.xib; sourceTree = "<group>"; }; - A22CF7C90FA5D3F90009BD3E /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = macosx/es.lproj/GroupRules.xib; sourceTree = "<group>"; }; -@@ -665,7 +665,7 @@ - A251A65D0F9E8FD5004F5973 /* pt */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt; path = macosx/pt.lproj/PrefsWindow.xib; sourceTree = "<group>"; }; - A251A65E0F9E8FDA004F5973 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = macosx/pt.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - A251A6620F9E8FED004F5973 /* pt */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt; path = macosx/pt.lproj/Localizable.strings; sourceTree = "<group>"; }; -- A25485390EB66CBB004539DA /* codelength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codelength.h; path = "third-party/miniupnp/codelength.h"; sourceTree = "<group>"; }; -+ A25485390EB66CBB004539DA /* codelength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codelength.h; path = "third-party/miniupnpc/codelength.h"; sourceTree = "<group>"; }; - A256588A0A9A695400E8A03B /* MessageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MessageWindowController.h; path = macosx/MessageWindowController.h; sourceTree = "<group>"; }; - A256588B0A9A695400E8A03B /* MessageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MessageWindowController.m; path = macosx/MessageWindowController.m; sourceTree = "<group>"; }; - A257C17F0CAD3003004E121C /* PeerTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PeerTableView.h; path = macosx/PeerTableView.h; sourceTree = "<group>"; }; -@@ -895,31 +895,31 @@ - A2F7CF5D13035FFD0016FF10 /* URLSheetWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URLSheetWindowController.h; path = macosx/URLSheetWindowController.h; sourceTree = "<group>"; }; - A2F7CF5E13035FFD0016FF10 /* URLSheetWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = URLSheetWindowController.m; path = macosx/URLSheetWindowController.m; sourceTree = "<group>"; }; - A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; }; -- A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpcstrings.h; path = "third-party/miniupnp/miniupnpcstrings.h"; sourceTree = "<group>"; }; -+ A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpcstrings.h; path = "third-party/miniupnpc/miniupnpcstrings.h"; sourceTree = "<group>"; }; - A2FB057C0BFEB6800095564D /* DragOverlayView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayView.h; path = macosx/DragOverlayView.h; sourceTree = "<group>"; }; - A2FB057D0BFEB6800095564D /* DragOverlayView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayView.m; path = macosx/DragOverlayView.m; sourceTree = "<group>"; }; - A2FB06950BFF484A0095564D /* Globe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Globe.png; path = macosx/Images/Globe.png; sourceTree = "<group>"; }; - A2FB701A0D95CAEA0001F331 /* GroupsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupsController.h; path = macosx/GroupsController.h; sourceTree = "<group>"; }; - A2FB701B0D95CAEA0001F331 /* GroupsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupsController.m; path = macosx/GroupsController.m; sourceTree = "<group>"; }; - BE1183480CE160960002D0F3 /* libminiupnp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminiupnp.a; sourceTree = BUILT_PRODUCTS_DIR; }; -- BE11834D0CE160C50002D0F3 /* bsdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdqueue.h; path = "third-party/miniupnp/bsdqueue.h"; sourceTree = "<group>"; }; -- BE11834E0CE160C50002D0F3 /* declspec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = declspec.h; path = "third-party/miniupnp/declspec.h"; sourceTree = "<group>"; }; -- BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igd_desc_parse.h; path = "third-party/miniupnp/igd_desc_parse.h"; sourceTree = "<group>"; }; -- BE1183500CE160C50002D0F3 /* minixml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minixml.h; path = "third-party/miniupnp/minixml.h"; sourceTree = "<group>"; }; -- BE1183510CE160C50002D0F3 /* miniwget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniwget.h; path = "third-party/miniupnp/miniwget.h"; sourceTree = "<group>"; }; -- BE1183520CE160C50002D0F3 /* minisoap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minisoap.h; path = "third-party/miniupnp/minisoap.h"; sourceTree = "<group>"; }; -- BE1183530CE160C50002D0F3 /* upnpreplyparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpreplyparse.h; path = "third-party/miniupnp/upnpreplyparse.h"; sourceTree = "<group>"; }; -- BE1183540CE160C50002D0F3 /* upnpcommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpcommands.h; path = "third-party/miniupnp/upnpcommands.h"; sourceTree = "<group>"; }; -- BE1183550CE160C50002D0F3 /* miniupnpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpc.h; path = "third-party/miniupnp/miniupnpc.h"; sourceTree = "<group>"; }; -- BE1183560CE160C50002D0F3 /* minissdpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minissdpc.h; path = "third-party/miniupnp/minissdpc.h"; sourceTree = "<group>"; }; -- BE1183610CE160D50002D0F3 /* igd_desc_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = igd_desc_parse.c; path = "third-party/miniupnp/igd_desc_parse.c"; sourceTree = "<group>"; }; -- BE1183620CE160D50002D0F3 /* minixml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minixml.c; path = "third-party/miniupnp/minixml.c"; sourceTree = "<group>"; }; -- BE1183630CE160D50002D0F3 /* miniwget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniwget.c; path = "third-party/miniupnp/miniwget.c"; sourceTree = "<group>"; }; -- BE1183640CE160D50002D0F3 /* minissdpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minissdpc.c; path = "third-party/miniupnp/minissdpc.c"; sourceTree = "<group>"; }; -- BE1183650CE160D50002D0F3 /* minisoap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minisoap.c; path = "third-party/miniupnp/minisoap.c"; sourceTree = "<group>"; }; -- BE1183660CE160D50002D0F3 /* upnpreplyparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpreplyparse.c; path = "third-party/miniupnp/upnpreplyparse.c"; sourceTree = "<group>"; }; -- BE1183670CE160D50002D0F3 /* upnpcommands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpcommands.c; path = "third-party/miniupnp/upnpcommands.c"; sourceTree = "<group>"; }; -- BE1183680CE160D50002D0F3 /* miniupnpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniupnpc.c; path = "third-party/miniupnp/miniupnpc.c"; sourceTree = "<group>"; }; -+ BE11834D0CE160C50002D0F3 /* bsdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdqueue.h; path = "third-party/miniupnpc/bsdqueue.h"; sourceTree = "<group>"; }; -+ BE11834E0CE160C50002D0F3 /* declspec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = declspec.h; path = "third-party/miniupnpc/declspec.h"; sourceTree = "<group>"; }; -+ BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igd_desc_parse.h; path = "third-party/miniupnpc/igd_desc_parse.h"; sourceTree = "<group>"; }; -+ BE1183500CE160C50002D0F3 /* minixml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minixml.h; path = "third-party/miniupnpc/minixml.h"; sourceTree = "<group>"; }; -+ BE1183510CE160C50002D0F3 /* miniwget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniwget.h; path = "third-party/miniupnpc/miniwget.h"; sourceTree = "<group>"; }; -+ BE1183520CE160C50002D0F3 /* minisoap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minisoap.h; path = "third-party/miniupnpc/minisoap.h"; sourceTree = "<group>"; }; -+ BE1183530CE160C50002D0F3 /* upnpreplyparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpreplyparse.h; path = "third-party/miniupnpc/upnpreplyparse.h"; sourceTree = "<group>"; }; -+ BE1183540CE160C50002D0F3 /* upnpcommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = upnpcommands.h; path = "third-party/miniupnpc/upnpcommands.h"; sourceTree = "<group>"; }; -+ BE1183550CE160C50002D0F3 /* miniupnpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpc.h; path = "third-party/miniupnpc/miniupnpc.h"; sourceTree = "<group>"; }; -+ BE1183560CE160C50002D0F3 /* minissdpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minissdpc.h; path = "third-party/miniupnpc/minissdpc.h"; sourceTree = "<group>"; }; -+ BE1183610CE160D50002D0F3 /* igd_desc_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = igd_desc_parse.c; path = "third-party/miniupnpc/igd_desc_parse.c"; sourceTree = "<group>"; }; -+ BE1183620CE160D50002D0F3 /* minixml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minixml.c; path = "third-party/miniupnpc/minixml.c"; sourceTree = "<group>"; }; -+ BE1183630CE160D50002D0F3 /* miniwget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniwget.c; path = "third-party/miniupnpc/miniwget.c"; sourceTree = "<group>"; }; -+ BE1183640CE160D50002D0F3 /* minissdpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minissdpc.c; path = "third-party/miniupnpc/minissdpc.c"; sourceTree = "<group>"; }; -+ BE1183650CE160D50002D0F3 /* minisoap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minisoap.c; path = "third-party/miniupnpc/minisoap.c"; sourceTree = "<group>"; }; -+ BE1183660CE160D50002D0F3 /* upnpreplyparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpreplyparse.c; path = "third-party/miniupnpc/upnpreplyparse.c"; sourceTree = "<group>"; }; -+ BE1183670CE160D50002D0F3 /* upnpcommands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpcommands.c; path = "third-party/miniupnpc/upnpcommands.c"; sourceTree = "<group>"; }; -+ BE1183680CE160D50002D0F3 /* miniupnpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniupnpc.c; path = "third-party/miniupnpc/miniupnpc.c"; sourceTree = "<group>"; }; - BE75C3490C729E9500DBEFE0 /* libevent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libevent.a; sourceTree = BUILT_PRODUCTS_DIR; }; - BEFC1C000C07750000B0BB3C /* transmission-daemon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-daemon"; sourceTree = BUILT_PRODUCTS_DIR; }; - BEFC1C0E0C07756200B0BB3C /* daemon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = daemon.c; path = daemon/daemon.c; sourceTree = "<group>"; }; -@@ -2129,14 +2129,14 @@ - files = ( - ); - inputPaths = ( -- "$(SRCROOT)/third-party/miniupnp/miniupnpcstrings.h.in", -+ "$(SRCROOT)/third-party/miniupnpc/miniupnpcstrings.h.in", - ); - outputPaths = ( -- "$(SRCROOT)/third-party/miniupnp/miniupnpcstrings.h", -+ "$(SRCROOT)/third-party/miniupnpc/miniupnpcstrings.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; -- shellScript = "sh third-party/miniupnp/updateminiupnpcstrings.sh \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\""; -+ shellScript = "sh third-party/miniupnpc/updateminiupnpcstrings.sh \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\""; - }; - BE75C3510C729EE100DBEFE0 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; -diff --git a/cli/Makefile.am b/cli/Makefile.am -index 9d618f2..8af71e6 100644 ---- a/cli/Makefile.am -+++ b/cli/Makefile.am -@@ -18,8 +18,8 @@ transmission_cli_SOURCES = cli.c - - transmission_cli_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -diff --git a/configure.ac b/configure.ac -index f4ec7d1..a0187a7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -241,6 +241,31 @@ AC_MSG_RESULT([$build_utp]) - - dnl ---------------------------------------------------------------------------- - dnl -+dnl Allow usage of system miniupnp library -+LIBUPNP_CFLAGS="-I\$(top_srcdir)/third-party/" -+LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnp/libminiupnp.a" -+LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" -+build_bundled_miniupnp="yes" -+AC_ARG_ENABLE([external-miniupnp], -+ AS_HELP_STRING([--enable-external-miniupnp],[Use system external-miniupnp]), -+ [want_external_miniupnp=${enableval}], -+ [want_external_miniupnp=no]) -+if test "x$want_external_utp" != "xno" ; then -+ AC_CHECK_LIB([miniupnpc], -+ [upnpDiscover], -+ [LIBUPNP_CFLAGS="" -+ LIBUPNP_LIBS="-lminiupnpc" -+ LIBUPNP_LIBS_QT="-lminiupnpc" -+ build_bundled_miniupnp="no"], -+ AC_MSG_ERROR("Requested system libminiupnp but it is not found") -+ ) -+fi -+AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$build_bundled_miniupnp" = "xyes"]) -+AC_SUBST(LIBUPNP_CFLAGS) -+AC_SUBST(LIBUPNP_LIBS) -+AC_SUBST(LIBUPNP_LIBS_QT) -+dnl ---------------------------------------------------------------------------- -+dnl - dnl detection for the GTK+ client - - PKG_CHECK_MODULES(GTK, -@@ -492,7 +517,7 @@ AC_CONFIG_FILES([Makefile - libtransmission/Makefile - utils/Makefile - third-party/Makefile -- third-party/miniupnp/Makefile -+ third-party/miniupnpc/Makefile - third-party/libnatpmp/Makefile - third-party/libutp/Makefile - third-party/dht/Makefile -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 9e2a10a..7a5e085 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -20,7 +20,7 @@ bin_PROGRAMS = \ - - LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index a86a440..abf3cd1 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -93,7 +93,7 @@ dist_man_MANS = transmission-gtk.1 - - transmission_gtk_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @LIBCANBERRA_LIBS@ \ - @GCONF2_LIBS@ \ -diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am -index 0dd244a..a68349b 100644 ---- a/libtransmission/Makefile.am -+++ b/libtransmission/Makefile.am -@@ -8,6 +8,7 @@ AM_CPPFLAGS = \ - AM_CFLAGS = \ - @DHT_CFLAGS@ \ - @LIBUTP_CFLAGS@ \ -+ @LIBUPNP_CFLAGS@ \ - @LIBEVENT_CFLAGS@ \ - @LIBCURL_CFLAGS@ \ - @OPENSSL_CFLAGS@ \ -@@ -139,7 +140,7 @@ apps_ldflags = \ - - apps_ldadd = \ - ./libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ -diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c -index 2059864..8f43d2a 100644 ---- a/libtransmission/upnp.c -+++ b/libtransmission/upnp.c -@@ -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" -diff --git a/qt/config.in b/qt/config.in -index 3340d1a..25851ea 100644 ---- a/qt/config.in -+++ b/qt/config.in -@@ -1 +1,3 @@ - LIBUTP_LIBS = @LIBUTP_LIBS_QT@ -+MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@ -+ -diff --git a/qt/qtr.pro b/qt/qtr.pro -index 4e28e98..8f6e659 100644 ---- a/qt/qtr.pro -+++ b/qt/qtr.pro -@@ -23,7 +23,7 @@ INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a - LIBS += $${LIBUTP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a --LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a -+LIBS += $${MINIUPNP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a - unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt - win32:DEFINES += QT_DBUS -diff --git a/third-party/Makefile.am b/third-party/Makefile.am -index 39eb5ee..ea2acaa 100644 ---- a/third-party/Makefile.am -+++ b/third-party/Makefile.am -@@ -1,11 +1,14 @@ - if BUILD_UTP - UTP_DIR = libutp - endif -+if BUILD_MINIUPNP -+ MINIUPNP = miniupnpc -+endif - - SUBDIRS = \ - dht \ - libnatpmp \ -- miniupnp \ -+ $(MINIUPNP_DIR) \ - $(UTP_DIR) - - EXTRA_DIST = \ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 896cb2b..1f687ed 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -26,7 +26,7 @@ dist_man_MANS = \ - - transmission_create_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ --- -1.7.3.4 - diff --git a/net-p2p/transmission/files/transmission-2.31-no-tests.patch b/net-p2p/transmission/files/transmission-2.31-no-tests.patch deleted file mode 100644 index d4a7e2fafc6a..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-no-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit b46cac3a9fb95fa6edd6f18c82b7738ab81c062d -Author: Peter Volkov <pva@gentoo.org> -Date: Thu Jun 16 13:21:12 2011 +0400 - - Don't build programs required for tests. - -diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am -index a68349b..656f8aa 100644 ---- a/libtransmission/Makefile.am -+++ b/libtransmission/Makefile.am -@@ -133,7 +133,7 @@ TESTS = \ - test-peer-id \ - utils-test - --noinst_PROGRAMS = $(TESTS) -+check_PROGRAMS = $(TESTS) - - apps_ldflags = \ - @ZLIB_LDFLAGS@ diff --git a/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch b/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch deleted file mode 100644 index b83fac7d3aae..000000000000 --- a/net-p2p/transmission/files/transmission-2.31-qt-libutp.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://trac.transmissionbt.com/changeset/12452#file0 -https://bugs.gentoo.org/show_bug.cgi?id=368187 - ---- qt/qtr.pro (revision 12449) -+++ qt/qtr.pro (working copy) -@@ -19,7 +19,9 @@ - INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH} - INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a --LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a -+exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) { -+ 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 diff --git a/net-p2p/transmission/files/transmission-2.33-0003-system-miniupnpc.patch b/net-p2p/transmission/files/transmission-2.33-0003-system-miniupnpc.patch deleted file mode 100644 index 7aa1f22ab8a9..000000000000 --- a/net-p2p/transmission/files/transmission-2.33-0003-system-miniupnpc.patch +++ /dev/null @@ -1,299 +0,0 @@ -From f69247bd3ca045b87e5ecf5d1c454181b59ecf5b Mon Sep 17 00:00:00 2001 -From: Peter Volkov <pva@gentoo.org> -Date: Tue, 28 Jun 2011 18:26:11 +0400 -Subject: [PATCH 3/3] Allow usage of system miniupnp. - ---- - cli/Makefile.am | 2 +- - configure.ac | 73 ++++++++++++++++++++++++++++++++++++++++++- - daemon/Makefile.am | 2 +- - gtk/Makefile.am | 2 +- - libtransmission/Makefile.am | 3 +- - libtransmission/upnp.c | 25 +++++++++++++++ - qt/config.in | 2 + - qt/qtr.pro | 2 +- - third-party/Makefile.am | 5 ++- - utils/Makefile.am | 2 +- - 10 files changed, 110 insertions(+), 8 deletions(-) - -diff --git a/cli/Makefile.am b/cli/Makefile.am -index 9d618f2..8af71e6 100644 ---- a/cli/Makefile.am -+++ b/cli/Makefile.am -@@ -18,8 +18,8 @@ transmission_cli_SOURCES = cli.c - - transmission_cli_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ - @LIBEVENT_LIBS@ \ -diff --git a/configure.ac b/configure.ac -index 57acb9d..417b6ef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -241,6 +241,77 @@ AC_MSG_RESULT([$build_utp]) - - dnl ---------------------------------------------------------------------------- - dnl -+dnl Allow usage of system miniupnp library -+LIBUPNP_CFLAGS="-I\$(top_srcdir)/third-party/" -+LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnp/libminiupnp.a" -+LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" -+build_bundled_miniupnp="yes" -+AC_ARG_ENABLE([external-miniupnp], -+ AS_HELP_STRING([--enable-external-miniupnp],[Use system external-miniupnp]), -+ [want_external_miniupnp=${enableval}], -+ [want_external_miniupnp=no]) -+if test "x$want_external_miniupnp" != "xno" ; then -+ AC_DEFINE([SYSTEM_MINIUPNP]) -+ ac_save_LIBS="$LIBS" -+ LIBS="-lminiupnpc" -+ # Check miniupnp 1.5 -+ AC_TRY_LINK([ -+ #include <stdlib.h> -+ #include <miniupnpc/miniupnpc.h> -+ #include <miniupnpc/upnpcommands.h> -+ ],[ -+ struct UPNPDev * devlist; -+ struct UPNPUrls urls; -+ struct IGDdatas data; -+ char lanaddr[16]; -+ char portStr[8]; -+ char intPort[8]; -+ char intClient[16]; -+ upnpDiscover( 2000, NULL, NULL, 0 ); -+ UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); -+ UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype, -+ portStr, "TCP", intClient, intPort ); -+ ],[ -+ AC_DEFINE(HAVE_MINIUPNP_15, 1, [Define to 1 if you have miniupnpc version 1.5]) -+ build_bundled_miniupnp="no"]) -+ -+ # Check miniupnp 1.6 -+ AC_TRY_LINK([ -+ #include <stdlib.h> -+ #include <errno.h> -+ #include <miniupnpc/miniupnpc.h> -+ #include <miniupnpc/upnpcommands.h> -+ ],[ -+ struct UPNPDev * devlist; -+ struct UPNPUrls urls; -+ struct IGDdatas data; -+ char lanaddr[16]; -+ char portStr[8]; -+ char intPort[8]; -+ char intClient[16]; -+ upnpDiscover( 2000, NULL, NULL, 0, 0, &errno ); -+ UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); -+ UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype, -+ portStr, "TCP", intClient, intPort, NULL, NULL, NULL ); -+ ],[ -+ AC_DEFINE(HAVE_MINIUPNP_16, 1, [Define to 1 if you have miniupnpc version 1.6]) -+ build_bundled_miniupnp="no"]) -+ -+ if test "x$build_bundled_miniupnp" = "xno" ; then -+ LIBUPNP_CFLAGS="" -+ LIBUPNP_LIBS="-lminiupnpc" -+ LIBUPNP_LIBS_QT="-lminiupnpc" -+ else -+ AC_MSG_ERROR("Requested system libminiupnp but it is not found") -+ fi -+ LIBS="$ac_save_LIBS" -+fi -+AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$build_bundled_miniupnp" = "xyes"]) -+AC_SUBST(LIBUPNP_CFLAGS) -+AC_SUBST(LIBUPNP_LIBS) -+AC_SUBST(LIBUPNP_LIBS_QT) -+dnl ---------------------------------------------------------------------------- -+dnl - dnl detection for the GTK+ client - - PKG_CHECK_MODULES(GTK, -@@ -492,7 +563,7 @@ AC_CONFIG_FILES([Makefile - libtransmission/Makefile - utils/Makefile - third-party/Makefile -- third-party/miniupnp/Makefile -+ third-party/miniupnp/Makefile - third-party/libnatpmp/Makefile - third-party/libutp/Makefile - third-party/dht/Makefile -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 9e2a10a..7a5e085 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -20,7 +20,7 @@ bin_PROGRAMS = \ - - LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @DHT_LIBS@ \ - @LIBUTP_LIBS@ \ -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index a86a440..abf3cd1 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -93,7 +93,7 @@ dist_man_MANS = transmission-gtk.1 - - transmission_gtk_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @LIBCANBERRA_LIBS@ \ - @GCONF2_LIBS@ \ -diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am -index 0dd244a..a68349b 100644 ---- a/libtransmission/Makefile.am -+++ b/libtransmission/Makefile.am -@@ -8,6 +8,7 @@ AM_CPPFLAGS = \ - AM_CFLAGS = \ - @DHT_CFLAGS@ \ - @LIBUTP_CFLAGS@ \ -+ @LIBUPNP_CFLAGS@ \ - @LIBEVENT_CFLAGS@ \ - @LIBCURL_CFLAGS@ \ - @OPENSSL_CFLAGS@ \ -@@ -139,7 +140,7 @@ apps_ldflags = \ - - apps_ldadd = \ - ./libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ -diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c -index 2059864..a675b7c 100644 ---- a/libtransmission/upnp.c -+++ b/libtransmission/upnp.c -@@ -13,8 +13,13 @@ - #include <assert.h> - #include <errno.h> - -+#ifdef SYSTEM_MINIUPNP -+#include <miniupnpc/miniupnpc.h> -+#include <miniupnpc/upnpcommands.h> -+#else - #include <miniupnp/miniupnpc.h> - #include <miniupnp/upnpcommands.h> -+#endif - - #include "transmission.h" - #include "port-forwarding.h" -@@ -97,7 +102,11 @@ tr_upnpPulse( tr_upnp * handle, - { - struct UPNPDev * devlist; - errno = 0; -+#ifdef HAVE_MINIUPNP_16 -+ devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, &errno ); -+#else - devlist = upnpDiscover( 2000, NULL, NULL, 0 ); -+#endif - if( devlist == NULL ) - { - tr_ndbg( -@@ -144,9 +153,17 @@ tr_upnpPulse( tr_upnp * handle, - - tr_snprintf( portStr, sizeof( portStr ), "%d", handle->port ); - if( UPNP_GetSpecificPortMappingEntry( handle->urls.controlURL, handle->data.first.servicetype, -+#ifdef HAVE_MINIUPNP_16 -+ portStr, "TCP", intClient, intPort, NULL, NULL, NULL ) != UPNPCOMMAND_SUCCESS || -+#else - portStr, "TCP", intClient, intPort ) != UPNPCOMMAND_SUCCESS || -+#endif - UPNP_GetSpecificPortMappingEntry( handle->urls.controlURL, handle->data.first.servicetype, -+#ifdef HAVE_MINIUPNP_16 -+ portStr, "UDP", intClient, intPort, NULL, NULL, NULL ) != UPNPCOMMAND_SUCCESS ) -+#else - portStr, "UDP", intClient, intPort ) != UPNPCOMMAND_SUCCESS ) -+#endif - { - tr_ninf( getKey( ), _( "Port %d isn't forwarded" ), handle->port ); - handle->isMapped = false; -@@ -198,7 +215,11 @@ tr_upnpPulse( tr_upnp * handle, - err_tcp = UPNP_AddPortMapping( handle->urls.controlURL, - handle->data.first.servicetype, - portStr, portStr, handle->lanaddr, -+#ifdef HAVE_MINIUPNP_16 -+ desc, "TCP", NULL, NULL ); -+#else - desc, "TCP", NULL ); -+#endif - if( err_tcp ) - tr_ndbg( getKey( ), "TCP Port forwarding failed with error %d (errno %d - %s)", - err_tcp, errno, tr_strerror( errno ) ); -@@ -207,7 +228,11 @@ tr_upnpPulse( tr_upnp * handle, - err_udp = UPNP_AddPortMapping( handle->urls.controlURL, - handle->data.first.servicetype, - portStr, portStr, handle->lanaddr, -+#ifdef HAVE_MINIUPNP_16 -+ desc, "UDP", NULL, NULL ); -+#else - desc, "UDP", NULL ); -+#endif - if( err_udp ) - tr_ndbg( getKey( ), "UDP Port forwarding failed with error %d (errno %d - %s)", - err_udp, errno, tr_strerror( errno ) ); -diff --git a/qt/config.in b/qt/config.in -index 3340d1a..25851ea 100644 ---- a/qt/config.in -+++ b/qt/config.in -@@ -1 +1,3 @@ - LIBUTP_LIBS = @LIBUTP_LIBS_QT@ -+MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@ -+ -diff --git a/qt/qtr.pro b/qt/qtr.pro -index 4e28e98..8f6e659 100644 ---- a/qt/qtr.pro -+++ b/qt/qtr.pro -@@ -23,7 +23,7 @@ INCLUDEPATH += $${TRANSMISSION_TOP} - LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a - LIBS += $${LIBUTP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a --LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a -+LIBS += $${MINIUPNP_LIBS} - LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a - unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt - win32:DEFINES += QT_DBUS -diff --git a/third-party/Makefile.am b/third-party/Makefile.am -index 39eb5ee..fcf1369 100644 ---- a/third-party/Makefile.am -+++ b/third-party/Makefile.am -@@ -1,11 +1,14 @@ - if BUILD_UTP - UTP_DIR = libutp - endif -+if BUILD_MINIUPNP -+ MINIUPNP_DIR = miniupnp -+endif - - SUBDIRS = \ - dht \ - libnatpmp \ -- miniupnp \ -+ $(MINIUPNP_DIR) \ - $(UTP_DIR) - - EXTRA_DIST = \ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 896cb2b..1f687ed 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -26,7 +26,7 @@ dist_man_MANS = \ - - transmission_create_LDADD = \ - $(top_builddir)/libtransmission/libtransmission.a \ -- $(top_builddir)/third-party/miniupnp/libminiupnp.a \ -+ @LIBUPNP_LIBS@ \ - $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - @INTLLIBS@ \ - @DHT_LIBS@ \ --- -1.7.3.4 - 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 deleted file mode 100644 index 57d0649fdeac..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-0001-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 deleted file mode 100644 index 501ca8ec8949..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-0003-system-miniupnpc.patch +++ /dev/null @@ -1,208 +0,0 @@ -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 deleted file mode 100644 index 87071762f54c..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-0005-build-with-natpmp1.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index cdf1872d7131..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch +++ /dev/null @@ -1,260 +0,0 @@ -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 deleted file mode 100644 index bbd0678cf30b..000000000000 --- a/net-p2p/transmission/files/transmission-2.42-respect-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/files/transmission-daemon.initd.7 b/net-p2p/transmission/files/transmission-daemon.initd.7 deleted file mode 100644 index d4ddb66127b1..000000000000 --- a/net-p2p/transmission/files/transmission-daemon.initd.7 +++ /dev/null @@ -1,72 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.7,v 1.2 2011/12/04 10:35:07 swegener Exp $ - -extra_started_commands="reload" -description="Transmission is a fast, easy and free bittorrent client" -description_start="Start transmission-daemon server and web interface" -description_stop="Stop transmission-daemon server and web interface" -description_reload="Reload transmission-daemon settings" - -pidfile=/var/run/transmission/transmission.pid -config_dir=/var/transmission/config -download_dir=/var/transmission/downloads -logfile=${logfile:-/var/log/transmission/transmission.log} -runas_user=${runas_user:-transmission:transmission} - -SSD_OPTIONS="" - -depend() { - need net -} - -check_config() { - if [ ! -d /var/run/transmission/ ]; then - mkdir /var/run/transmission/ - if [ -n "${runas_user}" ]; then - chown -R ${runas_user} /var/run/transmission/ - fi - fi - - # In case no config directory option passed use default - if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then - TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}" - # put download dir location on first run (and take it from config later) - if [ ! -f ${config_dir}/settings.json ]; then - TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}" - fi - fi - - if [ -n "${runas_user}" ]; then - if [ -f /etc/init.d/sysfs ]; then - SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}" - else - SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}" - fi - fi -} - -start() { - check_config - - ebegin "Starting transmission daemon" - start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \ - --exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \ - $(test ${logfile} != "syslog" && echo --logfile ${logfile}) \ - ${TRANSMISSION_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping transmission daemon" - start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile} - eend $? -} - -reload() { - ebegin "Reloading transmission configuration" - start-stop-daemon --signal HUP --pidfile ${pidfile} - eend $? -} - |