Date: Saturday, November 28, 2020 @ 14:01:33 Author: lfleischer Revision: 765252
archrelease: copy trunk to community-x86_64 Added: tor/repos/community-x86_64/PKGBUILD (from rev 765251, tor/trunk/PKGBUILD) tor/repos/community-x86_64/tor.sysusers (from rev 765251, tor/trunk/tor.sysusers) tor/repos/community-x86_64/tor.tmpfiles (from rev 765251, tor/trunk/tor.tmpfiles) tor/repos/community-x86_64/torrc.patch (from rev 765251, tor/trunk/torrc.patch) tor/repos/community-x86_64/torservice.patch (from rev 765251, tor/trunk/torservice.patch) Deleted: tor/repos/community-x86_64/PKGBUILD tor/repos/community-x86_64/tor.sysusers tor/repos/community-x86_64/tor.tmpfiles tor/repos/community-x86_64/torrc.patch tor/repos/community-x86_64/torservice.patch ------------------+ PKGBUILD | 116 ++++++++++++++++++++++++++--------------------------- tor.sysusers | 2 tor.tmpfiles | 2 torrc.patch | 56 ++++++++++++------------- torservice.patch | 22 +++++----- 5 files changed, 99 insertions(+), 99 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-11-28 14:01:25 UTC (rev 765251) +++ PKGBUILD 2020-11-28 14:01:33 UTC (rev 765252) @@ -1,58 +0,0 @@ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Daniel Micay <danielmi...@gmail.com> -# Contributor: simo <s...@archlinux.org> -# Contributor: Sid Karunaratne - -pkgname=tor -pkgver=0.4.4.5 -pkgrel=4 -pkgdesc='Anonymizing overlay network.' -arch=('x86_64') -url='https://www.torproject.org/' -license=('BSD') -depends=('openssl' 'libevent' 'bash' 'libseccomp' 'zstd' 'libcap' 'systemd-libs') -optdepends=('torsocks: for torify') -makedepends=('ca-certificates' 'systemd') -backup=('etc/tor/torrc') -source=("https://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} - 'torrc.patch' - 'torservice.patch' - 'tor.sysusers' - 'tor.tmpfiles') -b2sums=('b1c7342d5f1998b372529a8da1719a4f31c4e2516f9b666755b0edf29c7d66fa84a730fceed11e5c0bd1346f6fe06d7c96dd6a2161b0b2c3824468cd2f88f077' - 'SKIP' - 'ac2f3008108e736de3dd37895ad543d5c8cdcfa5ec3e09c93eed227d00a30a31636e3ef1db4cf8649a3c666e7844ea692ecd632a0ddba672efa3cfc1a64c529d' - '941e1b3ffdb9035219f484888c942db9c295b23feff571de0af8d3fe8836e1a4b0e606b6a3583aa581f2cd6e4f975aca0b883ef6ee7f2d5b50a4ef677fb5db52' - '9053da53926f2120ac57b6c1442238f5bbd89bf9270347c4e00b721b39939bebc6adfcf814a9d7289dfd14d085d91c193529305336db93190da5b7f586a031df' - '5d55d9a7e42b6ce78b8ab985bab37afe8f0bacddb5abd895c4a490adb8f98b9422f90b40066fef05ecf37b7b21e80aadc615c4b7f6e12b05581304113a1b1f1d') -validpgpkeys=('2133BC600AB133E1D826D173FE43009C4607B1FB' # Nick Mathewson - 'F65CE37F04BA5B360AE6EE17C218525819F78451') # Roger Dingledine - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - # install arch custom files - install -Dm0644 tor.sysusers "${pkgdir}"/usr/lib/sysusers.d/tor.conf - install -Dm0644 tor.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/tor.conf - - cd ${pkgname}-${pkgver} - # patch service file to fix FS#68157 - patch -Np1 < "${srcdir}/torservice.patch" - # uncomment essential config sections in the torrc file - patch -Np1 < "${srcdir}/torrc.patch" - - # invoke upstream install routine - make DESTDIR="${pkgdir}" install - install -Dm0644 contrib/dist/tor.service "${pkgdir}"/usr/lib/systemd/system/tor.service - - # install torrc - install -Dm0644 src/config/torrc.sample "${pkgdir}"/etc/tor/torrc - rm "${pkgdir}"/etc/tor/torrc.sample - - install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} Copied: tor/repos/community-x86_64/PKGBUILD (from rev 765251, tor/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-11-28 14:01:33 UTC (rev 765252) @@ -0,0 +1,58 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Daniel Micay <danielmi...@gmail.com> +# Contributor: simo <s...@archlinux.org> +# Contributor: Sid Karunaratne + +pkgname=tor +pkgver=0.4.4.6 +pkgrel=1 +pkgdesc='Anonymizing overlay network.' +arch=('x86_64') +url='https://www.torproject.org/' +license=('BSD') +depends=('openssl' 'libevent' 'bash' 'libseccomp' 'zstd' 'libcap' 'systemd-libs') +optdepends=('torsocks: for torify') +makedepends=('ca-certificates' 'systemd') +backup=('etc/tor/torrc') +source=("https://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'torrc.patch' + 'torservice.patch' + 'tor.sysusers' + 'tor.tmpfiles') +b2sums=('8eb5f22825193a61be42105ad32bd82e662c1859971fb2248fe05da2f80d1a3a9cbc96ee4f47f4127da56c328f5c60a6f57d5641cfa90b79becc8bf622f56f3f' + 'SKIP' + 'ac2f3008108e736de3dd37895ad543d5c8cdcfa5ec3e09c93eed227d00a30a31636e3ef1db4cf8649a3c666e7844ea692ecd632a0ddba672efa3cfc1a64c529d' + '941e1b3ffdb9035219f484888c942db9c295b23feff571de0af8d3fe8836e1a4b0e606b6a3583aa581f2cd6e4f975aca0b883ef6ee7f2d5b50a4ef677fb5db52' + '9053da53926f2120ac57b6c1442238f5bbd89bf9270347c4e00b721b39939bebc6adfcf814a9d7289dfd14d085d91c193529305336db93190da5b7f586a031df' + '5d55d9a7e42b6ce78b8ab985bab37afe8f0bacddb5abd895c4a490adb8f98b9422f90b40066fef05ecf37b7b21e80aadc615c4b7f6e12b05581304113a1b1f1d') +validpgpkeys=('2133BC600AB133E1D826D173FE43009C4607B1FB' # Nick Mathewson + 'F65CE37F04BA5B360AE6EE17C218525819F78451') # Roger Dingledine + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + # install arch custom files + install -Dm0644 tor.sysusers "${pkgdir}"/usr/lib/sysusers.d/tor.conf + install -Dm0644 tor.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/tor.conf + + cd ${pkgname}-${pkgver} + # patch service file to fix FS#68157 + patch -Np1 < "${srcdir}/torservice.patch" + # uncomment essential config sections in the torrc file + patch -Np1 < "${srcdir}/torrc.patch" + + # invoke upstream install routine + make DESTDIR="${pkgdir}" install + install -Dm0644 contrib/dist/tor.service "${pkgdir}"/usr/lib/systemd/system/tor.service + + # install torrc + install -Dm0644 src/config/torrc.sample "${pkgdir}"/etc/tor/torrc + rm "${pkgdir}"/etc/tor/torrc.sample + + install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} Deleted: tor.sysusers =================================================================== --- tor.sysusers 2020-11-28 14:01:25 UTC (rev 765251) +++ tor.sysusers 2020-11-28 14:01:33 UTC (rev 765252) @@ -1 +0,0 @@ -u tor 43 - /var/lib/tor Copied: tor/repos/community-x86_64/tor.sysusers (from rev 765251, tor/trunk/tor.sysusers) =================================================================== --- tor.sysusers (rev 0) +++ tor.sysusers 2020-11-28 14:01:33 UTC (rev 765252) @@ -0,0 +1 @@ +u tor 43 - /var/lib/tor Deleted: tor.tmpfiles =================================================================== --- tor.tmpfiles 2020-11-28 14:01:25 UTC (rev 765251) +++ tor.tmpfiles 2020-11-28 14:01:33 UTC (rev 765252) @@ -1 +0,0 @@ -d /var/lib/tor 0700 tor tor - - Copied: tor/repos/community-x86_64/tor.tmpfiles (from rev 765251, tor/trunk/tor.tmpfiles) =================================================================== --- tor.tmpfiles (rev 0) +++ tor.tmpfiles 2020-11-28 14:01:33 UTC (rev 765252) @@ -0,0 +1 @@ +d /var/lib/tor 0700 tor tor - - Deleted: torrc.patch =================================================================== --- torrc.patch 2020-11-28 14:01:25 UTC (rev 765251) +++ torrc.patch 2020-11-28 14:01:33 UTC (rev 765252) @@ -1,28 +0,0 @@ ---- a/src/config/torrc.sample 2020-10-06 18:11:24.173821006 +0200 -+++ b/src/config/torrc.sample 2020-10-06 18:11:06.000000000 +0200 -@@ -11,6 +11,7 @@ - ## - ## Tor will look for this file in various places based on your platform: - ## https://www.torproject.org/docs/faq#torrc -+User tor - - ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't - ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only -@@ -39,7 +40,7 @@ - ## Send every possible message to /var/log/tor/debug.log - #Log debug file /var/log/tor/debug.log - ## Use the system log instead of Tor's logfiles --#Log notice syslog -+Log notice syslog - ## To send all messages to stderr: - #Log debug stderr - -@@ -50,7 +51,7 @@ - - ## The directory for keeping all the keys/etc. By default, we store - ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. --#DataDirectory /var/lib/tor -+DataDirectory /var/lib/tor - - ## The port on which Tor will listen for local connections from Tor - ## controller applications, as documented in control-spec.txt. Copied: tor/repos/community-x86_64/torrc.patch (from rev 765251, tor/trunk/torrc.patch) =================================================================== --- torrc.patch (rev 0) +++ torrc.patch 2020-11-28 14:01:33 UTC (rev 765252) @@ -0,0 +1,28 @@ +--- a/src/config/torrc.sample 2020-10-06 18:11:24.173821006 +0200 ++++ b/src/config/torrc.sample 2020-10-06 18:11:06.000000000 +0200 +@@ -11,6 +11,7 @@ + ## + ## Tor will look for this file in various places based on your platform: + ## https://www.torproject.org/docs/faq#torrc ++User tor + + ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't + ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only +@@ -39,7 +40,7 @@ + ## Send every possible message to /var/log/tor/debug.log + #Log debug file /var/log/tor/debug.log + ## Use the system log instead of Tor's logfiles +-#Log notice syslog ++Log notice syslog + ## To send all messages to stderr: + #Log debug stderr + +@@ -50,7 +51,7 @@ + + ## The directory for keeping all the keys/etc. By default, we store + ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. +-#DataDirectory /var/lib/tor ++DataDirectory /var/lib/tor + + ## The port on which Tor will listen for local connections from Tor + ## controller applications, as documented in control-spec.txt. Deleted: torservice.patch =================================================================== --- torservice.patch 2020-11-28 14:01:25 UTC (rev 765251) +++ torservice.patch 2020-11-28 14:01:33 UTC (rev 765252) @@ -1,11 +0,0 @@ ---- a/contrib/dist/tor.service 2020-10-08 21:12:40.414833733 +0200 -+++ b/contrib/dist/tor.service 2020-10-08 21:12:42.751547264 +0200 -@@ -29,7 +29,7 @@ - ReadWriteDirectories=-/var/lib/tor - ReadWriteDirectories=-/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 Copied: tor/repos/community-x86_64/torservice.patch (from rev 765251, tor/trunk/torservice.patch) =================================================================== --- torservice.patch (rev 0) +++ torservice.patch 2020-11-28 14:01:33 UTC (rev 765252) @@ -0,0 +1,11 @@ +--- a/contrib/dist/tor.service 2020-10-08 21:12:40.414833733 +0200 ++++ b/contrib/dist/tor.service 2020-10-08 21:12:42.751547264 +0200 +@@ -29,7 +29,7 @@ + ReadWriteDirectories=-/var/lib/tor + ReadWriteDirectories=-/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