pkg/45063: Update net/Transmission to 2.31 (patch attached)

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/45063: Update net/Transmission to 2.31 (patch attached)
From: Stefano Marinelli <stefano%dragas.it@localhost>
Date: Wed, 15 Jun 2011 08:15:01 +0000 (UTC)
>Number:         45063
>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:   Wed Jun 15 08:15: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 on pkgsrc is at version 2.22. While it is a 
good and stable version, the 2.31 has been out for a while now and has 
interesting new features.
                This patch allows 2.31 to compile (and run) properly. I've also 
added a "utp" option (and made it enabled by default) flag to enable this 
interesting new feature.
                To avoid segfaults, I created "patch-ag" which sets the 
"open-file-limit" to the default value,which is "32". This  means it cannot be 
customised, but 
                devs are investigating. Meanwhile, we have a perfectly working 
and stable updated Transmission.
                According to asau suggestion, I'm providing a "diff -ruNa" 
patch file as the cvs diff didn't allow me to insert new files. Sorry about 
that.
>How-To-Repeat:
                Compile net/Transmission
>Fix:
                The patches allow it to be compiled (and run) cleanly.

diff -ruNa Transmission.orig/CVS/Entries Transmission/CVS/Entries
--- Transmission.orig/CVS/Entries       2011-06-15 07:44:28.000000000 +0000
+++ Transmission/CVS/Entries    2011-06-15 07:44:52.000000000 +0000
@@ -1,9 +1,9 @@
+/DESCR/1.1.1.1/Mon Jul  3 08:40:13 2006//
+/PLIST.qt/1.1/Fri May 15 09:43:55 2009//
 D/patches////
-/DESCR/1.1.1.1/Wed Jun 15 07:44:28 2011//
-/Makefile/1.71/Wed Jun 15 07:44:28 2011//
-/PLIST.common/1.14/Wed Jun 15 07:44:28 2011//
-/PLIST.gtk/1.23/Wed Jun 15 07:44:28 2011//
-/PLIST.qt/1.1/Wed Jun 15 07:44:28 2011//
-/distinfo/1.53/Wed Jun 15 07:44:28 2011//
-/options.mk/1.16/Wed Jun 15 07:44:28 2011//
+/PLIST.gtk/1.23/Tue Feb 15 10:50:59 2011//
+/options.mk/1.16/Tue Feb 15 10:50:59 2011//
+/PLIST.common/1.14/Mon Mar 28 08:35:06 2011//
+/distinfo/1.53/Mon Mar 28 08:35:06 2011//
+/Makefile/1.71/Tue May  3 21:38:21 2011//
 D
diff -ruNa Transmission.orig/Makefile Transmission/Makefile
--- Transmission.orig/Makefile  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/Makefile       2011-06-15 07:44:52.000000000 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2011/04/22 13:44:28 obache Exp $
+# $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.31
+PKGNAME=               Transmission-2.31
+PKGREVISION=           0
 CATEGORIES=            net
 MASTER_SITES=          http://download.m0k.org/transmission/files/
 EXTRACT_SUFX=          .tar.bz2
@@ -11,6 +11,9 @@
 HOMEPAGE=              http://www.transmissionbt.com/
 COMMENT=               Free, lightweight BitTorrent client
 
+#INSTALL_UNSTRIPPED=   yes
+#CFLAGS=                       -g
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config intltool msgfmt
diff -ruNa Transmission.orig/PLIST.common Transmission/PLIST.common
--- Transmission.orig/PLIST.common      2011-06-15 07:44:28.000000000 +0000
+++ Transmission/PLIST.common   2011-06-15 07:44:52.000000000 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.14 2011/03/25 21:37:02 abs Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2011/02/11 21:41:21 tnn Exp $
 bin/transmission-cli
 bin/transmission-create
 bin/transmission-daemon
diff -ruNa Transmission.orig/PLIST.gtk Transmission/PLIST.gtk
--- Transmission.orig/PLIST.gtk 2011-06-15 07:44:28.000000000 +0000
+++ Transmission/PLIST.gtk      2011-06-15 07:44:52.000000000 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gtk,v 1.23 2011/02/11 21:41:21 tnn Exp $
+@comment $NetBSD: PLIST.gtk,v 1.22 2010/11/15 09:15:13 tnn Exp $
 bin/transmission-gtk
 man/man1/transmission-gtk.1
 share/applications/transmission-gtk.desktop
diff -ruNa Transmission.orig/PLIST.qt Transmission/PLIST.qt
--- Transmission.orig/PLIST.qt  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/PLIST.qt       2011-06-15 07:44:52.000000000 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.qt,v 1.1 2009/05/15 09:43:55 tnn Exp $
+@comment $NetBSD$
 bin/qtr
diff -ruNa Transmission.orig/distinfo Transmission/distinfo
--- Transmission.orig/distinfo  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/distinfo       2011-06-15 07:44:52.000000000 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.53 2011/03/25 21:37:02 abs Exp $
+$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 (transmission-2.31.tar.bz2) = d14a0cca369f0b40dc3ac8851af3fdc50ec74d13
+RMD160 (transmission-2.31.tar.bz2) = 9ec36cefb5d5675147dc83bc4a0ffccacd64f9b3
+Size (transmission-2.31.tar.bz2) = 4408316 bytes
 SHA1 (patch-aa) = 9a97eb880af17dceeb0ed826b8e508c4ae59102e
 SHA1 (patch-ab) = 96174f474e3301f9062eaa17fafe3cd5c26a5243
 SHA1 (patch-ac) = 75e0d1fbfc5bb895b17fa22d8d09d6257e798847
-SHA1 (patch-ad) = 618097ee45aefaa2027a6638fa2faba4ca29251d
-SHA1 (patch-ae) = bf410b1a3a1841ff9d966d71de7e35c689df6024
+SHA1 (patch-ae) = e0fc6d991132ff3fcb81704d2e988aa14774c314
+SHA1 (patch-af) = b5f287d41dbc5e422013b15e897c44d625b01958
+SHA1 (patch-ag) = c426e686142b6c41acfd089e8e0840e544150de3
diff -ruNa Transmission.orig/options.mk Transmission/options.mk
--- Transmission.orig/options.mk        2011-06-15 07:44:28.000000000 +0000
+++ Transmission/options.mk     2011-06-15 07:44:52.000000000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.16 2011/02/11 21:41:21 tnn Exp $
+# $NetBSD: options.mk,v 1.15 2010/07/15 08:44:56 tnn Exp $
 
 .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 Transmission.orig/patches/CVS/Entries 
Transmission/patches/CVS/Entries
--- Transmission.orig/patches/CVS/Entries       2011-06-15 07:44:28.000000000 
+0000
+++ Transmission/patches/CVS/Entries    2011-06-15 07:44:52.000000000 +0000
@@ -1,6 +1,6 @@
-/patch-aa/1.10/Wed Jun 15 07:44:28 2011//
-/patch-ab/1.9/Wed Jun 15 07:44:28 2011//
-/patch-ac/1.3/Wed Jun 15 07:44:28 2011//
-/patch-ad/1.7/Wed Jun 15 07:44:28 2011//
-/patch-ae/1.9/Wed Jun 15 07:44:28 2011//
+/patch-aa/1.10/Mon May  3 15:39:33 2010//
+/patch-ab/1.9/Sat Aug  9 13:47:44 2008//
+/patch-ac/1.3/Sat Feb 16 23:10:06 2008//
+/patch-ad/1.7/Fri Feb 11 21:41:22 2011//
+/patch-ae/1.9/Tue Feb 15 10:50:59 2011//
 D
diff -ruNa Transmission.orig/patches/patch-aa Transmission/patches/patch-aa
--- Transmission.orig/patches/patch-aa  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/patches/patch-aa       2011-06-15 07:44:52.000000000 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2010/05/03 15:39:33 tnn Exp $
+$NetBSD$
 
 --- third-party/miniupnp/connecthostport.c.orig        2010-05-01 
21:35:46.000000000 +0000
 +++ third-party/miniupnp/connecthostport.c
diff -ruNa Transmission.orig/patches/patch-ab Transmission/patches/patch-ab
--- Transmission.orig/patches/patch-ab  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/patches/patch-ab       2011-06-15 07:44:52.000000000 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.9 2008/08/09 13:47:44 tnn Exp $
+$NetBSD$
 
 --- third-party/libnatpmp/getgateway.c.orig    2008-08-09 06:08:13.000000000 
+0200
 +++ third-party/libnatpmp/getgateway.c
diff -ruNa Transmission.orig/patches/patch-ac Transmission/patches/patch-ac
--- Transmission.orig/patches/patch-ac  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/patches/patch-ac       2011-06-15 07:44:52.000000000 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2008/02/16 23:10:06 tnn Exp $
+$NetBSD$
 
 --- gtk/icons/Makefile.in.orig 2008-02-09 04:56:00.000000000 +0100
 +++ gtk/icons/Makefile.in
diff -ruNa Transmission.orig/patches/patch-ad Transmission/patches/patch-ad
--- Transmission.orig/patches/patch-ad  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/patches/patch-ad       1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2011/02/11 21:41:22 tnn Exp $
-
---- ./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 Transmission.orig/patches/patch-ae Transmission/patches/patch-ae
--- Transmission.orig/patches/patch-ae  2011-06-15 07:44:28.000000000 +0000
+++ Transmission/patches/patch-ae       2011-06-15 07:44:52.000000000 +0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-ae,v 1.9 2011/02/11 21:41:22 tnn Exp $
-
---- 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-10 20:09:32.000000000 +0000
++++ qt/qtr.pro 2011-06-10 20:09:45.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 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-06-15 07:44:52.000000000 +0000
@@ -0,0 +1,12 @@
+--- libtransmission/peer-msgs.c.orig    2011-05-17 22:17:35.000000000 +0000
++++ libtransmission/peer-msgs.c 2011-06-10 20:20:12.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>
+
diff -ruNa Transmission.orig/patches/patch-ag Transmission/patches/patch-ag
--- Transmission.orig/patches/patch-ag  1970-01-01 00:00:00.000000000 +0000
+++ Transmission/patches/patch-ag       2011-06-15 07:44:52.000000000 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.0 2010/06/12 10:11:15 $                                  
                                                                                
                                
+                                                                               
                                                                                
                                           
+* Dirty ugly hack to make it run and not segfault while devs investigate
+
+--- libtransmission/fdlimit.c.orig     2011-06-11 18:47:45.000000000 +0200
++++ libtransmission/fdlimit.c  2011-06-11 18:50:20.000000000 +0200
+@@ -783,7 +783,7 @@
+     {
+         struct tr_fileset * set = get_fileset( session );
+         fileset_destruct( set );
+-        fileset_construct( set, limit );
++        fileset_construct( set, 32 );
+     }
+ }
+
Prev by Date: Re: pkg/43967: [PATCH] misc/elscreen-1.4.5 to elscreen-1.4.6
Next by Date: pkg/45064: mail/dovecot2 should alert to restart the service - patch attached
Previous by Thread: pkg/45061: pkgtools/bootstrap-mk-files bootstrap.sh not processing ${OPSYS}.bsd.own.mk.in
Next by Thread: pkg/45064: mail/dovecot2 should alert to restart the service - patch attached
Indexes:
Home | Main Index | Thread Index | Old Index