diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
commit | bc864260b40f40e8f689788c54f6138007764077 (patch) | |
tree | 9c9be0d9a53d7e3a03d76276fc4b02dd08b552bf /extra/subversion | |
parent | b90f83b99150003a2022c3a4bbad90b12eb56b7e (diff) | |
parent | 453f3b8b2c568e9babcdc4852772278a39f130c0 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/drbd/PKGBUILD
community/etherape/PKGBUILD
community/ext4magic/PKGBUILD
community/fcron/PKGBUILD
community/fcron/systab.orig
community/gnome-panel/PKGBUILD
community/libident/PKGBUILD
community/libtorrent/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/usbipd.service
community/makedev/PKGBUILD
community/minbif/PKGBUILD
community/noip/PKGBUILD
community/notmuch/PKGBUILD
community/pam_pwcheck/PKGBUILD
community/pound/PKGBUILD
community/preload/PKGBUILD
community/python-cchardet/PKGBUILD
community/rtorrent/PKGBUILD
community/tor/PKGBUILD
community/ude/PKGBUILD
core/openldap/PKGBUILD
core/sysvinit/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cvs/PKGBUILD
extra/epiphany-extensions/PKGBUILD
extra/fbset/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/gtkmm/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdepim/PKGBUILD
extra/libical/PKGBUILD
extra/mutt/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/ossp/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/rtkit/PKGBUILD
extra/samba/PKGBUILD
extra/totem/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/liferea-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
Diffstat (limited to 'extra/subversion')
-rw-r--r-- | extra/subversion/PKGBUILD | 25 | ||||
-rwxr-xr-x | extra/subversion/svnserve | 42 |
2 files changed, 10 insertions, 57 deletions
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index c7eb2b598..7c779605d 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $ +# $Id: PKGBUILD 185569 2013-05-15 08:05:28Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.7.9 -pkgrel=1 +pkgrel=4 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -22,22 +22,18 @@ 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 +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -sha1sums=('453757bae78a800997559f2232483ab99238ec1e' - '5ce5adc5f5cae5a2d569a89b5e4498623feae84a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' - '9f6790d842cf3e0228b007483a43e39a42724068' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - +md5sums=('8d532025771a67c06c23f299699f056f' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 @@ -93,8 +89,7 @@ package() { ## svnserve ... - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + # xinetd install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn # ... systemd diff --git a/extra/subversion/svnserve b/extra/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/extra/subversion/svnserve +++ /dev/null @@ -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 |