[arch-dev-public] [arch-commits] Commit in subversion/trunk (PKGBUILD svnserve)

[Stéphane Gaudreault]

Fixed.

Thanks

Le 2013-05-13 21:16, Dan McGee a écrit :
> Looks like this rebuild broke something and it is linked against two
> versions of libsasl:
>
> dmcgee at galway ~/projects/arch-repos
> $ svn up
> svn: error while loading shared libraries: libsasl2.so.2: cannot open
> shared object file: No such file or directory
>
> dmcgee at galway ~/projects/arch-repos
> $ ldd /usr/bin/svn | grep libsasl
>          libsasl2.so.2 => not found
>          libsasl2.so.2 => not found
>          libsasl2.so.2 => not found
>          libsasl2.so.3 => /usr/lib/libsasl2.so.3 (0x00007fadbd8f6000)
>
> On Mon, May 13, 2013 at 6:14 PM, Stéphane Gaudreault
> <stephane at nymeria.archlinux.org> wrote:
>>      Date: Tuesday, May 14, 2013 @ 01:14:41
>>    Author: stephane
>> Revision: 185408
>>
>> Remove old initscipts rc.d files
>>
>> Modified:
>>    subversion/trunk/PKGBUILD
>> Deleted:
>>    subversion/trunk/svnserve
>>
>> ----------+
>>   PKGBUILD |   20 ++++++++------------
>>   svnserve |   42 ------------------------------------------
>>   2 files changed, 8 insertions(+), 54 deletions(-)
>>
>> Modified: PKGBUILD
>> ===================================================================
>> --- PKGBUILD    2013-05-13 20:53:09 UTC (rev 185407)
>> +++ PKGBUILD    2013-05-13 23:14:41 UTC (rev 185408)
>> @@ -5,7 +5,7 @@
>>
>>   pkgname=subversion
>>   pkgver=1.7.9
>> -pkgrel=2
>> +pkgrel=3
>>   pkgdesc="A Modern Concurrent Version Control System"
>>   arch=('i686' 'x86_64')
>>   license=('APACHE')
>> @@ -20,13 +20,17 @@
>>   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)
>> -
>> +md5sums=('8d532025771a67c06c23f299699f056f'
>> +         'a0db6dd43af33952739b6ec089852630'
>> +         'c459e299192552f61578f3438abf0664'
>> +         'bb2857eceafcfac35dde39dcffad2314'
>> +         'e8020c7a1d1a0c47091b5fdd034f81c5'
>> +         '6b4340ba9d8845cd8497e013ae01be3f')
>>   build() {
>>      cd "${srcdir}/${pkgname}-${pkgver}"
>>      export PYTHON=/usr/bin/python2
>> @@ -70,8 +74,7 @@
>>
>>      ## 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
>> @@ -87,10 +90,3 @@
>>         ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
>>      done
>>   }
>> -md5sums=('8d532025771a67c06c23f299699f056f'
>> -         'a2b029e8385007ffb99b437b30521c90'
>> -         'a0db6dd43af33952739b6ec089852630'
>> -         'c459e299192552f61578f3438abf0664'
>> -         'bb2857eceafcfac35dde39dcffad2314'
>> -         'e8020c7a1d1a0c47091b5fdd034f81c5'
>> -         '6b4340ba9d8845cd8497e013ae01be3f')
>>
>> Deleted: svnserve
>> ===================================================================
>> --- svnserve    2013-05-13 20:53:09 UTC (rev 185407)
>> +++ svnserve    2013-05-13 23:14:41 UTC (rev 185408)
>> @@ -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
>>