[arch-commits] Commit in subversion/repos (16 files)

Andreas Radke andyrtr at nymeria.archlinux.org
Wed Aug 7 18:08:44 UTC 2013


    Date: Wednesday, August 7, 2013 @ 20:08:44
  Author: andyrtr
Revision: 192210

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  subversion/repos/staging-i686/
  subversion/repos/staging-i686/PKGBUILD
    (from rev 192209, subversion/trunk/PKGBUILD)
  subversion/repos/staging-i686/subversion.install
    (from rev 192209, subversion/trunk/subversion.install)
  subversion/repos/staging-i686/subversion.rpath.fix.patch
    (from rev 192209, subversion/trunk/subversion.rpath.fix.patch)
  subversion/repos/staging-i686/svn
    (from rev 192209, subversion/trunk/svn)
  subversion/repos/staging-i686/svnserve.conf
    (from rev 192209, subversion/trunk/svnserve.conf)
  subversion/repos/staging-i686/svnserve.service
    (from rev 192209, subversion/trunk/svnserve.service)
  subversion/repos/staging-i686/svnserve.tmpfiles
    (from rev 192209, subversion/trunk/svnserve.tmpfiles)
  subversion/repos/staging-x86_64/
  subversion/repos/staging-x86_64/PKGBUILD
    (from rev 192209, subversion/trunk/PKGBUILD)
  subversion/repos/staging-x86_64/subversion.install
    (from rev 192209, subversion/trunk/subversion.install)
  subversion/repos/staging-x86_64/subversion.rpath.fix.patch
    (from rev 192209, subversion/trunk/subversion.rpath.fix.patch)
  subversion/repos/staging-x86_64/svn
    (from rev 192209, subversion/trunk/svn)
  subversion/repos/staging-x86_64/svnserve.conf
    (from rev 192209, subversion/trunk/svnserve.conf)
  subversion/repos/staging-x86_64/svnserve.service
    (from rev 192209, subversion/trunk/svnserve.service)
  subversion/repos/staging-x86_64/svnserve.tmpfiles
    (from rev 192209, subversion/trunk/svnserve.tmpfiles)

-------------------------------------------+
 staging-i686/PKGBUILD                     |  100 ++++++++++++++++++++++++++++
 staging-i686/subversion.install           |    7 +
 staging-i686/subversion.rpath.fix.patch   |   10 ++
 staging-i686/svn                          |   11 +++
 staging-i686/svnserve.conf                |    7 +
 staging-i686/svnserve.service             |   11 +++
 staging-i686/svnserve.tmpfiles            |    1 
 staging-x86_64/PKGBUILD                   |  100 ++++++++++++++++++++++++++++
 staging-x86_64/subversion.install         |    7 +
 staging-x86_64/subversion.rpath.fix.patch |   10 ++
 staging-x86_64/svn                        |   11 +++
 staging-x86_64/svnserve.conf              |    7 +
 staging-x86_64/svnserve.service           |   11 +++
 staging-x86_64/svnserve.tmpfiles          |    1 
 14 files changed, 294 insertions(+)

