net-libs/libproxy: Drop old versions

Bug: https://bugs.gentoo.org/754954
Closes: https://bugs.gentoo.org/893704
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner
2023-07-22 12:10:23 -04:00
parent a557f52891
commit 3c640d1bd2
8 changed files with 0 additions and 374 deletions

View File

@@ -1,3 +1 @@
DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
DIST libproxy-0.5.2.tar.gz 60024 BLAKE2B 7484b61f5eb3dbb148bce69c6d5d30d218c9392c559661c7e01e02339546c246afb47ab28956d90076d835f4a72ec260690cd0d3a52b8302ec238f1bb1eb87c0 SHA512 10d2d435288e8259bc16e6fc678bbd5edee7de8ef4235de29ed7740493690b33c3b1820f1a9befb60254069946e3ff3cc6130c7d19f34fff8062aec16dc1cbc8
DIST libproxy-0.5.3.tar.gz 60069 BLAKE2B adfa982344470251667b113f12f77722f6793ceeec902ccf82e32e80e15836384fbe1ccbec8865fc877fa04b25e6985847eef75b4ce437dbf0410d16e2bd5f36 SHA512 0fa4c677372afa76a9f143abb1472af1df85e1190425ec4168b98e575a9b9c9fe3dcc56062609da8ef266d56dfb153e7f7a1c15aed2d385003d9f3f421d08590

View File

@@ -1,70 +0,0 @@
https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff
diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk
--- a/libproxy/cmake/libproxy.cmk 2012-10-02 07:20:40.000000000 -0700
+++ b/libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700
@@ -18,7 +18,7 @@
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
# When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings.
-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
+set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1)
set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "")
set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk
--- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.000000000 -0700
+++ b/libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -0700
@@ -1,3 +1,3 @@
-if (NOT WIN32 AND NOT APPLE)
+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
set(ENVVAR_FOUND 1)
-endif()
\ No newline at end of file
+endif()
diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk
--- libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.000000000 -0700
+++ b/libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.000000000 -0700
@@ -1,4 +1,4 @@
-if (NOT WIN32 AND NOT APPLE)
+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF)
option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON)
if(WITH_GNOME3)
diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk
--- libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.000000000 -0700
+++ b/libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -0700
@@ -1,4 +1,4 @@
-if(APPLE)
+if(APPLE AND MP_MACOSX)
find_library(SC_LIBRARIES SystemConfiguration)
find_library(CF_LIBRARIES CoreFoundation)
if(SC_LIBRARIES)
@@ -7,4 +7,4 @@
if(CF_LIBRARIES)
set(CF_FOUND 1)
endif()
-endif()
\ No newline at end of file
+endif()
diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk
--- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2012-10-02 07:20:40.000000000 -0700
+++ b/libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -0700
@@ -6,7 +6,7 @@
link_directories(WEBKIT_LIBRARIES)
include_directories("${WEBKIT_INCLUDE_DIR}")
endif()
-elseif(APPLE)
+elseif(APPLE AND MP_MACOSX)
find_library(WEBKIT_LIBRARIES JavaScriptCore)
if(WEBKIT_LIBRARIES)
set(WEBKIT_FOUND 1)
diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk
--- libproxy/cmake.orig/pkgconfig.cmk 2012-10-02 07:20:40.000000000 -0700
+++ b/libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.000000000 -0700
@@ -1,4 +1,4 @@
-if(NOT WIN32 AND NOT APPLE)
+if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
find_package(PkgConfig)
# Define our magical px_check_modules function

View File

@@ -1,33 +0,0 @@
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

View File

@@ -1,90 +0,0 @@
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

View File

@@ -1,23 +0,0 @@
.TH PROXY "1" "April 2016" "libproxy" "User Commands"
.SH NAME
proxy \- Display the proxy server that should be used to reach a given a network resource
.SH SYNOPSIS
proxy
.SH DESCRIPTION
Display the proxy server that should be used to reach a given a network resource.
.PP
libproxy is a library that provides automatic proxy configuration management
using different backends.
.SH EXAMPLE
.B echo http://www.example.com/ | proxy
http://webcache:3128 direct://
.SH AUTHOR
This manual page was written by
.MT bigon@debian.org
Laurent Bigonville
.ME ,
for the Debian GNU/Linux system (but may be used by others).
.SH SEE ALSO
.UR https://libproxy.github.io/libproxy/
libproxy
.UE .

View File

@@ -1,83 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
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"
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
}

View File

@@ -1,71 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson-multilib vala
DESCRIPTION="Library for automatic proxy configuration management"
HOMEPAGE="https://github.com/libproxy/libproxy"
SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${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"
IUSE="duktape gnome gtk-doc +introspection kde test vala"
REQUIRED_USE="
gtk-doc? ( introspection )
vala? ( introspection )
"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
>=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}]
gnome? ( gnome-base/gsettings-desktop-schemas )
duktape? (
dev-lang/duktape:=
net-misc/curl
)
introspection? ( dev-libs/gobject-introspection )
"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
kde? ( kde-frameworks/kconfig:5 )
"
BDEPEND="
virtual/pkgconfig
gtk-doc? ( dev-util/gi-docgen )
vala? ( $(vala_depend) )
"
src_prepare() {
use vala && vala_setup
default
}
multilib_src_configure() {
local emesonargs=(
$(meson_native_use_bool gtk-doc docs)
$(meson_use test tests)
-Dconfig-env=true
$(meson_use gnome config-gnome)
-Dconfig-windows=false
-Dconfig-sysconfig=true
-Dconfig-osx=false
$(meson_use kde config-kde)
$(meson_native_use_bool duktape pacrunner-duktape)
$(meson_native_use_bool vala vapi)
$(meson_use duktape curl)
$(meson_native_use_bool introspection)
)
meson_src_configure
}
multilib_src_install_all() {
einstalldocs
if use gtk-doc; then
mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
fi
}

View File

@@ -8,8 +8,6 @@
<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>
<flag name="webkit">Use libjavascriptcoregtk from <pkg>net-libs/webkit-gtk</pkg> for PAC parsing</flag>
</use>
<upstream>
<remote-id type="github">libproxy/libproxy</remote-id>