pkg/45127: Update net/Transmission to 2.32 (replaces PR-45063)

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/45127: Update net/Transmission to 2.32 (replaces PR-45063)
From: Stefano Marinelli <stefano%dragas.it@localhost>
Date: Sat, 9 Jul 2011 09:30:01 +0000 (UTC)
>Number:         45127
>Category:       pkg
>Synopsis:       net/Transmission is outdated - patch attached
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Jul 09 09:30:00 +0000 2011
>Originator:     Stefano Marinelli
>Release:        NetBSD 5.1_STABLE
>Organization:
>Environment:
System: NetBSD netbsd.it 5.1_STABLE NetBSD 5.1_STABLE (DOMU_DRAGAS) #9: Thu Jun 
2 07:52:32 UTC 2011 
root%netbsd.it@localhost:/usr/obj/sys/arch/amd64/compile/DOMU_DRAGAS amd64
Architecture: x86_64
Machine: amd64
>Description:
        net/Transmission is outdated. 2.32 is out and fixes an outstanding bug 
of 2.31 that was causing segfaults at launch. The attached patch upgrades to 
2.32 and
        adds the "utp" option. Being a huge improvement, I've set the "utp" 
option enabled by default.
>How-To-Repeat:
        Compile net/Transmission
>Fix:
        Apply the following patch:

diff -ruNa -x CVS Transmission.orig/Makefile Transmission/Makefile
--- Transmission.orig/Makefile  2011-04-22 13:44:28.000000000 +0000
+++ Transmission/Makefile       2011-07-09 09:17:51.000000000 +0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.70 2011/03/25 21:37:02 abs Exp $
 #
-DISTNAME=              transmission-2.22
-PKGNAME=               Transmission-2.22
-PKGREVISION=           1
+DISTNAME=              transmission-2.32
+PKGNAME=               Transmission-2.32
 CATEGORIES=            net
 MASTER_SITES=          http://download.m0k.org/transmission/files/
 EXTRACT_SUFX=          .tar.bz2
diff -ruNa -x CVS Transmission.orig/distinfo Transmission/distinfo
--- Transmission.orig/distinfo  2011-03-25 21:37:02.000000000 +0000
+++ Transmission/distinfo       2011-07-09 09:10:09.000000000 +0000
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.52 2011/02/11 21:41:21 tnn Exp $
 
-SHA1 (transmission-2.22.tar.bz2) = ddd515bdcc201193b45f58b705f6e8fde9fcb5d1
-RMD160 (transmission-2.22.tar.bz2) = e87b560f81fc8bc422dc7071a4b27bdcf2b2d6ac
-Size (transmission-2.22.tar.bz2) = 4802843 bytes
-SHA1 (patch-aa) = 9a97eb880af17dceeb0ed826b8e508c4ae59102e
-SHA1 (patch-ab) = 96174f474e3301f9062eaa17fafe3cd5c26a5243
-SHA1 (patch-ac) = 75e0d1fbfc5bb895b17fa22d8d09d6257e798847
-SHA1 (patch-ad) = 618097ee45aefaa2027a6638fa2faba4ca29251d
-SHA1 (patch-ae) = bf410b1a3a1841ff9d966d71de7e35c689df6024
+SHA1 (transmission-2.32.tar.bz2) = 74ec9c85d6fea500ffe5e5bb94b6c8ba97ae1bd4
+RMD160 (transmission-2.32.tar.bz2) = dc8663337dace1ac6e885d228cb5d190adc5fea4
+Size (transmission-2.32.tar.bz2) = 3890414 bytes
+SHA1 (patch-aa) = f0ba36e908e1e6ea62e820022cfbf9feb2527ebd
+SHA1 (patch-ab) = b024023777da834df88ec0cdc256c1d07e8f56b5
+SHA1 (patch-ac) = 17db51edeeda9673b0ab2623eacf48e4b645edac
+SHA1 (patch-ae) = 20ac0f89d8abc73d3904a9cae9a755bd449caf6c
+SHA1 (patch-af) = dd78abdc676eadddf34486f9c493d6c221a1b930
diff -ruNa -x CVS Transmission.orig/options.mk Transmission/options.mk
--- Transmission.orig/options.mk        2011-02-11 21:41:21.000000000 +0000
+++ Transmission/options.mk     2011-07-09 09:00:09.000000000 +0000
@@ -3,8 +3,8 @@
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.Transmission
-PKG_SUPPORTED_OPTIONS= gtk qt
-PKG_SUGGESTED_OPTIONS= gtk
+PKG_SUPPORTED_OPTIONS= gtk qt utp
+PKG_SUGGESTED_OPTIONS= gtk utp
 
 .include "../../mk/bsd.options.mk"
 
@@ -41,3 +41,11 @@
 install-qt-client:
        cd ${WRKSRC}/qt && ${SETENV} ${INSTALL_ENV} make install
 .endif
+
+.if !empty(PKG_OPTIONS:Mutp)
+USE_LANGUAGES+=         c c++
+CONFIGURE_ARGS+=        --enable-utp   
+.else
+CONFIGURE_ARGS+=        --disable-utp
+.endif
+
diff -ruNa -x CVS Transmission.orig/patches/patch-aa 
Transmission/patches/patch-aa
--- Transmission.orig/patches/patch-aa  2010-05-03 15:39:33.000000000 +0000
+++ Transmission/patches/patch-aa       2011-07-09 09:04:04.000000000 +0000
@@ -1,8 +1,6 @@
-$NetBSD$
-
---- third-party/miniupnp/connecthostport.c.orig        2010-05-01 
21:35:46.000000000 +0000
-+++ third-party/miniupnp/connecthostport.c
-@@ -29,6 +29,7 @@
+--- third-party/miniupnp/connecthostport.c.orig        2011-06-29 
01:14:43.000000000 +0000
++++ third-party/miniupnp/connecthostport.c     2011-07-09 08:48:04.000000000 
+0000
+@@ -31,6 +31,7 @@
  #ifndef USE_GETHOSTBYNAME
  #include <sys/types.h>
  #include <sys/socket.h>
