Compare commits
No commits in common. "c9s" and "c8" have entirely different histories.
|
@ -1,23 +1 @@
|
||||||
NetworkManager-openswan-0.8.tar.gz
|
SOURCES/NetworkManager-libreswan-1.2.10.tar.xz
|
||||||
/NetworkManager-openswan-0.9.8.0.sha256sum
|
|
||||||
/NetworkManager-openswan-0.9.8.0.tar.xz
|
|
||||||
/NetworkManager-openswan-0.9.8.4.sha256sum
|
|
||||||
/NetworkManager-openswan-0.9.8.4.tar.xz
|
|
||||||
/NetworkManager-openswan-1.0.0.tar.xz
|
|
||||||
/NetworkManager-openswan-1.0.2.tar.xz
|
|
||||||
/NetworkManager-openswan-1.0.6.tar.xz
|
|
||||||
/NetworkManager-openswan-1.2.0.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.0.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.1.90.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.1.91.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.1.92.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.1.93.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.2.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.4.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.6.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.10.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.12.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.14.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.18.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.20.tar.xz
|
|
||||||
/NetworkManager-libreswan-1.2.22.tar.xz
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,26 @@
|
||||||
|
From eaf501ab7cb732a152097d2af5636b03fd3f029d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Francesco Giudici <fgiudici@redhat.com>
|
||||||
|
Date: Mon, 15 Apr 2019 14:51:26 +0200
|
||||||
|
Subject: [PATCH] properties: set advanced dialog modal
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1697329
|
||||||
|
---
|
||||||
|
properties/nm-libreswan-dialog.ui | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/properties/nm-libreswan-dialog.ui b/properties/nm-libreswan-dialog.ui
|
||||||
|
index 73522d4..e355c08 100644
|
||||||
|
--- a/properties/nm-libreswan-dialog.ui
|
||||||
|
+++ b/properties/nm-libreswan-dialog.ui
|
||||||
|
@@ -451,6 +451,8 @@
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="border_width">12</property>
|
||||||
|
<property name="title" translatable="yes">IPsec Advanced Options</property>
|
||||||
|
+ <property name="modal">True</property>
|
||||||
|
+ <property name="destroy_with_parent">True</property>
|
||||||
|
<property name="type_hint">dialog</property>
|
||||||
|
<child internal-child="vbox">
|
||||||
|
<object class="GtkBox" id="dialog-vbox1">
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
|
@ -0,0 +1,68 @@
|
||||||
|
From 4be4c56b4f8a52b1cd5f8aadee273706c28ae332 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Beniamino Galvani <bgalvani@redhat.com>
|
||||||
|
Date: Sat, 13 Jan 2024 18:10:02 +0100
|
||||||
|
Subject: [PATCH 1/1] service: fix wrong refcounting in D-Bus handler for
|
||||||
|
Callback()
|
||||||
|
|
||||||
|
The Callback() D-Bus method is handled via a GDBus-generated skeleton
|
||||||
|
code in nm-libreswan-helper-service-dbus.c, function
|
||||||
|
_nmdbus_libreswan_helper_skeleton_handle_method_call(). The function
|
||||||
|
emits signal "handle-callback" to let the program handle the incoming
|
||||||
|
method. As documented in the GDoc comments, the signal handler must
|
||||||
|
return TRUE if it handles the call.
|
||||||
|
|
||||||
|
```
|
||||||
|
/**
|
||||||
|
* NMDBusLibreswanHelper::handle-callback:
|
||||||
|
* @object: A #NMDBusLibreswanHelper.
|
||||||
|
* @invocation: A #GDBusMethodInvocation.
|
||||||
|
* @arg_environment: Argument passed by remote caller.
|
||||||
|
|
||||||
|
* Signal emitted when a remote caller is invoking the Callback()
|
||||||
|
D-Bus method.
|
||||||
|
|
||||||
|
* If a signal handler returns %TRUE, it means the signal handler
|
||||||
|
will handle the invocation (e.g. take a reference to @invocation
|
||||||
|
and eventually call nmdbus_libreswan_helper_complete_callback()
|
||||||
|
or e.g. g_dbus_method_invocation_return_error() on it) and no
|
||||||
|
other signal handlers will run. If no signal handler handles the
|
||||||
|
invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
|
||||||
|
|
||||||
|
* Returns: %G_DBUS_METHOD_INVOCATION_HANDLED or %TRUE if the
|
||||||
|
invocation was handled, %G_DBUS_METHOD_INVOCATION_UNHANDLED or
|
||||||
|
%FALSE to let other signal handlers run.
|
||||||
|
*/
|
||||||
|
```
|
||||||
|
|
||||||
|
At the moment, in case of error the handler first calls
|
||||||
|
nmdbus_libreswan_helper_complete_callback() which decreases the
|
||||||
|
refcount of "invocation", and then returns FALSE which tells the
|
||||||
|
skeleton code to return an error, also unreferencing the
|
||||||
|
invocation. This causes a crash.
|
||||||
|
|
||||||
|
Since the G_DBUS_METHOD_INVOCATION_HANDLED alias for TRUE is only
|
||||||
|
available since GLib 2.68 (while we target 2.36), just return TRUE.
|
||||||
|
|
||||||
|
Fixes: acb9eb9de50b ('service: process the configuration in the service, not the helper')
|
||||||
|
(cherry picked from commit 8ceb901719acac3778e1d76779d9c14289185157)
|
||||||
|
---
|
||||||
|
src/nm-libreswan-service.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c
|
||||||
|
index fc470a6..4850729 100644
|
||||||
|
--- a/src/nm-libreswan-service.c
|
||||||
|
+++ b/src/nm-libreswan-service.c
|
||||||
|
@@ -1379,7 +1379,8 @@ out:
|
||||||
|
}
|
||||||
|
|
||||||
|
nmdbus_libreswan_helper_complete_callback (object, invocation);
|
||||||
|
- return success;
|
||||||
|
+
|
||||||
|
+ return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/****************************************************************/
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
|
@ -1,36 +1,25 @@
|
||||||
%if 0%{?fedora} < 28 && 0%{?rhel} < 8
|
%if 0%{?fedora} < 28 && 0%{?rhel} < 8
|
||||||
%bcond_without libnm_glib
|
%bcond_without libnm_glib
|
||||||
%else
|
%else
|
||||||
|
# Disable the legacy version by default
|
||||||
%bcond_with libnm_glib
|
%bcond_with libnm_glib
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} < 36 && 0%{?rhel} < 10
|
|
||||||
%bcond_with gtk4
|
|
||||||
%else
|
|
||||||
%bcond_without gtk4
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%global real_version 1.2.22
|
|
||||||
%global rpm_version 1.2.22
|
|
||||||
%global release_version 1
|
|
||||||
|
|
||||||
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
|
|
||||||
|
|
||||||
%global nm_version 1:1.2.0
|
|
||||||
%global nma_version 1.2.0
|
|
||||||
|
|
||||||
|
%global nm_version 1:1.2.0
|
||||||
|
%global nma_version 1.2.0
|
||||||
|
|
||||||
Summary: NetworkManager VPN plug-in for IPsec VPN
|
Summary: NetworkManager VPN plug-in for IPsec VPN
|
||||||
Name: NetworkManager-libreswan
|
Name: NetworkManager-libreswan
|
||||||
Version: %{rpm_version}
|
Version: 1.2.10
|
||||||
Release: %{release_version}%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.gnome.org/projects/NetworkManager/
|
URL: http://www.gnome.org/projects/NetworkManager/
|
||||||
Source0: https://download.gnome.org/sources/NetworkManager-libreswan/%{real_version_major}/%{name}-%{real_version}.tar.xz
|
Group: System Environment/Base
|
||||||
|
Source0: https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz
|
||||||
|
Patch0: 0001-po-import-translations-from-Red-Hat-translators.patch
|
||||||
|
Patch1: 0002-properties-set-advanced-dialog-modal.patch
|
||||||
|
Patch2: 0003-service-fix-wrong-refcounting-in-D-Bus-handler-for-C.patch
|
||||||
|
|
||||||
# Patch1: 0001-some.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: gtk3-devel
|
BuildRequires: gtk3-devel
|
||||||
BuildRequires: libnl3-devel
|
BuildRequires: libnl3-devel
|
||||||
BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
|
BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
|
||||||
|
@ -44,10 +33,6 @@ BuildRequires: NetworkManager-glib-devel >= %{nm_version}
|
||||||
BuildRequires: libnm-gtk-devel >= %{nma_version}
|
BuildRequires: libnm-gtk-devel >= %{nma_version}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %with gtk4
|
|
||||||
BuildRequires: libnma-gtk4-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Requires: NetworkManager >= %{nm_version}
|
Requires: NetworkManager >= %{nm_version}
|
||||||
Requires: dbus
|
Requires: dbus
|
||||||
Requires: /usr/sbin/ipsec
|
Requires: /usr/sbin/ipsec
|
||||||
|
@ -59,14 +44,13 @@ Obsoletes: NetworkManager-openswan < %{version}-%{release}
|
||||||
%global __provides_exclude ^(%{_privatelibs})$
|
%global __provides_exclude ^(%{_privatelibs})$
|
||||||
%global __requires_exclude ^(%{_privatelibs})$
|
%global __requires_exclude ^(%{_privatelibs})$
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains software for integrating the libreswan VPN software
|
This package contains software for integrating the libreswan VPN software
|
||||||
with NetworkManager and the GNOME desktop
|
with NetworkManager and the GNOME desktop
|
||||||
|
|
||||||
|
|
||||||
%package -n NetworkManager-libreswan-gnome
|
%package -n NetworkManager-libreswan-gnome
|
||||||
Summary: NetworkManager VPN plugin for libreswan - GNOME files
|
Summary: NetworkManager VPN plugin for libreswan - GNOME files
|
||||||
|
Group: System Environment/Base
|
||||||
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: shared-mime-info
|
Requires: shared-mime-info
|
||||||
|
@ -78,17 +62,12 @@ Obsoletes: NetworkManager-openswan-gnome < %{version}-%{release}
|
||||||
This package contains software for integrating VPN capabilities with
|
This package contains software for integrating VPN capabilities with
|
||||||
the libreswan server with NetworkManager (GNOME files).
|
the libreswan server with NetworkManager (GNOME files).
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n "%{name}-%{real_version}"
|
%autosetup -p1 -n %{name}-%{version}
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
%if %with gtk4
|
|
||||||
--with-gtk4 \
|
|
||||||
%endif
|
|
||||||
%if %without libnm_glib
|
%if %without libnm_glib
|
||||||
--without-libnm-glib \
|
--without-libnm-glib \
|
||||||
%endif
|
%endif
|
||||||
|
@ -96,13 +75,18 @@ the libreswan server with NetworkManager (GNOME files).
|
||||||
--with-dist-version=%{version}-%{release}
|
--with-dist-version=%{version}-%{release}
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=%{buildroot}
|
make install DESTDIR=%{buildroot}
|
||||||
rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
|
rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
|
%post
|
||||||
|
update-desktop-database &> /dev/null || :
|
||||||
|
|
||||||
|
%postun
|
||||||
|
update-desktop-database &> /dev/null || :
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
|
%{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
|
||||||
%{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf
|
%{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf
|
||||||
|
@ -110,78 +94,49 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
|
||||||
%{_libexecdir}/nm-libreswan-service
|
%{_libexecdir}/nm-libreswan-service
|
||||||
%{_libexecdir}/nm-libreswan-service-helper
|
%{_libexecdir}/nm-libreswan-service-helper
|
||||||
%{_mandir}/man5/nm-settings-libreswan.5.gz
|
%{_mandir}/man5/nm-settings-libreswan.5.gz
|
||||||
%doc AUTHORS NEWS
|
%doc AUTHORS ChangeLog NEWS
|
||||||
%license COPYING
|
%license COPYING
|
||||||
|
|
||||||
|
|
||||||
%files -n NetworkManager-libreswan-gnome
|
%files -n NetworkManager-libreswan-gnome
|
||||||
%{_libexecdir}/nm-libreswan-auth-dialog
|
%{_libexecdir}/nm-libreswan-auth-dialog
|
||||||
%{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so
|
%{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so
|
||||||
%{_metainfodir}/network-manager-libreswan.metainfo.xml
|
%dir %{_datadir}/gnome-vpn-properties/libreswan
|
||||||
|
%{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui
|
||||||
|
%{_datadir}/appdata/network-manager-libreswan.metainfo.xml
|
||||||
|
|
||||||
%if %with libnm_glib
|
%if %with libnm_glib
|
||||||
%{_libdir}/NetworkManager/libnm-*-properties.so
|
%{_libdir}/NetworkManager/libnm-*-properties.so
|
||||||
%{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name
|
%{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %with gtk4
|
|
||||||
%{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-libreswan-editor.so
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 22 2024 Beniamino Galvani <bgalvani@redhat.com> - 1.2.22-1
|
* Mon Feb 5 2024 Wen Liang <wenliang@redhat.com> - 1.2.10-5
|
||||||
- Add IPv6 support (RHEL-21875)
|
- Fix crash in libreswan_add_profile_wrong_password (RHEL-13123)
|
||||||
|
|
||||||
* Wed Apr 17 2024 Íñigo Huguet <ihuguet@redhat.com> - 1.2.20-1
|
* Tue Jul 9 2019 Francesco Giudici <fgiudici@redhat.com> - 1.2.10-4
|
||||||
- Support "leftsubnet" property (RHEL-26776)
|
- Fix Gnome IPsec advanced options dialog (rh #1697329)
|
||||||
- Support "rightcert" property (RHEL-30370)
|
|
||||||
|
|
||||||
* Wed Jan 17 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.2.18-2
|
* Mon Dec 10 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.2.10-3
|
||||||
- Support point-to-point IPSec tunnel (RHEL-20690)
|
- Update the translations (rh #1608329)
|
||||||
- Fix crash in libreswan_nmstate_iface_dpd_rsa (RHEL-21221)
|
|
||||||
- Support configuring IPSec mode with 'type' (RHEL-21554)
|
|
||||||
|
|
||||||
* Fri Dec 15 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.2.18-1
|
* Thu Oct 16 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.2.10-2
|
||||||
- Update to 1.2.18 release
|
- Import the translations (rh #1608329)
|
||||||
|
|
||||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.14-1.3
|
* Mon Oct 15 2018 Francesco Giudici <fgiudici@redhat.com> - 1.2.10-1
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- Update to 1.2.10 release (rh #1637867)
|
||||||
Related: rhbz#1991688
|
- Fix import functionality (rh #1633174)
|
||||||
|
|
||||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.14-1.2
|
* Wed Oct 3 2018 Beniamino Galvani <bgalvani@redhat.com> - 1.2.8-2
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
- Rebuild with updated annobin (rh #1630605)
|
||||||
|
|
||||||
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-1.1
|
* Mon Sep 17 2018 Francesco Giudici <fgiudici@redhat.com> - 1.2.8-1
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Update to 1.2.8 release
|
||||||
|
|
||||||
* Tue Jan 12 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.2.14-1
|
* Mon Aug 13 2018 Francesco Giudici <fgiudici@redhat.com> - 1.2.8-0.1
|
||||||
- Update to 1.2.14 release
|
- Update to latest development snapshot of NetworkManager-libreswan 1.2.8
|
||||||
|
- Introduced IKEv2 support (rh #1557035)
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-1.2
|
- Introduced support to more Libreswan properties (rh #1557035)
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Updated translations
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-1.1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 31 2019 Francesco Giudici <fgiudici@redhat.com> - 1.2.12-1
|
|
||||||
- Updated to 1.2.12
|
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.10-1.2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.10-1.1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Oct 18 2018 Francesco Giudici <fgiudici@redhat.com> - 1.2.10-1
|
|
||||||
- Updated to 1.2.10
|
|
||||||
- Import latest translations from upstream
|
|
||||||
|
|
||||||
* Wed Aug 22 2018 Paul Wouters <pwouters@redhat.com> - 1.2.6-1
|
|
||||||
- Updated to 1.2.6
|
|
||||||
- Upstream patches for IKEv2 support
|
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
@ -1,6 +0,0 @@
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-9
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
|
Loading…
Reference in New Issue