summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2004-07-26 07:29:30 +0000
committeragc <agc>2004-07-26 07:29:30 +0000
commit2e8d812ba75ba885fb8ee1211a35ef39c93b40db (patch)
tree579c63b08dcb4ce07eddeefe264251a4c6b75774
parentd920e81373d85951a7c002e4f9bb8cf17badaace (diff)
downloadpkgsrc-2e8d812ba75ba885fb8ee1211a35ef39c93b40db.tar.gz
Pullup ticket 64 to the pkgsrc-2004Q2 branch, requested by Matthias Scheler
Security fix for samba 3.0 Module Name: pkgsrc Committed By: tron Date: Fri Jul 23 15:11:30 UTC 2004 Modified Files: pkgsrc/net/samba: Makefile distinfo Log Message: Update "samba" package to version 3.0.5. This version fixes the security problems described in CAN-2004-0600 and CAN-2004-0686.
-rw-r--r--doc/CHANGES-pkgsrc-2004Q25
-rw-r--r--net/samba/Makefile6
-rw-r--r--net/samba/distinfo6
3 files changed, 10 insertions, 7 deletions
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2
index d139613622c..1975022263a 100644
--- a/doc/CHANGES-pkgsrc-2004Q2
+++ b/doc/CHANGES-pkgsrc-2004Q2
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.29 2004/07/26 07:22:52 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.30 2004/07/26 07:29:30 agc Exp $
Changes to the packages collection and infrastructure on the
pkgsrc-2004Q2 branch:
@@ -54,3 +54,6 @@ Pullup ticket 62, requested by Grant Beattie [agc 2004-07-20]
Security fix for apache and ap-ssl
Pullup ticket 63, requested by Grant Beattie [agc 2004-07-26]
Complete ticket 57 - security fix for apache2
+Pullup ticket 64, requested by Matthias Scheler [agc 2004-07-26]
+ Security fix for samba 3.0
+
diff --git a/net/samba/Makefile b/net/samba/Makefile
index ffecb2f0d61..56e86f657b3 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.122 2004/05/13 06:44:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.122.2.1 2004/07/26 07:29:30 agc Exp $
-DISTNAME= samba-3.0.4
+DISTNAME= samba-3.0.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
ftp://samba.anu.edu.au/pub/samba/ \
ftp://ftp.sunet.se/pub/unix/utilities/samba/
-COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6
+COUNTRY_MIRRORS= au1 ca fi fr it pl ru sg se us1 us6
.for COUNTRY in ${COUNTRY_MIRRORS}
MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/
.endfor
diff --git a/net/samba/distinfo b/net/samba/distinfo
index d9d552af436..2fe354acad9 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.33 2004/05/13 06:44:56 xtraeme Exp $
+$NetBSD: distinfo,v 1.33.2.1 2004/07/26 07:29:30 agc Exp $
-SHA1 (samba-3.0.4.tar.gz) = 1c7be860ad4e27f52076888f755ce72598f946d3
-Size (samba-3.0.4.tar.gz) = 15046252 bytes
+SHA1 (samba-3.0.5.tar.gz) = 15ca6660b385b936192b43a8da18dc625d7979bf
+Size (samba-3.0.5.tar.gz) = 15076996 bytes
SHA1 (patch-aa) = 26698e5f98fca1bf3632809e2886f7a880c02117
SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644
SHA1 (patch-ad) = b75770eb6fc7ff5d26764fced83e26fd6cf153af