Copied: subversion/repos/staging-i686/PKGBUILD (from rev 192209, subversion/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=subversion
+pkgver=1.8.1
+pkgrel=2
+pkgdesc="A Modern Concurrent Version Control System"
+arch=('i686' 'x86_64')
+url="http://subversion.apache.org/"
+license=('APACHE')
+depends=('sqlite' 'file' 'serf' 'systemd')
+makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
+             'libgnome-keyring' 'kdelibs' 'ruby')
+optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
+            'kdeutils-kwallet: for KWallet for auth credentials'
+            'bash-completion: for svn bash completion'
+            'python2: for some hook scripts'
+	    'java-environment: for Java support'
+	    'ruby: for some hook scripts')
+provides=('svn')
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+options=('!makeflags' '!libtool' '!emptydirs')
+install=${pkgname}.install
+source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc}
+        svn
+        svnserve.conf
+        svnserve.tmpfiles
+        svnserve.service
+        subversion.rpath.fix.patch)
+md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9'
+         'SKIP'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664'
+         'bb2857eceafcfac35dde39dcffad2314'
+         'e8020c7a1d1a0c47091b5fdd034f81c5'
+         '6b4340ba9d8845cd8497e013ae01be3f')
+
+prepare() {
+   cd ${pkgname}-${pkgver}
+   patch -Np0 -i ../subversion.rpath.fix.patch
+   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
+}
+
+build() {
+   cd ${pkgname}-${pkgver}
+   export PYTHON=/usr/bin/python2
+   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+               --with-zlib=/usr --with-serf=/usr --with-apxs \
+               --with-sqlite=/usr \
+               --enable-bdb6 --with-berkeley-db=:/usr/include/:/usr/lib:db-6.0 \
+               --enable-javahl --with-gnome-keyring --with-kwallet \
+               --with-apache-libexecdir=/usr/lib/httpd/modules \
+               --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
+               --disable-static
+
+   make LT_LDFLAGS="-L$Fdestdir/usr/lib"
+   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 ${pkgname}-${pkgver}
+   export LANG=C LC_ALL=C
+   make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl
+}
+
+package() {
+   cd ${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
+
+   ## 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
+}

Copied: subversion/repos/staging-i686/subversion.install (from rev 192209, subversion/trunk/subversion.install)
===================================================================
--- staging-i686/subversion.install	                        (rev 0)
+++ staging-i686/subversion.install	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1,7 @@
+post_install() {
+   usr/bin/systemd-tmpfiles --create svnserve.conf || true
+}
+
+post_upgrade() {
+   post_install
+}

Copied: subversion/repos/staging-i686/subversion.rpath.fix.patch (from rev 192209, subversion/trunk/subversion.rpath.fix.patch)
===================================================================
--- staging-i686/subversion.rpath.fix.patch	                        (rev 0)
+++ staging-i686/subversion.rpath.fix.patch	2013-08-07 18:08:44 UTC (rev 192210)
@@ -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

Copied: subversion/repos/staging-i686/svn (from rev 192209, subversion/trunk/svn)
===================================================================
--- staging-i686/svn	                        (rev 0)
+++ staging-i686/svn	2013-08-07 18:08:44 UTC (rev 192210)
@@ -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
+}

Copied: subversion/repos/staging-i686/svnserve.conf (from rev 192209, subversion/trunk/svnserve.conf)
===================================================================
--- staging-i686/svnserve.conf	                        (rev 0)
+++ staging-i686/svnserve.conf	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1,7 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
+
+#SVNSERVE_USER="svn"

Copied: subversion/repos/staging-i686/svnserve.service (from rev 192209, subversion/trunk/svnserve.service)
===================================================================
--- staging-i686/svnserve.service	                        (rev 0)
+++ staging-i686/svnserve.service	2013-08-07 18:08:44 UTC (rev 192210)
@@ -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

Copied: subversion/repos/staging-i686/svnserve.tmpfiles (from rev 192209, subversion/trunk/svnserve.tmpfiles)
===================================================================
--- staging-i686/svnserve.tmpfiles	                        (rev 0)
+++ staging-i686/svnserve.tmpfiles	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1 @@
+D /run/svnserve 0700 root root -

