rpms/NetworkManager-pptp/EL-5 NetworkManager-pptp-0.7.0-dbus.patch, NONE, 1.1 NetworkManager-pptp-0.7.0-keyring.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 NetworkManager-pptp.spec, 1.1, 1.2 sources, 1.2, 1.3 NetworkManager-pptp-0.6.4-noversion.patch, 1.1, NONE NetworkManager-pptp-0.6.4-pppdplugin.patch, 1.1, NONE NetworkManager-pptp-0.6.6-desktop.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/NetworkManager-pptp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25782

Modified Files:
	.cvsignore NetworkManager-pptp.spec sources 
Added Files:
	NetworkManager-pptp-0.7.0-dbus.patch 
	NetworkManager-pptp-0.7.0-keyring.patch 
Removed Files:
	NetworkManager-pptp-0.6.4-noversion.patch 
	NetworkManager-pptp-0.6.4-pppdplugin.patch 
	NetworkManager-pptp-0.6.6-desktop.patch 
Log Message:
* Sat Feb  7 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0-2.svn16
- Adjust for RHEL 5.3


NetworkManager-pptp-0.7.0-dbus.patch:

--- NEW FILE NetworkManager-pptp-0.7.0-dbus.patch ---
Fool configure into thinking we don't need dbus-glib 0.74. In fact,
it seems we actually don't.

Not worth regenerating with autoconf, just
sed -i 's/0\.74/0.73/g' -i configure

Lubomir Rintel <lkundrak at v3.sk>

diff -up NetworkManager-pptp-0.7.0/configure.dbus NetworkManager-pptp-0.7.0/configure
--- NetworkManager-pptp-0.7.0/configure.dbus	2009-01-03 08:33:10.000000000 +0100
+++ NetworkManager-pptp-0.7.0/configure	2009-02-07 12:31:03.000000000 +0100
@@ -22806,12 +22806,12 @@ if test -n "$DBUS_CFLAGS"; then
     pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\"") >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.74") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.73\"") >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.73") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.74" 2>/dev/null`
+  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.73" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22822,12 +22822,12 @@ if test -n "$DBUS_LIBS"; then
     pkg_cv_DBUS_LIBS="$DBUS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\"") >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.74") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.73\"") >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.73") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.74" 2>/dev/null`
+  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.73" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22845,14 +22845,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= 0.74" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= 0.73" 2>&1`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= 0.74" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= 0.73" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= 0.74) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= 0.73) were not met:
 
 $DBUS_PKG_ERRORS
 
@@ -22863,7 +22863,7 @@ Alternatively, you may set the environme
 and DBUS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (dbus-glib-1 >= 0.74) were not met:
+echo "$as_me: error: Package requirements (dbus-glib-1 >= 0.73) were not met:
 
 $DBUS_PKG_ERRORS
 

NetworkManager-pptp-0.7.0-keyring.patch:

--- NEW FILE NetworkManager-pptp-0.7.0-keyring.patch ---
Older keyring manager does not provide memory protected string manipulation.
This is slightly less secure, but definitely not a security flaw.

Lubomir Rintel <lkundrak at v3.sk>

diff -up NetworkManager-pptp-0.7.0/auth-dialog/main.c.keyring NetworkManager-pptp-0.7.0/auth-dialog/main.c
--- NetworkManager-pptp-0.7.0/auth-dialog/main.c.keyring	2008-12-20 15:05:02.000000000 +0100
+++ NetworkManager-pptp-0.7.0/auth-dialog/main.c	2009-02-07 12:31:03.000000000 +0100
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
 
 	if (password) {
 		memset (password, 0, strlen (password));
-		gnome_keyring_memory_free (password);
+		free (password);
 	}
 
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */
diff -up NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.c.keyring NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.c
--- NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.c.keyring	2008-12-11 20:52:51.000000000 +0100
+++ NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.c	2009-02-07 12:31:03.000000000 +0100
@@ -21,7 +21,7 @@
  */
 
 #include <string.h>
-#include <gnome-keyring-memory.h>
+#include <gnome-keyring.h>
 
 #include <nm-setting-vpn.h>
 
