upg curl iproute2

This commit is contained in:
joborun linux 2023-02-21 11:40:13 +02:00
parent 9c802b0042
commit 3f8276510d
6 changed files with 68 additions and 63 deletions

View file

@ -8,10 +8,10 @@
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
#pkgver=7.88.0
_tag='67c55cb8b3f5a530478201fd780a533fce92b2eb' # git rev-parse v${_tag_name}
_tag_name='7_88_0'
_tag='b3d2310c6441c075cdad12155da944886f1974a6' # git rev-parse v${_tag_name}
_tag_name='7_88_1'
pkgver="${_tag_name//_/.}"
pkgrel=04
pkgrel=01
pkgdesc='command line tool and library for transferring data with URLs - w/o ipv6 & zstd'
arch=('x86_64')
url='https://curl.haxx.se'
@ -27,8 +27,8 @@ provides=('libcurl.so')
source=("git+https://github.com/bagder/curl.git#tag=${_tag}?signed")
_backports=(
# git master
'curl-7_88_0..8c939453f587b8565af33927361edf40b48544ea'
# # git master
# 'curl-7_88_0..8c939453f587b8565af33927361edf40b48544ea'
)
_reverts=(
@ -174,14 +174,10 @@ license=('MIT')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
#sha256sums=(dfb8582a05a893e305783047d791ffef5e167d295cf8d12b9eb9cfa0991ca5a9 # curl-7.88.0.tar.gz
# 9c5ffc962eb4ac1fd2f29265c965512ddcfc672f86ceb39144e72edbe562e89c # curl-7.88.0.tar.gz.asc
# 9e6cbc24b8575c4dcf7b4755bfcf8f2eb943670535f7c5a19226f24286110308) # 0001-Revert-http2-minor-buffer-and-error-path-fixes.patch
sha256sums=(SKIP)
## bc3c00ec6f788bd855511b920a0117ccfb3a61e15ccd2076772ca725d33a3043 curl-7.88.0-04-x86_64.pkg.tar.lz
## 176b972ed3c2ba5ad74538b6fda7e5761694ed76b132034fcd5a692367f0625f libcurl-compat-7.88.0-04-x86_64.pkg.tar.lz
## de7cf90021448ab66bd39292e83d25fa028bf51cc04831bc1ddf139d74b559ad libcurl-gnutls-7.88.0-04-x86_64.pkg.tar.lz
## 3ddefc1df5f6c1617e0250842e8a2b1a4282d04f9c91fc13e9a25bfef2cd243f curl-7.88.1-01-x86_64.pkg.tar.lz
## aeeb8f8d19d1f97205165faf019f497bf7ff639a54e1ed27c148239ed3a0b255 libcurl-compat-7.88.1-01-x86_64.pkg.tar.lz
## 253edb225eb62730754393f3b748ae1711d5fcbc739bfe24262e0ae38627b093 libcurl-gnutls-7.88.1-01-x86_64.pkg.tar.lz

View file

@ -6,10 +6,10 @@
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
_tag='67c55cb8b3f5a530478201fd780a533fce92b2eb' # git rev-parse v${_tag_name}
_tag_name='7_88_0'
_tag='b3d2310c6441c075cdad12155da944886f1974a6' # git rev-parse v${_tag_name}
_tag_name='7_88_1'
pkgver="${_tag_name//_/.}"
pkgrel=4
pkgrel=1
pkgdesc='command line tool and library for transferring data with URLs'
arch=('x86_64')
url='https://curl.haxx.se/'
@ -24,8 +24,6 @@ source=("git+https://github.com/bagder/curl.git#tag=${_tag}?signed")
sha512sums=('SKIP')
_backports=(
# git master
'curl-7_88_0..8c939453f587b8565af33927361edf40b48544ea'
)
_reverts=(

View file

@ -0,0 +1,22 @@
--- a/configure 2022-12-13 01:08:01.607329918 +0100
+++ b/configure 2022-12-13 01:08:58.083857594 +0100
@@ -433,7 +433,7 @@
return 0;
}
EOF
- if $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1; then
+ if $CC -I$INCLUDE -I/usr/include/db5.3 -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb-5.3 >/dev/null 2>&1; then
echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
echo "yes"
else
--- a/misc/Makefile 2022-12-13 12:21:04.709608051 +0100
+++ b/misc/Makefile 2022-12-13 12:21:19.966264418 +0100
@@ -25,7 +25,7 @@
$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm
arpd: arpd.c
- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb
+ $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb-5.3
ssfilter.tab.c: ssfilter.y
$(QUIET_YACC)$(YACC) -b ssfilter ssfilter.y

View file

@ -7,8 +7,8 @@
## rebuild after any libbpf upgrade ##
pkgname=iproute2
pkgver=6.1.0
pkgrel=05
pkgver=6.2.0
pkgrel=01
pkgdesc='IP Routing Utilities'
arch=('x86_64')
url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
@ -33,10 +33,11 @@ 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}-${pkgver}.tar."{xz,sign}
"sha256sums::https://www.kernel.org/pub/linux/utils/net/${pkgname}/sha256sums.asc"
"sha256sums::https://mirrors.edge.kernel.org/pub/linux/utils/net/$pkgname/sha256sums.asc"
'0001-make-iproute2-fhs-compliant.patch'
'bdb5.3.patch'
'fix_overlapping_buffers.patch')
'0002-bdb-5-3.patch')
# 'bdb5.3.patch'
# 'fix_overlapping_buffers.patch')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@ -45,12 +46,7 @@ prepare() {
patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
# use Berkeley DB 5.3
patch -Np1 -i "${srcdir}"/bdb5.3.patch
# fix overlapping buffers leading to cut off IPv6 adresses since glibc 2.37
# See FS#77451 and
# https://lore.kernel.org/netdev/0011AC38-4823-4D0A-8580-B108D08959C2@gentoo.org/T/#u
patch -Np1 -i "${srcdir}"/fix_overlapping_buffers.patch
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
# do not treat warnings as errors
sed -i 's/-Werror//' Makefile
@ -81,16 +77,14 @@ license=('GPL2')
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
# https://www.kernel.org/pub/linux/utils/net/${pkgname}/sha256sums.asc
# 5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab iproute2-6.1.0.tar.xz
# https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
# 4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 iproute2-6.2.0.tar.xz
sha256sums=(5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab # iproute2-6.1.0.tar.xz
50342cdfe2be83559d7446287b9056d9591c76d4c7ba64c293ed7b24e0761134 # iproute2-6.1.0.tar.sign
d33d639556757092f7d03f0d7ca92786341c68d25dd74f7f0a572abe636f7076 # sha256sums.asc
sha256sums=(4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 # iproute2-6.2.0.tar.xz
39fe4931168c6730eb4c63581a60616f39cf8a63e012a8cbd9372fd10c1283d0 # iproute2-6.2.0.tar.sign
05ed581236e4e913c0a80208eeba11d601dca72279317cbf86fb6098a9a962bf # sha256sums
758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d # 0001-make-iproute2-fhs-compliant.patch
908de44ee99bf78669e7c513298fc2a22ca9d7e816a8f99788b1e9b091035cf4 # bdb5.3.patch
7d2fb8ba06f3b73a8fa3ab673b8f1ad41c0e4fd85e3c31a8d4002a1b074ec1ae) # fix_overlapping_buffers.patch
## 8fe730e2f151ed2e87a644fef50406a49472fdcefd65572817ce738dc617b65c iproute2-6.1.0-05-x86_64.pkg.tar.lz
611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6) # 0002-bdb-5-3.patch
## 1c69ff0b8050d20e35ad1fc99cd896f39d9e14e020453fdec5e0d9c701c65c30 iproute2-6.2.0-01-x86_64.pkg.tar.lz

