diff --git a/iproute2/PKGBUILD b/iproute2/PKGBUILD index 6df0ab7..d4bb0eb 100644 --- a/iproute2/PKGBUILD +++ b/iproute2/PKGBUILD @@ -8,7 +8,7 @@ ## rebuild after any libbpf upgrade ## pkgname=iproute2 pkgver=6.6.0 -pkgrel=01 +pkgrel=02 pkgdesc='IP Routing Utilities' url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git' depends=('glibc' 'iptables' 'libcap' 'libelf' 'libbpf') @@ -31,13 +31,13 @@ backup=('etc/iproute2/bpf_pinning' makedepends=('linux-atm' 'bison' 'gettext') #options=('staticlibs' 'debug') ## uncomment this and comment the following to have the debug pkg produced options=('staticlibs') -source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-v${pkgver}.tar."{xz,sign} +source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} "sha256sums::https://mirrors.edge.kernel.org/pub/linux/utils/net/$pkgname/sha256sums.asc" '0001-make-iproute2-fhs-compliant.patch' '0002-bdb-5-3.patch') prepare() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" # set correct fhs structure patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch @@ -50,7 +50,7 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" export CFLAGS+=' -ffat-lto-objects' @@ -59,7 +59,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install @@ -80,11 +80,10 @@ validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger # a70179085fa1b96d3c33b040c809b75e2b57563adc505a4ad05e2609df373463 iproute2-6.5.0.tar.xz # 71a43ebd4bbe023ac7e8dbf23b4d6a84439aac77d41e852c52b713ab675a22e4 iproute2-6.5.0.tar.sign -sha256sums=(77e49171a58ae1a507d890f76336a0b4704bb5057be5bb9b4d721c4b1d199d56 # iproute2-6.6.0.tar.xz - 9a556ea84acf340718bd05e6024db58caafc7fde6b94ed14e68429bcc9575ca2 # iproute2-v6.6.0.tar.sign - 9e5239f06e2bd76a726544747f57e28ddfd93ed152e8b644c70026ccbe1bc8e2 # sha256sums +sha256sums=(8738c804afd09f0bf756937f0c3de23117832a98d8cbbf50386cf5005cd613ce # iproute2-6.6.0.tar.xz + 10f8966db7020bbfd81c27b7089ea53cc1f9ad239664907dd6592caa7fd32a09 # iproute2-6.6.0.tar.sign + 379278ab7c6c8d7df196e7a36b8bfdf49104175697950d9259a457a91ac7be72 # sha256sums 758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d # 0001-make-iproute2-fhs-compliant.patch 611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6) # 0002-bdb-5-3.patch -## 2e9f162dba3b6f517832d9bf245d26147ea422111da12ee488a42265847bc1ce iproute2-6.6.0-01-x86_64.pkg.tar.lz - +## 0639d7add203f4dfe6b75ae44e04f47280d196e0851a8fcffe695ad04713ed99 iproute2-6.6.0-02-x86_64.pkg.tar.lz diff --git a/iproute2/PKGBUILD-arch b/iproute2/PKGBUILD-arch index c094915..04730f0 100644 --- a/iproute2/PKGBUILD-arch +++ b/iproute2/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=iproute2 pkgver=6.6.0 -pkgrel=1 +pkgrel=2 pkgdesc='IP Routing Utilities' arch=('x86_64') license=('GPL2') @@ -18,16 +18,16 @@ provides=('iproute') makedepends=('linux-atm') options=('staticlibs') validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger -source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-v${pkgver}.tar."{xz,sign} +source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} '0001-make-iproute2-fhs-compliant.patch' '0002-bdb-5-3.patch') -sha256sums=('77e49171a58ae1a507d890f76336a0b4704bb5057be5bb9b4d721c4b1d199d56' +sha256sums=('8738c804afd09f0bf756937f0c3de23117832a98d8cbbf50386cf5005cd613ce' 'SKIP' '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d' '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6') prepare() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" # set correct fhs structure patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch @@ -41,7 +41,7 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" export CFLAGS+=' -ffat-lto-objects' @@ -50,7 +50,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install diff --git a/iproute2/clean b/iproute2/clean index e8b71c5..76265cd 100644 --- a/iproute2/clean +++ b/iproute2/clean @@ -1 +1 @@ -rm -rf {src,pkg,iproute2-v*tar.xz*,*.sign,sha256sums} +rm -rf {src,pkg,iproute2-*tar.xz*,*.sign,sha256sums}