rpms/NetworkManager-pptp/devel nm-pptp-free.patch, NONE, 1.1 NetworkManager-pptp.spec, 1.4, 1.5

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4606

Modified Files:
	NetworkManager-pptp.spec 
Added Files:
	nm-pptp-free.patch 
Log Message:
* Wed Oct 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-12.svn4229
- Fix hang in auth dialog (rh #467007)



nm-pptp-free.patch:

--- NEW FILE nm-pptp-free.patch ---
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;
 


Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetworkManager-pptp.spec	28 Oct 2008 03:45:37 -0000	1.4
+++ NetworkManager-pptp.spec	30 Oct 2008 03:21:40 -0000	1.5
@@ -10,13 +10,15 @@
 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 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .free
 
 %build
 %configure --enable-more-warnings=yes
@@ -102,6 +105,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
 
 %changelog
+* Wed Oct 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-12.svn4229
+- Fix hang in auth dialog (rh #467007)
+
 * Mon Oct 27 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn4229
 - Rebuild for updated NetworkManager
 - Ensure that certain PPP options are always overriden