Copied: subversion/repos/staging-x86_64/PKGBUILD (from rev 192209, subversion/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=subversion
+pkgver=1.8.1
+pkgrel=2
+pkgdesc="A Modern Concurrent Version Control System"
+arch=('i686' 'x86_64')
+url="http://subversion.apache.org/"
+license=('APACHE')
+depends=('sqlite' 'file' 'serf' 'systemd')
+makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
+             'libgnome-keyring' 'kdelibs' 'ruby')
+optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
+            'kdeutils-kwallet: for KWallet for auth credentials'
+            'bash-completion: for svn bash completion'
+            'python2: for some hook scripts'
+	    'java-environment: for Java support'
+	    'ruby: for some hook scripts')
+provides=('svn')
+backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+options=('!makeflags' '!libtool' '!emptydirs')
+install=${pkgname}.install
+source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc}
+        svn
+        svnserve.conf
+        svnserve.tmpfiles
+        svnserve.service
+        subversion.rpath.fix.patch)
+md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9'
+         'SKIP'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664'
+         'bb2857eceafcfac35dde39dcffad2314'
+         'e8020c7a1d1a0c47091b5fdd034f81c5'
+         '6b4340ba9d8845cd8497e013ae01be3f')
+
+prepare() {
+   cd ${pkgname}-${pkgver}
+   patch -Np0 -i ../subversion.rpath.fix.patch
+   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
+}
+
+build() {
+   cd ${pkgname}-${pkgver}
+   export PYTHON=/usr/bin/python2
+   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
+               --with-zlib=/usr --with-serf=/usr --with-apxs \
+               --with-sqlite=/usr \
+               --enable-bdb6 --with-berkeley-db=:/usr/include/:/usr/lib:db-6.0 \
+               --enable-javahl --with-gnome-keyring --with-kwallet \
+               --with-apache-libexecdir=/usr/lib/httpd/modules \
+               --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
+               --disable-static
+
+   make LT_LDFLAGS="-L$Fdestdir/usr/lib"
+   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 ${pkgname}-${pkgver}
+   export LANG=C LC_ALL=C
+   make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl
+}
+
+package() {
+   cd ${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
+
+   ## 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
+}

Copied: subversion/repos/staging-x86_64/subversion.install (from rev 192209, subversion/trunk/subversion.install)
===================================================================
--- staging-x86_64/subversion.install	                        (rev 0)
+++ staging-x86_64/subversion.install	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1,7 @@
+post_install() {
+   usr/bin/systemd-tmpfiles --create svnserve.conf || true
+}
+
+post_upgrade() {
+   post_install
+}

Copied: subversion/repos/staging-x86_64/subversion.rpath.fix.patch (from rev 192209, subversion/trunk/subversion.rpath.fix.patch)
===================================================================
--- staging-x86_64/subversion.rpath.fix.patch	                        (rev 0)
+++ staging-x86_64/subversion.rpath.fix.patch	2013-08-07 18:08:44 UTC (rev 192210)
@@ -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

Copied: subversion/repos/staging-x86_64/svn (from rev 192209, subversion/trunk/svn)
===================================================================
--- staging-x86_64/svn	                        (rev 0)
+++ staging-x86_64/svn	2013-08-07 18:08:44 UTC (rev 192210)
@@ -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
+}

Copied: subversion/repos/staging-x86_64/svnserve.conf (from rev 192209, subversion/trunk/svnserve.conf)
===================================================================
--- staging-x86_64/svnserve.conf	                        (rev 0)
+++ staging-x86_64/svnserve.conf	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1,7 @@
+#
+# Parameters to be passed to svnserve
+#
+#SVNSERVE_ARGS="-r /path/to/some/repos"
+SVNSERVE_ARGS=""
+
+#SVNSERVE_USER="svn"

Copied: subversion/repos/staging-x86_64/svnserve.service (from rev 192209, subversion/trunk/svnserve.service)
===================================================================
--- staging-x86_64/svnserve.service	                        (rev 0)
+++ staging-x86_64/svnserve.service	2013-08-07 18:08:44 UTC (rev 192210)
@@ -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

Copied: subversion/repos/staging-x86_64/svnserve.tmpfiles (from rev 192209, subversion/trunk/svnserve.tmpfiles)
===================================================================
--- staging-x86_64/svnserve.tmpfiles	                        (rev 0)
+++ staging-x86_64/svnserve.tmpfiles	2013-08-07 18:08:44 UTC (rev 192210)
@@ -0,0 +1 @@
+D /run/svnserve 0700 root root -




More information about the arch-commits mailing list