From 2a928a874bbcf91a6fd136e12c39d4e16de0b496 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sat, 19 Aug 2006 10:46:12 +0000 Subject: [PATCH 001/129] auto-import NetworkManager-openvpn-0.3.2-4 on branch devel from NetworkManager-openvpn-0.3.2-4.src.rpm --- .cvsignore | 1 + NetworkManager-openvpn.spec | 115 ++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 117 insertions(+) create mode 100644 NetworkManager-openvpn.spec diff --git a/.cvsignore b/.cvsignore index e69de29..4505fcc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +NetworkManager-openvpn-0.3.2.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec new file mode 100644 index 0000000..53d9096 --- /dev/null +++ b/NetworkManager-openvpn.spec @@ -0,0 +1,115 @@ +%define nm_version 0.6.4 +%define dbus_version 0.61 +%define gtk2_version 2.6.0 +%define openvpn_version 2.1 +%define shared_mime_version 0.17-1 + +Summary: NetworkManager VPN integration for OpenVPN +Name: NetworkManager-openvpn +Version: 0.3.2 +Release: 4 +License: GPL +URL: http://www.gnome.org/projects/NetworkManager/ +Group: System Environment/Base +# How to build the source package: +# - Check out NetworkManager from Gnome CVS, use the right tag, +# e.g. NETWORKMANAGER_0_6_4_RELEASE +# - cd NetworkManager/vpn-daemons/openvpn +# - ./augogen.sh --prefix=/usr --sysconfdir=/etc +# - make distclean +# - cd .. +# - mv openvpn NetworkManager-openvpn-%{version} +# - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version} +Source: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: dbus-devel >= %{dbus_version} +BuildRequires: NetworkManager-devel >= %{nm_version} +BuildRequires: GConf2-devel +BuildRequires: libgnomeui-devel +BuildRequires: gnome-keyring-devel +BuildRequires: libglade2-devel +BuildRequires: libpng-devel +Requires(post): %{_bindir}/update-desktop-database +Requires(postun): %{_bindir}/update-desktop-database +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: gtk2 >= %{gtk2_version} +Requires: dbus >= %{dbus_version} +Requires: NetworkManager >= %{nm_version} +Requires: openvpn >= %{openvpn_version} +Requires: shared-mime-info >= %{shared_mime_version} +Requires: GConf2 +Requires: gnome-keyring + +%description +This package contains software for integrating the OpenVPN VPN software +with NetworkManager and the GNOME desktop. + +Note: Due to a problem with the openvpn package you have to use SELinux in +permissive mode to use the NetworkManager OpenVPN plugin at the moment. + +%prep +%setup -q + +%build +if [ ! -f configure ]; then + ./autogen.sh +fi +%configure --disable-static --disable-dependency-tracking +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +rm -f %{buildroot}%{_libdir}/lib*.la + +%clean +rm -rf %{buildroot} + +%post +/sbin/ldconfig +/usr/bin/update-desktop-database > /dev/null +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor +fi + +%postun +/sbin/ldconfig +/usr/bin/update-desktop-database > /dev/null +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor +fi + +%files +%defattr(-, root, root) + +%doc COPYING AUTHORS ChangeLog README +%{_libdir}/lib*.so* +%{_libexecdir}/nm-openvpn-auth-dialog +%config %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf +%config %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%{_bindir}/nm-openvpn-service +%{_bindir}/nm-openvpn-service-openvpn-helper +%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade +%{_datadir}/applications/nm-openvpn.desktop +%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png + +%changelog +* Tue Aug 15 2006 Tim Niemueller 0.3.2-4 +- Added instructions how to build the source package +- removed a rm line + +* Wed Aug 09 2006 Tim Niemueller 0.3.2-3 +- Added URL + +* Fri Aug 04 2006 Tim Niemueller 0.3.2-2 +- Upgrade to current upstream version (0.3.2 on 0.6 branch) + +* Mon Jul 10 2006 Tim Niemueller 0.3.2-1 +- Upgraded to 0.3.2 for 0.6 branch + +* Tue Dec 06 2005 Tim Niemueller 0.3-1 +- Initial revision based on NetworkManager-vpnc spec + diff --git a/sources b/sources index e69de29..741a6a4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9a35d23c554dd215deee39a2e58e8e08 NetworkManager-openvpn-0.3.2.tar.gz From 55aad67bf7142f4511c83392c6f4a00e19328d7c Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sat, 19 Aug 2006 13:02:55 +0000 Subject: [PATCH 002/129] Added some missing build requires Tim --- NetworkManager-openvpn.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 53d9096..36cc2ea 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Version: 0.3.2 -Release: 4 +Release: 5 License: GPL URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -30,6 +30,9 @@ BuildRequires: libgnomeui-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel BuildRequires: libpng-devel +BuildRequires: perl-XML-Parser +BuildRequires: intltool +BuildRequires: perl Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database Requires(post): /sbin/ldconfig @@ -97,6 +100,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog +* Sat Aug 19 2006 Tim Niemueller 0.3.2-5 +- Added perl-XML-Parser as a build requirement, needed for intltool + * Tue Aug 15 2006 Tim Niemueller 0.3.2-4 - Added instructions how to build the source package - removed a rm line From 3b1c1780ff8d88ec5fd519b8fefd7422b8e0a802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:42:51 +0000 Subject: [PATCH 003/129] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 1588a6007c7c1702bedfacec210877bb746efdd9 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Thu, 14 Sep 2006 22:48:21 +0000 Subject: [PATCH 004/129] Added %{?dist} to release Rebuild for FC6 Tim --- NetworkManager-openvpn.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 36cc2ea..deebddd 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Version: 0.3.2 -Release: 5 +Release: 6%{?dist} License: GPL URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -49,9 +49,6 @@ Requires: gnome-keyring This package contains software for integrating the OpenVPN VPN software with NetworkManager and the GNOME desktop. -Note: Due to a problem with the openvpn package you have to use SELinux in -permissive mode to use the NetworkManager OpenVPN plugin at the moment. - %prep %setup -q @@ -100,6 +97,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog +* Fri Sep 15 2006 Tim Niemueller 0.3.2-6 +- Rebuild for FC6 + * Sat Aug 19 2006 Tim Niemueller 0.3.2-5 - Added perl-XML-Parser as a build requirement, needed for intltool From aa504500bc67439e0e1c679006ca97d30a7de009 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Thu, 14 Sep 2006 22:50:59 +0000 Subject: [PATCH 005/129] Did not commit before tagging and then it's screwed. Bumping release by . one for this Tim --- NetworkManager-openvpn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index deebddd..a7dcc68 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Version: 0.3.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -97,7 +97,7 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog -* Fri Sep 15 2006 Tim Niemueller 0.3.2-6 +* Fri Sep 15 2006 Tim Niemueller 0.3.2-7 - Rebuild for FC6 * Sat Aug 19 2006 Tim Niemueller 0.3.2-5 From 51338b18cdd4741a6b0290e545e24323994ad3e8 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Thu, 14 Sep 2006 23:05:05 +0000 Subject: [PATCH 006/129] Rebuild completed successfully as job id 17363 Tim --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 2bdebca6e2476b74fbba02c763a3d55e7468611e Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 30 Oct 2007 22:43:36 +0000 Subject: [PATCH 007/129] Update to 0.7.0 --- .cvsignore | 2 +- NetworkManager-openvpn.spec | 38 ++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4505fcc..58eec19 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -NetworkManager-openvpn-0.3.2.tar.gz +NetworkManager-openvpn-0.7.0.svn3047.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a7dcc68..ca07186 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,14 +1,17 @@ -%define nm_version 0.6.4 -%define dbus_version 0.61 -%define gtk2_version 2.6.0 +%define nm_version 1:0.7.0-0.4.svn3030 +%define dbus_version 1.0 +%define gtk2_version 2.10.0 %define openvpn_version 2.1 -%define shared_mime_version 0.17-1 +%define shared_mime_version 0.16-3 + +%define svn_snapshot svn3047 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn -Version: 0.3.2 -Release: 7%{?dist} -License: GPL +Epoch: 1 +Version: 0.7.0 +Release: 1.%{svn_snapshot}%{?dist} +License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base # How to build the source package: @@ -20,11 +23,12 @@ Group: System Environment/Base # - cd .. # - mv openvpn NetworkManager-openvpn-%{version} # - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version} -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: NetworkManager-devel >= %{nm_version} +BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: dbus-devel >= %{dbus_version} +BuildRequires: NetworkManager-devel >= %{nm_version} +BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: GConf2-devel BuildRequires: libgnomeui-devel BuildRequires: gnome-keyring-devel @@ -54,7 +58,7 @@ with NetworkManager and the GNOME desktop. %build if [ ! -f configure ]; then - ./autogen.sh + ./autogen.sh fi %configure --disable-static --disable-dependency-tracking make %{?_smp_mflags} @@ -85,18 +89,22 @@ fi %files %defattr(-, root, root) -%doc COPYING AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README %{_libdir}/lib*.so* %{_libexecdir}/nm-openvpn-auth-dialog -%config %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf -%config %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf +%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_bindir}/nm-openvpn-service %{_bindir}/nm-openvpn-service-openvpn-helper %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade %{_datadir}/applications/nm-openvpn.desktop %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png +%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Tue Oct 30 2007 Tim Niemueller 1:0.7.0-1.svn3047.fc8 +- Upgrade to trunk, needed to be compatible with NM 0.7.0, rebuild for F-8 + * Fri Sep 15 2006 Tim Niemueller 0.3.2-7 - Rebuild for FC6 diff --git a/sources b/sources index 741a6a4..2b25ebd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a35d23c554dd215deee39a2e58e8e08 NetworkManager-openvpn-0.3.2.tar.gz +6cc65cd5e4b4afda8be5412d8dc3534b NetworkManager-openvpn-0.7.0.svn3047.tar.gz From e0de6f7bd222f98ba32f85a0845b063822a3d2cf Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sun, 11 Nov 2007 12:17:57 +0000 Subject: [PATCH 008/129] Copied from F-8 and lowered required NM version Tim --- NetworkManager-openvpn.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ca07186..23a8232 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 1.%{svn_snapshot}%{?dist} +Release: 3.%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -35,7 +35,7 @@ BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel BuildRequires: libpng-devel BuildRequires: perl-XML-Parser -BuildRequires: intltool +BuildRequires: intltool gettext BuildRequires: perl Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database @@ -102,6 +102,13 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Sun Nov 11 2007 Tim Niemueller 1:0.7.0-3.svn3047 +- Copy spec from F-8 +- Lower required NM version, F-8 version not yet in Rawhide + +* Wed Oct 31 2007 Tim Niemueller 1:0.7.0-2.svn3047 +- BuildRequire gettext + * Tue Oct 30 2007 Tim Niemueller 1:0.7.0-1.svn3047.fc8 - Upgrade to trunk, needed to be compatible with NM 0.7.0, rebuild for F-8 From 98c34d733e1ffdd3b2f7da53ad1e44aa21ebc4d8 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sun, 11 Nov 2007 12:31:43 +0000 Subject: [PATCH 009/129] Now really lowered version requirement. Tim --- NetworkManager-openvpn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 23a8232..ec5eb6b 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-0.4.svn3030 +%define nm_version 1:0.7.0-0.4.svn2983 %define dbus_version 1.0 %define gtk2_version 2.10.0 %define openvpn_version 2.1 From 7cf8ba5e2bca0d0685e135f3ce638089464a72d4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 15 Nov 2007 17:10:38 +0000 Subject: [PATCH 010/129] augogen did not work for me :) --- NetworkManager-openvpn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ec5eb6b..8641071 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -18,7 +18,7 @@ Group: System Environment/Base # - Check out NetworkManager from Gnome CVS, use the right tag, # e.g. NETWORKMANAGER_0_6_4_RELEASE # - cd NetworkManager/vpn-daemons/openvpn -# - ./augogen.sh --prefix=/usr --sysconfdir=/etc +# - ./autogen.sh --prefix=/usr --sysconfdir=/etc # - make distclean # - cd .. # - mv openvpn NetworkManager-openvpn-%{version} From 0d0882ebf4342f81156ce0bff451135afe383594 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Fri, 4 Jan 2008 19:48:52 +0000 Subject: [PATCH 011/129] - Update to latest SVN --- NetworkManager-openvpn.spec | 36 ++++++++++++++++++++++++++---------- sources | 2 +- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 8641071..fed2941 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.4.svn2983 +%define nm_version 1:0.7.0-0.6.7.svn3204 %define dbus_version 1.0 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot svn3047 +%define svn_snapshot .svn3205 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 3.%{svn_snapshot}%{?dist} +Release: 6%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -23,20 +23,22 @@ Group: System Environment/Base # - cd .. # - mv openvpn NetworkManager-openvpn-%{version} # - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version} -Source: %{name}-%{version}.%{svn_snapshot}.tar.gz +Source: %{name}-%{version}%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} +BuildRequires: glib2-devel BuildRequires: GConf2-devel BuildRequires: libgnomeui-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel BuildRequires: libpng-devel BuildRequires: perl-XML-Parser -BuildRequires: intltool gettext +BuildRequires: libtool intltool gettext BuildRequires: perl +BuildRequires: gnome-common Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database Requires(post): /sbin/ldconfig @@ -54,7 +56,7 @@ This package contains software for integrating the OpenVPN VPN software with NetworkManager and the GNOME desktop. %prep -%setup -q +%setup -q -n %{name}-%{version} %build if [ ! -f configure ]; then @@ -102,11 +104,25 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog -* Sun Nov 11 2007 Tim Niemueller 1:0.7.0-3.svn3047 -- Copy spec from F-8 -- Lower required NM version, F-8 version not yet in Rawhide +* Fri Jan 4 2008 Dan Williams 1:0.7.0-6.svn3205 +- Update to latest SVN -* Wed Oct 31 2007 Tim Niemueller 1:0.7.0-2.svn3047 +* Thu Dec 13 2007 Tim Niemueller 1:0.7.0-6.svn3168 +- Update to latest SVN snapshot + +* Thu Dec 6 2007 Dan Williams 1:0.7.0-5.svn3140 +- Update to latest SVN snapshot to get stuff working + +* Fri Nov 23 2007 Tim Niemueller 1:0.7.0-4.svn3047 +- BuildRequire libtool and glib2-devel since we call autogen.sh now + +* Fri Nov 23 2007 Tim Niemueller 1:0.7.0-3.svn3047 +- Fixed #320941 +- Call autogen, therefore BuildRequire gnome-common +- Use plain 3047 from repo and use a patch, we cannot use trunk at the + moment since it is in flux and incompatible with NM available for F8 + +* Wed Oct 31 2007 Tim Niemueller 1:0.7.0-2.svn3047.fc8 - BuildRequire gettext * Tue Oct 30 2007 Tim Niemueller 1:0.7.0-1.svn3047.fc8 diff --git a/sources b/sources index 2b25ebd..59d9d6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cc65cd5e4b4afda8be5412d8dc3534b NetworkManager-openvpn-0.7.0.svn3047.tar.gz +fd1640fc1b7c2eae83bc876dc7cf89e4 NetworkManager-openvpn-0.7.0.svn3205.tar.gz From 8e90212564f712fb398246742e1d47fcc8a563eb Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Thu, 7 Feb 2008 23:29:29 +0000 Subject: [PATCH 012/129] Update to latest svn version r3302 --- .cvsignore | 2 +- NetworkManager-openvpn.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 58eec19..359fc6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -NetworkManager-openvpn-0.7.0.svn3047.tar.gz +NetworkManager-openvpn-0.7.0.svn3302.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index fed2941..b381465 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,19 +4,18 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3205 +%define svn_snapshot .svn3302 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 6%{svn_snapshot}%{?dist} +Release: 8%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base # How to build the source package: -# - Check out NetworkManager from Gnome CVS, use the right tag, -# e.g. NETWORKMANAGER_0_6_4_RELEASE +# - Check out NetworkManager from Gnome SVN, currently trunk is used # - cd NetworkManager/vpn-daemons/openvpn # - ./autogen.sh --prefix=/usr --sysconfdir=/etc # - make distclean @@ -67,7 +66,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" rm -f %{buildroot}%{_libdir}/lib*.la @@ -104,10 +103,15 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog -* Fri Jan 4 2008 Dan Williams 1:0.7.0-6.svn3205 -- Update to latest SVN +* Fri Feb 08 2008 Tim Niemueller 1:0.7.0-8.svn3302 +- Update to latest SVN snapshot +- Fixes rhbz#429816 (port was not saved correctly) +- Respects DNS search string from OpenVPN server + +* Fri Jan 18 2008 Tim Niemueller 1:0.7.0-7.svn3169 +- Use install -p during "make install" to fix #342701 -* Thu Dec 13 2007 Tim Niemueller 1:0.7.0-6.svn3168 +* Thu Dec 13 2007 Tim Niemueller 1:0.7.0-6.svn3169 - Update to latest SVN snapshot * Thu Dec 6 2007 Dan Williams 1:0.7.0-5.svn3140 diff --git a/sources b/sources index 59d9d6d..16b8392 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd1640fc1b7c2eae83bc876dc7cf89e4 NetworkManager-openvpn-0.7.0.svn3205.tar.gz +ad2bc91ac55917663d3be49561ae0f86 NetworkManager-openvpn-0.7.0.svn3302.tar.gz From eacf6c08863b992bc164877438666f4e1a3a0702 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Mon, 3 Mar 2008 09:29:51 +0000 Subject: [PATCH 013/129] Mute %post and %postun scripts --- NetworkManager-openvpn.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index b381465..e10d50b 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 8%{svn_snapshot}%{?dist} +Release: 9%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -76,15 +76,17 @@ rm -rf %{buildroot} %post /sbin/ldconfig /usr/bin/update-desktop-database > /dev/null +touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun /sbin/ldconfig /usr/bin/update-desktop-database > /dev/null +touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files @@ -103,6 +105,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Mon Mar 03 2008 Tim Niemueller 1:0.7.0-9.svn3302 +- Mute %post and %postun scripts + * Fri Feb 08 2008 Tim Niemueller 1:0.7.0-8.svn3302 - Update to latest SVN snapshot - Fixes rhbz#429816 (port was not saved correctly) From 403aa93f9bb457187e9ce4b12997b2745ab48efa Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 10 Apr 2008 03:55:12 +0000 Subject: [PATCH 014/129] - Update for compat with new NM bits --- .cvsignore | 1 + NetworkManager-openvpn.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 359fc6e..049ef57 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ NetworkManager-openvpn-0.7.0.svn3302.tar.gz +NetworkManager-openvpn-0.7.0.svn3549.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index e10d50b..eeafad5 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.6.7.svn3204 -%define dbus_version 1.0 +%define nm_version 1:0.7.0-0.9.1.svn3549 +%define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3302 +%define svn_snapshot .svn3549 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -26,8 +26,8 @@ Source: %{name}-%{version}%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: NetworkManager-devel >= %{nm_version} -BuildRequires: NetworkManager-glib-devel >= %{nm_version} +BuildRequires: NetworkManager-devel >= 1:0.7.0-0.9.1.svn3548 +BuildRequires: NetworkManager-glib-devel >= 1:0.7.0-0.9.1.svn3548 BuildRequires: glib2-devel BuildRequires: GConf2-devel BuildRequires: libgnomeui-devel @@ -105,6 +105,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Wed Apr 09 2008 Dan Williams 1:0.7.0-9.svn3549 +- Update for compat with new NM bits + * Mon Mar 03 2008 Tim Niemueller 1:0.7.0-9.svn3302 - Mute %post and %postun scripts diff --git a/sources b/sources index 16b8392..fd1e0d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad2bc91ac55917663d3be49561ae0f86 NetworkManager-openvpn-0.7.0.svn3302.tar.gz +130eb95562552aa55c73841c78f5de17 NetworkManager-openvpn-0.7.0.svn3549.tar.gz From 8c2b990abdb764486970bac528f72d67223d6312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20H=C3=B6ger?= Date: Wed, 23 Apr 2008 12:19:52 +0000 Subject: [PATCH 015/129] - fix generation of nm-openvpn-service.name --- ...rkManager-openvpn-0.7.0-name-file-generation.patch | 11 +++++++++++ NetworkManager-openvpn.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 NetworkManager-openvpn-0.7.0-name-file-generation.patch diff --git a/NetworkManager-openvpn-0.7.0-name-file-generation.patch b/NetworkManager-openvpn-0.7.0-name-file-generation.patch new file mode 100644 index 0000000..f5554a8 --- /dev/null +++ b/NetworkManager-openvpn-0.7.0-name-file-generation.patch @@ -0,0 +1,11 @@ +--- Makefile.am 2008-04-23 12:57:02.000000000 +0200 ++++ Makefile.am.new 2008-04-23 12:58:15.000000000 +0200 +@@ -25,7 +25,7 @@ + nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile + sed -e 's|[@]BINDIR[@]|$(bindir)|g' \ + -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ +- -e 's|[@]LIBDIR[@]|$(libdir)|g' \ ++ -e 's|[@]PREFIX[@]|$(prefix)|g' \ + < $(srcdir)/nm-openvpn-service.name.in \ + > nm-openvpn-service.name + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index eeafad5..4a83c05 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,10 +10,11 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 9%{svn_snapshot}%{?dist} +Release: 10%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base +Patch: NetworkManager-openvpn-0.7.0-name-file-generation.patch # How to build the source package: # - Check out NetworkManager from Gnome SVN, currently trunk is used # - cd NetworkManager/vpn-daemons/openvpn @@ -56,6 +57,7 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{version} +%patch -p1 -b .buildroot %build if [ ! -f configure ]; then @@ -105,6 +107,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Wed Apr 23 2008 Christoph Höger 1:0.7.0-10.svn3549 +- (Hopefully) Fix generation of nm-openvpn-service.name (#443389) + * Wed Apr 09 2008 Dan Williams 1:0.7.0-9.svn3549 - Update for compat with new NM bits From 9195744e49511b94abe50c636efd109fbac3a17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20H=C3=B6ger?= Date: Wed, 23 Apr 2008 13:40:10 +0000 Subject: [PATCH 016/129] copy F-9 fix to F-10 branch --- NetworkManager-openvpn-0.7.0-name-file-generation.patch | 2 +- NetworkManager-openvpn.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NetworkManager-openvpn-0.7.0-name-file-generation.patch b/NetworkManager-openvpn-0.7.0-name-file-generation.patch index f5554a8..a9fa05e 100644 --- a/NetworkManager-openvpn-0.7.0-name-file-generation.patch +++ b/NetworkManager-openvpn-0.7.0-name-file-generation.patch @@ -1,5 +1,5 @@ --- Makefile.am 2008-04-23 12:57:02.000000000 +0200 -+++ Makefile.am.new 2008-04-23 12:58:15.000000000 +0200 ++++ Makefile.am 2008-04-23 12:58:15.000000000 +0200 @@ -25,7 +25,7 @@ nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile sed -e 's|[@]BINDIR[@]|$(bindir)|g' \ diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 4a83c05..93f1a6e 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -14,7 +14,7 @@ Release: 10%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Patch: NetworkManager-openvpn-0.7.0-name-file-generation.patch +Patch0: NetworkManager-openvpn-0.7.0-name-file-generation.patch # How to build the source package: # - Check out NetworkManager from Gnome SVN, currently trunk is used # - cd NetworkManager/vpn-daemons/openvpn @@ -57,7 +57,7 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{version} -%patch -p1 -b .buildroot +%patch0 -b .namefix %build if [ ! -f configure ]; then From b9c70891787be5be28086555cc0f849fafa2156c Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Fri, 2 May 2008 14:19:43 +0000 Subject: [PATCH 017/129] - Update for compat with new NM bits --- ...Manager-openvpn-0.7.0-name-file-generation.patch | 11 ----------- NetworkManager-openvpn.spec | 13 +++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 NetworkManager-openvpn-0.7.0-name-file-generation.patch diff --git a/NetworkManager-openvpn-0.7.0-name-file-generation.patch b/NetworkManager-openvpn-0.7.0-name-file-generation.patch deleted file mode 100644 index a9fa05e..0000000 --- a/NetworkManager-openvpn-0.7.0-name-file-generation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am 2008-04-23 12:57:02.000000000 +0200 -+++ Makefile.am 2008-04-23 12:58:15.000000000 +0200 -@@ -25,7 +25,7 @@ - nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile - sed -e 's|[@]BINDIR[@]|$(bindir)|g' \ - -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ -- -e 's|[@]LIBDIR[@]|$(libdir)|g' \ -+ -e 's|[@]PREFIX[@]|$(prefix)|g' \ - < $(srcdir)/nm-openvpn-service.name.in \ - > nm-openvpn-service.name - diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 93f1a6e..e829e9a 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.9.1.svn3549 +%define nm_version 1:0.7.0-0.9.3.svn3623 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3549 +%define svn_snapshot .svn3627 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -14,7 +14,6 @@ Release: 10%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Patch0: NetworkManager-openvpn-0.7.0-name-file-generation.patch # How to build the source package: # - Check out NetworkManager from Gnome SVN, currently trunk is used # - cd NetworkManager/vpn-daemons/openvpn @@ -27,8 +26,8 @@ Source: %{name}-%{version}%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: NetworkManager-devel >= 1:0.7.0-0.9.1.svn3548 -BuildRequires: NetworkManager-glib-devel >= 1:0.7.0-0.9.1.svn3548 +BuildRequires: NetworkManager-devel >= %{nm_version} +BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: glib2-devel BuildRequires: GConf2-devel BuildRequires: libgnomeui-devel @@ -57,7 +56,6 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{version} -%patch0 -b .namefix %build if [ ! -f configure ]; then @@ -107,6 +105,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Thu May 01 2008 Dan Williams 1:0.7.0-10.svn3627 +- Update for compat with new NM bits + * Wed Apr 23 2008 Christoph Höger 1:0.7.0-10.svn3549 - (Hopefully) Fix generation of nm-openvpn-service.name (#443389) diff --git a/sources b/sources index fd1e0d2..b8d471f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -130eb95562552aa55c73841c78f5de17 NetworkManager-openvpn-0.7.0.svn3549.tar.gz +84d53172075e20f53908e18a34cc2bb4 NetworkManager-openvpn-0.7.0.svn3627.tar.gz From a6710690a3eed4aeb86656064b850dc903ff883d Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 5 May 2008 21:07:01 +0000 Subject: [PATCH 018/129] - Fix issue with location of the VPN plugin --- NetworkManager-openvpn.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index e829e9a..6e70db3 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3627 +%define svn_snapshot .svn3632 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -105,6 +105,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Mon May 05 2008 Dan Williams 1:0.7.0-10.svn3632 +- Fix issue with location of the VPN plugin + * Thu May 01 2008 Dan Williams 1:0.7.0-10.svn3627 - Update for compat with new NM bits diff --git a/sources b/sources index b8d471f..343a0ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84d53172075e20f53908e18a34cc2bb4 NetworkManager-openvpn-0.7.0.svn3627.tar.gz +f4266d18d5949091ec85a8214244b787 NetworkManager-openvpn-0.7.0.svn3632.tar.gz From fa5d27e9e7622e898ab22ea787b408bc9323c430 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 3 Jul 2008 02:28:44 +0000 Subject: [PATCH 019/129] - Update for moving VPN editing into connection manager - Import OpenVPN configuration files rather than old custom format --- .cvsignore | 1 + NetworkManager-openvpn.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 049ef57..100d8a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ NetworkManager-openvpn-0.7.0.svn3302.tar.gz NetworkManager-openvpn-0.7.0.svn3549.tar.gz +NetworkManager-openvpn-0.7.0.svn3801.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 6e70db3..e895393 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.9.3.svn3623 +%define nm_version 1:0.7.0-0.10.svn3801 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3632 +%define svn_snapshot .svn3801 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 10%{svn_snapshot}%{?dist} +Release: 11%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -18,10 +18,8 @@ Group: System Environment/Base # - Check out NetworkManager from Gnome SVN, currently trunk is used # - cd NetworkManager/vpn-daemons/openvpn # - ./autogen.sh --prefix=/usr --sysconfdir=/etc -# - make distclean -# - cd .. -# - mv openvpn NetworkManager-openvpn-%{version} -# - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version} +# - make distcheck +# - use generated NetworkManager-openvpn-0.7.0.tar.gz Source: %{name}-%{version}%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -105,6 +103,10 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Wed Jul 02 2008 Dan Williams 1:0.7.0-11.svn3801 +- Update for moving VPN editing into connection manager +- Import OpenVPN configuration files rather than old custom format + * Mon May 05 2008 Dan Williams 1:0.7.0-10.svn3632 - Fix issue with location of the VPN plugin diff --git a/sources b/sources index 343a0ba..b1b28cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4266d18d5949091ec85a8214244b787 NetworkManager-openvpn-0.7.0.svn3632.tar.gz +e1a9424d9dc0188f1a61e48bac9fe01a NetworkManager-openvpn-0.7.0.svn3801.tar.gz From 64713b09e312712b54e51755104ed8a68c6aa859 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 19 Jul 2008 01:56:36 +0000 Subject: [PATCH 020/129] - Update for NM netmask -> prefix changes --- .cvsignore | 1 + NetworkManager-openvpn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 100d8a4..3b5f83a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ NetworkManager-openvpn-0.7.0.svn3302.tar.gz NetworkManager-openvpn-0.7.0.svn3549.tar.gz NetworkManager-openvpn-0.7.0.svn3801.tar.gz +NetworkManager-openvpn-0.7.0.svn3832.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index e895393..9870280 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.10.svn3801 +%define nm_version 1:0.7.0-0.11.svn3830 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3801 +%define svn_snapshot .svn3832 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -103,6 +103,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Fri Jul 18 2008 Dan Williams 1:0.7.0-11.svn3832 +- Update for NM netmask -> prefix changes + * Wed Jul 02 2008 Dan Williams 1:0.7.0-11.svn3801 - Update for moving VPN editing into connection manager - Import OpenVPN configuration files rather than old custom format diff --git a/sources b/sources index b1b28cd..da5eee0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1a9424d9dc0188f1a61e48bac9fe01a NetworkManager-openvpn-0.7.0.svn3801.tar.gz +13c2a24d2ae0f4d2ea0d4374d725c397 NetworkManager-openvpn-0.7.0.svn3832.tar.gz From 47de0010d4edbb9b3066f70a454373b4f3d3d83b Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 24 Jul 2008 20:57:39 +0000 Subject: [PATCH 021/129] - Fix TLS Authentication direction combo - Only update settings if the advanced dialog's OK button is pressed --- .cvsignore | 1 + NetworkManager-openvpn.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3b5f83a..669606e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ NetworkManager-openvpn-0.7.0.svn3302.tar.gz NetworkManager-openvpn-0.7.0.svn3549.tar.gz NetworkManager-openvpn-0.7.0.svn3801.tar.gz NetworkManager-openvpn-0.7.0.svn3832.tar.gz +NetworkManager-openvpn-0.7.0.svn3846.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 9870280..5403cd3 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3832 +%define svn_snapshot .svn3846 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -103,6 +103,10 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-11.svn3846 +- Fix TLS Authentication direction combo +- Only update settings if the advanced dialog's OK button is pressed + * Fri Jul 18 2008 Dan Williams 1:0.7.0-11.svn3832 - Update for NM netmask -> prefix changes diff --git a/sources b/sources index da5eee0..5b40b5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13c2a24d2ae0f4d2ea0d4374d725c397 NetworkManager-openvpn-0.7.0.svn3832.tar.gz +eb01cff3d1bb688f9e5bead7ef6b2c76 NetworkManager-openvpn-0.7.0.svn3846.tar.gz From 843a57467b87deedb12b0b9ffd28fc2b47be6c3f Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 24 Jul 2008 22:00:44 +0000 Subject: [PATCH 022/129] - Rebuild to sync with F9 release number --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 5403cd3..724a90a 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 11%{svn_snapshot}%{?dist} +Release: 15%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Thu Jul 24 2008 Dan Williams 1:0.7.0-15.svn3846 +- Rebuild to sync with F9 release number + * Thu Jul 24 2008 Dan Williams 1:0.7.0-11.svn3846 - Fix TLS Authentication direction combo - Only update settings if the advanced dialog's OK button is pressed From a09d4428bebb285516666dce607119e4f4e6b3e9 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 11 Aug 2008 20:51:17 +0000 Subject: [PATCH 023/129] - Rebuild for updated NetworkManager --- .cvsignore | 1 + NetworkManager-openvpn.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 669606e..cb1ff9a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ NetworkManager-openvpn-0.7.0.svn3549.tar.gz NetworkManager-openvpn-0.7.0.svn3801.tar.gz NetworkManager-openvpn-0.7.0.svn3832.tar.gz NetworkManager-openvpn-0.7.0.svn3846.tar.gz +NetworkManager-openvpn-0.7.0.svn3930.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 724a90a..a9acb3a 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.11.svn3830 +%define nm_version 1:0.7.0-0.11.svn3927 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3846 +%define svn_snapshot .svn3930 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -66,7 +66,7 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" -rm -f %{buildroot}%{_libdir}/lib*.la +rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %clean rm -rf %{buildroot} @@ -91,18 +91,21 @@ fi %defattr(-, root, root) %doc AUTHORS ChangeLog README -%{_libdir}/lib*.so* +%{_libdir}/NetworkManager/lib*.so* %{_libexecdir}/nm-openvpn-auth-dialog %config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf %config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name -%{_bindir}/nm-openvpn-service -%{_bindir}/nm-openvpn-service-openvpn-helper +%{_libexecdir}/nm-openvpn-service +%{_libexecdir}/nm-openvpn-service-openvpn-helper %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade %{_datadir}/applications/nm-openvpn.desktop %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Mon Aug 11 2008 Dan Williams 1:0.7.0-15.svn3930 +- Rebuild for updated NetworkManager + * Thu Jul 24 2008 Dan Williams 1:0.7.0-15.svn3846 - Rebuild to sync with F9 release number diff --git a/sources b/sources index 5b40b5c..e75b314 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb01cff3d1bb688f9e5bead7ef6b2c76 NetworkManager-openvpn-0.7.0.svn3846.tar.gz +75b4bba99bca6e172448f850719f4ab7 NetworkManager-openvpn-0.7.0.svn3930.tar.gz From f8b55826c404eabf5c05ab9a6b9248675940e8d7 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Fri, 29 Aug 2008 14:05:56 +0000 Subject: [PATCH 024/129] - Rebuild for updated NetworkManager --- NetworkManager-openvpn.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a9acb3a..6fd8e99 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.11.svn3927 +%define nm_version 1:0.7.0-0.11.svn4022 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot .svn3930 +%define svn_snapshot svn4027 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 15%{svn_snapshot}%{?dist} +Release: 15.%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -20,7 +20,7 @@ Group: System Environment/Base # - ./autogen.sh --prefix=/usr --sysconfdir=/etc # - make distcheck # - use generated NetworkManager-openvpn-0.7.0.tar.gz -Source: %{name}-%{version}%{svn_snapshot}.tar.gz +Source: %{name}-%{version}.%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -93,8 +93,8 @@ fi %doc AUTHORS ChangeLog README %{_libdir}/NetworkManager/lib*.so* %{_libexecdir}/nm-openvpn-auth-dialog -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf -%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf +%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_libexecdir}/nm-openvpn-service %{_libexecdir}/nm-openvpn-service-openvpn-helper %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade @@ -103,6 +103,9 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Fri Aug 29 2008 Dan Williams 1:0.7.0-15.svn4027 +- Rebuild for updated NetworkManager + * Mon Aug 11 2008 Dan Williams 1:0.7.0-15.svn3930 - Rebuild for updated NetworkManager diff --git a/sources b/sources index e75b314..d198046 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75b4bba99bca6e172448f850719f4ab7 NetworkManager-openvpn-0.7.0.svn3930.tar.gz +cbf3db7e4e3d14ad2ec1b2689b4bc7a3 NetworkManager-openvpn-0.7.0.svn4027.tar.gz From 8b5809d60867fc718851c72497601c75be5eee3b Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Tue, 30 Sep 2008 20:12:04 +0000 Subject: [PATCH 025/129] - Fix order of Password TLS certificate choosers (rh #464765) - Use %find_lang for locale-specific files (rh #448551) - Fix --script-security issues with OpenVPN 2.1-rc9 and later (rh #460754) --- NetworkManager-openvpn.spec | 17 +++++++++++++++-- nm-openvpn-fix-pw-tls-entries.patch | 21 +++++++++++++++++++++ nm-openvpn-script-security.patch | 17 +++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 nm-openvpn-fix-pw-tls-entries.patch create mode 100644 nm-openvpn-script-security.patch diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 6fd8e99..5e2b68d 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 15.%{svn_snapshot}%{?dist} +Release: 16.%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -21,6 +21,9 @@ Group: System Environment/Base # - make distcheck # - use generated NetworkManager-openvpn-0.7.0.tar.gz Source: %{name}-%{version}.%{svn_snapshot}.tar.gz +Patch0: nm-openvpn-fix-pw-tls-entries.patch +Patch10: nm-openvpn-script-security.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -55,6 +58,9 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .pw-tls-entries +%patch10 -p1 -b .script-security + %build if [ ! -f configure ]; then ./autogen.sh @@ -68,6 +74,8 @@ make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la +%find_lang %{name} + %clean rm -rf %{buildroot} @@ -87,7 +95,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -%files +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog README @@ -103,6 +111,11 @@ fi %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Tue Sep 30 2008 Dan Williams 1:0.7.0-16.svn4027 +- Fix order of Password TLS certificate choosers (rh #464765) +- Use %find_lang for locale-specific files (rh #448551) +- Fix --script-security issues with OpenVPN 2.1-rc9 and later (rh #460754) + * Fri Aug 29 2008 Dan Williams 1:0.7.0-15.svn4027 - Rebuild for updated NetworkManager diff --git a/nm-openvpn-fix-pw-tls-entries.patch b/nm-openvpn-fix-pw-tls-entries.patch new file mode 100644 index 0000000..a8f1bd0 --- /dev/null +++ b/nm-openvpn-fix-pw-tls-entries.patch @@ -0,0 +1,21 @@ +diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade +--- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries 2008-09-30 15:59:39.000000000 -0400 ++++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade 2008-09-30 16:01:37.000000000 -0400 +@@ -426,7 +426,7 @@ + + True + 0 +- CA Certificate: ++ User Certificate: + + + 1 +@@ -438,7 +438,7 @@ + + True + 0 +- User Certificate: ++ CA Certificate: + + + 2 diff --git a/nm-openvpn-script-security.patch b/nm-openvpn-script-security.patch new file mode 100644 index 0000000..4342d9a --- /dev/null +++ b/nm-openvpn-script-security.patch @@ -0,0 +1,17 @@ +diff -up NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c +--- NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security 2008-09-30 15:56:42.000000000 -0400 ++++ NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c 2008-09-30 15:57:03.000000000 -0400 +@@ -611,6 +611,13 @@ nm_openvpn_start_openvpn_binary (NMOpenv + add_openvpn_arg (args, "--syslog"); + add_openvpn_arg (args, "nm-openvpn"); + ++ /* Punch script security in the face; this option was added to OpenVPN 2.1-rc9 ++ * and defaults to disallowing any scripts, a behavior change from previous ++ * versions. ++ */ ++ add_openvpn_arg (args, "--script-security"); ++ add_openvpn_arg (args, "2"); ++ + /* Up script, called when connection has been established or has been restarted */ + add_openvpn_arg (args, "--up"); + add_openvpn_arg (args, NM_OPENVPN_HELPER_PATH); From 7e465dbdda52187cb4aa0d59849cb785c68f6edc Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Tue, 30 Sep 2008 20:16:47 +0000 Subject: [PATCH 026/129] No longer needed with %find_lang --- NetworkManager-openvpn.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 5e2b68d..6600a64 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -108,7 +108,6 @@ fi %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade %{_datadir}/applications/nm-openvpn.desktop %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png -%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog * Tue Sep 30 2008 Dan Williams 1:0.7.0-16.svn4027 From f224d6dbc6403c39c3adcc1d79f46e7df72b249b Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sun, 12 Oct 2008 17:47:57 +0000 Subject: [PATCH 027/129] - Rebuild for updated NetworkManager - Allow changing passwords from the connection editor - Honor OpenVPN's 'route-vpn-gateway' option --- .cvsignore | 1 + NetworkManager-openvpn.spec | 13 +++++++------ nm-openvpn-fix-pw-tls-entries.patch | 21 --------------------- nm-openvpn-script-security.patch | 17 ----------------- sources | 2 +- 5 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 nm-openvpn-fix-pw-tls-entries.patch delete mode 100644 nm-openvpn-script-security.patch diff --git a/.cvsignore b/.cvsignore index cb1ff9a..b8faa58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ NetworkManager-openvpn-0.7.0.svn3801.tar.gz NetworkManager-openvpn-0.7.0.svn3832.tar.gz NetworkManager-openvpn-0.7.0.svn3846.tar.gz NetworkManager-openvpn-0.7.0.svn3930.tar.gz +NetworkManager-openvpn-0.7.0.svn4175.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 6600a64..3171111 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.11.svn4022 +%define nm_version 1:0.7.0-0.11.svn4174 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4027 +%define svn_snapshot svn4175 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -21,8 +21,6 @@ Group: System Environment/Base # - make distcheck # - use generated NetworkManager-openvpn-0.7.0.tar.gz Source: %{name}-%{version}.%{svn_snapshot}.tar.gz -Patch0: nm-openvpn-fix-pw-tls-entries.patch -Patch10: nm-openvpn-script-security.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -58,8 +56,6 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .pw-tls-entries -%patch10 -p1 -b .script-security %build if [ ! -f configure ]; then @@ -110,6 +106,11 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog +* Sun Oct 12 2008 Dan Williams 1:0.7.0-16.svn4175 +- Rebuild for updated NetworkManager +- Allow changing passwords from the connection editor +- Honor OpenVPN's 'route-vpn-gateway' option + * Tue Sep 30 2008 Dan Williams 1:0.7.0-16.svn4027 - Fix order of Password TLS certificate choosers (rh #464765) - Use %find_lang for locale-specific files (rh #448551) diff --git a/nm-openvpn-fix-pw-tls-entries.patch b/nm-openvpn-fix-pw-tls-entries.patch deleted file mode 100644 index a8f1bd0..0000000 --- a/nm-openvpn-fix-pw-tls-entries.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade ---- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries 2008-09-30 15:59:39.000000000 -0400 -+++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade 2008-09-30 16:01:37.000000000 -0400 -@@ -426,7 +426,7 @@ - - True - 0 -- CA Certificate: -+ User Certificate: - - - 1 -@@ -438,7 +438,7 @@ - - True - 0 -- User Certificate: -+ CA Certificate: - - - 2 diff --git a/nm-openvpn-script-security.patch b/nm-openvpn-script-security.patch deleted file mode 100644 index 4342d9a..0000000 --- a/nm-openvpn-script-security.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c ---- NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security 2008-09-30 15:56:42.000000000 -0400 -+++ NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c 2008-09-30 15:57:03.000000000 -0400 -@@ -611,6 +611,13 @@ nm_openvpn_start_openvpn_binary (NMOpenv - add_openvpn_arg (args, "--syslog"); - add_openvpn_arg (args, "nm-openvpn"); - -+ /* Punch script security in the face; this option was added to OpenVPN 2.1-rc9 -+ * and defaults to disallowing any scripts, a behavior change from previous -+ * versions. -+ */ -+ add_openvpn_arg (args, "--script-security"); -+ add_openvpn_arg (args, "2"); -+ - /* Up script, called when connection has been established or has been restarted */ - add_openvpn_arg (args, "--up"); - add_openvpn_arg (args, NM_OPENVPN_HELPER_PATH); diff --git a/sources b/sources index d198046..1dd965d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbf3db7e4e3d14ad2ec1b2689b4bc7a3 NetworkManager-openvpn-0.7.0.svn4027.tar.gz +50ce22b0cd278d48e4118f1b9de57162 NetworkManager-openvpn-0.7.0.svn4175.tar.gz From 1db9c11067bc82695d974347e192a29e81525b48 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Tue, 28 Oct 2008 03:54:22 +0000 Subject: [PATCH 028/129] - Rebuild for updated NetworkManager --- .cvsignore | 1 + NetworkManager-openvpn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b8faa58..02ce3f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,4 @@ NetworkManager-openvpn-0.7.0.svn3832.tar.gz NetworkManager-openvpn-0.7.0.svn3846.tar.gz NetworkManager-openvpn-0.7.0.svn3930.tar.gz NetworkManager-openvpn-0.7.0.svn4175.tar.gz +NetworkManager-openvpn-0.7.0.svn4229.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 3171111..b6aefeb 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.11.svn4174 +%define nm_version 1:0.7.0-0.11.svn4229 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4175 +%define svn_snapshot svn4229 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -106,6 +106,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog +* Mon Oct 27 2008 Dan Williams 1:0.7.0-16.svn4229 +- Rebuild for updated NetworkManager + * Sun Oct 12 2008 Dan Williams 1:0.7.0-16.svn4175 - Rebuild for updated NetworkManager - Allow changing passwords from the connection editor diff --git a/sources b/sources index 1dd965d..f4c91ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50ce22b0cd278d48e4118f1b9de57162 NetworkManager-openvpn-0.7.0.svn4175.tar.gz +a2abc6df4494aeb2552619bab9661a6a NetworkManager-openvpn-0.7.0.svn4229.tar.gz From 121203e26be1ea14c6f88511b95d0e0d50570fe7 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 22 Nov 2008 03:52:46 +0000 Subject: [PATCH 029/129] - Rebuild for updated NetworkManager --- .cvsignore | 1 + NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 02ce3f3..d1ddcec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ NetworkManager-openvpn-0.7.0.svn3846.tar.gz NetworkManager-openvpn-0.7.0.svn3930.tar.gz NetworkManager-openvpn-0.7.0.svn4175.tar.gz NetworkManager-openvpn-0.7.0.svn4229.tar.gz +NetworkManager-openvpn-0.7.0.svn4326.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index b6aefeb..c152724 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,12 +1,12 @@ -%define nm_version 1:0.7.0-0.11.svn4229 +%define nm_version 1:0.7.0-0.12.svn4326 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4229 +%define svn_snapshot svn4326 -Summary: NetworkManager VPN integration for OpenVPN +Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 @@ -106,6 +106,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog +* Fri Nov 21 2008 Dan Williams 1:0.7.0-16.svn4326 +- Rebuild for updated NetworkManager + * Mon Oct 27 2008 Dan Williams 1:0.7.0-16.svn4229 - Rebuild for updated NetworkManager diff --git a/sources b/sources index f4c91ac..c53d20a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2abc6df4494aeb2552619bab9661a6a NetworkManager-openvpn-0.7.0.svn4229.tar.gz +027b5577aac9b132fdbd0735eb3ccdeb NetworkManager-openvpn-0.7.0.svn4326.tar.gz From 927641cbebbfa68b85b76dc8dfa3234bf14927bc Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 3 Jan 2009 07:41:58 +0000 Subject: [PATCH 030/129] - Rebuild for updated NetworkManager - Fix some specfile issues (rh #477149) - Allow the EAP authentication method --- .cvsignore | 1 + NetworkManager-openvpn.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index d1ddcec..55148fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,3 +7,4 @@ NetworkManager-openvpn-0.7.0.svn3930.tar.gz NetworkManager-openvpn-0.7.0.svn4175.tar.gz NetworkManager-openvpn-0.7.0.svn4229.tar.gz NetworkManager-openvpn-0.7.0.svn4326.tar.gz +NetworkManager-openvpn-0.7.0.svn11.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index c152724..b055d3c 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0-0.12.svn4326 +%define nm_version 1:0.7.0-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4326 +%define svn_snapshot svn11 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 16.%{svn_snapshot}%{?dist} +Release: 18.%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -29,10 +29,8 @@ BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: glib2-devel BuildRequires: GConf2-devel -BuildRequires: libgnomeui-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel -BuildRequires: libpng-devel BuildRequires: perl-XML-Parser BuildRequires: libtool intltool gettext BuildRequires: perl @@ -61,7 +59,7 @@ with NetworkManager and the GNOME desktop. if [ ! -f configure ]; then ./autogen.sh fi -%configure --disable-static --disable-dependency-tracking +%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes make %{?_smp_mflags} %install @@ -104,8 +102,17 @@ fi %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade %{_datadir}/applications/nm-openvpn.desktop %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png +%dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Sat Jan 3 2009 Dan Williams 1:0.7.0-18.svn11 +- Rebuild for updated NetworkManager +- Fix some specfile issues (rh #477149) +- Allow the EAP authentication method + +* Sat Dec 20 2008 Christoph Höger 0.7.0-17.svn4326 +- removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149) + * Fri Nov 21 2008 Dan Williams 1:0.7.0-16.svn4326 - Rebuild for updated NetworkManager diff --git a/sources b/sources index c53d20a..49863ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -027b5577aac9b132fdbd0735eb3ccdeb NetworkManager-openvpn-0.7.0.svn4326.tar.gz +de7716aef7fe8665030e82aa244ec3c0 NetworkManager-openvpn-0.7.0.svn11.tar.gz From 9aa278c541d9e0162ef4fb6f820e2296692e3554 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 3 Jan 2009 07:50:04 +0000 Subject: [PATCH 031/129] remove erroneous change entry --- NetworkManager-openvpn.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index b055d3c..1833554 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -108,7 +108,6 @@ fi * Sat Jan 3 2009 Dan Williams 1:0.7.0-18.svn11 - Rebuild for updated NetworkManager - Fix some specfile issues (rh #477149) -- Allow the EAP authentication method * Sat Dec 20 2008 Christoph Höger 0.7.0-17.svn4326 - removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149) From 7c1af512602d34a1a0d08ae207b95818d4e68239 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 19 Feb 2009 14:12:49 +0000 Subject: [PATCH 032/129] - Update to 0.7.1rc1 - Handle HMAC Authentication (--auth) - Handle TAP device subnet masks correctly - Don't segfault if the connection type is invalid --- .cvsignore | 1 + NetworkManager-openvpn.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 55148fa..d799183 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ NetworkManager-openvpn-0.7.0.svn4175.tar.gz NetworkManager-openvpn-0.7.0.svn4229.tar.gz NetworkManager-openvpn-0.7.0.svn4326.tar.gz NetworkManager-openvpn-0.7.0.svn11.tar.gz +NetworkManager-openvpn-0.7.0.97.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1833554..1e968db 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,13 +4,13 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot svn11 +%define svn_snapshot %{nil} Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.0 -Release: 18.%{svn_snapshot}%{?dist} +Version: 0.7.0.97 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -20,7 +20,7 @@ Group: System Environment/Base # - ./autogen.sh --prefix=/usr --sysconfdir=/etc # - make distcheck # - use generated NetworkManager-openvpn-0.7.0.tar.gz -Source: %{name}-%{version}.%{svn_snapshot}.tar.gz +Source: %{name}-%{version}%{svn_snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -105,6 +105,12 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 +- Update to 0.7.1rc1 +- Handle HMAC Authentication (--auth) +- Handle TAP device subnet masks correctly +- Don't segfault if the connection type is invalid + * Sat Jan 3 2009 Dan Williams 1:0.7.0-18.svn11 - Rebuild for updated NetworkManager - Fix some specfile issues (rh #477149) diff --git a/sources b/sources index 49863ee..4c53c0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de7716aef7fe8665030e82aa244ec3c0 NetworkManager-openvpn-0.7.0.svn11.tar.gz +bfd6c097c9987cf8ae46b42bc05cd067 NetworkManager-openvpn-0.7.0.97.tar.gz From d4ebab6e4613e4771660e10c25aeb273a47e0fd3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 23 Feb 2009 22:08:08 +0000 Subject: [PATCH 033/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1e968db..1d2b5f1 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0.97 -Release: 1%{svn_snapshot}%{?dist} +Release: 2%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -105,6 +105,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 - Update to 0.7.1rc1 - Handle HMAC Authentication (--auth) From 42de4bde1bc4f8f6867ab13a7303e415bceb1103 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 5 Mar 2009 19:20:46 +0000 Subject: [PATCH 034/129] - Update to 0.7.1rc3 --- .cvsignore | 1 + NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d799183..8193c0e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,3 +9,4 @@ NetworkManager-openvpn-0.7.0.svn4229.tar.gz NetworkManager-openvpn-0.7.0.svn4326.tar.gz NetworkManager-openvpn-0.7.0.svn11.tar.gz NetworkManager-openvpn-0.7.0.97.tar.gz +NetworkManager-openvpn-0.7.0.99.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1d2b5f1..5f1d9d1 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.0-1 +%define nm_version 1:0.7.0.99-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 @@ -9,8 +9,8 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.0.97 -Release: 2%{svn_snapshot}%{?dist} +Version: 0.7.0.99 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -105,6 +105,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 +- Update to 0.7.1rc3 + * Mon Feb 23 2009 Fedora Release Engineering - 1:0.7.0.97-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 4c53c0f..eadb390 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bfd6c097c9987cf8ae46b42bc05cd067 NetworkManager-openvpn-0.7.0.97.tar.gz +b38bf19fb7b7cd62ea7ed9143ea02233 NetworkManager-openvpn-0.7.0.99.tar.gz From 8a90f579c422d900972e8ad61dc021e8885a5644 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 13 Jul 2009 14:13:39 +0000 Subject: [PATCH 035/129] - Update to 0.7.1 - Translation updates --- .cvsignore | 1 + NetworkManager-openvpn.spec | 20 +++++++++++--------- sources | 1 - 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8193c0e..bf1aa9a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,3 +10,4 @@ NetworkManager-openvpn-0.7.0.svn4326.tar.gz NetworkManager-openvpn-0.7.0.svn11.tar.gz NetworkManager-openvpn-0.7.0.97.tar.gz NetworkManager-openvpn-0.7.0.99.tar.gz +NetworkManager-openvpn-0.7.1.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 5f1d9d1..fa69057 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,26 +1,25 @@ -%define nm_version 1:0.7.0.99-1 +%define nm_version 1:0.7.1-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot %{nil} +%define snapshot .git20090713 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.0.99 -Release: 1%{svn_snapshot}%{?dist} +Version: 0.7.1 +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base # How to build the source package: -# - Check out NetworkManager from Gnome SVN, currently trunk is used -# - cd NetworkManager/vpn-daemons/openvpn +# - Check out NetworkManager from Gnome git, currently NETWORKMANAGER_0_7 is used # - ./autogen.sh --prefix=/usr --sysconfdir=/etc # - make distcheck -# - use generated NetworkManager-openvpn-0.7.0.tar.gz -Source: %{name}-%{version}%{svn_snapshot}.tar.gz +# - use generated NetworkManager-openvpn-0.7.1.tar.bz2 +Source: %{name}-%{version}%{snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -34,7 +33,6 @@ BuildRequires: libglade2-devel BuildRequires: perl-XML-Parser BuildRequires: libtool intltool gettext BuildRequires: perl -BuildRequires: gnome-common Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database Requires(post): /sbin/ldconfig @@ -105,6 +103,10 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Mon Jul 13 2009 Dan Williams - 1:0.7.1-1.20090713 +- Update to 0.7.1 +- Translation updates + * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 diff --git a/sources b/sources index eadb390..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -b38bf19fb7b7cd62ea7ed9143ea02233 NetworkManager-openvpn-0.7.0.99.tar.gz From a1669aa31b067a5a9b032bb355e0dcb9b301dc5d Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 13 Jul 2009 14:16:31 +0000 Subject: [PATCH 036/129] Upload the right sources --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index bf1aa9a..2d7b22a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,4 @@ NetworkManager-openvpn-0.7.0.svn11.tar.gz NetworkManager-openvpn-0.7.0.97.tar.gz NetworkManager-openvpn-0.7.0.99.tar.gz NetworkManager-openvpn-0.7.1.tar.bz2 +NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 diff --git a/sources b/sources index e69de29..8f0e26e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +94227516db7c88a001b737fdec4604a2 NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 From 316bdea4329a5bd9f402a0872795d228d8d80dfc Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Tue, 14 Jul 2009 10:59:41 +0000 Subject: [PATCH 037/129] - Fix a misconfiguration with 'subnet' topology - Fix detection of password requests by the OpenVPN management interface --- .cvsignore | 1 + NetworkManager-openvpn.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2d7b22a..328eb3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -12,3 +12,4 @@ NetworkManager-openvpn-0.7.0.97.tar.gz NetworkManager-openvpn-0.7.0.99.tar.gz NetworkManager-openvpn-0.7.1.tar.bz2 NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 +NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index fa69057..30780bd 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20090713 +%define snapshot .git20090714 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn @@ -103,6 +103,10 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Tue Jul 14 2009 Dan Williams - 1:0.7.1-1.20090714 +- Fix a misconfiguration with 'subnet' topology +- Fix detection of password requests by the OpenVPN management interface + * Mon Jul 13 2009 Dan Williams - 1:0.7.1-1.20090713 - Update to 0.7.1 - Translation updates diff --git a/sources b/sources index 8f0e26e..8f3b4c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94227516db7c88a001b737fdec4604a2 NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 +2c9e6819d2628c0890eade41ecf151d6 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 From 80b5edcfdf6781a9c1cbb8caf7bbfc7ca42eea16 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 15:40:48 +0000 Subject: [PATCH 038/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 30780bd..877048e 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.1 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1:0.7.1-2.git20090714 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 14 2009 Dan Williams - 1:0.7.1-1.20090714 - Fix a misconfiguration with 'subnet' topology - Fix detection of password requests by the OpenVPN management interface From 174fe47197034004c82097f2cd6f8adbebe79b7e Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sun, 30 Aug 2009 14:38:33 +0000 Subject: [PATCH 039/129] - Rebuild for updated NetworkManager --- .cvsignore | 1 + NetworkManager-openvpn.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 328eb3d..6a8b599 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,3 +13,4 @@ NetworkManager-openvpn-0.7.0.99.tar.gz NetworkManager-openvpn-0.7.1.tar.bz2 NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 +NetworkManager-openvpn-0.7.996.git20090828.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 877048e..c801093 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.1-1 +%define nm_version 1:0.7.996-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20090714 +%define snapshot .git20090828 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.1 -Release: 2%{snapshot}%{?dist} +Version: 0.7.996 +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Fri Aug 28 2009 Dan Williams - 1:0.7.996-1 +- Rebuild for updated NetworkManager + * Fri Jul 24 2009 Fedora Release Engineering - 1:0.7.1-2.git20090714 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 8f3b4c9..bc5521d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c9e6819d2628c0890eade41ecf151d6 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 +ad13350c04dbf3dd59d3daeb67ef55e1 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2 From a95884a61137f1c78ba997f90ee01e7394244a21 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 21 Sep 2009 22:54:28 +0000 Subject: [PATCH 040/129] - Rebuild for updated NetworkManager --- .cvsignore | 1 + NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6a8b599..b1f003a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -14,3 +14,4 @@ NetworkManager-openvpn-0.7.1.tar.bz2 NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2 +NetworkManager-openvpn-0.7.996.git20090921.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index c801093..b21e494 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.996-1 +%define nm_version 1:0.7.996-3 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20090828 +%define snapshot .git20090921 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.996 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Mon Sep 21 2009 Dan Williams - 1:0.7.996-2 +- Rebuild for updated NetworkManager + * Fri Aug 28 2009 Dan Williams - 1:0.7.996-1 - Rebuild for updated NetworkManager diff --git a/sources b/sources index bc5521d..d2e475e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad13350c04dbf3dd59d3daeb67ef55e1 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2 +7b006d8051dcf0d3e34729079bbf6f09 NetworkManager-openvpn-0.7.996.git20090921.tar.bz2 From 7c08eb0e7f945485834349bea9d4ef9ffc1fb68e Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 21 Sep 2009 23:05:06 +0000 Subject: [PATCH 041/129] fix nm require --- NetworkManager-openvpn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index b21e494..c617553 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.996-3 +%define nm_version 1:0.7.996-2 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 From f9196e7f923f7a3005b9fd692b29a808c8d4decf Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Wed, 23 Sep 2009 09:33:47 +0000 Subject: [PATCH 042/129] - Add GUI option for reneg-sec config option (rh #490971) --- .cvsignore | 1 + NetworkManager-openvpn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b1f003a..8cfcfbc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,3 +15,4 @@ NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2 NetworkManager-openvpn-0.7.996.git20090921.tar.bz2 +NetworkManager-openvpn-0.7.996.git20090923.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index c617553..ed3275f 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,13 +4,13 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20090921 +%define snapshot .git20090923 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.996 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Wed Sep 23 2009 Dan Williams - 1:0.7.996-3.git20090923 +- Add GUI option for reneg-sec config option (rh #490971) + * Mon Sep 21 2009 Dan Williams - 1:0.7.996-2 - Rebuild for updated NetworkManager diff --git a/sources b/sources index d2e475e..e1a43f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b006d8051dcf0d3e34729079bbf6f09 NetworkManager-openvpn-0.7.996.git20090921.tar.bz2 +07cf14f98db13b87ad677f9db2f568dc NetworkManager-openvpn-0.7.996.git20090923.tar.bz2 From 4c6c5046ac43243f253488589a88cf2f7ff142f8 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 5 Oct 2009 17:43:50 +0000 Subject: [PATCH 043/129] - Rebuild for updated NetworkManager --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ed3275f..b778ce9 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.996 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Mon Oct 5 2009 Dan Williams - 1:0.7.996-4.git20090923 +- Rebuild for updated NetworkManager + * Wed Sep 23 2009 Dan Williams - 1:0.7.996-3.git20090923 - Add GUI option for reneg-sec config option (rh #490971) From 6508ed5f93e3b193c2a94c6913a82279dc413692 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:02:32 +0000 Subject: [PATCH 044/129] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b1ac3a4..8bc647a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := NetworkManager-openvpn SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 59b2aab90b9de75f55d54be697265ce616b57402 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 14 Dec 2009 20:33:37 +0000 Subject: [PATCH 045/129] - Implement export capability - Fix some import bugs - Correctly handle PEM certificates without an ending newline (rh #507315) --- .cvsignore | 1 + NetworkManager-openvpn.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8cfcfbc..26c6ab2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -16,3 +16,4 @@ NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 NetworkManager-openvpn-0.7.996.git20090828.tar.bz2 NetworkManager-openvpn-0.7.996.git20090921.tar.bz2 NetworkManager-openvpn-0.7.996.git20090923.tar.bz2 +NetworkManager-openvpn-0.7.997.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index b778ce9..0051c32 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.996-2 +%define nm_version 1:0.7.997-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20090923 +%define snapshot %{nil} Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.996 -Release: 4%{snapshot}%{?dist} +Version: 0.7.997 +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,11 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Mon Dec 14 2009 Dan Williams - 1:0.7.997-1 +- Implement export capability +- Fix some import bugs +- Correctly handle PEM certificates without an ending newline (rh #507315) + * Mon Oct 5 2009 Dan Williams - 1:0.7.996-4.git20090923 - Rebuild for updated NetworkManager diff --git a/sources b/sources index e1a43f0..3ddab5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07cf14f98db13b87ad677f9db2f568dc NetworkManager-openvpn-0.7.996.git20090923.tar.bz2 +90deb680bb62a9f846c794e56f5713b4 NetworkManager-openvpn-0.7.997.tar.bz2 From c938675ced5a7c5a11682929a318c6f45fa78159 Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Tue, 2 Mar 2010 03:46:15 +0000 Subject: [PATCH 046/129] Update to upstream 0.8 --- .cvsignore | 20 +------------------- NetworkManager-openvpn.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 26c6ab2..3c1ec47 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,19 +1 @@ -NetworkManager-openvpn-0.7.0.svn3302.tar.gz -NetworkManager-openvpn-0.7.0.svn3549.tar.gz -NetworkManager-openvpn-0.7.0.svn3801.tar.gz -NetworkManager-openvpn-0.7.0.svn3832.tar.gz -NetworkManager-openvpn-0.7.0.svn3846.tar.gz -NetworkManager-openvpn-0.7.0.svn3930.tar.gz -NetworkManager-openvpn-0.7.0.svn4175.tar.gz -NetworkManager-openvpn-0.7.0.svn4229.tar.gz -NetworkManager-openvpn-0.7.0.svn4326.tar.gz -NetworkManager-openvpn-0.7.0.svn11.tar.gz -NetworkManager-openvpn-0.7.0.97.tar.gz -NetworkManager-openvpn-0.7.0.99.tar.gz -NetworkManager-openvpn-0.7.1.tar.bz2 -NetworkManager-openvpn-0.7.1.git20090713.tar.bz2 -NetworkManager-openvpn-0.7.1.git20090714.tar.bz2 -NetworkManager-openvpn-0.7.996.git20090828.tar.bz2 -NetworkManager-openvpn-0.7.996.git20090921.tar.bz2 -NetworkManager-openvpn-0.7.996.git20090923.tar.bz2 -NetworkManager-openvpn-0.7.997.tar.bz2 +NetworkManager-openvpn-0.8.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0051c32..a815a02 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%define nm_version 1:0.7.997-1 +%define nm_version 1:0.8 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.7.997 +Version: 0.8 Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -98,11 +98,14 @@ fi %{_libexecdir}/nm-openvpn-service %{_libexecdir}/nm-openvpn-service-openvpn-helper %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade -%{_datadir}/applications/nm-openvpn.desktop -%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png +#%{_datadir}/applications/nm-openvpn.desktop +#%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Tue Mar 2 2010 Huzaifa Sidhpurwala - 1:0.8-1 +- Update to 0.8 + * Mon Dec 14 2009 Dan Williams - 1:0.7.997-1 - Implement export capability - Fix some import bugs diff --git a/sources b/sources index 3ddab5e..b529a9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90deb680bb62a9f846c794e56f5713b4 NetworkManager-openvpn-0.7.997.tar.bz2 +6d6f5cd3c80d2e04a9518a5461767f20 NetworkManager-openvpn-0.8.tar.bz2 From cfc26cf7a656f9261efae3211f47f9afdaa6be2c Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 12 Apr 2010 05:33:36 +0000 Subject: [PATCH 047/129] - Add support for more HMAC authentication algorithms - Fix requests for private key passwords for certificates (rh #549961) --- .cvsignore | 1 + NetworkManager-openvpn.spec | 16 ++++++++++++---- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3c1ec47..e8ae9ba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ NetworkManager-openvpn-0.8.tar.bz2 +NetworkManager-openvpn-0.8.git20100411.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a815a02..c2648b4 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,21 +4,21 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot %{nil} +%define snapshot .git20100411 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.8 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base # How to build the source package: -# - Check out NetworkManager from Gnome git, currently NETWORKMANAGER_0_7 is used +# - Check out network-manager-openvpn # - ./autogen.sh --prefix=/usr --sysconfdir=/etc # - make distcheck -# - use generated NetworkManager-openvpn-0.7.1.tar.bz2 +# - use generated NetworkManager-openvpn-0.8.tar.bz2 Source: %{name}-%{version}%{snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -103,7 +103,15 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Sun Apr 11 2010 Dan Williams - 1:0.8-2 +- Add support for more HMAC authentication algorithms +- Fix requests for private key passwords for certificates (rh #549961) + * Tue Mar 2 2010 Huzaifa Sidhpurwala - 1:0.8-1 +- Fix handling of remote peer address for shared-key connections (rh #564068) +- Add support for the "TLS Remote", tun-mtu, fragment, and mss-fix options +- Various import/export fixes (tls-auth, port/rport) +- Add support for PKCS#12 encoded certificates and private keys - Update to 0.8 * Mon Dec 14 2009 Dan Williams - 1:0.7.997-1 diff --git a/sources b/sources index b529a9b..40a40b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d6f5cd3c80d2e04a9518a5461767f20 NetworkManager-openvpn-0.8.tar.bz2 +8bec68b1d862154282e360808778717d NetworkManager-openvpn-0.8.git20100411.tar.bz2 From 6d7999291d3b3f2f48e6b5de7d64ddde90cb29ff Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 10 Jun 2010 05:21:01 +0000 Subject: [PATCH 048/129] - Add support for PKCS#8 private keys - Add support for unencrypted private keys (rh #497454) --- .cvsignore | 1 + NetworkManager-openvpn.spec | 20 +++++++++++++------- import-export.patch | 14 ++++++++++++++ sources | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 import-export.patch diff --git a/.cvsignore b/.cvsignore index e8ae9ba..c8f7306 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ NetworkManager-openvpn-0.8.tar.bz2 NetworkManager-openvpn-0.8.git20100411.tar.bz2 +NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index c2648b4..db2497c 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,17 @@ -%define nm_version 1:0.8 +%define nm_version 1:0.7.997 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20100411 +%define snapshot .git20100609 +%define realversion 0.8.0.997 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.8 -Release: 2%{snapshot}%{?dist} +Version: 0.8.1 +Release: 0.1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -19,7 +20,8 @@ Group: System Environment/Base # - ./autogen.sh --prefix=/usr --sysconfdir=/etc # - make distcheck # - use generated NetworkManager-openvpn-0.8.tar.bz2 -Source: %{name}-%{version}%{snapshot}.tar.bz2 +Source: %{name}-%{realversion}%{snapshot}.tar.bz2 +Patch0: import-export.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -50,8 +52,8 @@ This package contains software for integrating the OpenVPN VPN software with NetworkManager and the GNOME desktop. %prep -%setup -q -n %{name}-%{version} - +%setup -q -n %{name}-%{realversion} +%patch0 -p1 -b .importexport %build if [ ! -f configure ]; then @@ -103,6 +105,10 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Wed Jun 9 2010 Dan Williams - 1:0.8.1-0.1.git20100609 +- Add support for PKCS#8 private keys +- Add support for unencrypted private keys (rh #497454) + * Sun Apr 11 2010 Dan Williams - 1:0.8-2 - Add support for more HMAC authentication algorithms - Fix requests for private key passwords for certificates (rh #549961) diff --git a/import-export.patch b/import-export.patch new file mode 100644 index 0000000..771d441 --- /dev/null +++ b/import-export.patch @@ -0,0 +1,14 @@ +diff -up NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c +--- NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo 2010-06-09 22:15:22.095413377 -0700 ++++ NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c 2010-06-09 22:15:31.771412470 -0700 +@@ -767,8 +767,8 @@ openvpn_plugin_ui_interface_init (NMVpnP + /* interface implementation */ + iface_class->ui_factory = ui_factory; + iface_class->get_capabilities = get_capabilities; +- iface_class->import_from_file = import; +- iface_class->export_to_file = export; ++ iface_class->import = import; ++ iface_class->export = export; + iface_class->get_suggested_name = get_suggested_name; + iface_class->delete_connection = delete_connection; + } diff --git a/sources b/sources index 40a40b9..e802f7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bec68b1d862154282e360808778717d NetworkManager-openvpn-0.8.git20100411.tar.bz2 +b8a571e5594765b7a412d560afc16396 NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 From d1cf96de90b3c9bbee84fb7d7a95add4e779f453 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Wed, 28 Jul 2010 04:06:13 +0000 Subject: [PATCH 049/129] *** empty log message *** --- .cvsignore | 1 + NetworkManager-openvpn.spec | 15 +++++++++------ import-export.patch | 14 -------------- sources | 2 +- 4 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 import-export.patch diff --git a/.cvsignore b/.cvsignore index c8f7306..a929ef0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ NetworkManager-openvpn-0.8.tar.bz2 NetworkManager-openvpn-0.8.git20100411.tar.bz2 NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 +NetworkManager-openvpn-0.8.1.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index db2497c..ca0bbba 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,17 +1,17 @@ -%define nm_version 1:0.7.997 +%define nm_version 1:0.8.1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20100609 -%define realversion 0.8.0.997 +%define snapshot %{nil} +%define realversion 0.8.1 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.8.1 -Release: 0.1%{snapshot}%{?dist} +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -21,7 +21,6 @@ Group: System Environment/Base # - make distcheck # - use generated NetworkManager-openvpn-0.8.tar.bz2 Source: %{name}-%{realversion}%{snapshot}.tar.bz2 -Patch0: import-export.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -53,7 +52,6 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{realversion} -%patch0 -p1 -b .importexport %build if [ ! -f configure ]; then @@ -105,6 +103,11 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Tue Jul 27 2010 Dan Williams - 1:0.8.1-1 +- Update to 0.8.1 release +- Updated translations +- Fix crash when checking whether some private keys are encrypted + * Wed Jun 9 2010 Dan Williams - 1:0.8.1-0.1.git20100609 - Add support for PKCS#8 private keys - Add support for unencrypted private keys (rh #497454) diff --git a/import-export.patch b/import-export.patch deleted file mode 100644 index 771d441..0000000 --- a/import-export.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c ---- NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo 2010-06-09 22:15:22.095413377 -0700 -+++ NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c 2010-06-09 22:15:31.771412470 -0700 -@@ -767,8 +767,8 @@ openvpn_plugin_ui_interface_init (NMVpnP - /* interface implementation */ - iface_class->ui_factory = ui_factory; - iface_class->get_capabilities = get_capabilities; -- iface_class->import_from_file = import; -- iface_class->export_to_file = export; -+ iface_class->import = import; -+ iface_class->export = export; - iface_class->get_suggested_name = get_suggested_name; - iface_class->delete_connection = delete_connection; - } diff --git a/sources b/sources index e802f7f..bbe47e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8a571e5594765b7a412d560afc16396 NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 +0995450e31d1a47c3e3767de9773b7a7 NetworkManager-openvpn-0.8.1.tar.bz2 From 0dbeceacf26cfbe9aea7bc312fc4cd5ef669c1df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:05:44 +0000 Subject: [PATCH 050/129] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8bc647a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: NetworkManager-openvpn -# $Id$ -NAME := NetworkManager-openvpn -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From f5798e902e3d77da560e3329a9b63d61c2aeb32b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:00:38 -0600 Subject: [PATCH 051/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ca0bbba..f65f810 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.8.1 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1:0.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jul 27 2010 Dan Williams - 1:0.8.1-1 - Update to 0.8.1 release - Updated translations From e48e96c9b738367c3db1f14e48a8e773d38f7a06 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 3 May 2011 23:57:01 -0500 Subject: [PATCH 052/129] Update to 0.8.999 (0.9-rc2) --- NetworkManager-openvpn.spec | 38 +++++++++++++++++++++++-------------- sources | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index f65f810..4876355 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,17 +1,17 @@ -%define nm_version 1:0.8.1 +%define nm_version 1:0.8.998 %define dbus_version 1.1 -%define gtk2_version 2.10.0 +%define gtk2_version 3.0.1 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 %define snapshot %{nil} -%define realversion 0.8.1 +%define realversion 0.8.999 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.8.1 -Release: 2%{snapshot}%{?dist} +Version: 0.8.999 +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -23,27 +23,22 @@ Group: System Environment/Base Source: %{name}-%{realversion}%{snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: gtk3-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: glib2-devel -BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel -BuildRequires: libglade2-devel -BuildRequires: perl-XML-Parser BuildRequires: libtool intltool gettext -BuildRequires: perl Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: gtk2 >= %{gtk2_version} +Requires: gtk3 >= %{gtk2_version} Requires: dbus >= %{dbus_version} Requires: NetworkManager >= %{nm_version} Requires: openvpn >= %{openvpn_version} Requires: shared-mime-info >= %{shared_mime_version} -Requires: GConf2 Requires: gnome-keyring %description @@ -57,7 +52,7 @@ with NetworkManager and the GNOME desktop. if [ ! -f configure ]; then ./autogen.sh fi -%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes +%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3 make %{?_smp_mflags} %install @@ -97,12 +92,27 @@ fi %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_libexecdir}/nm-openvpn-service %{_libexecdir}/nm-openvpn-service-openvpn-helper -%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade +%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui #%{_datadir}/applications/nm-openvpn.desktop #%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Tue May 03 2011 Dan Williams - 1:0.8.999-1 +- Update to 0.8.999 (0.9-rc2) +- ui: default to user-stored secrets for new connections +- ui: updated translations +- ui: fix HTTP proxy authentication autodetection during import + +* Tue Apr 05 2011 Dan Williams - 1:0.8.998-1.git20110405 +- Update to 0.8.998 (0.9.0-rc1) +- Fix importing of configs with TLS Auth direction +- Fix handling of user-session-owned secrets +- Export HTTP Proxy auth file when appropriate + +* Thu Mar 24 2011 Dan Williams - 1:0.8.995-1 +- Update to 0.8.995 (0.9-beta1) + * Mon Feb 07 2011 Fedora Release Engineering - 1:0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index bbe47e9..8f3de36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0995450e31d1a47c3e3767de9773b7a7 NetworkManager-openvpn-0.8.1.tar.bz2 +e76cd6e68c27c1ff7a409a75756e96d3 NetworkManager-openvpn-0.8.999.tar.bz2 From 680dffd237b0aeb69b0d6ea46a544668ad6e8ef1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 21 Jul 2011 00:55:47 -0500 Subject: [PATCH 053/129] Update to new git snapshot --- NetworkManager-openvpn.spec | 18 ++++++++++++++---- sources | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 4876355..11ead5f 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,14 +4,14 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot %{nil} -%define realversion 0.8.999 +%define snapshot .git20110721 +%define realversion 0.8.9997 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.8.999 -Release: 1%{snapshot}%{?dist} +Version: 0.8.9997 +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -98,6 +98,16 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Thu Jul 21 2011 Dan Williams - 1:0.8.9997-2 +- ui: ensure secrets are saved when required and not saved when not required +- ui: add explicit secret saving options + +* Thu Jul 07 2011 Dan Williams - 1:0.8.9997-1 +- Update to 0.8.9997 (0.9-rc3) +- ui: ensure saved secrets are passed back to NM +- ui: updated translations +- ui: add RSA-MD4 HMAC digest algorithm + * Tue May 03 2011 Dan Williams - 1:0.8.999-1 - Update to 0.8.999 (0.9-rc2) - ui: default to user-stored secrets for new connections diff --git a/sources b/sources index 8f3de36..2a22b1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e76cd6e68c27c1ff7a409a75756e96d3 NetworkManager-openvpn-0.8.999.tar.bz2 +01f7e899bc052a006e0e03a4f06f4f78 NetworkManager-openvpn-0.8.9997.git20110721.tar.bz2 From 995ee6cd97488f6d418c20786f1453d43093e04b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 26 Aug 2011 14:11:32 -0500 Subject: [PATCH 054/129] Update to 0.9.0 --- NetworkManager-openvpn.spec | 13 +++++++------ sources | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 11ead5f..70fbab4 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,14 +4,14 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20110721 -%define realversion 0.8.9997 +%define snapshot %{nil} +%define realversion 0.9.0 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.8.9997 -Release: 2%{snapshot}%{?dist} +Version: 0.9.0 +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -93,11 +93,12 @@ fi %{_libexecdir}/nm-openvpn-service %{_libexecdir}/nm-openvpn-service-openvpn-helper %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui -#%{_datadir}/applications/nm-openvpn.desktop -#%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Fri Aug 26 2011 Dan Williams - 1:0.9.0-1 +- ui: updated translations + * Thu Jul 21 2011 Dan Williams - 1:0.8.9997-2 - ui: ensure secrets are saved when required and not saved when not required - ui: add explicit secret saving options diff --git a/sources b/sources index 2a22b1e..2e7e229 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01f7e899bc052a006e0e03a4f06f4f78 NetworkManager-openvpn-0.8.9997.git20110721.tar.bz2 +ab5dbe20315e5b4c41956b1ef2d8c3e2 NetworkManager-openvpn-0.9.0.tar.bz2 From 9c861be7285d2b81535f82f0fd04ecab129a89f7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 00:32:19 -0500 Subject: [PATCH 055/129] Rebuild for new libpng --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 70fbab4..0687dc6 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.0 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -96,6 +96,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Tue Dec 06 2011 Adam Jackson - 1:0.9.0-2 +- Rebuild for new libpng + * Fri Aug 26 2011 Dan Williams - 1:0.9.0-1 - ui: updated translations From a222588e8f91b64be77a0f6f4f21587a7b69f51c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 7 Dec 2011 20:20:34 -0500 Subject: [PATCH 056/129] Rebuild for new libpng Build with -Wno-error=deprecated-declarations for now --- NetworkManager-openvpn.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0687dc6..7a8946f 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -52,6 +52,7 @@ with NetworkManager and the GNOME desktop. if [ ! -f configure ]; then ./autogen.sh fi +export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations" %configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3 make %{?_smp_mflags} @@ -96,8 +97,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog -* Tue Dec 06 2011 Adam Jackson - 1:0.9.0-2 +* Wed Dec 07 2011 Adam Jackson 0.9.0-2 - Rebuild for new libpng +- Build with -Wno-error=deprecated-declarations for now * Fri Aug 26 2011 Dan Williams - 1:0.9.0-1 - ui: updated translations From b6ec4f5e1eb159116f89e6fe8e40bc0b993e1850 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:26:21 -0600 Subject: [PATCH 057/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 7a8946f..5e9c877 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.0 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -97,6 +97,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1:0.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Dec 07 2011 Adam Jackson 0.9.0-2 - Rebuild for new libpng - Build with -Wno-error=deprecated-declarations for now From 101c0be363fbd76795b965449d5f48b8a7917a44 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 26 Feb 2012 23:32:27 +0000 Subject: [PATCH 058/129] Update for unannounced gnome-keyring devel changes --- NetworkManager-openvpn.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 5e9c877..393b866 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -22,13 +22,12 @@ Group: System Environment/Base # - use generated NetworkManager-openvpn-0.8.tar.bz2 Source: %{name}-%{realversion}%{snapshot}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk3-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: glib2-devel -BuildRequires: gnome-keyring-devel +BuildRequires: libgnome-keyring-devel BuildRequires: libtool intltool gettext Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database @@ -57,16 +56,12 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations" make %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %find_lang %{name} -%clean -rm -rf %{buildroot} - %post /sbin/ldconfig /usr/bin/update-desktop-database > /dev/null @@ -97,6 +92,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Sun Feb 26 2012 Peter Robinson - 1:0.9.0-4 +- Update for unannounced gnome-keyring devel changes + * Thu Jan 12 2012 Fedora Release Engineering - 1:0.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From deadad79105e3700ed090ae7806d17f06d60580f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 26 Feb 2012 23:36:35 +0000 Subject: [PATCH 059/129] update Release --- NetworkManager-openvpn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 393b866..1b7e006 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.0 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base From 4b756cfb503bbe4d853a956b34bdcd0c237c38ea Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 2 Mar 2012 17:06:32 -0600 Subject: [PATCH 060/129] Update to 0.9.3.995 (0.9.4-beta1) --- NetworkManager-openvpn.spec | 25 ++++++++++++++----------- sources | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1b7e006..ffd22b2 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,25 +1,20 @@ -%define nm_version 1:0.8.998 +%define nm_version 1:0.9.2 %define dbus_version 1.1 %define gtk2_version 3.0.1 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot %{nil} -%define realversion 0.9.0 +%define snapshot .git20120302 +%define realversion 0.9.3.995 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.9.0 -Release: 4%{snapshot}%{?dist} +Version: 0.9.3.995 +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -# How to build the source package: -# - Check out network-manager-openvpn -# - ./autogen.sh --prefix=/usr --sysconfdir=/etc -# - make distcheck -# - use generated NetworkManager-openvpn-0.8.tar.bz2 Source: %{name}-%{realversion}%{snapshot}.tar.bz2 BuildRequires: gtk3-devel >= %{gtk2_version} @@ -27,7 +22,11 @@ BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: glib2-devel +%if 0%{?fedora} > 16 BuildRequires: libgnome-keyring-devel +%else +BuildRequires: gnome-keyring-devel +%endif BuildRequires: libtool intltool gettext Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database @@ -51,7 +50,6 @@ with NetworkManager and the GNOME desktop. if [ ! -f configure ]; then ./autogen.sh fi -export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations" %configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3 make %{?_smp_mflags} @@ -92,6 +90,11 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Fri Mar 2 2012 Dan Williams - 1:0.9.3.995-1 +- Update to 0.9.3.995 (0.9.4-beta1) +- ui: allow setting Cipher and HMAC options in Static Key mode +- ui: add support for external UI mode, eg GNOME Shell + * Sun Feb 26 2012 Peter Robinson - 1:0.9.0-4 - Update for unannounced gnome-keyring devel changes diff --git a/sources b/sources index 2e7e229..1470662 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab5dbe20315e5b4c41956b1ef2d8c3e2 NetworkManager-openvpn-0.9.0.tar.bz2 +cbe4a8082235446bd7108bf0686ee0b6 NetworkManager-openvpn-0.9.3.995.git20120302.tar.bz2 From bbbd085cf07d9f380afc400f11a99d244aa6be76 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 19 Mar 2012 22:20:06 -0500 Subject: [PATCH 061/129] Update to 0.9.3.997 (0.9.4-rc1) --- .gitignore | 2 ++ NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a929ef0..aebd861 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ NetworkManager-openvpn-0.8.tar.bz2 NetworkManager-openvpn-0.8.git20100411.tar.bz2 NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 NetworkManager-openvpn-0.8.1.tar.bz2 +/NetworkManager-openvpn-0.9.3.995.git20120302.tar.bz2 +/NetworkManager-openvpn-0.9.3.997.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ffd22b2..c5088e3 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,13 +4,13 @@ %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20120302 -%define realversion 0.9.3.995 +%define snapshot %{nil} +%define realversion 0.9.3.997 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.9.3.995 +Version: 0.9.3.997 Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -90,6 +90,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Mon Mar 19 2012 Dan Williams - 1:0.9.3.997-1 +- Update to 0.9.3.997 (0.9.4-rc1) + * Fri Mar 2 2012 Dan Williams - 1:0.9.3.995-1 - Update to 0.9.3.995 (0.9.4-beta1) - ui: allow setting Cipher and HMAC options in Static Key mode diff --git a/sources b/sources index 1470662..aa5d6f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbe4a8082235446bd7108bf0686ee0b6 NetworkManager-openvpn-0.9.3.995.git20120302.tar.bz2 +10e06a5938767b06097ca38543f2a462 NetworkManager-openvpn-0.9.3.997.tar.bz2 From a593eda5f0682c74f8dbc5ccf35bfa7aa966d3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 14 Jun 2012 00:46:11 +0300 Subject: [PATCH 062/129] Remove unnecessary ldconfig calls from scriptlets (#737330). - Escape macros in changelog. --- NetworkManager-openvpn.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index c5088e3..bff8441 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.3.997 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -30,8 +30,6 @@ BuildRequires: gnome-keyring-devel BuildRequires: libtool intltool gettext Requires(post): %{_bindir}/update-desktop-database Requires(postun): %{_bindir}/update-desktop-database -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig Requires: gtk3 >= %{gtk2_version} Requires: dbus >= %{dbus_version} Requires: NetworkManager >= %{nm_version} @@ -61,7 +59,6 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %find_lang %{name} %post -/sbin/ldconfig /usr/bin/update-desktop-database > /dev/null touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -69,7 +66,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then fi %postun -/sbin/ldconfig /usr/bin/update-desktop-database > /dev/null touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -90,6 +86,10 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Wed Jun 13 2012 Ville Skyttä - 1:0.9.3.997-2 +- Remove unnecessary ldconfig calls from scriptlets (#737330). +- Escape macros in changelog. + * Mon Mar 19 2012 Dan Williams - 1:0.9.3.997-1 - Update to 0.9.3.997 (0.9.4-rc1) @@ -204,7 +204,7 @@ fi - Fix some specfile issues (rh #477149) * Sat Dec 20 2008 Christoph Höger 0.7.0-17.svn4326 -- removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149) +- removed libpng-devel from BuildRequires, added %%{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149) * Fri Nov 21 2008 Dan Williams 1:0.7.0-16.svn4326 - Rebuild for updated NetworkManager @@ -219,7 +219,7 @@ fi * Tue Sep 30 2008 Dan Williams 1:0.7.0-16.svn4027 - Fix order of Password TLS certificate choosers (rh #464765) -- Use %find_lang for locale-specific files (rh #448551) +- Use %%find_lang for locale-specific files (rh #448551) - Fix --script-security issues with OpenVPN 2.1-rc9 and later (rh #460754) * Fri Aug 29 2008 Dan Williams 1:0.7.0-15.svn4027 @@ -255,7 +255,7 @@ fi - Update for compat with new NM bits * Mon Mar 03 2008 Tim Niemueller 1:0.7.0-9.svn3302 -- Mute %post and %postun scripts +- Mute %%post and %%postun scripts * Fri Feb 08 2008 Tim Niemueller 1:0.7.0-8.svn3302 - Update to latest SVN snapshot From 9d7f43217f133b402cbdc7f7d25ac2af41d860e8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 08:44:34 -0500 Subject: [PATCH 063/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index bff8441..c9f6f57 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.3.997 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -86,6 +86,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1:0.9.3.997-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Jun 13 2012 Ville Skyttä - 1:0.9.3.997-2 - Remove unnecessary ldconfig calls from scriptlets (#737330). - Escape macros in changelog. From 7d0656f34bbaed883fbf2e6a379dea7ab5cc6eed Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 28 Sep 2012 17:56:01 -0500 Subject: [PATCH 064/129] Update to 0.9.6.0 --- NetworkManager-openvpn.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index c9f6f57..130307b 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -5,17 +5,17 @@ %define shared_mime_version 0.16-3 %define snapshot %{nil} -%define realversion 0.9.3.997 +%define realversion 0.9.6.0 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.9.3.997 -Release: 3%{snapshot}%{?dist} +Version: 0.9.6.0 +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source: %{name}-%{realversion}%{snapshot}.tar.bz2 +Source: %{name}-%{realversion}%{snapshot}.tar.xz BuildRequires: gtk3-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -86,6 +86,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Fri Sep 28 2012 Dan Williams - 1:0.9.6.0-1 +- Update to 0.9.6.0 + * Wed Jul 18 2012 Fedora Release Engineering - 1:0.9.3.997-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index aa5d6f1..0a7abc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10e06a5938767b06097ca38543f2a462 NetworkManager-openvpn-0.9.3.997.tar.bz2 +c4c11aae895f5967d36f3dc7a24046b2 NetworkManager-openvpn-0.9.6.0.tar.xz From 78f0a8cafb80a36ff570c7e3a1db31d2d6693f41 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 09:26:54 -0600 Subject: [PATCH 065/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 130307b..d6f5c69 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.6.0 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -86,6 +86,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1:0.9.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Sep 28 2012 Dan Williams - 1:0.9.6.0-1 - Update to 0.9.6.0 From 0101510b590fd304f101987484a93117639dc2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 17 Jul 2013 15:26:05 +0200 Subject: [PATCH 066/129] Update to 0.9.8.2 release; split GUI to separate package and cleanup spec file (rh #949132) --- .gitignore | 1 + NetworkManager-openvpn.spec | 121 +++++++++++++++++++----------------- sources | 2 +- 3 files changed, 65 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index aebd861..f563bff 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.3.995.git20120302.tar.bz2 /NetworkManager-openvpn-0.9.3.997.tar.bz2 +/NetworkManager-openvpn-0.9.8.2.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index d6f5c69..48c47c5 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,48 +1,57 @@ -%define nm_version 1:0.9.2 -%define dbus_version 1.1 -%define gtk2_version 3.0.1 -%define openvpn_version 2.1 -%define shared_mime_version 0.16-3 - -%define snapshot %{nil} -%define realversion 0.9.6.0 - -Summary: NetworkManager VPN plugin for OpenVPN -Name: NetworkManager-openvpn -Epoch: 1 -Version: 0.9.6.0 -Release: 2%{snapshot}%{?dist} -License: GPLv2+ -URL: http://www.gnome.org/projects/NetworkManager/ -Group: System Environment/Base -Source: %{name}-%{realversion}%{snapshot}.tar.xz - -BuildRequires: gtk3-devel >= %{gtk2_version} -BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: NetworkManager-devel >= %{nm_version} -BuildRequires: NetworkManager-glib-devel >= %{nm_version} +%global snapshot %{nil} + +Summary: NetworkManager VPN plugin for OpenVPN +Name: NetworkManager-openvpn +Epoch: 1 +Version: 0.9.8.2 +Release: 1%{snapshot}%{?dist} +License: GPLv2+ +URL: http://www.gnome.org/projects/NetworkManager/ +Group: System Environment/Base +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.bz2 + +BuildRequires: gtk3-devel +BuildRequires: dbus-devel +BuildRequires: NetworkManager-devel +BuildRequires: NetworkManager-glib-devel BuildRequires: glib2-devel -%if 0%{?fedora} > 16 -BuildRequires: libgnome-keyring-devel -%else -BuildRequires: gnome-keyring-devel -%endif BuildRequires: libtool intltool gettext -Requires(post): %{_bindir}/update-desktop-database -Requires(postun): %{_bindir}/update-desktop-database -Requires: gtk3 >= %{gtk2_version} -Requires: dbus >= %{dbus_version} -Requires: NetworkManager >= %{nm_version} -Requires: openvpn >= %{openvpn_version} -Requires: shared-mime-info >= %{shared_mime_version} +BuildRequires: libgnome-keyring-devel + +Requires: gtk3 +Requires: dbus +Requires: NetworkManager +Requires: openvpn +Requires: shared-mime-info Requires: gnome-keyring +Obsoletes: NetworkManager-openvpn < 0.9.8.2-1 + +%global _privatelibs libnm-openvpn-properties[.]so.* +%global __provides_exclude ^(%{_privatelibs})$ +%global __requires_exclude ^(%{_privatelibs})$ %description -This package contains software for integrating the OpenVPN VPN software -with NetworkManager and the GNOME desktop. +This package contains software for integrating VPN capabilities with +the OpenVPN server with NetworkManager. + +%package -n NetworkManager-openvpn-gnome +Summary: NetworkManager VPN plugin for OpenVPN - GNOME files +Group: System Environment/Base + +Requires: NetworkManager-openvpn = %{epoch}:%{version}-%{release} +%if 0%{?fedora} > 17 +Requires: nm-connection-editor +%else +Requires: NetworkManager-gnome +%endif +Obsoletes: NetworkManager-openvpn < 0.9.8.2-1 + +%description -n NetworkManager-openvpn-gnome +This package contains software for integrating VPN capabilities with +the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-%{realversion} +%setup -q -n %{name}-%{version} %build if [ ! -f configure ]; then @@ -51,6 +60,9 @@ fi %configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3 make %{?_smp_mflags} +%check +make check + %install make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" @@ -58,34 +70,27 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %find_lang %{name} -%post -/usr/bin/update-desktop-database > /dev/null -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -/usr/bin/update-desktop-database > /dev/null -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - %files -f %{name}.lang -%defattr(-, root, root) - -%doc AUTHORS ChangeLog README -%{_libdir}/NetworkManager/lib*.so* -%{_libexecdir}/nm-openvpn-auth-dialog +%doc COPYING AUTHORS README ChangeLog %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_libexecdir}/nm-openvpn-service +%{_libexecdir}/nm-openvpn-auth-dialog %{_libexecdir}/nm-openvpn-service-openvpn-helper -%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui + +%files -n NetworkManager-openvpn-gnome +%doc COPYING AUTHORS README ChangeLog +%{_libdir}/NetworkManager/lib*.so* %dir %{_datadir}/gnome-vpn-properties/openvpn +%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Tue Jul 16 2013 Jiří Klimeš - 1:0.9.8.2-1 +- Update to 0.9.8.2 release + +* Sat Apr 06 2013 Dan Fruehauf - 1:0.9.8.0-1 +- Refactored spec file + * Wed Feb 13 2013 Fedora Release Engineering - 1:0.9.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 0a7abc9..5b60b42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4c11aae895f5967d36f3dc7a24046b2 NetworkManager-openvpn-0.9.6.0.tar.xz +2073ef7ee98032dc777c7fbda7f8e2ad NetworkManager-openvpn-0.9.8.2.tar.bz2 From 1134eaceb5eee64ccb01f998c7dde11fac3aa26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 17 Jul 2013 15:33:12 +0200 Subject: [PATCH 067/129] Require libgnome-keyring instead of gnome-keyring (rh #811931) --- NetworkManager-openvpn.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 48c47c5..d9895a6 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.8.2 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -23,8 +23,8 @@ Requires: dbus Requires: NetworkManager Requires: openvpn Requires: shared-mime-info -Requires: gnome-keyring -Obsoletes: NetworkManager-openvpn < 0.9.8.2-1 +Requires: libgnome-keyring +Obsoletes: NetworkManager-openvpn < 0.9.8.2-2 %global _privatelibs libnm-openvpn-properties[.]so.* %global __provides_exclude ^(%{_privatelibs})$ @@ -44,7 +44,7 @@ Requires: nm-connection-editor %else Requires: NetworkManager-gnome %endif -Obsoletes: NetworkManager-openvpn < 0.9.8.2-1 +Obsoletes: NetworkManager-openvpn < 0.9.8.2-2 %description -n NetworkManager-openvpn-gnome This package contains software for integrating VPN capabilities with @@ -85,6 +85,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Wed Jul 17 2013 Stef Walter - 1:0.9.8.2-2 +- Depend on libgnome-keyring (the client library), not gnome-keyring (daemon) (rh #811931) + * Tue Jul 16 2013 Jiří Klimeš - 1:0.9.8.2-1 - Update to 0.9.8.2 release From 3fc0e920a96e19a44e1ea1338dd35ccf5fd2c208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 26 Jul 2013 10:07:55 +0200 Subject: [PATCH 068/129] Fix Obsoletes to ensure NetworkManager-openvpn-gnome installs on update (rh #988131) --- NetworkManager-openvpn.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index d9895a6..cb15175 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.8.2 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -24,7 +24,7 @@ Requires: NetworkManager Requires: openvpn Requires: shared-mime-info Requires: libgnome-keyring -Obsoletes: NetworkManager-openvpn < 0.9.8.2-2 +Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %global _privatelibs libnm-openvpn-properties[.]so.* %global __provides_exclude ^(%{_privatelibs})$ @@ -44,7 +44,7 @@ Requires: nm-connection-editor %else Requires: NetworkManager-gnome %endif -Obsoletes: NetworkManager-openvpn < 0.9.8.2-2 +Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %description -n NetworkManager-openvpn-gnome This package contains software for integrating VPN capabilities with @@ -85,6 +85,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Fri Jul 26 2013 Jiří Klimeš - 1:0.9.8.2-3 +- Fixing Obsoletes to ensure NetworkManager-openvpn-gnome installs on update (rh #988131) + * Wed Jul 17 2013 Stef Walter - 1:0.9.8.2-2 - Depend on libgnome-keyring (the client library), not gnome-keyring (daemon) (rh #811931) From 1f2868d75e4e70c390d6967afdc5ea162e180465 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 17:59:34 -0500 Subject: [PATCH 069/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index d6f5c69..3029982 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.6.0 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -86,6 +86,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Fri Aug 02 2013 Fedora Release Engineering - 1:0.9.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1:0.9.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0bfa843f3263626b52363aa0909affbc6eccc737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 7 Jan 2014 15:22:53 +0100 Subject: [PATCH 070/129] properties: fix an endless loop when selecting PKCS12 file (rh #997255) --- NetworkManager-openvpn.spec | 8 ++- rh997255-fix-pkcs12-endless-loop.patch | 82 ++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 rh997255-fix-pkcs12-endless-loop.patch diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index cb15175..4856f8d 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,11 +4,12 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.8.2 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.bz2 +Patch1: rh997255-fix-pkcs12-endless-loop.patch BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -53,6 +54,8 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b .rh997255-fix-endless-loop + %build if [ ! -f configure ]; then ./autogen.sh @@ -85,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Tue Jan 7 2014 Jiří Klimeš - 1:0.9.8.2-4 +- properties: fix an endless loop when selecting PKCS12 file (rh #997255) + * Fri Jul 26 2013 Jiří Klimeš - 1:0.9.8.2-3 - Fixing Obsoletes to ensure NetworkManager-openvpn-gnome installs on update (rh #988131) diff --git a/rh997255-fix-pkcs12-endless-loop.patch b/rh997255-fix-pkcs12-endless-loop.patch new file mode 100644 index 0000000..ff92feb --- /dev/null +++ b/rh997255-fix-pkcs12-endless-loop.patch @@ -0,0 +1,82 @@ +From 522190ad916b301919535208193b9d69db0f5f8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= +Date: Tue, 7 Jan 2014 14:50:57 +0100 +Subject: [PATCH] properties: fix an endless loop when selecting PKCS12 file + (rh #997255) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + +Signed-off-by: Jiří Klimeš +--- + properties/auth-helpers.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c +index d0c8844..2dcb2ea 100644 +--- a/properties/auth-helpers.c ++++ b/properties/auth-helpers.c +@@ -46,6 +46,8 @@ + #define PW_TYPE_ASK 1 + #define PW_TYPE_UNUSED 2 + ++#define BLOCK_HANDLER_ID "block-handler-id" ++ + static void + show_password (GtkToggleButton *togglebutton, GtkEntry *password_entry) + { +@@ -105,7 +107,10 @@ tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) + next_fname = gtk_file_chooser_get_filename (next); + if (!next_fname || strcmp (fname, next_fname)) { + /* Next chooser was different, make it the same as the first */ ++ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); ++ g_signal_handler_block (G_OBJECT (next_widget), id); + gtk_file_chooser_set_filename (next, fname); ++ g_signal_handler_unblock (G_OBJECT (next_widget), id); + } + g_free (fname); + g_free (next_fname); +@@ -117,8 +122,12 @@ tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) + * file selectors that have PKCS#12 files in them. + */ + next_fname = gtk_file_chooser_get_filename (next); +- if (is_pkcs12 (next_fname)) ++ if (is_pkcs12 (next_fname)) { ++ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); ++ g_signal_handler_block (G_OBJECT (next_widget), id); + gtk_file_chooser_set_filename (next, NULL); ++ g_signal_handler_unblock (G_OBJECT (next_widget), id); ++ } + g_free (next_fname); + } + +@@ -135,6 +144,7 @@ tls_setup (GtkBuilder *builder, + const char *value; + char *tmp; + GtkFileFilter *filter; ++ gulong id1, id2, id3; + + tmp = g_strdup_printf ("%s_user_cert_chooser", prefix); + cert = GTK_WIDGET (gtk_builder_get_object (builder, tmp)); +@@ -173,9 +183,14 @@ tls_setup (GtkBuilder *builder, + } + + /* Link choosers to the PKCS#12 changer callback */ +- g_signal_connect (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), cert); +- g_signal_connect (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), key); +- g_signal_connect (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ca_chooser); ++ id1 = g_signal_connect (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), cert); ++ id2 = g_signal_connect (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), key); ++ id3 = g_signal_connect (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ca_chooser); ++ ++ /* Store handler id to be able to block the signal in tls_cert_changed_cb() */ ++ g_object_set_data (ca_chooser, BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id1)); ++ g_object_set_data (cert, BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id2)); ++ g_object_set_data (key, BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id3)); + + /* Fill in the private key password */ + tmp = g_strdup_printf ("%s_private_key_password_entry", prefix); +-- +1.7.11.7 + From 14a0d58b7df05dbaaefa54bb80efe1a1aa4c6822 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 28 Jan 2014 12:39:50 -0600 Subject: [PATCH 071/129] Update snapshot with IPv6 support --- .gitignore | 1 + NetworkManager-openvpn.spec | 21 ++++--- rh997255-fix-pkcs12-endless-loop.patch | 82 -------------------------- sources | 2 +- 4 files changed, 16 insertions(+), 90 deletions(-) delete mode 100644 rh997255-fix-pkcs12-endless-loop.patch diff --git a/.gitignore b/.gitignore index f563bff..f7a81f1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.3.995.git20120302.tar.bz2 /NetworkManager-openvpn-0.9.3.997.tar.bz2 /NetworkManager-openvpn-0.9.8.2.tar.bz2 +/NetworkManager-openvpn-0.9.9.0.git20140128.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 4856f8d..2879159 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,15 +1,14 @@ -%global snapshot %{nil} +%global snapshot .git20140128 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.9.8.2 -Release: 4%{snapshot}%{?dist} +Version: 0.9.9.0 +Release: 0.1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.bz2 -Patch1: rh997255-fix-pkcs12-endless-loop.patch BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -18,6 +17,8 @@ BuildRequires: NetworkManager-glib-devel BuildRequires: glib2-devel BuildRequires: libtool intltool gettext BuildRequires: libgnome-keyring-devel +BuildRequires: libnm-gtk-devel >= 0.9.9.0 +BuildRequires: libsecret-devel Requires: gtk3 Requires: dbus @@ -54,13 +55,15 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .rh997255-fix-endless-loop - %build if [ ! -f configure ]; then ./autogen.sh fi -%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3 +%configure \ + --disable-static \ + --disable-dependency-tracking \ + --enable-more-warnings=yes \ + --with-gnome make %{?_smp_mflags} %check @@ -88,6 +91,10 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Tue Jan 28 2014 Dan Williams - 1:0.9.9.0-0.1 +- core: add support for IPv6 inside tunnels (rh #1033868) +- auth: add support for interactive mode + * Tue Jan 7 2014 Jiří Klimeš - 1:0.9.8.2-4 - properties: fix an endless loop when selecting PKCS12 file (rh #997255) diff --git a/rh997255-fix-pkcs12-endless-loop.patch b/rh997255-fix-pkcs12-endless-loop.patch deleted file mode 100644 index ff92feb..0000000 --- a/rh997255-fix-pkcs12-endless-loop.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 522190ad916b301919535208193b9d69db0f5f8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= -Date: Tue, 7 Jan 2014 14:50:57 +0100 -Subject: [PATCH] properties: fix an endless loop when selecting PKCS12 file - (rh #997255) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - -Signed-off-by: Jiří Klimeš ---- - properties/auth-helpers.c | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index d0c8844..2dcb2ea 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -46,6 +46,8 @@ - #define PW_TYPE_ASK 1 - #define PW_TYPE_UNUSED 2 - -+#define BLOCK_HANDLER_ID "block-handler-id" -+ - static void - show_password (GtkToggleButton *togglebutton, GtkEntry *password_entry) - { -@@ -105,7 +107,10 @@ tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) - next_fname = gtk_file_chooser_get_filename (next); - if (!next_fname || strcmp (fname, next_fname)) { - /* Next chooser was different, make it the same as the first */ -+ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); -+ g_signal_handler_block (G_OBJECT (next_widget), id); - gtk_file_chooser_set_filename (next, fname); -+ g_signal_handler_unblock (G_OBJECT (next_widget), id); - } - g_free (fname); - g_free (next_fname); -@@ -117,8 +122,12 @@ tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) - * file selectors that have PKCS#12 files in them. - */ - next_fname = gtk_file_chooser_get_filename (next); -- if (is_pkcs12 (next_fname)) -+ if (is_pkcs12 (next_fname)) { -+ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); -+ g_signal_handler_block (G_OBJECT (next_widget), id); - gtk_file_chooser_set_filename (next, NULL); -+ g_signal_handler_unblock (G_OBJECT (next_widget), id); -+ } - g_free (next_fname); - } - -@@ -135,6 +144,7 @@ tls_setup (GtkBuilder *builder, - const char *value; - char *tmp; - GtkFileFilter *filter; -+ gulong id1, id2, id3; - - tmp = g_strdup_printf ("%s_user_cert_chooser", prefix); - cert = GTK_WIDGET (gtk_builder_get_object (builder, tmp)); -@@ -173,9 +183,14 @@ tls_setup (GtkBuilder *builder, - } - - /* Link choosers to the PKCS#12 changer callback */ -- g_signal_connect (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), cert); -- g_signal_connect (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), key); -- g_signal_connect (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ca_chooser); -+ id1 = g_signal_connect (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), cert); -+ id2 = g_signal_connect (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), key); -+ id3 = g_signal_connect (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ca_chooser); -+ -+ /* Store handler id to be able to block the signal in tls_cert_changed_cb() */ -+ g_object_set_data (ca_chooser, BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id1)); -+ g_object_set_data (cert, BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id2)); -+ g_object_set_data (key, BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id3)); - - /* Fill in the private key password */ - tmp = g_strdup_printf ("%s_private_key_password_entry", prefix); --- -1.7.11.7 - diff --git a/sources b/sources index 5b60b42..15cb598 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2073ef7ee98032dc777c7fbda7f8e2ad NetworkManager-openvpn-0.9.8.2.tar.bz2 +d2a818ba041cdf28676024615549dbc2 NetworkManager-openvpn-0.9.9.0.git20140128.tar.bz2 From d326db24b69e4b22f8df86d068a4a84cbd578a4b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 17:54:16 -0500 Subject: [PATCH 072/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 2879159..ae0c30e 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.9.0 -Release: 0.1%{snapshot}%{?dist} +Release: 0.2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -91,6 +91,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 1:0.9.9.0-0.2.git20140128 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Jan 28 2014 Dan Williams - 1:0.9.9.0-0.1 - core: add support for IPv6 inside tunnels (rh #1033868) - auth: add support for interactive mode From 2cfae89321661beedf621d2dbea573eb20029af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 24 Jul 2014 10:04:51 +0200 Subject: [PATCH 073/129] ui: correct selection of certificates in relation to p12/non-p12 files (cherry picked from commit 7a131d84a2faf4a939fe8d6cce1c6b40a27eacb9) --- NetworkManager-openvpn.spec | 9 +- fix-gui-certs-selection.patch | 160 ++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 fix-gui-certs-selection.patch diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ae0c30e..27faa8d 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,12 +4,14 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.9.0 -Release: 0.2%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.bz2 +Patch1: fix-gui-certs-selection.patch + BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: NetworkManager-devel @@ -55,6 +57,8 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b .fix-gui-certs-selection.orig + %build if [ ! -f configure ]; then ./autogen.sh @@ -91,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Thu Jul 24 2014 Jiří Klimeš - 1:0.9.9.0-2 +- ui: correct selection of certificates in relation to p12/non-p12 files + * Fri Jun 06 2014 Fedora Release Engineering - 1:0.9.9.0-0.2.git20140128 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/fix-gui-certs-selection.patch b/fix-gui-certs-selection.patch new file mode 100644 index 0000000..3a97180 --- /dev/null +++ b/fix-gui-certs-selection.patch @@ -0,0 +1,160 @@ +From 62bf1c8875908d8550238009775eb31de4e4ebdc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= +Date: Wed, 23 Jul 2014 11:38:09 +0200 +Subject: [PATCH] auth-helpers: correct the selection of certificates +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The commit 522190ad916b301919535208193b9d69db0f5f8e fixed an endless loop. But +it didn't make the PKCS#12 vs. non-PKCS#12 file selection right. This commit +makes sure that either all or none of the certificates are in PKCS#12 format, +as it is required. + +Note: +The bug mentioned in the commit 522190ad (rh #997255) might not be the cause +of the endless loop problem. But rather it is a defect in Gtk: +https://bugzilla.redhat.com/show_bug.cgi?id=1091837 + +Signed-off-by: Jiří Klimeš +--- + properties/auth-helpers.c | 92 ++++++++++++++++++++++++++++++++--------------- + 1 file changed, 63 insertions(+), 29 deletions(-) + +diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c +index becfee3..4a29dbb 100644 +--- a/properties/auth-helpers.c ++++ b/properties/auth-helpers.c +@@ -84,11 +84,25 @@ setup_secret_widget (GtkBuilder *builder, + return widget; + } + ++typedef struct { ++ GtkWidget *widget1; ++ GtkWidget *widget2; ++} TlsChooserSignalData; ++ + static void +-tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) ++tls_chooser_signal_data_destroy (gpointer data, GClosure *closure) + { +- GtkFileChooser *this, *next; +- char *fname, *next_fname; ++ g_slice_free (TlsChooserSignalData, data); ++} ++ ++static void ++tls_cert_changed_cb (GtkWidget *widget, gpointer data) ++{ ++ GtkWidget *other_widgets[2] = { ((TlsChooserSignalData *) data)->widget1, ++ ((TlsChooserSignalData *) data)->widget2 }; ++ GtkFileChooser *this, *others[2]; ++ char *fname, *other_fnames[2]; ++ int i; + + /* If the just-changed file chooser is a PKCS#12 file, then all of the + * TLS filechoosers have to be PKCS#12. But if it just changed to something +@@ -100,36 +114,42 @@ tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) + */ + + this = GTK_FILE_CHOOSER (widget); +- next = GTK_FILE_CHOOSER (next_widget); ++ others[0] = GTK_FILE_CHOOSER (other_widgets[0]); ++ others[1] = GTK_FILE_CHOOSER (other_widgets[1]); + + fname = gtk_file_chooser_get_filename (this); ++ other_fnames[0] = gtk_file_chooser_get_filename (others[0]); ++ other_fnames[1] = gtk_file_chooser_get_filename (others[1]); ++ + if (is_pkcs12 (fname)) { + /* Make sure all choosers have this PKCS#12 file */ +- next_fname = gtk_file_chooser_get_filename (next); +- if (!next_fname || strcmp (fname, next_fname)) { +- /* Next chooser was different, make it the same as the first */ +- gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); +- g_signal_handler_block (G_OBJECT (next_widget), id); +- gtk_file_chooser_set_filename (next, fname); +- g_signal_handler_unblock (G_OBJECT (next_widget), id); ++ for (i = 0; i < 2; i++) { ++ if (!other_fnames[i] || strcmp (fname, other_fnames[i])) { ++ /* Next chooser was different, make it the same as the first */ ++ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (other_widgets[i]), ++ BLOCK_HANDLER_ID)); ++ g_signal_handler_block (other_widgets[i], id); ++ gtk_file_chooser_set_filename (others[i], fname); ++ g_signal_handler_unblock (other_widgets[i], id); ++ } ++ } ++ } else { ++ /* Just-chosen file isn't PKCS#12 or no file was chosen, so clear out other ++ * file selectors that have PKCS#12 files in them. ++ */ ++ for (i = 0; i < 2; i++) { ++ if (is_pkcs12 (other_fnames[i])) { ++ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (other_widgets[i]), ++ BLOCK_HANDLER_ID)); ++ g_signal_handler_block (other_widgets[i], id); ++ gtk_file_chooser_unselect_all (others[i]); ++ g_signal_handler_unblock (other_widgets[i], id); ++ } + } +- g_free (fname); +- g_free (next_fname); +- return; + } + g_free (fname); +- +- /* Just-chosen file isn't PKCS#12 or no file was chosen, so clear out other +- * file selectors that have PKCS#12 files in them. +- */ +- next_fname = gtk_file_chooser_get_filename (next); +- if (is_pkcs12 (next_fname)) { +- gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); +- g_signal_handler_block (G_OBJECT (next_widget), id); +- gtk_file_chooser_set_filename (next, NULL); +- g_signal_handler_unblock (G_OBJECT (next_widget), id); +- } +- g_free (next_fname); ++ g_free (other_fnames[0]); ++ g_free (other_fnames[1]); + } + + static void +@@ -145,6 +165,7 @@ tls_setup (GtkBuilder *builder, + const char *value; + char *tmp; + GtkFileFilter *filter; ++ TlsChooserSignalData *ca_chooser_data, *cert_data, *key_data; + gulong id1, id2, id3; + + tmp = g_strdup_printf ("%s_user_cert_chooser", prefix); +@@ -183,10 +204,23 @@ tls_setup (GtkBuilder *builder, + gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (key), value); + } + ++ ca_chooser_data = g_slice_new0 (TlsChooserSignalData); ++ ca_chooser_data->widget1 = cert; ++ ca_chooser_data->widget2 = key; ++ cert_data = g_slice_new0 (TlsChooserSignalData); ++ cert_data->widget1 = ca_chooser; ++ cert_data->widget2 = key; ++ key_data = g_slice_new0 (TlsChooserSignalData); ++ key_data->widget1 = ca_chooser; ++ key_data->widget2 = cert; ++ + /* Link choosers to the PKCS#12 changer callback */ +- id1 = g_signal_connect (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), cert); +- id2 = g_signal_connect (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), key); +- id3 = g_signal_connect (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ca_chooser); ++ id1 = g_signal_connect_data (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ++ ca_chooser_data, tls_chooser_signal_data_destroy, 0); ++ id2 = g_signal_connect_data (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ++ cert_data, tls_chooser_signal_data_destroy, 0); ++ id3 = g_signal_connect_data (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ++ key_data, tls_chooser_signal_data_destroy, 0); + + /* Store handler id to be able to block the signal in tls_cert_changed_cb() */ + g_object_set_data (G_OBJECT (ca_chooser), BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id1)); +-- +1.7.11.7 + From b23e2ff437370659d4dc67de0d83bf3b31915c0e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 18:51:29 +0000 Subject: [PATCH 074/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ae0c30e..04fa13e 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.9.0 -Release: 0.2%{snapshot}%{?dist} +Release: 0.3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -91,6 +91,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1:0.9.9.0-0.3.git20140128 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 1:0.9.9.0-0.2.git20140128 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d120416f828e955b67f2c60afdcb410502317de5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 18:51:42 +0000 Subject: [PATCH 075/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 27faa8d..50f12f1 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.9.0 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -95,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1:0.9.9.0-3.git20140128 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jul 24 2014 Jiří Klimeš - 1:0.9.9.0-2 - ui: correct selection of certificates in relation to p12/non-p12 files From 9ba414d3977887bc65804d4a7f86b29a652e243d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 11 Nov 2014 17:17:24 +0100 Subject: [PATCH 076/129] Update to a later snapshot - Try to align with Fedora guidelines on snapshot versions --- .gitignore | 1 + NetworkManager-openvpn.spec | 21 +++-- fix-gui-certs-selection.patch | 160 ---------------------------------- sources | 2 +- 4 files changed, 16 insertions(+), 168 deletions(-) delete mode 100644 fix-gui-certs-selection.patch diff --git a/.gitignore b/.gitignore index f7a81f1..8e5f03e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.3.997.tar.bz2 /NetworkManager-openvpn-0.9.8.2.tar.bz2 /NetworkManager-openvpn-0.9.9.0.git20140128.tar.bz2 +/NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 50f12f1..a77cf5d 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,16 +1,21 @@ -%global snapshot .git20140128 +%global commit 5afb8eb +%global snapshot .20141110git%{commit} + Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.9.9.0 -Release: 3%{snapshot}%{?dist} +Release: 3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.bz2 - -Patch1: fix-gui-certs-selection.patch +# git clone git://git.gnome.org/network-manager-openvpn +# cd network-manager-openvpn +# ./autogen.sh +# make dist +# mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{?commit:-%{commit}}.tar.bz2 BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -57,8 +62,6 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .fix-gui-certs-selection.orig - %build if [ ! -f configure ]; then ./autogen.sh @@ -95,6 +98,10 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Tue Nov 11 2014 Lubomir Rintel - 1:0.9.9.0-3.20141110git5afb8eb +- Update to a later snapshot +- Try to align with Fedora guidelines on snapshot versions + * Fri Aug 15 2014 Fedora Release Engineering - 1:0.9.9.0-3.git20140128 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/fix-gui-certs-selection.patch b/fix-gui-certs-selection.patch deleted file mode 100644 index 3a97180..0000000 --- a/fix-gui-certs-selection.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 62bf1c8875908d8550238009775eb31de4e4ebdc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= -Date: Wed, 23 Jul 2014 11:38:09 +0200 -Subject: [PATCH] auth-helpers: correct the selection of certificates -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The commit 522190ad916b301919535208193b9d69db0f5f8e fixed an endless loop. But -it didn't make the PKCS#12 vs. non-PKCS#12 file selection right. This commit -makes sure that either all or none of the certificates are in PKCS#12 format, -as it is required. - -Note: -The bug mentioned in the commit 522190ad (rh #997255) might not be the cause -of the endless loop problem. But rather it is a defect in Gtk: -https://bugzilla.redhat.com/show_bug.cgi?id=1091837 - -Signed-off-by: Jiří Klimeš ---- - properties/auth-helpers.c | 92 ++++++++++++++++++++++++++++++++--------------- - 1 file changed, 63 insertions(+), 29 deletions(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index becfee3..4a29dbb 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -84,11 +84,25 @@ setup_secret_widget (GtkBuilder *builder, - return widget; - } - -+typedef struct { -+ GtkWidget *widget1; -+ GtkWidget *widget2; -+} TlsChooserSignalData; -+ - static void --tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) -+tls_chooser_signal_data_destroy (gpointer data, GClosure *closure) - { -- GtkFileChooser *this, *next; -- char *fname, *next_fname; -+ g_slice_free (TlsChooserSignalData, data); -+} -+ -+static void -+tls_cert_changed_cb (GtkWidget *widget, gpointer data) -+{ -+ GtkWidget *other_widgets[2] = { ((TlsChooserSignalData *) data)->widget1, -+ ((TlsChooserSignalData *) data)->widget2 }; -+ GtkFileChooser *this, *others[2]; -+ char *fname, *other_fnames[2]; -+ int i; - - /* If the just-changed file chooser is a PKCS#12 file, then all of the - * TLS filechoosers have to be PKCS#12. But if it just changed to something -@@ -100,36 +114,42 @@ tls_cert_changed_cb (GtkWidget *widget, GtkWidget *next_widget) - */ - - this = GTK_FILE_CHOOSER (widget); -- next = GTK_FILE_CHOOSER (next_widget); -+ others[0] = GTK_FILE_CHOOSER (other_widgets[0]); -+ others[1] = GTK_FILE_CHOOSER (other_widgets[1]); - - fname = gtk_file_chooser_get_filename (this); -+ other_fnames[0] = gtk_file_chooser_get_filename (others[0]); -+ other_fnames[1] = gtk_file_chooser_get_filename (others[1]); -+ - if (is_pkcs12 (fname)) { - /* Make sure all choosers have this PKCS#12 file */ -- next_fname = gtk_file_chooser_get_filename (next); -- if (!next_fname || strcmp (fname, next_fname)) { -- /* Next chooser was different, make it the same as the first */ -- gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); -- g_signal_handler_block (G_OBJECT (next_widget), id); -- gtk_file_chooser_set_filename (next, fname); -- g_signal_handler_unblock (G_OBJECT (next_widget), id); -+ for (i = 0; i < 2; i++) { -+ if (!other_fnames[i] || strcmp (fname, other_fnames[i])) { -+ /* Next chooser was different, make it the same as the first */ -+ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (other_widgets[i]), -+ BLOCK_HANDLER_ID)); -+ g_signal_handler_block (other_widgets[i], id); -+ gtk_file_chooser_set_filename (others[i], fname); -+ g_signal_handler_unblock (other_widgets[i], id); -+ } -+ } -+ } else { -+ /* Just-chosen file isn't PKCS#12 or no file was chosen, so clear out other -+ * file selectors that have PKCS#12 files in them. -+ */ -+ for (i = 0; i < 2; i++) { -+ if (is_pkcs12 (other_fnames[i])) { -+ gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (other_widgets[i]), -+ BLOCK_HANDLER_ID)); -+ g_signal_handler_block (other_widgets[i], id); -+ gtk_file_chooser_unselect_all (others[i]); -+ g_signal_handler_unblock (other_widgets[i], id); -+ } - } -- g_free (fname); -- g_free (next_fname); -- return; - } - g_free (fname); -- -- /* Just-chosen file isn't PKCS#12 or no file was chosen, so clear out other -- * file selectors that have PKCS#12 files in them. -- */ -- next_fname = gtk_file_chooser_get_filename (next); -- if (is_pkcs12 (next_fname)) { -- gulong id = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (next_widget), BLOCK_HANDLER_ID)); -- g_signal_handler_block (G_OBJECT (next_widget), id); -- gtk_file_chooser_set_filename (next, NULL); -- g_signal_handler_unblock (G_OBJECT (next_widget), id); -- } -- g_free (next_fname); -+ g_free (other_fnames[0]); -+ g_free (other_fnames[1]); - } - - static void -@@ -145,6 +165,7 @@ tls_setup (GtkBuilder *builder, - const char *value; - char *tmp; - GtkFileFilter *filter; -+ TlsChooserSignalData *ca_chooser_data, *cert_data, *key_data; - gulong id1, id2, id3; - - tmp = g_strdup_printf ("%s_user_cert_chooser", prefix); -@@ -183,10 +204,23 @@ tls_setup (GtkBuilder *builder, - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (key), value); - } - -+ ca_chooser_data = g_slice_new0 (TlsChooserSignalData); -+ ca_chooser_data->widget1 = cert; -+ ca_chooser_data->widget2 = key; -+ cert_data = g_slice_new0 (TlsChooserSignalData); -+ cert_data->widget1 = ca_chooser; -+ cert_data->widget2 = key; -+ key_data = g_slice_new0 (TlsChooserSignalData); -+ key_data->widget1 = ca_chooser; -+ key_data->widget2 = cert; -+ - /* Link choosers to the PKCS#12 changer callback */ -- id1 = g_signal_connect (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), cert); -- id2 = g_signal_connect (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), key); -- id3 = g_signal_connect (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), ca_chooser); -+ id1 = g_signal_connect_data (ca_chooser, "selection-changed", G_CALLBACK (tls_cert_changed_cb), -+ ca_chooser_data, tls_chooser_signal_data_destroy, 0); -+ id2 = g_signal_connect_data (cert, "selection-changed", G_CALLBACK (tls_cert_changed_cb), -+ cert_data, tls_chooser_signal_data_destroy, 0); -+ id3 = g_signal_connect_data (key, "selection-changed", G_CALLBACK (tls_cert_changed_cb), -+ key_data, tls_chooser_signal_data_destroy, 0); - - /* Store handler id to be able to block the signal in tls_cert_changed_cb() */ - g_object_set_data (G_OBJECT (ca_chooser), BLOCK_HANDLER_ID, GSIZE_TO_POINTER (id1)); --- -1.7.11.7 - diff --git a/sources b/sources index 15cb598..aa5e284 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2a818ba041cdf28676024615549dbc2 NetworkManager-openvpn-0.9.9.0.git20140128.tar.bz2 +78a56af41dbbe44b774e606482b74afe NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 From 1ca1127f2b41155c84c40dbe4576dd624099130b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 11 Nov 2014 17:17:42 +0100 Subject: [PATCH 077/129] Fix whitespace Makes rpmlint happy. --- NetworkManager-openvpn.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a77cf5d..4d4c71a 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -67,10 +67,10 @@ if [ ! -f configure ]; then ./autogen.sh fi %configure \ - --disable-static \ - --disable-dependency-tracking \ - --enable-more-warnings=yes \ - --with-gnome + --disable-static \ + --disable-dependency-tracking \ + --enable-more-warnings=yes \ + --with-gnome make %{?_smp_mflags} %check From ce28232d9c9dcd761070bbe30e7ab2de97a00877 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 11 Nov 2014 17:40:17 +0100 Subject: [PATCH 078/129] Update tarball with a complete one --- .gitignore | 1 + NetworkManager-openvpn.spec | 3 +-- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8e5f03e..d060f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.8.2.tar.bz2 /NetworkManager-openvpn-0.9.9.0.git20140128.tar.bz2 /NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 +/NetworkManager-openvpn-0.9.9.0-da5fb9b.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 4d4c71a..0ada3c4 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,7 +1,6 @@ -%global commit 5afb8eb +%global commit da5fb9b %global snapshot .20141110git%{commit} - Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 diff --git a/sources b/sources index aa5e284..98174bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78a56af41dbbe44b774e606482b74afe NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 +6301b295e2a160dd14c54f1f2bd57214 NetworkManager-openvpn-0.9.9.0-da5fb9b.tar.bz2 From 3dc0d43954b8b40c8ec2ffa2b874177fc0d04239 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 22 Dec 2014 13:47:44 -0600 Subject: [PATCH 079/129] Update to 1.0 --- .gitignore | 1 + NetworkManager-openvpn.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d060f7c..6d13e0f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.9.0.git20140128.tar.bz2 /NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 /NetworkManager-openvpn-0.9.9.0-da5fb9b.tar.bz2 +/NetworkManager-openvpn-1.0.0.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0ada3c4..adcce2c 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,11 +1,11 @@ -%global commit da5fb9b -%global snapshot .20141110git%{commit} +%global commit %{nil} +%global snapshot %{nil}%{commit} Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 0.9.9.0 -Release: 3%{?snapshot}%{?dist} +Version: 1.0.0 +Release: 1%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -14,7 +14,7 @@ Group: System Environment/Base # ./autogen.sh # make dist # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{?commit:-%{commit}}.tar.bz2 +Source0: %{name}-%{version}%{?commit:%{commit}}.tar.xz BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Mon Dec 22 2014 Dan Williams - 1:1.0.0-1 +- Update to 1.0 + * Tue Nov 11 2014 Lubomir Rintel - 1:0.9.9.0-3.20141110git5afb8eb - Update to a later snapshot - Try to align with Fedora guidelines on snapshot versions diff --git a/sources b/sources index 98174bc..8574823 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6301b295e2a160dd14c54f1f2bd57214 NetworkManager-openvpn-0.9.9.0-da5fb9b.tar.bz2 +1ed64b76a363dd1c7999eafcecef0e14 NetworkManager-openvpn-1.0.0.tar.xz From 44fd631bdedd5f3473d8708f5b9cc5deeac8746f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 22 Dec 2014 14:43:22 -0600 Subject: [PATCH 080/129] Remove obsolete gnome-keyring requirements Replaced by libsecret. --- NetworkManager-openvpn.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index adcce2c..66940c9 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -22,7 +22,6 @@ BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel BuildRequires: glib2-devel BuildRequires: libtool intltool gettext -BuildRequires: libgnome-keyring-devel BuildRequires: libnm-gtk-devel >= 0.9.9.0 BuildRequires: libsecret-devel @@ -31,7 +30,6 @@ Requires: dbus Requires: NetworkManager Requires: openvpn Requires: shared-mime-info -Requires: libgnome-keyring Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %global _privatelibs libnm-openvpn-properties[.]so.* From 0b30c4423e5f154a1520070190af9fa7aeb0eabd Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 23 Feb 2015 10:40:39 +0100 Subject: [PATCH 081/129] Fix Source url --- NetworkManager-openvpn.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 66940c9..df84c19 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,11 +1,11 @@ -%global commit %{nil} -%global snapshot %{nil}%{commit} +#global commit %{nil} +#global snapshot %{nil}%{commit} Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.0.0 -Release: 1%{?snapshot}%{?dist} +Release: 2%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -14,7 +14,7 @@ Group: System Environment/Base # ./autogen.sh # make dist # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 -Source0: %{name}-%{version}%{?commit:%{commit}}.tar.xz +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -95,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Mon Feb 23 2015 Lubomir Rintel - 1:1.0.0-2 +- Fix Source url + * Mon Dec 22 2014 Dan Williams - 1:1.0.0-1 - Update to 1.0 From 1e586a25927256352e85eb17c983ed4ca20573a5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 8 Apr 2015 10:08:12 -0500 Subject: [PATCH 082/129] Default client renegotiation interval to zero (rh #969433) --- ...lt-renegotiation-interval-of-zero-rh.patch | 42 +++++++++++++++++++ NetworkManager-openvpn.spec | 8 +++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch diff --git a/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch b/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch new file mode 100644 index 0000000..2ea57b3 --- /dev/null +++ b/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch @@ -0,0 +1,42 @@ +From 81149fd01897166cee5649d2da3801f2a5a45b5c Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Wed, 8 Apr 2015 09:37:56 -0500 +Subject: [PATCH] core: use a default renegotiation interval of zero (rh + #969433) + +Since the client and server do not negotiate options, each side gets +to specify its own --reneg-sec to control when each side renegotiates. +OpenVPN defaults to 3600, so if the client and server don't agree this +causes too-frequent renegotiations. + +This is worse with two-factor authentication, becuase it can mean that +the client requests a password/PIN from the user much more often then +the server actually wants. + +https://bugzilla.redhat.com/show_bug.cgi?id=969433 +--- + src/nm-openvpn-service.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c +index 8282573..93ced6c 100644 +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -1115,6 +1115,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + free_openvpn_args (args); + return FALSE; + } ++ } else { ++ /* Either the server and client must agree on the renegotiation ++ * interval, or it should be disabled on one side to prevent ++ * too-frequent renegotiations, which make two-factor auth quite ++ * painful. ++ */ ++ add_openvpn_arg (args, "--reneg-sec"); ++ add_openvpn_arg (args, "0"); + } + + if (debug) { +-- +2.1.0 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index df84c19..88687d4 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.0.0 -Release: 2%{?snapshot}%{?dist} +Release: 3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -16,6 +16,8 @@ Group: System Environment/Base # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz +Patch0: 0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch + BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: NetworkManager-devel @@ -58,6 +60,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build if [ ! -f configure ]; then @@ -95,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Wed Apr 8 2015 Dan Williams - 1:1.0.0-3 +- Default client renegotiation interval to zero (rh #969433) + * Mon Feb 23 2015 Lubomir Rintel - 1:1.0.0-2 - Fix Source url From 1cbade2886c3267e4164ed5e53a3fbdd3ad8fdee Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 8 Apr 2015 10:09:13 -0500 Subject: [PATCH 083/129] Default client renegotiation interval to zero (rh #969433) --- ...lt-renegotiation-interval-of-zero-rh.patch | 42 +++++++++++++++++++ NetworkManager-openvpn.spec | 8 +++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch diff --git a/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch b/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch new file mode 100644 index 0000000..2ea57b3 --- /dev/null +++ b/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch @@ -0,0 +1,42 @@ +From 81149fd01897166cee5649d2da3801f2a5a45b5c Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Wed, 8 Apr 2015 09:37:56 -0500 +Subject: [PATCH] core: use a default renegotiation interval of zero (rh + #969433) + +Since the client and server do not negotiate options, each side gets +to specify its own --reneg-sec to control when each side renegotiates. +OpenVPN defaults to 3600, so if the client and server don't agree this +causes too-frequent renegotiations. + +This is worse with two-factor authentication, becuase it can mean that +the client requests a password/PIN from the user much more often then +the server actually wants. + +https://bugzilla.redhat.com/show_bug.cgi?id=969433 +--- + src/nm-openvpn-service.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c +index 8282573..93ced6c 100644 +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -1115,6 +1115,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + free_openvpn_args (args); + return FALSE; + } ++ } else { ++ /* Either the server and client must agree on the renegotiation ++ * interval, or it should be disabled on one side to prevent ++ * too-frequent renegotiations, which make two-factor auth quite ++ * painful. ++ */ ++ add_openvpn_arg (args, "--reneg-sec"); ++ add_openvpn_arg (args, "0"); + } + + if (debug) { +-- +2.1.0 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index df84c19..88687d4 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.0.0 -Release: 2%{?snapshot}%{?dist} +Release: 3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -16,6 +16,8 @@ Group: System Environment/Base # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz +Patch0: 0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch + BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: NetworkManager-devel @@ -58,6 +60,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build if [ ! -f configure ]; then @@ -95,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Wed Apr 8 2015 Dan Williams - 1:1.0.0-3 +- Default client renegotiation interval to zero (rh #969433) + * Mon Feb 23 2015 Lubomir Rintel - 1:1.0.0-2 - Fix Source url From 9f7650ebd5febac88114da5f6e847cb6b8a731ba Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 8 Apr 2015 10:19:56 -0500 Subject: [PATCH 084/129] Fix max allowed NM version --- NetworkManager-openvpn.spec | 2 ++ nm-max-allowed.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 nm-max-allowed.patch diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 88687d4..4982453 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -17,6 +17,7 @@ Group: System Environment/Base Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz Patch0: 0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch +Patch1: nm-max-allowed.patch BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -61,6 +62,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build if [ ! -f configure ]; then diff --git a/nm-max-allowed.patch b/nm-max-allowed.patch new file mode 100644 index 0000000..efd66cc --- /dev/null +++ b/nm-max-allowed.patch @@ -0,0 +1,12 @@ +diff -up NetworkManager-openvpn-1.0.0/configure.ac.foo NetworkManager-openvpn-1.0.0/configure.ac +--- NetworkManager-openvpn-1.0.0/configure.ac.foo 2015-04-08 10:18:31.993032447 -0500 ++++ NetworkManager-openvpn-1.0.0/configure.ac 2015-04-08 10:18:49.078818846 -0500 +@@ -71,7 +71,7 @@ PKG_CHECK_MODULES(NM, + libnm-util >= 0.9.10 + libnm-glib >= 0.9.10 + libnm-glib-vpn >= 0.9.10) +-NM_CFLAGS="$NM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10" ++NM_CFLAGS="$NM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_0_99" + AC_SUBST(NM_CFLAGS) + AC_SUBST(NM_LIBS) + From 036980b0f30f8f3c9d9884f0741c4e4012dc4779 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 8 Apr 2015 12:15:57 -0500 Subject: [PATCH 085/129] Autoreconf to ensure nm-max-allowed.patch gets picked up --- NetworkManager-openvpn.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 4982453..be63f0d 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -68,6 +68,7 @@ the OpenVPN server with NetworkManager (GNOME files). if [ ! -f configure ]; then ./autogen.sh fi +autoreconf -i %configure \ --disable-static \ --disable-dependency-tracking \ From 4ac86f4a127e86b03d3e172ec7384953f52fd7ca Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 5 May 2015 14:45:45 +0200 Subject: [PATCH 086/129] Update to 1.0.2 release --- .gitignore | 1 + ...lt-renegotiation-interval-of-zero-rh.patch | 42 ------------------- NetworkManager-openvpn.spec | 10 ++--- sources | 2 +- 4 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch diff --git a/.gitignore b/.gitignore index 6d13e0f..7c74d22 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 /NetworkManager-openvpn-0.9.9.0-da5fb9b.tar.bz2 /NetworkManager-openvpn-1.0.0.tar.xz +/NetworkManager-openvpn-1.0.2.tar.xz diff --git a/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch b/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch deleted file mode 100644 index 2ea57b3..0000000 --- a/0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 81149fd01897166cee5649d2da3801f2a5a45b5c Mon Sep 17 00:00:00 2001 -From: Dan Williams -Date: Wed, 8 Apr 2015 09:37:56 -0500 -Subject: [PATCH] core: use a default renegotiation interval of zero (rh - #969433) - -Since the client and server do not negotiate options, each side gets -to specify its own --reneg-sec to control when each side renegotiates. -OpenVPN defaults to 3600, so if the client and server don't agree this -causes too-frequent renegotiations. - -This is worse with two-factor authentication, becuase it can mean that -the client requests a password/PIN from the user much more often then -the server actually wants. - -https://bugzilla.redhat.com/show_bug.cgi?id=969433 ---- - src/nm-openvpn-service.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c -index 8282573..93ced6c 100644 ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -1115,6 +1115,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - free_openvpn_args (args); - return FALSE; - } -+ } else { -+ /* Either the server and client must agree on the renegotiation -+ * interval, or it should be disabled on one side to prevent -+ * too-frequent renegotiations, which make two-factor auth quite -+ * painful. -+ */ -+ add_openvpn_arg (args, "--reneg-sec"); -+ add_openvpn_arg (args, "0"); - } - - if (debug) { --- -2.1.0 - diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 88687d4..a22fc73 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,8 +4,8 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.0.0 -Release: 3%{?snapshot}%{?dist} +Version: 1.0.2 +Release: 1%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -16,8 +16,6 @@ Group: System Environment/Base # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz -Patch0: 0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch - BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: NetworkManager-devel @@ -60,7 +58,6 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build if [ ! -f configure ]; then @@ -98,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Tue May 5 2015 Lubomir Rintel - 1:1.0.2-1 +- Update to 1.0.2 release + * Wed Apr 8 2015 Dan Williams - 1:1.0.0-3 - Default client renegotiation interval to zero (rh #969433) diff --git a/sources b/sources index 8574823..ca314a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ed64b76a363dd1c7999eafcecef0e14 NetworkManager-openvpn-1.0.0.tar.xz +511eae0d4ac17c6d2659a3da2646296f NetworkManager-openvpn-1.0.2.tar.xz From 6cd1e5f7086cadf3fe2b3f4ec8d43264918598b7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 28 May 2015 11:15:48 +0200 Subject: [PATCH 087/129] core: fix static-key connections failure due to reneg-sec (rh #1225218) --- 0001-reneg-sec.patch | 49 +++++++++++++++++++++++++++++++++++++ NetworkManager-openvpn.spec | 8 +++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0001-reneg-sec.patch diff --git a/0001-reneg-sec.patch b/0001-reneg-sec.patch new file mode 100644 index 0000000..13c8e2b --- /dev/null +++ b/0001-reneg-sec.patch @@ -0,0 +1,49 @@ +From 5124acb300405946602b4ff048bf7499e6d82347 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Wed, 27 May 2015 10:47:49 +0200 +Subject: [PATCH 1/1] service: only set reneg-sec option in TLS mode + +Fixes: bfc4464c9b6d7a00be013eee9a4132a1f9c6fbb9 + +https://bugzilla.gnome.org/show_bug.cgi?id=749050 +https://bugzilla.redhat.com/show_bug.cgi?id=1225218 + +(cherry picked from commit 0fd197dc4221708dd37ee256952e8d080356676e) +--- + src/nm-openvpn-service.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c +index 7cb9438..0a4d5bf 100644 +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -733,6 +733,14 @@ validate_connection_type (const char *ctype) + return NULL; + } + ++static gboolean ++connection_type_is_tls_mode (const char *connection_type) ++{ ++ return strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS) == 0 ++ || strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD) == 0 ++ || strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS) == 0; ++} ++ + static const char * + nm_find_openvpn (void) + { +@@ -1108,7 +1116,10 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + + /* Reneg seconds */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS); +- if (tmp && strlen (tmp)) { ++ if (!connection_type_is_tls_mode (connection_type)) { ++ /* Ignore --reneg-sec option if we are not in TLS mode (as enabled ++ * by --client below). openvpn will error out otherwise, see bgo#749050. */ ++ } else if (tmp && strlen (tmp)) { + add_openvpn_arg (args, "--reneg-sec"); + if (!add_openvpn_arg_int (args, tmp)) { + g_set_error (error, +-- +2.1.0 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a22fc73..0dcb3df 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.0.2 -Release: 1%{?snapshot}%{?dist} +Release: 2%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -16,6 +16,8 @@ Group: System Environment/Base # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz +Patch0: 0001-reneg-sec.patch + BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: NetworkManager-devel @@ -58,6 +60,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .0001-reneg-sec.orig %build if [ ! -f configure ]; then @@ -95,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Thu May 28 2015 Thomas Haller - 1:1.0.2-2 +- core: fix static-key connections failure due to reneg-sec (rh #1225218) + * Tue May 5 2015 Lubomir Rintel - 1:1.0.2-1 - Update to 1.0.2 release From ee69263988667081c1336a1907d77c6725db454a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 22:59:21 +0000 Subject: [PATCH 088/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0dcb3df..782064a 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.0.2 -Release: 2%{?snapshot}%{?dist} +Release: 3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -98,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1:1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu May 28 2015 Thomas Haller - 1:1.0.2-2 - core: fix static-key connections failure due to reneg-sec (rh #1225218) From ce0e13b73ad98e432a4a33e83dee07eb725d3bb2 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 27 Aug 2015 20:07:59 +0200 Subject: [PATCH 089/129] Update to 1.0.6 release --- .gitignore | 1 + 0001-reneg-sec.patch | 49 ------------------------------------- NetworkManager-openvpn.spec | 10 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 0001-reneg-sec.patch diff --git a/.gitignore b/.gitignore index 7c74d22..5c19bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.9.0-da5fb9b.tar.bz2 /NetworkManager-openvpn-1.0.0.tar.xz /NetworkManager-openvpn-1.0.2.tar.xz +/NetworkManager-openvpn-1.0.6.tar.xz diff --git a/0001-reneg-sec.patch b/0001-reneg-sec.patch deleted file mode 100644 index 13c8e2b..0000000 --- a/0001-reneg-sec.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5124acb300405946602b4ff048bf7499e6d82347 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Wed, 27 May 2015 10:47:49 +0200 -Subject: [PATCH 1/1] service: only set reneg-sec option in TLS mode - -Fixes: bfc4464c9b6d7a00be013eee9a4132a1f9c6fbb9 - -https://bugzilla.gnome.org/show_bug.cgi?id=749050 -https://bugzilla.redhat.com/show_bug.cgi?id=1225218 - -(cherry picked from commit 0fd197dc4221708dd37ee256952e8d080356676e) ---- - src/nm-openvpn-service.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c -index 7cb9438..0a4d5bf 100644 ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -733,6 +733,14 @@ validate_connection_type (const char *ctype) - return NULL; - } - -+static gboolean -+connection_type_is_tls_mode (const char *connection_type) -+{ -+ return strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS) == 0 -+ || strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD) == 0 -+ || strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS) == 0; -+} -+ - static const char * - nm_find_openvpn (void) - { -@@ -1108,7 +1116,10 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - /* Reneg seconds */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS); -- if (tmp && strlen (tmp)) { -+ if (!connection_type_is_tls_mode (connection_type)) { -+ /* Ignore --reneg-sec option if we are not in TLS mode (as enabled -+ * by --client below). openvpn will error out otherwise, see bgo#749050. */ -+ } else if (tmp && strlen (tmp)) { - add_openvpn_arg (args, "--reneg-sec"); - if (!add_openvpn_arg_int (args, tmp)) { - g_set_error (error, --- -2.1.0 - diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 782064a..ca906ee 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,8 +4,8 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.0.2 -Release: 3%{?snapshot}%{?dist} +Version: 1.0.6 +Release: 1%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -16,8 +16,6 @@ Group: System Environment/Base # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz -Patch0: 0001-reneg-sec.patch - BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: NetworkManager-devel @@ -60,7 +58,6 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .0001-reneg-sec.orig %build if [ ! -f configure ]; then @@ -98,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Thu Aug 27 2015 Lubomir Rintel - 1.0.6-1 +- Update to 1.0.6 release + * Tue Jun 16 2015 Fedora Release Engineering - 1:1.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index ca314a1..71ac574 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -511eae0d4ac17c6d2659a3da2646296f NetworkManager-openvpn-1.0.2.tar.xz +02931c0302310d06e43d413b5a7a3261 NetworkManager-openvpn-1.0.6.tar.xz From 43ea22c9206bb1fab3020032eed97a515cfaa2fb Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 28 Aug 2015 12:51:08 +0200 Subject: [PATCH 090/129] Update the BRs --- NetworkManager-openvpn.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ca906ee..0d56170 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -5,15 +5,10 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.0.6 -Release: 1%{?snapshot}%{?dist} +Release: 2%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -# git clone git://git.gnome.org/network-manager-openvpn -# cd network-manager-openvpn -# ./autogen.sh -# make dist -# mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz BuildRequires: gtk3-devel @@ -22,7 +17,7 @@ BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel BuildRequires: glib2-devel BuildRequires: libtool intltool gettext -BuildRequires: libnm-gtk-devel >= 0.9.9.0 +BuildRequires: libnm-gtk-devel >= 1.0.5 BuildRequires: libsecret-devel Requires: gtk3 @@ -95,7 +90,10 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog -* Thu Aug 27 2015 Lubomir Rintel - 1.0.6-1 +* Fri Aug 28 2015 Lubomir Rintel - 1:1.0.6-2 +- Update the BRs + +* Thu Aug 27 2015 Lubomir Rintel - 1:1.0.6-1 - Update to 1.0.6 release * Tue Jun 16 2015 Fedora Release Engineering - 1:1.0.2-3 From c920d465b4dc124f068bae0896a0e165c42d2ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 28 Aug 2015 13:22:23 +0200 Subject: [PATCH 091/129] spec: add nm-openvpn/n-openvpn user/group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is required to be able to run as non-root user. https://git.gnome.org/browse/network-manager-openvpn/commit/?h=nm-1-0&id=87631c2867f1102e365243fabb2828c8b4eac2cc http://fedoraproject.org/wiki/Packaging:UsersAndGroups Signed-off-by: Jiří Klimeš --- NetworkManager-openvpn.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0d56170..12eae00 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -24,6 +24,7 @@ Requires: gtk3 Requires: dbus Requires: NetworkManager Requires: openvpn +Requires(pre): shadow-utils Requires: shared-mime-info Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 @@ -68,6 +69,13 @@ make %{?_smp_mflags} %check make check +%pre +getent group nm-openvpn >/dev/null || groupadd -r nm-openvpn +getent passwd nm-openvpn >/dev/null || \ + useradd -r -g nm-openvpn -d / -s /sbin/nologin \ + -c "Default user for running openvpn spawned by NetworkManager" nm-openvpn +exit 0 + %install make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" @@ -90,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog +* Fri Aug 28 2015 Lubomir Rintel - 1:1.0.6-3 +- Create an user for unprivileged runs + * Fri Aug 28 2015 Lubomir Rintel - 1:1.0.6-2 - Update the BRs From 56f8943d94bb18d296322682efd3619a1479fd62 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 28 Aug 2015 13:37:16 +0200 Subject: [PATCH 092/129] Bump release --- NetworkManager-openvpn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 12eae00..26e34ac 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.0.6 -Release: 2%{?snapshot}%{?dist} +Release: 3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base From 88c370a570b4c5dc8554b48e7b4731bfd0183a18 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 31 Aug 2015 15:38:52 +0200 Subject: [PATCH 093/129] Update to 1.2 git snapshot with libnm-based properties plugin --- .gitignore | 1 + NetworkManager-openvpn.spec | 35 +++++++++++++++++------------------ sources | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 5c19bc3..cd5f332 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.0.0.tar.xz /NetworkManager-openvpn-1.0.2.tar.xz /NetworkManager-openvpn-1.0.6.tar.xz +/NetworkManager-openvpn-1.2.0.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 26e34ac..608d4c8 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,23 +1,22 @@ -#global commit %{nil} -#global snapshot %{nil}%{commit} +%global snapshot .20150903gitda388ff Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.0.6 -Release: 3%{?snapshot}%{?dist} +Version: 1.2.0 +Release: 0.1%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz +Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz BuildRequires: gtk3-devel -BuildRequires: dbus-devel BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel +BuildRequires: NetworkManager-glib-devel >= 1:1.1.0 BuildRequires: glib2-devel BuildRequires: libtool intltool gettext -BuildRequires: libnm-gtk-devel >= 1.0.5 +BuildRequires: libnm-gtk-devel >= 0.9.9.0 +BuildRequires: libnma-devel >= 1.1.0 BuildRequires: libsecret-devel Requires: gtk3 @@ -26,6 +25,7 @@ Requires: NetworkManager Requires: openvpn Requires(pre): shadow-utils Requires: shared-mime-info +Requires(pre): shadow-utils Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %global _privatelibs libnm-openvpn-properties[.]so.* @@ -40,12 +40,8 @@ the OpenVPN server with NetworkManager. Summary: NetworkManager VPN plugin for OpenVPN - GNOME files Group: System Environment/Base -Requires: NetworkManager-openvpn = %{epoch}:%{version}-%{release} -%if 0%{?fedora} > 17 +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: nm-connection-editor -%else -Requires: NetworkManager-gnome -%endif Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %description -n NetworkManager-openvpn-gnome @@ -61,9 +57,8 @@ if [ ! -f configure ]; then fi %configure \ --disable-static \ - --disable-dependency-tracking \ --enable-more-warnings=yes \ - --with-gnome + --with-dist-version=%{version}-%{release} make %{?_smp_mflags} %check @@ -84,20 +79,24 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %find_lang %{name} %files -f %{name}.lang -%doc COPYING AUTHORS README ChangeLog %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf -%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%{_prefix}/lib/NetworkManager/VPN/nm-openvpn-service.name %{_libexecdir}/nm-openvpn-service %{_libexecdir}/nm-openvpn-auth-dialog %{_libexecdir}/nm-openvpn-service-openvpn-helper +%doc AUTHORS README ChangeLog +%license COPYING %files -n NetworkManager-openvpn-gnome -%doc COPYING AUTHORS README ChangeLog %{_libdir}/NetworkManager/lib*.so* %dir %{_datadir}/gnome-vpn-properties/openvpn %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui +%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Mon Aug 31 2015 Lubomir Rintel - 1:1.2.0-0.1.20160831gitda388ff +- Update to 1.2 git snapshot with libnm-based properties plugin + * Fri Aug 28 2015 Lubomir Rintel - 1:1.0.6-3 - Create an user for unprivileged runs diff --git a/sources b/sources index 71ac574..a910db1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02931c0302310d06e43d413b5a7a3261 NetworkManager-openvpn-1.0.6.tar.xz +9198db992c0cf016d1fa5e65924f7ea2 NetworkManager-openvpn-1.2.0.tar.xz From 791e035dabd9272e48643fa0e67c2a91b994551a Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 23 Oct 2015 17:12:38 +0200 Subject: [PATCH 094/129] Update to a newer git snapshot --- NetworkManager-openvpn.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 608d4c8..1f92143 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%global snapshot .20150903gitda388ff +%global snapshot .20151023gitadff387 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn @@ -21,7 +21,7 @@ BuildRequires: libsecret-devel Requires: gtk3 Requires: dbus -Requires: NetworkManager +Requires: NetworkManager >= 1:1.2.0-0.3 Requires: openvpn Requires(pre): shadow-utils Requires: shared-mime-info @@ -94,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Fri Oct 23 2015 Lubomir Rintel - 1:1.2.0-0.1.20151023gitadff387 +- Update to a newer git snapshot + * Mon Aug 31 2015 Lubomir Rintel - 1:1.2.0-0.1.20160831gitda388ff - Update to 1.2 git snapshot with libnm-based properties plugin diff --git a/sources b/sources index a910db1..3cbd647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9198db992c0cf016d1fa5e65924f7ea2 NetworkManager-openvpn-1.2.0.tar.xz +a4e68e23701aeb38bc5902aa4a687fd3 NetworkManager-openvpn-1.2.0.tar.xz From c48bd126159ca38ebe276f8d757331c857cf4568 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 18 Dec 2015 12:39:58 +0100 Subject: [PATCH 095/129] Update to a newer git snapshot --- NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1f92143..17c9a43 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%global snapshot .20151023gitadff387 +%global snapshot .20151208git4ad98f0 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn @@ -15,13 +15,13 @@ BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel >= 1:1.1.0 BuildRequires: glib2-devel BuildRequires: libtool intltool gettext -BuildRequires: libnm-gtk-devel >= 0.9.9.0 +BuildRequires: libnm-gtk-devel >= 1.1.0 BuildRequires: libnma-devel >= 1.1.0 BuildRequires: libsecret-devel Requires: gtk3 Requires: dbus -Requires: NetworkManager >= 1:1.2.0-0.3 +Requires: NetworkManager >= 1:1.1.0 Requires: openvpn Requires(pre): shadow-utils Requires: shared-mime-info @@ -94,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Fri Dec 18 2015 Lubomir Rintel - 1:1.2.0-0.1.20151208git4ad98f0 +- Update to a newer git snapshot + * Fri Oct 23 2015 Lubomir Rintel - 1:1.2.0-0.1.20151023gitadff387 - Update to a newer git snapshot diff --git a/sources b/sources index 3cbd647..5960b04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4e68e23701aeb38bc5902aa4a687fd3 NetworkManager-openvpn-1.2.0.tar.xz +102e9a2344307ea573f4d0d39867b330 NetworkManager-openvpn-1.2.0.tar.xz From f919c653867f1803b8ca16d1f261ec28847c0614 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 19 Jan 2016 16:10:31 +0100 Subject: [PATCH 096/129] Update to NetworkManager-openvpn 1.2-beta1 --- .gitignore | 1 + NetworkManager-openvpn.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cd5f332..4fdec85 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.0.2.tar.xz /NetworkManager-openvpn-1.0.6.tar.xz /NetworkManager-openvpn-1.2.0.tar.xz +/NetworkManager-openvpn-1.1.90.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 17c9a43..18761b4 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,14 +1,14 @@ -%global snapshot .20151208git4ad98f0 +%global snapshot .beta1 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.0 -Release: 0.1%{?snapshot}%{?dist} +Release: 0.2%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.90.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -49,7 +49,7 @@ This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-1.1.90 %build if [ ! -f configure ]; then @@ -94,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Tue Jan 19 2016 Lubomir Rintel - 1:1.2.0-0.2.beta1 +- Update to NetworkManager-openvpn 1.2-beta1 + * Fri Dec 18 2015 Lubomir Rintel - 1:1.2.0-0.1.20151208git4ad98f0 - Update to a newer git snapshot diff --git a/sources b/sources index 5960b04..2dae6de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -102e9a2344307ea573f4d0d39867b330 NetworkManager-openvpn-1.2.0.tar.xz +90e9097268c20a926f1e2f016d8c45ee NetworkManager-openvpn-1.1.90.tar.xz From a7a1e6f4c1d57fac6514d0f3d5629a3826062888 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:32:09 +0000 Subject: [PATCH 097/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 18761b4..0e4fd5a 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,7 +4,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.0 -Release: 0.2%{?snapshot}%{?dist} +Release: 0.3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -94,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1:1.2.0-0.3.beta1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 19 2016 Lubomir Rintel - 1:1.2.0-0.2.beta1 - Update to NetworkManager-openvpn 1.2-beta1 From 0c80f90c8c1d5252fe7717fcfd14195fce20ef19 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 1 Mar 2016 17:46:09 +0100 Subject: [PATCH 098/129] Update to NetworkManager-openvpn 1.2-beta2 --- .gitignore | 1 + NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4fdec85..5e40fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.0.6.tar.xz /NetworkManager-openvpn-1.2.0.tar.xz /NetworkManager-openvpn-1.1.90.tar.xz +/NetworkManager-openvpn-1.1.91.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0e4fd5a..9474cad 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%global snapshot .beta1 +%global snapshot .beta2 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn @@ -8,7 +8,7 @@ Release: 0.3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.90.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.91.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -49,7 +49,7 @@ This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-1.1.90 +%setup -q -n %{name}-1.1.91 %build if [ ! -f configure ]; then @@ -94,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Tue Mar 1 2016 Lubomir Rintel - 1:1.2.0-0.3.beta2 +- Update to NetworkManager-openvpn 1.2-beta2 + * Wed Feb 03 2016 Fedora Release Engineering - 1:1.2.0-0.3.beta1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 2dae6de..20ff4e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90e9097268c20a926f1e2f016d8c45ee NetworkManager-openvpn-1.1.90.tar.xz +a50a63f2f9d5370a5f23c736afa3b156 NetworkManager-openvpn-1.1.91.tar.xz From aa30061051fe8071648b7706f7a4561a43a5abd7 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 29 Mar 2016 17:51:48 +0200 Subject: [PATCH 099/129] Update to NetworkManager-openvpn 1.2-beta3 --- .gitignore | 1 + NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5e40fc1..f6e3b79 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.0.tar.xz /NetworkManager-openvpn-1.1.90.tar.xz /NetworkManager-openvpn-1.1.91.tar.xz +/NetworkManager-openvpn-1.1.92.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 9474cad..c617f11 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%global snapshot .beta2 +%global snapshot .beta3 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn @@ -8,7 +8,7 @@ Release: 0.3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.91.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.92.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -49,7 +49,7 @@ This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-1.1.91 +%setup -q -n %{name}-1.1.92 %build if [ ! -f configure ]; then @@ -94,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Tue Mar 29 2016 Lubomir Rintel - 1:1.2.0-0.3.beta3 +- Update to NetworkManager-openvpn 1.2-beta3 + * Tue Mar 1 2016 Lubomir Rintel - 1:1.2.0-0.3.beta2 - Update to NetworkManager-openvpn 1.2-beta2 diff --git a/sources b/sources index 20ff4e5..caec448 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a50a63f2f9d5370a5f23c736afa3b156 NetworkManager-openvpn-1.1.91.tar.xz +091c3e133aa000d2bfa4c2515aeb45f7 NetworkManager-openvpn-1.1.92.tar.xz From 8d24de776ef7874d8187ae3bc843d5d9fbafe3c4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 5 Apr 2016 23:19:19 +0200 Subject: [PATCH 100/129] Update to NetworkManager-openvpn --- .gitignore | 1 + NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f6e3b79..2149d46 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.1.90.tar.xz /NetworkManager-openvpn-1.1.91.tar.xz /NetworkManager-openvpn-1.1.92.tar.xz +/NetworkManager-openvpn-1.1.93.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index c617f11..20cfefe 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,4 +1,4 @@ -%global snapshot .beta3 +%global snapshot .rc1 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn @@ -8,7 +8,7 @@ Release: 0.3%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.92.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.93.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -49,7 +49,7 @@ This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-1.1.92 +%setup -q -n %{name}-1.1.93 %build if [ ! -f configure ]; then @@ -94,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %changelog +* Tue Apr 5 2016 Lubomir Rintel - 1:1.2.0-0.3.rc1 +- Update to NetworkManager-openvpn 1.2-rc1 + * Tue Mar 29 2016 Lubomir Rintel - 1:1.2.0-0.3.beta3 - Update to NetworkManager-openvpn 1.2-beta3 diff --git a/sources b/sources index caec448..668778e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -091c3e133aa000d2bfa4c2515aeb45f7 NetworkManager-openvpn-1.1.92.tar.xz +ac51610750537d6c7ed1a2c98b11d7d0 NetworkManager-openvpn-1.1.93.tar.xz From b7f0767a73125aaa9d2f55e6cef90c88dc20cfb8 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 20 Apr 2016 19:48:34 +0200 Subject: [PATCH 101/129] Update to 1.2.0 release --- NetworkManager-openvpn.spec | 12 +++++++----- sources | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 20cfefe..a73df7d 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,14 +1,12 @@ -%global snapshot .rc1 - Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.0 -Release: 0.3%{?snapshot}%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.1/%{name}-1.1.93.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-1.2.0.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -49,7 +47,7 @@ This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-1.1.93 +%setup -q %build if [ ! -f configure ]; then @@ -92,8 +90,12 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %dir %{_datadir}/gnome-vpn-properties/openvpn %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%{_datadir}/appdata/network-manager-openvpn.appdata.xml %changelog +* Wed Apr 20 2016 Lubomir Rintel - 1.2.0-1 +- Update to 1.2.0 release + * Tue Apr 5 2016 Lubomir Rintel - 1:1.2.0-0.3.rc1 - Update to NetworkManager-openvpn 1.2-rc1 diff --git a/sources b/sources index 668778e..4b6696e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac51610750537d6c7ed1a2c98b11d7d0 NetworkManager-openvpn-1.1.93.tar.xz +6a8c03288cd0b4b849a7b883689c04f3 NetworkManager-openvpn-1.2.0.tar.xz From a78b895375ea635d45c18d5bbaf3cd4b5bb707fd Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 11 May 2016 15:18:10 +0200 Subject: [PATCH 102/129] Update to 1.2.2 release --- .gitignore | 1 + NetworkManager-openvpn.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2149d46..29e2b34 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.1.91.tar.xz /NetworkManager-openvpn-1.1.92.tar.xz /NetworkManager-openvpn-1.1.93.tar.xz +/NetworkManager-openvpn-1.2.2.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a73df7d..0c6d881 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,25 +1,25 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.2.0 +Version: 1.2.2 Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-1.2.0.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel >= 1:1.1.0 +BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 BuildRequires: glib2-devel BuildRequires: libtool intltool gettext -BuildRequires: libnm-gtk-devel >= 1.1.0 -BuildRequires: libnma-devel >= 1.1.0 +BuildRequires: libnm-gtk-devel >= 1.2.0 +BuildRequires: libnma-devel >= 1.2.0 BuildRequires: libsecret-devel Requires: gtk3 Requires: dbus -Requires: NetworkManager >= 1:1.1.0 +Requires: NetworkManager >= 1:1.2.0 Requires: openvpn Requires(pre): shadow-utils Requires: shared-mime-info @@ -90,9 +90,12 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %dir %{_datadir}/gnome-vpn-properties/openvpn %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name -%{_datadir}/appdata/network-manager-openvpn.appdata.xml +%{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Wed May 11 2016 Lubomir Rintel - 1.2.2-1 +- Update to 1.2.2 release + * Wed Apr 20 2016 Lubomir Rintel - 1.2.0-1 - Update to 1.2.0 release diff --git a/sources b/sources index 4b6696e..eaf5cc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a8c03288cd0b4b849a7b883689c04f3 NetworkManager-openvpn-1.2.0.tar.xz +f7889d7530f226afd3ef110501a68af4 NetworkManager-openvpn-1.2.2.tar.xz From fa587bff2553a5eaea583887ebdac08836de9245 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 17 May 2016 12:03:16 +0200 Subject: [PATCH 103/129] Drop duplicate require --- NetworkManager-openvpn.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0c6d881..1ee61ef 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -23,7 +23,6 @@ Requires: NetworkManager >= 1:1.2.0 Requires: openvpn Requires(pre): shadow-utils Requires: shared-mime-info -Requires(pre): shadow-utils Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %global _privatelibs libnm-openvpn-properties[.]so.* From 01d92111612cd8c23f3a8b9abc15af4a169e762a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 4 Jul 2016 10:52:26 +0200 Subject: [PATCH 104/129] Update to 1.2.4 release --- .gitignore | 1 + NetworkManager-openvpn.spec | 22 ++++++++++++++++------ sources | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 29e2b34..d4cd4ef 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.1.92.tar.xz /NetworkManager-openvpn-1.1.93.tar.xz /NetworkManager-openvpn-1.2.2.tar.xz +/NetworkManager-openvpn-1.2.4.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1ee61ef..a58b481 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,7 +1,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.2.2 +Version: 1.2.4 Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -17,12 +17,10 @@ BuildRequires: libnm-gtk-devel >= 1.2.0 BuildRequires: libnma-devel >= 1.2.0 BuildRequires: libsecret-devel -Requires: gtk3 Requires: dbus Requires: NetworkManager >= 1:1.2.0 Requires: openvpn Requires(pre): shadow-utils -Requires: shared-mime-info Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %global _privatelibs libnm-openvpn-properties[.]so.* @@ -38,7 +36,8 @@ Summary: NetworkManager VPN plugin for OpenVPN - GNOME files Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: nm-connection-editor +Requires: gtk3 +Requires: shared-mime-info Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 %description -n NetworkManager-openvpn-gnome @@ -76,22 +75,33 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %find_lang %{name} %files -f %{name}.lang +%{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn.so %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf %{_prefix}/lib/NetworkManager/VPN/nm-openvpn-service.name %{_libexecdir}/nm-openvpn-service -%{_libexecdir}/nm-openvpn-auth-dialog %{_libexecdir}/nm-openvpn-service-openvpn-helper %doc AUTHORS README ChangeLog %license COPYING %files -n NetworkManager-openvpn-gnome -%{_libdir}/NetworkManager/lib*.so* +%{_libexecdir}/nm-openvpn-auth-dialog +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so %dir %{_datadir}/gnome-vpn-properties/openvpn %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Mon Jul 4 2016 Thomas Haller - 1.2.4-1 +- Update to 1.2.4 release +- Remove GTK dependency from base openvpn package (rh#1088670) +- Introduce new GTK-free VPN plugin base-library to openvpn package +- Don't require nm-connection-editor anymore +- Fix import of ovpn file with default route (rh#1350108) +- Extend support for comp-lzo option (rh#1327284) +- Preserve IP route configuration on restart (rh#1231338) + * Wed May 11 2016 Lubomir Rintel - 1.2.2-1 - Update to 1.2.2 release diff --git a/sources b/sources index eaf5cc3..62ea748 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7889d7530f226afd3ef110501a68af4 NetworkManager-openvpn-1.2.2.tar.xz +ee4c09a8896eab3e1740f7c7bc1434f9 NetworkManager-openvpn-1.2.4.tar.xz From b6d228aa2540266ba08c1a6b7e886622a0b0c80e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 11 Aug 2016 16:18:21 +0200 Subject: [PATCH 105/129] fix change in behavior that causes issues with comp-lzo=no (rh#1355688) --- 0001-comp-lzo-no-fix-rh1355688 | 136 +++++++++++++++++++++++++++++++++ NetworkManager-openvpn.spec | 9 ++- 2 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 0001-comp-lzo-no-fix-rh1355688 diff --git a/0001-comp-lzo-no-fix-rh1355688 b/0001-comp-lzo-no-fix-rh1355688 new file mode 100644 index 0000000..1300891 --- /dev/null +++ b/0001-comp-lzo-no-fix-rh1355688 @@ -0,0 +1,136 @@ +From 4ecbe9f176b6d29aa51bf7800d0495e1c949f5bc Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Thu, 11 Aug 2016 14:38:53 +0200 +Subject: [PATCH 1/1] fix recent change in behavior for "comp-lzo=no" setting + +openvpn supports 4 different ways for --comp-lzo: + 1) no --comp-lzo option + 2) --comp-lzo yes + 3) --comp-lzo [adaptive] + 4) --comp-lzo no + +Before commit 2ecf18c25a7bee7f0122d9d666a7e11cd8b55ea3, nm-openvpn +only supported 1) and 2). Those were expressed in NM's connection +by either omitting the comp-lzo setting or setting "comp-lzo=yes". + +Arguably due to a bug, old plasma-nm would configure connections with +comp-lzo=no to mean 1), so after update of nm-openvpn to 2ecf18c2 those +connections changed to mean 4), which broke some existing configurations. +That was later attemted to be fixed in plasma-nm by commit [1], which +however only affects new connections and cannot fix existing connections +for users. + +Ultimatley, the "comp-lzo=no" setting is spoiled due to that. + +The fix is to add a new setting "comp-lzo=no-by-default" which shall +have the meaning 4) and pass "--comp-lzo no" to openvpn. A connection +with "comp-lzo=no" is again treated as 1). + +This fixes old connections that were created by old plasma-nm before commit +[1] by restoring the old meaning. + +This however now breaks users of recent nm-openvpn which were deliberately setting +"comp-lzo=no" to mean option 4), most notably users of recent plasma-nm (since +commit [1]). Users of the properties plugin for nm-connection-editor/gnome-control-center +are anyway unable to configure "comp-lzo=no" in the UI, so probably isn't a real +issue for many users. + +plasma-nm bugs: + [1] https://quickgit.kde.org/?p=plasma-nm.git&a=commit&h=31bcd5f2cffd1c19fbd10ab0f4172f2d82eff194 + https://bugs.kde.org/show_bug.cgi?id=365816 + https://bugzilla.redhat.com/show_bug.cgi?id=1365663 + +https://bugzilla.gnome.org/show_bug.cgi?id=769177 +https://bugzilla.redhat.com/show_bug.cgi?id=1355688 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833166 +(cherry picked from commit 62bdd278d69cc396479af9d05a0b776d5ad386bf) +--- + properties/auth-helpers.c | 5 ++++- + properties/import-export.c | 14 ++++++++++++-- + src/nm-openvpn-service.c | 24 ++++++++++++++++++++++++ + 3 files changed, 40 insertions(+), 3 deletions(-) + +diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c +index 85985c8..7244df1 100644 +--- a/properties/auth-helpers.c ++++ b/properties/auth-helpers.c +@@ -2010,7 +2010,10 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { + /* we only have a checkbox, which we either map to "--comp-lzo yes" or + * no "--comp-lzo" flag. In the UI, we cannot express "--comp-lzo [adaptive]" +- * or "--comp-lzo no". */ ++ * or "--comp-lzo no". ++ * ++ * Note that "--comp-lzo no" must be encoded as "comp-lzo=no-by-default" (bgo#769177). ++ */ + g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_COMP_LZO), g_strdup ("yes")); + } + +diff --git a/properties/import-export.c b/properties/import-export.c +index 90b4631..ddb1cd3 100644 +--- a/properties/import-export.c ++++ b/properties/import-export.c +@@ -951,13 +951,23 @@ do_import (const char *path, const char *contents, gsize contents_len, GError ** + } + + if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_COMP_LZO)) { ++ const char *v; ++ + if (!args_params_check_nargs_minmax (params, 0, 1, &line_error)) + goto handle_line_error; +- if (!NM_IN_STRSET (params[1], NULL, "no", "yes", "adaptive")) { ++ ++ v = params[1] ?: "adaptive"; ++ ++ if (nm_streq (v, "no")) { ++ /* old plasma-nm used to set "comp-lzo=no" to mean unset, thus it spoiled ++ * to "no" option to be used in the connection. Workaround that, by instead ++ * using "no-by-default" (bgo#769177). */ ++ v = "no-by-default"; ++ } else if (!NM_IN_STRSET (v, "yes", "adaptive")) { + line_error = g_strdup_printf (_("unsupported comp-lzo argument")); + goto handle_line_error; + } +- setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, params[1] ?: "adaptive"); ++ setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, v); + continue; + } + +diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c +index e5a1aa9..9238a45 100644 +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -1250,6 +1250,30 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + } + + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO); ++ ++ /* openvpn understands 4 different modes for --comp-lzo, which have ++ * different meaning: ++ * 1) no --comp-lzo option ++ * 2) --comp-lzo yes ++ * 3) --comp-lzo [adaptive] ++ * 4) --comp-lzo no ++ * ++ * In the past, nm-openvpn only supported 1) and 2) by having no ++ * comp-lzo connection setting or "comp-lzo=yes", respectively. ++ * ++ * However, old plasma-nm would set "comp-lzo=no" in the connection ++ * to mean 1). Thus, "comp-lzo=no" is spoiled to mean 4) in order ++ * to preserve backward compatibily. ++ * We use instead a special value "no-by-default" to express "no". ++ * ++ * See bgo#769177 ++ */ ++ if (NM_IN_STRSET (tmp, "no")) { ++ /* means no --comp-lzo option. */ ++ tmp = NULL; ++ } else if (NM_IN_STRSET (tmp, "no-by-default")) ++ tmp = "no"; ++ + if (NM_IN_STRSET (tmp, "yes", "no", "adaptive")) { + add_openvpn_arg (args, "--comp-lzo"); + add_openvpn_arg (args, tmp); +-- +2.7.4 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a58b481..16e2946 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,12 +2,14 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz +Patch1: 0001-comp-lzo-no-fix-rh1355688 + BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 @@ -47,6 +49,8 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q +%patch1 -p1 + %build if [ ! -f configure ]; then ./autogen.sh @@ -93,6 +97,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Thu Aug 11 2016 Thomas Haller - 1.2.4-2 +- fix change in behavior that causes issues with comp-lzo=no (rh#1355688) + * Mon Jul 4 2016 Thomas Haller - 1.2.4-1 - Update to 1.2.4 release - Remove GTK dependency from base openvpn package (rh#1088670) From 424ca48007ea630febd37793ecf58f905d9e4d03 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 12 Sep 2016 16:16:38 +0200 Subject: [PATCH 106/129] Update to 1.2.6 pre-release snapshot (1.2.6-0.1) --- .gitignore | 1 + NetworkManager-openvpn.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d4cd4ef..d5934a2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.1.93.tar.xz /NetworkManager-openvpn-1.2.2.tar.xz /NetworkManager-openvpn-1.2.4.tar.xz +/NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 16e2946..a26b7bc 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,14 +1,15 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.2.4 -Release: 2%{?dist} +Version: 1.2.6 +Release: 0.1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz +#Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz +Source0: NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz -Patch1: 0001-comp-lzo-no-fix-rh1355688 +#Patch1: 0001-xxx.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -47,9 +48,9 @@ This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q +%setup -q -n NetworkManager-openvpn-1.2.5 -%patch1 -p1 +#%patch1 -p1 %build if [ ! -f configure ]; then @@ -97,6 +98,10 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Mon Sep 12 2016 Thomas Haller - 1.2.6-0.1 +- Update to 1.2.6 pre-release snapshot +- Add support for max-routes and verify-x509-name + * Thu Aug 11 2016 Thomas Haller - 1.2.4-2 - fix change in behavior that causes issues with comp-lzo=no (rh#1355688) diff --git a/sources b/sources index 62ea748..32bd90b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee4c09a8896eab3e1740f7c7bc1434f9 NetworkManager-openvpn-1.2.4.tar.xz +80a42b5b482c4ddd750b6d32a29d4d68 NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz From bdede25bd646281ef5dbd1498a913c7f59b0ec45 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 3 Oct 2016 17:20:55 +0200 Subject: [PATCH 107/129] Update to 1.2.6 release --- .gitignore | 1 + NetworkManager-openvpn.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d5934a2..dc684fd 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.2.tar.xz /NetworkManager-openvpn-1.2.4.tar.xz /NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz +/NetworkManager-openvpn-1.2.6.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a26b7bc..a9f9841 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,12 +2,11 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.6 -Release: 0.1%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -#Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz -Source0: NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz #Patch1: 0001-xxx.patch @@ -48,7 +47,7 @@ This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n NetworkManager-openvpn-1.2.5 +%setup -q #%patch1 -p1 @@ -98,6 +97,10 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Mon Oct 3 2016 Thomas Haller - 1.2.6-1 +- Update to 1.2.6 release +- Fix invalid free when parsing remote option + * Mon Sep 12 2016 Thomas Haller - 1.2.6-0.1 - Update to 1.2.6 pre-release snapshot - Add support for max-routes and verify-x509-name diff --git a/sources b/sources index 32bd90b..f4be81f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80a42b5b482c4ddd750b6d32a29d4d68 NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz +47ed9b6c43ca364976a15e84207687df NetworkManager-openvpn-1.2.6.tar.xz From 652ba4a6a5846f91b9f861f759e40c94de3c9b84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:14:32 +0000 Subject: [PATCH 108/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a9f9841..8be12f0 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,7 +2,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1:1.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 3 2016 Thomas Haller - 1.2.6-1 - Update to 1.2.6 release - Fix invalid free when parsing remote option From 63965111d1895325af36ef5bcbb79eebc9595776 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 10 Feb 2017 11:34:39 -0600 Subject: [PATCH 109/129] 1.2.8 --- .gitignore | 1 + NetworkManager-openvpn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc684fd..7646016 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.4.tar.xz /NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz /NetworkManager-openvpn-1.2.6.tar.xz +/NetworkManager-openvpn-1.2.8.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 8be12f0..adb90c8 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,8 +1,8 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.2.6 -Release: 2%{?dist} +Version: 1.2.8 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Fri Feb 10 2017 Jon Ciesla - 1:1.2.8-1 +- 1.2.8 + * Fri Feb 10 2017 Fedora Release Engineering - 1:1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index f4be81f..ed5d81b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47ed9b6c43ca364976a15e84207687df NetworkManager-openvpn-1.2.6.tar.xz +SHA512 (NetworkManager-openvpn-1.2.8.tar.xz) = e6d64106cd93f91d292a6b2346dc31317e1056d2bbaf09a376c84ffaaa8fd584f92999865bdf52531b44de7ae144e1ae9271b9efc564d99f8569b0d059ab8019 From 86eace12c63ed451b3368ff503c0500e8863fe55 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 27 Feb 2017 16:18:27 +0100 Subject: [PATCH 110/129] Workaround removed tls-remote option with Openvpn 2.4 (rh#1421241) --- 0001-comp-lzo-no-fix-rh1355688 | 136 ------ 0001-tls-remote-workaround-rh1421241.patch | 471 +++++++++++++++++++++ NetworkManager-openvpn.spec | 9 +- 3 files changed, 477 insertions(+), 139 deletions(-) delete mode 100644 0001-comp-lzo-no-fix-rh1355688 create mode 100644 0001-tls-remote-workaround-rh1421241.patch diff --git a/0001-comp-lzo-no-fix-rh1355688 b/0001-comp-lzo-no-fix-rh1355688 deleted file mode 100644 index 1300891..0000000 --- a/0001-comp-lzo-no-fix-rh1355688 +++ /dev/null @@ -1,136 +0,0 @@ -From 4ecbe9f176b6d29aa51bf7800d0495e1c949f5bc Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Thu, 11 Aug 2016 14:38:53 +0200 -Subject: [PATCH 1/1] fix recent change in behavior for "comp-lzo=no" setting - -openvpn supports 4 different ways for --comp-lzo: - 1) no --comp-lzo option - 2) --comp-lzo yes - 3) --comp-lzo [adaptive] - 4) --comp-lzo no - -Before commit 2ecf18c25a7bee7f0122d9d666a7e11cd8b55ea3, nm-openvpn -only supported 1) and 2). Those were expressed in NM's connection -by either omitting the comp-lzo setting or setting "comp-lzo=yes". - -Arguably due to a bug, old plasma-nm would configure connections with -comp-lzo=no to mean 1), so after update of nm-openvpn to 2ecf18c2 those -connections changed to mean 4), which broke some existing configurations. -That was later attemted to be fixed in plasma-nm by commit [1], which -however only affects new connections and cannot fix existing connections -for users. - -Ultimatley, the "comp-lzo=no" setting is spoiled due to that. - -The fix is to add a new setting "comp-lzo=no-by-default" which shall -have the meaning 4) and pass "--comp-lzo no" to openvpn. A connection -with "comp-lzo=no" is again treated as 1). - -This fixes old connections that were created by old plasma-nm before commit -[1] by restoring the old meaning. - -This however now breaks users of recent nm-openvpn which were deliberately setting -"comp-lzo=no" to mean option 4), most notably users of recent plasma-nm (since -commit [1]). Users of the properties plugin for nm-connection-editor/gnome-control-center -are anyway unable to configure "comp-lzo=no" in the UI, so probably isn't a real -issue for many users. - -plasma-nm bugs: - [1] https://quickgit.kde.org/?p=plasma-nm.git&a=commit&h=31bcd5f2cffd1c19fbd10ab0f4172f2d82eff194 - https://bugs.kde.org/show_bug.cgi?id=365816 - https://bugzilla.redhat.com/show_bug.cgi?id=1365663 - -https://bugzilla.gnome.org/show_bug.cgi?id=769177 -https://bugzilla.redhat.com/show_bug.cgi?id=1355688 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833166 -(cherry picked from commit 62bdd278d69cc396479af9d05a0b776d5ad386bf) ---- - properties/auth-helpers.c | 5 ++++- - properties/import-export.c | 14 ++++++++++++-- - src/nm-openvpn-service.c | 24 ++++++++++++++++++++++++ - 3 files changed, 40 insertions(+), 3 deletions(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index 85985c8..7244df1 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -2010,7 +2010,10 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error) - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - /* we only have a checkbox, which we either map to "--comp-lzo yes" or - * no "--comp-lzo" flag. In the UI, we cannot express "--comp-lzo [adaptive]" -- * or "--comp-lzo no". */ -+ * or "--comp-lzo no". -+ * -+ * Note that "--comp-lzo no" must be encoded as "comp-lzo=no-by-default" (bgo#769177). -+ */ - g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_COMP_LZO), g_strdup ("yes")); - } - -diff --git a/properties/import-export.c b/properties/import-export.c -index 90b4631..ddb1cd3 100644 ---- a/properties/import-export.c -+++ b/properties/import-export.c -@@ -951,13 +951,23 @@ do_import (const char *path, const char *contents, gsize contents_len, GError ** - } - - if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_COMP_LZO)) { -+ const char *v; -+ - if (!args_params_check_nargs_minmax (params, 0, 1, &line_error)) - goto handle_line_error; -- if (!NM_IN_STRSET (params[1], NULL, "no", "yes", "adaptive")) { -+ -+ v = params[1] ?: "adaptive"; -+ -+ if (nm_streq (v, "no")) { -+ /* old plasma-nm used to set "comp-lzo=no" to mean unset, thus it spoiled -+ * to "no" option to be used in the connection. Workaround that, by instead -+ * using "no-by-default" (bgo#769177). */ -+ v = "no-by-default"; -+ } else if (!NM_IN_STRSET (v, "yes", "adaptive")) { - line_error = g_strdup_printf (_("unsupported comp-lzo argument")); - goto handle_line_error; - } -- setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, params[1] ?: "adaptive"); -+ setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO, v); - continue; - } - -diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c -index e5a1aa9..9238a45 100644 ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -1250,6 +1250,30 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - } - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_COMP_LZO); -+ -+ /* openvpn understands 4 different modes for --comp-lzo, which have -+ * different meaning: -+ * 1) no --comp-lzo option -+ * 2) --comp-lzo yes -+ * 3) --comp-lzo [adaptive] -+ * 4) --comp-lzo no -+ * -+ * In the past, nm-openvpn only supported 1) and 2) by having no -+ * comp-lzo connection setting or "comp-lzo=yes", respectively. -+ * -+ * However, old plasma-nm would set "comp-lzo=no" in the connection -+ * to mean 1). Thus, "comp-lzo=no" is spoiled to mean 4) in order -+ * to preserve backward compatibily. -+ * We use instead a special value "no-by-default" to express "no". -+ * -+ * See bgo#769177 -+ */ -+ if (NM_IN_STRSET (tmp, "no")) { -+ /* means no --comp-lzo option. */ -+ tmp = NULL; -+ } else if (NM_IN_STRSET (tmp, "no-by-default")) -+ tmp = "no"; -+ - if (NM_IN_STRSET (tmp, "yes", "no", "adaptive")) { - add_openvpn_arg (args, "--comp-lzo"); - add_openvpn_arg (args, tmp); --- -2.7.4 - diff --git a/0001-tls-remote-workaround-rh1421241.patch b/0001-tls-remote-workaround-rh1421241.patch new file mode 100644 index 0000000..3c74d6b --- /dev/null +++ b/0001-tls-remote-workaround-rh1421241.patch @@ -0,0 +1,471 @@ +From 40ee847d32c11d0bc7c1b06fefa9a9ef8e2b0570 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Mon, 13 Feb 2017 12:30:16 +0100 +Subject: [PATCH 1/4] service: avoid strlen() for checking whether a string is + empty + +Possibly the compiler can optimize it not to evaluate the full string length, +just to verify whether the string is empty. Still, I think it's bad style. + +(cherry picked from commit 2a4a4a49d8b97e3cbe37307f6b6c1053df946ce4) +--- + src/nm-openvpn-service.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c +index d7bd29f..d6e36a6 100644 +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -1406,7 +1406,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + + /* Cipher */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CIPHER); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--cipher"); + add_openvpn_arg (args, tmp); + } +@@ -1419,7 +1419,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + + /* Keysize */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_KEYSIZE); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--keysize"); + if (!add_openvpn_arg_int (args, tmp)) { + g_set_error (error, +@@ -1440,25 +1440,25 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + + /* TA */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--tls-auth"); + add_openvpn_arg_utf8safe (args, tmp); + + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA_DIR); +- if (tmp && strlen (tmp)) ++ if (tmp && tmp[0]) + add_openvpn_arg (args, tmp); + } + + /* tls-remote */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_REMOTE); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--tls-remote"); + add_openvpn_arg (args, tmp); + } + + /* verify-x509-name */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_VERIFY_X509_NAME); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + const char *name; + gs_free char *type = NULL; + +@@ -1483,7 +1483,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + + /* remote-cert-tls */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE_CERT_TLS); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--remote-cert-tls"); + add_openvpn_arg (args, tmp); + } +@@ -1500,7 +1500,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + if (!connection_type_is_tls_mode (connection_type)) { + /* Ignore --reneg-sec option if we are not in TLS mode (as enabled + * by --client below). openvpn will error out otherwise, see bgo#749050. */ +- } else if (tmp && strlen (tmp)) { ++ } else if (tmp && tmp[0]) { + add_openvpn_arg (args, "--reneg-sec"); + if (!add_openvpn_arg_int (args, tmp)) { + g_set_error (error, +@@ -1532,7 +1532,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + + /* TUN MTU size */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TUNNEL_MTU); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--tun-mtu"); + if (!add_openvpn_arg_int (args, tmp)) { + g_set_error (error, +@@ -1546,7 +1546,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + + /* fragment size */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_FRAGMENT_SIZE); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--fragment"); + if (!add_openvpn_arg_int (args, tmp)) { + g_set_error (error, +@@ -1620,12 +1620,12 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + add_cert_args (args, s_vpn); + } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_STATIC_KEY)) { + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--secret"); + add_openvpn_arg_utf8safe (args, tmp); + + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY_DIRECTION); +- if (tmp && strlen (tmp)) ++ if (tmp && tmp[0]) + add_openvpn_arg (args, tmp); + } + +@@ -1659,7 +1659,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + add_openvpn_arg (args, "--auth-user-pass"); + + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CA); +- if (tmp && strlen (tmp)) { ++ if (tmp && tmp[0]) { + add_openvpn_arg (args, "--ca"); + add_openvpn_arg_utf8safe (args, tmp); + } +-- +2.9.3 + + +From 1a21babccc3eb77c5b4a2953e7c45aaec670b120 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Mon, 13 Feb 2017 11:31:40 +0100 +Subject: [PATCH 2/4] service: minor refactoring of nm_find_openvpn() + +And rename to openvpn_binary_find_exepath(). +The prefix "openvpn_binary_" will be used for related functions. + +(cherry picked from commit 05cb6356bb4d27fb1c2ca5f8a7bfdf23fe424f0c) +--- + src/nm-openvpn-service.c | 41 ++++++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c +index d6e36a6..d88ed19 100644 +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -188,6 +188,25 @@ _LOGD_enabled (void) + + /*****************************************************************************/ + ++static const char * ++openvpn_binary_find_exepath (void) ++{ ++ static const char *paths[] = { ++ "/usr/sbin/openvpn", ++ "/sbin/openvpn", ++ "/usr/local/sbin/openvpn", ++ }; ++ int i; ++ ++ for (i = 0; i < G_N_ELEMENTS (paths); i++) { ++ if (g_file_test (paths[i], G_FILE_TEST_EXISTS)) ++ return paths[i]; ++ } ++ return NULL; ++} ++ ++/*****************************************************************************/ ++ + static void + pids_pending_data_free (PidsPendingData *pid_data) + { +@@ -886,26 +905,6 @@ connection_type_is_tls_mode (const char *connection_type) + || strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS) == 0; + } + +-static const char * +-nm_find_openvpn (void) +-{ +- static const char *openvpn_binary_paths[] = { +- "/usr/sbin/openvpn", +- "/sbin/openvpn", +- "/usr/local/sbin/openvpn", +- NULL +- }; +- const char **openvpn_binary = openvpn_binary_paths; +- +- while (*openvpn_binary != NULL) { +- if (g_file_test (*openvpn_binary, G_FILE_TEST_EXISTS)) +- break; +- openvpn_binary++; +- } +- +- return *openvpn_binary; +-} +- + static void + add_openvpn_arg (GPtrArray *args, const char *arg) + { +@@ -1154,7 +1153,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + return FALSE; + + /* Find openvpn */ +- openvpn_binary = nm_find_openvpn (); ++ openvpn_binary = openvpn_binary_find_exepath (); + if (!openvpn_binary) { + g_set_error_literal (error, + NM_VPN_PLUGIN_ERROR, +-- +2.9.3 + + +From adc7dd5148c12917eee1c2c92ddb605e2ecd6b2c Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Mon, 13 Feb 2017 12:30:26 +0100 +Subject: [PATCH 3/4] service: for OpenVPN 2.4 and newer, handle --tls-remote + option via --verify-x509-name + +The tls-remote option got removed from OpenVPN 2.4. This requires users +to fix their existing configurations to use verify-x509-name instead. + +Using tls-remote on a recent OpenVPN binary thus fails to establish +the connection, which is an annoyance for the user. Let the plugin +automatically convert the "tls-remote $NAME" option to "verify-x509-name +$NAME name". Note that the two options are not entirely equivalent, thus +the is a chance that this wrongly rejects a server that would have worked +before, or ever worse, that it wronlgy accepts a server that would have +been rejected. + +But in most common cases, the workaround should work fine. +The user is still strongly encouraged to update his configuration. + +https://bugzilla.gnome.org/show_bug.cgi?id=776045 +https://bugzilla.redhat.com/show_bug.cgi?id=1421241 +(cherry picked from commit f7421ef277222bd640c432afefc21ef5a98477bc) +--- + src/nm-openvpn-service.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 85 insertions(+), 2 deletions(-) + +diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c +index d88ed19..fa59537 100644 +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -70,6 +70,13 @@ G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_SERVICE_PLUGIN) + + #define NM_OPENVPN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_OPENVPN_PLUGIN, NMOpenvpnPluginPrivate)) + ++typedef enum { ++ OPENVPN_BINARY_VERSION_INVALID, ++ OPENVPN_BINARY_VERSION_UNKNOWN, ++ OPENVPN_BINARY_VERSION_2_3_OR_OLDER, ++ OPENVPN_BINARY_VERSION_2_4_OR_NEWER, ++} OpenvpnBinaryVersion; ++ + typedef struct { + char *default_username; + char *username; +@@ -205,6 +212,64 @@ openvpn_binary_find_exepath (void) + return NULL; + } + ++static OpenvpnBinaryVersion ++openvpn_binary_detect_version (const char *exepath) ++{ ++ gs_free char *s_stdout = NULL; ++ const char *s; ++ int exit_code; ++ int n; ++ ++ g_return_val_if_fail (exepath && exepath[0] == '/', OPENVPN_BINARY_VERSION_UNKNOWN); ++ ++ if (!g_spawn_sync (NULL, ++ (char *[]) { (char *) exepath, "--version", NULL }, ++ NULL, ++ G_SPAWN_STDERR_TO_DEV_NULL, ++ NULL, ++ NULL, ++ &s_stdout, ++ NULL, ++ &exit_code, ++ NULL)) ++ return OPENVPN_BINARY_VERSION_UNKNOWN; ++ ++ if ( !WIFEXITED (exit_code) ++ || WEXITSTATUS (exit_code) != 1) { ++ /* expect return code 1 (OPENVPN_EXIT_STATUS_USAGE) */ ++ return OPENVPN_BINARY_VERSION_UNKNOWN; ++ } ++ ++ /* the output for --version starts with title_string, which starts with PACKAGE_STRING, ++ * which looks like "OpenVPN 2.#...". Do a strict parsing here... */ ++ if ( !s_stdout ++ || !g_str_has_prefix (s_stdout, "OpenVPN 2.")) ++ return OPENVPN_BINARY_VERSION_UNKNOWN; ++ s = &s_stdout[NM_STRLEN ("OpenVPN 2.")]; ++ ++ if (!g_ascii_isdigit (s[0])) ++ return OPENVPN_BINARY_VERSION_UNKNOWN; ++ ++ n = 0; ++ do { ++ if (n > G_MAXINT / 100) ++ return OPENVPN_BINARY_VERSION_UNKNOWN; ++ n = (n * 10) + (s[0] - '0'); ++ } while (g_ascii_isdigit ((++s)[0])); ++ ++ if (n <= 3) ++ return OPENVPN_BINARY_VERSION_2_3_OR_OLDER; ++ return OPENVPN_BINARY_VERSION_2_4_OR_NEWER; ++} ++ ++static OpenvpnBinaryVersion ++openvpn_binary_detect_version_cached (const char *exepath, OpenvpnBinaryVersion *cached) ++{ ++ if (G_UNLIKELY (*cached == OPENVPN_BINARY_VERSION_INVALID)) ++ *cached = openvpn_binary_detect_version (exepath); ++ return *cached; ++} ++ + /*****************************************************************************/ + + static void +@@ -1119,12 +1184,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + gboolean dev_type_is_tap; + char *stmp; + const char *defport, *proto_tcp; ++ const char *tls_remote = NULL; + const char *nm_openvpn_user, *nm_openvpn_group, *nm_openvpn_chroot; + gs_free char *bus_name = NULL; + NMSettingVpn *s_vpn; + const char *connection_type; + gint64 v_int64; + char sbuf_64[65]; ++ OpenvpnBinaryVersion openvpn_binary_version = OPENVPN_BINARY_VERSION_INVALID; + + s_vpn = nm_connection_get_setting_vpn (connection); + if (!s_vpn) { +@@ -1451,8 +1518,17 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + /* tls-remote */ + tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_REMOTE); + if (tmp && tmp[0]) { +- add_openvpn_arg (args, "--tls-remote"); +- add_openvpn_arg (args, tmp); ++ if (openvpn_binary_detect_version_cached (openvpn_binary, &openvpn_binary_version) != OPENVPN_BINARY_VERSION_2_4_OR_NEWER) { ++ _LOGW ("the tls-remote option is deprecated and removed from OpenVPN 2.4. Update your connection to use verify-x509-name"); ++ add_openvpn_arg (args, "--tls-remote"); ++ add_openvpn_arg (args, tmp); ++ } else { ++ _LOGW ("the tls-remote option is deprecated and removed from OpenVPN 2.4. For compatibility, the plugin uses \"verify-x509-name\" \"%s\" \"name\" instead. Update your connection to use verify-x509-name", tmp); ++ add_openvpn_arg (args, "--verify-x509-name"); ++ add_openvpn_arg (args, tmp); ++ add_openvpn_arg (args, "name"); ++ } ++ tls_remote = tmp; + } + + /* verify-x509-name */ +@@ -1461,6 +1537,13 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, + const char *name; + gs_free char *type = NULL; + ++ if (tls_remote) { ++ g_set_error (error, NM_VPN_PLUGIN_ERROR, ++ NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, ++ _("Invalid configuration with tls-remote and verify-x509-name.")); ++ return FALSE; ++ } ++ + name = strchr (tmp, ':'); + if (name) { + type = g_strndup (tmp, name - tmp); +-- +2.9.3 + + +From 11049e7c888fcc74896b34ea86f09d38a561fc35 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Mon, 13 Feb 2017 12:56:27 +0100 +Subject: [PATCH 4/4] properties: discourage use of tls-remote in GUI + +Mark the entry as "error" when selecting the deprecated +tls-remote option. + +This is to make it more apparent to the user that he +should avoid this setting. + +(cherry picked from commit 1c2986b8881b3b28d493f66cc804da12712cc2a7) +--- + properties/auth-helpers.c | 14 ++++++++++++-- + properties/import-export.c | 2 +- + properties/nm-openvpn-dialog.ui | 2 ++ + 3 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c +index 4d1e1ce..2f880dd 100644 +--- a/properties/auth-helpers.c ++++ b/properties/auth-helpers.c +@@ -1211,7 +1211,7 @@ populate_tls_remote_mode_entry_combo (GtkEntry* entry, GtkComboBox *box, + + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, +- TLS_REMOTE_MODE_COL_NAME, _("Verify subject partially (legacy mode)"), ++ TLS_REMOTE_MODE_COL_NAME, _("Verify subject partially (legacy mode, strongly discouraged)"), + TLS_REMOTE_MODE_COL_VALUE, TLS_REMOTE_MODE_LEGACY, + -1); + +@@ -1250,6 +1250,7 @@ tls_remote_changed (GtkWidget *widget, gpointer user_data) + GtkWidget *entry, *combo, *ok_button; + GtkTreeIter iter; + gboolean entry_enabled = TRUE, entry_has_error = FALSE; ++ gboolean legacy_tls_remote = FALSE; + + entry = GTK_WIDGET (gtk_builder_get_object (builder, "tls_remote_entry")); + combo = GTK_WIDGET (gtk_builder_get_object (builder, "tls_remote_mode_combo")); +@@ -1272,6 +1273,7 @@ tls_remote_changed (GtkWidget *widget, gpointer user_data) + + entry_enabled = TRUE; + entry_has_error = !subject || !subject[0]; ++ legacy_tls_remote = nm_streq (tls_remote_mode, TLS_REMOTE_MODE_LEGACY); + } + } + +@@ -1280,9 +1282,17 @@ tls_remote_changed (GtkWidget *widget, gpointer user_data) + widget_set_error (entry); + gtk_widget_set_sensitive (ok_button, FALSE); + } else { +- widget_unset_error (entry); ++ if (legacy_tls_remote) { ++ /* selecting tls-remote is not an error, but strongly discouraged. I wish ++ * there would be a warning-class as well. Anyway, mark the widget as ++ * erroneous, although this doesn't make the connection invalid (which ++ * is an ugly inconsistency). */ ++ widget_set_error (entry); ++ } else ++ widget_unset_error (entry); + gtk_widget_set_sensitive (ok_button, TRUE); + } ++ + } + + static void +diff --git a/properties/import-export.c b/properties/import-export.c +index 1993026..7b42e0b 100644 +--- a/properties/import-export.c ++++ b/properties/import-export.c +@@ -1256,7 +1256,7 @@ do_import (const char *path, const char *contents, gsize contents_len, GError ** + } + + if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_VERIFY_X509_NAME)) { +- const char *type = "subject"; ++ const char *type = NM_OPENVPN_VERIFY_X509_NAME_TYPE_SUBJECT; + gs_free char *item = NULL; + + if (!args_params_check_nargs_minmax (params, 1, 2, &line_error)) +diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui +index b2ca176..5558b70 100644 +--- a/properties/nm-openvpn-dialog.ui ++++ b/properties/nm-openvpn-dialog.ui +@@ -1918,6 +1918,8 @@ When enabled, connection will only succeed if the server certificate matches som + Matching can either apply to the whole certificate subject (all the fields), + or just the Common Name (CN field). + ++The legacy option tls-remote is deprecated and removed from OpenVPN 2.4 and newer. Do not use it anymore. ++ + config: verify-x509-name subject-or-name [mode] + config (legacy mode): tls-remote subject-or-name + model9 +-- +2.9.3 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index adb90c8..a46a5e4 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,13 +2,13 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz -#Patch1: 0001-xxx.patch +Patch1: 0001-tls-remote-workaround-rh1421241.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -49,7 +49,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -#%patch1 -p1 +%patch1 -p1 %build if [ ! -f configure ]; then @@ -97,6 +97,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Mon Feb 27 2017 Thomas Haller - 1:1.2.8-2 +- Workaround removed tls-remote option with Openvpn 2.4 (rh#1421241) + * Fri Feb 10 2017 Jon Ciesla - 1:1.2.8-1 - 1.2.8 From 4ca7c2846397c2103a2a9487171c9e37bdf4860d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 17 May 2017 16:13:11 +0200 Subject: [PATCH 111/129] Update to 1.2.10 release --- .gitignore | 1 + 0001-tls-remote-workaround-rh1421241.patch | 471 --------------------- NetworkManager-openvpn.spec | 11 +- sources | 2 +- 4 files changed, 7 insertions(+), 478 deletions(-) delete mode 100644 0001-tls-remote-workaround-rh1421241.patch diff --git a/.gitignore b/.gitignore index 7646016..32e2252 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.5-dev-45-ga84840b.tar.xz /NetworkManager-openvpn-1.2.6.tar.xz /NetworkManager-openvpn-1.2.8.tar.xz +/NetworkManager-openvpn-1.2.10.tar.xz diff --git a/0001-tls-remote-workaround-rh1421241.patch b/0001-tls-remote-workaround-rh1421241.patch deleted file mode 100644 index 3c74d6b..0000000 --- a/0001-tls-remote-workaround-rh1421241.patch +++ /dev/null @@ -1,471 +0,0 @@ -From 40ee847d32c11d0bc7c1b06fefa9a9ef8e2b0570 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Mon, 13 Feb 2017 12:30:16 +0100 -Subject: [PATCH 1/4] service: avoid strlen() for checking whether a string is - empty - -Possibly the compiler can optimize it not to evaluate the full string length, -just to verify whether the string is empty. Still, I think it's bad style. - -(cherry picked from commit 2a4a4a49d8b97e3cbe37307f6b6c1053df946ce4) ---- - src/nm-openvpn-service.c | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c -index d7bd29f..d6e36a6 100644 ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -1406,7 +1406,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - /* Cipher */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CIPHER); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--cipher"); - add_openvpn_arg (args, tmp); - } -@@ -1419,7 +1419,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - /* Keysize */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_KEYSIZE); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--keysize"); - if (!add_openvpn_arg_int (args, tmp)) { - g_set_error (error, -@@ -1440,25 +1440,25 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - /* TA */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--tls-auth"); - add_openvpn_arg_utf8safe (args, tmp); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA_DIR); -- if (tmp && strlen (tmp)) -+ if (tmp && tmp[0]) - add_openvpn_arg (args, tmp); - } - - /* tls-remote */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_REMOTE); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--tls-remote"); - add_openvpn_arg (args, tmp); - } - - /* verify-x509-name */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_VERIFY_X509_NAME); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - const char *name; - gs_free char *type = NULL; - -@@ -1483,7 +1483,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - /* remote-cert-tls */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE_CERT_TLS); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--remote-cert-tls"); - add_openvpn_arg (args, tmp); - } -@@ -1500,7 +1500,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - if (!connection_type_is_tls_mode (connection_type)) { - /* Ignore --reneg-sec option if we are not in TLS mode (as enabled - * by --client below). openvpn will error out otherwise, see bgo#749050. */ -- } else if (tmp && strlen (tmp)) { -+ } else if (tmp && tmp[0]) { - add_openvpn_arg (args, "--reneg-sec"); - if (!add_openvpn_arg_int (args, tmp)) { - g_set_error (error, -@@ -1532,7 +1532,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - /* TUN MTU size */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TUNNEL_MTU); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--tun-mtu"); - if (!add_openvpn_arg_int (args, tmp)) { - g_set_error (error, -@@ -1546,7 +1546,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - /* fragment size */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_FRAGMENT_SIZE); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--fragment"); - if (!add_openvpn_arg_int (args, tmp)) { - g_set_error (error, -@@ -1620,12 +1620,12 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - add_cert_args (args, s_vpn); - } else if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--secret"); - add_openvpn_arg_utf8safe (args, tmp); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_STATIC_KEY_DIRECTION); -- if (tmp && strlen (tmp)) -+ if (tmp && tmp[0]) - add_openvpn_arg (args, tmp); - } - -@@ -1659,7 +1659,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - add_openvpn_arg (args, "--auth-user-pass"); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CA); -- if (tmp && strlen (tmp)) { -+ if (tmp && tmp[0]) { - add_openvpn_arg (args, "--ca"); - add_openvpn_arg_utf8safe (args, tmp); - } --- -2.9.3 - - -From 1a21babccc3eb77c5b4a2953e7c45aaec670b120 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Mon, 13 Feb 2017 11:31:40 +0100 -Subject: [PATCH 2/4] service: minor refactoring of nm_find_openvpn() - -And rename to openvpn_binary_find_exepath(). -The prefix "openvpn_binary_" will be used for related functions. - -(cherry picked from commit 05cb6356bb4d27fb1c2ca5f8a7bfdf23fe424f0c) ---- - src/nm-openvpn-service.c | 41 ++++++++++++++++++++--------------------- - 1 file changed, 20 insertions(+), 21 deletions(-) - -diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c -index d6e36a6..d88ed19 100644 ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -188,6 +188,25 @@ _LOGD_enabled (void) - - /*****************************************************************************/ - -+static const char * -+openvpn_binary_find_exepath (void) -+{ -+ static const char *paths[] = { -+ "/usr/sbin/openvpn", -+ "/sbin/openvpn", -+ "/usr/local/sbin/openvpn", -+ }; -+ int i; -+ -+ for (i = 0; i < G_N_ELEMENTS (paths); i++) { -+ if (g_file_test (paths[i], G_FILE_TEST_EXISTS)) -+ return paths[i]; -+ } -+ return NULL; -+} -+ -+/*****************************************************************************/ -+ - static void - pids_pending_data_free (PidsPendingData *pid_data) - { -@@ -886,26 +905,6 @@ connection_type_is_tls_mode (const char *connection_type) - || strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS) == 0; - } - --static const char * --nm_find_openvpn (void) --{ -- static const char *openvpn_binary_paths[] = { -- "/usr/sbin/openvpn", -- "/sbin/openvpn", -- "/usr/local/sbin/openvpn", -- NULL -- }; -- const char **openvpn_binary = openvpn_binary_paths; -- -- while (*openvpn_binary != NULL) { -- if (g_file_test (*openvpn_binary, G_FILE_TEST_EXISTS)) -- break; -- openvpn_binary++; -- } -- -- return *openvpn_binary; --} -- - static void - add_openvpn_arg (GPtrArray *args, const char *arg) - { -@@ -1154,7 +1153,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - return FALSE; - - /* Find openvpn */ -- openvpn_binary = nm_find_openvpn (); -+ openvpn_binary = openvpn_binary_find_exepath (); - if (!openvpn_binary) { - g_set_error_literal (error, - NM_VPN_PLUGIN_ERROR, --- -2.9.3 - - -From adc7dd5148c12917eee1c2c92ddb605e2ecd6b2c Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Mon, 13 Feb 2017 12:30:26 +0100 -Subject: [PATCH 3/4] service: for OpenVPN 2.4 and newer, handle --tls-remote - option via --verify-x509-name - -The tls-remote option got removed from OpenVPN 2.4. This requires users -to fix their existing configurations to use verify-x509-name instead. - -Using tls-remote on a recent OpenVPN binary thus fails to establish -the connection, which is an annoyance for the user. Let the plugin -automatically convert the "tls-remote $NAME" option to "verify-x509-name -$NAME name". Note that the two options are not entirely equivalent, thus -the is a chance that this wrongly rejects a server that would have worked -before, or ever worse, that it wronlgy accepts a server that would have -been rejected. - -But in most common cases, the workaround should work fine. -The user is still strongly encouraged to update his configuration. - -https://bugzilla.gnome.org/show_bug.cgi?id=776045 -https://bugzilla.redhat.com/show_bug.cgi?id=1421241 -(cherry picked from commit f7421ef277222bd640c432afefc21ef5a98477bc) ---- - src/nm-openvpn-service.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 85 insertions(+), 2 deletions(-) - -diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c -index d88ed19..fa59537 100644 ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -70,6 +70,13 @@ G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_SERVICE_PLUGIN) - - #define NM_OPENVPN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_OPENVPN_PLUGIN, NMOpenvpnPluginPrivate)) - -+typedef enum { -+ OPENVPN_BINARY_VERSION_INVALID, -+ OPENVPN_BINARY_VERSION_UNKNOWN, -+ OPENVPN_BINARY_VERSION_2_3_OR_OLDER, -+ OPENVPN_BINARY_VERSION_2_4_OR_NEWER, -+} OpenvpnBinaryVersion; -+ - typedef struct { - char *default_username; - char *username; -@@ -205,6 +212,64 @@ openvpn_binary_find_exepath (void) - return NULL; - } - -+static OpenvpnBinaryVersion -+openvpn_binary_detect_version (const char *exepath) -+{ -+ gs_free char *s_stdout = NULL; -+ const char *s; -+ int exit_code; -+ int n; -+ -+ g_return_val_if_fail (exepath && exepath[0] == '/', OPENVPN_BINARY_VERSION_UNKNOWN); -+ -+ if (!g_spawn_sync (NULL, -+ (char *[]) { (char *) exepath, "--version", NULL }, -+ NULL, -+ G_SPAWN_STDERR_TO_DEV_NULL, -+ NULL, -+ NULL, -+ &s_stdout, -+ NULL, -+ &exit_code, -+ NULL)) -+ return OPENVPN_BINARY_VERSION_UNKNOWN; -+ -+ if ( !WIFEXITED (exit_code) -+ || WEXITSTATUS (exit_code) != 1) { -+ /* expect return code 1 (OPENVPN_EXIT_STATUS_USAGE) */ -+ return OPENVPN_BINARY_VERSION_UNKNOWN; -+ } -+ -+ /* the output for --version starts with title_string, which starts with PACKAGE_STRING, -+ * which looks like "OpenVPN 2.#...". Do a strict parsing here... */ -+ if ( !s_stdout -+ || !g_str_has_prefix (s_stdout, "OpenVPN 2.")) -+ return OPENVPN_BINARY_VERSION_UNKNOWN; -+ s = &s_stdout[NM_STRLEN ("OpenVPN 2.")]; -+ -+ if (!g_ascii_isdigit (s[0])) -+ return OPENVPN_BINARY_VERSION_UNKNOWN; -+ -+ n = 0; -+ do { -+ if (n > G_MAXINT / 100) -+ return OPENVPN_BINARY_VERSION_UNKNOWN; -+ n = (n * 10) + (s[0] - '0'); -+ } while (g_ascii_isdigit ((++s)[0])); -+ -+ if (n <= 3) -+ return OPENVPN_BINARY_VERSION_2_3_OR_OLDER; -+ return OPENVPN_BINARY_VERSION_2_4_OR_NEWER; -+} -+ -+static OpenvpnBinaryVersion -+openvpn_binary_detect_version_cached (const char *exepath, OpenvpnBinaryVersion *cached) -+{ -+ if (G_UNLIKELY (*cached == OPENVPN_BINARY_VERSION_INVALID)) -+ *cached = openvpn_binary_detect_version (exepath); -+ return *cached; -+} -+ - /*****************************************************************************/ - - static void -@@ -1119,12 +1184,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - gboolean dev_type_is_tap; - char *stmp; - const char *defport, *proto_tcp; -+ const char *tls_remote = NULL; - const char *nm_openvpn_user, *nm_openvpn_group, *nm_openvpn_chroot; - gs_free char *bus_name = NULL; - NMSettingVpn *s_vpn; - const char *connection_type; - gint64 v_int64; - char sbuf_64[65]; -+ OpenvpnBinaryVersion openvpn_binary_version = OPENVPN_BINARY_VERSION_INVALID; - - s_vpn = nm_connection_get_setting_vpn (connection); - if (!s_vpn) { -@@ -1451,8 +1518,17 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - /* tls-remote */ - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_REMOTE); - if (tmp && tmp[0]) { -- add_openvpn_arg (args, "--tls-remote"); -- add_openvpn_arg (args, tmp); -+ if (openvpn_binary_detect_version_cached (openvpn_binary, &openvpn_binary_version) != OPENVPN_BINARY_VERSION_2_4_OR_NEWER) { -+ _LOGW ("the tls-remote option is deprecated and removed from OpenVPN 2.4. Update your connection to use verify-x509-name"); -+ add_openvpn_arg (args, "--tls-remote"); -+ add_openvpn_arg (args, tmp); -+ } else { -+ _LOGW ("the tls-remote option is deprecated and removed from OpenVPN 2.4. For compatibility, the plugin uses \"verify-x509-name\" \"%s\" \"name\" instead. Update your connection to use verify-x509-name", tmp); -+ add_openvpn_arg (args, "--verify-x509-name"); -+ add_openvpn_arg (args, tmp); -+ add_openvpn_arg (args, "name"); -+ } -+ tls_remote = tmp; - } - - /* verify-x509-name */ -@@ -1461,6 +1537,13 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - const char *name; - gs_free char *type = NULL; - -+ if (tls_remote) { -+ g_set_error (error, NM_VPN_PLUGIN_ERROR, -+ NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, -+ _("Invalid configuration with tls-remote and verify-x509-name.")); -+ return FALSE; -+ } -+ - name = strchr (tmp, ':'); - if (name) { - type = g_strndup (tmp, name - tmp); --- -2.9.3 - - -From 11049e7c888fcc74896b34ea86f09d38a561fc35 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Mon, 13 Feb 2017 12:56:27 +0100 -Subject: [PATCH 4/4] properties: discourage use of tls-remote in GUI - -Mark the entry as "error" when selecting the deprecated -tls-remote option. - -This is to make it more apparent to the user that he -should avoid this setting. - -(cherry picked from commit 1c2986b8881b3b28d493f66cc804da12712cc2a7) ---- - properties/auth-helpers.c | 14 ++++++++++++-- - properties/import-export.c | 2 +- - properties/nm-openvpn-dialog.ui | 2 ++ - 3 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index 4d1e1ce..2f880dd 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -1211,7 +1211,7 @@ populate_tls_remote_mode_entry_combo (GtkEntry* entry, GtkComboBox *box, - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, -- TLS_REMOTE_MODE_COL_NAME, _("Verify subject partially (legacy mode)"), -+ TLS_REMOTE_MODE_COL_NAME, _("Verify subject partially (legacy mode, strongly discouraged)"), - TLS_REMOTE_MODE_COL_VALUE, TLS_REMOTE_MODE_LEGACY, - -1); - -@@ -1250,6 +1250,7 @@ tls_remote_changed (GtkWidget *widget, gpointer user_data) - GtkWidget *entry, *combo, *ok_button; - GtkTreeIter iter; - gboolean entry_enabled = TRUE, entry_has_error = FALSE; -+ gboolean legacy_tls_remote = FALSE; - - entry = GTK_WIDGET (gtk_builder_get_object (builder, "tls_remote_entry")); - combo = GTK_WIDGET (gtk_builder_get_object (builder, "tls_remote_mode_combo")); -@@ -1272,6 +1273,7 @@ tls_remote_changed (GtkWidget *widget, gpointer user_data) - - entry_enabled = TRUE; - entry_has_error = !subject || !subject[0]; -+ legacy_tls_remote = nm_streq (tls_remote_mode, TLS_REMOTE_MODE_LEGACY); - } - } - -@@ -1280,9 +1282,17 @@ tls_remote_changed (GtkWidget *widget, gpointer user_data) - widget_set_error (entry); - gtk_widget_set_sensitive (ok_button, FALSE); - } else { -- widget_unset_error (entry); -+ if (legacy_tls_remote) { -+ /* selecting tls-remote is not an error, but strongly discouraged. I wish -+ * there would be a warning-class as well. Anyway, mark the widget as -+ * erroneous, although this doesn't make the connection invalid (which -+ * is an ugly inconsistency). */ -+ widget_set_error (entry); -+ } else -+ widget_unset_error (entry); - gtk_widget_set_sensitive (ok_button, TRUE); - } -+ - } - - static void -diff --git a/properties/import-export.c b/properties/import-export.c -index 1993026..7b42e0b 100644 ---- a/properties/import-export.c -+++ b/properties/import-export.c -@@ -1256,7 +1256,7 @@ do_import (const char *path, const char *contents, gsize contents_len, GError ** - } - - if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_VERIFY_X509_NAME)) { -- const char *type = "subject"; -+ const char *type = NM_OPENVPN_VERIFY_X509_NAME_TYPE_SUBJECT; - gs_free char *item = NULL; - - if (!args_params_check_nargs_minmax (params, 1, 2, &line_error)) -diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui -index b2ca176..5558b70 100644 ---- a/properties/nm-openvpn-dialog.ui -+++ b/properties/nm-openvpn-dialog.ui -@@ -1918,6 +1918,8 @@ When enabled, connection will only succeed if the server certificate matches som - Matching can either apply to the whole certificate subject (all the fields), - or just the Common Name (CN field). - -+The legacy option tls-remote is deprecated and removed from OpenVPN 2.4 and newer. Do not use it anymore. -+ - config: verify-x509-name subject-or-name [mode] - config (legacy mode): tls-remote subject-or-name - model9 --- -2.9.3 - diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index a46a5e4..1037f8e 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,15 +1,13 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.2.8 -Release: 2%{?dist} +Version: 1.2.10 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz -Patch1: 0001-tls-remote-workaround-rh1421241.patch - BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 @@ -49,8 +47,6 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -%patch1 -p1 - %build if [ ! -f configure ]; then ./autogen.sh @@ -97,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Wed May 17 2017 Lubomir Rintel - 1.2.10-1 +- Update to 1.2.10 release + * Mon Feb 27 2017 Thomas Haller - 1:1.2.8-2 - Workaround removed tls-remote option with Openvpn 2.4 (rh#1421241) diff --git a/sources b/sources index ed5d81b..0e55c75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.2.8.tar.xz) = e6d64106cd93f91d292a6b2346dc31317e1056d2bbaf09a376c84ffaaa8fd584f92999865bdf52531b44de7ae144e1ae9271b9efc564d99f8569b0d059ab8019 +SHA512 (NetworkManager-openvpn-1.2.10.tar.xz) = d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 From 5239c492cb78b7a658f2ffa901fbce32b1b8aa81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 01:56:50 +0000 Subject: [PATCH 112/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1037f8e..6ac2d36 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,7 +2,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1:1.2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed May 17 2017 Lubomir Rintel - 1.2.10-1 - Update to 1.2.10 release From 6664b9bea7f020e47112af74b7159acd84167dc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:01:57 +0000 Subject: [PATCH 113/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 6ac2d36..59668d3 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,7 +2,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.2.10 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1:1.2.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1:1.2.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 17465b058d6d905f2db635dda4736d32770aef45 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 21 Sep 2017 14:10:27 +0200 Subject: [PATCH 114/129] Update to 1.8.0 release --- .gitignore | 1 + NetworkManager-openvpn.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 32e2252..60e881d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.6.tar.xz /NetworkManager-openvpn-1.2.8.tar.xz /NetworkManager-openvpn-1.2.10.tar.xz +/NetworkManager-openvpn-1.8.0.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 59668d3..98dab06 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,12 +1,12 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.2.10 -Release: 3%{?dist} +Version: 1.8.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -87,12 +87,13 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_libexecdir}/nm-openvpn-auth-dialog %{_libdir}/NetworkManager/libnm-*-properties.so %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so -%dir %{_datadir}/gnome-vpn-properties/openvpn -%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Thu Sep 21 2017 Thomas Haller - 1:1.8.0-1 +- Update to 1.8.0 release + * Wed Aug 02 2017 Fedora Release Engineering - 1:1.2.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 0e55c75..15d67f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.2.10.tar.xz) = d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 +SHA512 (NetworkManager-openvpn-1.8.0.tar.xz) = fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c From a7c0b0f12054926d797efc5ebb15ea0fae8f6042 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Sep 2017 00:44:42 +0200 Subject: [PATCH 115/129] properties: fix handling user-ca in GUI --- ...operties-fix-unusable-config-imports.patch | 29 +++++++++++++++++++ NetworkManager-openvpn.spec | 9 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-properties-fix-unusable-config-imports.patch diff --git a/0001-properties-fix-unusable-config-imports.patch b/0001-properties-fix-unusable-config-imports.patch new file mode 100644 index 0000000..43f0a97 --- /dev/null +++ b/0001-properties-fix-unusable-config-imports.patch @@ -0,0 +1,29 @@ +From c79c951aa10524a238992314561c033e10f45882 Mon Sep 17 00:00:00 2001 +From: polygamma +Date: Mon, 25 Sep 2017 22:56:29 +0200 +Subject: [PATCH 1/1] properties: fix unusable config imports + +Fixes: 86a70095afc229f1f970b7e546390d166152cfc2 + +https://github.com/NetworkManager/network-manager-openvpn/pull/1 +(cherry picked from commit fcf4b58fe0da5994687469ebb0c6eac3cf083e83) +--- + properties/auth-helpers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c +index f9babfb..c55afd1 100644 +--- a/properties/auth-helpers.c ++++ b/properties/auth-helpers.c +@@ -544,7 +544,7 @@ update_tls (GtkBuilder *builder, const char *prefix, NMSettingVpn *s_vpn) + NM_OPENVPN_KEY_CERT, + NM_OPENVPN_KEY_KEY, + NM_OPENVPN_KEY_CERTPASS, +- prefix, "ca_cert", s_vpn); ++ prefix, "user_cert", s_vpn); + } + + static void +-- +2.13.5 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 98dab06..fc6b556 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,12 +2,14 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz +Patch1: 0001-properties-fix-unusable-config-imports.patch + BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 @@ -47,6 +49,8 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q +%patch1 -p1 + %build if [ ! -f configure ]; then ./autogen.sh @@ -91,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Wed Sep 26 2017 Thomas Haller - 1:1.8.0-2 +- properties: fix handling user-ca in GUI + * Thu Sep 21 2017 Thomas Haller - 1:1.8.0-1 - Update to 1.8.0 release From 72356d817ea52b1d649966f98b4cac1327aaa1b0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Sep 2017 00:50:45 +0200 Subject: [PATCH 116/129] fix date in changelog --- NetworkManager-openvpn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index fc6b556..6e98ad7 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -95,7 +95,7 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog -* Wed Sep 26 2017 Thomas Haller - 1:1.8.0-2 +* Tue Sep 26 2017 Thomas Haller - 1:1.8.0-2 - properties: fix handling user-ca in GUI * Thu Sep 21 2017 Thomas Haller - 1:1.8.0-1 From 4867c892cf944556b4950888172e799d5fe1c079 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 27 Sep 2017 10:27:49 +0200 Subject: [PATCH 117/129] properties: fix validation of static-key in GUI (bgo#788226) --- ...-fix-validation-of-static-key-in-GUI.patch | 33 +++++++++++++++++++ NetworkManager-openvpn.spec | 7 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0002-properties-fix-validation-of-static-key-in-GUI.patch diff --git a/0002-properties-fix-validation-of-static-key-in-GUI.patch b/0002-properties-fix-validation-of-static-key-in-GUI.patch new file mode 100644 index 0000000..07f98bd --- /dev/null +++ b/0002-properties-fix-validation-of-static-key-in-GUI.patch @@ -0,0 +1,33 @@ +From eae01ceaeed9bf2c46a3b402fef89024dde0853b Mon Sep 17 00:00:00 2001 +From: Brandon Guttersohn +Date: Wed, 27 Sep 2017 09:57:58 +0200 +Subject: [PATCH 1/1] properties: fix validation of static-key in GUI + +Otherwise it's not possible to edit a connection with static key. + +[thaller@redhat.com: modified original patch and add commit message] + +https://bugzilla.gnome.org/show_bug.cgi?id=788226 + +Fixes: 86a70095afc229f1f970b7e546390d166152cfc2 +(cherry picked from commit b83f028a6da067dcc9b31555c15411f0288ebda1) +--- + properties/auth-helpers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c +index c55afd1..16ff6e5 100644 +--- a/properties/auth-helpers.c ++++ b/properties/auth-helpers.c +@@ -449,7 +449,7 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e + } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) { + widget = GTK_WIDGET (gtk_builder_get_object (builder, "sk_key_chooser")); + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); +- if (filename && strlen (filename)) { ++ if (!filename || !filename[0]) { + g_free (filename); + g_set_error (error, + NMV_EDITOR_PLUGIN_ERROR, +-- +2.13.5 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 6e98ad7..0156f2b 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,13 +2,14 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz Patch1: 0001-properties-fix-unusable-config-imports.patch +Patch2: 0002-properties-fix-validation-of-static-key-in-GUI.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -50,6 +51,7 @@ the OpenVPN server with NetworkManager (GNOME files). %setup -q %patch1 -p1 +%patch2 -p1 %build if [ ! -f configure ]; then @@ -95,6 +97,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Wed Sep 27 2017 Thomas Haller - 1:1.8.0-3 +- properties: fix validation of static-key in GUI (bgo#788226) + * Tue Sep 26 2017 Thomas Haller - 1:1.8.0-2 - properties: fix handling user-ca in GUI From af16c1552615a73c6cd8d732c88f52260b56e837 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 30 Nov 2017 10:57:43 +0100 Subject: [PATCH 118/129] Drop libnm-glib for Fedora 28 --- NetworkManager-openvpn.spec | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0156f2b..6dfb100 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,8 +1,15 @@ +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%bcond_without libnm_glib +%else +# Disable the legacy version by default +%bcond_with libnm_glib +%endif + Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -13,22 +20,24 @@ Patch2: 0002-properties-fix-validation-of-static-key-in-GUI.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 +BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 BuildRequires: glib2-devel BuildRequires: libtool intltool gettext -BuildRequires: libnm-gtk-devel >= 1.2.0 BuildRequires: libnma-devel >= 1.2.0 BuildRequires: libsecret-devel +%if %with libnm_glib +BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 +BuildRequires: libnm-gtk-devel >= 1.2.0 +%endif + Requires: dbus Requires: NetworkManager >= 1:1.2.0 Requires: openvpn Requires(pre): shadow-utils Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 -%global _privatelibs libnm-openvpn-properties[.]so.* -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ +%global __provides_exclude ^libnm-.*\\.so %description This package contains software for integrating VPN capabilities with @@ -59,6 +68,9 @@ if [ ! -f configure ]; then fi %configure \ --disable-static \ +%if %without libnm_glib + --without-libnm-glib \ +%endif --enable-more-warnings=yes \ --with-dist-version=%{version}-%{release} make %{?_smp_mflags} @@ -91,12 +103,18 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %files -n NetworkManager-openvpn-gnome %{_libexecdir}/nm-openvpn-auth-dialog -%{_libdir}/NetworkManager/libnm-*-properties.so %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so -%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_datadir}/appdata/network-manager-openvpn.metainfo.xml +%if %with libnm_glib +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%endif + %changelog +* Thu Nov 30 2017 Lubomir Rintel - 1:1.8.0-4 +- Drop libnm-glib for Fedora 28 + * Wed Sep 27 2017 Thomas Haller - 1:1.8.0-3 - properties: fix validation of static-key in GUI (bgo#788226) From 94fca79862bbc31ac4e376e1313f66f658c720ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:49:37 +0000 Subject: [PATCH 119/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 6dfb100..e4ea939 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.8.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -112,6 +112,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1:1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Nov 30 2017 Lubomir Rintel - 1:1.8.0-4 - Drop libnm-glib for Fedora 28 From 843233903d4af60f4f4be8583c19e002a920607e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 12 Mar 2018 11:18:59 +0100 Subject: [PATCH 120/129] Update to 1.8.2 release --- .gitignore | 1 + ...operties-fix-unusable-config-imports.patch | 29 ---------------- ...-fix-validation-of-static-key-in-GUI.patch | 33 ------------------- NetworkManager-openvpn.spec | 13 ++++---- sources | 2 +- 5 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 0001-properties-fix-unusable-config-imports.patch delete mode 100644 0002-properties-fix-validation-of-static-key-in-GUI.patch diff --git a/.gitignore b/.gitignore index 60e881d..e72ea68 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.8.tar.xz /NetworkManager-openvpn-1.2.10.tar.xz /NetworkManager-openvpn-1.8.0.tar.xz +/NetworkManager-openvpn-1.8.2.tar.xz diff --git a/0001-properties-fix-unusable-config-imports.patch b/0001-properties-fix-unusable-config-imports.patch deleted file mode 100644 index 43f0a97..0000000 --- a/0001-properties-fix-unusable-config-imports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c79c951aa10524a238992314561c033e10f45882 Mon Sep 17 00:00:00 2001 -From: polygamma -Date: Mon, 25 Sep 2017 22:56:29 +0200 -Subject: [PATCH 1/1] properties: fix unusable config imports - -Fixes: 86a70095afc229f1f970b7e546390d166152cfc2 - -https://github.com/NetworkManager/network-manager-openvpn/pull/1 -(cherry picked from commit fcf4b58fe0da5994687469ebb0c6eac3cf083e83) ---- - properties/auth-helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index f9babfb..c55afd1 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -544,7 +544,7 @@ update_tls (GtkBuilder *builder, const char *prefix, NMSettingVpn *s_vpn) - NM_OPENVPN_KEY_CERT, - NM_OPENVPN_KEY_KEY, - NM_OPENVPN_KEY_CERTPASS, -- prefix, "ca_cert", s_vpn); -+ prefix, "user_cert", s_vpn); - } - - static void --- -2.13.5 - diff --git a/0002-properties-fix-validation-of-static-key-in-GUI.patch b/0002-properties-fix-validation-of-static-key-in-GUI.patch deleted file mode 100644 index 07f98bd..0000000 --- a/0002-properties-fix-validation-of-static-key-in-GUI.patch +++ /dev/null @@ -1,33 +0,0 @@ -From eae01ceaeed9bf2c46a3b402fef89024dde0853b Mon Sep 17 00:00:00 2001 -From: Brandon Guttersohn -Date: Wed, 27 Sep 2017 09:57:58 +0200 -Subject: [PATCH 1/1] properties: fix validation of static-key in GUI - -Otherwise it's not possible to edit a connection with static key. - -[thaller@redhat.com: modified original patch and add commit message] - -https://bugzilla.gnome.org/show_bug.cgi?id=788226 - -Fixes: 86a70095afc229f1f970b7e546390d166152cfc2 -(cherry picked from commit b83f028a6da067dcc9b31555c15411f0288ebda1) ---- - properties/auth-helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index c55afd1..16ff6e5 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -449,7 +449,7 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - widget = GTK_WIDGET (gtk_builder_get_object (builder, "sk_key_chooser")); - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); -- if (filename && strlen (filename)) { -+ if (!filename || !filename[0]) { - g_free (filename); - g_set_error (error, - NMV_EDITOR_PLUGIN_ERROR, --- -2.13.5 - diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index e4ea939..92926b2 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -8,15 +8,14 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.8.0 -Release: 5%{?dist} +Version: 1.8.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz -Patch1: 0001-properties-fix-unusable-config-imports.patch -Patch2: 0002-properties-fix-validation-of-static-key-in-GUI.patch +#Patch1: 0001-example.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -59,8 +58,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 %build if [ ! -f configure ]; then @@ -112,6 +110,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %endif %changelog +* Mon Mar 12 2018 Thomas Haller - 1:1.8.2-1 +- Update to 1.8.2 release + * Wed Feb 07 2018 Fedora Release Engineering - 1:1.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 15d67f3..04c840e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.8.0.tar.xz) = fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c +SHA512 (NetworkManager-openvpn-1.8.2.tar.xz) = c17f0de1d41df00b3359ab2dcce939574104b1272896bd403834b426c3fc3f177a5d2ea9cb5a1b98268f63095bc14c5904bd98c2fcf23481e78d8b8acb667927 From ea7c25ad9e309f4b73dfdbde2657adc54e5e2927 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Sat, 19 May 2018 15:03:07 +0200 Subject: [PATCH 121/129] Drop build dependency to NetworkManager-devel The NetworkManager-devel package doesn't exist anymore and is provided by NetworkManager-glib-devel. We already require NetworkManager-glib-devel when needed, so the NetworkManager-devel dependency can be dropped. --- NetworkManager-openvpn.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 92926b2..45a7ffe 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -18,7 +18,6 @@ Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name} #Patch1: 0001-example.patch BuildRequires: gtk3-devel -BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 BuildRequires: glib2-devel BuildRequires: libtool intltool gettext From 60f90d163c0a61bc6025d19ef1c71415a4e37902 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Sat, 19 May 2018 16:01:12 +0200 Subject: [PATCH 122/129] Update to 1.8.4 release --- .gitignore | 1 + NetworkManager-openvpn.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e72ea68..95e7de5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.10.tar.xz /NetworkManager-openvpn-1.8.0.tar.xz /NetworkManager-openvpn-1.8.2.tar.xz +/NetworkManager-openvpn-1.8.4.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 45a7ffe..714a597 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -8,7 +8,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.8.2 +Version: 1.8.4 Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -109,6 +109,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %endif %changelog +* Sat May 19 2018 Beniamino Galvani - 1:1.8.4-1 +- Update to 1.8.4 release + * Mon Mar 12 2018 Thomas Haller - 1:1.8.2-1 - Update to 1.8.2 release diff --git a/sources b/sources index 04c840e..34eb0ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.8.2.tar.xz) = c17f0de1d41df00b3359ab2dcce939574104b1272896bd403834b426c3fc3f177a5d2ea9cb5a1b98268f63095bc14c5904bd98c2fcf23481e78d8b8acb667927 +SHA512 (NetworkManager-openvpn-1.8.4.tar.xz) = dd0381175fa6a88259726a848ac46b7a5ee07a797cbe34382d3f4c0b6d8ad3807d224bfbb53cff793f4854558484d77fc7c6a6970e5364d39d058da5c35eac5a From e7a8a76cb6c419967b35ccabd55bbaf0264fc4bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:08:52 +0000 Subject: [PATCH 123/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 714a597..74ab607 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.8.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -109,6 +109,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %endif %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1:1.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat May 19 2018 Beniamino Galvani - 1:1.8.4-1 - Update to 1.8.4 release From b8f6cee323b9f87b1386630321a4ad6e472b14e0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 2 Oct 2018 11:01:17 +0200 Subject: [PATCH 124/129] Update to 1.8.6 release Also, update .spec file with some double-new-lines and variables for the version (like for network-manager-applet). --- .gitignore | 1 + NetworkManager-openvpn.spec | 31 ++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 95e7de5..0280c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.8.0.tar.xz /NetworkManager-openvpn-1.8.2.tar.xz /NetworkManager-openvpn-1.8.4.tar.xz +/NetworkManager-openvpn-1.8.6.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 74ab607..e8b6266 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,22 +1,28 @@ %if 0%{?fedora} < 28 && 0%{?rhel} < 8 %bcond_without libnm_glib %else -# Disable the legacy version by default -%bcond_with libnm_glib +%bcond_with libnm_glib %endif +%global real_version 1.8.6 +%global rpm_version 1.8.6 +%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') + Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.8.4 -Release: 2%{?dist} +Version: %{rpm_version} +Release: %{release_version}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/%{real_version_major}/%{name}-%{real_version}.tar.xz #Patch1: 0001-example.patch + BuildRequires: gtk3-devel BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 BuildRequires: glib2-devel @@ -35,12 +41,15 @@ Requires: openvpn Requires(pre): shadow-utils Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 + %global __provides_exclude ^libnm-.*\\.so + %description This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager. + %package -n NetworkManager-openvpn-gnome Summary: NetworkManager VPN plugin for OpenVPN - GNOME files Group: System Environment/Base @@ -54,10 +63,10 @@ Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 This package contains software for integrating VPN capabilities with the OpenVPN server with NetworkManager (GNOME files). + %prep -%setup -q +%autosetup -p1 -n "%{name}-%{real_version}" -#%patch1 -p1 %build if [ ! -f configure ]; then @@ -72,9 +81,11 @@ fi --with-dist-version=%{version}-%{release} make %{?_smp_mflags} + %check make check + %pre getent group nm-openvpn >/dev/null || groupadd -r nm-openvpn getent passwd nm-openvpn >/dev/null || \ @@ -82,6 +93,7 @@ getent passwd nm-openvpn >/dev/null || \ -c "Default user for running openvpn spawned by NetworkManager" nm-openvpn exit 0 + %install make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" @@ -98,6 +110,7 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %doc AUTHORS README ChangeLog %license COPYING + %files -n NetworkManager-openvpn-gnome %{_libexecdir}/nm-openvpn-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so @@ -108,7 +121,11 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %endif + %changelog +* Tue Oct 2 2018 Thomas Haller - 1:1.8.6-1 +- Update to 1.8.6 release + * Thu Jul 12 2018 Fedora Release Engineering - 1:1.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 34eb0ec..8f26d3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.8.4.tar.xz) = dd0381175fa6a88259726a848ac46b7a5ee07a797cbe34382d3f4c0b6d8ad3807d224bfbb53cff793f4854558484d77fc7c6a6970e5364d39d058da5c35eac5a +SHA512 (NetworkManager-openvpn-1.8.6.tar.xz) = a2d711be58810aad337b9c8bdead1ba6f64c1d1315a772ab79815624794c79668ab5056587be7096ac7367554c16114c2a3805a03484c2ea265ba4cd3bd54d32 From b5a2bc3216dca605c4d0d47a5405af5f96e367a8 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 17 Oct 2018 14:07:24 +0200 Subject: [PATCH 125/129] Update to 1.8.8 release --- .gitignore | 1 + NetworkManager-openvpn.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0280c9e..2484ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.8.2.tar.xz /NetworkManager-openvpn-1.8.4.tar.xz /NetworkManager-openvpn-1.8.6.tar.xz +/NetworkManager-openvpn-1.8.8.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index e8b6266..388e574 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,8 +4,8 @@ %bcond_with libnm_glib %endif -%global real_version 1.8.6 -%global rpm_version 1.8.6 +%global real_version 1.8.8 +%global rpm_version 1.8.8 %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') @@ -123,6 +123,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %changelog +* Wed Oct 17 2018 Beniamino Galvani - 1:1.8.8-1 +- Update to 1.8.8 release + * Tue Oct 2 2018 Thomas Haller - 1:1.8.6-1 - Update to 1.8.6 release diff --git a/sources b/sources index 8f26d3d..5ce7975 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.8.6.tar.xz) = a2d711be58810aad337b9c8bdead1ba6f64c1d1315a772ab79815624794c79668ab5056587be7096ac7367554c16114c2a3805a03484c2ea265ba4cd3bd54d32 +SHA512 (NetworkManager-openvpn-1.8.8.tar.xz) = 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574 From dac1fbe4637c96c4705b658bc444d8593d13aef2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:55 +0100 Subject: [PATCH 126/129] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- NetworkManager-openvpn.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 388e574..fdb1329 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -17,7 +17,6 @@ Version: %{rpm_version} Release: %{release_version}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/%{real_version_major}/%{name}-%{real_version}.tar.xz #Patch1: 0001-example.patch @@ -52,7 +51,6 @@ the OpenVPN server with NetworkManager. %package -n NetworkManager-openvpn-gnome Summary: NetworkManager VPN plugin for OpenVPN - GNOME files -Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: gtk3 From 7a055f6f6c5d723ace225333fe02c39d20848d62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:43:26 +0000 Subject: [PATCH 127/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index fdb1329..1327d31 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -14,7 +14,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: %{rpm_version} -Release: %{release_version}%{?dist} +Release: %{release_version}%{?dist}.1 License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -121,6 +121,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1:1.8.8-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Oct 17 2018 Beniamino Galvani - 1:1.8.8-1 - Update to 1.8.8 release From 78d30230186cd773f214d69ef593a0452f290f74 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 8 Feb 2019 18:28:29 +0100 Subject: [PATCH 128/129] Update to 1.8.10 release --- .gitignore | 1 + NetworkManager-openvpn.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2484ccf..0184495 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.8.4.tar.xz /NetworkManager-openvpn-1.8.6.tar.xz /NetworkManager-openvpn-1.8.8.tar.xz +/NetworkManager-openvpn-1.8.10.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 1327d31..ca4d1b9 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -4,8 +4,8 @@ %bcond_with libnm_glib %endif -%global real_version 1.8.8 -%global rpm_version 1.8.8 +%global real_version 1.8.10 +%global rpm_version 1.8.10 %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') @@ -14,7 +14,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: %{rpm_version} -Release: %{release_version}%{?dist}.1 +Release: %{release_version}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -121,6 +121,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %changelog +* Fri Feb 8 2019 Beniamino Galvani - 1:1.8.10-1 +- Update to 1.8.10 release + * Thu Jan 31 2019 Fedora Release Engineering - 1:1.8.8-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 5ce7975..9ced4be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.8.8.tar.xz) = 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574 +SHA512 (NetworkManager-openvpn-1.8.10.tar.xz) = f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc From 32ec29530c99a64197f27911240c34306b8a824b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 16:00:38 +0000 Subject: [PATCH 129/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-openvpn.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index ca4d1b9..9406376 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -14,7 +14,7 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: %{rpm_version} -Release: %{release_version}%{?dist} +Release: %{release_version}%{?dist}.1 License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -121,6 +121,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1:1.8.10-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 8 2019 Beniamino Galvani - 1:1.8.10-1 - Update to 1.8.10 release