summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz>2009-02-24 22:50:45 +0000
committerwiz <wiz>2009-02-24 22:50:45 +0000
commit1347b24f51e29fbf00c45077e03b1ace3d3bd1fc (patch)
tree824d03c370c3b8757d2908467356f6f8e82572fc /net
parent6f66731b1ae4c98dc4e05859d212d54d2bfba7b7 (diff)
downloadpkgsrc-1347b24f51e29fbf00c45077e03b1ace3d3bd1fc.tar.gz
Add patch fixing security problem from upstream.
Bump PKGREVISION.
Diffstat (limited to 'net')
-rw-r--r--net/mldonkey/Makefile4
-rw-r--r--net/mldonkey/distinfo3
-rw-r--r--net/mldonkey/patches/patch-aa26
3 files changed, 31 insertions, 2 deletions
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index a309d540d6e..0af3e51fb76 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.46 2009/02/16 13:11:40 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2009/02/24 22:50:45 wiz Exp $
#
.include "Makefile.common"
+PKGREVISION= 1
+
RCD_SCRIPTS= mldonkey
PKG_GROUPS_VARS+= MLDONKEY_GROUP
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 7b0c5d29935..2b3514ef070 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.46 2009/01/24 12:59:28 wiz Exp $
+$NetBSD: distinfo,v 1.47 2009/02/24 22:50:45 wiz Exp $
SHA1 (mldonkey-2.9.7.tar.bz2) = 59f3e07b85ce05d54cbe2ef5400d47e558d2f250
RMD160 (mldonkey-2.9.7.tar.bz2) = 29083fcc611851f55df7739a463cf91f200ae9d8
Size (mldonkey-2.9.7.tar.bz2) = 2720793 bytes
+SHA1 (patch-aa) = 5ae1cd638c0b733e8dd1b40631a8428f3733bf3d
diff --git a/net/mldonkey/patches/patch-aa b/net/mldonkey/patches/patch-aa
new file mode 100644
index 00000000000..b28d9633331
--- /dev/null
+++ b/net/mldonkey/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.15 2009/02/24 22:50:45 wiz Exp $
+
+https://savannah.nongnu.org/bugs/download.php?file_id=17518
+
+--- src/utils/lib/url.ml.orig 2007-03-17 18:49:32.000000000 +0000
++++ src/utils/lib/url.ml
+@@ -175,6 +175,19 @@ let put_args s args =
+ Buffer.contents res
+
+ let of_string ?(args=[]) s =
++ let remove_leading_slashes s =
++ let len = String.length s in
++ let left =
++ let rec aux i =
++ if i < len && s.[i] = '/' then aux (i+1) else i in
++ aux 0 in
++ if left = 0 then s
++ else
++ String.sub s left (len - left) in
++
++ (* redefine s to remove all leading slashes *)
++ let s = remove_leading_slashes s in
++
+ let s = put_args s args in
+ let url =
+ let get_two init_pos =