summaryrefslogtreecommitdiff
path: root/net/transmission/patches
diff options
context:
space:
mode:
authorwiz <wiz>2014-05-30 13:46:30 +0000
committerwiz <wiz>2014-05-30 13:46:30 +0000
commit234c281f3f0ed9da7e1be6dafc5ef07b69353f83 (patch)
tree10a71ff25447dbc0a7e82ec435b02e0195e7ab77 /net/transmission/patches
parent8ff30bb8afcedea3932dc376f0a14aa9edabf612 (diff)
downloadpkgsrc-234c281f3f0ed9da7e1be6dafc5ef07b69353f83.tar.gz
Update transmission packages to 2.83:
All Platforms Licensing change: the GNU GPLv2 code can now be used under GNU GPL v2 or v3 Fix network hanging issues that could occur when both UTP and DHT were enabled Fix 2.82 file descriptor leak when importing a blocklist Disallow torrents that contain "/../" in the path Fix 2.82 bug that didn't retain peers between sessions Fix potential dangling memory error in UDP tracker DNS lookups Remember a torrent's "queued" state between Transmission sessions Updated third party libraries: DHT updated to v0.22; miniupnpc updated to v1.9 Autoconf script fixes: better detection of ccache, minupnpc Fix the X-Transmission-Session-Id header to be valid with the SPDY protocol Fix thread safety bugs in the tr_list datatype When determining free disk space on NetBSD>=6, support its Quota feature Windows portability improvements Mac Client Share option in File menu and context menu Show all torrents when the filter bar is hidden Show zero-byte files correctly Coalesce multiple Speed Limit Auto Enabled/Disabled? notifications Turkish localization Removed Brazilian Portuguese localization because of lack of localizer (European Portuguese localization remains) GTK+ Client Fix threading issue on shutdown Qt Client Fix toggle-downloading-by-pressing-spacebar in the file list Fix "Open URL" crash from dangling pointer Support launching downloaded files from inside Transmission On Windows, use native Windows icons Improved network status info and tooltip in the status bar Fix "Open Torrent" dialog crash in Qt 5.2 Daemon On systemd systems, fix config reloading via 'systemctl reload' Use libevent's event loop Fix discrepancy in curl SSL setup between tr-daemon and tr-remote Fix broken OS X build Web Client Support file renaming in the web client Fix incorrect torrent state being displayed for magnet links Make URLs in the torrent's comment field clickable (and sanitize them to prevent cross-scripting)
Diffstat (limited to 'net/transmission/patches')
-rw-r--r--net/transmission/patches/patch-aa14
-rw-r--r--net/transmission/patches/patch-configure70
-rw-r--r--net/transmission/patches/patch-configure.ac15
-rw-r--r--net/transmission/patches/patch-libtransmission_platform-quota.c75
-rw-r--r--net/transmission/patches/patch-qt_qtr.pro28
-rw-r--r--net/transmission/patches/patch-qt_torrent-filter.cc15
-rw-r--r--net/transmission/patches/patch-third-party_miniupnp_miniupnp.c16
7 files changed, 18 insertions, 215 deletions
diff --git a/net/transmission/patches/patch-aa b/net/transmission/patches/patch-aa
deleted file mode 100644
index f0f563f2044..00000000000
--- a/net/transmission/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2014/04/01 11:13:28 wiz Exp $
-
-Include header for select().
-
---- third-party/miniupnp/connecthostport.c.orig 2012-07-06 01:26:19.000000000 +0000
-+++ third-party/miniupnp/connecthostport.c
-@@ -33,6 +33,7 @@
- #ifndef USE_GETHOSTBYNAME
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/select.h>
- #endif /* #ifndef USE_GETHOSTBYNAME */
- #endif /* #else _WIN32 */
-
diff --git a/net/transmission/patches/patch-configure b/net/transmission/patches/patch-configure
deleted file mode 100644
index 0bb49f483e4..00000000000
--- a/net/transmission/patches/patch-configure
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/04/01 11:13:28 wiz Exp $
-
-Quota support for NetBSD-6+.
-http://trac.transmissionbt.com/ticket/5643
-
---- configure.orig 2014-03-31 11:48:05.000000000 +0000
-+++ configure
-@@ -16935,6 +16935,62 @@ if test "$ac_res" != no; then :
-
- fi
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing quotacursor_skipidtype" >&5
-+$as_echo_n "checking for library containing quotacursor_skipidtype... " >&6; }
-+if ${ac_cv_search_quotacursor_skipidtype+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char quotacursor_skipidtype ();
-+int
-+main ()
-+{
-+return quotacursor_skipidtype ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+for ac_lib in '' quota; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_search_quotacursor_skipidtype=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if ${ac_cv_search_quotacursor_skipidtype+:} false; then :
-+ break
-+fi
-+done
-+if ${ac_cv_search_quotacursor_skipidtype+:} false; then :
-+
-+else
-+ ac_cv_search_quotacursor_skipidtype=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_quotacursor_skipidtype" >&5
-+$as_echo "$ac_cv_search_quotacursor_skipidtype" >&6; }
-+ac_res=$ac_cv_search_quotacursor_skipidtype
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-
-
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
diff --git a/net/transmission/patches/patch-configure.ac b/net/transmission/patches/patch-configure.ac
deleted file mode 100644
index 0daa276258e..00000000000
--- a/net/transmission/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2014/04/01 11:13:28 wiz Exp $
-
-Quota support for NetBSD-6+.
-http://trac.transmissionbt.com/ticket/5643
-
---- configure.ac.orig 2013-08-09 02:47:38.000000000 +0000
-+++ configure.ac
-@@ -117,6 +117,7 @@ fi
- AC_SEARCH_LIBS(cos, [m])
- AC_SEARCH_LIBS([socket], [socket net])
- AC_SEARCH_LIBS([gethostbyname], [nsl bind])
-+AC_SEARCH_LIBS([quotacursor_skipidtype], [quota])
- PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
- PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
- PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_MINIMUM])
diff --git a/net/transmission/patches/patch-libtransmission_platform-quota.c b/net/transmission/patches/patch-libtransmission_platform-quota.c
deleted file mode 100644
index 727cd6014c9..00000000000
--- a/net/transmission/patches/patch-libtransmission_platform-quota.c
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
-Quota support for NetBSD-6+.
-http://trac.transmissionbt.com/ticket/5643
-
---- libtransmission/platform-quota.c.orig 2013-08-09 02:45:44.000000000 +0000
-+++ libtransmission/platform-quota.c
-@@ -20,6 +20,11 @@
- #include <sys/types.h> /* types needed by quota.h */
- #if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <ufs/ufs/quota.h> /* quotactl() */
-+ #elif defined (__NetBSD__)
-+ #include <sys/param.h>
-+ #ifndef statfs
-+ #define statfs statvfs
-+ #endif
- #elif defined (__sun)
- #include <sys/fs/ufs_quota.h> /* quotactl */
- #else
-@@ -195,6 +200,47 @@ getblkdev (const char * path)
- return device;
- }
-
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000)
-+#include <quota.h>
-+
-+static int64_t
-+getquota (const char * device)
-+{
-+ struct quotahandle *qh;
-+ struct quotakey qk;
-+ struct quotaval qv;
-+ int64_t limit;
-+ int64_t freespace;
-+ int64_t spaceused;
-+
-+ qh = quota_open(device);
-+ if (qh == NULL) {
-+ return -1;
-+ }
-+ qk.qk_idtype = QUOTA_IDTYPE_USER;
-+ qk.qk_id = getuid();
-+ qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
-+ if (quota_get(qh, &qk, &qv) == -1) {
-+ quota_close(qh);
-+ return -1;
-+ }
-+ if (qv.qv_softlimit > 0) {
-+ limit = qv.qv_softlimit;
-+ }
-+ else if (qv.qv_hardlimit > 0) {
-+ limit = qv.qv_hardlimit;
-+ }
-+ else {
-+ quota_close(qh);
-+ return -1;
-+ }
-+ spaceused = qv.qv_usage;
-+ quota_close(qh);
-+
-+ freespace = limit - spaceused;
-+ return (freespace < 0) ? 0 : freespace;
-+}
-+#else
- static int64_t
- getquota (const char * device)
- {
-@@ -259,6 +305,7 @@ getquota (const char * device)
- /* something went wrong */
- return -1;
- }
-+#endif
-
- #ifdef HAVE_XQM
- static int64_t
diff --git a/net/transmission/patches/patch-qt_qtr.pro b/net/transmission/patches/patch-qt_qtr.pro
index 766f5624a31..ae0917308f7 100644
--- a/net/transmission/patches/patch-qt_qtr.pro
+++ b/net/transmission/patches/patch-qt_qtr.pro
@@ -1,20 +1,28 @@
-$NetBSD: patch-qt_qtr.pro,v 1.2 2014/04/01 09:48:04 adam Exp $
+$NetBSD: patch-qt_qtr.pro,v 1.3 2014/05/30 13:46:30 wiz Exp $
---- qt/qtr.pro.orig 2014-03-21 11:16:35.000000000 +0000
+--- qt/qtr.pro.orig 2014-05-18 20:52:17.000000000 +0000
+++ qt/qtr.pro
-@@ -8,12 +8,14 @@ target.path = /bin
+@@ -8,7 +8,8 @@ target.path = /bin
INSTALLS += target
unix: INSTALLS += man
-man.path = /share/man/man1/
+man.path = /man/man1/
++
man.files = transmission-qt.1
- CONFIG += qt thread debug link_pkgconfig
- QT += network dbus widgets
- PKGCONFIG = fontconfig libcurl openssl libevent
-+INCLUDEPATH += $${OPENSSL_CFLAGS}
-+LIBS += $${OPENSSL_LIBS}
-
- TRANSMISSION_TOP = ..
+ CONFIG += qt thread debug link_pkgconfig c++11 warn_on
+@@ -25,11 +26,13 @@ include(config.pri)
+ INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
+ INCLUDEPATH += $${TRANSMISSION_TOP}
++INCLUDEPATH += $${OPENSSL_CFLAGS}
+ LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
+ LIBS += $${LIBUTP_LIBS}
+ LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
+ LIBS += $${LIBUPNP_LIBS}
+ LIBS += $${LIBNATPMP_LIBS}
++LIBS += $${OPENSSL_LIBS}
+ unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
+ win32:DEFINES += QT_DBUS
+ win32:LIBS += -levent-2.0 -lws2_32 -lintl
diff --git a/net/transmission/patches/patch-qt_torrent-filter.cc b/net/transmission/patches/patch-qt_torrent-filter.cc
deleted file mode 100644
index da3bc28cec5..00000000000
--- a/net/transmission/patches/patch-qt_torrent-filter.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qt_torrent-filter.cc,v 1.1 2014/04/01 09:48:04 adam Exp $
-
-Fix building error.
-
---- qt/torrent-filter.cc.orig 2014-04-01 07:01:04.000000000 +0000
-+++ qt/torrent-filter.cc
-@@ -211,7 +211,7 @@ TorrentFilter :: hiddenRowCount( ) const
- void
- TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const
- {
-- std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0);
-+ std::fill_n (setmeCounts, (int)FilterMode::NUM_MODES, 0);
-
- for (int row(0); ; ++row)
- {
diff --git a/net/transmission/patches/patch-third-party_miniupnp_miniupnp.c b/net/transmission/patches/patch-third-party_miniupnp_miniupnp.c
deleted file mode 100644
index eaefe13a9e9..00000000000
--- a/net/transmission/patches/patch-third-party_miniupnp_miniupnp.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-third-party_miniupnp_miniupnp.c,v 1.1 2013/03/02 19:33:29 wiz Exp $
-
-FreeBSD does IP_MULTICAST_IF, but it is the only BSD that does.
-Add DragonFly to the list of system that exclude support for IP multicast
-
---- third-party/miniupnp/miniupnpc.c.orig 2012-07-06 01:26:19.715654000 +0000
-+++ third-party/miniupnp/miniupnpc.c
-@@ -17,7 +17,7 @@
- #endif
- #endif
-
--#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun)
-+#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun)
- #define HAS_IP_MREQN
- #endif
-