Initial import

6 files changed, 195 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..1910b0141463
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,49 @@
+pkgbase = subversion-1.6
+	pkgdesc = A Modern Concurrent Version Control System
+	pkgver = 1.6.23
+	pkgrel = 3
+	url = http://subversion.apache.org/
+	arch = i686
+	arch = x86_64
+	license = APACHE
+	makedepends = krb5
+	makedepends = python2
+	makedepends = perl
+	makedepends = swig
+	makedepends = java-runtime
+	makedepends = java-environment
+	makedepends = autoconf
+	makedepends = db
+	makedepends = e2fsprogs
+	makedepends = kdelibs
+	makedepends = libgnome-keyring
+	depends = neon
+	depends = apr-util
+	depends = sqlite3
+	depends = file
+	optdepends = bash-completion: for svn bash completion
+	optdepends = python2: for some hook scripts
+	optdepends = ruby: for some hook scripts
+	optdepends = kdebase-runtime: for KWallet for auth credentials
+	optdepends = libgnome-keyring: for GNOME Keyring for auth credentials
+	provides = svn
+	provides = subversion
+	conflicts = svn
+	conflicts = subversion
+	options = !makeflags
+	options = !libtool
+	backup = etc/xinetd.d/svn
+	backup = etc/conf.d/svnserve
+	source = https://archive.apache.org/dist/subversion/subversion-1.6.23.tar.bz2
+	source = svnserve
+	source = svn
+	source = svnserve.conf
+	source = neon.version.fix.patch
+	md5sums = 5d621281ce9d3448e1437cb006331f57
+	md5sums = a2b029e8385007ffb99b437b30521c90
+	md5sums = a0db6dd43af33952739b6ec089852630
+	md5sums = c459e299192552f61578f3438abf0664
+	md5sums = 9f2f0f25d6b5cb485f6a72aad928dbc7
+
+pkgname = subversion-1.6
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..3b3a7fe6693d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer: sLite (daniel@slite.org)
+# Contributor: Paul Mattal <paul@archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
+
+pkgname=subversion-1.6
+_pkgname=subversion
+pkgver=1.6.23
+pkgrel=3
+pkgdesc="A Modern Concurrent Version Control System"
+arch=('i686' 'x86_64')
+license=('APACHE')
+depends=('neon' 'apr-util' 'sqlite3' 'file')
+optdepends=('bash-completion: for svn bash completion' \
+            'python2: for some hook scripts' 'ruby: for some hook scripts' 'kdebase-runtime: for KWallet for auth credentials' 'libgnome-keyring: for GNOME Keyring for auth credentials')
+makedepends=('krb5' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
+             'autoconf' 'db' 'e2fsprogs' 'kdelibs' 'libgnome-keyring')
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+url="http://subversion.apache.org/"
+provides=('svn' 'subversion')
+conflicts=('svn' 'subversion')
+options=('!makeflags' '!libtool')
+source=(https://archive.apache.org/dist/subversion/$_pkgname-$pkgver.tar.bz2
+        svnserve svn svnserve.conf neon.version.fix.patch)
+md5sums=('5d621281ce9d3448e1437cb006331f57'
+         'a2b029e8385007ffb99b437b30521c90'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664'
+         '9f2f0f25d6b5cb485f6a72aad928dbc7')
+
+build() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+   export PYTHON=/usr/bin/python2
+
+   patch -Np1 -i ../neon.version.fix.patch
+
+   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
+
+   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+               --with-zlib=/usr --with-neon=/usr --without-apxs \
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
+               --enable-javahl --with-gnome-keyring --with-kwallet
+
+   make external-all
+   make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
+   make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py javahl # swig-rb
+}
+
+package() {
+   cd "${srcdir}/${_pkgname}-${pkgver}"
+
+   export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH
+   make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
+     swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+     install install-swig-py install-javahl # install-swig-rb
+
+   install -d "${pkgdir}"/usr/share/subversion
+   cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
+   rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
+
+   rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+   rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
+
+   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
+   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
+   install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
+
+   # bash completion
+   install -Dm 644 tools/client-side/bash_completion \
+     "${pkgdir}"/etc/bash_completion.d/subversion
+}
diff --git a/neon.version.fix.patch b/neon.version.fix.patch
new file mode 100644
index 000000000000..a8d09c2a27b5
--- /dev/null
+++ b/neon.version.fix.patch
@@ -0,0 +1,14 @@
+diff -aur subversion-1.6.17/configure subversion-1.6.17-patched/configure
+--- subversion-1.6.17/configure	2014-08-29 10:56:04.195937000 +0200
++++ subversion-1.6.17-patched/configure	2014-08-29 10:59:02.868437787 +0200
+@@ -5171,8 +5171,8 @@
+ 
+ # Either a space-separated list of allowable Neon versions, or "any" to
+ # mean allow anything.
+-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
+-NEON_RECOMMENDED_VER="0.29.0"
++NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29 0\.30"
++NEON_RECOMMENDED_VER="0.30.0"
+ NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
+ # Check whether --enable-neon-version-check was given.
+ if test "${enable_neon_version_check+set}" = set; then :
diff --git a/svn b/svn
new file mode 100644
index 000000000000..8988aaf63b59
--- /dev/null
+++ b/svn
@@ -0,0 +1,11 @@
+service svn
+{
+	flags			= REUSE
+	socket_type		= stream
+	wait			= no
+	user			= root
+	server			= /usr/bin/svnserve
+	server_args		= -i
+	log_on_failure		+= USERID
+	disable			= yes
+}
diff --git a/svnserve b/svnserve
new file mode 100644
index 000000000000..670fee742afa
--- /dev/null
+++ b/svnserve
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/svnserve
+
+PID=`pidof -o %PPID /usr/bin/svnserve`
+case "$1" in
+  start)
+    stat_busy "Starting svnserve"
+    if [ -z "$PID" ]; then 
+      if [ -n "$SVNSERVE_USER" ]; then
+        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
+      else
+        /usr/bin/svnserve -d $SVNSERVE_ARGS &
+      fi
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon svnserve
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping svnserve"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon svnserve
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
diff --git a/svnserve.conf b/svnserve.conf
new file mode 100644
index 000000000000..37fb7ea10500
--- /dev/null
+++ b/svnserve.conf
@@ -0,0 +1,7 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
+
+#SVNSERVE_USER="svn"