View file

@ -3,8 +3,8 @@
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=iproute2
pkgver=6.1.0
pkgrel=5
pkgver=6.2.0
pkgrel=1
pkgdesc='IP Routing Utilities'
arch=('x86_64')
license=('GPL2')
@ -29,13 +29,11 @@ options=('staticlibs')
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
'0001-make-iproute2-fhs-compliant.patch'
'fix_overlapping_buffers.patch'
'bdb5.3.patch')
sha256sums=('5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab'
'0002-bdb-5-3.patch')
sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
'SKIP'
'758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
'7d2fb8ba06f3b73a8fa3ab673b8f1ad41c0e4fd85e3c31a8d4002a1b074ec1ae'
'908de44ee99bf78669e7c513298fc2a22ca9d7e816a8f99788b1e9b091035cf4')
'611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@ -44,12 +42,7 @@ prepare() {
patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
# use Berkeley DB 5.3
patch -Np1 -i "${srcdir}"/bdb5.3.patch
# fix overlapping buffers leading to cut off IPv6 adresses since glibc 2.37
# See FS#77451 and
# https://lore.kernel.org/netdev/0011AC38-4823-4D0A-8580-B108D08959C2@gentoo.org/T/#u
patch -Np1 -i "${srcdir}"/fix_overlapping_buffers.patch
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
# do not treat warnings as errors
sed -i 's/-Werror//' Makefile

