From 6301e3add45c8a42c8c4b40dc32dc1ddebb4401f Mon Sep 17 00:00:00 2001 From: Iurii Egorov Date: Tue, 22 Oct 2024 15:30:01 +0300 Subject: [PATCH] Fix kernel download for newer Fedora kernels, and Ubuntu 24 package build fixes --- amneziawg-dkms.spec | 6 +++++- debian/control | 2 -- kernel-tree-scripts/prepare-sources.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/amneziawg-dkms.spec b/amneziawg-dkms.spec index 0b7e8ab..fa7613a 100644 --- a/amneziawg-dkms.spec +++ b/amneziawg-dkms.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: amneziawg-dkms -Version: 1.0.20240711 +Version: 1.0.20241022 Release: 1%{?dist} Epoch: 1 URL: https://www.wireguard.com/ @@ -25,6 +25,7 @@ Requires: bc Requires: yum-utils Requires: rpm-build Requires: python3-devel +Requires: git %description WireGuard is a novel VPN that runs inside the Linux Kernel and uses @@ -88,6 +89,9 @@ exit 0 %{_usrsrc}/amneziawg-%{version} %changelog +* Thu Oct 22 2024 Yuri Egorov - 1.0.20241022-1 +- Update to 1.0.20241022 + * Thu Feb 1 2024 Yuri Egorov - 1.0.20240201-1 - Update to 1.0.20240201 diff --git a/debian/control b/debian/control index eecdde3..8910b04 100755 --- a/debian/control +++ b/debian/control @@ -4,8 +4,6 @@ Priority: optional Maintainer: unidentified attacker Build-Depends: debhelper, - dh-dkms | dkms, - dh-sequence-dkms | dkms, dkms Standards-Version: 4.5.1 Homepage: https://amnezia.org diff --git a/kernel-tree-scripts/prepare-sources.sh b/kernel-tree-scripts/prepare-sources.sh index 34405ff..29b841a 100755 --- a/kernel-tree-scripts/prepare-sources.sh +++ b/kernel-tree-scripts/prepare-sources.sh @@ -83,7 +83,7 @@ else rm -rf "${HOME}/.rpmmacros" [ -f "${HOME}/.rpmmacros.orig" ] && mv "${HOME}/.rpmmacros.orig" "${HOME}/.rpmmacros" cd ../BUILD || exit 255 - cd "$(ls -d */)" || exit 255 + cd "$(find ./* -maxdepth 0 -type d | sort | head -n 1)" || exit 255 cd "$(ls -d linux*/)" || exit 255 fi