summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorskydrome2020-02-04 00:05:34 -0500
committerskydrome2020-02-04 00:05:34 -0500
commit5d4c5992841e99d12fb2e379f4d769bb1cab3bd6 (patch)
tree334e581e53496f5945e9d19721d3c5f6d80136c7
parent3ea6ad36db82257c0309057c362a2959831e6643 (diff)
downloadaur-5d4c5992841e99d12fb2e379f4d769bb1cab3bd6.tar.gz
systemd fix
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--tor.service3
-rw-r--r--torrc3
4 files changed, 11 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef22808db00e..b73f7c197684 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = tor-git
pkgdesc = An anonymizing overlay network (development version)
- pkgver = 0.4.3.1.alpha.r7.gf10b7
+ pkgver = 0.4.3.1.alpha.r42.g1bf377f
pkgrel = 1
url = https://www.torproject.org
arch = i686
@@ -37,13 +37,13 @@ pkgbase = tor-git
source = tor.tmpfiles
source = tor.sysusers
sha256sums = SKIP
- sha256sums = 3826ae9596371e5fc38829dfadb0064fdd7ac5218d81abb0b3bf6f1b6f72d6a9
+ sha256sums = 4fe3fd1042b369ed5d45e95a214dfef315bf756dc44f51d8fdb775aab1dcffd9
sha256sums = 72ed5d90c54d9d5354af0d9fc7eb1412c548cc308868b85a99278abe8ccbf145
sha256sums = 90a588c3c2dc7826172341453f76739e8f48df7b0c858adebd12e97f047bde26
sha256sums = 7fbb63e9411eee2176964449a3d6809d16e1120152c6ff201ecea1d1f97f102b
sha256sums = 748b7264b49b12d5252d688b8859820046413938c5fde91578da0d5b95594c2e
sha256sums = d447227fcc2756778a1be143b8975d67b25ea15688cde2291185b3c71d0f6e34
- sha256sums = 96ed5b040c944fd99b15e8bdd25a7682a4e6d19c11f42c669c80aade088ec9dc
+ sha256sums = 5306e144bb79a89bdc19a79987d690a7ab34eb1564125723b90de96f53365a4e
sha256sums = 06c00318d84ead3f939b267c7ae9e4cc1cd90c534d0b57ddd2595fee9065ee7f
sha256sums = 231405d1fbbcc68168248f93edd19ae14b60f66bb4d1c8e46ead1d4cd8e0ae7c
diff --git a/PKGBUILD b/PKGBUILD
index dc3ca1d6cfc1..4d9221890633 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _with_rust=1
#_malloc=jemalloc # tcmalloc
pkgname=tor-git
-pkgver=0.4.3.1.alpha.r7.gf10b7
+pkgver=0.4.3.1.alpha.r42.g1bf377f
pkgrel=1
pkgdesc="An anonymizing overlay network (development version)"
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -21,6 +21,7 @@ backup=('etc/tor/torrc'
'etc/tor/torrc.d/transparent_proxy')
depends=('openssl' 'libevent' 'libseccomp' 'zstd' 'xz')
+#https://github.com/skydrome/PKGBUILDs/tree/master/asciidoc-py3
makedepends=('asciidoc')
checkdepends=('python')
optdepends=('torsocks: allow transparent SOCKS proxying'
@@ -39,13 +40,13 @@ source=("git+https://git.torproject.org/tor.git#branch=${_branch:-master}"
'tor.logrotate' 'tor.service' 'tor.tmpfiles' 'tor.sysusers')
sha256sums=('SKIP'
- '3826ae9596371e5fc38829dfadb0064fdd7ac5218d81abb0b3bf6f1b6f72d6a9'
+ '4fe3fd1042b369ed5d45e95a214dfef315bf756dc44f51d8fdb775aab1dcffd9'
'72ed5d90c54d9d5354af0d9fc7eb1412c548cc308868b85a99278abe8ccbf145'
'90a588c3c2dc7826172341453f76739e8f48df7b0c858adebd12e97f047bde26'
'7fbb63e9411eee2176964449a3d6809d16e1120152c6ff201ecea1d1f97f102b'
'748b7264b49b12d5252d688b8859820046413938c5fde91578da0d5b95594c2e'
'd447227fcc2756778a1be143b8975d67b25ea15688cde2291185b3c71d0f6e34'
- '96ed5b040c944fd99b15e8bdd25a7682a4e6d19c11f42c669c80aade088ec9dc'
+ '5306e144bb79a89bdc19a79987d690a7ab34eb1564125723b90de96f53365a4e'
'06c00318d84ead3f939b267c7ae9e4cc1cd90c534d0b57ddd2595fee9065ee7f'
'231405d1fbbcc68168248f93edd19ae14b60f66bb4d1c8e46ead1d4cd8e0ae7c')
diff --git a/tor.service b/tor.service
index 481e3c0e2700..6aa6e8b66151 100644
--- a/tor.service
+++ b/tor.service
@@ -5,7 +5,6 @@ After=syslog.target network.target nss-lookup.target
[Service]
Type=notify
NotifyAccess=all
-Group=tor
ExecStartPre=/usr/bin/tor -f /etc/tor/torrc --verify-config
ExecStart=/usr/bin/tor -f /etc/tor/torrc
ExecReload=/bin/kill -HUP ${MAINPID}
@@ -24,7 +23,7 @@ ProtectKernelTunables=yes
ReadOnlyDirectories=/
ReadWriteDirectories=-/var/lib/tor -/var/log/tor
NoNewPrivileges=yes
-CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE CAP_DAC_READ_SEARCH
[Install]
WantedBy=multi-user.target
diff --git a/torrc b/torrc
index 97a637b7e895..48ccb58e1f97 100644
--- a/torrc
+++ b/torrc
@@ -249,6 +249,9 @@ DataDirectory /var/lib/tor
## only a limited number of writes.
AvoidDiskWrites 1
+## Try to use built-in (static) crypto hardware acceleration when available.
+HardwareAccel 1
+
## Configuration options can be imported from files or folders using the %include
## option with the value being a path. If the path is a file, the options from the
## file will be parsed as if they were written where the %include option is. If