* update libproxy to 0.5.2-2

This commit is contained in:
Alexander Baldeck 2023-07-11 19:48:59 +02:00
parent 57c32e1d65
commit 12e8b01427
2 changed files with 75 additions and 50 deletions

View File

@ -0,0 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Thu, 29 Jun 2023 14:31:16 +0200
Subject: [PATCH] Fix crash querying URLs without a host
Such as `udp:`.
Fixes: https://bugs.archlinux.org/task/78881
---
src/backend/px-manager.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/backend/px-manager.c b/src/backend/px-manager.c
index 204d51765ae4..dc63b3747eb5 100644
--- a/src/backend/px-manager.c
+++ b/src/backend/px-manager.c
@@ -697,6 +697,9 @@ ignore_domain (GUri *uri,
if (g_strcmp0 (ignore, "*") == 0)
return TRUE;
+ if (!host)
+ return FALSE;
+
ignore_split = g_strsplit (ignore, ":", -1);
port = g_uri_get_port (uri);
@@ -736,6 +739,9 @@ ignore_hostname (GUri *uri,
{
const char *host = g_uri_get_host (uri);
+ if (!host)
+ return FALSE;
+
if (g_strcmp0 (ignore, "<local>") == 0 && strchr (host, ':') == NULL && strchr (host, '.') == NULL)
return TRUE;

View File

@ -3,87 +3,76 @@
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgbase=libproxy
pkgname=(libproxy libproxy-webkit)
pkgver=0.4.18
pkgrel=3
pkgname=(
libproxy
libproxy-docs
)
pkgver=0.5.2
pkgrel=2
pkgdesc="Automatic proxy configuration management library"
url="https://libproxy.github.io/libproxy/"
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
license=(LGPL)
depends=(
dbus
curl
duktape
gcc-libs
glib2
zlib
)
makedepends=(
cmake
gi-docgen
git
ninja
perl
python
webkit2gtk
gobject-introspection
gsettings-desktop-schemas
meson
vala
)
_commit=caccaf28e3df6ea612d2d4b39f781c4324019fdb # tags/0.4.18
source=("git+https://github.com/libproxy/libproxy#commit=$_commit")
b2sums=('SKIP')
_commit=e4f467b05c8adf25e5a2d5464914fc7e92bb7990 # tags/0.5.2^0
source=(
"git+https://github.com/libproxy/libproxy#commit=$_commit"
0001-Fix-crash-querying-URLs-without-a-host.patch
)
b2sums=('SKIP'
'32672271cce8d52c6051e51d5ccaf6186bcc26a582cd7e746e53ccc5c632c2f3019a1abfdc2c08ba9bf32a62af87ad027fce0a54b48c4abfdc8c4b7c700c7007')
pkgver() {
cd libproxy
git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
git describe --tags | sed 's/^libproxy-//;s/[^-]*-g/r&/;s/-/+/g'
}
prepare() {
cd libproxy
# https://bugs.archlinux.org/task/78881
git apply -3 ../0001-Fix-crash-querying-URLs-without-a-host.patch
}
build() {
cmake -S libproxy -B build -G Ninja \
-DBIPR=0 \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_SKIP_RPATH=ON \
-DLIBEXEC_INSTALL_DIR=/usr/lib \
-DPERL_VENDORINSTALL=yes \
-DWITH_{VALA,WEBKIT3}=ON
cmake --build build
local meson_options=(
)
arch-meson libproxy build "${meson_options[@]}"
meson compile -C build
}
check() {
cmake --build build --target test
}
_pick() {
local p="$1" f d; shift
for f; do
d="$srcdir/$p/${f#$pkgdir/}"
mkdir -p "$(dirname "$d")"
mv "$f" "$d"
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
done
meson test -C build --print-errorlogs
}
package_libproxy() {
optdepends=('networkmanager: NetworkManager configuration module'
'perl: Perl bindings'
'python: Python 3.x bindings'
'libproxy-webkit: PAC proxy support (via WebKit)'
'pacrunner: PAC proxy support (via pacrunner)')
provides+=(libproxy.so)
provides=(libproxy.so)
conflicts=('libproxy-webkit<0.5.0-1')
DESTDIR="$pkgdir" cmake --install build
meson install -C build --destdir "$pkgdir"
_pick webkit "$pkgdir"/usr/lib/libproxy/*/modules/pacrunner_webkit.so
mkdir -p doc/usr/share
mv {"$pkgdir",doc}/usr/share/doc
}
package_libproxy-webkit() {
pkgdesc="JavaScriptCore-based PAC proxy support for libproxy"
depends=(libproxy webkit2gtk)
replaces=('libproxy-mozjs<0.4.16-1')
mv webkit/* "$pkgdir"
package_libproxy-docs() {
pkgdesc+=" (documentation)"
depends=()
mv doc/* "$pkgdir"
}
# vim:set sw=2 sts=-1 et: