From f02c27bd99f90c6e66f253b5a0d124cabe69a69a Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 25 Apr 2008 15:35:15 +0000 Subject: [PATCH 01/81] a dead end --- dead.package | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 dead.package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..81c8f1d --- /dev/null +++ b/dead.package @@ -0,0 +1,5 @@ +Later versions of this are named "NetworkManager-ppp_vpn", since they are no longer PPTP specific. +They compile against 0.7, but don't work at all. In case you are interested fixing it upstream, +you're be much thanked. In case you wish to package it in Fedora, I'll gladly help. + +Lubomir Kundrak From d79268e7b079f86749c373a94b8939a6a1390b64 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Fri, 29 Aug 2008 13:47:10 +0000 Subject: [PATCH 02/81] not dead yet\! --- dead.package | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 dead.package diff --git a/dead.package b/dead.package deleted file mode 100644 index 81c8f1d..0000000 --- a/dead.package +++ /dev/null @@ -1,5 +0,0 @@ -Later versions of this are named "NetworkManager-ppp_vpn", since they are no longer PPTP specific. -They compile against 0.7, but don't work at all. In case you are interested fixing it upstream, -you're be much thanked. In case you wish to package it in Fedora, I'll gladly help. - -Lubomir Kundrak From 800efb20f9aa78142660392891253dcfd67cd969 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Fri, 29 Aug 2008 14:07:37 +0000 Subject: [PATCH 03/81] - Resurrect from the dead --- NetworkManager-pptp.spec | 128 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 NetworkManager-pptp.spec diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec new file mode 100644 index 0000000..fc8ac52 --- /dev/null +++ b/NetworkManager-pptp.spec @@ -0,0 +1,128 @@ +%define nm_version 1:0.7.0-0.11.svn4022 +%define dbus_version 1.1 +%define gtk2_version 2.10.0 +%define ppp_version 2.2.4 +%define shared_mime_version 0.16-3 + +%define svn_snapshot svn4027 + +Summary: NetworkManager VPN integration for pptp +Name: NetworkManager-pptp +Epoch: 1 +Version: 0.7.0 +Release: 0.10.%{svn_snapshot}%{?dist} +License: GPLv2+ +Group: System Environment/Base +URL: http://www.gnome.org/projects/NetworkManager/ +Source: %{name}-%{version}.%{svn_snapshot}.tar.bz2 +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: GConf2-devel +BuildRequires: libgnomeui-devel +BuildRequires: gnome-keyring-devel +BuildRequires: libglade2-devel +BuildRequires: intltool gettext +BuildRequires: ppp-devel >= %{ppp_version} + +Requires: gtk2 >= %{gtk2_version} +Requires: dbus >= %{dbus_version} +Requires: NetworkManager >= %{nm_version} +Requires: ppp >= %{ppp_version} +Requires: shared-mime-info >= %{shared_mime_version} +Requires: GConf2 +Requires: gnome-keyring +Requires(post): /sbin/ldconfig desktop-file-utils +Requires(postun): /sbin/ldconfig desktop-file-utils + + +%description +This package contains software for integrating PPTP VPN support with +the NetworkManager and the GNOME desktop. + +%prep +%setup -q + + +%build +%configure --enable-more-warnings=yes +make %{?_smp_mflags} + +%install + +make install DESTDIR=$RPM_BUILD_ROOT + +rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la +rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a + +rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.la +rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.a + +%find_lang %{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +/sbin/ldconfig +/usr/bin/update-desktop-database &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/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 %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + + +%files -f %{name}.lang +%defattr(-, root, root) + +%doc AUTHORS ChangeLog +%{_libdir}/NetworkManager/lib*.so* +%{_libexecdir}/nm-pptp-auth-dialog +%{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf +%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name +%{_libexecdir}/nm-pptp-service +%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.so +%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade +%{_datadir}/applications/nm-pptp.desktop +%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png + +%changelog +* Fri Aug 29 2008 Dan Williams 1:0.7.0-10.svn4027 +- Resurrect from the dead + +* Mon Apr 21 2008 Lubomir Kundrak 0.6.4-2 +- Take Dan Horak's review into account (#443807): +- Do not install versioned .so-s for properties module +- Do not do useless ldconfigs +- Remove leftover dependencies + +* Mon Apr 21 2008 Lubomir Kundrak 0.6.4-1 +- Branch this for EPEL, go back to: +- 0.6.4 +- NetworkManager-pptp from NetworkManager-ppp_vpn +- Install pppd plugin correctly + +* Wed Nov 21 2007 Lubomir Kundrak 0.7.0-0.3.svn3549 +- Update against trunk + +* Wed Nov 21 2007 Lubomir Kundrak 0.7.0-0.2.svn3085 +- Do not exclude .so for NM, and properly generate the .name file + +* Thu Nov 15 2007 Lubomir Kundrak 0.7.0-0.1.svn3085 +- Initial packaging attempt, inspired by NetworkManager-openvpn +- Nearly completly rewritten spec, all bugs in it are solely my responsibility + From d4e1f72dbe0261b8307d2ab1886fe19ff1e22d28 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Fri, 29 Aug 2008 14:13:02 +0000 Subject: [PATCH 04/81] oops, forgot the sources --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index e69de29..bc9e32b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +NetworkManager-pptp-0.7.0.svn4027.tar.bz2 diff --git a/sources b/sources index e69de29..fdd53ad 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ed1756507151434252f32e2a54916a4e NetworkManager-pptp-0.7.0.svn4027.tar.bz2 From 50c43416d0d5aa675705ba66b3b1fc9a08ac20f3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 5 Oct 2008 18:45:45 +0000 Subject: [PATCH 05/81] - Add pptp dependency (#465644) --- NetworkManager-pptp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index fc8ac52..a7bf898 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN integration for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.0 -Release: 0.10.%{svn_snapshot}%{?dist} +Release: 0.11.%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -33,6 +33,7 @@ Requires: dbus >= %{dbus_version} Requires: NetworkManager >= %{nm_version} Requires: ppp >= %{ppp_version} Requires: shared-mime-info >= %{shared_mime_version} +Requires: pptp Requires: GConf2 Requires: gnome-keyring Requires(post): /sbin/ldconfig desktop-file-utils @@ -101,6 +102,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %changelog +* Sun Oct 05 2008 Lubomir Rintel 1:0.7.0-11.svn4027 +- Add pptp dependency (#465644) + * Fri Aug 29 2008 Dan Williams 1:0.7.0-10.svn4027 - Resurrect from the dead From bdfcb5528e5e261bd135036f281e8404014c4bf3 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 13 Oct 2008 00:03:15 +0000 Subject: [PATCH 06/81] - Rebuild for updated NetworkManager - Allow changing passwords from the connection editor --- .cvsignore | 1 + NetworkManager-pptp.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bc9e32b..20db516 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ NetworkManager-pptp-0.7.0.svn4027.tar.bz2 +NetworkManager-pptp-0.7.0.svn4178.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a7bf898..7ab43f9 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4027 +%define svn_snapshot svn4178 Summary: NetworkManager VPN integration for pptp Name: NetworkManager-pptp @@ -102,6 +102,10 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %changelog +* Sun Oct 12 2008 Dan Williams 1:0.7.0-11.svn4178 +- Rebuild for updated NetworkManager +- Allow changing passwords from the connection editor + * Sun Oct 05 2008 Lubomir Rintel 1:0.7.0-11.svn4027 - Add pptp dependency (#465644) diff --git a/sources b/sources index fdd53ad..14bf0ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed1756507151434252f32e2a54916a4e NetworkManager-pptp-0.7.0.svn4027.tar.bz2 +1bbe2bb35b026ea4fd127e085c426c8d NetworkManager-pptp-0.7.0.svn4178.tar.bz2 From 59f060ac1249c8c6f4df57eb27d4d57b87188803 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Tue, 28 Oct 2008 03:45:37 +0000 Subject: [PATCH 07/81] - Rebuild for updated NetworkManager - Ensure that certain PPP options are always overriden --- .cvsignore | 1 + NetworkManager-pptp.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 20db516..c02f691 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ NetworkManager-pptp-0.7.0.svn4027.tar.bz2 NetworkManager-pptp-0.7.0.svn4178.tar.bz2 +NetworkManager-pptp-0.7.0.svn4229.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 7ab43f9..fd8bd15 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4178 +%define svn_snapshot svn4229 Summary: NetworkManager VPN integration for pptp Name: NetworkManager-pptp @@ -102,6 +102,10 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %changelog +* Mon Oct 27 2008 Dan Williams 1:0.7.0-11.svn4229 +- Rebuild for updated NetworkManager +- Ensure that certain PPP options are always overriden + * Sun Oct 12 2008 Dan Williams 1:0.7.0-11.svn4178 - Rebuild for updated NetworkManager - Allow changing passwords from the connection editor diff --git a/sources b/sources index 14bf0ee..3311ed5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bbe2bb35b026ea4fd127e085c426c8d NetworkManager-pptp-0.7.0.svn4178.tar.bz2 +d0638ecb71c4f9047ca1036159134db3 NetworkManager-pptp-0.7.0.svn4229.tar.bz2 From cdbe87a3ad49138f2fd59d2042fcfe6f4746054a Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 30 Oct 2008 03:21:40 +0000 Subject: [PATCH 08/81] - Fix hang in auth dialog (rh #467007) --- NetworkManager-pptp.spec | 8 +++++++- nm-pptp-free.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 nm-pptp-free.patch diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index fd8bd15..4445283 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -10,13 +10,15 @@ Summary: NetworkManager VPN integration for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.0 -Release: 0.11.%{svn_snapshot}%{?dist} +Release: 0.12.%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.%{svn_snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch0: nm-pptp-free.patch + BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: NetworkManager-devel >= %{nm_version} @@ -47,6 +49,7 @@ the NetworkManager and the GNOME desktop. %prep %setup -q +%patch0 -p1 -b .free %build %configure --enable-more-warnings=yes @@ -102,6 +105,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %changelog +* Wed Oct 29 2008 Dan Williams 1:0.7.0-12.svn4229 +- Fix hang in auth dialog (rh #467007) + * Mon Oct 27 2008 Dan Williams 1:0.7.0-11.svn4229 - Rebuild for updated NetworkManager - Ensure that certain PPP options are always overriden diff --git a/nm-pptp-free.patch b/nm-pptp-free.patch new file mode 100644 index 0000000..da7ed22 --- /dev/null +++ b/nm-pptp-free.patch @@ -0,0 +1,12 @@ +diff -up NetworkManager-pptp-0.7.0/auth-dialog/main.c.free NetworkManager-pptp-0.7.0/auth-dialog/main.c +--- NetworkManager-pptp-0.7.0/auth-dialog/main.c.free 2008-10-29 23:06:48.000000000 -0400 ++++ NetworkManager-pptp-0.7.0/auth-dialog/main.c 2008-10-29 23:07:37.000000000 -0400 +@@ -171,7 +171,7 @@ main (int argc, char *argv[]) + + if (password) { + memset (password, 0, strlen (password)); +- g_free (password); ++ gnome_keyring_memory_free (password); + } + exit_status = 0; + From a13164244bb806885ba17248919864b264823a63 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 22 Nov 2008 04:10:16 +0000 Subject: [PATCH 09/81] - Rebuild for updated NetworkManager --- .cvsignore | 1 + NetworkManager-pptp.spec | 9 +++++---- nm-pptp-free.patch | 12 ------------ sources | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 nm-pptp-free.patch diff --git a/.cvsignore b/.cvsignore index c02f691..aa50ae7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ NetworkManager-pptp-0.7.0.svn4027.tar.bz2 NetworkManager-pptp-0.7.0.svn4178.tar.bz2 NetworkManager-pptp-0.7.0.svn4229.tar.bz2 +NetworkManager-pptp-0.7.0.svn4326.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 4445283..c926838 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,10 +1,10 @@ -%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 ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4229 +%define svn_snapshot svn4326 Summary: NetworkManager VPN integration for pptp Name: NetworkManager-pptp @@ -17,7 +17,6 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.%{svn_snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root -Patch0: nm-pptp-free.patch BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -49,7 +48,6 @@ the NetworkManager and the GNOME desktop. %prep %setup -q -%patch0 -p1 -b .free %build %configure --enable-more-warnings=yes @@ -105,6 +103,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %changelog +* Fri Nov 21 2008 Dan Williams 1:0.7.0-12.svn4326 +- Rebuild for updated NetworkManager + * Wed Oct 29 2008 Dan Williams 1:0.7.0-12.svn4229 - Fix hang in auth dialog (rh #467007) diff --git a/nm-pptp-free.patch b/nm-pptp-free.patch deleted file mode 100644 index da7ed22..0000000 --- a/nm-pptp-free.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up NetworkManager-pptp-0.7.0/auth-dialog/main.c.free NetworkManager-pptp-0.7.0/auth-dialog/main.c ---- NetworkManager-pptp-0.7.0/auth-dialog/main.c.free 2008-10-29 23:06:48.000000000 -0400 -+++ NetworkManager-pptp-0.7.0/auth-dialog/main.c 2008-10-29 23:07:37.000000000 -0400 -@@ -171,7 +171,7 @@ main (int argc, char *argv[]) - - if (password) { - memset (password, 0, strlen (password)); -- g_free (password); -+ gnome_keyring_memory_free (password); - } - exit_status = 0; - diff --git a/sources b/sources index 3311ed5..a4712f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0638ecb71c4f9047ca1036159134db3 NetworkManager-pptp-0.7.0.svn4229.tar.bz2 +b9b6d1e987be04279fa2610eb208e09e NetworkManager-pptp-0.7.0.svn4326.tar.bz2 From 25affade2fefb62009ae5d328bd0b736661c674c Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 22 Nov 2008 04:11:56 +0000 Subject: [PATCH 10/81] Update summary --- NetworkManager-pptp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index c926838..e6187ed 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -6,7 +6,7 @@ %define svn_snapshot svn4326 -Summary: NetworkManager VPN integration for pptp +Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.0 From d7e05f6c4efaccf4fbf70bcc4deb494b094ea7dc Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sat, 3 Jan 2009 07:55:15 +0000 Subject: [PATCH 11/81] - Rebuild for updated NetworkManager - Fix some specfile issues (rh #477153) - Allow the EAP authentication method --- .cvsignore | 1 + NetworkManager-pptp.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index aa50ae7..ba7707c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ NetworkManager-pptp-0.7.0.svn4027.tar.bz2 NetworkManager-pptp-0.7.0.svn4178.tar.bz2 NetworkManager-pptp-0.7.0.svn4229.tar.bz2 NetworkManager-pptp-0.7.0.svn4326.tar.bz2 +NetworkManager-pptp-0.7.0.svn16.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index e6187ed..72f2ca4 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4326 +%define svn_snapshot svn16 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.0 -Release: 0.12.%{svn_snapshot}%{?dist} +Release: 1.%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -23,7 +23,6 @@ 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 BuildRequires: libglade2-devel BuildRequires: intltool gettext @@ -50,7 +49,7 @@ the NetworkManager and the GNOME desktop. %build -%configure --enable-more-warnings=yes +%configure --disable-static --enable-more-warnings=yes make %{?_smp_mflags} %install @@ -101,8 +100,14 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade %{_datadir}/applications/nm-pptp.desktop %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png +%dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Sat Jan 3 2009 Dan Williams 1:0.7.0-1.svn16 +- Rebuild for updated NetworkManager +- Fix some specfile issues (rh #477153) +- Allow the EAP authentication method + * Fri Nov 21 2008 Dan Williams 1:0.7.0-12.svn4326 - Rebuild for updated NetworkManager diff --git a/sources b/sources index a4712f3..9efea84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9b6d1e987be04279fa2610eb208e09e NetworkManager-pptp-0.7.0.svn4326.tar.bz2 +df7f950127c9cc7e640dd2c8effd953b NetworkManager-pptp-0.7.0.svn16.tar.bz2 From 5dc75df66919cd69da14320ff67cccacae3a005e Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 19 Feb 2009 14:44:02 +0000 Subject: [PATCH 12/81] - Update to 0.7.1rc1 - Set a reasonable MTU - Ensure 'noauth' is used - Fix domain-based logins - Fix saving MPPE values in connection editor --- .cvsignore | 1 + NetworkManager-pptp.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index ba7707c..47fe665 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ NetworkManager-pptp-0.7.0.svn4178.tar.bz2 NetworkManager-pptp-0.7.0.svn4229.tar.bz2 NetworkManager-pptp-0.7.0.svn4326.tar.bz2 NetworkManager-pptp-0.7.0.svn16.tar.bz2 +NetworkManager-pptp-0.7.0.97.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 72f2ca4..935d87b 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -4,17 +4,17 @@ %define ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn16 +%define svn_snapshot %{nil} Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.0 -Release: 1.%{svn_snapshot}%{?dist} +Version: 0.7.0.97 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}.%{svn_snapshot}.tar.bz2 +Source: %{name}-%{version}%{svn_snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -103,6 +103,13 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Thu Feb 19 2009 Dan Williams 1:0.7.0.97-1 +- Update to 0.7.1rc1 +- Set a reasonable MTU +- Ensure 'noauth' is used +- Fix domain-based logins +- Fix saving MPPE values in connection editor + * Sat Jan 3 2009 Dan Williams 1:0.7.0-1.svn16 - Rebuild for updated NetworkManager - Fix some specfile issues (rh #477153) diff --git a/sources b/sources index 9efea84..de27db0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df7f950127c9cc7e640dd2c8effd953b NetworkManager-pptp-0.7.0.svn16.tar.bz2 +83e0464fc59748a2708db5f0ed8e3c74 NetworkManager-pptp-0.7.0.97.tar.bz2 From 23ce6653ae72b2aae8e2ee5645db56866275efc0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 23 Feb 2009 22:09:03 +0000 Subject: [PATCH 13/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 935d87b..1d55acd 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.0.97 -Release: 1%{svn_snapshot}%{?dist} +Release: 2%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %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 - Set a reasonable MTU From e929b2066ca8aee7a8b72ae52496ebdc355c5bce Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 5 Mar 2009 19:52:23 +0000 Subject: [PATCH 14/81] - Update to 0.7.1rc3 --- .cvsignore | 1 + NetworkManager-pptp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 47fe665..50bcb81 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ NetworkManager-pptp-0.7.0.svn4229.tar.bz2 NetworkManager-pptp-0.7.0.svn4326.tar.bz2 NetworkManager-pptp-0.7.0.svn16.tar.bz2 NetworkManager-pptp-0.7.0.97.tar.bz2 +NetworkManager-pptp-0.7.0.99.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 1d55acd..555e012 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 ppp_version 2.2.4 @@ -9,8 +9,8 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.0.97 -Release: 2%{svn_snapshot}%{?dist} +Version: 0.7.0.99 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %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 de27db0..d0e9661 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83e0464fc59748a2708db5f0ed8e3c74 NetworkManager-pptp-0.7.0.97.tar.bz2 +97fcd56217476b951ec7fa91e4245d75 NetworkManager-pptp-0.7.0.99.tar.bz2 From 2ae834b71f2ca6d0a5bc77f89cdc3aa9f8fe7c83 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 15:41:08 +0000 Subject: [PATCH 15/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 555e012..2f9613c 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.0.99 -Release: 1%{svn_snapshot}%{?dist} +Release: 2%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1:0.7.0.99-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Mar 5 2009 Dan Williams 1:0.7.0.99-1 - Update to 0.7.1rc3 From ca9b1dddb7c4aab17c1addfed7546baee23235fb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 14:37:29 +0000 Subject: [PATCH 16/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 2f9613c..7bafb37 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.0.99 -Release: 2%{svn_snapshot}%{?dist} +Release: 3%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -103,6 +103,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1:0.7.0.99-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 1:0.7.0.99-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 551febe8e12649cf0db7e21b3b6fcb367573d4f9 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sun, 30 Aug 2009 15:00:40 +0000 Subject: [PATCH 17/81] - Rebuild for updated NetworkManager - Fix window title of Advanced dialog --- .cvsignore | 1 + NetworkManager-pptp.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 50bcb81..fade8b4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,4 @@ NetworkManager-pptp-0.7.0.svn4326.tar.bz2 NetworkManager-pptp-0.7.0.svn16.tar.bz2 NetworkManager-pptp-0.7.0.97.tar.bz2 NetworkManager-pptp-0.7.0.99.tar.bz2 +NetworkManager-pptp-0.7.996.git20090828.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 7bafb37..c0a8bc4 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,16 +1,16 @@ -%define nm_version 1:0.7.0.99-1 +%define nm_version 1:0.7.996-1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot %{nil} +%define svn_snapshot .git20090828 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.0.99 -Release: 3%{svn_snapshot}%{?dist} +Version: 0.7.996 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -20,8 +20,8 @@ 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 >= %{nm_version} +#BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel @@ -103,6 +103,10 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Fri Aug 28 2009 Dan Williams - 1:0.7.996-1 +- Rebuild for updated NetworkManager +- Fix window title of Advanced dialog + * Mon Jul 27 2009 Fedora Release Engineering - 1:0.7.0.99-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index d0e9661..0bf17c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97fcd56217476b951ec7fa91e4245d75 NetworkManager-pptp-0.7.0.99.tar.bz2 +74b041bee35d7192052e69dfb1c1ff94 NetworkManager-pptp-0.7.996.git20090828.tar.bz2 From bd84c53a9b5d9167f8caba4fa5fcdbf4865695c2 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 31 Aug 2009 02:33:13 +0000 Subject: [PATCH 18/81] Add dbus-glib buildreq; fix NM buildreqs left over from debugging --- NetworkManager-pptp.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index c0a8bc4..4a64f7c 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -20,8 +20,9 @@ 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: dbus-glib-devel >= 0.74 +BuildRequires: NetworkManager-devel >= %{nm_version} +BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel From 9235c559a199f512745fcf5d0a18d64afd83fffc Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 21 Sep 2009 22:59:21 +0000 Subject: [PATCH 19/81] - Rebuild for updated NetworkManager --- .cvsignore | 1 + NetworkManager-pptp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index fade8b4..2af1cc2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ NetworkManager-pptp-0.7.0.svn16.tar.bz2 NetworkManager-pptp-0.7.0.97.tar.bz2 NetworkManager-pptp-0.7.0.99.tar.bz2 NetworkManager-pptp-0.7.996.git20090828.tar.bz2 +NetworkManager-pptp-0.7.996.git20090921.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 4a64f7c..79859aa 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot .git20090828 +%define svn_snapshot .git20090921 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.996 -Release: 1%{svn_snapshot}%{?dist} +Release: 2%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -104,6 +104,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %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 - Fix window title of Advanced dialog diff --git a/sources b/sources index 0bf17c5..a28ca74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74b041bee35d7192052e69dfb1c1ff94 NetworkManager-pptp-0.7.996.git20090828.tar.bz2 +7793770d136a65e8aebb66855a4f2ab4 NetworkManager-pptp-0.7.996.git20090921.tar.bz2 From 9c057c5046d4f99ecf25407d8bc92b48e3b2d387 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 21 Sep 2009 23:05:59 +0000 Subject: [PATCH 20/81] fix nm require --- NetworkManager-pptp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 79859aa..ca39661 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 ppp_version 2.2.4 From c51d1dc21c0ab63d05ee0daffb36835f6404e69f Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 5 Oct 2009 17:59:50 +0000 Subject: [PATCH 21/81] - Rebuild for updated NetworkManager --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index ca39661..9301093 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.996 -Release: 2%{svn_snapshot}%{?dist} +Release: 4%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -104,6 +104,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Mon Oct 5 2009 Dan Williams - 1:0.7.996-4.git20090921 +- Rebuild for updated NetworkManager + * Mon Sep 21 2009 Dan Williams - 1:0.7.996-2 - Rebuild for updated NetworkManager From 22c69a3390d19421684d69bc62a580f85ebb3a08 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:02:32 +0000 Subject: [PATCH 22/81] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c403e47..61e15c6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: NetworkManager-pptp -# $Id$ +# $Id: Makefile,v 1.1 2008/04/25 15:14:31 kevin Exp $ NAME := NetworkManager-pptp 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 b2a66ba0c7c778ed1e6fc48a5796e25ddfae7447 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 14 Dec 2009 20:38:54 +0000 Subject: [PATCH 23/81] - Add debugging helpers - Fix saving MPPE-related settings from the properties dialog - Resolve PPTP gateway hostname if necessary --- .cvsignore | 1 + NetworkManager-pptp.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2af1cc2..b73d5eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,3 +7,4 @@ NetworkManager-pptp-0.7.0.97.tar.bz2 NetworkManager-pptp-0.7.0.99.tar.bz2 NetworkManager-pptp-0.7.996.git20090828.tar.bz2 NetworkManager-pptp-0.7.996.git20090921.tar.bz2 +NetworkManager-pptp-0.7.997.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 9301093..a01f13c 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 ppp_version 2.2.4 %define shared_mime_version 0.16-3 -%define svn_snapshot .git20090921 +%define svn_snapshot %{nil} Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.996 -Release: 4%{svn_snapshot}%{?dist} +Version: 0.7.997 +Release: 1%{svn_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -104,6 +104,11 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Mon Dec 14 2009 Dan Williams - 1:0.7.997-1 +- Add debugging helpers +- Fix saving MPPE-related settings from the properties dialog +- Resolve PPTP gateway hostname if necessary + * Mon Oct 5 2009 Dan Williams - 1:0.7.996-4.git20090921 - Rebuild for updated NetworkManager diff --git a/sources b/sources index a28ca74..02029a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7793770d136a65e8aebb66855a4f2ab4 NetworkManager-pptp-0.7.996.git20090921.tar.bz2 +8cc3b32ec753421327fa64a82c571b24 NetworkManager-pptp-0.7.997.tar.bz2 From 378a06dc3112703c30832e73840f05f7c580addf Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 21 Jan 2010 03:49:15 +0000 Subject: [PATCH 24/81] - Rebuild for new pppd --- NetworkManager-pptp.spec | 23 +++++++++++++---------- sources | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a01f13c..5d3673c 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,20 +1,20 @@ -%define nm_version 1:0.7.997-1 +%define nm_version 1:0.7.996-2 %define dbus_version 1.1 %define gtk2_version 2.10.0 -%define ppp_version 2.2.4 +%define ppp_version 2.4.5 %define shared_mime_version 0.16-3 -%define svn_snapshot %{nil} +%define git_snapshot .git20100120 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.997 -Release: 1%{svn_snapshot}%{?dist} +Release: 2%{git_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{svn_snapshot}.tar.bz2 +Source: %{name}-%{version}%{git_snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -27,12 +27,12 @@ BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel BuildRequires: intltool gettext -BuildRequires: ppp-devel >= %{ppp_version} +BuildRequires: ppp-devel = %{ppp_version} Requires: gtk2 >= %{gtk2_version} Requires: dbus >= %{dbus_version} Requires: NetworkManager >= %{nm_version} -Requires: ppp >= %{ppp_version} +Requires: ppp = %{ppp_version} Requires: shared-mime-info >= %{shared_mime_version} Requires: pptp Requires: GConf2 @@ -60,8 +60,8 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a -rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.la -rm -f %{buildroot}%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.a +rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.la +rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.a %find_lang %{name} @@ -97,13 +97,16 @@ fi %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %{_libexecdir}/nm-pptp-service -%{_libdir}/pppd/2.4.4/nm-pptp-pppd-plugin.so +%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.so %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade %{_datadir}/applications/nm-pptp.desktop %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Wed Jan 20 2010 Dan Williams - 1:0.7.997-2.git20100120 +- Rebuild for new pppd + * Mon Dec 14 2009 Dan Williams - 1:0.7.997-1 - Add debugging helpers - Fix saving MPPE-related settings from the properties dialog diff --git a/sources b/sources index 02029a2..07f3bb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cc3b32ec753421327fa64a82c571b24 NetworkManager-pptp-0.7.997.tar.bz2 +3f7207a551a3afc3fcc8a5b35cfa2fd9 NetworkManager-pptp-0.7.997.git20100120.tar.bz2 From 9220b6a7be04690c98f8719039e8fc963a2b7f53 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 1 Feb 2010 23:42:04 +0000 Subject: [PATCH 25/81] - Really fix pppd plugin directory path --- NetworkManager-pptp.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 5d3673c..89ef0ee 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.7.997 -Release: 2%{git_snapshot}%{?dist} +Release: 3%{git_snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -50,7 +50,11 @@ the NetworkManager and the GNOME desktop. %build -%configure --disable-static --enable-more-warnings=yes +%configure \ + --disable-static \ + --enable-more-warnings=yes \ + --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} + make %{?_smp_mflags} %install @@ -104,6 +108,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Mon Feb 1 2010 Dan Williams - 1:0.7.997-3.git20100120 +- Really fix pppd plugin directory path + * Wed Jan 20 2010 Dan Williams - 1:0.7.997-2.git20100120 - Rebuild for new pppd From 44165737ee1c838a0d64dc8d7ed18c9c074c5f8b Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 12 Apr 2010 06:51:12 +0000 Subject: [PATCH 26/81] - Fix saving of MPPE security levels - Updated translations --- .cvsignore | 1 + NetworkManager-pptp.spec | 23 ++++++++++++++--------- sources | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index b73d5eb..84b8e62 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ NetworkManager-pptp-0.7.0.99.tar.bz2 NetworkManager-pptp-0.7.996.git20090828.tar.bz2 NetworkManager-pptp-0.7.996.git20090921.tar.bz2 NetworkManager-pptp-0.7.997.tar.bz2 +NetworkManager-pptp-0.8.git20100411.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 89ef0ee..d6b82a6 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,20 +1,21 @@ -%define nm_version 1:0.7.996-2 +%define nm_version 1:0.7.997 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define ppp_version 2.4.5 %define shared_mime_version 0.16-3 -%define git_snapshot .git20100120 +%define snapshot .git20100411 +%define realversion 0.8 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.7.997 -Release: 3%{git_snapshot}%{?dist} +Version: 0.8.0 +Release: 1%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{git_snapshot}.tar.bz2 +Source: %{name}-%{realversion}%{snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -46,7 +47,7 @@ This package contains software for integrating PPTP VPN support with the NetworkManager and the GNOME desktop. %prep -%setup -q +%setup -q -n NetworkManager-pptp-%{realversion} %build @@ -103,12 +104,16 @@ fi %{_libexecdir}/nm-pptp-service %{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.so %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade -%{_datadir}/applications/nm-pptp.desktop -%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png +#%{_datadir}/applications/nm-pptp.desktop +#%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %dir %{_datadir}/gnome-vpn-properties/pptp %changelog -* Mon Feb 1 2010 Dan Williams - 1:0.7.997-3.git20100120 +* Sun Apr 11 2010 Dan Williams - 1:0.8.0-1 +- Fix saving of MPPE security levels +- Updated translations + +* Mon Feb 1 2010 Dan Williams - 1:0.7.997-3.git20100120 - Really fix pppd plugin directory path * Wed Jan 20 2010 Dan Williams - 1:0.7.997-2.git20100120 diff --git a/sources b/sources index 07f3bb8..c3010cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f7207a551a3afc3fcc8a5b35cfa2fd9 NetworkManager-pptp-0.7.997.git20100120.tar.bz2 +ad748ddecf3a65654bb821c96be0c0bd NetworkManager-pptp-0.8.git20100411.tar.bz2 From 0024c6165e3df73a132c3bfb7d2c3a6aa56a82f6 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Wed, 28 Jul 2010 03:37:51 +0000 Subject: [PATCH 27/81] - Update to 0.8.1 release - MPPE auth method UI fixes - Lower default pptp log level and add debugging capability --- .cvsignore | 1 + NetworkManager-pptp.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 84b8e62..984c971 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,3 +9,4 @@ NetworkManager-pptp-0.7.996.git20090828.tar.bz2 NetworkManager-pptp-0.7.996.git20090921.tar.bz2 NetworkManager-pptp-0.7.997.tar.bz2 NetworkManager-pptp-0.8.git20100411.tar.bz2 +NetworkManager-pptp-0.8.1.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index d6b82a6..d20c63f 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,16 +1,16 @@ -%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 ppp_version 2.4.5 %define shared_mime_version 0.16-3 -%define snapshot .git20100411 -%define realversion 0.8 +%define snapshot %{nil} +%define realversion 0.8.1 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.8.0 +Version: 0.8.1 Release: 1%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -109,6 +109,11 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %changelog +* Tue Jul 27 2010 Dan Williams - 1:0.8.1-1 +- Update to 0.8.1 release +- MPPE auth method UI fixes +- Lower default pptp log level and add debugging capability + * Sun Apr 11 2010 Dan Williams - 1:0.8.0-1 - Fix saving of MPPE security levels - Updated translations diff --git a/sources b/sources index c3010cd..c392416 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad748ddecf3a65654bb821c96be0c0bd NetworkManager-pptp-0.8.git20100411.tar.bz2 +3eb00a9c5dc7e50fe76119da914148bc NetworkManager-pptp-0.8.1.tar.bz2 From f604ed27912501b9a186ce7a5fe02e5342b135a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:06:04 +0000 Subject: [PATCH 28/81] 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 61e15c6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: NetworkManager-pptp -# $Id: Makefile,v 1.1 2008/04/25 15:14:31 kevin Exp $ -NAME := NetworkManager-pptp -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 2e366663d8a2d90317b1e29bf0b164d6539a0878 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:01:48 -0600 Subject: [PATCH 29/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index d20c63f..be09173 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.8.1 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -109,6 +109,9 @@ fi %dir %{_datadir}/gnome-vpn-properties/pptp %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 - MPPE auth method UI fixes From 27aa3e03871a24a361844c3c3c3cd94947b337a8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 4 May 2011 00:01:34 -0500 Subject: [PATCH 30/81] Update to 0.8.999 (0.9-rc2) --- NetworkManager-pptp.spec | 30 ++++++++++++++++++++---------- sources | 2 +- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index be09173..91ec005 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 gtk3_version 3.0 %define ppp_version 2.4.5 %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 pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.8.1 -Release: 2%{snapshot}%{?dist} +Version: 0.8.999 +Release: 1%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -19,14 +19,12 @@ Source: %{name}-%{realversion}%{snapshot}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} -BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel -BuildRequires: libglade2-devel BuildRequires: intltool gettext BuildRequires: ppp-devel = %{ppp_version} @@ -36,7 +34,6 @@ Requires: NetworkManager >= %{nm_version} Requires: ppp = %{ppp_version} Requires: shared-mime-info >= %{shared_mime_version} Requires: pptp -Requires: GConf2 Requires: gnome-keyring Requires(post): /sbin/ldconfig desktop-file-utils Requires(postun): /sbin/ldconfig desktop-file-utils @@ -103,12 +100,25 @@ fi %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %{_libexecdir}/nm-pptp-service %{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.so -%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade #%{_datadir}/applications/nm-pptp.desktop #%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png %dir %{_datadir}/gnome-vpn-properties/pptp +%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %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 + +* Tue Apr 05 2011 Dan Williams - 1:0.8.998-1 +- Update to 0.8.998 (0.9.0-rc1) +- Fix issues with secrets flags and password saving/retrieval +- Fix issues with PPTP pools using the same DNS name for different servers + +* Sat Mar 26 2011 Christopher Aillon - 1:0.8.995-1 +- Update to 0.8.995 + * 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 c392416..bc0eb28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3eb00a9c5dc7e50fe76119da914148bc NetworkManager-pptp-0.8.1.tar.bz2 +7db30dc1198b0f7453ffc05d24248b55 NetworkManager-pptp-0.8.999.tar.bz2 From d0f2a288b4ea31cd0582353e9463d77874a91919 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 21 Jul 2011 16:14:42 -0500 Subject: [PATCH 31/81] Update to git snapshot --- NetworkManager-pptp.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 91ec005..f9b4d53 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -4,14 +4,14 @@ %define ppp_version 2.4.5 %define shared_mime_version 0.16-3 -%define snapshot %{nil} +%define snapshot .git20110721 %define realversion 0.8.999 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.8.999 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -106,6 +106,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Thu Jul 21 2011 Dan Williams - 1:0.8.999-2.git20110721 +- ui: ensure secrets are saved when required and not saved when not required + * 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 bc0eb28..39b232b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7db30dc1198b0f7453ffc05d24248b55 NetworkManager-pptp-0.8.999.tar.bz2 +c75fe6a3034edbdd5664b70e205cf85b NetworkManager-pptp-0.8.999.git20110721.tar.bz2 From 928629103ccf5a15fa526e82ab3a85325c16f568 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 26 Aug 2011 13:34:44 -0500 Subject: [PATCH 32/81] Update to 0.9.0 release --- NetworkManager-pptp.spec | 12 ++++++++---- sources | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index f9b4d53..47c10ea 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -4,14 +4,14 @@ %define ppp_version 2.4.5 %define shared_mime_version 0.16-3 -%define snapshot .git20110721 -%define realversion 0.8.999 +%define snapshot %{nil} +%define realversion 0.9.0 Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.8.999 -Release: 2%{snapshot}%{?dist} +Version: 0.9.0 +Release: 1%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -106,6 +106,10 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Fri Aug 26 2011 Dan Williams - 1:0.9.0-1 +- Update to 0.9.0 release +- ui: updated translations + * Thu Jul 21 2011 Dan Williams - 1:0.8.999-2.git20110721 - ui: ensure secrets are saved when required and not saved when not required diff --git a/sources b/sources index 39b232b..0b8d534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c75fe6a3034edbdd5664b70e205cf85b NetworkManager-pptp-0.8.999.git20110721.tar.bz2 +38cf737d5fbd2b4bd03a5b3fb55da252 NetworkManager-pptp-0.9.0.tar.bz2 From 9249139b03120f3c2984c7527b745773465df024 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 00:32:38 -0500 Subject: [PATCH 33/81] Rebuild for new libpng --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 47c10ea..d6c5ded 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.0 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -106,6 +106,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %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 - Update to 0.9.0 release - ui: updated translations From 7700107fd57b73eca62057eeffed8ba55abb93bb Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 7 Dec 2011 20:18:22 -0500 Subject: [PATCH 34/81] Rebuild for new libpng Build with -Wno-error=deprecated-declarations for now --- NetworkManager-pptp.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index d6c5ded..37d6110 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -48,6 +48,7 @@ the NetworkManager and the GNOME desktop. %build +export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations" %configure \ --disable-static \ --enable-more-warnings=yes \ @@ -106,8 +107,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %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 - Update to 0.9.0 release From 5dc81d3982e7091c2911ec361b23fd26a45d1540 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:26:32 -0600 Subject: [PATCH 35/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 37d6110..2c1ef83 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.0 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -107,6 +107,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %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 691e02999befc4ffa1c35d495407624beae74371 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 26 Feb 2012 23:35:43 +0000 Subject: [PATCH 36/81] Update for unannounced gnome-keyring devel changes --- NetworkManager-pptp.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 2c1ef83..4022874 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,20 +11,18 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.0 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{realversion}%{snapshot}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root - BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} -BuildRequires: gnome-keyring-devel +BuildRequires: libgnome-keyring-devel BuildRequires: intltool gettext BuildRequires: ppp-devel = %{ppp_version} @@ -69,10 +67,6 @@ rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.a %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - - %post /sbin/ldconfig /usr/bin/update-desktop-database &> /dev/null || : @@ -107,6 +101,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %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 1729a055a13449d4066146a3984cfcbd819b6c9e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 1 Mar 2012 16:21:13 -0500 Subject: [PATCH 37/81] Remove obsolete and broken gtk2 requirement. --- NetworkManager-pptp.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 4022874..7d23ebb 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.0 -Release: 4%{snapshot}%{?dist} +Release: 5%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -26,7 +26,6 @@ BuildRequires: libgnome-keyring-devel BuildRequires: intltool gettext BuildRequires: ppp-devel = %{ppp_version} -Requires: gtk2 >= %{gtk2_version} Requires: dbus >= %{dbus_version} Requires: NetworkManager >= %{nm_version} Requires: ppp = %{ppp_version} @@ -101,6 +100,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Thu Mar 1 2012 Bill Nottingham - 1:0.9.0-5 +- Remove obsolete and broken gtk2 requirement + * Sun Feb 26 2012 Peter Robinson - 1:0.9.0-4 - Update for unannounced gnome-keyring devel changes From bc417255868eb3e880ccce7cb26d815d75a4eea9 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 2 Mar 2012 17:34:54 -0600 Subject: [PATCH 38/81] Update to 0.9.3.995 (0.9.4-beta1) --- NetworkManager-pptp.spec | 20 ++++++++++++++------ sources | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 7d23ebb..7cee1c3 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,17 +1,17 @@ -%define nm_version 1:0.8.998 +%define nm_version 1:0.9.2 %define dbus_version 1.1 %define gtk3_version 3.0 %define ppp_version 2.4.5 %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 pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.9.0 -Release: 5%{snapshot}%{?dist} +Version: 0.9.3.995 +Release: 1%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -22,7 +22,11 @@ BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} +%if 0%{?fedora} > 16 BuildRequires: libgnome-keyring-devel +%else +BuildRequires: gnome-keyring-devel +%endif BuildRequires: intltool gettext BuildRequires: ppp-devel = %{ppp_version} @@ -45,7 +49,6 @@ the NetworkManager and the GNOME desktop. %build -export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations" %configure \ --disable-static \ --enable-more-warnings=yes \ @@ -100,6 +103,11 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Fri Mar 2 2012 Dan Williams - 1:0.9.3.995-1 +- Update to 0.9.3.995 (0.9.4-beta1) +- ui: add support for external UI mode, eg GNOME Shell +- ui: tooltips now refer to pppd/pptp config options + * Thu Mar 1 2012 Bill Nottingham - 1:0.9.0-5 - Remove obsolete and broken gtk2 requirement diff --git a/sources b/sources index 0b8d534..743bbc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38cf737d5fbd2b4bd03a5b3fb55da252 NetworkManager-pptp-0.9.0.tar.bz2 +698067264712582e8e88e6cd41d3d06f NetworkManager-pptp-0.9.3.995.git20120302.tar.bz2 From aeb9fe8fa3bcf4979b968b136fa3d9ab43a21a20 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 19 Mar 2012 22:23:08 -0500 Subject: [PATCH 39/81] Update to 0.9.3.997 (0.9.4-rc1) --- .gitignore | 2 ++ NetworkManager-pptp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 984c971..54b8688 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ NetworkManager-pptp-0.7.996.git20090921.tar.bz2 NetworkManager-pptp-0.7.997.tar.bz2 NetworkManager-pptp-0.8.git20100411.tar.bz2 NetworkManager-pptp-0.8.1.tar.bz2 +/NetworkManager-pptp-0.9.3.995.git20120302.tar.bz2 +/NetworkManager-pptp-0.9.3.997.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 7cee1c3..f2e3b39 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -4,13 +4,13 @@ %define ppp_version 2.4.5 %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 pptp Name: NetworkManager-pptp Epoch: 1 -Version: 0.9.3.995 +Version: 0.9.3.997 Release: 1%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base @@ -103,6 +103,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %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: add support for external UI mode, eg GNOME Shell diff --git a/sources b/sources index 743bbc4..e1ae6fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -698067264712582e8e88e6cd41d3d06f NetworkManager-pptp-0.9.3.995.git20120302.tar.bz2 +c85a3f620046bc6a8e352cf79f5c1382 NetworkManager-pptp-0.9.3.997.tar.bz2 From 56903ec2c32e4eeadbf2fb81c44cfef65e954704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 14 Jun 2012 01:00:06 +0300 Subject: [PATCH 40/81] Remove unnecessary ldconfig calls from scriptlets (#737333). --- NetworkManager-pptp.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index f2e3b39..c000a12 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.3.997 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -36,8 +36,8 @@ Requires: ppp = %{ppp_version} Requires: shared-mime-info >= %{shared_mime_version} Requires: pptp Requires: gnome-keyring -Requires(post): /sbin/ldconfig desktop-file-utils -Requires(postun): /sbin/ldconfig desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils %description @@ -70,7 +70,6 @@ rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.a %post -/sbin/ldconfig /usr/bin/update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -79,7 +78,6 @@ fi %postun -/sbin/ldconfig /usr/bin/update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -103,6 +101,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Wed Jun 13 2012 Ville Skyttä - 1:0.9.3.997-2 +- Remove unnecessary ldconfig calls from scriptlets (#737333). + * Mon Mar 19 2012 Dan Williams - 1:0.9.3.997-1 - Update to 0.9.3.997 (0.9.4-rc1) From 07ab3998dabc73cff2326427d8330908e3031b15 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 08:45:26 -0500 Subject: [PATCH 41/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index c000a12..417a794 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.3.997 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -101,6 +101,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %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 (#737333). From c1a78b4daef267bb60b8a875570a93abb4ed4f82 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 09:27:07 -0600 Subject: [PATCH 42/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 417a794..ec0ad2d 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.3.997 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -101,6 +101,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1:0.9.3.997-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 1:0.9.3.997-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e73446075a2fe77fecd19a94090734591f58a51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 10 Jul 2013 16:15:59 +0200 Subject: [PATCH 43/81] Update to 0.9.8.2 release; split GUI to separate package and cleanup spec file (rh #950282) --- .gitignore | 1 + NetworkManager-pptp.spec | 131 +++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 66 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 54b8688..c6543f9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ NetworkManager-pptp-0.8.git20100411.tar.bz2 NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-0.9.3.995.git20120302.tar.bz2 /NetworkManager-pptp-0.9.3.997.tar.bz2 +/NetworkManager-pptp-0.9.8.2.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index ec0ad2d..ad802f9 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,106 +1,104 @@ -%define nm_version 1:0.9.2 -%define dbus_version 1.1 -%define gtk3_version 3.0 -%define ppp_version 2.4.5 -%define shared_mime_version 0.16-3 +%global snapshot %{nil} +%global ppp_version %(rpm -q ppp --queryformat '%{VERSION}') -%define snapshot %{nil} -%define realversion 0.9.3.997 - -Summary: NetworkManager VPN plugin for pptp +Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 0.9.3.997 -Release: 4%{snapshot}%{?dist} +Version: 0.9.8.2 +Release: 1%{snapshot}%{?dist} License: GPLv2+ -Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{realversion}%{snapshot}.tar.bz2 - -BuildRequires: gtk3-devel >= %{gtk3_version} -BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: dbus-glib-devel >= 0.74 -BuildRequires: NetworkManager-devel >= %{nm_version} -BuildRequires: NetworkManager-glib-devel >= %{nm_version} -%if 0%{?fedora} > 16 +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 +BuildRequires: ppp-devel +BuildRequires: libtool intltool gettext BuildRequires: libgnome-keyring-devel -%else -BuildRequires: gnome-keyring-devel -%endif -BuildRequires: intltool gettext -BuildRequires: ppp-devel = %{ppp_version} -Requires: dbus >= %{dbus_version} -Requires: NetworkManager >= %{nm_version} -Requires: ppp = %{ppp_version} -Requires: shared-mime-info >= %{shared_mime_version} +Requires: gtk3 +Requires: dbus +Requires: NetworkManager Requires: pptp +Requires: ppp +Requires: shared-mime-info Requires: gnome-keyring -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +Obsoletes: NetworkManager-pptp < 0.9.8.2-1 +%global _privatelibs libnm-pptp-properties[.]so.* +%global __provides_exclude ^(%{_privatelibs})$ +%global __requires_exclude ^(%{_privatelibs})$ %description -This package contains software for integrating PPTP VPN support with -the NetworkManager and the GNOME desktop. +This package contains software for integrating VPN capabilities with +the PPTP server with NetworkManager. -%prep -%setup -q -n NetworkManager-pptp-%{realversion} +%package -n NetworkManager-pptp-gnome +Summary: NetworkManager VPN plugin for PPTP - GNOME files +Group: System Environment/Base + +Requires: NetworkManager-pptp = %{epoch}:%{version}-%{release} +%if 0%{?fedora} > 17 +Requires: nm-connection-editor +%else +Requires: NetworkManager-gnome +%endif +Obsoletes: NetworkManager-pptp < 0.9.8.2-1 + +%description -n NetworkManager-pptp-gnome +This package contains software for integrating VPN capabilities with +the PPTP server with NetworkManager (GNOME files). +%prep +%setup -q -n %{name}-%{version} %build +if [ ! -f configure ]; then + ./autogen.sh +fi %configure \ --disable-static \ --enable-more-warnings=yes \ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} - make %{?_smp_mflags} -%install +%check +make check -make install DESTDIR=$RPM_BUILD_ROOT +%install +make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a - -rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.la -rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.a +rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %find_lang %{name} - -%post -/usr/bin/update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/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 %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - - %files -f %{name}.lang -%defattr(-, root, root) - -%doc AUTHORS ChangeLog -%{_libdir}/NetworkManager/lib*.so* -%{_libexecdir}/nm-pptp-auth-dialog +%doc COPYING AUTHORS README ChangeLog %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %{_libexecdir}/nm-pptp-service -%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.so -#%{_datadir}/applications/nm-pptp.desktop -#%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png +%{_libexecdir}/nm-pptp-auth-dialog +%{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so + +%files -n NetworkManager-pptp-gnome +%doc COPYING AUTHORS README ChangeLog +%{_libdir}/NetworkManager/lib*.so* %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Thu Jul 11 2013 Jiří Klimeš - 1:0.9.8.2-1 +- Update to 0.9.8.2 release + +* Sun Apr 07 2013 Dan Fruehauf - 1:0.9.8.0-1 +- Refactored spec file + * Wed Feb 13 2013 Fedora Release Engineering - 1:0.9.3.997-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -249,4 +247,3 @@ fi * Thu Nov 15 2007 Lubomir Kundrak 0.7.0-0.1.svn3085 - Initial packaging attempt, inspired by NetworkManager-openvpn - Nearly completly rewritten spec, all bugs in it are solely my responsibility - diff --git a/sources b/sources index e1ae6fe..de38e2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c85a3f620046bc6a8e352cf79f5c1382 NetworkManager-pptp-0.9.3.997.tar.bz2 +b6750afdba77dc96fc496084ae9c6ea0 NetworkManager-pptp-0.9.8.2.tar.bz2 From 7f9561e86d828486be945d2f869905d33bbe15d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 11 Jul 2013 12:41:54 +0200 Subject: [PATCH 44/81] Require libgnome-keyring instead of gnome-keyring (rh #811930) --- NetworkManager-pptp.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index ad802f9..82765d0 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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 @@ -26,7 +26,7 @@ Requires: NetworkManager Requires: pptp Requires: ppp Requires: shared-mime-info -Requires: gnome-keyring +Requires: libgnome-keyring Obsoletes: NetworkManager-pptp < 0.9.8.2-1 %global _privatelibs libnm-pptp-properties[.]so.* @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Thu Jul 11 2013 Stef Walter - 1:0.9.8.2-2 +- Depend on libgnome-keyring (the client library), not gnome-keyring (daemon) (rh #811930) + * Thu Jul 11 2013 Jiří Klimeš - 1:0.9.8.2-1 - Update to 0.9.8.2 release From b529f4d480afa12ee2c4781ec7be75de11f4dd66 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:36:57 +0200 Subject: [PATCH 45/81] Fix Obsoletes to ensure NetworkManager-pptp-gnome installs on update (rh #986368) --- NetworkManager-pptp.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 82765d0..a8d3ce7 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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 @@ -27,7 +27,7 @@ Requires: pptp Requires: ppp Requires: shared-mime-info Requires: libgnome-keyring -Obsoletes: NetworkManager-pptp < 0.9.8.2-1 +Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %global _privatelibs libnm-pptp-properties[.]so.* %global __provides_exclude ^(%{_privatelibs})$ @@ -47,7 +47,7 @@ Requires: nm-connection-editor %else Requires: NetworkManager-gnome %endif -Obsoletes: NetworkManager-pptp < 0.9.8.2-1 +Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %description -n NetworkManager-pptp-gnome This package contains software for integrating VPN capabilities with @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Fri Jul 26 2013 Jiří Klimeš - 1:0.9.8.2-3 +- Fixing Obsoletes to ensure NetworkManager-pptp-gnome installs on update (rh #986368) + * Thu Jul 11 2013 Stef Walter - 1:0.9.8.2-2 - Depend on libgnome-keyring (the client library), not gnome-keyring (daemon) (rh #811930) From 3e39a517845bec910aca8be2658384f523ccd652 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 17:59:57 -0500 Subject: [PATCH 46/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index ec0ad2d..1bf69e5 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -11,7 +11,7 @@ Summary: NetworkManager VPN plugin for pptp Name: NetworkManager-pptp Epoch: 1 Version: 0.9.3.997 -Release: 4%{snapshot}%{?dist} +Release: 5%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ @@ -101,6 +101,9 @@ fi %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Fri Aug 02 2013 Fedora Release Engineering - 1:0.9.3.997-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1:0.9.3.997-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 9e03daa46a5e7f6f29f608148b3cffe4d2001e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 17 Apr 2014 09:42:33 +0200 Subject: [PATCH 47/81] Rebuild against ppp 2.4.6 --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a8d3ce7..827c513 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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 @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Thu Apr 17 2014 Jiří Klimeš - 1:0.9.8.2-4 +- Rebuild against pppd 2.4.6 + * Fri Jul 26 2013 Jiří Klimeš - 1:0.9.8.2-3 - Fixing Obsoletes to ensure NetworkManager-pptp-gnome installs on update (rh #986368) From 4cf8047efe1855da8d4e038624fc2d54f0b8c11e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 17:54:34 -0500 Subject: [PATCH 48/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 827c513..261efeb 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 0.9.8.2 -Release: 4%{snapshot}%{?dist} +Release: 5%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 1:0.9.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Apr 17 2014 Jiří Klimeš - 1:0.9.8.2-4 - Rebuild against pppd 2.4.6 From 29fe5c72fb336aeb8c7694720044e3248cb9ed1e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 18:52:02 +0000 Subject: [PATCH 49/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 261efeb..e70dad9 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 0.9.8.2 -Release: 5%{snapshot}%{?dist} +Release: 6%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1:0.9.8.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 1:0.9.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a3c637d11f0637edecf42936fb479748ba9023a4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 22 Dec 2014 14:45:38 -0600 Subject: [PATCH 50/81] Update to 1.0 --- .gitignore | 1 + NetworkManager-pptp.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c6543f9..0eb307e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-0.9.3.995.git20120302.tar.bz2 /NetworkManager-pptp-0.9.3.997.tar.bz2 /NetworkManager-pptp-0.9.8.2.tar.bz2 +/NetworkManager-pptp-1.0.0.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index e70dad9..35fd62c 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -4,12 +4,12 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 0.9.8.2 -Release: 6%{snapshot}%{?dist} +Version: 1.0.0 +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 +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.0/%{name}-%{version}%{snapshot}.tar.xz BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -18,7 +18,7 @@ BuildRequires: NetworkManager-glib-devel BuildRequires: glib2-devel BuildRequires: ppp-devel BuildRequires: libtool intltool gettext -BuildRequires: libgnome-keyring-devel +BuildRequires: libsecret-devel Requires: gtk3 Requires: dbus @@ -26,7 +26,7 @@ Requires: NetworkManager Requires: pptp Requires: ppp Requires: shared-mime-info -Requires: libgnome-keyring +Requires: gnome-keyring Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %global _privatelibs libnm-pptp-properties[.]so.* @@ -93,6 +93,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Mon Dec 22 2014 Dan Williams - 1:1.0.0-1 +- Update to 1.0 + * Fri Aug 15 2014 Fedora Release Engineering - 1:0.9.8.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index de38e2b..cc438a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6750afdba77dc96fc496084ae9c6ea0 NetworkManager-pptp-0.9.8.2.tar.bz2 +493d76494ddf0b1ec1e78e835fd887ca NetworkManager-pptp-1.0.0.tar.xz From 8d073f204d539e80673da2266baead400f8ff56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 28 Apr 2015 14:23:28 +0200 Subject: [PATCH 51/81] Add missing libnm-gtk Require and BuildRequire for d291de3 auth-dialog: port to libnm-gtk's NMAVpnPasswordDialog --- NetworkManager-pptp.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 35fd62c..f998d1b 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -19,6 +19,7 @@ BuildRequires: glib2-devel BuildRequires: ppp-devel BuildRequires: libtool intltool gettext BuildRequires: libsecret-devel +BuildRequires: libnm-gtk-devel Requires: gtk3 Requires: dbus @@ -27,6 +28,7 @@ Requires: pptp Requires: ppp Requires: shared-mime-info Requires: gnome-keyring +Requires: libnm-gtk Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %global _privatelibs libnm-pptp-properties[.]so.* From adac87b67ce736ed705513e0b83c3a03ca67505a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 28 Apr 2015 14:09:11 +0200 Subject: [PATCH 52/81] Update to a git snapshot (git sha 695d4f2) - all: add "unit" option for pppd to define ppp name (bgo #736485) - service: try to load nf_conntrack_pptp kernel module (rh #1214643) - updated translations --- .gitignore | 1 + NetworkManager-pptp.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0eb307e..7cd088a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-0.9.3.997.tar.bz2 /NetworkManager-pptp-0.9.8.2.tar.bz2 /NetworkManager-pptp-1.0.0.tar.xz +/NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index f998d1b..a7ca8d7 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,15 +1,15 @@ -%global snapshot %{nil} +%global snapshot .20150428git695d4f2 %global ppp_version %(rpm -q ppp --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 1.0.0 +Version: 1.1.0 Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.0/%{name}-%{version}%{snapshot}.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.0/%{name}-%{version}%{snapshot}.tar.bz2 BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -95,6 +95,12 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Tue Apr 28 2015 Jiří Klimeš - 1:1.1.0-1.20150428git695d4f2 +- Update to a git snapshot (git sha 695d4f2) +- all: add "unit" option for pppd to define ppp name (bgo #736485) +- service: try to load nf_conntrack_pptp kernel module (rh #1214643) +- updated translations + * Mon Dec 22 2014 Dan Williams - 1:1.0.0-1 - Update to 1.0 diff --git a/sources b/sources index cc438a1..c73c291 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -493d76494ddf0b1ec1e78e835fd887ca NetworkManager-pptp-1.0.0.tar.xz +5843ec177126eec3f4f349422c535491 NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 From 99c8c81ceefb8bd8d6fc8eb4e24595f72ad3decc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 22:59:31 +0000 Subject: [PATCH 53/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a7ca8d7..89c626b 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.1.0 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -95,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1:1.1.0-2.20150428git695d4f2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Apr 28 2015 Jiří Klimeš - 1:1.1.0-1.20150428git695d4f2 - Update to a git snapshot (git sha 695d4f2) - all: add "unit" option for pppd to define ppp name (bgo #736485) From 2e83c9a77728581075fd1868a1fc262acf66d375 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 3 Sep 2015 15:29:49 +0200 Subject: [PATCH 54/81] Avoid requireing NetworkManager-gnome It's long gone and not there on RHEL 7. --- NetworkManager-pptp.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 89c626b..a5c7619 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.1.0 -Release: 2%{snapshot}%{?dist} +Release: 3%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -44,11 +44,7 @@ Summary: NetworkManager VPN plugin for PPTP - GNOME files Group: System Environment/Base Requires: NetworkManager-pptp = %{epoch}:%{version}-%{release} -%if 0%{?fedora} > 17 Requires: nm-connection-editor -%else -Requires: NetworkManager-gnome -%endif Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %description -n NetworkManager-pptp-gnome @@ -95,6 +91,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %changelog +* Thu Sep 3 2015 Lubomir Rintel - 1:1.1.0-3.20150428git695d4f2 +- Avoid requireing NetworkManager-gnome + * Tue Jun 16 2015 Fedora Release Engineering - 1:1.1.0-2.20150428git695d4f2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From aec1d3d09e4283344f44314f4efc1dfcb25a3818 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 31 Aug 2015 15:47:19 +0200 Subject: [PATCH 55/81] Update to 1.2 git snapshot with libnm-based properties plugin --- .gitignore | 1 + NetworkManager-pptp.spec | 33 +++++++++++++++++++-------------- sources | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7cd088a..1d78e78 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-0.9.8.2.tar.bz2 /NetworkManager-pptp-1.0.0.tar.xz /NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 +/NetworkManager-pptp-1.2.0.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a5c7619..eb98a81 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,25 +1,26 @@ -%global snapshot .20150428git695d4f2 +%global snapshot .20150903git345c34e %global ppp_version %(rpm -q ppp --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 1.1.0 -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: https://download.gnome.org/sources/NetworkManager-pptp/1.0/%{name}-%{version}%{snapshot}.tar.bz2 +Source0: https://download.gnome.org/sources/NetworkManager-pptp/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: NetworkManager-libnm-devel >= 1:1.1.0 BuildRequires: glib2-devel BuildRequires: ppp-devel BuildRequires: libtool intltool gettext BuildRequires: libsecret-devel -BuildRequires: libnm-gtk-devel +BuildRequires: libnm-gtk-devel >= 0.9 +BuildRequires: libnma-devel >= 1.1.0 Requires: gtk3 Requires: dbus @@ -43,7 +44,7 @@ the PPTP server with NetworkManager. Summary: NetworkManager VPN plugin for PPTP - GNOME files Group: System Environment/Base -Requires: NetworkManager-pptp = %{epoch}:%{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: nm-connection-editor Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 @@ -61,7 +62,8 @@ fi %configure \ --disable-static \ --enable-more-warnings=yes \ - --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} + --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ + --with-dist-version=%{version}-%{release} make %{?_smp_mflags} %check @@ -71,28 +73,31 @@ make check make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la -rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %find_lang %{name} %files -f %{name}.lang -%doc COPYING AUTHORS README ChangeLog %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf -%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name +%{_prefix}/lib/NetworkManager/VPN/nm-pptp-service.name %{_libexecdir}/nm-pptp-service %{_libexecdir}/nm-pptp-auth-dialog %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so +%doc AUTHORS README ChangeLog NEWS +%license COPYING %files -n NetworkManager-pptp-gnome -%doc COPYING AUTHORS README ChangeLog %{_libdir}/NetworkManager/lib*.so* %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui +%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Thu Sep 3 2015 Lubomir Rintel - 1:1.2.0-0.1.20150901git345c34e +- Update to 1.2 git snapshot with libnm-based properties plugin + * Thu Sep 3 2015 Lubomir Rintel - 1:1.1.0-3.20150428git695d4f2 -- Avoid requireing NetworkManager-gnome +- Avoid requiring NetworkManager-gnome * Tue Jun 16 2015 Fedora Release Engineering - 1:1.1.0-2.20150428git695d4f2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index c73c291..1856f8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5843ec177126eec3f4f349422c535491 NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 +5d5a43ef2f79bd110713e1fe318fcbd3 NetworkManager-pptp-1.2.0.tar.xz From 4acade6bcce7d8250e6f77b80105982dfd38dc4a Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 27 Oct 2015 14:21:34 +0100 Subject: [PATCH 56/81] Update the git snapshot --- NetworkManager-pptp.spec | 11 +++++------ sources | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index eb98a81..5600701 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,4 +1,4 @@ -%global snapshot .20150903git345c34e +%global snapshot .20151027gita2e7ffa %global ppp_version %(rpm -q ppp --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP @@ -22,14 +22,10 @@ BuildRequires: libsecret-devel BuildRequires: libnm-gtk-devel >= 0.9 BuildRequires: libnma-devel >= 1.1.0 -Requires: gtk3 Requires: dbus -Requires: NetworkManager +Requires: NetworkManager >= 1:1.2.0-0.3 Requires: pptp Requires: ppp -Requires: shared-mime-info -Requires: gnome-keyring -Requires: libnm-gtk Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %global _privatelibs libnm-pptp-properties[.]so.* @@ -93,6 +89,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Tue Oct 27 2015 Lubomir Rintel - 1:1.2.0-0.1.20151027gita2e7ffa +- Update the git snapshot + * Thu Sep 3 2015 Lubomir Rintel - 1:1.2.0-0.1.20150901git345c34e - Update to 1.2 git snapshot with libnm-based properties plugin diff --git a/sources b/sources index 1856f8e..d376fc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d5a43ef2f79bd110713e1fe318fcbd3 NetworkManager-pptp-1.2.0.tar.xz +740b608d3d9d0531dd809e3e4a465c45 NetworkManager-pptp-1.2.0.tar.xz From 63060257f1d11c2d32b914b87fe2af5d138a758c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 27 Oct 2015 15:20:53 +0100 Subject: [PATCH 57/81] Fix the el7 build --- NetworkManager-pptp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 5600701..b5af54f 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,5 +1,5 @@ %global snapshot .20151027gita2e7ffa -%global ppp_version %(rpm -q ppp --queryformat '%{VERSION}') +%global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp @@ -91,6 +91,7 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog * Tue Oct 27 2015 Lubomir Rintel - 1:1.2.0-0.1.20151027gita2e7ffa - Update the git snapshot +- Fix the el7 build * Thu Sep 3 2015 Lubomir Rintel - 1:1.2.0-0.1.20150901git345c34e - Update to 1.2 git snapshot with libnm-based properties plugin From de77ef256b6a07241284d5870aa27c0ec6334b8b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 23 Dec 2015 14:46:11 +0100 Subject: [PATCH 58/81] Update the git snapshot --- NetworkManager-pptp.spec | 8 +++++--- sources | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index b5af54f..dfe8cc6 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,4 +1,4 @@ -%global snapshot .20151027gita2e7ffa +%global snapshot .20151223gitde50986 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP @@ -23,10 +23,9 @@ BuildRequires: libnm-gtk-devel >= 0.9 BuildRequires: libnma-devel >= 1.1.0 Requires: dbus -Requires: NetworkManager >= 1:1.2.0-0.3 +Requires: NetworkManager >= 1:1.1.0 Requires: pptp Requires: ppp -Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %global _privatelibs libnm-pptp-properties[.]so.* %global __provides_exclude ^(%{_privatelibs})$ @@ -89,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Wed Dec 23 2015 Lubomir Rintel - 1:1.2.0-0.1.20151223gitde50986 +- Update the git snapshot + * Tue Oct 27 2015 Lubomir Rintel - 1:1.2.0-0.1.20151027gita2e7ffa - Update the git snapshot - Fix the el7 build diff --git a/sources b/sources index d376fc0..30f2385 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -740b608d3d9d0531dd809e3e4a465c45 NetworkManager-pptp-1.2.0.tar.xz +d32558cbf966d89f34e2a1e9863b6c08 NetworkManager-pptp-1.2.0.tar.xz From 3f9b46a8ea7b4c3dec8ec39ddcf16108eaea4e77 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 19 Jan 2016 16:10:38 +0100 Subject: [PATCH 59/81] Update to NetworkManager-pptp 1.2-beta1 --- .gitignore | 1 + NetworkManager-pptp.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1d78e78..72d09e6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.0.0.tar.xz /NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 /NetworkManager-pptp-1.2.0.tar.xz +/NetworkManager-pptp-1.1.90.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index dfe8cc6..3d0424b 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,15 +1,15 @@ -%global snapshot .20151223gitde50986 +%global snapshot .beta1 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.1/%{name}-1.1.90.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -48,7 +48,7 @@ This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-1.1.90 %build if [ ! -f configure ]; then @@ -88,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Tue Jan 19 2016 Lubomir Rintel - 1:1.2.0-0.2.beta1 +- Update to NetworkManager-pptp 1.2-beta1 + * Wed Dec 23 2015 Lubomir Rintel - 1:1.2.0-0.1.20151223gitde50986 - Update the git snapshot diff --git a/sources b/sources index 30f2385..1c4d1cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d32558cbf966d89f34e2a1e9863b6c08 NetworkManager-pptp-1.2.0.tar.xz +f982f44fbb7115f4cc68274482d82c19 NetworkManager-pptp-1.1.90.tar.xz From ef0c456ba2bf7485f05911ed73e17562f7e40bed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:32:16 +0000 Subject: [PATCH 60/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 3d0424b..07a8f70 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,7 +5,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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 @@ -88,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-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-pptp 1.2-beta1 From 7c76510b65a47691d5908e1abb688a563302fee3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 1 Mar 2016 17:46:19 +0100 Subject: [PATCH 61/81] Update to NetworkManager-pptp 1.2-beta2 --- .gitignore | 1 + NetworkManager-pptp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 72d09e6..5b6bde8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.1.0.20150428git695d4f2.tar.bz2 /NetworkManager-pptp-1.2.0.tar.xz /NetworkManager-pptp-1.1.90.tar.xz +/NetworkManager-pptp-1.1.91.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 07a8f70..5305e28 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,4 +1,4 @@ -%global snapshot .beta1 +%global snapshot .beta2 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP @@ -9,7 +9,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-pptp/1.1/%{name}-1.1.90.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.1/%{name}-1.1.91.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -48,7 +48,7 @@ This package contains software for integrating VPN capabilities with the PPTP 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 @@ -88,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Tue Mar 1 2016 Lubomir Rintel - 1:1.2.0-0.3.beta2 +- Update to NetworkManager-pptp 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 1c4d1cd..da86386 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f982f44fbb7115f4cc68274482d82c19 NetworkManager-pptp-1.1.90.tar.xz +bb3d5ae25b81ca56ad1988031bce1baa NetworkManager-pptp-1.1.91.tar.xz From 5e09c5df542e5096257cff58fb1a6426420e4488 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 29 Mar 2016 17:51:49 +0200 Subject: [PATCH 62/81] Update to NetworkManager-pptp 1.2-beta3 --- .gitignore | 1 + NetworkManager-pptp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5b6bde8..ff3b9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.2.0.tar.xz /NetworkManager-pptp-1.1.90.tar.xz /NetworkManager-pptp-1.1.91.tar.xz +/NetworkManager-pptp-1.1.92.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 5305e28..c0ed48d 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,4 +1,4 @@ -%global snapshot .beta2 +%global snapshot .beta3 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP @@ -9,7 +9,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-pptp/1.1/%{name}-1.1.91.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.1/%{name}-1.1.92.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -48,7 +48,7 @@ This package contains software for integrating VPN capabilities with the PPTP 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 @@ -88,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Tue Mar 29 2016 Lubomir Rintel - 1:1.2.0-0.3.beta3 +- Update to NetworkManager-pptp 1.2-beta3 + * Tue Mar 1 2016 Lubomir Rintel - 1:1.2.0-0.3.beta2 - Update to NetworkManager-pptp 1.2-beta2 diff --git a/sources b/sources index da86386..540b834 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb3d5ae25b81ca56ad1988031bce1baa NetworkManager-pptp-1.1.91.tar.xz +8fbc4c87074e36be0599831bf1ee2c14 NetworkManager-pptp-1.1.92.tar.xz From 2438ff14414bbd34d3c999b4f3c2ab862519427b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 5 Apr 2016 23:19:19 +0200 Subject: [PATCH 63/81] Update to NetworkManager-pptp --- .gitignore | 1 + NetworkManager-pptp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ff3b9c8..47b8fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.1.90.tar.xz /NetworkManager-pptp-1.1.91.tar.xz /NetworkManager-pptp-1.1.92.tar.xz +/NetworkManager-pptp-1.1.93.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index c0ed48d..2a66f33 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,4 +1,4 @@ -%global snapshot .beta3 +%global snapshot .rc1 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP @@ -9,7 +9,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-pptp/1.1/%{name}-1.1.92.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.1/%{name}-1.1.93.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -48,7 +48,7 @@ This package contains software for integrating VPN capabilities with the PPTP 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 @@ -88,6 +88,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Tue Apr 5 2016 Lubomir Rintel - 1:1.2.0-0.3.rc1 +- Update to NetworkManager-pptp 1.2-rc1 + * Tue Mar 29 2016 Lubomir Rintel - 1:1.2.0-0.3.beta3 - Update to NetworkManager-pptp 1.2-beta3 diff --git a/sources b/sources index 540b834..023206e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fbc4c87074e36be0599831bf1ee2c14 NetworkManager-pptp-1.1.92.tar.xz +ea51fd3132878fc17de84abceaae027f NetworkManager-pptp-1.1.93.tar.xz From c204a644352995749d50dd6c321154cd14e13a95 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 14 Apr 2016 18:01:02 +0200 Subject: [PATCH 64/81] Fix a crash --- 0001-nm-pppd-plugin-fix-crash.patch | 30 +++++++++++++++++++++++++++++ NetworkManager-pptp.spec | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-nm-pppd-plugin-fix-crash.patch diff --git a/0001-nm-pppd-plugin-fix-crash.patch b/0001-nm-pppd-plugin-fix-crash.patch new file mode 100644 index 0000000..33d93ac --- /dev/null +++ b/0001-nm-pppd-plugin-fix-crash.patch @@ -0,0 +1,30 @@ +From 5878c8644f1989464583d3537a88fe16e4664e0d Mon Sep 17 00:00:00 2001 +From: Mikhail Efremov +Date: Wed, 13 Apr 2016 21:43:18 +0300 +Subject: [PATCH] nm-pppd-plugin: fix crash + +A bus name is not an object path. +Fix crash introduced by commit 17ae85788987ef1f7c92a251c535312163144c33. + +(cherry picked from commit f145851f93614473e63d0a7a1a452fedcc90e914) +--- + src/nm-pptp-pppd-plugin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nm-pptp-pppd-plugin.c b/src/nm-pptp-pppd-plugin.c +index 2b8c819..4567fcc 100644 +--- a/src/nm-pptp-pppd-plugin.c ++++ b/src/nm-pptp-pppd-plugin.c +@@ -318,8 +318,8 @@ plugin_init (void) + proxy = g_dbus_proxy_new_sync (bus, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, + NULL, +- NM_DBUS_SERVICE_PPTP_PPP, + bus_name, ++ NM_DBUS_PATH_PPTP_PPP, + NM_DBUS_INTERFACE_PPTP_PPP, + NULL, &err); + g_object_unref (bus); +-- +2.5.5 + diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 2a66f33..e9e6a69 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -5,12 +5,14 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.0 -Release: 0.3%{?snapshot}%{?dist} +Release: 0.4%{?snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.1/%{name}-1.1.93.tar.xz +Patch0: 0001-nm-pppd-plugin-fix-crash.patch + BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel >= 1:1.1.0 @@ -49,6 +51,7 @@ the PPTP server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-1.1.93 +%patch0 -p1 %build if [ ! -f configure ]; then @@ -88,6 +91,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %changelog +* Thu Apr 14 2016 Lubomir Rintel - 1:1.2.0-0.4.rc1 +- Fix a crash + * Tue Apr 5 2016 Lubomir Rintel - 1:1.2.0-0.3.rc1 - Update to NetworkManager-pptp 1.2-rc1 From 4dd8d451a263956a7c3b7cd86e195eafdde01954 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 20 Apr 2016 19:48:31 +0200 Subject: [PATCH 65/81] Update to 1.2.0 release --- 0001-nm-pppd-plugin-fix-crash.patch | 30 ----------------------------- NetworkManager-pptp.spec | 14 +++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 0001-nm-pppd-plugin-fix-crash.patch diff --git a/0001-nm-pppd-plugin-fix-crash.patch b/0001-nm-pppd-plugin-fix-crash.patch deleted file mode 100644 index 33d93ac..0000000 --- a/0001-nm-pppd-plugin-fix-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5878c8644f1989464583d3537a88fe16e4664e0d Mon Sep 17 00:00:00 2001 -From: Mikhail Efremov -Date: Wed, 13 Apr 2016 21:43:18 +0300 -Subject: [PATCH] nm-pppd-plugin: fix crash - -A bus name is not an object path. -Fix crash introduced by commit 17ae85788987ef1f7c92a251c535312163144c33. - -(cherry picked from commit f145851f93614473e63d0a7a1a452fedcc90e914) ---- - src/nm-pptp-pppd-plugin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nm-pptp-pppd-plugin.c b/src/nm-pptp-pppd-plugin.c -index 2b8c819..4567fcc 100644 ---- a/src/nm-pptp-pppd-plugin.c -+++ b/src/nm-pptp-pppd-plugin.c -@@ -318,8 +318,8 @@ plugin_init (void) - proxy = g_dbus_proxy_new_sync (bus, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, - NULL, -- NM_DBUS_SERVICE_PPTP_PPP, - bus_name, -+ NM_DBUS_PATH_PPTP_PPP, - NM_DBUS_INTERFACE_PPTP_PPP, - NULL, &err); - g_object_unref (bus); --- -2.5.5 - diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index e9e6a69..6db588e 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,17 +1,14 @@ -%global snapshot .rc1 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.0 -Release: 0.4%{?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-pptp/1.1/%{name}-1.1.93.tar.xz - -Patch0: 0001-nm-pppd-plugin-fix-crash.patch +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-1.2.0.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -50,8 +47,7 @@ This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-1.1.93 -%patch0 -p1 +%setup -q %build if [ ! -f configure ]; then @@ -89,8 +85,12 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name +%{_datadir}/appdata/network-manager-pptp.appdata.xml %changelog +* Wed Apr 20 2016 Lubomir Rintel - 1.2.0-1 +- Update to 1.2.0 release + * Thu Apr 14 2016 Lubomir Rintel - 1:1.2.0-0.4.rc1 - Fix a crash diff --git a/sources b/sources index 023206e..fb5cd26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea51fd3132878fc17de84abceaae027f NetworkManager-pptp-1.1.93.tar.xz +c1ed01ab077dcea91d1f95cfcba11d50 NetworkManager-pptp-1.2.0.tar.xz From 582c03cc46de93cd1cc668c29a18dc139f6c9a93 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 11 May 2016 15:18:14 +0200 Subject: [PATCH 66/81] Update to 1.2.2 release --- .gitignore | 1 + NetworkManager-pptp.spec | 20 ++++++++++---------- sources | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 47b8fc8..e4d80d7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.1.91.tar.xz /NetworkManager-pptp-1.1.92.tar.xz /NetworkManager-pptp-1.1.93.tar.xz +/NetworkManager-pptp-1.2.2.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 6db588e..a8a0354 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -3,26 +3,26 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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-pptp/1.2/%{name}-1.2.0.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel >= 1:1.1.0 -BuildRequires: NetworkManager-libnm-devel >= 1:1.1.0 +BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 +BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 BuildRequires: glib2-devel BuildRequires: ppp-devel BuildRequires: libtool intltool gettext BuildRequires: libsecret-devel BuildRequires: libnm-gtk-devel >= 0.9 -BuildRequires: libnma-devel >= 1.1.0 +BuildRequires: libnma-devel >= 1.2.0 Requires: dbus -Requires: NetworkManager >= 1:1.1.0 +Requires: NetworkManager >= 1:1.2.0 Requires: pptp Requires: ppp @@ -50,9 +50,6 @@ the PPTP server with NetworkManager (GNOME files). %setup -q %build -if [ ! -f configure ]; then - ./autogen.sh -fi %configure \ --disable-static \ --enable-more-warnings=yes \ @@ -85,9 +82,12 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name -%{_datadir}/appdata/network-manager-pptp.appdata.xml +%{_datadir}/appdata/network-manager-pptp.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 fb5cd26..faf33a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1ed01ab077dcea91d1f95cfcba11d50 NetworkManager-pptp-1.2.0.tar.xz +e1d0021eff80fcf6ad1c445b4fa0451d NetworkManager-pptp-1.2.2.tar.xz From 7c44fa37224f0493e392cec9cf81d50282a0f2a7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 12 Sep 2016 15:08:21 +0200 Subject: [PATCH 67/81] Update to 1.2.4-0.1 pre-release package Implement GTK split (rh#1088677) --- .gitignore | 1 + NetworkManager-pptp.spec | 27 ++++++++++++++++++--------- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e4d80d7..0afa0b8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.1.92.tar.xz /NetworkManager-pptp-1.1.93.tar.xz /NetworkManager-pptp-1.2.2.tar.xz +/NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index a8a0354..3d1f04d 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,14 +1,15 @@ -%global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') - Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 1.2.2 -Release: 1%{?dist} +Version: 1.2.4 +Release: 0.1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz +#Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz +Source0: NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz + +%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -39,7 +40,6 @@ Summary: NetworkManager VPN plugin for PPTP - GNOME files Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: nm-connection-editor Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 %description -n NetworkManager-pptp-gnome @@ -47,7 +47,7 @@ This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager (GNOME files). %prep -%setup -q +%setup -q -n NetworkManager-pptp-1.2.3 %build %configure \ @@ -69,22 +69,31 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %find_lang %{name} %files -f %{name}.lang +%{_libdir}/NetworkManager/libnm-vpn-plugin-pptp.so %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf %{_prefix}/lib/NetworkManager/VPN/nm-pptp-service.name %{_libexecdir}/nm-pptp-service -%{_libexecdir}/nm-pptp-auth-dialog %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so %doc AUTHORS README ChangeLog NEWS %license COPYING %files -n NetworkManager-pptp-gnome -%{_libdir}/NetworkManager/lib*.so* +%{_libexecdir}/nm-pptp-auth-dialog +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_libdir}/NetworkManager/libnm-vpn-plugin-pptp-editor.so %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %{_datadir}/appdata/network-manager-pptp.metainfo.xml %changelog +* Mon Sep 12 2016 Thomas Haller - 1.2.4-0.1 +- Update to 1.2.4 pre-release +- Remove GTK dependency from base openvpn package (rh#1088677) +- Introduce new GTK-free VPN plugin base-library to nm-pptp package +- Don't require nm-connection-editor anymore +- Support NM_VPN_LOG_LEVEL environment variable to control logging + * Wed May 11 2016 Lubomir Rintel - 1.2.2-1 - Update to 1.2.2 release diff --git a/sources b/sources index faf33a6..3e5b14e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1d0021eff80fcf6ad1c445b4fa0451d NetworkManager-pptp-1.2.2.tar.xz +a66297ca567d00e3ea17ae0fd3dae955 NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz From bfcb4829dc4671eb418ea98e1612494bb5b786f2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 3 Oct 2016 13:15:48 +0200 Subject: [PATCH 68/81] Update to 1.2.4 release package --- .gitignore | 1 + NetworkManager-pptp.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0afa0b8..c98b3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.1.93.tar.xz /NetworkManager-pptp-1.2.2.tar.xz /NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz +/NetworkManager-pptp-1.2.4.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 3d1f04d..2d2166b 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -2,12 +2,11 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.4 -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-pptp/1.2/%{name}-%{version}.tar.xz -Source0: NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) @@ -47,7 +46,7 @@ This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager (GNOME files). %prep -%setup -q -n NetworkManager-pptp-1.2.3 +%setup -q %build %configure \ @@ -87,6 +86,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/appdata/network-manager-pptp.metainfo.xml %changelog +* Mon Oct 3 2016 Thomas Haller - 1.2.4-1 +- Update to 1.2.4 release + * Mon Sep 12 2016 Thomas Haller - 1.2.4-0.1 - Update to 1.2.4 pre-release - Remove GTK dependency from base openvpn package (rh#1088677) diff --git a/sources b/sources index 3e5b14e..609bdc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a66297ca567d00e3ea17ae0fd3dae955 NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz +a05b36c92870e2e248c0c75b2c7ef577 NetworkManager-pptp-1.2.4.tar.xz From 1c2c443ba2e79cc7ca791b68342c938cbe01685a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:14:41 +0000 Subject: [PATCH 69/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 2d2166b..5f8fcdb 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -2,7 +2,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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 @@ -86,6 +86,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/appdata/network-manager-pptp.metainfo.xml %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1:1.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 3 2016 Thomas Haller - 1.2.4-1 - Update to 1.2.4 release From 55aa51569e4f9475103327bc317d5f7233c4ef46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 01:56:59 +0000 Subject: [PATCH 70/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 5f8fcdb..3c85af5 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -2,7 +2,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -86,6 +86,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/appdata/network-manager-pptp.metainfo.xml %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1:1.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1:1.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1153279f327ab3b812af26b2c79d916b635d0eef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:02:06 +0000 Subject: [PATCH 71/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 3c85af5..547dbf1 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -2,7 +2,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -86,6 +86,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %{_datadir}/appdata/network-manager-pptp.metainfo.xml %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1:1.2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1:1.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f384192c3d7f08c7c9af4fc001bf54b665681012 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 30 Nov 2017 10:57:40 +0100 Subject: [PATCH 72/81] Drop libnm-glib for Fedora 28 --- NetworkManager-pptp.spec | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 547dbf1..5a82765 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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 PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -26,9 +33,7 @@ Requires: NetworkManager >= 1:1.2.0 Requires: pptp Requires: ppp -%global _privatelibs libnm-pptp-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 @@ -51,6 +56,9 @@ the PPTP server with NetworkManager (GNOME files). %build %configure \ --disable-static \ +%if %without libnm_glib + --without-libnm-glib \ +%endif --enable-more-warnings=yes \ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ --with-dist-version=%{version}-%{release} @@ -78,14 +86,21 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %files -n NetworkManager-pptp-gnome %{_libexecdir}/nm-pptp-auth-dialog -%{_libdir}/NetworkManager/libnm-*-properties.so %{_libdir}/NetworkManager/libnm-vpn-plugin-pptp-editor.so %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui -%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name %{_datadir}/appdata/network-manager-pptp.metainfo.xml +%if %with libnm_glib +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name +%endif + + %changelog +* Thu Nov 30 2017 Lubomir Rintel - 1:1.2.4-5 +- Drop libnm-glib for Fedora 28 + * Wed Aug 02 2017 Fedora Release Engineering - 1:1.2.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 98807136fe60dc9fce45bcc8faf9ed632eb39da4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:49:48 +0000 Subject: [PATCH 73/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 5a82765..3927b2e 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -98,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1:1.2.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Nov 30 2017 Lubomir Rintel - 1:1.2.4-5 - Drop libnm-glib for Fedora 28 From 1445a385c85648854579ca0145e86394e81c5679 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 29 Mar 2018 10:11:26 +0200 Subject: [PATCH 74/81] Update to 1.2.6 release --- .gitignore | 1 + NetworkManager-pptp.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c98b3e4..9bd21aa 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.2.2.tar.xz /NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz /NetworkManager-pptp-1.2.4.tar.xz +/NetworkManager-pptp-1.2.6.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 3927b2e..e89ce1a 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -8,8 +8,8 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 1.2.4 -Release: 6%{?dist} +Version: 1.2.6 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -17,16 +17,18 @@ Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{ %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) +BuildRequires: glib2-devel 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: libnma-devel >= 1.2.0 BuildRequires: ppp-devel BuildRequires: libtool intltool gettext BuildRequires: libsecret-devel +%if %with libnm_glib +BuildRequires: NetworkManager-devel +BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 BuildRequires: libnm-gtk-devel >= 0.9 -BuildRequires: libnma-devel >= 1.2.0 +%endif Requires: dbus Requires: NetworkManager >= 1:1.2.0 @@ -57,7 +59,7 @@ the PPTP server with NetworkManager (GNOME files). %configure \ --disable-static \ %if %without libnm_glib - --without-libnm-glib \ + --without-libnm-glib \ %endif --enable-more-warnings=yes \ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ @@ -87,8 +89,6 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %files -n NetworkManager-pptp-gnome %{_libexecdir}/nm-pptp-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-pptp-editor.so -%dir %{_datadir}/gnome-vpn-properties/pptp -%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %{_datadir}/appdata/network-manager-pptp.metainfo.xml %if %with libnm_glib @@ -98,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Thu Mar 29 2018 Thomas Haller - 1.2.6-1 +- Update to 1.2.6 release + * Wed Feb 07 2018 Fedora Release Engineering - 1:1.2.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 609bdc6..74db50c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a05b36c92870e2e248c0c75b2c7ef577 NetworkManager-pptp-1.2.4.tar.xz +SHA512 (NetworkManager-pptp-1.2.6.tar.xz) = aaa74eba949a93a132ebb956bfec46f8cf7b9807cf984a1fd8c4f71a252709d9e2b144cd7b4ce1f560501056c758f028eeb2c53d5cccaa79f8dc6b9d595763f8 From 93b28835a829139090e3a07ddb3346ad78aecb19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:08:59 +0000 Subject: [PATCH 75/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index e89ce1a..ca451be 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -9,7 +9,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp 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 @@ -98,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1:1.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 29 2018 Thomas Haller - 1.2.6-1 - Update to 1.2.6 release From b6a912c97b7f23a316c09ea5c9c631fafb4a34cf Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 4 Oct 2018 11:16:35 +0200 Subject: [PATCH 76/81] Update to 1.2.8 release --- .gitignore | 1 + NetworkManager-pptp.spec | 25 ++++++++++++++++++++++--- sources | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9bd21aa..4744b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz /NetworkManager-pptp-1.2.4.tar.xz /NetworkManager-pptp-1.2.6.tar.xz +/NetworkManager-pptp-1.2.8.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index ca451be..f3a56f5 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,10 +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 +%global real_version 1.2.8 +%global rpm_version 1.2.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') + Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 @@ -13,7 +18,11 @@ Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz + + +Source0: https://download.gnome.org/sources/NetworkManager-pptp/%{real_version_major}/%{name}-%{real_version}.tar.xz +#Patch1: 0001-example.patch + %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) @@ -35,12 +44,14 @@ Requires: NetworkManager >= 1:1.2.0 Requires: pptp Requires: ppp + %global __provides_exclude ^libnm-.*\\.so %description This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager. + %package -n NetworkManager-pptp-gnome Summary: NetworkManager VPN plugin for PPTP - GNOME files Group: System Environment/Base @@ -52,8 +63,10 @@ Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager (GNOME files). + %prep -%setup -q +%autosetup -p1 -n "%{name}-%{real_version}" + %build %configure \ @@ -66,9 +79,11 @@ the PPTP server with NetworkManager (GNOME files). --with-dist-version=%{version}-%{release} make %{?_smp_mflags} + %check make check + %install make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" @@ -77,6 +92,7 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %find_lang %{name} + %files -f %{name}.lang %{_libdir}/NetworkManager/libnm-vpn-plugin-pptp.so %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf @@ -98,6 +114,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Thu Oct 4 2018 Thomas Haller - 1.2.8-1 +- Update to 1.2.8 release + * Thu Jul 12 2018 Fedora Release Engineering - 1:1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 74db50c..3115edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-pptp-1.2.6.tar.xz) = aaa74eba949a93a132ebb956bfec46f8cf7b9807cf984a1fd8c4f71a252709d9e2b144cd7b4ce1f560501056c758f028eeb2c53d5cccaa79f8dc6b9d595763f8 +SHA512 (NetworkManager-pptp-1.2.8.tar.xz) = ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7 From 5c0392e9e381b271e4b967e6041c1360d6becff1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 4 Oct 2018 11:31:46 +0200 Subject: [PATCH 77/81] fix version number --- NetworkManager-pptp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index f3a56f5..b37a581 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -13,8 +13,8 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 1.2.6 -Release: 2%{?dist} +Version: %{rpm_version} +Release: %{release_version}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base From 34ea1f0acafe5ca0dfc4146e1040196bfb465d4f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:55 +0100 Subject: [PATCH 78/81] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- NetworkManager-pptp.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index b37a581..75f8d56 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.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-pptp/%{real_version_major}/%{name}-%{real_version}.tar.xz @@ -54,7 +53,6 @@ the PPTP server with NetworkManager. %package -n NetworkManager-pptp-gnome Summary: NetworkManager VPN plugin for PPTP - GNOME files -Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 From d8200a9cb33c4acbee435cd6cf0f9ba2466256b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:43:36 +0000 Subject: [PATCH 79/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 75f8d56..765d29f 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -14,7 +14,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: %{rpm_version} -Release: %{release_version}%{?dist} +Release: %{release_version}%{?dist}.1 License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -112,6 +112,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1:1.2.8-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Oct 4 2018 Thomas Haller - 1.2.8-1 - Update to 1.2.8 release From 2fdd4f95e3e45053fa80b87bcc7b519046c9dc36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 16:00:48 +0000 Subject: [PATCH 80/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 765d29f..958bde3 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -14,7 +14,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: %{rpm_version} -Release: %{release_version}%{?dist}.1 +Release: %{release_version}%{?dist}.2 License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -112,6 +112,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1:1.2.8-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1:1.2.8-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ab230473aa927c5935805c61daa09b47cff5ba3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:35:03 +0000 Subject: [PATCH 81/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- NetworkManager-pptp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 958bde3..c2cab19 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -14,7 +14,7 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: %{rpm_version} -Release: %{release_version}%{?dist}.2 +Release: %{release_version}%{?dist}.3 License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -112,6 +112,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1:1.2.8-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1:1.2.8-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild