Thu Feb 26 14:03:29 2009 UTC ()
Pullup ticket #2708 - requested by:
mldonkey: security update
mldonkey-gui: security update

Revisions pulled up:
- net/mldonkey/Makefile				1.46-1.48
- net/mldonkey/Makefile.common			1.34-1.36
- net/mldonkey/distinfo				1.46-1.48
- net/mldonkey-gui/Makefile			1.27
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Jan 24 12:59:28 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile.common distinfo

Log Message:
Update to 2.9.7:

2009/01/20: version 2.9.7 = tag release-2-9-7
6727: Web_infos: Replace old GeoIP URL with new one
- old code added the new URL, even if GeoIP was not present in web_infos

2009/01/04
6714: BT: Fix bug when computing limits for max_bt_uploaders
6713: GeoIP: New web_infos URL for country list (thx to Choby)
- old URLs are updated to:
  http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz

2008/12/13
6689: Allow compilation with Ocaml 3.11.0

2008/09/01
6629: Mail: Move hostname from subject to body (eydaimon)
Updated Mozilla protocol handler to version 2.5
- original source from http://www.informatik.uni-oldenburg.de/~dyna/mldonkey
6628: IP discover: Use http://whatismyip.org, old URL is not working anymore
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Feb 16 13:11:41 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile Makefile.common
	pkgsrc/net/mldonkey-gui: Makefile

Log Message:
Convert to user-destdir.
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Feb 24 22:50:45 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile distinfo
Added Files:
	pkgsrc/net/mldonkey/patches: patch-aa

Log Message:
Add patch fixing security problem from upstream.

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed Feb 25 23:39:37 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile Makefile.common distinfo
Removed Files:
	pkgsrc/net/mldonkey/patches: patch-aa

Log Message:
Update to 3.0.0:

2009/02/24: version 3.0.0 = tag release-3-0-0
6754: Fix local file access bug in internal http server
- this is an urgent security related bug-fix and effects
  all MLDonkey versions >= 2.8.4
6752: Optimized implementation of the ip_set module (cbah)
6736: Add/fix some copyright texts


(tron)
diff -r1.45 -r1.45.16.1 pkgsrc/net/mldonkey/Makefile
diff -r1.33 -r1.33.6.1 pkgsrc/net/mldonkey/Makefile.common
diff -r1.45 -r1.45.6.1 pkgsrc/net/mldonkey/distinfo
diff -r1.26 -r1.26.6.1 pkgsrc/net/mldonkey-gui/Makefile
cvs diff -r1.45 -r1.45.16.1 pkgsrc/net/mldonkey/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mldonkey/Attic/Makefile 2007/07/04 20:54:50 1.45
+++ pkgsrc/net/mldonkey/Attic/Makefile 2009/02/26 14:03:28 1.45.16.1
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: Makefile,v 1.45 2007/07/04 20:54:50 jlam Exp $ 1# $NetBSD: Makefile,v 1.45.16.1 2009/02/26 14:03:28 tron Exp $
2# 2#
3 3
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6RCD_SCRIPTS= mldonkey 6RCD_SCRIPTS= mldonkey
7 7
8PKG_GROUPS_VARS+= MLDONKEY_GROUP 8PKG_GROUPS_VARS+= MLDONKEY_GROUP
9PKG_USERS_VARS+= MLDONKEY_USER 9PKG_USERS_VARS+= MLDONKEY_USER
10 10
11BUILD_DEFS+= MLDONKEY_HOME VARBASE 11BUILD_DEFS+= MLDONKEY_HOME VARBASE
12 12
 13INSTALLATION_DIRS= libexec/mldonkey
 14
13OWN_DIRS_PERMS= ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 15OWN_DIRS_PERMS= ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
14OWN_DIRS_PERMS+= ${VARBASE}/log/mldonkey \ 16OWN_DIRS_PERMS+= ${VARBASE}/log/mldonkey \
15 ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 17 ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
16OWN_DIRS_PERMS+= ${VARBASE}/run/mldonkey \ 18OWN_DIRS_PERMS+= ${VARBASE}/run/mldonkey \
17 ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 19 ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
18 20
19PKG_GROUPS= ${MLDONKEY_GROUP} 21PKG_GROUPS= ${MLDONKEY_GROUP}
20PKG_USERS= ${MLDONKEY_USER}:${MLDONKEY_GROUP} 22PKG_USERS= ${MLDONKEY_USER}:${MLDONKEY_GROUP}
21 23
22PKG_GECOS.${MLDONKEY_USER}= Dedicated mldonkey server 24PKG_GECOS.${MLDONKEY_USER}= Dedicated mldonkey server
23PKG_HOME.${MLDONKEY_USER}= ${MLDONKEY_HOME} 25PKG_HOME.${MLDONKEY_USER}= ${MLDONKEY_HOME}
24PKG_SHELL.${MLDONKEY_USER}= ${SH} 26PKG_SHELL.${MLDONKEY_USER}= ${SH}
25 27
26FILES_SUBST+= MLDONKEY_GROUP=${MLDONKEY_GROUP:Q} 28FILES_SUBST+= MLDONKEY_GROUP=${MLDONKEY_GROUP:Q}
27FILES_SUBST+= MLDONKEY_HOME=${MLDONKEY_HOME:Q} 29FILES_SUBST+= MLDONKEY_HOME=${MLDONKEY_HOME:Q}
28FILES_SUBST+= MLDONKEY_USER=${MLDONKEY_USER:Q} 30FILES_SUBST+= MLDONKEY_USER=${MLDONKEY_USER:Q}
29 31
30do-install: 32do-install:
31 ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey 33 ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${DESTDIR}${PREFIX}/libexec/mldonkey
32 ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/libexec/mldonkey 
33 34
34.include "../../converters/libiconv/buildlink3.mk" 35.include "../../converters/libiconv/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.33 -r1.33.6.1 pkgsrc/net/mldonkey/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/mldonkey/Attic/Makefile.common 2008/08/12 17:09:01 1.33
+++ pkgsrc/net/mldonkey/Attic/Makefile.common 2009/02/26 14:03:28 1.33.6.1
@@ -1,32 +1,36 @@ @@ -1,32 +1,36 @@
1# $NetBSD: Makefile.common,v 1.33 2008/08/12 17:09:01 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.33.6.1 2009/02/26 14:03:28 tron Exp $
2# 2#
 3# used by net/mldonkey/Makefile
 4# used by net/mldonkey-gui/Makefile
3 5
4DISTNAME= mldonkey-2.9.6 6DISTNAME= mldonkey-3.0.0
5CATEGORIES= net 7CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mldonkey/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mldonkey/}
7EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
8 10
9MAINTAINER= wiz@NetBSD.org 11MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://www.nongnu.org/mldonkey/ 12HOMEPAGE= http://www.nongnu.org/mldonkey/
11COMMENT= Free peer-to-peer client with eDonkey support and more 13COMMENT= Free peer-to-peer client with eDonkey support and more
12 14
13DISTINFO_FILE= ${.CURDIR}/../../net/mldonkey/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../net/mldonkey/distinfo
14PATCHDIR= ${.CURDIR}/../../net/mldonkey/patches 16PATCHDIR= ${.CURDIR}/../../net/mldonkey/patches
15 17
16GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
17USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
18USE_TOOLS+= gmake perl 20USE_TOOLS+= gmake perl
19 21
 22PKG_DESTDIR_SUPPORT= user-destdir
 23
