diff options
Diffstat (limited to 'net-vpn')
-rw-r--r-- | net-vpn/Manifest.gz | bin | 5033 -> 5031 bytes | |||
-rw-r--r-- | net-vpn/tinc/Manifest | 3 | ||||
-rw-r--r-- | net-vpn/tinc/files/tinc-1.1-tinfo.patch | 10 | ||||
-rw-r--r-- | net-vpn/tinc/tinc-1.1_pre15.ebuild | 8 | ||||
-rw-r--r-- | net-vpn/tor/Manifest | 2 | ||||
-rw-r--r-- | net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch | 12 | ||||
-rw-r--r-- | net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild | 85 |
7 files changed, 116 insertions, 4 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz Binary files differindex 7ff7625573b9..c1145fc0cd9a 100644 --- a/net-vpn/Manifest.gz +++ b/net-vpn/Manifest.gz diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest index d823d6a17bd3..86ed3d38f510 100644 --- a/net-vpn/tinc/Manifest +++ b/net-vpn/tinc/Manifest @@ -1,4 +1,5 @@ AUX tinc-1.1-fix-paths.patch 1469 BLAKE2B de939576010a60fa74e1bb5880a7eef2e0c77c7c853d3640d0b779642f0a2dbc83c927e8f9b75183a08cc72345c583139b28d0b3d345f5737be033b7eabea0b8 SHA512 55bd0e61a1d10a89d879d5113082f0cdb5ff6bf1d1fb3f618c459eb2658836bf602f72fe27ac03ec78746e300a3a5178db053eef6f08d3cb34b11410dbeb05de +AUX tinc-1.1-tinfo.patch 143 BLAKE2B a78500b9b020c6cd3f667f59459dd9b146baf7cdee90b96b2ed1ef62e4d9d55d8a8752f4a0544452e604d2a6962d29faf93fa6285475c9b39d72e95e94da2549 SHA512 d18d194b63dc71b8e45a0899ca325e722b4228b22370426265eaa669fb421a9b05fa87e42dbc23ce524ae61e62a99ca949e3f4d96be1f60fa0f77a8e8cb54419 AUX tinc.networks 387 BLAKE2B c3057322b46ee0186db4f2e9cadb8e60a318f5731e77a19e8c31e757c47c88afb8db6848f739511146bd0dc85ffdecea80c5be09890bcc3060a9b9ace9ecf855 SHA512 f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135 AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c8dd55e29d3916f8de0befdcef4ff7862b5f741406918bba2203c8b2e13548f874edad5c821 SHA512 1308d097487ef0f1fb1763ca99565edc1026c11159775a5d0c1e41905d8332b7df734460ccea5750a7b6dd5897ecffbe8e95cb721d94ffe5b7855ec4293dc360 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e @@ -11,5 +12,5 @@ DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a7890483703 EBUILD tinc-1.0.31.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c EBUILD tinc-1.0.32.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c -EBUILD tinc-1.1_pre15.ebuild 2395 BLAKE2B a2823e5cbd4eda68fe675606808458b2e8e77ca5bda77bf7d16d76fbb03c18bbb1bbd01998ff2a649048e958ee0b76370e0e1693c4f0c86c77f2ee6e15063e23 SHA512 debbc0e04ba85bde3ca88d3b60bc7b9523f25ddc13057618bd5bb22520d0af9517395e56cd8d97317e5485ed969400e74d2734a826dc0ef96a71df5262c97f0c +EBUILD tinc-1.1_pre15.ebuild 2463 BLAKE2B 4af2897de07c7451630edf7ad2d8760556dbf4bcbc1cbbc32122ce1b4c946f4ce865e1f30c334afd2328ccd9bcee9bbe7500357064065bcc7eb5a91a41642e38 SHA512 0f40a4c374d06758444aa9748d46ea61324445027eff5c6d94bd8af96dc3341ef2e78d7ccd6cdbd72904f8803e09c83863febe98262019027d6e52955e2c832e MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac diff --git a/net-vpn/tinc/files/tinc-1.1-tinfo.patch b/net-vpn/tinc/files/tinc-1.1-tinfo.patch new file mode 100644 index 000000000000..5a9ec01473df --- /dev/null +++ b/net-vpn/tinc/files/tinc-1.1-tinfo.patch @@ -0,0 +1,10 @@ +--- a/m4/curses.m4 ++++ b/m4/curses.m4 +@@ -39,6 +39,7 @@ + )] + ) + ]) ++ AC_SEARCH_LIBS(stdscr, tinfo) + + AC_SUBST(CURSES_LIBS) + ]) diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild index a1b29bd75463..57d5cee18286 100644 --- a/net-vpn/tinc/tinc-1.1_pre15.ebuild +++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -8,7 +8,7 @@ MY_P=${PN}-${MY_PV} PYTHON_COMPAT=( python2_7 ) -inherit eutils multilib python-single-r1 systemd +inherit autotools multilib python-single-r1 systemd DESCRIPTION="tinc is an easy to configure VPN implementation" HOMEPAGE="http://www.tinc-vpn.org/" @@ -41,7 +41,6 @@ DEPEND=" zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND} vde? ( net-misc/vde )" - S="${WORKDIR}/${MY_P}" src_prepare() { @@ -55,7 +54,10 @@ src_prepare() { fi eapply "${FILESDIR}"/tinc-1.1-fix-paths.patch #560528 + eapply "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 eapply_user + + eautoreconf } src_configure() { diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest index c709a8e2a8ea..1a0a3d49bceb 100644 --- a/net-vpn/tor/Manifest +++ b/net-vpn/tor/Manifest @@ -1,5 +1,6 @@ AUX README.gentoo 316 BLAKE2B 9c962395e49a2eff8411e7fb3996d99e504b0023712151acdd6bee43755be89d52c970cbf7e5aae62c0adfb33ff7ad072578b88a40857bffb359a3d2c8571947 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660 AUX tor-0.2.7.4-torrc.sample.patch 1345 BLAKE2B 4540ae1b32a83a80a844a5e4dce32cb3fc0b196a685eb0232a0eaef259e2019687541a435cd9d6433759e8ef98197eb1a0757a8388011fbda336c25fa71c9c76 SHA512 7b49338ec86ed30d69b0d3b77bf45507139267a4e12c9810277a253287510d388a6d4026601552396ad76712c5d2970aa9f47d3ede9d16d82d5b68db8e0fff6a +AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e9114c69ba738a5849e28b886cb7326bb4f0e8b40861407f40ca21988ac188280a4eb8031cba699eda63e66b968013a9796713a5468 SHA512 ef4023423cd96c85106d0dcd3f381ffa1adcfab8c4ae49046c3dc4a45c61401e0db205483144421f620279f6a989c821c581f202561e5c24da7ccdc61a267521 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 @@ -10,5 +11,6 @@ DIST tor-0.3.3.2-alpha.tar.gz 6487418 BLAKE2B e1d574640c88249d0930da386c3421eb0f EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c EBUILD tor-0.3.1.9-r1.ebuild 2019 BLAKE2B 8bbf2b10bad9d163551fd700e477d8123cb75d3a3d11030d8bdc132e9d5db2247e5c8e7e1ffebeeec349ace1e99b3a142f60e0ace92de0e64b79794dba5cc3cd SHA512 9a294302ef07cefa8e7461758f861e9c9d0c1c4e01bd4b096d989ba08e77216131d6ff7ed7fa92c73a9c8837873186b5c8a7d0ca87785c304d3afa447315e813 EBUILD tor-0.3.2.9.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905 +EBUILD tor-0.3.3.2_alpha-r1.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f EBUILD tor-0.3.3.2_alpha.ebuild 2142 BLAKE2B 3482c9f988da8b2fe8cf7dbcd53a2c2dfe86b960240422aa927522e3c57a0eccfdd5abca4d56724f36399c9f6c07a043e7d72bd5ae45b2832b33594b4a811ab7 SHA512 e2653dcdeec3339effb79164c991cde78e691749866abb9ee4f8813ef7eb6abd51ce8eab846b9027b1784236b6c3be0a316bb2730de72777bc031b6d2396ec5f MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b diff --git a/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch b/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch new file mode 100644 index 000000000000..76e88bbaba99 --- /dev/null +++ b/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch @@ -0,0 +1,12 @@ +--- a/contrib/dist/tor.service.in 2017-11-11 13:40:46.000000000 -0500 ++++ b/contrib/dist/tor.service.in 2018-02-24 19:06:12.307506884 -0500 +@@ -21,6 +21,9 @@ + LimitNOFILE=32768 + + # Hardening ++Group=tor ++RuntimeDirectory=tor ++RuntimeDirectoryMode=0770 + PrivateTmp=yes + PrivateDevices=yes + ProtectHome=yes diff --git a/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild b/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild new file mode 100644 index 000000000000..655250741364 --- /dev/null +++ b/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit flag-o-matic readme.gentoo-r1 systemd versionator user + +MY_PV="$(replace_version_separator 4 -)" +MY_PF="${PN}-${MY_PV}" +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz + https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz" +S="${WORKDIR}/${MY_PF}" + +LICENSE="BSD GPL-2" +SLOT="0" +# We need to keyword app-arch/zstd +#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos" +IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd" + +DEPEND=" + app-text/asciidoc + dev-libs/libevent[ssl] + sys-libs/zlib + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + lzma? ( app-arch/xz-utils ) + scrypt? ( app-crypt/libscrypt ) + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd ) + zstd? ( app-arch/zstd )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-tor )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch + "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch +) + +DOCS=( README ChangeLog ReleaseNotes doc/HACKING ) + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}/var" \ + --enable-system-torrc \ + --enable-asciidoc \ + --disable-android \ + --disable-libfuzzer \ + --disable-rust \ + --disable-restart-debugging \ + $(use_enable lzma) \ + $(use_enable scrypt libscrypt) \ + $(use_enable seccomp) \ + $(use_enable systemd) \ + $(use_enable tor-hardening gcc-hardening) \ + $(use_enable tor-hardening linker-hardening) \ + $(use_enable web tor2web-mode) \ + $(use_enable test unittests) \ + $(use_enable test coverage) \ + $(use_enable zstd) +} + +src_install() { + default + readme.gentoo_create_doc + + newconfd "${FILESDIR}"/tor.confd tor + newinitd "${FILESDIR}"/tor.initd-r8 tor + systemd_dounit contrib/dist/tor.service + + keepdir /var/lib/tor + + fperms 750 /var/lib/tor + fowners tor:tor /var/lib/tor + + insinto /etc/tor/ + newins "${FILESDIR}"/torrc-r1 torrc +} |