From f9f77a675cee6006d80a34603cae1b5a134f9e80 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 15 Mar 2016 09:06:18 +0000 Subject: [PATCH] transmission: drop 2.82, touch 2.84, add 2.92. * Drop recipe for version 2.82. * Fix SOURCE_URI for 2.84. * Add recipe for 2.92 with "--enable-cli" (as it's no longuer enabled by default) and without "--datadir=$dataDir" which runConfigure already takes care of. --- .../patches/transmission-2.82.patch | 108 ----------------- .../patches/transmission-2.92.patchset | 109 ++++++++++++++++++ net-p2p/transmission/transmission-2.82.recipe | 94 --------------- net-p2p/transmission/transmission-2.84.recipe | 6 +- net-p2p/transmission/transmission-2.92.recipe | 69 +++++++++++ 5 files changed, 181 insertions(+), 205 deletions(-) delete mode 100644 net-p2p/transmission/patches/transmission-2.82.patch create mode 100644 net-p2p/transmission/patches/transmission-2.92.patchset delete mode 100644 net-p2p/transmission/transmission-2.82.recipe create mode 100644 net-p2p/transmission/transmission-2.92.recipe diff --git a/net-p2p/transmission/patches/transmission-2.82.patch b/net-p2p/transmission/patches/transmission-2.82.patch deleted file mode 100644 index d874f536a..000000000 --- a/net-p2p/transmission/patches/transmission-2.82.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -ur transmission-2.82/libtransmission/platform-quota.c transmission-2.82-haiku/libtransmission/platform-quota.c ---- transmission-2.82/libtransmission/platform-quota.c 2013-08-09 02:45:44.822345728 +0000 -+++ transmission-2.82-haiku/libtransmission/platform-quota.c 2013-12-27 10:29:53.872415232 +0000 -@@ -16,7 +16,7 @@ - #include /* getuid() */ - #include /* evutil_ascii_strcasecmp () */ - --#ifndef WIN32 -+#if !defined(WIN32) && !defined(__HAIKU__) - #include /* types needed by quota.h */ - #if defined(__FreeBSD__) || defined(__OpenBSD__) - #include /* quotactl() */ -@@ -67,7 +67,7 @@ - **** - ***/ - --#ifndef WIN32 -+#if !defined(WIN32) && !defined(__HAIKU__) - static const char * - getdev (const char * path) - { -@@ -300,7 +300,7 @@ - { - int64_t ret = -1; - --#ifndef WIN32 -+#if !defined(WIN32) && !defined(__HAIKU__) - - if (info->fstype && !evutil_ascii_strcasecmp(info->fstype, "xfs")) - { -@@ -347,7 +347,7 @@ - - info = tr_new0 (struct tr_device_info, 1); - info->path = tr_strdup (path); --#ifndef WIN32 -+#if !defined(WIN32) && !defined(__HAIKU__) - info->device = tr_strdup (getblkdev (path)); - info->fstype = tr_strdup (getfstype (path)); - #endif -diff -ur transmission-2.82/third-party/miniupnp/connecthostport.c transmission-2.82-haiku/third-party/miniupnp/connecthostport.c ---- transmission-2.82/third-party/miniupnp/connecthostport.c 2013-08-09 02:47:50.398196736 +0000 -+++ transmission-2.82-haiku/third-party/miniupnp/connecthostport.c 2013-12-27 10:30:00.589037568 +0000 -@@ -24,6 +24,7 @@ - #else /* #ifdef _WIN32 */ - #include - #include -+#include - #include - #define closesocket close - #include -diff -ur transmission-2.82/third-party/miniupnp/miniupnpc.c transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c ---- transmission-2.82/third-party/miniupnp/miniupnpc.c 2013-08-09 02:47:50.894435328 +0000 -+++ transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c 2013-12-27 10:30:00.625737728 +0000 -@@ -17,7 +17,7 @@ - #endif - #endif - --#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) -+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__HAIKU__) - #define HAS_IP_MREQN - #endif - -diff -ur transmission-2.82/third-party/miniupnp/portlistingparse.c transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c ---- transmission-2.82/third-party/miniupnp/portlistingparse.c 2013-08-09 02:47:50.074186752 +0000 -+++ transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c 2013-12-27 10:30:00.638582784 +0000 -@@ -28,7 +28,7 @@ - - /* Helper function */ - static UNSIGNED_INTEGER --atoui(const char * p, int l) -+my_atoui(const char * p, int l) - { - UNSIGNED_INTEGER r = 0; - while(l > 0 && *p) -@@ -92,7 +92,7 @@ - pm->remoteHost[l] = '\0'; - break; - case NewExternalPort: -- pm->externalPort = (unsigned short)atoui(data, l); -+ pm->externalPort = (unsigned short)my_atoui(data, l); - break; - case NewProtocol: - if(l > 3) -@@ -101,21 +101,21 @@ - pm->protocol[l] = '\0'; - break; - case NewInternalPort: -- pm->internalPort = (unsigned short)atoui(data, l); -+ pm->internalPort = (unsigned short)my_atoui(data, l); - break; - case NewInternalClient: - memcpy(pm->internalClient, data, l); - pm->internalClient[l] = '\0'; - break; - case NewEnabled: -- pm->enabled = (unsigned char)atoui(data, l); -+ pm->enabled = (unsigned char)my_atoui(data, l); - break; - case NewDescription: - memcpy(pm->description, data, l); - pm->description[l] = '\0'; - break; - case NewLeaseTime: -- pm->leaseTime = atoui(data, l); -+ pm->leaseTime = my_atoui(data, l); - break; - default: - break; diff --git a/net-p2p/transmission/patches/transmission-2.92.patchset b/net-p2p/transmission/patches/transmission-2.92.patchset new file mode 100644 index 000000000..21c8b2268 --- /dev/null +++ b/net-p2p/transmission/patches/transmission-2.92.patchset @@ -0,0 +1,109 @@ +From b5e7c81ea3fc2ad66bb59088405cfa8fd8b16d11 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 5 Sep 2014 14:57:25 +0000 +Subject: haiku patch + + +diff --git a/libtransmission/platform-quota.c b/libtransmission/platform-quota.c +index 4a7d4e9..048b7b4 100644 +--- a/libtransmission/platform-quota.c ++++ b/libtransmission/platform-quota.c +@@ -13,7 +13,7 @@ + + #include /* evutil_ascii_strcasecmp () */ + +-#ifndef _WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + #include /* getuid() */ + #include /* types needed by quota.h */ + #if defined(__FreeBSD__) || defined(__OpenBSD__) +@@ -72,7 +72,7 @@ + **** + ***/ + +-#ifndef _WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + static const char * + getdev (const char * path) + { +@@ -347,7 +347,7 @@ tr_getQuotaFreeSpace (const struct tr_device_info * info) + { + int64_t ret = -1; + +-#ifndef _WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + + if (info->fstype && !evutil_ascii_strcasecmp(info->fstype, "xfs")) + { +@@ -410,7 +410,7 @@ tr_device_info_create (const char * path) + + info = tr_new0 (struct tr_device_info, 1); + info->path = tr_strdup (path); +-#ifndef _WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + info->device = tr_strdup (getblkdev (path)); + info->fstype = tr_strdup (getfstype (path)); + #endif +diff --git a/third-party/miniupnp/miniupnpc.c b/third-party/miniupnp/miniupnpc.c +index 82e7535..425d7fc 100644 +--- a/third-party/miniupnp/miniupnpc.c ++++ b/third-party/miniupnp/miniupnpc.c +@@ -17,7 +17,7 @@ + #endif + #endif + +-#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) ++#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__HAIKU__) + #define HAS_IP_MREQN + #endif + +diff --git a/third-party/miniupnp/portlistingparse.c b/third-party/miniupnp/portlistingparse.c +index 19e3054..2b1bce8 100644 +--- a/third-party/miniupnp/portlistingparse.c ++++ b/third-party/miniupnp/portlistingparse.c +@@ -28,7 +28,7 @@ static const struct { + + /* Helper function */ + static UNSIGNED_INTEGER +-atoui(const char * p, int l) ++my_atoui(const char * p, int l) + { + UNSIGNED_INTEGER r = 0; + while(l > 0 && *p) +@@ -94,7 +94,7 @@ data(void * d, const char * data, int l) + pm->remoteHost[l] = '\0'; + break; + case NewExternalPort: +- pm->externalPort = (unsigned short)atoui(data, l); ++ pm->externalPort = (unsigned short)my_atoui(data, l); + break; + case NewProtocol: + if(l > 3) +@@ -103,21 +103,21 @@ data(void * d, const char * data, int l) + pm->protocol[l] = '\0'; + break; + case NewInternalPort: +- pm->internalPort = (unsigned short)atoui(data, l); ++ pm->internalPort = (unsigned short)my_atoui(data, l); + break; + case NewInternalClient: + memcpy(pm->internalClient, data, l); + pm->internalClient[l] = '\0'; + break; + case NewEnabled: +- pm->enabled = (unsigned char)atoui(data, l); ++ pm->enabled = (unsigned char)my_atoui(data, l); + break; + case NewDescription: + memcpy(pm->description, data, l); + pm->description[l] = '\0'; + break; + case NewLeaseTime: +- pm->leaseTime = atoui(data, l); ++ pm->leaseTime = my_atoui(data, l); + break; + default: + break; +-- +2.7.0 + diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe deleted file mode 100644 index a2ab72adf..000000000 --- a/net-p2p/transmission/transmission-2.82.recipe +++ /dev/null @@ -1,94 +0,0 @@ -SUMMARY="A cross-platform open source BitTorrent client" -DESCRIPTION="Transmission is an open source, volunteer-based project. Unlike \ -some BitTorrent clients, Transmission doesn't play games with its users to \ -make money: -- Transmission doesn't bundle toolbars, pop-up ads, flash ads, twitter tools, \ -or anything else. -- It doesn't hold some feaures back for a payware version. -- Its source code is available for anyone to review. -- They don't track our users, and their website and forums have no third-party \ -ads or analytics. - -Transmission is designed for easy, powerful use. They've set the defaults to \ -Just Work and it only takes a few clicks to configure advanced features like \ -watch directories, bad peer blocklists, and the web interface. -In separate benchmarks, Linux Format and Lacrocivious both found Transmission \ -to use less CPU than any other GUI client. It even used less CPU than some \ -non-GUI clients. -Transmission also has the lowest memory footprint of any major BitTorrent \ -client. - -Imageshack chose Transmission for its BitTorrent farms because the competition \ -requires amounts of memory several times greater than Transmission. -Transmission's small footprint is one reason why many home device \ -manufacturers, such as FON, Belkin, and Networked Media Tank ship with \ -Transmission. When Belkin and Vuze Inc. partnered to write a Torrent Genie to \ -let people who ran Vuze and owned a Belkin router keep sharing files even when \ -Vuze wasn't running, they decided to use Transmission -- not Vuze's own BitTorrent client -- on the router. -Unlike many cross-platform applications, Transmission integrates seamlessly \ -with your operating system. - -Transmission has the features you want from a BitTorrent client: encryption, a \ -web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port \ -forwarding, webseed support, watch directories, tracker editing, global and \ -per-torrent speed limits, and more." -HOMEPAGE="http://www.transmissionbt.com/" -COPYRIGHT="2005-2013 By the respective authors" -LICENSE="Transmission - MIT - GNU GPL v2" -REVISION="1" -SOURCE_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz" -CHECKSUM_SHA256="3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522" -PATCHES="transmission-2.82.patch" - -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 x86" - -PROVIDES=" - transmission = $portVersion - cmd:transmission_cli$secondaryArchSuffix - cmd:transmission_create$secondaryArchSuffix - cmd:transmission_daemon$secondaryArchSuffix - cmd:transmission_edit$secondaryArchSuffix - cmd:transmission_remote$secondaryArchSuffix - cmd:transmission_show$secondaryArchSuffix - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libcurl$secondaryArchSuffix - lib:libevent$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libssl$secondaryArchSuffix - devel:libcurl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libevent$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libgettextlib$secondaryArchSuffix >= 0.14.1 - intltool >= 0.40 - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:pkg_config$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - runConfigure ./configure --without-gtk --datadir=$dataDir - make -} - -INSTALL() -{ - make install -} diff --git a/net-p2p/transmission/transmission-2.84.recipe b/net-p2p/transmission/transmission-2.84.recipe index 9134f4d46..2c39d3142 100644 --- a/net-p2p/transmission/transmission-2.84.recipe +++ b/net-p2p/transmission/transmission-2.84.recipe @@ -3,13 +3,13 @@ DESCRIPTION="Transmission has the features you want from a BitTorrent client: \ encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and \ NAT-PMP port forwarding, webseed support, watch directories, tracker editing, \ global and per-torrent speed limits, and more." -HOMEPAGE="http://www.transmissionbt.com/" -COPYRIGHT="2005-2013 By the respective authors" +HOMEPAGE="https://www.transmissionbt.com/" +COPYRIGHT="2005-2014 By the respective authors" LICENSE="Transmission MIT GNU GPL v2" REVISION="4" -SOURCE_URI="https://transmission.cachefly.net/transmission-$portVersion.tar.xz" +SOURCE_URI="https://download.transmissionbt.com/files/transmission-$portVersion.tar.xz" CHECKSUM_SHA256="a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb" PATCHES="transmission-$portVersion.patchset" diff --git a/net-p2p/transmission/transmission-2.92.recipe b/net-p2p/transmission/transmission-2.92.recipe new file mode 100644 index 000000000..f19a13f97 --- /dev/null +++ b/net-p2p/transmission/transmission-2.92.recipe @@ -0,0 +1,69 @@ +SUMMARY="A cross-platform open source BitTorrent client" +DESCRIPTION="Transmission has the features you want from a BitTorrent client: \ +encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and \ +NAT-PMP port forwarding, webseed support, watch directories, tracker editing, \ +global and per-torrent speed limits, and more." +HOMEPAGE="https://www.transmissionbt.com/" +COPYRIGHT="2005-2016 By the respective authors" +LICENSE="Transmission + MIT + GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.transmissionbt.com/files/transmission-$portVersion.tar.xz" +CHECKSUM_SHA256="3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f" +PATCHES="transmission-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +PROVIDES=" + transmission$secondaryArchSuffix = $portVersion + cmd:transmission_cli$secondaryArchSuffix + cmd:transmission_create$secondaryArchSuffix + cmd:transmission_daemon$secondaryArchSuffix + cmd:transmission_edit$secondaryArchSuffix + cmd:transmission_remote$secondaryArchSuffix + cmd:transmission_show$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libevent$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libssl$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libevent$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libgettextlib$secondaryArchSuffix >= 0.14.1 + intltool >= 0.40 + " +BUILD_PREREQUIRES=" + cmd:awk + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + export CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" + export CXXFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" + export LDFLAGS="-lposix_error_mapper" + runConfigure ./configure --without-gtk --enable-cli + make +} + +INSTALL() +{ + make install +}