message ""WARNING, disabling neon is not recommended and may break
downloading some svn spells."" &&
-optional_depends neon '--with-neon=/usr' '--without-neon' 'for Subversion
client to support DAV' &&
+optional_depends -sub DAV neon "--with-neon=${INSTALL_ROOT}/usr" \
+ "--without-neon" \
+ "for Subversion client to support DAV" &&
optional_depends db '--with-berkeley-db' '--without-berkeley-db' 'for
Berkeley DB backend' &&
optional_depends APACHE2 '--with-apxs' '--without-apxs' 'to create Apache 2
modules' &&
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index b65c311..e1fa559 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
SPELL=subversion
- VERSION=1.6.17
+ VERSION=1.7.5
SECURITY_PATCH=2
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
@@ -10,9 +10,9 @@ if [[ "$SVN_HEAD" == y ]]; then
else
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
- SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
+ SOURCE_URL[0]=http://www.apache.org/dist/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=4E24517C.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=ED1A599C.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/collab/subversion/ED1A599C.gpg b/collab/subversion/ED1A599C.gpg
new file mode 100644
index 0000000..d26579d
Binary files /dev/null and b/collab/subversion/ED1A599C.gpg differ
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 31bc532..3d2186b 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,11 @@
+2012-05-28 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 1.7.5, changed SOURCE_URL[0], use ED1A599C.gpg now
+ for GnuPG checking
+ * DEPENDS: added ${INSTALL_ROOT} in APR, APU zlib and neon, changed
+ quotations need neon with DAV
+ * 4E24517C.gpg: removed
+ * ED1A599C.gpg: added Philip Martin's key
+
2011-10-30 Ladislav Hagara <hgr AT vabo.cz>
* CONFIGURE, DEPENDS, BUILD, INSTALL: JAVA bindings added (javahl)
diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
index 470338c..60ea88e 100755
--- a/crypto/cyrus-sasl/DEPENDS
+++ b/crypto/cyrus-sasl/DEPENDS
@@ -35,10 +35,15 @@ if [[ "$CS_MECH" =~ 'auxprop' ]]; then
gdbm) depends gdbm '--with-dblib=gdbm' ;;
esac &&