From 27dfd272ae3be15b1017f733682211afa1c7c0f0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 2 Nov 2017 21:07:25 +0000 Subject: gentoo resync : 02.11.2017 --- net-vpn/wireguard/Manifest | 6 +- .../wireguard-0.0.20171017-blake-headers.patch | 25 ---- .../files/wireguard-0.0.20171101-funcfix.patch | 40 ++++++ net-vpn/wireguard/wireguard-0.0.20171017.ebuild | 138 --------------------- net-vpn/wireguard/wireguard-0.0.20171101.ebuild | 138 +++++++++++++++++++++ 5 files changed, 181 insertions(+), 166 deletions(-) delete mode 100644 net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch create mode 100644 net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch delete mode 100644 net-vpn/wireguard/wireguard-0.0.20171017.ebuild create mode 100644 net-vpn/wireguard/wireguard-0.0.20171101.ebuild (limited to 'net-vpn/wireguard') diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest index ab5ee6b395ff..9ca306449162 100644 --- a/net-vpn/wireguard/Manifest +++ b/net-vpn/wireguard/Manifest @@ -1,6 +1,6 @@ -AUX wireguard-0.0.20171017-blake-headers.patch 606 SHA256 f65edb61bf190f80ecbd082e086fd491178400b67c5e5067cb9062873808fd30 SHA512 d2aca681482d3b7b669c8a8618a305a7e6d6b8fdf6632b4f98f2bedde646ff9f0f68ae51805651a8618f6fd4bdefe855042a4474540ad0f36a51ac9604032362 WHIRLPOOL 02374f6372eb6a5841e5c2e585e1c75694ee42bcb97553c8364b4e8d5c2c73a520cca7150c3fa3b78582c03328cfdc0d6a5678e1613709d4093faeeece98d666 +AUX wireguard-0.0.20171101-funcfix.patch 1588 SHA256 a42d55bac43531240177eec8bbc723f1f41f9d65584c8149815da86e74b27c1b SHA512 dbf2a6cdd6c0e847b163f8ebbb73e6b5918a818d2e409588bd9661b01412fd5c14bc1d8eb29e12f0a825526435727b54c20ae6ff4891dbceefe224b8dc152a91 WHIRLPOOL 7a2a9bb28d9e9ef12e97f986ba7220ac0de77dd375077b9362731a0fef129610a81e7fbc49df7eb75adba67c19f1aaf6fb9592172b7d3e4103e2377d91395560 AUX wireguard-openrc.sh 915 SHA256 f425a60ef4ec42df025df182a474e4ce7157f9fa400ac22a813b33f8421c4d23 SHA512 dd21d8558b4c5ff0fb02a35b6996f1f89ea0e59c885523b9443aafdebcfb23cab3e60f248594d416245a5829b36103566a7a59f41183a9990451c35aa6933dcb WHIRLPOOL a7889f5429a658674a28b913bd1d629024403539fa9ba7742e5c4feaccf3878aaba9f5a062281ceaace163c51abd841edacc104f080cc481b41917135df19b06 -DIST WireGuard-0.0.20171017.tar.xz 171724 SHA256 57b79a62874d9b99659a744513d4f6f9d88cb772deaa99e485b6fed3004a35cd SHA512 134a1cbcdae6f3fa56e2c557f08eaae89e14f6b8455ffb818e1bb4113905298f26c170b3ee73129f895089407e86809047ae6813cd7a31db55b6b9a89f361edb WHIRLPOOL 255c9b91aa80d0e92d92249665c995331c17d7ff1e3574184464c70a784aa21d837b2bf4d63997c777e3abd584715f7676f65e51243e8a2a41b1f2453df2f961 -EBUILD wireguard-0.0.20171017.ebuild 4831 SHA256 826fece714b6a9cf5061d5a23c9d15a7fdb2d9a4c4c4e38ffa9ed340f19140e7 SHA512 c71c3547fa24065a4a3d55de3bd6b9c14a80df10e980bf3909bb3931e781f83ac9a0452bf98b92db91e332f2f75ceb62477da6ce299da8556d9f5ba6bd558f25 WHIRLPOOL a8a4cc5893b365af398d8493cedc8916640ad3b998e27a11c32f9c9ff8380a8d72406916b5ff7a4401c660c601c54845d632299ca57fdc2b92dc5cd0703d9f89 +DIST WireGuard-0.0.20171101.tar.xz 173952 SHA256 096b6482a65e566c7bf8c059f5ee6aadb2de565b04b6d810c685f1c377540325 SHA512 c3a394256cf3cc2dce75dcb299f54969f74d4076a351b61972f10fb3e69191756c0c32552a5acc7e0cd5919c248f12035e6a33f15e43fdad64c6cf1230511ee3 WHIRLPOOL 0166c6e2c03a979719798332c8f6f0bae9f9586368d7d0f8cc9c3ee2ae7d6b15133caff1f665d1e99ab7e568a41dc1c64f94887f1461a1660a3c87b0d8a1f4a5 +EBUILD wireguard-0.0.20171101.ebuild 4825 SHA256 5530b5b4e936a636b83503cb4bfe42f25f952d9b65a4ae791380bb6c0933743f SHA512 46d70e262fadee21fd00dbec765f911f0c24d9959e337d1318c2bed59c27ce212b5d41532c6a31a33735e0fe4749bc6e66abde120e39ddc2350d0833ac8d6cc4 WHIRLPOOL 8536df2c08c0c4e448301a1eadd8fd8569ccf74103d8f5bfa6363cdaea49b9dc41d9da8dff74389d7e863159dec9c2658c83bf28214922cc373d182f1ffa7f3e EBUILD wireguard-9999.ebuild 4779 SHA256 09ec1cc8c1b84396038b34b81ebd935d088c2119e04f417ae4d782bc7d9b7cec SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f WHIRLPOOL 69fbaff57cc11b87c321f07b49a817314bb778afc6e1edfd36310d768faa8503a8c2bd1404a3b322201cf3748ac9f04a538be3021ec397e2cbd995c9717f1475 MISC metadata.xml 765 SHA256 b39a60fb08df46968b7200955f3568c1437afa566283c2962c7bb03e155392bf SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805 WHIRLPOOL fd59215f63552e46f26cb7d7545f2ef3ee270433afe764e6408acd5dfc5f1bf88269cd02ea1fcd8bcf8b6857d83ae7558119cf6fa5c48dca00c48d11a63c78c7 diff --git a/net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch b/net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch deleted file mode 100644 index d083a80fb5b8..000000000000 --- a/net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cf21875fe39d21bff2028a78921e03d96dc56e5a Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Sat, 21 Oct 2017 01:30:45 +0200 -Subject: blake2: include headers for macros - ---- - src/crypto/blake2s.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/crypto/blake2s.h b/src/crypto/blake2s.h -index 615010f..99de9f9 100644 ---- a/src/crypto/blake2s.h -+++ b/src/crypto/blake2s.h -@@ -4,6 +4,8 @@ - #define _WG_BLAKE2S_H - - #include -+#include -+#include - - enum blake2s_lengths { - BLAKE2S_BLOCKBYTES = 64, --- -cgit v1.1-31-g4243 - diff --git a/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch b/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch new file mode 100644 index 000000000000..fe74e48b5dd4 --- /dev/null +++ b/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch @@ -0,0 +1,40 @@ +From cc310a5dd1899417971e993d61d1230b14fe4f87 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Thu, 2 Nov 2017 16:07:26 +0100 +Subject: global: revert checkpatch.pl changes + +These changes were suggested by checkpatch.pl, but actually cause big +problems depending on the options. Revert. +--- + src/noise.c | 2 +- + src/peer.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/noise.c b/src/noise.c +index a0bea29..6ce9b78 100644 +--- a/src/noise.c ++++ b/src/noise.c +@@ -118,7 +118,7 @@ void noise_keypair_put(struct noise_keypair *keypair) + + struct noise_keypair *noise_keypair_get(struct noise_keypair *keypair) + { +- RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Calling " __func__ " without holding the RCU BH read lock"); ++ RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Taking noise keypair reference without holding the RCU BH read lock"); + if (unlikely(!keypair || !kref_get_unless_zero(&keypair->refcount))) + return NULL; + return keypair; +diff --git a/src/peer.c b/src/peer.c +index 1580262..81b71d4 100644 +--- a/src/peer.c ++++ b/src/peer.c +@@ -58,7 +58,7 @@ struct wireguard_peer *peer_create(struct wireguard_device *wg, const u8 public_ + + struct wireguard_peer *peer_get(struct wireguard_peer *peer) + { +- RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Calling " __func__ " without holding the RCU read lock"); ++ RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Taking peer reference without holding the RCU read lock"); + if (unlikely(!peer || !kref_get_unless_zero(&peer->refcount))) + return NULL; + return peer; +-- +cgit v1.1-33-gc3c0 diff --git a/net-vpn/wireguard/wireguard-0.0.20171017.ebuild b/net-vpn/wireguard/wireguard-0.0.20171017.ebuild deleted file mode 100644 index 64a7738a1b8a..000000000000 --- a/net-vpn/wireguard/wireguard-0.0.20171017.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MODULES_OPTIONAL_USE="module" -inherit linux-mod bash-completion-r1 - -DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography." -HOMEPAGE="https://www.wireguard.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.zx2c4.com/WireGuard" - KEYWORDS="" -else - SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz" - S="${WORKDIR}/WireGuard-${PV}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug +module +tools module-src" - -DEPEND="tools? ( net-libs/libmnl )" -RDEPEND="${DEPEND}" - -MODULE_NAMES="wireguard(kernel/drivers/net:src)" -BUILD_TARGETS="module" -CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER" - -PATCHES=( "${FILESDIR}/${P}-blake-headers.patch" ) - -pkg_setup() { - if use module; then - linux-mod_pkg_setup - kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10" - fi -} - -src_compile() { - BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" - use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}" - use module && linux-mod_src_compile - use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools -} - -src_install() { - use module && linux-mod_src_install - if use tools; then - dodoc README.md - dodoc -r contrib/examples - emake \ - WITH_BASHCOMPLETION=yes \ - WITH_SYSTEMDUNITS=yes \ - WITH_WGQUICK=yes \ - DESTDIR="${D}" \ - BASHCOMPDIR="$(get_bashcompdir)" \ - PREFIX="${EPREFIX}/usr" \ - -C src/tools install - insinto /$(get_libdir)/netifrc/net - newins "${FILESDIR}"/wireguard-openrc.sh wireguard.sh - fi - use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install -} - -pkg_postinst() { - if use module-src && ! use module; then - einfo - einfo "You have enabled the module-src USE flag without the module USE" - einfo "flag. This means that sources are installed to" - einfo "${ROOT}usr/src/wireguard instead of having the" - einfo "kernel module compiled. You will need to compile the module" - einfo "yourself. Most likely, you don't want this USE flag, and should" - einfo "rather use USE=module" - einfo - fi - use module && linux-mod_pkg_postinst - - einfo - einfo "This software is experimental and has not yet been released." - einfo "As such, it may contain significant issues. Please do not file" - einfo "bug reports with Gentoo, but rather direct them upstream to:" - einfo - einfo " team@wireguard.com security@wireguard.com" - einfo - - if use tools; then - einfo - einfo "After installing WireGuard, if you'd like to try sending some packets through" - einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh" - einfo "test example script:" - einfo - einfo " \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -" - einfo - einfo "This will automatically setup interface wg0, through a very insecure transport" - einfo "that is only suitable for demonstration purposes. You can then try loading the" - einfo "hidden website or sending pings:" - einfo - einfo " \$ chromium http://192.168.4.1" - einfo " \$ ping 192.168.4.1" - einfo - einfo "If you'd like to redirect your internet traffic, you can run it with the" - einfo "\"default-route\" argument. You may not use this server for any abusive or illegal" - einfo "purposes. It is for quick testing only." - einfo - einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/" - einfo - fi - if use module; then - local old new - if [[ $(uname -r) != "${KV_FULL}" ]]; then - ewarn - ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running" - ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently" - ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for" - ewarn "which this module was built." - ewarn - elif [[ -f /sys/module/wireguard/version ]] && \ - old="$(< /sys/module/wireguard/version)" && \ - new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \ - [[ $old != "$new" ]]; then - ewarn - ewarn "You appear to have just upgraded WireGuard from version v$old to v$new." - ewarn "However, the old version is still running on your system. In order to use the" - ewarn "new version, you will need to remove the old module and load the new one. As" - ewarn "root, you can accomplish this with the following commands:" - ewarn - ewarn " # rmmod wireguard" - ewarn " # modprobe wireguard" - ewarn - ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want" - ewarn "to gracefully remove them yourself prior." - ewarn - fi - fi -} diff --git a/net-vpn/wireguard/wireguard-0.0.20171101.ebuild b/net-vpn/wireguard/wireguard-0.0.20171101.ebuild new file mode 100644 index 000000000000..579c9736f073 --- /dev/null +++ b/net-vpn/wireguard/wireguard-0.0.20171101.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MODULES_OPTIONAL_USE="module" +inherit linux-mod bash-completion-r1 + +DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography." +HOMEPAGE="https://www.wireguard.com/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.zx2c4.com/WireGuard" + KEYWORDS="" +else + SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz" + S="${WORKDIR}/WireGuard-${PV}" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug +module +tools module-src" + +DEPEND="tools? ( net-libs/libmnl )" +RDEPEND="${DEPEND}" + +MODULE_NAMES="wireguard(kernel/drivers/net:src)" +BUILD_TARGETS="module" +CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER" + +PATCHES=( "${FILESDIR}/${P}-funcfix.patch" ) + +pkg_setup() { + if use module; then + linux-mod_pkg_setup + kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10" + fi +} + +src_compile() { + BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" + use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}" + use module && linux-mod_src_compile + use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools +} + +src_install() { + use module && linux-mod_src_install + if use tools; then + dodoc README.md + dodoc -r contrib/examples + emake \ + WITH_BASHCOMPLETION=yes \ + WITH_SYSTEMDUNITS=yes \ + WITH_WGQUICK=yes \ + DESTDIR="${D}" \ + BASHCOMPDIR="$(get_bashcompdir)" \ + PREFIX="${EPREFIX}/usr" \ + -C src/tools install + insinto /$(get_libdir)/netifrc/net + newins "${FILESDIR}"/wireguard-openrc.sh wireguard.sh + fi + use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install +} + +pkg_postinst() { + if use module-src && ! use module; then + einfo + einfo "You have enabled the module-src USE flag without the module USE" + einfo "flag. This means that sources are installed to" + einfo "${ROOT}usr/src/wireguard instead of having the" + einfo "kernel module compiled. You will need to compile the module" + einfo "yourself. Most likely, you don't want this USE flag, and should" + einfo "rather use USE=module" + einfo + fi + use module && linux-mod_pkg_postinst + + einfo + einfo "This software is experimental and has not yet been released." + einfo "As such, it may contain significant issues. Please do not file" + einfo "bug reports with Gentoo, but rather direct them upstream to:" + einfo + einfo " team@wireguard.com security@wireguard.com" + einfo + + if use tools; then + einfo + einfo "After installing WireGuard, if you'd like to try sending some packets through" + einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh" + einfo "test example script:" + einfo + einfo " \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -" + einfo + einfo "This will automatically setup interface wg0, through a very insecure transport" + einfo "that is only suitable for demonstration purposes. You can then try loading the" + einfo "hidden website or sending pings:" + einfo + einfo " \$ chromium http://192.168.4.1" + einfo " \$ ping 192.168.4.1" + einfo + einfo "If you'd like to redirect your internet traffic, you can run it with the" + einfo "\"default-route\" argument. You may not use this server for any abusive or illegal" + einfo "purposes. It is for quick testing only." + einfo + einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/" + einfo + fi + if use module; then + local old new + if [[ $(uname -r) != "${KV_FULL}" ]]; then + ewarn + ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running" + ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently" + ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for" + ewarn "which this module was built." + ewarn + elif [[ -f /sys/module/wireguard/version ]] && \ + old="$(< /sys/module/wireguard/version)" && \ + new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \ + [[ $old != "$new" ]]; then + ewarn + ewarn "You appear to have just upgraded WireGuard from version v$old to v$new." + ewarn "However, the old version is still running on your system. In order to use the" + ewarn "new version, you will need to remove the old module and load the new one. As" + ewarn "root, you can accomplish this with the following commands:" + ewarn + ewarn " # rmmod wireguard" + ewarn " # modprobe wireguard" + ewarn + ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want" + ewarn "to gracefully remove them yourself prior." + ewarn + fi + fi +} -- cgit v1.2.3