diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
| commit | ee6ba8d4dcf31aa630641953009a27b3fd700faa (patch) | |
| tree | e0b23465af10683570926837a56ade01adc17307 /community/tor | |
| parent | d090dd0cd7b9488aebc92281720a0c5804950f32 (diff) | |
| parent | c65624e6d74bffd70dcd67cc28448b5a50596efb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ecryptfs-utils/PKGBUILD
community/pylibacl/PKGBUILD
extra/kwebkitpart/PKGBUILD
extra/php/PKGBUILD
extra/qhull/PKGBUILD
kde-unstable/kdegames-kigo/PKGBUILD
kde-unstable/kdeutils-print-manager/PKGBUILD
Diffstat (limited to 'community/tor')
| -rw-r--r-- | community/tor/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/tor/tor.service | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index be803b822..6792915b6 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79370 2012-11-03 16:57:39Z lfleischer $ +# $Id: PKGBUILD 80483 2012-11-22 17:38:18Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.39 -pkgrel=2 +pkgver=0.2.3.25 +pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') url='http://www.torproject.org/' @@ -21,12 +21,12 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'tor' 'tor.conf.d' 'tor.service') -md5sums=('9157a1f02fcda9d7d2c5744176373abd' - '7944de0693fccf65fe0e3ea6712887b6' +md5sums=('a1c364189a9a66ed9daa8e6436489daf' + 'a4c12795ffb8f68550a5dab4a9eb0654' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa' - '98901f7dfa85b352b806ba7b0d66b7d0') + 'b8989a7b3ab39d697624b243f7fc255d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tor/tor.service b/community/tor/tor.service index a4bc1ac51..33bbc0776 100644 --- a/community/tor/tor.service +++ b/community/tor/tor.service @@ -5,10 +5,10 @@ After=network.target [Service] Type=forking GuessMainPID=yes -EnvironmentFile=/etc/conf.d/tor -ExecStart=/usr/bin/tor -f $TOR_CONF $TOR_ARGS +ExecStart=/usr/bin/tor -f /etc/tor/torrc --quiet ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGINT +LimitNOFILE=8192 [Install] WantedBy=multi-user.target |