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

[Lukas Fleischer]

    Date: Monday, May 13, 2013 @ 10:20:24
  Author: lfleischer
Revision: 90562

upgpkg: tor 0.2.3.25-2

Remove rc.d script.

Modified:
  tor/trunk/PKGBUILD
Deleted:
  tor/trunk/tor
  tor/trunk/tor.conf.d

------------+
 PKGBUILD   |   11 ++---------
 tor        |   44 --------------------------------------------
 tor.conf.d |    9 ---------
 3 files changed, 2 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 08:02:43 UTC (rev 90561)
+++ PKGBUILD	2013-05-13 08:20:24 UTC (rev 90562)
@@ -4,7 +4,7 @@
 
 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 @@
 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 @@
 
   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"
 

Deleted: tor
===================================================================
--- tor	2013-05-13 08:02:43 UTC (rev 90561)
+++ tor	2013-05-13 08:20:24 UTC (rev 90562)
@@ -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

Deleted: tor.conf.d
===================================================================
--- tor.conf.d	2013-05-13 08:02:43 UTC (rev 90561)
+++ tor.conf.d	2013-05-13 08:20:24 UTC (rev 90562)
@@ -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"
-