diff options
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | PKGBUILD | 55 | ||||
-rw-r--r-- | bridge.conf (renamed from bridge) | 0 | ||||
-rw-r--r-- | isolation.conf (renamed from isolation) | 0 | ||||
-rw-r--r-- | nodes.conf (renamed from nodes) | 0 | ||||
-rw-r--r-- | torrc | 6 | ||||
-rw-r--r-- | transparent_proxy.conf (renamed from transparent_proxy) | 0 |
7 files changed, 40 insertions, 45 deletions
@@ -1,16 +1,16 @@ pkgbase = tor-git pkgdesc = An anonymizing overlay network (development version) - pkgver = 0.4.6.0.alpha.dev.r50.g94fc207 + pkgver = 0.4.7.0.alpha.dev.r327.g82168e5 pkgrel = 1 url = https://www.torproject.org arch = i686 arch = x86_64 arch = armv6h arch = armv7h + arch = aarch64 license = BSD checkdepends = python makedepends = asciidoc - makedepends = rust depends = openssl depends = libevent depends = libseccomp @@ -22,26 +22,26 @@ pkgbase = tor-git provides = tor conflicts = tor backup = etc/tor/torrc - backup = etc/tor/torrc.d/nodes - backup = etc/tor/torrc.d/bridge - backup = etc/tor/torrc.d/isolation - backup = etc/tor/torrc.d/transparent_proxy - source = git+https://git.torproject.org/tor.git#branch=master + backup = etc/tor/torrc.d/nodes.conf + backup = etc/tor/torrc.d/bridge.conf + backup = etc/tor/torrc.d/isolation.conf + backup = etc/tor/torrc.d/transparent_proxy.conf + source = git+https://git.torproject.org/tor.git#branch=main + source = nodes.conf + source = bridge.conf + source = transparent_proxy.conf + source = isolation.conf source = torrc - source = nodes - source = bridge - source = transparent_proxy - source = isolation source = tor.logrotate source = tor.service source = tor.tmpfiles source = tor.sysusers sha256sums = SKIP - sha256sums = 70dd879309db4c1b346ea35e0926eda6f2fe37dcb6f827e31506af4ee692b433 sha256sums = 72ed5d90c54d9d5354af0d9fc7eb1412c548cc308868b85a99278abe8ccbf145 sha256sums = 90a588c3c2dc7826172341453f76739e8f48df7b0c858adebd12e97f047bde26 sha256sums = 7fbb63e9411eee2176964449a3d6809d16e1120152c6ff201ecea1d1f97f102b sha256sums = 748b7264b49b12d5252d688b8859820046413938c5fde91578da0d5b95594c2e + sha256sums = 1f32a363443437a08d133494732008b98a9dc520173a97d53ce832edfb923f7b sha256sums = d447227fcc2756778a1be143b8975d67b25ea15688cde2291185b3c71d0f6e34 sha256sums = 488525b2051cf0f216ac14c3ab1bc8531d308cedf92e64d147f7f11b6c58cf41 sha256sums = 06c00318d84ead3f939b267c7ae9e4cc1cd90c534d0b57ddd2595fee9065ee7f @@ -1,27 +1,27 @@ # Contributor: skydrome <skydrome@protonmail.com> # Maintainer: skydrome <skydrome@protonmail.com> -#_branch=maint-0.4.4 # stable +# 0.4.5 is last release to access onion v2 services +#_branch=maint-0.4.6 # stable #_malloc=jemalloc # tcmalloc pkgname=tor-git -pkgver=0.4.6.0.alpha.dev.r50.g94fc207 +pkgver=0.4.7.0.alpha.dev.r327.g82168e5 pkgrel=1 pkgdesc="An anonymizing overlay network (development version)" -arch=('i686' 'x86_64' 'armv6h' 'armv7h') +arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') url="https://www.torproject.org" license=('BSD') conflicts=('tor') provides=('tor') backup=('etc/tor/torrc' - 'etc/tor/torrc.d/nodes' - 'etc/tor/torrc.d/bridge' - 'etc/tor/torrc.d/isolation' - 'etc/tor/torrc.d/transparent_proxy') + 'etc/tor/torrc.d/nodes.conf' + 'etc/tor/torrc.d/bridge.conf' + 'etc/tor/torrc.d/isolation.conf' + 'etc/tor/torrc.d/transparent_proxy.conf') depends=('openssl' 'libevent' 'libseccomp' 'zstd' 'xz') -#https://github.com/skydrome/PKGBUILDs/tree/master/asciidoc-py3 -makedepends=('asciidoc' 'rust') +makedepends=('asciidoc') checkdepends=('python') optdepends=('torsocks: allow transparent SOCKS proxying' 'obfs4proxy: obfuscating pluggable transport proxy' @@ -30,16 +30,16 @@ optdepends=('torsocks: allow transparent SOCKS proxying' [[ $_malloc = 'jemalloc' ]] && depends+=('jemalloc') [[ $_malloc = 'tcmalloc' ]] && depends+=('gperftools') -source=("git+https://git.torproject.org/tor.git#branch=${_branch:-master}" - 'torrc' 'nodes' 'bridge' 'transparent_proxy' 'isolation' - 'tor.logrotate' 'tor.service' 'tor.tmpfiles' 'tor.sysusers') +source=("git+https://git.torproject.org/tor.git#branch=${_branch:-main}" + {nodes,bridge,transparent_proxy,isolation}.conf + 'torrc' 'tor.logrotate' 'tor.service' 'tor.tmpfiles' 'tor.sysusers') sha256sums=('SKIP' - '70dd879309db4c1b346ea35e0926eda6f2fe37dcb6f827e31506af4ee692b433' '72ed5d90c54d9d5354af0d9fc7eb1412c548cc308868b85a99278abe8ccbf145' '90a588c3c2dc7826172341453f76739e8f48df7b0c858adebd12e97f047bde26' '7fbb63e9411eee2176964449a3d6809d16e1120152c6ff201ecea1d1f97f102b' '748b7264b49b12d5252d688b8859820046413938c5fde91578da0d5b95594c2e' + '1f32a363443437a08d133494732008b98a9dc520173a97d53ce832edfb923f7b' 'd447227fcc2756778a1be143b8975d67b25ea15688cde2291185b3c71d0f6e34' '488525b2051cf0f216ac14c3ab1bc8531d308cedf92e64d147f7f11b6c58cf41' '06c00318d84ead3f939b267c7ae9e4cc1cd90c534d0b57ddd2595fee9065ee7f' @@ -47,22 +47,17 @@ sha256sums=('SKIP' pkgver () { cd tor - git describe --long --tags --abbrev=7 "origin/${_branch:-master}" \ + git describe --long --tags --abbrev=7 "origin/${_branch:-main}" \ |sed -e 's/tor.//g;s/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { cd tor - git submodule update --init --recursive - - sed -i configure.ac \ - -e 's/AC_PROG_CC_C99/AC_PROG_CC/' ./autogen.sh } build() { cd tor - export TOR_RUST_DEPENDENCIES="$srcdir/tor/src/ext/rust/crates" ./configure \ --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ @@ -71,7 +66,6 @@ build() { --enable-zstd \ --enable-lzma \ --enable-pic \ - --enable-rust \ --with-malloc="${_malloc:-system}" #\ #--disable-module-relay \ #--disable-unittests @@ -93,14 +87,15 @@ package() { install -dm755 "$pkgdir/etc/tor" install -dm750 "$pkgdir/etc/tor/torrc.d" - install -Dm640 "$srcdir/torrc" "$pkgdir/etc/tor/torrc" - install -Dm640 "$srcdir/nodes" "$pkgdir/etc/tor/torrc.d/nodes" - install -Dm640 "$srcdir/bridge" "$pkgdir/etc/tor/torrc.d/bridge" - install -Dm640 "$srcdir/isolation" "$pkgdir/etc/tor/torrc.d/isolation" - install -Dm640 "$srcdir/transparent_proxy" "$pkgdir/etc/tor/torrc.d/transparent_proxy" - install -Dm644 "$srcdir/tor.logrotate" "$pkgdir/etc/logrotate.d/tor" - install -Dm644 "$srcdir/tor.service" "$pkgdir/usr/lib/systemd/system/tor.service" - install -Dm644 "$srcdir/tor.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/tor.conf" - install -Dm644 "$srcdir/tor.sysusers" "$pkgdir/usr/lib/sysusers.d/tor.conf" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/tor-git/LICENSE" + install -Dm640 "$srcdir/torrc" "$pkgdir/etc/tor/torrc" + install -Dm640 "$srcdir/nodes.conf" "$pkgdir/etc/tor/torrc.d/nodes.conf" + install -Dm640 "$srcdir/bridge.conf" "$pkgdir/etc/tor/torrc.d/bridge.conf" + install -Dm640 "$srcdir/isolation.conf" "$pkgdir/etc/tor/torrc.d/isolation.conf" + install -Dm640 "$srcdir/transparent_proxy.conf" "$pkgdir/etc/tor/torrc.d/transparent_proxy.conf" + + install -Dm644 "$srcdir/tor.logrotate" "$pkgdir/etc/logrotate.d/tor" + install -Dm644 "$srcdir/tor.service" "$pkgdir/usr/lib/systemd/system/tor.service" + install -Dm644 "$srcdir/tor.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/tor.conf" + install -Dm644 "$srcdir/tor.sysusers" "$pkgdir/usr/lib/sysusers.d/tor.conf" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/tor-git/LICENSE" } diff --git a/bridge b/bridge.conf index fcec8de30533..fcec8de30533 100644 --- a/bridge +++ b/bridge.conf diff --git a/isolation b/isolation.conf index 5487a4673663..5487a4673663 100644 --- a/isolation +++ b/isolation.conf @@ -91,7 +91,7 @@ DataDirectory /var/lib/tor ## yourself to make this work. #ORPort 443 NoListen #ORPort 127.0.0.1:9090 NoAdvertise -## If you want to listen on IPv6 your numeric address must be explictly +## If you want to listen on IPv6 your numeric address must be explicitly ## between square brackets as follows. You must also listen on IPv4. #ORPort [2001:DB8::1]:9050 @@ -242,7 +242,7 @@ DataDirectory /var/lib/tor ## mechanisms like https://bridges.torproject.org/. If you want to run ## a private bridge, for example because you'll give out your bridge ## address manually to your friends, uncomment this line: -#PublishServerDescriptor 0 +#BridgeDistribution none ## If non-zero, try to write to disk less frequently than we would otherwise. ## This is useful when running on flash memory or other media that support @@ -264,4 +264,4 @@ DisableAllSwap 1 ## folder will be parsed following lexical order. Files starting with a dot are ignored. Files ## on subfolders are ignored. ## The %include option can be used recursively. -%include /etc/tor/torrc.d/ +%include /etc/tor/torrc.d/*.conf diff --git a/transparent_proxy b/transparent_proxy.conf index 4db96cb2575e..4db96cb2575e 100644 --- a/transparent_proxy +++ b/transparent_proxy.conf |