[arch-commits] Commit in tor/repos (extra-x86_64 extra-x86_64/PKGBUILD)

Allan McRae allan at archlinux.org
Sat Sep 19 05:10:18 UTC 2009


    Date: Saturday, September 19, 2009 @ 01:10:18
  Author: allan
Revision: 52411

Merged revisions 52409 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/tor/trunk

........
  r52409 | allan | 2009-09-19 15:06:01 +1000 (Sat, 19 Sep 2009) | 2 lines
  
  upgpkg: tor 0.2.1.19-2
      fix license (FS#16074) and tidy PKGBUILD
........

Modified:
  tor/repos/extra-x86_64/	(properties)
  tor/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)


Property changes on: tor/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /tor/trunk:1-50436
   + /tor/trunk:1-52410

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-19 05:06:59 UTC (rev 52410)
+++ extra-x86_64/PKGBUILD	2009-09-19 05:10:18 UTC (rev 52411)
@@ -1,17 +1,20 @@
 # $Id$
-# Maintainer: simo <simo at archlinux.org>
+# Maintainer: 
+# Contributor: simo <simo at archlinux.org>
 
 pkgname=tor
 pkgver=0.2.1.19
-pkgrel=1
+pkgrel=2
 pkgdesc="TOR Client"
 arch=('i686' 'x86_64')
-url="http://tor.eff.org"
-license=('GPL')
-install=tor.install
+url="http://www.torproject.org/"
+license=('custom')
 depends=('openssl' 'libevent')
-source=(http://tor.eff.org/dist/tor-${pkgver}.tar.gz tor.conf tor.rc)
 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'
          '4e39d56f462fc9f59e91715ac1b994c0')
@@ -23,10 +26,13 @@
     make || return 1
 
     install -d $pkgdir/var/lib || return 1
-	install -o43 -g43 -d -m0755 $startdir/pkg/var/lib/tor || return 1
-	install -D -m644 $startdir/src/tor.conf $pkgdir/etc/tor/torrc || return 1
-	install -D -m755 $startdir/src/tor.rc $pkgdir/etc/rc.d/tor || return 1
-    chmod 755 $pkgdir/.INSTALL	
+    install -o43 -g43 -d -m0755 $startdir/pkg/var/lib/tor || 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 -Dm644 LICENSE $pkgdir/usr/share/licenses/tor/LICENSE
 }




More information about the arch-commits mailing list