|
|
@@ -4,8 +4,8 @@
|
|
|
|
|
|
Summary: A library handling all the details of proxy configuration
|
|
|
Name: libproxy
|
|
|
-Version: 0.4.15
|
|
|
-Release: 4%{?_dist_release}
|
|
|
+Version: 0.4.17
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -13,21 +13,9 @@ Distribution: Vine Linux
|
|
|
License: LGPLv2+
|
|
|
URL: http://libproxy.github.io/libproxy
|
|
|
Source0: https://github.com/libproxy/libproxy/releases/download/%{version}/libproxy-%{version}.tar.xz
|
|
|
-Patch0: libproxy-0.4.15-python38.patch
|
|
|
-Patch1000: CVE-2020-25219.patch
|
|
|
-# CVE-2020-26154
|
|
|
-Patch1001: libproxy-0.4.15-fix-pac-buffer-overflow.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
|
|
-BuildRequires: python-devel
|
|
|
-BuildRequires: python3-devel
|
|
|
-#Virtual Provides - We need either mozjs or WebKit
|
|
|
-%if %{with mozjs}
|
|
|
-Requires: %{name}-pac >= %{version}
|
|
|
-%endif
|
|
|
-#
|
|
|
-Requires: libproxy-python = %{version}-%{release}
|
|
|
Requires: libproxy-bin = %{version}-%{release}
|
|
|
|
|
|
Obsoletes: %{name}-mozjs < 1.4.15
|
|
|
@@ -35,26 +23,18 @@ Obsoletes: %{name}-webkitgtk3 < 1.4.15
|
|
|
|
|
|
BuildRequires: cmake
|
|
|
# gnome
|
|
|
-BuildRequires: GConf2-devel
|
|
|
-%if %{with mozjs}
|
|
|
-# mozjs
|
|
|
-BuildRequires: mozjs >= 38
|
|
|
-%endif
|
|
|
+BuildRequires: pkgconfig(gio-2.0) >= 2.26
|
|
|
# NetworkManager
|
|
|
BuildRequires: NetworkManager-libnm-devel
|
|
|
BuildRequires: dbus-devel
|
|
|
BuildRequires: glib2
|
|
|
-# webkit (gtk)
|
|
|
-BuildRequires: webkitgtk4-devel
|
|
|
-# kde
|
|
|
-BuildRequires: libXmu-devel
|
|
|
-BuildRequires: libX11-devel
|
|
|
-
|
|
|
-BuildRequires: python-rpm-macros
|
|
|
+# webkit (gtk3)
|
|
|
+BuildRequires: pkgconfig(javascriptcoregtk-4.0)
|
|
|
+# python3
|
|
|
+BuildRequires: python3-devel
|
|
|
BuildRequires: python3-rpm-macros
|
|
|
|
|
|
-Provides: %{name}-webkit = %{version}-%{release}
|
|
|
-Obsoletes: %{name}-webkit < %{version}-%{release}
|
|
|
+Obsoletes: %{name}-python < 0.4.17
|
|
|
|
|
|
%description
|
|
|
libproxy offers the following features:
|
|
|
@@ -80,22 +60,18 @@ Requires: %{name} = %{version}-%{release}
|
|
|
The %{name}-bin package contains the proxy binary for %{name}
|
|
|
|
|
|
|
|
|
-%package python
|
|
|
-Summary: Binding for %{name} and python
|
|
|
-Group: programming
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
-
|
|
|
-%description python
|
|
|
-The %{name}-python package contains the python binding for %{name}
|
|
|
-
|
|
|
-%package python3
|
|
|
+%package -n python3-%{name}
|
|
|
Summary: Binding for %{name} and python
|
|
|
Group: programming
|
|
|
+BuildArch: noarch
|
|
|
+%{?python_provide:%python_provide python3-%{name}}
|
|
|
+Obsoletes: %{name}-python3 < 1.4.17
|
|
|
+Provides: %{name}-python3 = %{version}-%{release}
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
+%description -n python3-%{name}
|
|
|
+The python3-%{name} package contains the python3 binding for %{name}
|
|
|
|
|
|
-%description python3
|
|
|
-The %{name}-python package contains the python binding for %{name}
|
|
|
|
|
|
%package gnome
|
|
|
Summary: Plugin for %{name} and gnome
|
|
|
@@ -106,38 +82,37 @@ Requires: %{name} = %{version}-%{release}
|
|
|
The %{name}-gnome package contains the %{name} plugin for gnome.
|
|
|
|
|
|
|
|
|
-%package kde
|
|
|
-Summary: Plugin for %{name} and kde
|
|
|
+%package networkmanager
|
|
|
+Summary: Plugin for %{name} and networkmanager
|
|
|
Group: system
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
+Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
|
|
|
-%description kde
|
|
|
-The %{name}-kde package contains the %{name} plugin for kde.
|
|
|
+%description networkmanager
|
|
|
+The %{name}-networkmanager package contains the %{name} plugin
|
|
|
+for networkmanager.
|
|
|
|
|
|
|
|
|
-%if %{with mozjs}
|
|
|
-%package mozjs
|
|
|
-Summary: Plugin for %{name} and mozjs
|
|
|
+%package webkitgtk4
|
|
|
+Summary: Plugin for %{name} and webkitgtk4
|
|
|
Group: system
|
|
|
Requires: %{name} = %{version}
|
|
|
-#Tweak this according to the current gecko-libs version
|
|
|
-Requires: js
|
|
|
Provides: %{name}-pac = %{version}-%{release}
|
|
|
|
|
|
-%description mozjs
|
|
|
-The %{name}-mozjs package contains the %{name} plugin for mozjs.
|
|
|
+%description webkitgtk4
|
|
|
+The %{name}-webkitgtk4 package contains the %{name} plugin for
|
|
|
+webkitgtk4.
|
|
|
|
|
|
|
|
|
-%package webkitgtk4
|
|
|
-Summary: Plugin for %{name} and webkitgtk4
|
|
|
+%package pacrunner
|
|
|
+Summary: Plugin for %{name} and PacRunner
|
|
|
Group: system
|
|
|
-Requires: %{name} = %{version}
|
|
|
+Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
Provides: %{name}-pac = %{version}-%{release}
|
|
|
+Requires: pacrunner
|
|
|
|
|
|
-%description webkitgtk4
|
|
|
-The %{name}-webkitgtk3 package contains the %{name} plugin for
|
|
|
-webkitgtk3.
|
|
|
-%endif
|
|
|
+%description pacrunner
|
|
|
+The %{name}-pacrunner package contains the %{name} plugin for
|
|
|
+PacRunner.
|
|
|
|
|
|
|
|
|
%package devel
|
|
|
@@ -156,7 +131,6 @@ developing applications that use %{name}.
|
|
|
|
|
|
%prep
|
|
|
%autosetup -p1
|
|
|
-#sed -i "s|mozjs185>=1.8.5|mozjs185|" libproxy/cmake/modules/pacrunner_mozjs.cmk
|
|
|
|
|
|
|
|
|
%build
|
|
|
@@ -165,29 +139,25 @@ export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
|
|
|
-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
|
|
|
-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
|
|
|
-DWITH_PERL=OFF \
|
|
|
+ -DWITH_PYTHON2=OFF \
|
|
|
+ -DWITH_PYTHON3=ON \
|
|
|
+ -DBIPR=OFF \
|
|
|
-DWITH_WEBKIT3=ON \
|
|
|
-DWITH_GNOME3=ON \
|
|
|
- -DWITH_KDE=ON \
|
|
|
- .
|
|
|
-make VERBOSE=1 %{?_smp_mflags}
|
|
|
-
|
|
|
+ -DWITH_KDE=OFF \
|
|
|
+ %{nil}
|
|
|
+%cmake_build
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
|
|
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
|
|
+%cmake_install
|
|
|
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
-%post -p /sbin/ldconfig
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
-
|
|
|
-
|
|
|
%files
|
|
|
-%defattr(-,root,root,-)
|
|
|
%license COPYING
|
|
|
%doc AUTHORS README
|
|
|
%{_libdir}/*.so.*
|
|
|
@@ -197,36 +167,23 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
|
|
|
|
|
|
%files bin
|
|
|
-%defattr(-,root,root,-)
|
|
|
%{_bindir}/proxy
|
|
|
|
|
|
-%files python
|
|
|
-%defattr(-,root,root,-)
|
|
|
-%{python_sitelib}/libproxy.py
|
|
|
-
|
|
|
-%files python3
|
|
|
-%defattr(-,root,root,-)
|
|
|
+%files -n python3-%{name}
|
|
|
%{python3_sitelib}/libproxy.py
|
|
|
|
|
|
%files gnome
|
|
|
-%defattr(-,root,root,-)
|
|
|
%{_libdir}/%{name}/%{version}/modules/config_gnome3.so
|
|
|
%{_libexecdir}/pxgsettings
|
|
|
|
|
|
-%files kde
|
|
|
-%defattr(-,root,root,-)
|
|
|
-%{_libdir}/%{name}/%{version}/modules/config_kde.so
|
|
|
-
|
|
|
-# Build the pacrunner into libproxy unless we are building for multiple engines
|
|
|
-%if %{with mozjs}
|
|
|
-%files mozjs
|
|
|
-%defattr(-,root,root,-)
|
|
|
-%{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
|
|
|
+%files networkmanager
|
|
|
+%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
|
|
|
|
|
|
%files webkitgtk4
|
|
|
-%defattr(-,root,root,-)
|
|
|
%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
|
|
|
-%endif
|
|
|
+
|
|
|
+%files pacrunner
|
|
|
+%{_libdir}/%{name}/%{version}/modules/config_pacrunner.so
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root,-)
|
|
|
@@ -237,6 +194,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.17-1
|
|
|
+- dropped ldconfig scriptlets.
|
|
|
+- dropped subpackages: kde, python2.
|
|
|
+- dropped Patch0, 1000 and 1001: fixed in upstream.
|
|
|
+
|
|
|
* Sat Oct 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-4
|
|
|
- imported Patch1001 to fix CVE-2020-26154 from rawhide.
|
|
|
|
