Sat Sep 15 12:25:47 2018 UTC ()
Pullup ticket #5830 - requested by maya
net/rtorrent: security fix (remote code execution)

Revisions pulled up:
- net/rtorrent/Makefile                                         1.72
- net/rtorrent/options.mk                                       1.3

---
   Module Name:	pkgsrc
   Committed By:	maya
   Date:		Fri Sep 14 21:06:42 UTC 2018

   Modified Files:
   	pkgsrc/net/rtorrent: Makefile options.mk

   Log Message:
   rtorrent: disable xmlrpc option by default, it is too insecure.

   bump PKGREVISION.


(bsiegert)
diff -r1.70 -r1.70.2.1 pkgsrc/net/rtorrent/Makefile
diff -r1.2 -r1.2.2.1 pkgsrc/net/rtorrent/options.mk
cvs diff -r1.70 -r1.70.2.1 pkgsrc/net/rtorrent/Makefile (switch to unified diff)

--- pkgsrc/net/rtorrent/Makefile 2018/06/24 16:59:52 1.70
+++ pkgsrc/net/rtorrent/Makefile 2018/09/15 12:25:47 1.70.2.1
@@ -1,53 +1,54 @@ @@ -1,53 +1,54 @@
1# $NetBSD: Makefile,v 1.70 2018/06/24 16:59:52 adam Exp $ 1# $NetBSD: Makefile,v 1.70.2.1 2018/09/15 12:25:47 bsiegert Exp $
2 2
3DISTNAME= rtorrent-0.9.7 3DISTNAME= rtorrent-0.9.7
 4PKGREVISION= 2
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://rtorrent.net/downloads/ 6MASTER_SITES= http://rtorrent.net/downloads/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://github.com/rakshasa/rtorrent 9HOMEPAGE= https://github.com/rakshasa/rtorrent
9COMMENT= Ncurses based torrent client with support for sessions 10COMMENT= Ncurses based torrent client with support for sessions
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12USE_LANGUAGES= c c++11 13USE_LANGUAGES= c c++11
13USE_LIBTOOL= yes 14USE_LIBTOOL= yes
14USE_NCURSES= yes # chgat 15USE_NCURSES= yes # chgat
15USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
17 18
18.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
19.if ${MACHINE_ARCH} == "alpha" || \ 20.if ${MACHINE_ARCH} == "alpha" || \
20 ${MACHINE_ARCH} == "i386" || \ 21 ${MACHINE_ARCH} == "i386" || \
21 ${MACHINE_ARCH} == "powerpc" || \ 22 ${MACHINE_ARCH} == "powerpc" || \
22 ${MACHINE_ARCH} == "x86_64" 23 ${MACHINE_ARCH} == "x86_64"
23GCC_REQD+= 4.1.3 24GCC_REQD+= 4.1.3
24.else 25.else
25GCC_REQD+= 4.2.1 26GCC_REQD+= 4.2.1
26.endif 27.endif
27 28
28.include "../../mk/pthread.buildlink3.mk" 29.include "../../mk/pthread.buildlink3.mk"
29LDFLAGS+= ${PTHREAD_LDFLAGS} 30LDFLAGS+= ${PTHREAD_LDFLAGS}
30 31
31.include "options.mk" 32.include "options.mk"
32 33
33# See http://libtorrent.rakshasa.no/ticket/77 34# See http://libtorrent.rakshasa.no/ticket/77
34.include "../../mk/compiler.mk" 35.include "../../mk/compiler.mk"
35.if !empty(CC_VERSION:Mgcc-4.0.*) 36.if !empty(CC_VERSION:Mgcc-4.0.*)
36CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ 37CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \
37 -fno-inline -fforce-addr 38 -fno-inline -fforce-addr
38.endif 39.endif
39 40
40.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi?86) 41.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi?86)
41CXXFLAGS+= -march=i486 42CXXFLAGS+= -march=i486
42.endif 43.endif
43 44
44INSTALLATION_DIRS= share/examples/rtorrent 45INSTALLATION_DIRS= share/examples/rtorrent
45 46
46post-install: 47post-install:
47 ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \ 48 ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \
48 ${DESTDIR}${PREFIX}/share/examples/rtorrent 49 ${DESTDIR}${PREFIX}/share/examples/rtorrent
49 50
50.include "../../devel/ncurses/buildlink3.mk" 51.include "../../devel/ncurses/buildlink3.mk"
51.include "../../net/libtorrent/buildlink3.mk" 52.include "../../net/libtorrent/buildlink3.mk"
52.include "../../www/curl/buildlink3.mk" 53.include "../../www/curl/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.2.2.1 pkgsrc/net/rtorrent/options.mk (switch to unified diff)

--- pkgsrc/net/rtorrent/options.mk 2018/06/24 16:59:52 1.2
+++ pkgsrc/net/rtorrent/options.mk 2018/09/15 12:25:47 1.2.2.1
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: options.mk,v 1.2 2018/06/24 16:59:52 adam Exp $ 1# $NetBSD: options.mk,v 1.2.2.1 2018/09/15 12:25:47 bsiegert Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.rtorrent 3PKG_OPTIONS_VAR= PKG_OPTIONS.rtorrent
4PKG_SUPPORTED_OPTIONS= xmlrpc 4PKG_SUPPORTED_OPTIONS= xmlrpc
5PKG_SUGGESTED_OPTIONS= xmlrpc 5PKG_SUGGESTED_OPTIONS=
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mxmlrpc) 9.if !empty(PKG_OPTIONS:Mxmlrpc)
10CONFIGURE_ARGS+= --with-xmlrpc-c=${PREFIX}/bin/xmlrpc-c-config 10CONFIGURE_ARGS+= --with-xmlrpc-c=${PREFIX}/bin/xmlrpc-c-config
11. include "../../textproc/xmlrpc-c/buildlink3.mk" 11. include "../../textproc/xmlrpc-c/buildlink3.mk"
12.endif 12.endif