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; +