Date: Tuesday, May 14, 2013 @ 01:45:05 Author: stephane Revision: 185410
archrelease: copy trunk to testing-i686, testing-x86_64 Added: subversion/repos/testing-i686/PKGBUILD (from rev 185409, subversion/trunk/PKGBUILD) subversion/repos/testing-i686/subversion.install (from rev 185409, subversion/trunk/subversion.install) subversion/repos/testing-i686/subversion.rpath.fix.patch (from rev 185409, subversion/trunk/subversion.rpath.fix.patch) subversion/repos/testing-i686/svn (from rev 185409, subversion/trunk/svn) subversion/repos/testing-i686/svnserve.conf (from rev 185409, subversion/trunk/svnserve.conf) subversion/repos/testing-i686/svnserve.service (from rev 185409, subversion/trunk/svnserve.service) subversion/repos/testing-i686/svnserve.tmpfiles (from rev 185409, subversion/trunk/svnserve.tmpfiles) subversion/repos/testing-x86_64/PKGBUILD (from rev 185409, subversion/trunk/PKGBUILD) subversion/repos/testing-x86_64/subversion.install (from rev 185409, subversion/trunk/subversion.install) subversion/repos/testing-x86_64/subversion.rpath.fix.patch (from rev 185409, subversion/trunk/subversion.rpath.fix.patch) subversion/repos/testing-x86_64/svn (from rev 185409, subversion/trunk/svn) subversion/repos/testing-x86_64/svnserve.conf (from rev 185409, subversion/trunk/svnserve.conf) subversion/repos/testing-x86_64/svnserve.service (from rev 185409, subversion/trunk/svnserve.service) subversion/repos/testing-x86_64/svnserve.tmpfiles (from rev 185409, subversion/trunk/svnserve.tmpfiles) Deleted: subversion/repos/testing-i686/PKGBUILD subversion/repos/testing-i686/subversion.install subversion/repos/testing-i686/subversion.rpath.fix.patch subversion/repos/testing-i686/svn subversion/repos/testing-i686/svnserve subversion/repos/testing-i686/svnserve.conf subversion/repos/testing-i686/svnserve.service subversion/repos/testing-i686/svnserve.tmpfiles subversion/repos/testing-x86_64/PKGBUILD subversion/repos/testing-x86_64/subversion.install subversion/repos/testing-x86_64/subversion.rpath.fix.patch subversion/repos/testing-x86_64/svn subversion/repos/testing-x86_64/svnserve subversion/repos/testing-x86_64/svnserve.conf subversion/repos/testing-x86_64/svnserve.service subversion/repos/testing-x86_64/svnserve.tmpfiles -------------------------------------------+ /PKGBUILD | 184 ++++++++++++++++++++++++++++ /subversion.install | 14 ++ /subversion.rpath.fix.patch | 20 +++ /svn | 22 +++ /svnserve.conf | 14 ++ /svnserve.service | 22 +++ /svnserve.tmpfiles | 2 testing-i686/PKGBUILD | 96 -------------- testing-i686/subversion.install | 7 - testing-i686/subversion.rpath.fix.patch | 10 - testing-i686/svn | 11 - testing-i686/svnserve | 42 ------ testing-i686/svnserve.conf | 7 - testing-i686/svnserve.service | 11 - testing-i686/svnserve.tmpfiles | 1 testing-x86_64/PKGBUILD | 96 -------------- testing-x86_64/subversion.install | 7 - testing-x86_64/subversion.rpath.fix.patch | 10 - testing-x86_64/svn | 11 - testing-x86_64/svnserve | 42 ------ testing-x86_64/svnserve.conf | 7 - testing-x86_64/svnserve.service | 11 - testing-x86_64/svnserve.tmpfiles | 1 23 files changed, 278 insertions(+), 370 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/PKGBUILD 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,96 +0,0 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Paul Mattal <p...@archlinux.org> -# Contributor: Jason Chu <ja...@archlinux.org> - -pkgname=subversion -pkgver=1.7.9 -pkgrel=2 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool' '!emptydirs') -install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} - svnserve - svn - svnserve.conf - svnserve.tmpfiles - svnserve.service - subversion.rpath.fix.patch) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python2 - - patch -Np0 -i ../subversion.rpath.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 --with-serf=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet \ - --disable-static - - 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 swig-pl javahl #swig-rb -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-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-swig-pl install-javahl #install-swig-rb - - install -dm755 "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - - ## svnserve ... - - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - - # ... systemd - install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service - install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf - - # ... common config - install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - - install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/usr/share/bash-completion/completions/subversion - for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do - ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} - done -} -md5sums=('8d532025771a67c06c23f299699f056f' - 'a2b029e8385007ffb99b437b30521c90' - 'a0db6dd43af33952739b6ec089852630' - 'c459e299192552f61578f3438abf0664' - 'bb2857eceafcfac35dde39dcffad2314' - 'e8020c7a1d1a0c47091b5fdd034f81c5' - '6b4340ba9d8845cd8497e013ae01be3f') Copied: subversion/repos/testing-i686/PKGBUILD (from rev 185409, subversion/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,92 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=subversion +pkgver=1.7.9 +pkgrel=3 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('APACHE') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ + 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool' '!emptydirs') +install=${pkgname}.install +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} + svn + svnserve.conf + svnserve.tmpfiles + svnserve.service + subversion.rpath.fix.patch) +md5sums=('8d532025771a67c06c23f299699f056f' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PYTHON=/usr/bin/python2 + + patch -Np0 -i ../subversion.rpath.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 --with-serf=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ + --enable-javahl --with-gnome-keyring --with-kwallet \ + --disable-static + + 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 swig-pl javahl #swig-rb +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-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-swig-pl install-javahl #install-swig-rb + + install -dm755 "${pkgdir}"/usr/share/subversion + cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ + rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in + + rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -r "${pkgdir}"/usr/lib/perl5/core_perl + + ## svnserve ... + + # xinetd + install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + + # ... systemd + install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service + install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf + + # ... common config + install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve + + install -Dm 644 tools/client-side/bash_completion \ + "${pkgdir}"/usr/share/bash-completion/completions/subversion + for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do + ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} + done +} Deleted: testing-i686/subversion.install =================================================================== --- testing-i686/subversion.install 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/subversion.install 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,7 +0,0 @@ -post_install() { - usr/bin/systemd-tmpfiles --create svnserve.conf || true -} - -post_upgrade() { - post_install -} Copied: subversion/repos/testing-i686/subversion.install (from rev 185409, subversion/trunk/subversion.install) =================================================================== --- testing-i686/subversion.install (rev 0) +++ testing-i686/subversion.install 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,7 @@ +post_install() { + usr/bin/systemd-tmpfiles --create svnserve.conf || true +} + +post_upgrade() { + post_install +} Deleted: testing-i686/subversion.rpath.fix.patch =================================================================== --- testing-i686/subversion.rpath.fix.patch 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/subversion.rpath.fix.patch 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile Copied: subversion/repos/testing-i686/subversion.rpath.fix.patch (from rev 185409, subversion/trunk/subversion.rpath.fix.patch) =================================================================== --- testing-i686/subversion.rpath.fix.patch (rev 0) +++ testing-i686/subversion.rpath.fix.patch 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile Deleted: testing-i686/svn =================================================================== --- testing-i686/svn 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/svn 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} Copied: subversion/repos/testing-i686/svn (from rev 185409, subversion/trunk/svn) =================================================================== --- testing-i686/svn (rev 0) +++ testing-i686/svn 2013-05-13 23:45:05 UTC (rev 185410) @@ -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 +} Deleted: testing-i686/svnserve =================================================================== --- testing-i686/svnserve 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/svnserve 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,42 +0,0 @@ -#!/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 Deleted: testing-i686/svnserve.conf =================================================================== --- testing-i686/svnserve.conf 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/svnserve.conf 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" Copied: subversion/repos/testing-i686/svnserve.conf (from rev 185409, subversion/trunk/svnserve.conf) =================================================================== --- testing-i686/svnserve.conf (rev 0) +++ testing-i686/svnserve.conf 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" Deleted: testing-i686/svnserve.service =================================================================== --- testing-i686/svnserve.service 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/svnserve.service 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,11 +0,0 @@ -[Unit] -Description=Subversion protocol daemon -After=syslog.target network.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/svnserve -ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS - -[Install] -WantedBy=multi-user.target Copied: subversion/repos/testing-i686/svnserve.service (from rev 185409, subversion/trunk/svnserve.service) =================================================================== --- testing-i686/svnserve.service (rev 0) +++ testing-i686/svnserve.service 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,11 @@ +[Unit] +Description=Subversion protocol daemon +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/svnserve +ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS + +[Install] +WantedBy=multi-user.target Deleted: testing-i686/svnserve.tmpfiles =================================================================== --- testing-i686/svnserve.tmpfiles 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-i686/svnserve.tmpfiles 2013-05-13 23:45:05 UTC (rev 185410) @@ -1 +0,0 @@ -D /run/svnserve 0700 root root - Copied: subversion/repos/testing-i686/svnserve.tmpfiles (from rev 185409, subversion/trunk/svnserve.tmpfiles) =================================================================== --- testing-i686/svnserve.tmpfiles (rev 0) +++ testing-i686/svnserve.tmpfiles 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1 @@ +D /run/svnserve 0700 root root - Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/PKGBUILD 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,96 +0,0 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Paul Mattal <p...@archlinux.org> -# Contributor: Jason Chu <ja...@archlinux.org> - -pkgname=subversion -pkgver=1.7.9 -pkgrel=2 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool' '!emptydirs') -install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} - svnserve - svn - svnserve.conf - svnserve.tmpfiles - svnserve.service - subversion.rpath.fix.patch) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python2 - - patch -Np0 -i ../subversion.rpath.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 --with-serf=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet \ - --disable-static - - 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 swig-pl javahl #swig-rb -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-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-swig-pl install-javahl #install-swig-rb - - install -dm755 "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - - ## svnserve ... - - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - - # ... systemd - install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service - install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf - - # ... common config - install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - - install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/usr/share/bash-completion/completions/subversion - for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do - ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} - done -} -md5sums=('8d532025771a67c06c23f299699f056f' - 'a2b029e8385007ffb99b437b30521c90' - 'a0db6dd43af33952739b6ec089852630' - 'c459e299192552f61578f3438abf0664' - 'bb2857eceafcfac35dde39dcffad2314' - 'e8020c7a1d1a0c47091b5fdd034f81c5' - '6b4340ba9d8845cd8497e013ae01be3f') Copied: subversion/repos/testing-x86_64/PKGBUILD (from rev 185409, subversion/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,92 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Jason Chu <ja...@archlinux.org> + +pkgname=subversion +pkgver=1.7.9 +pkgrel=3 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('APACHE') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ + 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool' '!emptydirs') +install=${pkgname}.install +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} + svn + svnserve.conf + svnserve.tmpfiles + svnserve.service + subversion.rpath.fix.patch) +md5sums=('8d532025771a67c06c23f299699f056f' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PYTHON=/usr/bin/python2 + + patch -Np0 -i ../subversion.rpath.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 --with-serf=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ + --enable-javahl --with-gnome-keyring --with-kwallet \ + --disable-static + + 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 swig-pl javahl #swig-rb +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-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-swig-pl install-javahl #install-swig-rb + + install -dm755 "${pkgdir}"/usr/share/subversion + cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ + rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in + + rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -r "${pkgdir}"/usr/lib/perl5/core_perl + + ## svnserve ... + + # xinetd + install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + + # ... systemd + install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service + install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf + + # ... common config + install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve + + install -Dm 644 tools/client-side/bash_completion \ + "${pkgdir}"/usr/share/bash-completion/completions/subversion + for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do + ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} + done +} Deleted: testing-x86_64/subversion.install =================================================================== --- testing-x86_64/subversion.install 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/subversion.install 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,7 +0,0 @@ -post_install() { - usr/bin/systemd-tmpfiles --create svnserve.conf || true -} - -post_upgrade() { - post_install -} Copied: subversion/repos/testing-x86_64/subversion.install (from rev 185409, subversion/trunk/subversion.install) =================================================================== --- testing-x86_64/subversion.install (rev 0) +++ testing-x86_64/subversion.install 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,7 @@ +post_install() { + usr/bin/systemd-tmpfiles --create svnserve.conf || true +} + +post_upgrade() { + post_install +} Deleted: testing-x86_64/subversion.rpath.fix.patch =================================================================== --- testing-x86_64/subversion.rpath.fix.patch 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/subversion.rpath.fix.patch 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile Copied: subversion/repos/testing-x86_64/subversion.rpath.fix.patch (from rev 185409, subversion/trunk/subversion.rpath.fix.patch) =================================================================== --- testing-x86_64/subversion.rpath.fix.patch (rev 0) +++ testing-x86_64/subversion.rpath.fix.patch 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile Deleted: testing-x86_64/svn =================================================================== --- testing-x86_64/svn 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/svn 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} Copied: subversion/repos/testing-x86_64/svn (from rev 185409, subversion/trunk/svn) =================================================================== --- testing-x86_64/svn (rev 0) +++ testing-x86_64/svn 2013-05-13 23:45:05 UTC (rev 185410) @@ -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 +} Deleted: testing-x86_64/svnserve =================================================================== --- testing-x86_64/svnserve 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/svnserve 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,42 +0,0 @@ -#!/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 Deleted: testing-x86_64/svnserve.conf =================================================================== --- testing-x86_64/svnserve.conf 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/svnserve.conf 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" Copied: subversion/repos/testing-x86_64/svnserve.conf (from rev 185409, subversion/trunk/svnserve.conf) =================================================================== --- testing-x86_64/svnserve.conf (rev 0) +++ testing-x86_64/svnserve.conf 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" Deleted: testing-x86_64/svnserve.service =================================================================== --- testing-x86_64/svnserve.service 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/svnserve.service 2013-05-13 23:45:05 UTC (rev 185410) @@ -1,11 +0,0 @@ -[Unit] -Description=Subversion protocol daemon -After=syslog.target network.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/svnserve -ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS - -[Install] -WantedBy=multi-user.target Copied: subversion/repos/testing-x86_64/svnserve.service (from rev 185409, subversion/trunk/svnserve.service) =================================================================== --- testing-x86_64/svnserve.service (rev 0) +++ testing-x86_64/svnserve.service 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1,11 @@ +[Unit] +Description=Subversion protocol daemon +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/svnserve +ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS + +[Install] +WantedBy=multi-user.target Deleted: testing-x86_64/svnserve.tmpfiles =================================================================== --- testing-x86_64/svnserve.tmpfiles 2013-05-13 23:14:47 UTC (rev 185409) +++ testing-x86_64/svnserve.tmpfiles 2013-05-13 23:45:05 UTC (rev 185410) @@ -1 +0,0 @@ -D /run/svnserve 0700 root root - Copied: subversion/repos/testing-x86_64/svnserve.tmpfiles (from rev 185409, subversion/trunk/svnserve.tmpfiles) =================================================================== --- testing-x86_64/svnserve.tmpfiles (rev 0) +++ testing-x86_64/svnserve.tmpfiles 2013-05-13 23:45:05 UTC (rev 185410) @@ -0,0 +1 @@ +D /run/svnserve 0700 root root -