upg curl elfutils libpipeline

This commit is contained in:
joborun linux 2022-04-26 21:13:23 +03:00
parent 2830a2c392
commit b35da7b18b
9 changed files with 106 additions and 68 deletions

View File

@ -0,0 +1,30 @@
From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 8 Mar 2022 13:38:13 +0100
Subject: [PATCH] openssl: fix CN check error code
Due to a missing 'else' this returns error too easily.
Regressed in: d15692ebb
Reported-by: Kristoffer Gleditsch
Fixes #8559
Closes #8560
---
lib/vtls/openssl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 0b79fc50a9c5..4618beeb3867 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn,
memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen);
peer_CN[peerlen] = '\0';
}
- result = CURLE_OUT_OF_MEMORY;
+ else
+ result = CURLE_OUT_OF_MEMORY;
}
}
else /* not a UTF8 name */

View File

@ -1,13 +1,14 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
pkgver=7.82.0
pkgrel=02
pkgrel=03
pkgdesc='An URL retrieval utility and library - w/o ipv6 & zstd'
arch=('x86_64')
url='https://curl.haxx.se'
@ -20,8 +21,8 @@ provides=('libcurl.so')
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
0001-http2-handle-DONE-called-for-the-paused-stream.patch
0002-http-close-the-stream-not-connection-on-time-conditi.patch
0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch)
0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
0004-openssl-fix-CN-check-error-code.patch)
_configure_options=(
--prefix='/usr'
@ -46,6 +47,8 @@ prepare() {
patch -Np1 -i ../0001-http2-handle-DONE-called-for-the-paused-stream.patch
patch -Np1 -i ../0002-http-close-the-stream-not-connection-on-time-conditi.patch
patch -Np1 -i ../0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
# https://github.com/curl/curl/issues/8559
patch -Np1 -i ../0004-openssl-fix-CN-check-error-code.patch
}
build() {
@ -139,4 +142,6 @@ sha256sums=(910cc5fe279dc36e2cca534172c94364cf3fcf7d6494ba56e6c61a390881ddce # c
c1799877d4d45e733f2c88373d5b6399f169133551e8968f131bb8447e673004 # curl-7.82.0.tar.gz.asc
ee63885393f548166e08a85ce20b21b680cd654ecb26594aad4e5d7f3299c496 # 0001-http2-handle-DONE-called-for-the-paused-stream.patch
9d93b236d302fc4c8115317139c6d8454d3c76b5ee4767266f8dbcfbf82a61f9 # 0002-http-close-the-stream-not-connection-on-time-conditi.patch
d3262ade60f214e2bd7b7cb1b705256e69fc7e79e162cc4b6c59dbf5a1b7b987) # 0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
d3262ade60f214e2bd7b7cb1b705256e69fc7e79e162cc4b6c59dbf5a1b7b987 # 0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
ad96be99435a85b447681a2aa22b732d9d08814755077f35f9558e73bb6592e3) # 0004-openssl-fix-CN-check-error-code.patch

View File

@ -7,7 +7,7 @@
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
pkgver=7.82.0
pkgrel=2
pkgrel=3
pkgdesc='An URL retrieval utility and library'
arch=('x86_64')
url='https://curl.haxx.se'
@ -20,12 +20,14 @@ provides=('libcurl.so')
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
0001-http2-handle-DONE-called-for-the-paused-stream.patch
0002-http-close-the-stream-not-connection-on-time-conditi.patch
0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch)
0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
0004-openssl-fix-CN-check-error-code.patch)
sha512sums=('d4c4a785876e0d1ba1c1adbe65528d56a8b81fc03ff724e87819cfe51aca60f8a7bf2ac9384f30c3a6bbd28669b2bd3e9a6794737243c836c4902d085a72c474'
'SKIP'
'0d883c3fc267c4c5d82078e03689db31f83292cb41f3f6fab26d05fa9cbaa77ae75cfd3bbb4f6953bbc4bc9760c54b49bdfdae219cd48af92312abbb1ba70ec6'
'422df75880b107a5c457d25ca1488166f5e61cc2876ad0193a742ad6cf4cae5363b0c7bd00cbaf9f49a5e5d503159cb2d2fd3d602abf3935dc3f77f14e9027dc'
'394f27e8721c23b82924064df8f72aa33f6e5064d0a3798a59543fd7d9660939437f1a6f45f03370d517edf5d4a218a9d41b4d62e7498d4f520f026da68007b1')
'394f27e8721c23b82924064df8f72aa33f6e5064d0a3798a59543fd7d9660939437f1a6f45f03370d517edf5d4a218a9d41b4d62e7498d4f520f026da68007b1'
'bb2e3d40d65c5c1c07b2623c2d5db11fe232ecf4d9f223ec2bdd8fba32c76c991292b36114b48dd0cad2ed376d127070a65f30fcec7af4b328e4adaab81b4dc1')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
_configure_options=(
@ -49,6 +51,8 @@ prepare() {
patch -Np1 -i ../0001-http2-handle-DONE-called-for-the-paused-stream.patch
patch -Np1 -i ../0002-http-close-the-stream-not-connection-on-time-conditi.patch
patch -Np1 -i ../0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
# https://github.com/curl/curl/issues/8559
patch -Np1 -i ../0004-openssl-fix-CN-check-error-code.patch
}
build() {

View File

@ -1,20 +1,22 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgbase=elfutils
pkgname=(debuginfod elfutils libelf)
pkgver=0.186
pkgrel=05
pkgver=0.187
pkgrel=01
pkgdesc="Handle ELF object files and DWARF debugging information"
arch=(x86_64)
url="https://sourceware.org/elfutils/"
makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib zstd)
#options=(debug staticlibs)
options=(staticlibs)
source=("https://sourceware.org/${pkgbase}/ftp/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig})
_pick() {
local p="$1" f d; shift
@ -28,11 +30,11 @@ _pick() {
prepare() {
(
cd "$pkgbase-$pkgver"
cd $pkgbase-$pkgver
autoreconf -fiv
)
cp -av "$pkgbase-$pkgver" "$pkgbase-test-$pkgver"
cp -av $pkgbase-$pkgver $pkgbase-test-$pkgver
}
@ -40,7 +42,7 @@ build() {
(
# fat-lto-objects is required for non-mangled .a files in libelf
CFLAGS+=" -ffat-lto-objects"
cd "$pkgbase-$pkgver"
cd $pkgbase-$pkgver
./configure --prefix=/usr \
--sysconfdir=/etc \
--program-prefix="eu-" \
@ -48,7 +50,7 @@ build() {
make
)
(
cd "$pkgbase-test-$pkgver"
cd $pkgbase-test-$pkgver
# debugging information is required for test-suite
CFLAGS+=" -g"
# fat-lto-objects is required for non-mangled .a files in libelf
@ -61,28 +63,26 @@ build() {
)
}
check() {
cd "$pkgbase-test-$pkgver"
make check || printf "Fails in restrictive build environments: https://gitlab.archlinux.org/archlinux/infrastructure/-/issues/424\n"
}
# a few tests fail on this 0187 build, they didn't on last 0186 but do try them on your
# machine and environment and report if your build didn't fail, otherwise we will try again on next build
#
#check() {
# make check -C $pkgbase-test-$pkgver
#}
package_debuginfod() {
pkgdesc+=" (debuginfod)"
depends=(gcc-libs glibc libarchive.so "libelf=${pkgver}-${pkgrel}"
libmicrohttpd.so sqlite)
optdepends=("elfutils=${pkgver}-${pkgrel}: for translations")
depends=(gcc-libs glibc libarchive.so libelf=$pkgver libmicrohttpd.so sqlite)
optdepends=("elfutils=$pkgver: for translations")
# cd "$pkgbase-$pkgver"
# make DESTDIR="$pkgdir" install
# install -vDm 644 {AUTHORS,ChangeLog,NEWS,NOTES,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
make DESTDIR="$pkgdir" install -C "$pkgbase-$pkgver"
install -vDm 644 "$pkgbase-$pkgver"/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/"
# set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL
printf "https://debuginfod.archlinux.org\n" > "$pkgdir/etc/debuginfod/archlinux.urls"
(
cd "${pkgdir}"
cd "$pkgdir"
_pick libelf usr/{include,lib}
_pick elfutils usr/bin/eu-*
@ -95,10 +95,10 @@ package_debuginfod() {
package_elfutils() {
pkgdesc+=" (utilities)"
depends=(gcc-libs glibc "libelf=${pkgver}-${pkgrel}")
depends=(gcc-libs glibc libelf=$pkgver)
mv -v elfutils/* "$pkgdir"
install -vDm 644 "$pkgbase-$pkgver"/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/"
}
package_libelf() {
@ -107,10 +107,7 @@ package_libelf() {
# NOTE: the shared objects can not be added to provides as they are not versioned
mv -v libelf/* "$pkgdir"
install -vDm 644 "$pkgbase-$pkgver/"{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
# # set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL
# printf "https://debuginfod.archlinux.org\n" > "$pkgdir/etc/debuginfod/archlinux.urls"
install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/"
}
#---- license gpg-key sha256sums ----
@ -120,5 +117,5 @@ license=(LGPL3 GPL3)
validpgpkeys=(47CC0331081B8BC6D0FD4DA08370665B57816A6A # Mark J. Wielaard <mark@klomp.org>
EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A) # Mark Wielaard <mjw@gnu.org>
sha256sums=(7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 # elfutils-0.186.tar.bz2
1865a1f8e11ae50d8c3aa130ed5c3d9ca526d78df754d3f04656c372538cc84c) # elfutils-0.186.tar.bz2.sig
sha256sums=(e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8 # elfutils-0.187.tar.bz2
93a9568f7fd4c3b29a94709abcaad2213d5bcf7e89bdd40350f222141f2d41f0) # elfutils-0.187.tar.bz2.sig

View File

@ -5,18 +5,18 @@
pkgbase=elfutils
pkgname=(debuginfod elfutils libelf)
pkgver=0.186
pkgrel=5
pkgver=0.187
pkgrel=1
pkgdesc="Handle ELF object files and DWARF debugging information"
arch=(x86_64)
url="https://sourceware.org/elfutils/"
license=(LGPL3 GPL3)
makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib zstd)
options=(debug staticlibs)
source=("https://sourceware.org/${pkgbase}/ftp/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
sha512sums=('c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78'
source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig})
sha512sums=('a9b9e32b503b8b50a62d4e4001097ed2721d3475232a6380e6b9853bd1647aec016440c0ca7ceb950daf1144f8db9814ab43cf33cc0ebef7fc91e9e775c9e874'
'SKIP')
b2sums=('49573d0a1f3519eab81d1ba3e94354cbc0935a36a94a3fdb22fe223a47b78cca8fd6e322870b0e335a809529fa6f54180b13c67936dec0242123c54ba20c9fc9'
b2sums=('00ba3efa689d137808f5f53ecda93fd006be0c18d690ce76616ed1dba442281098579fa4b9a9e91b8ba865a3de15968f0ae06703a7b50b15c48a4beb5c970a46'
'SKIP')
validpgpkeys=(
'47CC0331081B8BC6D0FD4DA08370665B57816A6A' # Mark J. Wielaard <mark@klomp.org>
@ -35,11 +35,11 @@ _pick() {
prepare() {
(
cd "$pkgbase-$pkgver"
cd $pkgbase-$pkgver
autoreconf -fiv
)
cp -av "$pkgbase-$pkgver" "$pkgbase-test-$pkgver"
cp -av $pkgbase-$pkgver $pkgbase-test-$pkgver
}
@ -47,7 +47,7 @@ build() {
(
# fat-lto-objects is required for non-mangled .a files in libelf
CFLAGS+=" -ffat-lto-objects"
cd "$pkgbase-$pkgver"
cd $pkgbase-$pkgver
./configure --prefix=/usr \
--sysconfdir=/etc \
--program-prefix="eu-" \
@ -55,7 +55,7 @@ build() {
make
)
(
cd "$pkgbase-test-$pkgver"
cd $pkgbase-test-$pkgver
# debugging information is required for test-suite
CFLAGS+=" -g"
# fat-lto-objects is required for non-mangled .a files in libelf
@ -69,24 +69,22 @@ build() {
}
check() {
cd "$pkgbase-test-$pkgver"
make check || printf "Fails in restrictive build environments: https://gitlab.archlinux.org/archlinux/infrastructure/-/issues/424\n"
make check -C $pkgbase-test-$pkgver
}
package_debuginfod() {
pkgdesc+=" (debuginfod)"
depends=(gcc-libs glibc libarchive.so "libelf=${pkgver}-${pkgrel}"
libmicrohttpd.so sqlite)
optdepends=("elfutils=${pkgver}-${pkgrel}: for translations")
depends=(gcc-libs glibc libarchive.so libelf=$pkgver libmicrohttpd.so sqlite)
optdepends=("elfutils=$pkgver: for translations")
make DESTDIR="$pkgdir" install -C "$pkgbase-$pkgver"
install -vDm 644 "$pkgbase-$pkgver/"{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/"
# set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL
printf "https://debuginfod.archlinux.org\n" > "$pkgdir/etc/debuginfod/archlinux.urls"
(
cd "${pkgdir}"
cd "$pkgdir"
_pick libelf usr/{include,lib}
_pick elfutils usr/bin/eu-*
@ -99,10 +97,10 @@ package_debuginfod() {
package_elfutils() {
pkgdesc+=" (utilities)"
depends=(gcc-libs glibc "libelf=${pkgver}-${pkgrel}")
depends=(gcc-libs glibc libelf=$pkgver)
mv -v elfutils/* "$pkgdir"
install -vDm 644 "$pkgbase-$pkgver"/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/"
}
package_libelf() {
@ -111,5 +109,5 @@ package_libelf() {
# NOTE: the shared objects can not be added to provides as they are not versioned
mv -v libelf/* "$pkgdir"
install -vDm 644 "$pkgbase-$pkgver"/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "${pkgdir}/usr/share/doc/${pkgname}"
install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/"
}

View File

@ -1,11 +1,12 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libpipeline
pkgver=1.5.5
pkgver=1.5.6
pkgrel=01
pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
arch=('x86_64')
@ -31,13 +32,13 @@ package() {
}
#---- license gpg-key sha256sums ----
license=('GPL')
#validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwatson@debian.org>
#validpgpkeys=('87317259431038049C92C139F6DD330210FA4CD1') # "Colin Watson <cjwatson@flatline.org.uk>"
validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # "Colin Watson <cjwatson@chiark.greenend.org.uk>"
sha256sums=('0c8367f8b82bb721b50647a647115b6e62a37e3b2e954a9685e4d933f30c00cc'
'SKIP')
sha256sums=(0c8367f8b82bb721b50647a647115b6e62a37e3b2e954a9685e4d933f30c00cc # libpipeline-1.5.5.tar.gz
724112f2f1e8e950b9999687845cea686c088d2b308f5b5f540386f3cde6a2de) # libpipeline-1.5.5.tar.gz.asc
sha256sums=(60fbb9e7dc398528e5f3a776af57bb28ca3fe5d9f0cd8a961ac6cebfe6e9b797 # libpipeline-1.5.6.tar.gz
f58e43ce83734f5b983465aeb114147dd8daabe8fe7e462043cb834ea768259e) # libpipeline-1.5.6.tar.gz.asc

View File

@ -1,7 +1,7 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=libpipeline
pkgver=1.5.5
pkgver=1.5.6
pkgrel=1
pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
arch=('x86_64')
@ -10,7 +10,7 @@ license=('GPL')
depends=('glibc')
# https://gitlab.com/cjwatson/libpipeline
source=(https://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.asc})
sha256sums=('0c8367f8b82bb721b50647a647115b6e62a37e3b2e954a9685e4d933f30c00cc'
sha256sums=('60fbb9e7dc398528e5f3a776af57bb28ca3fe5d9f0cd8a961ac6cebfe6e9b797'
'SKIP')
#validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwatson@debian.org>
#validpgpkeys=('87317259431038049C92C139F6DD330210FA4CD1') # "Colin Watson <cjwatson@flatline.org.uk>"

View File

@ -0,0 +1,2 @@

View File

@ -1,4 +1,5 @@
real 0m14.958s
user 0m15.325s
sys 0m2.706s
real 0m17.707s
user 0m14.512s
sys 0m2.502s