17 Commits

Author SHA1 Message Date
a174421884 automatic version update by autodist [release 0.5.8-1mamba;Sat Jul 20 2024] 2024-07-20 20:07:07 +02:00
55e92f173c automatic version update by autodist [release 0.5.7-1mamba;Wed Jun 19 2024] 2024-06-20 18:15:41 +02:00
47bd6a2c55 automatic version update by autodist [release 0.5.6-1mamba;Fri Apr 26 2024] 2024-04-26 10:20:48 +02:00
ce413fe903 automatic version update by autodist [release 0.5.5-1mamba;Sat Apr 06 2024] 2024-04-10 14:54:31 +02:00
649031819f obsolete perl-Net-Libproxy [release 0.5.4-2mamba;Sun Mar 03 2024] 2024-03-03 18:03:49 +01:00
307e3dcf0d automatic version update by autodist [release 0.5.4-1mamba;Tue Feb 13 2024] 2024-03-01 17:54:11 +01:00
0801c4c700 rebuilt with python3 == 3.11 [release 0.4.18-2mamba;Wed Oct 04 2023] 2024-01-06 05:27:20 +01:00
72d02e0e6d update to 0.4.18 [release 0.4.18-1mamba;Sun Jul 31 2022] 2024-01-06 05:27:18 +01:00
6550093423 automatic version update by autodist [release 0.4.17-1mamba;Thu Jan 14 2021] 2024-01-06 05:27:18 +01:00
cf11afd914 added a patch to fix error in python module: TypeError: _argtypes_ must be a sequence of types [release 0.4.16-2mamba;Mon Dec 21 2020] 2024-01-06 05:27:18 +01:00
a37d76abd6 automatic version update by autodist [release 0.4.16-1mamba;Fri Dec 18 2020] 2024-01-06 05:27:18 +01:00
1e843b755e added python3 package [release 0.4.15-3mamba;Thu Jul 23 2020] 2024-01-06 05:27:18 +01:00
e834e187ca rebuilt with python 3.6 support [release 0.4.15-2mamba;Sun Mar 31 2019] 2024-01-06 05:27:18 +01:00
8d9a5194a9 automatic version update by autodist [release 0.4.15-1mamba;Tue Aug 08 2017] 2024-01-06 05:27:18 +01:00
6412539903 automatic version update by autodist [release 0.4.13-1mamba;Mon Oct 31 2016] 2024-01-06 05:27:17 +01:00
b69072bd43 update to 0.4.12 [release 0.4.12-1mamba;Sat Feb 27 2016] 2024-01-06 05:27:17 +01:00
f36ceb06a4 package NetworkManager plugin apart
disable link to webkit [release 0.4.11-4mamba;Tue Mar 10 2015]
2024-01-06 05:27:17 +01:00
5 changed files with 131 additions and 277 deletions

View File

@@ -1,13 +0,0 @@
diff -Nru libproxy-0.4.11.orig/libproxy/modules/config_kde4.cpp libproxy-0.4.11/libproxy/modules/config_kde4.cpp
--- libproxy-0.4.11.orig/libproxy/modules/config_kde4.cpp 2012-07-05 18:50:06.000000000 +0200
+++ libproxy-0.4.11/libproxy/modules/config_kde4.cpp 2013-04-22 13:29:01.905639524 +0200
@@ -64,7 +64,8 @@
};
// The result of toLatin1() is undefined for non-Latin1 strings.
// However, KDE saves this entry using IDN and percent-encoding, so no problem...
- response.push_back(string(prxy.toLatin1().data()));
+ // Workaround: since recent kde versions a space is used instead of ':'
+ response.push_back(string(prxy.replace(' ',':').toLatin1().data()));
break;
case 2: // Use a manual PAC
// The result of toLatin1() is undefined for non-Latin1 strings.

View File

