[arch-commits] CVS update of extra/devel/subversion (4 files)
Jason Chu
jason at archlinux.org
Sun Mar 30 20:25:41 UTC 2008
Date: Sunday, March 30, 2008 @ 16:25:41
Author: jason
Path: /home/cvs-extra/extra/devel/subversion
Modified: PKGBUILD (1.84 -> 1.85) subversion-neon.patch (1.2 -> 1.3)
svnserve (1.1 -> 1.2) svnserve.conf (1.1 -> 1.2)
upgpkg: subversion 1.4.6-1
-----------------------+
PKGBUILD | 44 +++++++++++++----------------------
subversion-neon.patch | 59 +++++++++++++++++++++++++++++++-----------------
svnserve | 6 ++++
svnserve.conf | 1
4 files changed, 62 insertions(+), 48 deletions(-)
Index: extra/devel/subversion/PKGBUILD
diff -u extra/devel/subversion/PKGBUILD:1.84 extra/devel/subversion/PKGBUILD:1.85
--- extra/devel/subversion/PKGBUILD:1.84 Fri Feb 8 02:20:20 2008
+++ extra/devel/subversion/PKGBUILD Sun Mar 30 16:25:40 2008
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD,v 1.84 2008/02/08 07:20:20 simo Exp $
+# $Id: PKGBUILD,v 1.85 2008/03/30 20:25:40 jason Exp $
# Contributer: Jason Chu <jason at archlinux.org>
# Maintainer: Jason Chu <jason at archlinux.org>
pkgname=subversion
-pkgver=1.4.5
-pkgrel=4
+pkgver=1.4.6
+pkgrel=1
pkgdesc="Replacement for CVS, another versioning system (svn)"
arch=(i686 x86_64)
-license=('APACHE' 'BSD')
-depends=('neon>=0.27.0-2' 'apr-util>=1.2.7-2')
+license=('apache' 'bsd')
+depends=('neon>=0.27.2-1' 'apr-util>=1.2.12-1')
makedepends=('heimdal>=1.0.1' 'db>=4.6' 'apache' 'python>=2.5'
'perl>=5.10.0' 'swig>=1.3.27' 'jdk' 'jre' 'ruby'
'autoconf')
source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
svnserve svn svnserve.conf subversion-neon.patch)
+md5sums=('32786fe2f322982c0567346de18f6460'
+ 'c5a2e490b3e58c6bd2ca3a2e72b71845'
+ 'a0db6dd43af33952739b6ec089852630'
+ 'c459e299192552f61578f3438abf0664'
+ 'f869289684b394840e10908c89460303')
backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
url="http://subversion.tigris.org/"
provides=('svn')
-options=('!makeflags')
-md5sums=('3caf1d93e13ed09d76c42eff0f52dfaf'
- '22d452e0de5168d56c438d99c7ad72fa'
- 'a0db6dd43af33952739b6ec089852630'
- 'c0001ceb13418a065915e27dfdf592c0'
- '00cd1570a3731f984c2bbda95b094ebe')
+options=('!makeflags' 'libtool')
build() {
cd $startdir/src/${pkgname}-${pkgver}
@@ -29,26 +29,16 @@
[ -z "${J2REDIR}" ] && . /etc/profile.d/jre.sh
[ -z "${J2SDKDIR}" ] && . /etc/profile.d/jdk.sh
-# export LDFLAGS="-L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_client/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_delta/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_fs/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_fs_base/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_fs_fs/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_repos/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_ra_svn/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_ra/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_ra_dav/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_ra_local/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_subr/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_diff/.libs \
-# -L$startdir/src/${pkgname}-${pkgver}/${pkgname}/libsvn_wc/.libs"
-
+ # patch from gentoo
patch -Np1 -i $startdir/src/subversion-neon.patch
+
+ sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1"/' -i configure.in
+
+ libtoolize --force --copy
aclocal -I build/ac-macros
autoconf
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr --with-zlib --with-neon=/usr --with-apxs --enable-javahl --with-jdk=/opt/java
- #sed -i 's|-ldb-4.2|-ldb-4.4|' Makefile
- #make DESTDIR=$startdir/pkg || return 1
+
(make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1
export LD_LIBRARY_PATH=$startdir/pkg/usr/lib:$LD_LIBRARY_PATH
Index: extra/devel/subversion/subversion-neon.patch
diff -u extra/devel/subversion/subversion-neon.patch:1.2 extra/devel/subversion/subversion-neon.patch:1.3
--- extra/devel/subversion/subversion-neon.patch:1.2 Fri Feb 8 02:20:20 2008
+++ extra/devel/subversion/subversion-neon.patch Sun Mar 30 16:25:40 2008
@@ -1,43 +1,62 @@
-diff -Nur subversion-1.4.4.orig/build/ac-macros/neon.m4 subversion-1.4.4/build/ac-macros/neon.m4
---- subversion-1.4.4.orig/build/ac-macros/neon.m4 2006-10-21 01:44:09.000000000 +0200
-+++ subversion-1.4.4/build/ac-macros/neon.m4 2007-08-26 11:24:01.000000000 +0200
-@@ -50,11 +50,11 @@
+Index: subversion-1.4.6/build/ac-macros/neon.m4
+===================================================================
+--- subversion-1.4.6.orig/build/ac-macros/neon.m4
++++ subversion-1.4.6/build/ac-macros/neon.m4
+@@ -50,14 +50,18 @@ AC_DEFUN(SVN_LIB_NEON,
NEON_VERSION=`cat $abs_srcdir/neon/.version`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
-+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[567]]\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
[Define to 1 if you have Neon 0.25 or later.])
fi
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[67]]\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
[Define to 1 if you have Neon 0.26 or later.])
fi
-@@ -127,11 +127,11 @@
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
++ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
++ [Define to 1 if you have Neon 0.27 or later.])
++ fi
+
+ for svn_allowed_neon in $NEON_ALLOWED_LIST; do
+ if test "$NEON_VERSION" = "$svn_allowed_neon" ||
+@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG,
NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
-+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[567]]\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
[Define to 1 if you have Neon 0.25 or later.])
fi
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[67]]\.'`" ; then
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
[Define to 1 if you have Neon 0.26 or later.])
fi
-diff -Nur subversion-1.4.4.orig/configure.in subversion-1.4.4/configure.in
---- subversion-1.4.4.orig/configure.in 2007-01-01 15:41:51.000000000 +0100
-+++ subversion-1.4.4/configure.in 2007-08-26 11:23:06.000000000 +0200
-@@ -69,7 +69,7 @@
++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
++ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
++ [Define to 1 if you have Neon 0.27 or later.])
++ fi
+
+ for svn_allowed_neon in $NEON_ALLOWED_LIST; do
+ if test "$NEON_VERSION" = "$svn_allowed_neon" ||
+Index: subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+===================================================================
+--- subversion-1.4.6.orig/subversion/libsvn_ra_dav/session.c
++++ subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+@@ -575,7 +575,11 @@ typedef struct neonprogress_baton_t
+ } neonprogress_baton_t;
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.27.0 0.27.1 0.27.2"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- dnl You can skip the neon version check only if you know what you are doing
+ static void
++#ifdef SVN_NEON_0_27
++ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total)
++#else
+ ra_dav_neonprogress(void *baton, off_t progress, off_t total)
++#endif /* SVN_NEON_0_27 */
+ {
+ const neonprogress_baton_t *neonprogress_baton = baton;
+ if (neonprogress_baton->progress_func)
Index: extra/devel/subversion/svnserve
diff -u extra/devel/subversion/svnserve:1.1 extra/devel/subversion/svnserve:1.2
--- extra/devel/subversion/svnserve:1.1 Thu Jun 10 17:07:30 2004
+++ extra/devel/subversion/svnserve Sun Mar 30 16:25:40 2008
@@ -9,7 +9,11 @@
start)
stat_busy "Starting svnserve"
if [ -z "$PID" ]; then
- /usr/bin/svnserve -d $SVNSERVE_ARGS &
+ if [ -n "$SVNSERVE_USER" ]; then
+ su $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
Index: extra/devel/subversion/svnserve.conf
diff -u extra/devel/subversion/svnserve.conf:1.1 extra/devel/subversion/svnserve.conf:1.2
--- extra/devel/subversion/svnserve.conf:1.1 Thu Jun 10 17:07:30 2004
+++ extra/devel/subversion/svnserve.conf Sun Mar 30 16:25:40 2008
@@ -4,3 +4,4 @@
#SVNSERVE_ARGS="-r /path/to/some/repos"
SVNSERVE_ARGS=""
+#SVNSERVE_USER="svn"
More information about the arch-commits
mailing list