20CONFIGURE_ENV+= WGET="" 24CONFIGURE_ENV+= WGET=""
21CONFIGURE_ENV+= ac_cv_prog_WGET="no" 25CONFIGURE_ENV+= ac_cv_prog_WGET="no"
22CONFIGURE_ARGS+= --enable-directconnect 26CONFIGURE_ARGS+= --enable-directconnect
23LDFLAGS+= ${PTHREAD_LDFLAGS} 27LDFLAGS+= ${PTHREAD_LDFLAGS}
24MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread} 28MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread}
25CONFIGURE_ARGS+= --enable-pthread-lib 29CONFIGURE_ARGS+= --enable-pthread-lib
26 30
27UNLIMIT_RESOURCES= stacksize 31UNLIMIT_RESOURCES= stacksize
28 32
29PRINT_PLIST_AWK+= /^@dirrm libexec\/mldonkey$$/ \ 33PRINT_PLIST_AWK+= /^@dirrm libexec\/mldonkey$$/ \
30 { print "@unexec $${RMDIR} %D/libexec/mldonkey"\ 34 { print "@unexec $${RMDIR} %D/libexec/mldonkey"\
31 " >/dev/null 2>&1 || $${TRUE}"; next } 35 " >/dev/null 2>&1 || $${TRUE}"; next }
32 36
cvs diff -r1.45 -r1.45.6.1 pkgsrc/net/mldonkey/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mldonkey/Attic/distinfo 2008/08/12 17:09:01 1.45
+++ pkgsrc/net/mldonkey/Attic/distinfo 2009/02/26 14:03:28 1.45.6.1
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.45 2008/08/12 17:09:01 wiz Exp $ 1$NetBSD: distinfo,v 1.45.6.1 2009/02/26 14:03:28 tron Exp $
2 2
3SHA1 (mldonkey-2.9.6.tar.bz2) = 3c52b11e906aa08d1c4132e3bb23756d447f20f9 3SHA1 (mldonkey-3.0.0.tar.bz2) = 8d3f1808578bb145655050c0224f512afe0266b5
4RMD160 (mldonkey-2.9.6.tar.bz2) = f88ca0224e484be67d836038683bcf5c2bb5bac6 4RMD160 (mldonkey-3.0.0.tar.bz2) = c53efda6b513bbfd2dcd71804600b0906252e463
5Size (mldonkey-2.9.6.tar.bz2) = 2718844 bytes 5Size (mldonkey-3.0.0.tar.bz2) = 2723830 bytes
cvs diff -r1.26 -r1.26.6.1 pkgsrc/net/mldonkey-gui/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mldonkey-gui/Attic/Makefile 2008/08/12 17:09:01 1.26
+++ pkgsrc/net/mldonkey-gui/Attic/Makefile 2009/02/26 14:03:28 1.26.6.1
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.26 2008/08/12 17:09:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.26.6.1 2009/02/26 14:03:28 tron Exp $
2# 2#
3 3
4.include "../../net/mldonkey/Makefile.common" 4.include "../../net/mldonkey/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/mldonkey/mldonkey-gui/} 6PKGNAME= ${DISTNAME:S/mldonkey/mldonkey-gui/}
7COMMENT+= (GTK interface) 7COMMENT+= (GTK interface)
8 8
9DEPENDS+= mldonkey-[0-9]*:../../net/mldonkey 9DEPENDS+= mldonkey-[0-9]*:../../net/mldonkey
10 10
11USE_TOOLS+= pkg-config 11USE_TOOLS+= pkg-config
12 12
13PRINT_PLIST_AWK+= /^@dirrm libexec\/mldonkey$$/ \ 13PRINT_PLIST_AWK+= /^@dirrm libexec\/mldonkey$$/ \
14 { print "@comment in mldonkey: " $$0; next } 14 { print "@comment in mldonkey: " $$0; next }
15 15
16INSTALLATION_DIRS= bin 16INSTALLATION_DIRS= bin
17 17
18.include "options.mk" 18.include "options.mk"
19 19
20do-install: 20do-install:
21 ${RM} -f ${PREFIX}/bin/mlgui 21 ${RM} -f ${DESTDIR}${PREFIX}/bin/mlgui
22 cd ${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui 22 cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui
23 ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey 23 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/mldonkey
24 ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/libexec/mldonkey 24 ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${DESTDIR}${PREFIX}/libexec/mldonkey
25 ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${PREFIX}/libexec/mldonkey 25 ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter \
26 ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${PREFIX}/libexec/mldonkey 26 ${DESTDIR}${PREFIX}/libexec/mldonkey
 27 ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui \
 28 ${DESTDIR}${PREFIX}/libexec/mldonkey
27 29
28.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"