diff -ruNa -x CVS Transmission.orig/patches/patch-ab 
Transmission/patches/patch-ab
--- Transmission.orig/patches/patch-ab  2008-08-09 13:47:44.000000000 +0000
+++ Transmission/patches/patch-ab       2011-07-09 09:04:17.000000000 +0000
@@ -1,18 +1,18 @@
-$NetBSD$
-
---- third-party/libnatpmp/getgateway.c.orig    2008-08-09 06:08:13.000000000 
+0200
-+++ third-party/libnatpmp/getgateway.c
-@@ -49,6 +49,13 @@
+--- third-party/libnatpmp/getgateway.c.orig    2011-06-29 01:14:43.000000000 
+0000
++++ third-party/libnatpmp/getgateway.c 2011-07-09 08:49:53.000000000 +0000
+@@ -53,6 +53,15 @@
  #undef USE_SYSCTL_NET_ROUTE
  #endif
  
 +#if !defined(USE_PROC_NET_ROUTE) && !defined(USE_SOCKET_ROUTE) && 
!defined(USE_SYSCTL_NET_ROUTE)
 +int getdefaultgateway(in_addr_t * addr)
 +{
-+      return -1;
++       return -1;
 +}
 +#endif
 +
++
++
  #ifdef WIN32
  #undef USE_PROC_NET_ROUTE
  #undef USE_SOCKET_ROUTE
diff -ruNa -x CVS Transmission.orig/patches/patch-ac 
Transmission/patches/patch-ac
--- Transmission.orig/patches/patch-ac  2008-02-16 23:10:06.000000000 +0000
+++ Transmission/patches/patch-ac       2011-07-09 09:04:32.000000000 +0000
@@ -1,8 +1,6 @@
-$NetBSD$
-
---- gtk/icons/Makefile.in.orig 2008-02-09 04:56:00.000000000 +0100
-+++ gtk/icons/Makefile.in
-@@ -445,14 +445,6 @@ install-icons:
+--- gtk/icons/Makefile.in.orig 2011-06-29 01:31:10.000000000 +0000
++++ gtk/icons/Makefile.in      2011-07-09 08:55:00.000000000 +0000
+@@ -489,14 +489,6 @@
                ICONFILE=`echo $$icon | cut -d_ -f4`; \
                mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
                $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
diff -ruNa -x CVS Transmission.orig/patches/patch-ad 
Transmission/patches/patch-ad
--- Transmission.orig/patches/patch-ad  2011-02-11 21:41:22.000000000 +0000
+++ Transmission/patches/patch-ad       1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- ./libtransmission/torrent.c.orig   2011-02-08 21:14:19.000000000 +0000
-+++ ./libtransmission/torrent.c
-@@ -27,6 +27,7 @@
- #include <stdarg.h>
- #include <string.h> /* memcmp */
- #include <stdlib.h> /* qsort */
-+#include <signal.h> /* SIGCHLD */
- 
- #include <event2/util.h> /* evutil_vsnprintf() */
- 
diff -ruNa -x CVS Transmission.orig/patches/patch-ae 
Transmission/patches/patch-ae
--- Transmission.orig/patches/patch-ae  2011-02-11 21:41:22.000000000 +0000
+++ Transmission/patches/patch-ae       2011-07-09 09:04:48.000000000 +0000
@@ -1,8 +1,6 @@
-$NetBSD$
-
---- qt/qtr.pro.orig    2011-02-08 21:14:20.000000000 +0000
-+++ qt/qtr.pro
-@@ -13,7 +13,9 @@ man.files = transmission-qt.1
+--- qt/qtr.pro.orig    2011-06-29 01:14:38.000000000 +0000
++++ qt/qtr.pro 2011-07-09 08:57:57.000000000 +0000
+@@ -13,7 +13,9 @@
  
  CONFIG += qt qdbus thread debug link_pkgconfig
  QT += network
@@ -12,4 +10,4 @@
 +LIBS +=  $${OPENSSL_LIBS}
  
  TRANSMISSION_TOP = ..
- INCLUDEPATH += $${TRANSMISSION_TOP}
+ INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
diff -ruNa -x CVS Transmission.orig/patches/patch-af 
Transmission/patches/patch-af
--- Transmission.orig/patches/patch-af  1970-01-01 00:00:00.000000000 +0000
+++ Transmission/patches/patch-af       2011-07-09 09:09:50.000000000 +0000
@@ -0,0 +1,11 @@
+--- libtransmission/peer-msgs.c.orig   2011-06-29 01:14:37.000000000 +0000
++++ libtransmission/peer-msgs.c        2011-07-09 09:08:46.000000000 +0000
+@@ -16,8 +16,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <alloca.h>
+-
+ #include <event2/buffer.h>
+ #include <event2/bufferevent.h>
+ #include <event2/event.h>
Prev by Date: Re: pkg/44912 (gcc generates unaligned SSE2 memory accesses)
Next by Date: Re: pkg/45063 (net/Transmission is outdated - patch attached)
Previous by Thread: PR/44912 CVS commit: pkgsrc/devel/xulrunner
Next by Thread: Re: pkg/45127 (net/Transmission is outdated - patch attached)
Indexes:
Home | Main Index | Thread Index | Old Index