Hello community, here is the log from the commit of package NetworkManager-novellvpn for openSUSE:Factory checked in at Wed May 18 16:55:49 CEST 2011.
-------- --- NetworkManager-novellvpn/NetworkManager-novellvpn.changes 2011-02-15 14:28:37.000000000 +0100 +++ NetworkManager-novellvpn/NetworkManager-novellvpn.changes 2011-02-18 20:40:15.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 18 20:39:54 CET 2011 - [email protected] + +- Translations migrated to translation-update-upstream. +- Created lang package. +- Merged patches from SLE11 SP1. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- NetworkManager-novellvpn-po.tar.gz New: ---- NetworkManager-novellvpn-pot.patch NetworkManager-novellvpn-system-connection-password.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-novellvpn.spec ++++++ --- /var/tmp/diff_new_pack.iZ66Dm/_old 2011-05-18 16:54:42.000000000 +0200 +++ /var/tmp/diff_new_pack.iZ66Dm/_new 2011-05-18 16:54:42.000000000 +0200 @@ -19,28 +19,32 @@ Name: NetworkManager-novellvpn -BuildRequires: NetworkManager-devel NetworkManager-gnome intltool libglade2-devel libgnomeui-devel libnl-devel perl-XML-Parser update-desktop-files +BuildRequires: NetworkManager-devel NetworkManager-gnome intltool libglade2-devel libgnomeui-devel libnl-devel perl-XML-Parser translation-update-upstream update-desktop-files Summary: VPN support for Turnpike Version: 0.7.2.r1138 -Release: 10 +Release: 15 License: GPLv2+ Group: Productivity/Networking/System Url: http://www.gnome.org/projects/NetworkManager Source0: %{name}-%{version}.tar.bz2 Source1: gnome-mime-application-x-novellvpn-settings.png -Source2: %{name}-po.tar.gz Patch0: %{name}-dbus-policy.patch # PATCH-FIX-UPSTREAM NetworkManager-novellvpn-nm08.patch [email protected] -- Fix build against NM 0.8 Patch1: NetworkManager-novellvpn-nm08.patch # PATCH-FIX-UPSTREAM NetworkManager-novellvpn-dhgroup-pfsgroup-default.patch [email protected] -- Fix default value for dhgroup&pfsgroup. Patch2: NetworkManager-novellvpn-dhgroup-pfsgroup-default.patch Patch3: NetworkManager-novellvpn-nm082.patch +# PATCH-FIX-UPSTREAM NetworkManager-novellvpn-pot.patch [email protected] -- Fix POTFILES.in to not include files not existing in the tarball. +Patch4: %{name}-pot.patch +# bnc#582593 NetworkManger-novellvpn-system-connection-password.patch [email protected] +Patch5: %{name}-system-connection-password.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: NetworkManager >= 0.7.0.r4274 Requires: %{name}-frontend Requires: novell-ipsec-tools >= 0.7 Requires: novell-nortelplugins >= 0.1.4 Requires: turnpike >= 0.1.2 +Recommends: %{name}-lang %description NetworkManager-novellvpn provides VPN support to NetworkManager for @@ -74,13 +78,18 @@ NetworkManager-novellvpn. It provides interface for configuring Novell related VPN in NetworkManager. +%lang_package %prep #' -%setup -n %{name}-0.7.2 -q -a2 +%setup -n %{name}-0.7.2 -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 +%patch4 -p1 +%patch5 -p1 +# Call translation-update-upstream after patching - LCN should include strings in patches. +translation-update-upstream %build autoreconf -f -i @@ -107,7 +116,7 @@ %postun gnome -p /sbin/ldconfig -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc README %dir %{_sysconfdir}/NetworkManager @@ -120,6 +129,8 @@ %{_libexecdir}/nm-novellvpn-service-novellvpn-helper %{_libexecdir}/nm_novellvpn_racoon_launcher.sh +%files lang -f %{name}.lang + %files gnome %defattr(-,root,root,-) %{_libdir}/NetworkManager/libnm-novellvpn-properties.so* ++++++ NetworkManager-novellvpn-pot.patch ++++++ Index: NetworkManager-novellvpn-0.7.2/po/POTFILES.in =================================================================== --- NetworkManager-novellvpn-0.7.2.orig/po/POTFILES.in +++ NetworkManager-novellvpn-0.7.2/po/POTFILES.in @@ -4,5 +4,5 @@ auth-dialog/gnome-two-password-dialog.c auth-dialog/main.c nm-novellvpn.desktop.in properties/nm-novellvpn-dialog.glade -properties/nm-novellvpn-vpnui-impl.c +properties/nm-novellvpn.c src/nm-novellvpn-service.c ++++++ NetworkManager-novellvpn-system-connection-password.patch ++++++ Index: NetworkManager-novellvpn-0.7.2/properties/nm-novellvpn.c =================================================================== --- NetworkManager-novellvpn-0.7.2.orig/properties/nm-novellvpn.c +++ NetworkManager-novellvpn-0.7.2/properties/nm-novellvpn.c @@ -1129,6 +1142,34 @@ update_connection (NMVpnPluginUiWidgetIn auth_widget_update_connection (priv->xml, auth_type, s_vpn); } + /* System secrets get stored in the connection, user secrets are saved + * via the save_secrets() hook. + */ + if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) { + + if (!strcmp (auth_type, NM_NOVELLVPN_CONTYPE_GROUPAUTH_STRING)) { + // User password + widget = glade_xml_get_widget (priv->xml, "userpassword_entry"); + str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + if (str && strlen (str)) + nm_setting_vpn_add_secret (s_vpn, NM_NOVELLVPN_KEY_USER_PWD, str); + + // Group password + widget = glade_xml_get_widget (priv->xml, "grouppassword_entry"); + str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + if (str && strlen (str)) + nm_setting_vpn_add_secret (s_vpn, NM_NOVELLVPN_KEY_GRP_PWD, str); + + } else if (!strcmp (auth_type, NM_NOVELLVPN_CONTYPE_X509_STRING)) { + // Certificate password + widget = glade_xml_get_widget (priv->xml, "certpassword_entry"); + str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + if (str && strlen (str)) + nm_setting_vpn_add_secret (s_vpn, NM_NOVELLVPN_KEY_CERT_PWD, str); + } else + g_assert_not_reached (); + } + // add each vpn properties into connections from advanced hash table if (priv->advanced) g_hash_table_foreach (priv->advanced, hash_copy_advanced, s_vpn); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