@@ -0,0 +1,36 @@
From cb41b94be34b31bc84eed0908858654632e57906 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 14 Dec 2020 15:39:22 +0100
Subject: [PATCH] python bindings: fix "TypeError: _argtypes_ must be a
sequence of types"
Fixes #125
---
bindings/python/libproxy.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bindings/python/libproxy.py b/bindings/python/libproxy.py
index a29b33a..2224a19 100644
--- a/bindings/python/libproxy.py
+++ b/bindings/python/libproxy.py
@@ -44,9 +44,9 @@ def _load(name, *versions):
# Load libproxy
_libproxy = _load("proxy", 1)
_libproxy.px_proxy_factory_new.restype = ctypes.POINTER(ctypes.c_void_p)
-_libproxy.px_proxy_factory_free.argtypes = ctypes.c_void_p,
+_libproxy.px_proxy_factory_free.argtypes = [ctypes.c_void_p]
_libproxy.px_proxy_factory_get_proxies.restype = ctypes.POINTER(ctypes.c_void_p)
-_libproxy.px_proxy_factory_free_proxies.argtypes = ctypes.POINTER(ctypes.c_void_p)
+_libproxy.px_proxy_factory_free_proxies.argtypes = [ctypes.POINTER(ctypes.c_void_p)]
class ProxyFactory(object):
"""A ProxyFactory object is used to provide potential proxies to use
@@ -141,7 +141,7 @@ def getProxies(self, url):
proxies.append(proxy_bytes.decode('utf-8', errors='replace'))
i += 1
- _libproxy.px_proxy_factory_free_proxies(proxies)
+ _libproxy.px_proxy_factory_free_proxies(array)
return proxies

View File

@@ -1,80 +0,0 @@
From 8dbcf9b358f50f7a7c1f1368d167999c31b1e86b Mon Sep 17 00:00:00 2001
From: "dominique.leuenberger@gmail.com"
<dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>
Date: Fri, 9 Mar 2012 17:47:15 +0000
Subject: [PATCH] Fix build with gcc 4.7. Fixes issue 173
git-svn-id: http://libproxy.googlecode.com/svn/trunk@833 c587cffe-e639-0410-9787-d7902ae8ed56
---
libproxy/modules/config_sysconfig.cpp | 3 +++
libproxy/modules/pacrunner_mozjs.cpp | 1 +
libproxy/modules/pacrunner_natus.cpp | 1 +
libproxy/modules/pacrunner_webkit.cpp | 1 +
libproxy/url.cpp | 1 +
5 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/libproxy/modules/config_sysconfig.cpp b/libproxy/modules/config_sysconfig.cpp
index 616585a..6e97ae8 100644
--- a/libproxy/modules/config_sysconfig.cpp
+++ b/libproxy/modules/config_sysconfig.cpp
@@ -21,6 +21,9 @@
#include <cstdlib>
#include <map>
#include <fstream>
+#include <unistd.h>
+#include <sys/types.h>
+
#include "../extension_config.hpp"
using namespace libproxy;
diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
index 3283e91..abb4b9d 100644
--- a/libproxy/modules/pacrunner_mozjs.cpp
+++ b/libproxy/modules/pacrunner_mozjs.cpp
@@ -18,6 +18,7 @@
******************************************************************************/
#include <cstring> // ?
+#include <unistd.h> // gethostname
#include "../extension_pacrunner.hpp"
using namespace libproxy;
diff --git a/libproxy/modules/pacrunner_natus.cpp b/libproxy/modules/pacrunner_natus.cpp
index f7bd4fc..ce79943 100644
--- a/libproxy/modules/pacrunner_natus.cpp
+++ b/libproxy/modules/pacrunner_natus.cpp
@@ -18,6 +18,7 @@
******************************************************************************/
#include "../extension_pacrunner.hpp"
+#include <unistd.h> // gethostname
using namespace libproxy;
#define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
diff --git a/libproxy/modules/pacrunner_webkit.cpp b/libproxy/modules/pacrunner_webkit.cpp
index b9abf34..c51b869 100644
--- a/libproxy/modules/pacrunner_webkit.cpp
+++ b/libproxy/modules/pacrunner_webkit.cpp
@@ -18,6 +18,7 @@
******************************************************************************/
#include "../extension_pacrunner.hpp"
+#include <unistd.h> // gethostname
using namespace libproxy;
#ifdef __APPLE__
diff --git a/libproxy/url.cpp b/libproxy/url.cpp
index df75022..cd781df 100644
--- a/libproxy/url.cpp
+++ b/libproxy/url.cpp
@@ -33,6 +33,7 @@
#include <cstdlib> // For atoi()
#include <sys/stat.h> // For stat()
#include <algorithm> // For transform()
+#include <unistd.h> // For read() close()
#ifdef WIN32
#include <io.h>
--
1.7.8.6

View File

@@ -1,46 +0,0 @@
Index: libproxy/libproxy/cmake/modules/pacrunner_mozjs.cmk
===================================================================
--- libproxy/libproxy/cmake/modules/pacrunner_mozjs.cmk (révision 814)
+++ libproxy/libproxy/cmake/modules/pacrunner_mozjs.cmk (révision 815)
@@ -7,19 +7,15 @@
include_directories("${MOZJS_INCLUDE_DIR}")
endif()
elseif(NOT APPLE)
- set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order")
option(WITH_MOZJS "Search for MOZJS package" ON)
if (WITH_MOZJS)
- foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER})
- pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12)
- if(MOZJS_FOUND)
- include_directories(${MOZJS_INCLUDE_DIRS})
- link_directories(${MOZJS_LIBRARY_DIRS})
- break()
- else()
- set(MOZJS_FOUND 0)
- endif()
- endforeach()
+ pkg_search_module(MOZJS mozjs185>=1.8.5)
+ if(MOZJS_FOUND)
+ include_directories(${MOZJS_INCLUDE_DIRS})
+ link_directories(${MOZJS_LIBRARY_DIRS})
+ else()
+ set(MOZJS_FOUND 0)
+ endif()
else()
set(MOZJS_FOUND 0)
endif()
Index: libproxy/NEWS
===================================================================
--- libproxy/NEWS (révision 814)
+++ libproxy/NEWS (révision 815)
@@ -1,3 +1,10 @@
+New in version 0.4.8 (not yet released)
+==============================
+* Only support standalone mozjs185 as mozilla js engine.
+ xulrunner being part of the now lightning fast moving firefox
+ is impossible to be tracked as a dependency and it is not
+ supported by Mozilla to be used in this scenario.
+
New in version 0.4.7
==============================
* Support/require xulrunner 2.0+

View File

@@ -1,54 +1,49 @@
Name: libproxy Name: libproxy
Version: 0.4.11 Version: 0.5.8
Release: 3mamba Release: 1mamba
Summary: A library that provides automatic proxy configuration management. Summary: A library that provides automatic proxy configuration management.
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://libproxy.googlecode.com URL: https://libproxy.github.io/libproxy/
Source: http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz Source: https://github.com/libproxy/libproxy.git/%{version}/libproxy-%{version}.tar.bz2
Patch0: libproxy-0.4.7-gcc-4.7.patch Patch3: libproxy-0.4.16-upstream-fix-python-argtypes_must_be_a_sequence.patch
Patch1: libproxy-0.4.7-xulrunner.patch
Patch2: libproxy-0.4.11-kde-4.10.patch
License: LGPL License: LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
%if "%{stage1}" != "1" BuildRequires: libcurl-devel
BuildRequires: kdelibs-devel BuildRequires: libduktape-devel
%endif
BuildRequires: libatk-devel
BuildRequires: libcairo-devel
BuildRequires: libdbus-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgcc
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libglib-devel BuildRequires: libglib-devel
BuildRequires: libgtk2-devel
BuildRequires: libpango-devel
BuildRequires: libpython-devel
BuildRequires: libqt4-devel
BuildRequires: libsoup-devel
BuildRequires: libstdc++6-devel
BuildRequires: libwebkit-gtk-devel
BuildRequires: perl-devel
BuildRequires: pkg-config
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
#%if "%{stage1}" != "1" BuildRequires: libpython3-devel >= 3.11
#BuildRequires: xulrunner-devel
#%endif
BuildRequires: glproto-devel BuildRequires: glproto-devel
BuildRequires: libnm-devel BuildRequires: libnm-devel
Requires: %{name}-tools = %{?epoch:%epoch:}%{version}-%{release}
Provides: %{name}-mozjs Provides: %{name}-mozjs
Obsoletes: %{name}-mozjs Obsoletes: %{name}-mozjs < 0.4.18
Provides: %{name}-webkit Provides: %{name}-webkit
Obsoletes: %{name}-webkit Obsoletes: %{name}-webkit < 0.4.18
BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: perl-Net-Libproxy < 0.5.4
Obsoletes: python-libproxy-py310 < 0.4.18-2mamba
Obsoletes: python-libproxy-py3 < 0.5.4
Obsoletes: libproxy-gnome < 0.5.4
Obsoletes: libproxy-kde < 0.5.4
Obsoletes: libproxy-networkmanager < 0.5.4
Obsoletes: libproxy-pacrunner < 0.5.4
%description %description
libproxy is a library that provides automatic proxy configuration management. libproxy is a library that provides automatic proxy configuration management.
%package devel
Summary: Devel package for %{name}
Group: Development/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description devel
libproxy is a library that provides automatic proxy configuration management.
This package contains static libraries and header files needed for development.
%package tools %package tools
Summary: A simple application using libproxy Summary: A simple application using libproxy
Group: System/Tools Group: System/Tools
@@ -58,86 +53,20 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
A simple application that will use libproxy to give the results you can expect from other applications. A simple application that will use libproxy to give the results you can expect from other applications.
It can be used to debug what would happen in various cases. It can be used to debug what would happen in various cases.
%package -n python-libproxy %debug_package
Summary: Pythin binding for %{name}
Group: System/Libraries/Python
%description -n python-libproxy
%{summary}.
%package -n perl-Net-Libproxy
Summary: Perl binding for %{name}
Group: System/Libraries/Perl
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description -n perl-Net-Libproxy
%{summary}.
%package devel
Summary: Devel package for %{name}
Group: Development/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description devel
libproxy is a library that provides automatic proxy configuration management.
This package contains static libraries and header files need for development.
%package kde
Summary: KDE plugin for %{name}
Group: System/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description kde
libproxy is a library that provides automatic proxy configuration management.
This package contains the plugin for the KDE desktop enviroment.
%package gnome
Summary: Gnome plugin for %{name}
Group: System/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description gnome
libproxy is a library that provides automatic proxy configuration management.
This package contains the plugin for the KDE desktop enviroment.
%package mozjs
Summary: Mozilla plugin for %{name}
Group: System/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description mozjs
libproxy is a library that provides automatic proxy configuration management.
This package contains the mozilla plugin.
%package webkit
Summary: WebKit plugin for %{name}
Group: System/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description webkit
libproxy is a library that provides automatic proxy configuration management.
%prep %prep
%setup -q %setup -q
#%patch0 -p1 #%patch3 -p1
#%patch1 -p1
%patch2 -p1
%build %build
#export NetworkManager_CFLAGS="-I/usr/include/NetworkManager `pkg-config --cflags --libs dbus-1`" %meson
%cmake \
-DPERL_VENDORINSTALL=yes \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}
%make %meson_build
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall %meson_install
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -148,52 +77,80 @@ libproxy is a library that provides automatic proxy configuration management.
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libproxy.so.* %{_libdir}/libproxy.so.*
#%{_libdir}/libmodman.so.* %{_libdir}/libproxy/libpxbackend-1.0.so
%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so %{_libdir}/girepository-1.0/Libproxy-1.0.typelib
%{_libexecdir}/pxgsettings %doc COPYING
%doc AUTHORS COPYING
%files tools %files tools
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/proxy %{_bindir}/proxy
%{_mandir}/man8/proxy.8*
%files -n python-libproxy
%defattr(-,root,root)
%{python_sitearch}/libproxy.py
%files -n perl-Net-Libproxy
%defattr(-,root,root)
%{perl_vendorarch}/Net/Libproxy.pm
%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/*.h %dir %{_includedir}/libproxy
%{_includedir}/libproxy/proxy.h
%{_libdir}/libproxy.so %{_libdir}/libproxy.so
#%{_libdir}/libmodman.so %{_datadir}/gir-1.0/Libproxy-1.0.gir
%{_datadir}/vala/vapi/libproxy-1.0.*
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/Modules/Findlibproxy.cmake %dir %{_docdir}/libproxy-1.0
#%doc ChangeLog README %{_docdir}/libproxy-1.0/*
#%doc CHANGELOG.md README.md
%files gnome
%defattr(-,root,root)
%{_libdir}/libproxy/%{version}/modules/config_gnome3.so
%if "%{stage1}" != "1"
#%files mozjs
#%defattr(-,root,root)
##%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so
#
#%files webkit
#%defattr(-,root,root)
##%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so
%files kde
%defattr(-,root,root)
%{_libdir}/libproxy/%{version}/modules/config_kde4.so
%endif
%changelog %changelog
* Sat Jul 20 2024 Automatic Build System <autodist@openmamba.org> 0.5.8-1mamba
- automatic version update by autodist
* Wed Jun 19 2024 Automatic Build System <autodist@openmamba.org> 0.5.7-1mamba
- automatic version update by autodist
* Fri Apr 26 2024 Automatic Build System <autodist@openmamba.org> 0.5.6-1mamba
- automatic version update by autodist
* Sat Apr 06 2024 Automatic Build System <autodist@openmamba.org> 0.5.5-1mamba
- automatic version update by autodist
* Sun Mar 03 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 0.5.4-2mamba
- obsolete perl-Net-Libproxy
* Tue Feb 13 2024 Automatic Build System <autodist@openmamba.org> 0.5.4-1mamba
- automatic version update by autodist
* Wed Oct 04 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.18-2mamba
- rebuilt with python3 == 3.11
* Sun Jul 31 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.18-1mamba
- update to 0.4.18
* Thu Jan 14 2021 Automatic Build System <autodist@mambasoft.it> 0.4.17-1mamba
- automatic version update by autodist
* Mon Dec 21 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.16-2mamba
- added a patch to fix error in python module: TypeError: _argtypes_ must be a sequence of types
* Fri Dec 18 2020 Automatic Build System <autodist@mambasoft.it> 0.4.16-1mamba
- automatic version update by autodist
* Thu Jul 23 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.15-3mamba
- added python3 package
* Sun Mar 31 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.15-2mamba
- rebuilt with python 3.6 support
* Tue Aug 08 2017 Automatic Build System <autodist@mambasoft.it> 0.4.15-1mamba
- automatic version update by autodist
* Mon Oct 31 2016 Automatic Build System <autodist@mambasoft.it> 0.4.13-1mamba
- automatic version update by autodist
* Sat Feb 27 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.12-1mamba
- update to 0.4.12
* Tue Mar 10 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.11-4mamba
- package NetworkManager plugin apart
- disable link to webkit
* Fri May 17 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.11-3mamba * Fri May 17 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.11-3mamba
- rebuilt with python 2.7 - rebuilt with python 2.7