summaryrefslogtreecommitdiff
path: root/net-libs/libproxy
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
commit0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-libs/libproxy
parent752d6256e5204b958b0ef7905675a940b5e9172f (diff)
gentoo resync : 29.12.2022
Diffstat (limited to 'net-libs/libproxy')
-rw-r--r--net-libs/libproxy/Manifest8
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch33
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch90
-rw-r--r--net-libs/libproxy/libproxy-0.4.17-r1.ebuild2
-rw-r--r--net-libs/libproxy/libproxy-0.4.18.ebuild84
-rw-r--r--net-libs/libproxy/metadata.xml1
6 files changed, 215 insertions, 3 deletions
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 762a0204c0e4..b6c20434a13f 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -2,7 +2,11 @@ AUX libproxy-0.4.10-disable-pac-test.patch 1017 BLAKE2B f8f7b2e48f587725539cdb12
AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
AUX libproxy-0.4.16-avoid-nm-build-dep.patch 3555 BLAKE2B 3df682dcacb157a1913d53a3358da5c4200de894270d38df4aa29997979b5e284e0207eed53db9c39ea85a528a037c832c44eb7167e433781d862b75ad0d47bf SHA512 a83dde4a161c96e2c059c88e5ae54d20f9348d583d43c94c5dbc5cb53887d75c845937a43f6597544a82c4162bba2ae8ed433ec6229504ddedf33ce146585683
AUX libproxy-0.4.17-mozjs.patch 760 BLAKE2B df245777cd3b9a1d4c6ea30a691b64fde5fdb5dfd52246ed1356041a036e0c883c0f2388b86f56d892e67697a1e3a8fdde050a26480bb1e3962a77e599fa3e7f SHA512 54f1371bf74531d427114aa6d194f2ed2c9ec6288f14315b4adfa50a0d7722e948429f949b647fdf49cf47fb53c05bf3d45070d261330a83c4eb15b58e8309db
+AUX libproxy-0.4.18-Fix-building-without-duktape.patch 1006 BLAKE2B b6b8a704a61e59bca27946b55967a6b413a219811b632b7486c94d66e5d48c78baefbba2a8f12b44b3c926b2009fa4f6a82d0e74a79d5b0b9b2ba82cc327ee44 SHA512 f77d0223c3afabf9e64e09adf64de119edbd6a93458a070b2bca60e4efc58785c45cc1c09114d2edd4e8d9d1567dd96b14ee51748266b9eefc82e5ceafabd8c3
+AUX libproxy-0.4.18-avoid-nm-build-dep.patch 3592 BLAKE2B 7f7f8af5aebbfb176b405db4c666e894b3adf879ba186f3f08a7b82508d67227905cd1fb31af761c8c0d24e362bfe84341243c2ce5fb6c1ea11dead16f6c9e0c SHA512 64a1823b1710ce3be1019ea077b5ce9e1b0f1ff97b8e940bb4187613af797d198ffcd1f66f21399b23a3a0b1133b7fc71ac80c86ff67bd1d9735abcfb5bcb61a
AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
DIST libproxy-0.4.17.tar.gz 95542 BLAKE2B 70b78c90aebb0ea308d105ec6d2c61bb54dea36df2d99db835f29c6ffa91168c15e73e01823b799a37fa89a9cb6fca51013ea057006b608fa2a79f4056a5d3c5 SHA512 589045538a78dc7453335ed61c60adad3352b840b224885d4a58ae284e52224ae3ff2eebd77df57aebbc3ae75d7b6d69a825f24f01c19e75bf0a3345dce53126
-EBUILD libproxy-0.4.17-r1.ebuild 2642 BLAKE2B 952fe62637e6c5af5ca2cc1ecbecd66f021241874d5fb833a7d2da26c66b9a0723071eff46345fbba6c1cb54bb7eaa5fb3d2ac1b63dbeab1ff055d76c85bcaa0 SHA512 a515b773a896a365af5a57c837b32c9c746b1e9cd0f408841c0f461dc2f7b04e08e66f55a87a1ba24708c23fa56c235bd87101e26a74ab3a5fc63bcf77e71d2f
-MISC metadata.xml 692 BLAKE2B e196c11c6fa73bb33410d3eed6a526de85b6d15c56b28b648a32928175ebbceb6cfcca7879dfb23335281a6ace24d571c3726954601d11232ce6a967793318fc SHA512 5d986af4a2e3b887654da557b3466f0b7e3b98a66bbfe7029e24fcd17c4e10d044afd8386e99d0aabe221b79961c68de4c0a8632e4827ac94f6e2da04bd15d07
+DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
+EBUILD libproxy-0.4.17-r1.ebuild 2649 BLAKE2B d7e25db2b99d310671292f10e9b1cfe196d500d9a14d600ae067433a05c737b91aea1d382e705674015b35b250e5bf21506a3646c6a1ac3640e8f78a4cebd875 SHA512 161cde54e8ff01918a7d75d23e7f6088b124ca367ebaf02ee13ab61654b22654b0b6148b53c4357f1d4cd74bdac909e7ac3986b745a2b2fdf217ba99d2560c1c
+EBUILD libproxy-0.4.18.ebuild 2653 BLAKE2B 3550ea47a0a39d7d5e8430904a61c7e493bb16f548236bf51a9757b48cdae676387a589a73df072ac98a48d8e2149d87c2c30a8577b6e384ad345ae83153e7b2 SHA512 608294f098d08fa95258c3569baad16916b2bf179cfa3a32de57d305143485cd8c976240750b794ae3da7d49385c01418973db8caae30ab6f5f9777205fdfb68
+MISC metadata.xml 770 BLAKE2B ae78ea34cf603f837bcb20532febb873d54c9f0e96867c82a2ab095fa94e8c1a1b64d83c6e4f29fbe26c5a21cc3d04b722add5fb88ab74a781ad15fc50f300ee SHA512 90c1cf64ad650e58e172832383a8ceaf396274610d65e0486f9fc19534dda1e5a4356b18139dc62483d7df46769143acd4ccfc35ebe0d18e64dc8a71bd5e5789
diff --git a/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch
new file mode 100644
index 000000000000..dd834687553a
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.18-Fix-building-without-duktape.patch
@@ -0,0 +1,33 @@
+https://github.com/libproxy/libproxy/pull/180
+
+From 54a08b73f4a9bc43356dd50fe91942b4270bfe10 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 21 Jun 2022 00:08:57 -0400
+Subject: [PATCH] Fix building without duktape
+
+Otherwise configuring fails with
+
+CMake Error at libproxy/cmake/modules.cmk:26 (math):
+ math cannot parse the expression: "0+0+0+": syntax error, unexpected end of
+ file (6).
+Call Stack (most recent call first):
+ libproxy/CMakeLists.txt:14 (include)
+---
+ libproxy/cmake/modules/pacrunner_duktape.cmk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libproxy/cmake/modules/pacrunner_duktape.cmk b/libproxy/cmake/modules/pacrunner_duktape.cmk
+index e7918a8..a468125 100644
+--- a/libproxy/cmake/modules/pacrunner_duktape.cmk
++++ b/libproxy/cmake/modules/pacrunner_duktape.cmk
+@@ -17,5 +17,7 @@ else()
+ link_directories(${DUKTAPE_LIBRARIES})
+ link_libraries(duktape)
+ endif()
++ else()
++ set(DUKTAPE_FOUND 0)
+ endif()
+ endif()
+--
+2.35.1
+
diff --git a/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch
new file mode 100644
index 000000000000..d62eac9af879
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.18-avoid-nm-build-dep.patch
@@ -0,0 +1,90 @@
+From f0ae8a0022a18fb26dff0ace0608d1916c68d179 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 29 Apr 2013 23:02:25 -0400
+Subject: [PATCH] Avoid build-time dependency on NetworkManager
+
+Needed to prevent a dependency loop:
+nm -> libsoup -> glib-networking -> libproxy -> nm
+
+https://bugs.gentoo.org/467696
+
+* asturm@gentoo.org: Rebased on top of 0.4.15
+ also revert 423801295921ab1ec0d98565fcbc2635088d45da
+* sam@gentoo.org: Rebased on top of 0.4.16
+ (same revert included)
+* mattst88@gentoo.org: Rebased on top of 0.4.18
+ (same revert included)
+---
+ libproxy/cmake/modules.cmk | 6 ++---
+ .../cmake/modules/network_networkmanager.cmk | 5 +---
+ libproxy/modules/network_networkmanager.cpp | 23 ++++++++++++++-----
+ 3 files changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
+index 6eaaa01..0afce2f 100644
+--- a/libproxy/cmake/modules.cmk
++++ b/libproxy/cmake/modules.cmk
+@@ -43,10 +43,10 @@ px_module(config_w32reg "${WIN32}" 1)
+ px_module(ignore_domain 1 1)
+ px_module(ignore_hostname 1 1)
+ px_module(ignore_ip 1 1)
+-if(NM_FOUND OR NMold_FOUND)
++if(NM_FOUND)
+ set(NM_BUILD 1)
+-endif(NM_FOUND OR NMold_FOUND)
+-px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES})
++endif(NM_FOUND)
++px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES})
+ px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES})
+ px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES})
+ px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
+diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
+index 6ef6ead..2586bbd 100644
+--- a/libproxy/cmake/modules/network_networkmanager.cmk
++++ b/libproxy/cmake/modules/network_networkmanager.cmk
+@@ -1,6 +1,3 @@
+ if (NOT WIN32 AND NOT APPLE)
+- px_check_modules(NM libnm dbus-1)
+- if (NOT NM_FOUND)
+- px_check_modules(NMold NetworkManager dbus-1)
+- endif (NOT NM_FOUND)
++ px_check_modules(NM dbus-1)
+ endif()
+diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
+index 546a8ee..317f1ab 100644
+--- a/libproxy/modules/network_networkmanager.cpp
++++ b/libproxy/modules/network_networkmanager.cpp
+@@ -23,13 +23,24 @@
+ using namespace libproxy;
+
+ #include <dbus/dbus.h>
+-#include <NetworkManager.h>
+
+-// Backwards compatibility: with the switch to libnm, NM_STATE_CONNECTED is no
+-// longer defined. NM_STATE_CONNECTED_GLOBAL appeared with NM 0.9 and was aliased
+-#ifndef NM_STATE_CONNECTED
+- #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+-#endif
++/*
++ * copy-pasted from NetworkManager-1.26.0's NetworkManager.h to prevent
++ * a circular dependency; https://bugs.gentoo.org/467696
++ */
++#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
++#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
++typedef enum {
++ NM_STATE_UNKNOWN = 0,
++ NM_STATE_ASLEEP = 10,
++ NM_STATE_DISCONNECTED = 20,
++ NM_STATE_DISCONNECTING = 30,
++ NM_STATE_CONNECTING = 40,
++ NM_STATE_CONNECTED_LOCAL = 50,
++ NM_STATE_CONNECTED_SITE = 60,
++ NM_STATE_CONNECTED_GLOBAL = 70,
++} NMState;
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
+
+ class networkmanager_network_extension : public network_extension {
+ public:
+--
+2.35.1
+
diff --git a/net-libs/libproxy/libproxy-0.4.17-r1.ebuild b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
index 0f5687d4a18a..5d69bcee8d45 100644
--- a/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.17-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="gnome kde mono networkmanager spidermonkey test webkit"
RESTRICT="!test? ( test )"
diff --git a/net-libs/libproxy/libproxy-0.4.18.ebuild b/net-libs/libproxy/libproxy-0.4.18.ebuild
new file mode 100644
index 000000000000..0e6a926aebd0
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.18.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic mono-env
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="duktape gnome kde mono networkmanager spidermonkey test webkit"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ duktape? ( dev-lang/duktape )
+ gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+ mono? ( dev-lang/mono )
+ networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] )
+ spidermonkey? ( dev-lang/spidermonkey:68 )
+ webkit? ( net-libs/webkit-gtk:4 )
+"
+RDEPEND="${DEPEND}
+ kde? ( kde-frameworks/kconfig:5 )
+"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
+
+PATCHES=(
+ # https://github.com/libproxy/libproxy/issues/27
+ "${FILESDIR}/${PN}-0.4.12-macosx.patch"
+
+ # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+ # https://github.com/libproxy/libproxy/issues/28
+ "${FILESDIR}/${PN}-0.4.18-avoid-nm-build-dep.patch"
+
+ "${FILESDIR}/${PN}-0.4.18-Fix-building-without-duktape.patch"
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+
+ -DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo OFF)
+ $(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}"/usr/bin/mcs)
+ -DWITH_GNOME2=OFF
+ -DWITH_GNOME3=$(usex gnome)
+ -DWITH_KDE=$(usex kde)
+ -DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo OFF)
+ -DWITH_NM=$(usex networkmanager)
+ -DWITH_PERL=OFF # bug 705410, uses reserved target name "test"
+ -DWITH_PYTHON2=OFF
+ -DWITH_PYTHON3=OFF # Major issue: https://github.com/libproxy/libproxy/issues/65
+ # WITH_VALA just copies the .vapi file over and needs no deps,
+ # hence always enable it unconditionally
+ -DWITH_VALA=ON
+ -DWITH_WEBKIT=$(multilib_is_native_abi && usex webkit || echo OFF)
+ -DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo OFF)
+ -DWITH_DUKTAPE=$(multilib_is_native_abi && usex duktape || echo OFF)
+
+ -DWITH_NATUS=OFF
+ -DBUILD_TESTING=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_install_all() {
+ doman "${FILESDIR}"/proxy.1
+}
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index d443844f9a64..c93e411e331d 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -5,6 +5,7 @@
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
<use>
+ <flag name="duktape">Use <pkg>dev-lang/duktape</pkg> for PAC parsing</flag>
<flag name="gnome">Enable support for reading proxy settings from GNOME</flag>
<flag name="kde">Enable support for reading proxy settings from KDE</flag>
<flag name="spidermonkey">Use libmozjs from <pkg>dev-lang/spidermonkey</pkg> for PAC parsing</flag>