Date: Friday, May 31, 2013 @ 02:33:51 Author: seblu Revision: 92046 upgpkg: tinc 1.0.21-2
- /usr merge Modified: tinc/trunk/PKGBUILD tinc/trunk/[email protected] Deleted: tinc/trunk/tincd.conf tinc/trunk/tincd.rc ----------------+ PKGBUILD | 13 ++++--------- tincd.conf | 5 ----- tincd.rc | 42 ------------------------------------------ [email protected] | 2 +- 4 files changed, 5 insertions(+), 57 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-31 00:26:55 UTC (rev 92045) +++ PKGBUILD 2013-05-31 00:33:51 UTC (rev 92046) @@ -6,26 +6,23 @@ pkgname=tinc pkgver=1.0.21 -pkgrel=1 +pkgrel=2 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') url="http://www.tinc-vpn.org/"; license=('GPL') depends=('lzo2' 'openssl') -backup=(etc/conf.d/tincd.conf) install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} - tincd.rc tincd.conf [email protected]) + [email protected]) md5sums=('d7bc9ca38672c9da08d74ff2a3e8e36d' 'SKIP' - '64bb53748d9051255f243003f0d511f5' - '7c0276d4812cc5d3cc18142562a3aa82' - '035b0e549b08da55d19a8df5b8306e4d') + '112327da32fdb56ab779fe004712235f') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin make } @@ -38,7 +35,5 @@ find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} + find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} + - install -Dm755 "$srcdir/tincd.rc" "$pkgdir/etc/rc.d/tincd" - install -Dm644 "$srcdir/tincd.conf" "$pkgdir/etc/conf.d/tincd.conf" install -Dm644 "$srcdir/[email protected]" "$pkgdir/usr/lib/systemd/system/[email protected]" } Deleted: tincd.conf =================================================================== --- tincd.conf 2013-05-31 00:26:55 UTC (rev 92045) +++ tincd.conf 2013-05-31 00:33:51 UTC (rev 92046) @@ -1,5 +0,0 @@ -# Extra options to be passed to tincd. -# TINCD_EXTRAOPTS="-d" - -# Arrays containing all names of the networks to be started from rc.d. -NETNAMES=() Deleted: tincd.rc =================================================================== --- tincd.rc 2013-05-31 00:26:55 UTC (rev 92045) +++ tincd.rc 2013-05-31 00:33:51 UTC (rev 92046) @@ -1,42 +0,0 @@ -#!/bin/bash - -daemon_name=tincd - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -case "$1" in - start) - for net in "${NETNAMES[@]}"; do - stat_busy "Starting ${daemon_name}" - /usr/sbin/tincd -n "${net}" $TINCD_EXTRAOPTS &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ${daemon_name} - stat_done - fi - done - ;; - stop) - stat_busy "Stopping ${daemon_name}" - for net in "${NETNAMES[@]}"; do - /usr/sbin/tincd -k -n "${net}" &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ${daemon_name} - stat_done - fi - done - ;; - restart) - "$0" stop - sleep 5 - "$0" start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Modified: [email protected] =================================================================== --- [email protected] 2013-05-31 00:26:55 UTC (rev 92045) +++ [email protected] 2013-05-31 00:33:51 UTC (rev 92046) @@ -4,7 +4,7 @@ [Service] Type=forking -ExecStart=/usr/sbin/tincd -n %i +ExecStart=/usr/bin/tincd -n %i [Install] WantedBy=multi-user.target
