[arch-commits] Commit in tor/trunk (PKGBUILD tor.install)

[Eric Bélanger]

    Date: Saturday, October 31, 2009 @ 07:43:09
  Author: eric
Revision: 57057

upgpkg: tor 0.2.1.20-1
    Upstream update, fixed license, added tsocks and bash depends (close FS#16404), cleaned up .install script

Modified:
  tor/trunk/PKGBUILD
  tor/trunk/tor.install

-------------+
 PKGBUILD    |   29 +++++++++++++++--------------
 tor.install |   22 ++++++----------------
 2 files changed, 21 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-31 11:20:43 UTC (rev 57056)
+++ PKGBUILD	2009-10-31 11:43:09 UTC (rev 57057)
@@ -3,36 +3,37 @@
 # Contributor: simo <simo at archlinux.org>
 
 pkgname=tor
-pkgver=0.2.1.19
-pkgrel=2
+pkgver=0.2.1.20
+pkgrel=1
 pkgdesc="Anonymizing overlay network"
 arch=('i686' 'x86_64')
 url="http://www.torproject.org/"
-license=('custom')
-depends=('openssl' 'libevent')
+license=('BSD')
+depends=('openssl' 'libevent' 'tsocks' 'bash')
 backup=('etc/tor/torrc etc/tor/torrc-dist etc/tor/tor-tsocks.conf')
 install=tor.install
 source=(http://www.torproject.org/dist/tor-${pkgver}.tar.gz
        tor.conf
        tor.rc)
-md5sums=('2c0ca9bf5d0cfb771f4d6bec9c4360ca'
-         '56c75d4e8a66f34167d31e38c43793dd'
+md5sums=('0d62ee2332fdd95de43debac7435df19' '56c75d4e8a66f34167d31e38c43793dd'\
          '4e39d56f462fc9f59e91715ac1b994c0')
+sha1sums=('bfc6c7e9ccee23abc4e97ca4ba98aa3ad7784262' '091385e9604d2ec519c1092ca875885c04c62a7c'\
+         '978588d0078465b6383422772d187e92963eb41f')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
+    cd "$srcdir/$pkgname-$pkgver"
 
     ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
     make || return 1
 
-    install -d $pkgdir/var/lib || return 1
-    install -o43 -g43 -d -m0755 $startdir/pkg/var/lib/tor || return 1
+    install -d "$pkgdir/var/lib" || return 1
+    install -o43 -g43 -d -m0755 "$pkgdir/var/lib/tor" || return 1
 
-    make DESTDIR=$pkgdir install || return 1
-    mv $pkgdir/etc/tor/torrc.sample $pkgdir/etc/tor/torrc-dist || return 1
+    make DESTDIR="$pkgdir" install || return 1
+    mv "$pkgdir/etc/tor/torrc.sample" "$pkgdir/etc/tor/torrc-dist" || return 1
 
-    install -D -m644 $srcdir/tor.conf $pkgdir/etc/tor/torrc || return 1
-    install -D -m755 $srcdir/tor.rc $pkgdir/etc/rc.d/tor || return 1
+    install -D -m644 "$srcdir/tor.conf" "$pkgdir/etc/tor/torrc" || return 1
+    install -D -m755 "$srcdir/tor.rc" "$pkgdir/etc/rc.d/tor" || return 1
     
-    install -Dm644 LICENSE $pkgdir/usr/share/licenses/tor/LICENSE
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/tor/LICENSE" || return 1
 }

Modified: tor.install
===================================================================
--- tor.install	2009-10-31 11:20:43 UTC (rev 57056)
+++ tor.install	2009-10-31 11:43:09 UTC (rev 57057)
@@ -1,6 +1,10 @@
 post_install() {
-  echo "-> Tor has been preconfigured to run as a client only"
-  echo "-> Tor is experimental software, Do not rely on it for strong anonymity."
+  echo "-> Tor has been preconfigured to run as a client only."
+  echo "-> Tor is experimental software. Do not rely on it for strong anonymity."
+  post_upgrade $1
+}
+
+post_upgrade() {
   if [ ! `grep '^tor:' /etc/group` ]; then
     groupadd -g 43 tor &>/dev/null;
   fi
@@ -9,21 +13,7 @@
     useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor
 }
 
-post_upgrade() {
-  post_install $1
-}
-
 pre_remove() {
   userdel tor &> /dev/null
   groupdel tor &> /dev/null
 }
-
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*
-# vim: ts=2 sw=2 et ft=sh