PR#3: Disable mozjs backend by default - rpms/libproxy

rpms / libproxy

#3 Disable mozjs backend by default

Merged 2 years ago by amigadave. Opened 2 years ago by frantisekz.

rpms/ frantisekz/libproxy master into master

Disable mozjs backend by default

František Zatloukal • 2 years ago

9ba40fc

libproxy.spec

file modified

+7 -15

		`@@ -4,7 +4,7 @@`

		`Name: libproxy`
		`Version: 0.4.15`
		`- Release: 26%{?dist}`
		`+ Release: 27%{?dist}`
		`Summary: A library handling all the details of proxy configuration`

		`License: LGPLv2+`
		`@@ -39,8 +39,6 @@`
		`%if ! 0%{?bootstrap}`
		`# gnome`
		`BuildRequires: pkgconfig(gio-2.0) >= 2.26`
		`- # mozjs`
		`- BuildRequires: pkgconfig(mozjs-68)`
		`# NetworkManager`
		`BuildRequires: pkgconfig(libnm)`
		`# pacrunner (and NetworkManager)`
		`@@ -106,14 +104,6 @@`
		`%description kde`
		`The %{name}-kde package contains the %{name} plugin for kde.`

		`- %package mozjs`
		`- Summary: Plugin for %{name} and mozjs`
		`- Requires: %{name}%{?_isa} = %{version}-%{release}`
		`- Provides: %{name}-pac = %{version}-%{release}`
		`-`
		`- %description mozjs`
		`- The %{name}-mozjs package contains the %{name} plugin for mozjs.`
		`-`
		`%package networkmanager`
		`Summary: Plugin for %{name} and networkmanager`
		`Requires: %{name}%{?_isa} = %{version}-%{release}`
		`@@ -126,6 +116,7 @@`
		`Summary: Plugin for %{name} and webkitgtk3`
		`Requires: %{name}%{?_isa} = %{version}-%{release}`
		`Provides: %{name}-pac = %{version}-%{release}`
		`+ Obsoletes: %{name}-mozjs <= %{version}-%{release}`

		`%description webkitgtk4`
		`The %{name}-webkitgtk4 package contains the %{name} plugin for`
		`@@ -159,13 +150,14 @@`
		`export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"`
		`%{cmake} \`
		`-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \`
		`+ -DBIPR=OFF \`
amigadave commented 2 years ago Why is this newly required?
frantisekz commented 2 years ago Without this, %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so is built right into libproxy, not as a separate .so file.[0] I was trying to make change as small as possible and not risk breaking stuff that might be depending on that (don't know if that's possible). I can change it and purge the webkitgtk4 subpackage too, if you prefer that. [0] https://github.com/libproxy/libproxy/blob/master/INSTALL#L71
		`-DWITH_PERL=OFF \`
		`%if ! 0%{?bootstrap}`
		`-DWITH_GNOME3=ON \`
		`-DWITH_PYTHON2=OFF \`
		`-DWITH_PYTHON3=ON \`
		`-DWITH_WEBKIT3=ON \`
		`- -DWITH_MOZJS=ON \`
		`+ -DWITH_MOZJS=OFF \`
		`%else`
		`-DWITH_PYTHON2=OFF \`
		`-DWITH_PYTHON3=OFF \`
		`@@ -214,9 +206,6 @@`
		`%files kde`
		`%{_libdir}/%{name}/%{version}/modules/config_kde.so`

		`- %files mozjs`
		`- %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so`
		`-`
		`%files networkmanager`
		`%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so`

		`@@ -235,6 +224,9 @@`


		`%changelog`
		`+ * Tue Oct 06 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.4.15-27`
		`+ - Disable mozjs backend by default, obsolete it by webkit subpackage`
		`+`
		`* Tue Sep 29 2020 David King <amigadave@amigadave.com> - 0.4.15-26`
		`- Fix PAC buffer overflow (#1883584)`

frantisekz commented 2 years ago

Implements https://github.com/libproxy/libproxy/pull/139 .

Obsoletes libproxy-mozjs by libproxy-webkitgtk4 . This would allow us to drop mozjs68 from default Workstation installation.

rebased onto 9ba40fc

2 years ago

amigadave commented on line 46 of libproxy.spec 2 years ago

Why is this newly required?

frantisekz commented on line 46 of libproxy.spec 2 years ago

Without this, %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so is built right into libproxy, not as a separate .so file.[0]

I was trying to make change as small as possible and not risk breaking stuff that might be depending on that (don't know if that's possible). I can change it and purge the webkitgtk4 subpackage too, if you prefer that.

[0] https://github.com/libproxy/libproxy/blob/master/INSTALL#L71