@@ -66,7 +66,7 @@ keyring_helpers_lookup_secret (const cha
 			*is_session = FALSE;
 	}
 
-	secret = found->secret ? gnome_keyring_memory_strdup (found->secret) : NULL;
+	secret = found->secret ? strdup (found->secret) : NULL;
 	gnome_keyring_found_list_free (found_list);
 
 	return secret;
@@ -139,7 +139,7 @@ keyring_helpers_delete_secret (const cha
 	                                      GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
 	                                      secret_name,
 	                                      NULL);
-	if (ret != GNOME_KEYRING_RESULT_OK && ret != GNOME_KEYRING_RESULT_NO_MATCH)
+	if (ret != GNOME_KEYRING_RESULT_OK)
 		return FALSE;
 	if (g_list_length (found) == 0)
 		return TRUE;
diff -up NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.h.keyring NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.h
--- NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.h.keyring	2008-12-11 20:52:51.000000000 +0100
+++ NetworkManager-pptp-0.7.0/common-gnome/keyring-helpers.h	2009-02-07 12:31:03.000000000 +0100
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <gnome-keyring.h>
-#include <gnome-keyring-memory.h>
 
 char *keyring_helpers_lookup_secret (
 		const char *vpn_uuid,
diff -up NetworkManager-pptp-0.7.0/properties/nm-pptp.c.keyring NetworkManager-pptp-0.7.0/properties/nm-pptp.c
--- NetworkManager-pptp-0.7.0/properties/nm-pptp.c.keyring	2008-12-11 20:52:51.000000000 +0100
+++ NetworkManager-pptp-0.7.0/properties/nm-pptp.c	2009-02-07 12:31:03.000000000 +0100
@@ -249,7 +249,7 @@ fill_password (GladeXML *xml,
 
 			tmp = nm_setting_vpn_get_secret (s_vpn, password_type);
 			if (tmp)
-				password = gnome_keyring_memory_strdup (tmp);
+				password = strdup (tmp);
 		}
 	} else {
 		NMSettingConnection *s_con = NULL;
@@ -265,7 +265,7 @@ fill_password (GladeXML *xml,
 
 	if (password) {
 		gtk_entry_set_text (GTK_ENTRY (widget), password);
-		gnome_keyring_memory_free (password);
+		free (password);
 	}
 
 	return widget;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Apr 2008 15:35:51 -0000	1.2
+++ .cvsignore	7 Feb 2009 11:47:32 -0000	1.3
@@ -1 +1 @@
-NetworkManager-pptp-0.6.4.tar.gz
+NetworkManager-pptp-0.7.0.svn16.tar.bz2


Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/EL-5/NetworkManager-pptp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NetworkManager-pptp.spec	25 Apr 2008 15:35:51 -0000	1.1
+++ NetworkManager-pptp.spec	7 Feb 2009 11:47:32 -0000	1.2
@@ -1,66 +1,74 @@
-%define ppp_version %(%{_sbindir}/pppd --version 2>&1 |awk '{print $3}')
+%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 svn16
+
+Summary:   NetworkManager VPN plugin for pptp
+Name:      NetworkManager-pptp
+Epoch:     1
+Version:   0.7.0
+Release:   2.%{svn_snapshot}%{?dist}
+License:   GPLv2+
+Group:     System Environment/Base
+URL:       http://www.gnome.org/projects/NetworkManager/
+Source:    %{name}-%{version}.%{svn_snapshot}.tar.bz2
+Patch0:    NetworkManager-pptp-0.7.0-dbus.patch
+Patch1:    NetworkManager-pptp-0.7.0-keyring.patch
+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: gnome-keyring-devel
+BuildRequires: libglade2-devel
+BuildRequires: intltool gettext
+%if 0%{?fedora} > 6
+BuildRequires: ppp-devel >= %{ppp_version}
+%else
+BuildRequires: ppp >= %{ppp_version}
+%endif
+
+Requires: gtk2             >= %{gtk2_version}
+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
+Requires(postun): /sbin/ldconfig desktop-file-utils
 
-Name:           NetworkManager-pptp
-Version:        0.6.4
-Release:        2%{?dist}
-Summary:        PPTP support for NetworkManager
-
-# How to build the source tarball:
-# NAME=%{name}
-# VERSION=%{version}
-# svn co http://svn.gnome.org/svn/NetworkManager/tags/NETWORKMANAGER_0_6_4_RELEASE/vpn-daemons/pptp/ \
-#       $NAME-$VERSION
-# cd $NAME-$VERSION
-# ./autogen.sh
-# make distclean
-# cd ..
-# tar  --exclude .svn -czf $NAME-$VERSION.tar.gz $NAME-$VERSION
-
-Group:          System Environment/Base
-License:        GPLv2+
-URL:            http://www.gnome.org/projects/NetworkManager/
-Source0:        %{name}-%{version}.tar.gz
-Patch0:         NetworkManager-pptp-0.6.6-desktop.patch
-Patch1:         NetworkManager-pptp-0.6.4-pppdplugin.patch
-Patch2:         NetworkManager-pptp-0.6.4-noversion.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: NetworkManager-devel = 1:%{version}
-BuildRequires: libgnomeui-devel
-BuildRequires: gettext intltool
-BuildRequires: desktop-file-utils
-BuildRequires: ppp
-
-Requires:      NetworkManager = 1:%{version}
-# Installs plugin to version-specific directory
-Requires:      ppp = %{ppp_version}
-Requires:      pptp
 
 %description
 This package contains software for integrating PPTP VPN support with
 the NetworkManager and the GNOME desktop.
 
-
 %prep
 %setup -q
-%patch0 -p0 -b .desktop
-%patch1 -p1 -b .pppdplugin
-%patch2 -p1 -b .noversion
+%patch0 -p1 -b .dbus
+%patch1 -p1 -b .keyring
 
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-more-warnings=yes
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --delete-original                  \
-  --vendor=fedora                                       \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications         \
-  $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop
+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}
 
@@ -70,37 +78,67 @@
 
 
 %post
-update-desktop-database &> /dev/null || :
+/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 || :
+      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
 %postun
-update-desktop-database &> /dev/null || :
+/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 || :
+      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
-%{_bindir}/*
-%{_sysconfdir}/NetworkManager/VPN/*.name
-%{_sysconfdir}/dbus-1/system.d/*.conf
-%{_libdir}/*.so*
-%{_libdir}/pppd/%{ppp_version}/*.so
-%exclude %{_libdir}/*.la
-%{_libexecdir}/*
-%doc AUTHORS ChangeLog README TODO
+%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
+%dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Sat Feb  7 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0-2.svn16
+- Adjust for RHEL 5.3
+
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 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 <dcbw at redhat.com> 1:0.7.0-12.svn4326
+- Rebuild for updated NetworkManager
+
+* 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
+
+* Sun Oct 12 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn4178
+- Rebuild for updated NetworkManager
+- Allow changing passwords from the connection editor
+
+* Sun Oct 05 2008 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0-11.svn4027
+- Add pptp dependency (#465644)
+
+* Fri Aug 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4027
+- Resurrect from the dead
+
 * Mon Apr 21 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.6.4-2
 - Take Dan Horak's review into account (#443807):
 - Do not install versioned .so-s for properties module
@@ -122,3 +160,4 @@
 * Thu Nov 15 2007 Lubomir Kundrak <lkundrak at redhat.com> 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
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Apr 2008 15:35:51 -0000	1.2
+++ sources	7 Feb 2009 11:47:32 -0000	1.3
@@ -1 +1 @@
-fb3cbdb32cf67a434229e6e1d1dd9616  NetworkManager-pptp-0.6.4.tar.gz
+df7f950127c9cc7e640dd2c8effd953b  NetworkManager-pptp-0.7.0.svn16.tar.bz2


--- NetworkManager-pptp-0.6.4-noversion.patch DELETED ---


--- NetworkManager-pptp-0.6.4-pppdplugin.patch DELETED ---


--- NetworkManager-pptp-0.6.6-desktop.patch DELETED ---