SPECS/NetworkManager-libreswan.spec

@@ -7,31 +7,23 @@
 %bcond_with gtk4
 %else
 %bcond_without gtk4
-%endif 
+%endif
-
-%global real_version     1.2.22
-%global rpm_version      1.2.22
-%global release_version  4
-
-%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
 
-
 Summary:   NetworkManager VPN plug-in for IPsec VPN
 Name:      NetworkManager-libreswan
-Version:   %{rpm_version}
+Version:   1.2.22
-Release:   %{release_version}%{?dist}
+Release:   2%{?dist}
-License:   GPLv2+
+License:   GPL-2.0-or-later
-URL:       http://www.gnome.org/projects/NetworkManager/
+URL:       https://gitlab.gnome.org/GNOME/NetworkManager-libreswan
-Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/%{real_version_major}/%{name}-%{real_version}.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz
 
-# Patch1: 0001-some.patch
+#Patch1: 0001-some.patch
-Patch1: 0001-ipsec-conf-escaping-cve-2024-9050.patch
 
 BuildRequires: make
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: gtk3-devel
 BuildRequires: libnl3-devel
 BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
@@ -50,7 +42,7 @@ BuildRequires: libnma-gtk4-devel
 %endif
 
 Requires: NetworkManager >= %{nm_version}
-Requires: dbus
+Requires: dbus-common
 Requires: /usr/sbin/ipsec
 
 Provides: NetworkManager-openswan = %{version}-%{release}
@@ -81,32 +73,34 @@ the libreswan server with NetworkManager (GNOME files).
 
 
 %prep
-%autosetup -p1 -n "%{name}-%{real_version}"
+%autosetup -p1
 
 
 %build
 %configure \
         --disable-static \
 %if %with gtk4
-    --with-gtk4 \
+        --with-gtk4 \
 %endif
 %if %without libnm_glib
         --without-libnm-glib \
 %endif
         --enable-more-warnings=yes \
         --with-dist-version=%{version}-%{release}
-make %{?_smp_mflags}
+%make_build
+
 
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
+mv %{buildroot}%{_sysconfdir}/dbus-1 %{buildroot}%{_datadir}/
 
 %find_lang %{name}
 
 %files -f %{name}.lang
 %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
-%{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf
+%{_datadir}/dbus-1/system.d/nm-libreswan-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name
 %{_libexecdir}/nm-libreswan-service
 %{_libexecdir}/nm-libreswan-service-helper
@@ -129,34 +123,56 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-libreswan-editor.so
 %endif
 
-%changelog
-* Thu Oct 03 2024 Lubomir Rintel <lkundrak@v3.sk> - 1.2.22-4
-- Unbreak validation of unknown keys
 
-* Wed Sep 25 2024 Lubomir Rintel <lkundrak@v3.sk> - 1.2.22-2
+%changelog
-- Fix improper escaping of Libreswan configuration (CVE-2024-9050)
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2.22-2
+- Bump release for June 2024 mass rebuild
 
 * Wed May 22 2024 Beniamino Galvani <bgalvani@redhat.com> - 1.2.22-1
 - Add IPv6 support (RHEL-21875)
 
+* Fri Apr 19 2024 Íñigo Huguet <ihuguet@redhat.com> - 1.2.20-2
+- Added gating.yaml
+
 * Wed Apr 17 2024 Íñigo Huguet <ihuguet@redhat.com> - 1.2.20-1
-- Support "leftsubnet" property (RHEL-26776)
+- Update to 1.2.20 release
-- Support "rightcert" property (RHEL-30370)
 
-* Wed Jan 17 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.2.18-2
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-3
-- Support point-to-point IPSec tunnel (RHEL-20690)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-- 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
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 15 2023 Beniamino Galvani <bgalvani@redhat.com> - 1.2.18-1
 - Update to 1.2.18 release
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.14-1.3
+* Fri Sep 08 2023 Till Maas <opensource@till.name> - 1.2.16-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Migrate to spdx license
-  Related: rhbz#1991688
+- Cleanup whitespace
+- Use make macros
+- Fix changelog
+- Update URL
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Mar 11 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.2.16-1
+- Update to 1.2.16 release
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.14-1.2
+* Mon Feb 15 2021 Lubomir Rintel <lkundrak@v3.sk> - 1.2.14-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Move dbus service file into /usr/share/dbus-1
 
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild