--- network-manager-pptp-0.7~~svn20081015t024626.orig/2 +++ network-manager-pptp-0.7~~svn20081015t024626/2 @@ -0,0 +1,109 @@ +network-manager-pptp (0.7~~svn20081015t024626-0ubuntu2~nm3) intrepid; urgency=low + + * improve ppp domain in username encoding + - add debian/patches/ppp.patch + - add debian/patches/ppp1.patch + * LP: #292681 crash when running auth-dialog and secret in keyring; + we use the proper memory functions in this patch + - add debian/patches/keyring_memory_free.patch + + -- Alexander Sack Thu, 30 Oct 2008 00:22:51 +0100 + +network-manager-pptp (0.7~~svn20081015t024626-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * debian/control: adjust network manager build-depends to >= 0.7~~svn20081015 + + -- Alexander Sack Thu, 16 Oct 2008 00:25:26 +0200 + +network-manager-pptp (0.7~~svn20081008t224042-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * debian/control: adjust network manager build-depends to >= 0.7~~svn20081008 + + -- Thierry Carrez Mon, 13 Oct 2008 11:07:50 +0200 + +network-manager-pptp (0.7~~svn20080928t225540-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * adjust network manager build-depends to >= 0.7~~svn20080928 + - update debian/control + + -- Alexander Sack Mon, 29 Sep 2008 22:39:05 +0200 + +network-manager-pptp (0.7~~svn20080908t183521-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * adjust network manager build-depends to >= 0.7~~svn20080908 + - update debian/control + + -- Alexander Sack Wed, 10 Sep 2008 11:04:06 +0200 + +network-manager-pptp (0.7~~svn20080818t061112-0ubuntu1) intrepid; urgency=low + + * switch to cdbs; add cdbs to build-depends accordingly + - update debian/control + - update debian/rules + * drop _all_ patches and the complete patches directory; in turn drop dpatch + from build-depends + - delete debian/patches/00list + - delete debian/patches/02_nm_ppp_starter_0.62.dpatch + - delete debian/patches/04_nm_ppp_properties.c.dpatch + - delete debian/patches/01_no_icon.dpatch + - delete debian/patches/03_nm_ppp_dialog.glade.dpatch + - delete debian/patches/05_ppplibdir.dpatch + - update debian/control + * use absolute path (@LIBEXECPATH@) for auth-dialog key + - update nm-pptp-service.name.in + + -- Alexander Sack Tue, 12 Aug 2008 14:04:51 +0200 + +network-manager-pptp (0.6.5+svnhead2574-0ubuntu1) gutsy; urgency=low + + * Due to misscomprehension with original maintainer, my previous svn + sync was a regression, as I synched with 0.6.5 branch while he did + with 0.7 beta and backported the sources for 0.6.x. Reverting the + packaging for the moment as we are late in the dev cycle to resync + from svn and get potentially something unstable. + * Applyed patch 01_no_icon.dpatch + * Removed network-manager-gnome dependancy + * Added missing build-dep libnm-util-dev + + -- Anthony Mercatante Fri, 15 Jun 2007 18:20:22 +0200 + +network-manager-pptp (0.6.5+svn2595-0ubuntu1) gutsy; urgency=low + + * New svn snapshot + * Fixes dependancies. Shouldn't depend on network-manager-gnome. + * Added missing build-dep libnm-util-dev according to new + network-manager + * Dropped obsolete patches + * Switched packaging to cdbs + * Build-deps on network-manager 0.6.5 + + -- Anthony Mercatante Fri, 15 Jun 2007 18:20:22 +0200 + +network-manager-pptp (0.6.4+svn2574-0ubuntu1) gutsy; urgency=low + + * New upstream release (fixes LP: #67881, LP: #80541). + * Fix properties dialog so an option is always selected. (fixes LP: #89120) + * Set NoDisplay=true in the .desktop file to hide spurious menu item + (fixes LP: #109856). + * Bump Standards-version to 3.7.2 and fix Maintainer: field in + debian/control. + + -- Craig Box Sun, 4 Jun 2007 11:18:03 +1200 + +network-manager-pptp (0.6.3+cvs20060819-0ubuntu2) edgy; urgency=low + + * Add mss field in VPN properties structure, and update documentation to + point out that this patch only applies to NM 0.6.2 (dapper). + + -- Craig Box Sun, 1 Oct 2006 16:04:54 +1300 + +network-manager-pptp (0.6.3+cvs20060819-0ubuntu1) edgy; urgency=low + + * Initial release. + + -- Craig Box Wed, 26 Oct 2006 21:06:54 +1200 + --- network-manager-pptp-0.7~~svn20081015t024626.orig/nm-pptp-service.name.in +++ network-manager-pptp-0.7~~svn20081015t024626/nm-pptp-service.name.in @@ -4,5 +4,5 @@ program=@LIBEXECDIR@/nm-pptp-service [GNOME] -auth-dialog=nm-pptp-auth-dialog +auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog properties=libnm-pptp-properties --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/network-manager-pptp.preinst +++ network-manager-pptp-0.7~~svn20081015t024626/debian/network-manager-pptp.preinst @@ -0,0 +1,29 @@ +#!/bin/sh + +# Remove a no-longer used conffile +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "0.7~~svn20081015t024626-0ubuntu1"; then + for obsolete_conffile in /etc/NetworkManager/VPN/nm-ppp-starter.name /etc/dbus-1/system.d/nm-ppp-starter.conf; do + rm_conffile network-manager-pptp "$obsolete_conffile" + done + fi +esac + --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/network-manager-pptp.manpages +++ network-manager-pptp-0.7~~svn20081015t024626/debian/network-manager-pptp.manpages @@ -0,0 +1 @@ +debian/nm-ppp-starter.1 --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/README.Debian +++ network-manager-pptp-0.7~~svn20081015t024626/debian/README.Debian @@ -0,0 +1,15 @@ +network-manager-pptp for Debian +------------------------------- + +When you have installed this package, you have to restart dbus before it will +allow you to connect (and add VPN icons into the menu). + +The package will reload dbus for you. + +Building for NetworkManager 0.6.2 +--------------------------------- + +To use with NM 0.6.2, you need to include the patch 02_nm_ppp_starter_0.62.patch (in the debian/patches directory), as a field was removed in the VPN properties between 0.6.2 and 0.6.3. + + -- Craig Box , Tue, 1 Oct 2006 15:48:01 +1300 + --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/postrm +++ network-manager-pptp-0.7~~svn20081015t024626/debian/postrm @@ -0,0 +1,40 @@ +#! /bin/sh +# postrm script for network-manager-pptp +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) +# ldconfig + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/docs +++ network-manager-pptp-0.7~~svn20081015t024626/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/compat +++ network-manager-pptp-0.7~~svn20081015t024626/debian/compat @@ -0,0 +1 @@ +4 --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/nm-ppp-starter.1 +++ network-manager-pptp-0.7~~svn20081015t024626/debian/nm-ppp-starter.1 @@ -0,0 +1,41 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH NM-PPP-SERVICE 1 "August 6, 2006" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +nm-ppp-service \- PPP connection helper for NetworkManager +.SH SYNOPSIS +.B nm-ppp-starter +.RI [ options ] ... +.SH DESCRIPTION +.B nm-ppp-service +is a helper for the NetworkManager(1) program. NetworkManager will launch +this service automatically as necessary. For debugging purposes, you can +launch the helper yourself, and watch its output. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH OPTIONS +None. +.SH SEE ALSO +.BR NetworkManager (1), +.SH AUTHOR +nm-ppp-service is part of the PPP plugin for NetworkManager, written by +Anthony Mee . +.PP +This manual page was written by Craig Box , +for Ubuntu (but may be used freely by anyone). --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/copyright +++ network-manager-pptp-0.7~~svn20081015t024626/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Craig Box on +Sun, 6 Aug 2006 19:30:11 +1200. + +It was downloaded from GNOME CVS, module NetworkManager/vpn-daemons/pptp. + +Copyright Holder: Anthony Mee, eemynotna@googlemail.com + +License: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/rules +++ network-manager-pptp-0.7~~svn20081015t024626/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +makebuilddir/network-manager-pptp:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + NOCONFIGURE=1 ./autogen.sh + touch debian/stamp-bootstrap + +clean:: + rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \ + config.h.in config.sub configure depcomp install-sh \ + intltool-extract.in intltool-merge.in intltool-update.in \ + ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \ + properties/Makefile.in src/Makefile.in debian/stamp-bootstrap + --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/control +++ network-manager-pptp-0.7~~svn20081015t024626/debian/control @@ -0,0 +1,31 @@ +Source: network-manager-pptp +Section: net +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Craig Box +Build-Depends: debhelper (>= 5.0.0), + cdbs, + autotools-dev, + network-manager-dev (>= 0.7~~svn20081015), + libnm-util-dev (>= 0.7~~svn20081015), + libnm-glib-dev (>= 0.7~~svn20081015), + ppp-dev, + automake1.9, + gnome-common, + intltool, + libgnomeui-dev, + libdbus-glib-1-dev +Standards-Version: 3.7.2 + +Package: network-manager-pptp +Architecture: any +Depends: pptp-linux, ${shlibs:Depends}, ${misc:Depends} +Description: network management framework (PPTP plugin) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides a VPN plugin for PPTP, commonly used for connecting + to Microsoft VPN servers. --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/dirs +++ network-manager-pptp-0.7~~svn20081015t024626/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +etc/NetworkManager/VPN/ --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/changelog +++ network-manager-pptp-0.7~~svn20081015t024626/debian/changelog @@ -0,0 +1,117 @@ +network-manager-pptp (0.7~~svn20081015t024626-0ubuntu1.8.10.1) intrepid-proposed; urgency=low + + * LP: #259168 Network Manager unable to connect to PPTP VPN (bad NT-Domain + escaping); we improve ppp domain in username encoding + - add debian/patches/lp259168_ppp_nt_domain_escaping.patch + * LP: #268667 MASTER - not all required ppp options get set on command line + which makes ppp use bad values from /etc/ppp/options*; we explicitly set + good values for: nodefaultroute, lcp-echo-failure and lcp-echo-interval + - add debian/patches/lp268667_ppp_default_options.patch + * LP: #292681 crash when running auth-dialog and secret in keyring; + we use the proper memory functions in this patch (dupe-of LP: #284212 + VPN connection fails: "unable to find valid VPN secrets") + - add debian/patches/lp_292681_keyring_memory_free.patch + * LP: #290468 VPN fails, "/usr/bin/nm-ppp-starter missing"; we remove + obsolete conffiles in .preinst now + - add debian/network-manager-pptp.preinst + + -- Alexander Sack Thu, 30 Oct 2008 00:22:51 +0100 + +network-manager-pptp (0.7~~svn20081015t024626-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * debian/control: adjust network manager build-depends to >= 0.7~~svn20081015 + + -- Alexander Sack Thu, 16 Oct 2008 00:25:26 +0200 + +network-manager-pptp (0.7~~svn20081008t224042-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * debian/control: adjust network manager build-depends to >= 0.7~~svn20081008 + + -- Thierry Carrez Mon, 13 Oct 2008 11:07:50 +0200 + +network-manager-pptp (0.7~~svn20080928t225540-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * adjust network manager build-depends to >= 0.7~~svn20080928 + - update debian/control + + -- Alexander Sack Mon, 29 Sep 2008 22:39:05 +0200 + +network-manager-pptp (0.7~~svn20080908t183521-0ubuntu1) intrepid; urgency=low + + * New upstream snapshot + * adjust network manager build-depends to >= 0.7~~svn20080908 + - update debian/control + + -- Alexander Sack Wed, 10 Sep 2008 11:04:06 +0200 + +network-manager-pptp (0.7~~svn20080818t061112-0ubuntu1) intrepid; urgency=low + + * switch to cdbs; add cdbs to build-depends accordingly + - update debian/control + - update debian/rules + * drop _all_ patches and the complete patches directory; in turn drop dpatch + from build-depends + - delete debian/patches/00list + - delete debian/patches/02_nm_ppp_starter_0.62.dpatch + - delete debian/patches/04_nm_ppp_properties.c.dpatch + - delete debian/patches/01_no_icon.dpatch + - delete debian/patches/03_nm_ppp_dialog.glade.dpatch + - delete debian/patches/05_ppplibdir.dpatch + - update debian/control + * use absolute path (@LIBEXECPATH@) for auth-dialog key + - update nm-pptp-service.name.in + + -- Alexander Sack Tue, 12 Aug 2008 14:04:51 +0200 + +network-manager-pptp (0.6.5+svnhead2574-0ubuntu1) gutsy; urgency=low + + * Due to misscomprehension with original maintainer, my previous svn + sync was a regression, as I synched with 0.6.5 branch while he did + with 0.7 beta and backported the sources for 0.6.x. Reverting the + packaging for the moment as we are late in the dev cycle to resync + from svn and get potentially something unstable. + * Applyed patch 01_no_icon.dpatch + * Removed network-manager-gnome dependancy + * Added missing build-dep libnm-util-dev + + -- Anthony Mercatante Fri, 15 Jun 2007 18:20:22 +0200 + +network-manager-pptp (0.6.5+svn2595-0ubuntu1) gutsy; urgency=low + + * New svn snapshot + * Fixes dependancies. Shouldn't depend on network-manager-gnome. + * Added missing build-dep libnm-util-dev according to new + network-manager + * Dropped obsolete patches + * Switched packaging to cdbs + * Build-deps on network-manager 0.6.5 + + -- Anthony Mercatante Fri, 15 Jun 2007 18:20:22 +0200 + +network-manager-pptp (0.6.4+svn2574-0ubuntu1) gutsy; urgency=low + + * New upstream release (fixes LP: #67881, LP: #80541). + * Fix properties dialog so an option is always selected. (fixes LP: #89120) + * Set NoDisplay=true in the .desktop file to hide spurious menu item + (fixes LP: #109856). + * Bump Standards-version to 3.7.2 and fix Maintainer: field in + debian/control. + + -- Craig Box Sun, 4 Jun 2007 11:18:03 +1200 + +network-manager-pptp (0.6.3+cvs20060819-0ubuntu2) edgy; urgency=low + + * Add mss field in VPN properties structure, and update documentation to + point out that this patch only applies to NM 0.6.2 (dapper). + + -- Craig Box Sun, 1 Oct 2006 16:04:54 +1300 + +network-manager-pptp (0.6.3+cvs20060819-0ubuntu1) edgy; urgency=low + + * Initial release. + + -- Craig Box Wed, 26 Oct 2006 21:06:54 +1200 + --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/postinst +++ network-manager-pptp-0.7~~svn20081015t024626/debian/postinst @@ -0,0 +1,38 @@ +#! /bin/sh +# postinst script for network-manager-pptp + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + + # Ask the bus to reload the config file + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/patches/lp268667_ppp_default_options.patch +++ network-manager-pptp-0.7~~svn20081015t024626/debian/patches/lp268667_ppp_default_options.patch @@ -0,0 +1,83 @@ +=== modified file 'vpn-daemons/pptp/src/nm-pptp-service.c' +--- vpn-daemons/pptp/src/nm-pptp-service.c 2008-09-29 21:25:08 +0000 ++++ vpn-daemons/pptp/src/nm-pptp-service.c 2008-10-29 22:27:36 +0000 +@@ -645,16 +645,17 @@ static GPtrArray * + construct_pppd_args (NMPptpPlugin *plugin, + NMSettingVPN *s_vpn, + const char *pppd, + GError **error) + { + GPtrArray *args = NULL; + const char *value, *pptp_binary; + char *ipparam, *tmp; ++ gboolean set = TRUE; + + pptp_binary = nm_find_pptp (); + if (!pptp_binary) { + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, + "%s", + "Could not find pptp client binary."); +@@ -684,16 +685,17 @@ construct_pppd_args (NMPptpPlugin *plugi + /* PPP options */ + g_ptr_array_add (args, (gpointer) g_strdup ("ipparam")); + g_ptr_array_add (args, (gpointer) ipparam); + + g_ptr_array_add (args, (gpointer) g_strdup ("nodetach")); + g_ptr_array_add (args, (gpointer) g_strdup ("lock")); + g_ptr_array_add (args, (gpointer) g_strdup ("usepeerdns")); + g_ptr_array_add (args, (gpointer) g_strdup ("noipdefault")); ++ g_ptr_array_add (args, (gpointer) g_strdup ("nodefaultroute")); + + value = g_hash_table_lookup (s_vpn->data, NM_PPTP_KEY_REFUSE_EAP); + if (value && !strcmp (value, "yes")) + g_ptr_array_add (args, (gpointer) g_strdup ("refuse-eap")); + + value = g_hash_table_lookup (s_vpn->data, NM_PPTP_KEY_REFUSE_PAP); + if (value && !strcmp (value, "yes")) + g_ptr_array_add (args, (gpointer) g_strdup ("refuse-pap")); +@@ -745,32 +747,42 @@ construct_pppd_args (NMPptpPlugin *plugi + /* Convert to integer and then back to string for security's sake + * because strtol ignores some leading and trailing characters. + */ + errno = 0; + tmp_int = strtol (value, NULL, 10); + if (errno == 0) { + g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-failure")); + g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int)); ++ } else { ++ nm_warning ("failed to convert lcp-echo-failure value '%s'", value); + } ++ } else { ++ g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-failure")); ++ g_ptr_array_add (args, (gpointer) g_strdup ("0")); + } + + value = g_hash_table_lookup (s_vpn->data, NM_PPTP_KEY_LCP_ECHO_INTERVAL); + if (value && strlen (value)) { + long int tmp_int; + + /* Convert to integer and then back to string for security's sake + * because strtol ignores some leading and trailing characters. + */ + errno = 0; + tmp_int = strtol (value, NULL, 10); + if (errno == 0) { + g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-interval")); + g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int)); ++ } else { ++ nm_warning ("failed to convert lcp-echo-interval value '%s'", value); + } ++ } else { ++ g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-interval")); ++ g_ptr_array_add (args, (gpointer) g_strdup ("0")); + } + + g_ptr_array_add (args, (gpointer) g_strdup ("plugin")); + g_ptr_array_add (args, (gpointer) g_strdup (NM_PPTP_PPPD_PLUGIN)); + + g_ptr_array_add (args, NULL); + + return args; + --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/patches/lp_292681_keyring_memory_free.patch +++ network-manager-pptp-0.7~~svn20081015t024626/debian/patches/lp_292681_keyring_memory_free.patch @@ -0,0 +1,61 @@ +=== modified file 'vpn-daemons/pptp/auth-dialog/main.c' +--- a/auth-dialog/main.c 2008-10-12 15:03:27 +0000 ++++ b/auth-dialog/main.c 2008-11-02 16:59:18 +0000 +@@ -23,16 +23,17 @@ + #ifdef HAVE_CONFIG_H + #include + #endif + + #include + #include + #include + #include ++#include + + #include + + #include "src/nm-pptp-service.h" + #include "common-gnome/keyring-helpers.h" + #include "gnome-two-password-dialog.h" + + #define KEYRING_UUID_TAG "connection-uuid" +@@ -77,17 +78,17 @@ get_secrets (const char *vpn_uuid, + else + gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER); + } else + gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING); + + /* if retrying, pre-fill dialog with the password */ + if (*password) { + gnome_two_password_dialog_set_password (dialog, *password); +- g_free (*password); ++ gnome_keyring_memory_free (*password); + *password = NULL; + } + + gtk_widget_show (GTK_WIDGET (dialog)); + + if (gnome_two_password_dialog_run_and_block (dialog)) { + const char *keyring = NULL; + gboolean save = FALSE; +@@ -165,18 +166,17 @@ main (int argc, char *argv[]) + if (!get_secrets (vpn_uuid, vpn_name, vpn_service, retry, &password)) + goto out; + + /* dump the passwords to stdout */ + printf ("%s\n%s\n", NM_PPTP_KEY_PASSWORD, password); + printf ("\n\n"); + + if (password) { +- memset (password, 0, strlen (password)); +- g_free (password); ++ gnome_keyring_memory_free (password); + } + exit_status = 0; + + /* for good measure, flush stdout since Kansas is going Bye-Bye */ + fflush (stdout); + + /* wait for data on stdin */ + ret = fread (buf, sizeof (char), sizeof (buf), stdin); + --- network-manager-pptp-0.7~~svn20081015t024626.orig/debian/patches/lp259168_ppp_nt_domain_escaping.patch +++ network-manager-pptp-0.7~~svn20081015t024626/debian/patches/lp259168_ppp_nt_domain_escaping.patch @@ -0,0 +1,23 @@ +=== modified file 'vpn-daemons/pptp/src/nm-pptp-service.c' +--- vpn-daemons/pptp/src/nm-pptp-service.c 2008-09-29 21:25:08 +0000 ++++ vpn-daemons/pptp/src/nm-pptp-service.c 2008-10-29 22:45:16 +0000 +@@ -306,17 +306,17 @@ impl_pptp_service_need_secrets (NMPptpPp + NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, + "%s", + "No cached credentials."); + goto error; + } + + /* Success */ + if (strlen (priv->domain)) +- *out_username = g_strdup_printf ("%s\\\\%s", priv->domain, priv->username); ++ *out_username = g_strdup_printf ("%s\\%s", priv->domain, priv->username); + else + *out_username = g_strdup (priv->username); + *out_password = g_strdup (priv->password); + return TRUE; + + error: + return FALSE; + } +