From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A7C31382C5 for ; Mon, 28 Dec 2020 16:01:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95277E0CCC; Mon, 28 Dec 2020 16:01:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 698D1E0CCC for ; Mon, 28 Dec 2020 16:01:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27AE034158C for ; Mon, 28 Dec 2020 16:01:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD8A1CC for ; Mon, 28 Dec 2020 16:01:51 +0000 (UTC) From: "Jason A. Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" Message-ID: <1609171307.afb18759f2652a16aae3ac7553e6aca576ec334b.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard-modules/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/wireguard-modules/Manifest net-vpn/wireguard-modules/wireguard-modules-1.0.20201112.ebuild net-vpn/wireguard-modules/wireguard-modules-1.0.20201221.ebuild X-VCS-Directories: net-vpn/wireguard-modules/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: afb18759f2652a16aae3ac7553e6aca576ec334b X-VCS-Branch: master Date: Mon, 28 Dec 2020 16:01:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84c4d9a2-4f2b-47bf-8a3b-da1bd93320ad X-Archives-Hash: 29c0d2fe60d04725d0272915d8f59571 commit: afb18759f2652a16aae3ac7553e6aca576ec334b Author: Jason A. Donenfeld gentoo org> AuthorDate: Mon Dec 28 16:01:17 2020 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Mon Dec 28 16:01:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb18759 net-vpn/wireguard-modules: stable trivial bump Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Jason A. Donenfeld gentoo.org> net-vpn/wireguard-modules/Manifest | 1 - .../wireguard-modules-1.0.20201112.ebuild | 99 ---------------------- .../wireguard-modules-1.0.20201221.ebuild | 2 +- 3 files changed, 1 insertion(+), 101 deletions(-) diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest index b07af4b2aae..b1b69be60db 100644 --- a/net-vpn/wireguard-modules/Manifest +++ b/net-vpn/wireguard-modules/Manifest @@ -1,2 +1 @@ -DIST wireguard-linux-compat-1.0.20201112.tar.xz 262220 BLAKE2B 2bbcce294c7d0578e820b285074bdbff2c96908ccc10294e05aa846a6f0b614930ca71536cb954233480c9e294692df1f4954b8f11db86deecdc93373b6e1d4f SHA512 c3ad6611d1d8abf163e6626ceeb1329b8b4a745159021473fee134858e22f6a5d3418b39f165f2f2f0bde1891d560f773cdb4d1f4fb60d61b35aff01d59aee54 DIST wireguard-linux-compat-1.0.20201221.tar.xz 262596 BLAKE2B fffd0f3a5501aa5ad0e52f3210edf507b0db63230d59b3204104584cc2b1d739311262a0e0180ce5cd5d6e74c5228d01a631fdbba8be9788bda2d80df8cfcbd0 SHA512 1b06eeda525903661657cae4f462cf2ef464bce292b0a9ae37425d254142ed4137ca7a2296da0f11447f89a4d921c3cb7cee018a4f691131541f0ec32f99c458 diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20201112.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20201112.ebuild deleted file mode 100644 index a3aea3fe6a5..00000000000 --- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20201112.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-linux-compat" -else - SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz" - S="${WORKDIR}/wireguard-linux-compat-${PV}" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug +module module-src" - -DEPEND="" -RDEPEND="${DEPEND}" - -MODULE_NAMES="wireguard(kernel/drivers/net:src)" -BUILD_TARGETS="module" -CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI" - -pkg_setup() { - if use module; then - linux-mod_pkg_setup - if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then - eerror - eerror "WireGuard has been merged upstream into this kernel. Therefore," - eerror "you no longer need this compatibility ebuild. Instead, simply" - eerror "enable CONFIG_WIREGUARD=y in your kernel configuration." - eerror - die "Use CONFIG_WIREGUARD=y for this kernel, and do not use this package." - elif kernel_is -lt 3 10 0 || kernel_is -ge 5 6 0; then - die "This version of ${PN} requires Linux >= 3.10 and < 5.6." - fi - fi -} - -src_compile() { - BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}" - use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}" - use module && linux-mod_src_compile -} - -src_install() { - use module && linux-mod_src_install - 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 - - if use module; then - linux-mod_pkg_postinst - 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-modules/wireguard-modules-1.0.20201221.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20201221.ebuild index a346e8fae15..a3aea3fe6a5 100644 --- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20201221.ebuild +++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20201221.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz" S="${WORKDIR}/wireguard-linux-compat-${PV}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86" fi LICENSE="GPL-2"