diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-01-14 02:09:05 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-01-14 02:09:05 +0000 |
| commit | 82955cf75cb2fe1bc7596d739dca4abd15b46318 (patch) | |
| tree | 49a018e2ab83fa7600f17552689f3388cab5f010 | |
| parent | 1b5ac6b603626d26dbb3484ae4cb7624cb18a620 (diff) | |
| parent | 526bd9f0171eaf47e620714600c0c684eaa764ca (diff) | |
| download | packages-82955cf75cb2fe1bc7596d739dca4abd15b46318.tar.gz packages-82955cf75cb2fe1bc7596d739dca4abd15b46318.tar.bz2 packages-82955cf75cb2fe1bc7596d739dca4abd15b46318.tar.xz packages-82955cf75cb2fe1bc7596d739dca4abd15b46318.zip | |
Merge branch 'lr.wg' into 'master'
Bump wireguard packages
See merge request adelie/packages!392
| -rw-r--r-- | user/wireguard-module/APKBUILD | 18 | ||||
| -rw-r--r-- | user/wireguard-tools/APKBUILD | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index 614beff16..e77179680 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -1,11 +1,9 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> -# KEEP THIS IN SYNC with the other wireguard-module packages. -_kflavour="" _kver="5.4.5-mc0" -pkgver=0.0.20191226 +pkgver=0.0.20200105 pkgrel=0 -_pkgname="wireguard-module$_kflavour" +_pkgname="wireguard-module" pkgname="$_pkgname-$_kver" _pkgreal="wireguard-linux-compat" pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" @@ -14,23 +12,23 @@ arch="all" options="!check !dbg !strip" # no test suite license="GPL-2.0-only" provides="$_pkgname=$pkgver" -depends="easy-kernel$_kflavour-modules-$_kver" -makedepends="easy-kernel$_kflavour-src-$_kver" +depends="easy-kernel-modules-$_kver" +makedepends="easy-kernel-src-$_kver" subpackages="wireguard-patch:_patch:noarch" source="https://git.zx2c4.com/$_pkgreal/snapshot/$_pkgreal-$pkgver.tar.xz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module + make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver" module } package() { if [ -f $HOME/kernel_key.pem ]; then - /usr/src/linux-$_kver$_kflavour/scripts/sign-file sha512 \ + /usr/src/linux-$_kver/scripts/sign-file sha512 \ $HOME/kernel_key.pem $HOME/kernel_key.pem \ "$builddir"/src/wireguard.ko fi - make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install + make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver" INSTALL_MOD_PATH="$pkgdir" module-install } _patch() { @@ -41,4 +39,4 @@ _patch() { "$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" } -sha512sums="7eba183128555ca5fd8b171179fe8ec7b9a67c618ad000bc9c5475ff74097e0e2c220a1f1dd82393fbde6dbbba5c1114bfd725e733a5f4acfbb23248538f6afb wireguard-linux-compat-0.0.20191226.tar.xz" +sha512sums="a27d863e7af9ecbdad784d9ebd6b7613cb6a3a8749d2552c0ecc932c606ed08effc9600813d8cc6801748041456d6e59aab28b9ba486986c88f3d2e90a9209bd wireguard-linux-compat-0.0.20200105.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index 21875f043..37aeb1ab7 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireguard-tools -pkgver=1.0.20191226 +pkgver=1.0.20200102 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -32,4 +32,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="e6b7fc34f9517efc830b751e054e811acdd7f210e8f68b5ad5a503ee0c081bcb1a65e64e82a0b66ddfea9ef3ea0ca3210d5620c278d1b17442e233be1734ef03 wireguard-tools-1.0.20191226.tar.xz" +sha512sums="a4275eefc55b2a7ed3935a46a2098f9b0acdfaf0e1ed33ca42b51a186b388b53425ded5887e2cfc5be2802d6a453b8ebbf0294800ec1307a2dc21f46bd040da6 wireguard-tools-1.0.20200102.tar.xz" |