Tue May 14 01:18:40 PDT 2013

3 files changed, 3 insertions, 63 deletions

diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index 6a1b3ec48..dc66e4093 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80483 2012-11-22 17:38:18Z lfleischer $
+# $Id: PKGBUILD 90563 2013-05-13 08:20:47Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=tor
 pkgver=0.2.3.25
-pkgrel=1
+pkgrel=2
 pkgdesc='Anonymizing overlay network.'
 arch=('i686' 'x86_64')
 url='http://www.torproject.org/'
@@ -13,19 +13,14 @@ depends=('openssl' 'libevent' 'tsocks' 'bash')
 makedepends=('ca-certificates')
 backup=('etc/tor/torrc'
         'etc/tor/torrc-dist'
-        'etc/tor/tor-tsocks.conf'
-        'etc/conf.d/tor')
+        'etc/tor/tor-tsocks.conf')
 install='tor.install'
 source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'torrc'
-        'tor'
-        'tor.conf.d'
         'tor.service')
 md5sums=('a1c364189a9a66ed9daa8e6436489daf'
          'a4c12795ffb8f68550a5dab4a9eb0654'
          '56c75d4e8a66f34167d31e38c43793dd'
-         'f8e6868a389877346e7eebaacd1078bb'
-         '5c7c6834064b3530c442def6079ac3aa'
          'b8989a7b3ab39d697624b243f7fc255d')
 
 build() {
@@ -44,8 +39,6 @@ package() {
 
   mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist"
   install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc"
-  install -Dm0755 "${srcdir}/tor" "${pkgdir}/etc/rc.d/tor"
-  install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor"
 
   install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
diff --git a/community/tor/tor b/community/tor/tor
deleted file mode 100644
index 522c498ce..000000000
--- a/community/tor/tor
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/tor ] && . /etc/conf.d/tor
-
-PID=`pidof -o %PPID /usr/bin/tor`
-case "$1" in
-  start)
-    stat_busy "Starting Tor Daemon"
-    if [ -z "${TOR_MAX_FD}" ] || ulimit -n "${TOR_MAX_FD}"; then
-      [ -z "$PID" ] && /usr/bin/tor -f ${TOR_CONF} ${TOR_ARGS} &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon tor
-        stat_done
-      fi
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Tor Daemon"
-    [ ! -z "$PID" ] && kill -INT $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-# vim: ft=sh ts=2 sw=2
diff --git a/community/tor/tor.conf.d b/community/tor/tor.conf.d
deleted file mode 100644
index e9fa098e0..000000000
--- a/community/tor/tor.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Location of the config file.
-TOR_CONF='/etc/tor/torrc'
-
-# Custom ulimit for maximum number of open files.
-TOR_MAX_FD=
-
-# Additional arguments.
-TOR_ARGS="--quiet"
-