Hello community, here is the log from the commit of package NetworkManager-openvpn for openSUSE:Factory checked in at Wed Nov 25 16:09:32 CET 2009. -------- --- NetworkManager-openvpn/NetworkManager-openvpn.changes 2009-10-23 12:48:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-openvpn/NetworkManager-openvpn.changes 2009-11-16 13:00:52.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 16 12:00:49 UTC 2009 - aj@suse.de + +- Regenerate patches to apply cleanly. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openvpn.spec ++++++ --- /var/tmp/diff_new_pack.e4bFqV/_old 2009-11-25 16:07:27.000000000 +0100 +++ /var/tmp/diff_new_pack.e4bFqV/_new 2009-11-25 16:07:27.000000000 +0100 @@ -25,7 +25,7 @@ %define sysconfdir %{_sysconfdir} Summary: NetworkManager VPN support for OpenVPN Version: 0.7.1 -Release: 2 +Release: 3 License: GPL v2 or later Group: Productivity/Networking/System Url: http://www.gnome.org/projects/NetworkManager ++++++ nm-openvpn-desktop.patch ++++++ --- /var/tmp/diff_new_pack.e4bFqV/_old 2009-11-25 16:07:27.000000000 +0100 +++ /var/tmp/diff_new_pack.e4bFqV/_new 2009-11-25 16:07:27.000000000 +0100 @@ -1,7 +1,7 @@ -Index: NetworkManager-openvpn-0.7.0/nm-openvpn.desktop.in +Index: NetworkManager-openvpn-0.7.1/nm-openvpn.desktop.in =================================================================== ---- NetworkManager-openvpn-0.7.0.orig/nm-openvpn.desktop.in -+++ NetworkManager-openvpn-0.7.0/nm-openvpn.desktop.in +--- NetworkManager-openvpn-0.7.1.orig/nm-openvpn.desktop.in ++++ NetworkManager-openvpn-0.7.1/nm-openvpn.desktop.in @@ -3,9 +3,10 @@ Name=VPN Connection Manager (OpenVPN) GenericName=VPN Connection Manager (OpenVPN) Comment=Add, Remove, and Edit VPN Connections ++++++ nm-openvpn-properties.patch ++++++ --- /var/tmp/diff_new_pack.e4bFqV/_old 2009-11-25 16:07:27.000000000 +0100 +++ /var/tmp/diff_new_pack.e4bFqV/_new 2009-11-25 16:07:27.000000000 +0100 @@ -1,10 +1,10 @@ -Index: NetworkManager-openvpn-0.7.0/properties/Makefile.am +Index: NetworkManager-openvpn-0.7.1/properties/Makefile.am =================================================================== ---- NetworkManager-openvpn-0.7.0.orig/properties/Makefile.am -+++ NetworkManager-openvpn-0.7.0/properties/Makefile.am -@@ -36,9 +36,6 @@ libnm_openvpn_properties_la_LIBADD = - $(NETWORK_MANAGER_LIBS) \ - $(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la +--- NetworkManager-openvpn-0.7.1.orig/properties/Makefile.am ++++ NetworkManager-openvpn-0.7.1/properties/Makefile.am +@@ -36,9 +36,6 @@ libnm_openvpn_properties_la_LIBADD = + $(NETWORK_MANAGER_LIBS) \ + $(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la -libnm_openvpn_properties_la_LDFLAGS = \ - -avoid-version ++++++ nm-openvpn-sscanf.patch ++++++ --- /var/tmp/diff_new_pack.e4bFqV/_old 2009-11-25 16:07:27.000000000 +0100 +++ /var/tmp/diff_new_pack.e4bFqV/_new 2009-11-25 16:07:27.000000000 +0100 @@ -8,10 +8,10 @@ and confusing, and we don't even need to use it. Also add the ability to set OPENVPN_DEBUG to get more info out of openvpn. -diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c -index 346df20..6cde642 100644 ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c +Index: NetworkManager-openvpn-0.7.1/src/nm-openvpn-service.c +=================================================================== +--- NetworkManager-openvpn-0.7.1.orig/src/nm-openvpn-service.c ++++ NetworkManager-openvpn-0.7.1/src/nm-openvpn-service.c @@ -287,6 +287,35 @@ ovpn_quote_string (const char *unquoted) return quoted; } @@ -48,7 +48,7 @@ static gboolean handle_management_socket (NMVPNPlugin *plugin, GIOChannel *source, -@@ -295,7 +324,7 @@ handle_management_socket (NMVPNPlugin *plugin, +@@ -295,7 +324,7 @@ handle_management_socket (NMVPNPlugin *p { NMOpenvpnPluginIOData *io_data = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin)->io_data; gboolean again = TRUE; @@ -57,7 +57,7 @@ gsize written; if (!(condition & G_IO_IN)) -@@ -307,7 +336,8 @@ handle_management_socket (NMVPNPlugin *plugin, +@@ -307,7 +336,8 @@ handle_management_socket (NMVPNPlugin *p if (strlen (str) < 1) goto out; @@ -67,7 +67,7 @@ if (strcmp (auth, "Auth") == 0) { if (io_data->username != NULL && io_data->password != NULL) { char *quser, *qpass; -@@ -351,8 +381,11 @@ handle_management_socket (NMVPNPlugin *plugin, +@@ -351,8 +381,11 @@ handle_management_socket (NMVPNPlugin *p *out_failure = NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED; again = FALSE; } @@ -81,7 +81,7 @@ if (!strcmp (auth, "Auth")) nm_warning ("Password verification failed"); else if (!strcmp (auth, "Private Key")) -@@ -360,7 +393,7 @@ handle_management_socket (NMVPNPlugin *plugin, +@@ -360,7 +393,7 @@ handle_management_socket (NMVPNPlugin *p else nm_warning ("Unknown verification failed: %s", auth); @@ -90,7 +90,7 @@ if (out_failure) *out_failure = NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED; -@@ -688,6 +721,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, +@@ -688,6 +721,7 @@ nm_openvpn_start_openvpn_binary (NMOpenv add_openvpn_arg (args, "--auth"); add_openvpn_arg (args, auth); } @@ -98,7 +98,7 @@ /* TA */ tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA); -@@ -700,9 +734,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, +@@ -700,9 +734,14 @@ nm_openvpn_start_openvpn_binary (NMOpenv add_openvpn_arg (args, tmp); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org