View file

@ -142,20 +142,22 @@ cb0d520dcc9371c53e5b637d3e2a20bcef5a18f2c4bd9f1997fdab2f543d60a1 iproute2-6.0.0
523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a iproute2-6.0.0.tar.xz
389fdb2e4d6e5d53cf48a6a4eb8790aa6852c9a6f03213bd5668bc8ce458e3a9 iproute2-6.1.0.tar.gz
5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab iproute2-6.1.0.tar.xz
6080ba2ab81009cd8880d44dc19919fd7a4a910b961bebbb2189d2299e1464c3 iproute2-6.2.0.tar.gz
4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 iproute2-6.2.0.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAEBCAAGBQJjmgw5AAoJEGMtOgZYnaaxwYAP/R2TAXXwDPWcLQhAYpYI5cat
OpWegrF7MzFfjpvm+QzF7xE1tqTV30zJtLhFcuPV1upO2Z6R86kR0052YMk8zESK
zUAqiZvGTxbkhZiC9T9QaYcWsA+rbgU2AuWE2cFOtWGOiHhxLYo3w37aGzw3fSy6
NdowKcCjCbRUJ2W1aAYQvD5xtGN7cCmNQ7E2FjgCRSuhCVQWr4gOaTG2W0YSqUYt
HpsGNccF79xA7/E0uvVMl3TLtEX2CtoOgrpbLeycP3vGjJMtnu7khMrUqrwAqqUw
76l61F7y5yaGuBfaTe5A0g7JfGJqptmbTn41RsCBrH9P4AR8yqiVMgcYkwKMoR/H
xyeGSy6Ru473ci3cmQw4NWkWuSKMll75Sabiwi4tRTStVWN4tnQyC/WS4SmaDZQ4
+iDkGkQ9vPAYh3DVxeOzM5R6nUKAvqLY6B9XumA3a9g0J96ZwqXaiaHWDIt3yEGy
CIJzQZiI2ZkHO7M65qilS1vROTY6boKD2XD5fzUT2E5v7nULyMs4VGuZGUYXu3AV
YYy1ry/1V0gCnp0xdg8ukfM0gkYZtC12Z51gjoPLHdSU3a+XkyfvylyWTuCaYCkd
gdRW6xLGakyOEqoEsf/udDUxkbiFuRSGuVW06lfNttzQ37f+mvfIAzk9+mdF+mTn
BLf/9USrV8mlXA+4DaR2
=kqFG
iQIcBAEBCAAGBQJj88JnAAoJEGMtOgZYnaaxZygP/RseUCb779OL8j6jMoZzXHy7
F0Dd7ZEOsV73EL7FYmLPJEFzXj/g60njaL+tWCvmAB+agJibiNjYNKhpjdp8vrUy
G8UtllWbSbzJQTfVwkg9in0rTR9n7GrWyMMrLPiYPiGgxow87enNK42PzMLZ3s+x
/g+8aivSDc19CuvdwZS502JTJOc9Obj+gmBp4COeZw//r66k3uutZYK/ndYyKCn7
V4PvqNx5Sg/K+jXqde3MArCuWlewdMPQfBOOMZBB4ZiSELJNJvEY7o4G78cS83CG
zN/1x2TlGVRViTc5vRTAMMht88b3zPxB+kPJUbOGza+3oeoKFo7AldR4QS6fKMC/
GKI1GIR4ZwWQul+UJiQnALS1u5IiyWZyz8jsc66ePv2t94hWTNTItEdvFGo6kwIp
xJ0rMF8lsR1F4N546PBLHa333a2zRbrjxdNtONWwqtLxF7mh83BYF9Tw7H58oaAG
bgx6R1Mqhq5wiljhRTIawk5Jl2as7/orPoLF0IYKAtcgnhABGOfGP4Awp7yyeUGP
aI40aw3vJt2CcFvzuPvW63R3DQ8yR55mf/05csY9KbcTfzf/ToLxgzfXb3JopO6W
tSESn/EQY2hBQVtoeerhFN1xA8QBUZu/6rYJG/9LL9Yk00ZjyHPCc+uMcY9V6j7Q
XTqCZdsSLTOsfL07GOvj
=UmHp
-----END PGP SIGNATURE-----