UPDATE: subversion 1.6.4

2009-08-09 Thread Steven Mestdagh
security update from maintainer; ignore the previous update and use this
diff instead.

http://subversion.tigris.org/security/CVE-2009-2411-advisory.txt

Index: Makefile
===
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- Makefile22 Jun 2009 17:00:23 -  1.59
+++ Makefile7 Aug 2009 05:19:19 -
@@ -7,13 +7,13 @@
 COMMENT-ap2=   apache2 subversion modules
 COMMENT-gnome-keyring= gnome-keyring support for subversion
 
-VERSION=   1.6.1
+VERSION=   1.6.4
 DISTNAME=  subversion-${VERSION}
 PKGNAME=   ${DISTNAME}
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-perl=  p5-SVN-${VERSION}
 PKGNAME-python=py-subversion-${VERSION}
-PKGNAME-ruby=  ruby-subversion-${VERSION}p0
+PKGNAME-ruby=  ruby-subversion-${VERSION}
 PKGNAME-ap2=   ap2-subversion-${VERSION}
 PKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
 
@@ -37,7 +37,7 @@
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=  ${HOMEPAGE}/tarballs/
+MASTER_SITES=  ${HOMEPAGE}/downloads/
 EXTRACT_SUFX=  .tar.bz2
 
 PSEUDO_FLAVORS=no_bindings no_ap2 no_gnome-keyring
Index: distinfo
===
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo28 Apr 2009 23:43:56 -  1.19
+++ distinfo7 Aug 2009 05:19:19 -
@@ -1,5 +1,5 @@
-MD5 (subversion-1.6.1.tar.bz2) = lXCLlrkg+u/8oBf0Pslndw==
-RMD160 (subversion-1.6.1.tar.bz2) = s8yObPRsjkrUrb7m497Bhq55Alc=
-SHA1 (subversion-1.6.1.tar.bz2) = 3gHv7SVQXWicNppn+/my0vAuR5U=
-SHA256 (subversion-1.6.1.tar.bz2) = 
zdSnpOLG5nlnuZ/nhXpAmy/15XEmIU/cD22DX/eJ5so=
-SIZE (subversion-1.6.1.tar.bz2) = 5462507
+MD5 (subversion-1.6.4.tar.bz2) = EeP6g4yaVYytw3jygHVy4g==
+RMD160 (subversion-1.6.4.tar.bz2) = R+SV0STAoBbUSiZUXqVW3bMPE/s=
+SHA1 (subversion-1.6.4.tar.bz2) = 0EOvxHmtmFsjq+gOlAcpuZ1Os8Q=
+SHA256 (subversion-1.6.4.tar.bz2) = 
fJv25nN8hP43ByBsDKfh4WPPanQXIon4UJNvu8CvDlI=
+SIZE (subversion-1.6.4.tar.bz2) = 5484272
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/devel/subversion/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -r1.2 patch-configure_ac
--- patches/patch-configure_ac  28 Apr 2009 23:43:56 -  1.2
+++ patches/patch-configure_ac  7 Aug 2009 05:19:19 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_ac,v 1.2 2009/04/28 23:43:56 stsp Exp $
 configure.ac.orig  Sat Feb  7 20:46:30 2009
-+++ configure.ac   Thu Feb 19 19:37:20 2009
+$OpenBSD: patch-configure_ac,v 1.1 2008/11/02 20:43:49 steven Exp $
+--- configure.ac.orig  Mon Jun  8 18:33:29 2009
 configure.ac   Thu Aug  6 17:10:17 2009
 @@ -6,7 +6,7 @@ AC_PREREQ(2.58)
  dnl Get the version of Subversion, using m4's esyscmd() command to do this
  dnl at m4-time, since AC_INIT() requires it then.
@@ -15,21 +15,25 @@
  fi
  
 -AC_SUBST([MKDIR], [$INSTALL -d])
-+AC_SUBST([MKDIR], [mkdir -p])
++AC_SUBST([MKDIR], [/bin/mkdir -p])
  
  #  Libraries, for which we may have source to build ==
  
-@@ -447,7 +447,8 @@ if test $enable_nls = yes; then
-[
- AC_MSG_WARN([bindtextdomain() not found.  Disabling NLS.])
+@@ -448,10 +448,13 @@ if test $enable_nls = yes; then
  enable_nls=no
--   ])
-+   ], -liconv)
-+AC_CHECK_LIB(iconv, libiconv_open)
- if test $enable_nls = yes; then
-   AC_DEFINE(ENABLE_NLS, 1,
- [Define to 1 if translation of program messages to the user's
-@@ -749,7 +750,7 @@ AS_HELP_STRING([--enable-gprof],
+])
+ if test $enable_nls = no; then
++  # Destroy the cached result so we can test again
++  unset ac_cv_search_bindtextdomain
+   # On some systems, libintl needs libiconv to link properly,
+   # so try again with -liconv.
+   AC_SEARCH_LIBS(bindtextdomain, [intl],
+  [
++  enable_nls=yes
+   # This is here so that -liconv ends up in LIBS
+   # if it worked with -liconv.
+   AC_CHECK_LIB(iconv, libiconv_open)
+@@ -762,7 +765,7 @@ AS_HELP_STRING([--enable-gprof],
  # Python: Used for testsuite, and bindings
  
  



Re: UPDATE: subversion 1.6.4

2009-08-09 Thread Steven Mestdagh
Steven Mestdagh [2009-08-07, 07:24:15]:
 security update from maintainer; ignore the previous update and use this
 diff instead.

oh and please test with the apr and apr-util updates that were just
committed.