Hello community,
here is the log from the commit of package NetworkManager-openvpn
checked in at Mon Oct 27 17:03:40 CET 2008.
--------
--- NetworkManager-openvpn/NetworkManager-openvpn.changes 2008-10-13 10:24:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-openvpn/NetworkManager-openvpn.changes 2008-10-24 12:34:52.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Oct 24 12:58:22 EEST 2008 - tambet@suse.de
+
+- The "Certificates (TLS)" tab should also be present for
+ NM_OPENVPN_CONTYPE_PASSWORD.
+- Accept ".cer" extension for certificates.
+- Handle route_vpn_gateway (bgo #549196).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
NetworkManager-openvpn-0.7.0.r4160.tar.bz2
New:
----
NetworkManager-openvpn-0.7.0.r4209.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-openvpn.spec ++++++
--- /var/tmp/diff_new_pack.V31815/_old 2008-10-27 17:03:25.000000000 +0100
+++ /var/tmp/diff_new_pack.V31815/_new 2008-10-27 17:03:25.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-openvpn (Version 0.7.0.r4160)
+# spec file for package NetworkManager-openvpn (Version 0.7.0.r4209)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
%define prefix %{_prefix}
%define sysconfdir %{_sysconfdir}
Summary: NetworkManager VPN support for OpenVPN
-Version: 0.7.0.r4160
+Version: 0.7.0.r4209
Release: 1
License: GPL v2 or later
Group: Productivity/Networking/System
@@ -117,6 +117,11 @@
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Fri Oct 24 2008 tambet@suse.de
+- The "Certificates (TLS)" tab should also be present for
+ NM_OPENVPN_CONTYPE_PASSWORD.
+- Accept ".cer" extension for certificates.
+- Handle route_vpn_gateway (bgo #549196).
* Fri Oct 10 2008 tambet@suse.de
- Fix the User and CA certificate entries in Password TLS mode,
they were swapped with their labels (rh #464765).
++++++ NetworkManager-openvpn-0.7.0.r4160.tar.bz2 -> NetworkManager-openvpn-0.7.0.r4209.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/auth-dialog/Makefile.in new/NetworkManager-openvpn-0.7.0/auth-dialog/Makefile.in
--- old/NetworkManager-openvpn-0.7.0/auth-dialog/Makefile.in 2008-09-26 14:56:47.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/auth-dialog/Makefile.in 2008-10-24 11:55:14.000000000 +0200
@@ -273,9 +273,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu auth-dialog/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auth-dialog/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu auth-dialog/Makefile
+ $(AUTOMAKE) --foreign auth-dialog/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/ChangeLog new/NetworkManager-openvpn-0.7.0/ChangeLog
--- old/NetworkManager-openvpn-0.7.0/ChangeLog 2008-10-02 14:45:10.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/ChangeLog 2008-10-24 10:56:50.000000000 +0200
@@ -1,3 +1,20 @@
+2008-10-17 Dan Williams
+
+ * properties/auth-helpers.c
+ - (advanced_dialog_new): The "Certificates (TLS)" tab should also be
+ present for NM_OPENVPN_CONTYPE_PASSWORD
+
+2008-10-17 Dan Williams
+
+ * properties/auth-helpers.c
+ - (tls_default_filter, tls_file_chooser_filter_new): accept ".cer"
+ extension too
+
+2008-10-11 Dan Williams
+
+ * src/nm-openvpn-service-openvpn-helper.c
+ - (main): handle route_vpn_gateway (requires NM svn r4169) (bgo #549196)
+
2008-09-30 Dan Williams
* properties/nm-openvpn-dialog.glade
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/common-gnome/Makefile.in new/NetworkManager-openvpn-0.7.0/common-gnome/Makefile.in
--- old/NetworkManager-openvpn-0.7.0/common-gnome/Makefile.in 2008-10-10 10:12:27.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/common-gnome/Makefile.in 2008-10-24 11:55:14.000000000 +0200
@@ -262,9 +262,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common-gnome/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign common-gnome/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu common-gnome/Makefile
+ $(AUTOMAKE) --foreign common-gnome/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/po/ChangeLog new/NetworkManager-openvpn-0.7.0/po/ChangeLog
--- old/NetworkManager-openvpn-0.7.0/po/ChangeLog 2008-10-10 09:52:00.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/ChangeLog 2008-10-24 10:56:50.000000000 +0200
@@ -1,3 +1,20 @@
+2008-10-22 Daniel Nylander
+
+ * sv.po: Updated Swedish translation.
+
+2008-10-21 Og Maciel
+
+ * pt_BR.po: Updated Brazilian Portuguese translation by
+ Fábio Nogueira and Vladimir Melo.
+
+2008-10-18 Jorge Gonzalez
+
+ * es.po: Updated Spanish translation
+
+2008-10-11 Jorge Gonzalez
+
+ * es.po: Updated Spanish translation.
+
2008-10-09 Raivis Dejus
* fi.po: Added Latvian translation.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/po/es.po new/NetworkManager-openvpn-0.7.0/po/es.po
--- old/NetworkManager-openvpn-0.7.0/po/es.po 2008-09-29 09:08:26.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/es.po 2008-10-24 10:56:50.000000000 +0200
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: NetworkManager-openvpn.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-24 08:00+0000\n"
-"PO-Revision-Date: 2008-09-26 14:53+0200\n"
+"POT-Creation-Date: 2008-10-17 11:06+0000\n"
+"PO-Revision-Date: 2008-10-18 12:39+0200\n"
"Last-Translator: Jorge González \n"
"Language-Team: Español \n"
"MIME-Version: 1.0\n"
@@ -100,8 +100,8 @@
msgstr "Ninguno"
#: ../properties/auth-helpers.c:660
-msgid "PEM certificates (*.pem, *.crt, *.key)"
-msgstr "Certificados PEM (*.pem, *.crt, *.key)"
+msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)"
+msgstr "Certificados PEM (*.pem, *.crt, *.key, *.cer)"
#: ../properties/auth-helpers.c:720
msgid "OpenVPN Static Keys (*.key)"
@@ -119,7 +119,7 @@
msgid "Compatible with the OpenVPN server."
msgstr "Compatible con el servidor OpenVPN."
-#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:8
+#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:7
msgid "Certificates (TLS)"
msgstr "Certificados (TLS)"
@@ -166,97 +166,99 @@
msgid "CA Certificate:"
msgstr "Certificado CA:"
-#: ../properties/nm-openvpn-dialog.glade.h:7
-msgid "Certificate Password:"
-msgstr "Contraseña del certificado:"
-
# clients/inst_custom_part.ycp:2337
# clients/inst_custom_part.ycp:2336
# clients/inst_custom_part.ycp:2350
-#: ../properties/nm-openvpn-dialog.glade.h:9
+#: ../properties/nm-openvpn-dialog.glade.h:8
msgid "Cipher:"
msgstr "Cifrado:"
-#: ../properties/nm-openvpn-dialog.glade.h:10
+#: ../properties/nm-openvpn-dialog.glade.h:9
msgid "General"
msgstr "General"
-#: ../properties/nm-openvpn-dialog.glade.h:11
+#: ../properties/nm-openvpn-dialog.glade.h:10
msgid "Key Direction:"
msgstr "Dirección de la clave:"
-#: ../properties/nm-openvpn-dialog.glade.h:12
+#: ../properties/nm-openvpn-dialog.glade.h:11
msgid "Key File:"
msgstr "Archivo de clave:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:12
msgid "Local IP Address:"
msgstr "Dirección IP local:"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:13
msgid "OpenVPN Advanced Options"
msgstr "Opciones avanzadas de OpenVPN"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:14
msgid "Password:"
msgstr "Contraseña:"
+#: ../properties/nm-openvpn-dialog.glade.h:15
+msgid "Private Key Password:"
+msgstr "Contraseña de la clave privada:"
+
#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Private Key:"
msgstr "Clave privada:"
#: ../properties/nm-openvpn-dialog.glade.h:17
-msgid "Select A File"
-msgstr "Seleccione un archivo"
-
-#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Show passwords"
msgstr "Mostrar contraseñas"
-#: ../properties/nm-openvpn-dialog.glade.h:19
+#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Static Key:"
msgstr "Clave estática:"
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:19
msgid "Type:"
msgstr "Tipo:"
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Use L_ZO data compression"
msgstr "Usar compresión L_ZO"
# include/scanner/scanner_usb.ycp:47
# include/scanner/scanner_usb.ycp:47
# include/scanner/scanner_usb.ycp:47
-#: ../properties/nm-openvpn-dialog.glade.h:22
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "Use a TA_P device"
msgstr "Usar dispositivo TA_P"
# include/printconf/dialogs.ycp:150
-#: ../properties/nm-openvpn-dialog.glade.h:23
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "Use a _TCP connection"
msgstr "Usar conexión _TCP"
-#: ../properties/nm-openvpn-dialog.glade.h:24
+#: ../properties/nm-openvpn-dialog.glade.h:23
msgid "Use additional TLS authentication"
msgstr "Usar autenticación TLS adicional"
-#: ../properties/nm-openvpn-dialog.glade.h:25
+#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "Use custom gateway p_ort:"
msgstr "Usar un p_uerto de pasarela personalizado:"
-#: ../properties/nm-openvpn-dialog.glade.h:26
+#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "User Certificate:"
msgstr "Certificado de usuario:"
-#: ../properties/nm-openvpn-dialog.glade.h:27
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "User name:"
msgstr "Nombre de usuario:"
-#: ../properties/nm-openvpn-dialog.glade.h:28
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "_Gateway:"
msgstr "_Pasarela:"
+#~ msgid "Certificate Password:"
+#~ msgstr "Contraseña del certificado:"
+
+#~ msgid "Select A File"
+#~ msgstr "Seleccione un archivo"
+
#~ msgid "gtk-cancel"
#~ msgstr "gtk-cancel"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/po/pt_BR.po new/NetworkManager-openvpn-0.7.0/po/pt_BR.po
--- old/NetworkManager-openvpn-0.7.0/po/pt_BR.po 2008-07-24 09:52:08.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/pt_BR.po 2008-10-24 10:56:50.000000000 +0200
@@ -1,18 +1,19 @@
# Brazilian Portuguese translation of NetworkManager.
# Copyright (C) 2004-2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the NetworkManager package.
-# Raphael Higino , 2004-2007.
+# Raphael Higino <In Memoriam>, 2004-2007.
# Washington Lins , 2007.
# Luiz Armesto , 2007.
# Henrique P Machado , 2008.
+# Fábio Nogueira , 2008.
#
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-01 03:19+0000\n"
-"PO-Revision-Date: 2008-07-04 22:43-0300\n"
-"Last-Translator: Henrique P Machado \n"
+"POT-Creation-Date: 2008-10-21 15:02-0400\n"
+"PO-Revision-Date: 2008-10-01 13:51-0300\n"
+"Last-Translator: Fábio Nogueira \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,52 +53,52 @@
msgid "_Save password in keyring"
msgstr "_Salvar senha no chaveiro"
-#: ../auth-dialog/main.c:187
+#: ../auth-dialog/main.c:127
#, c-format
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr "Você precisa se autenticar para acessar a Rede Privada Virtual \"%s\"."
-#: ../auth-dialog/main.c:188
+#: ../auth-dialog/main.c:128
msgid "Authenticate VPN"
msgstr "Autenticar VPN"
-#: ../auth-dialog/main.c:201
+#: ../auth-dialog/main.c:149
msgid "Certificate pass_word:"
msgstr "Sen_ha do certificado:"
-#: ../auth-dialog/main.c:216
+#: ../auth-dialog/main.c:163
msgid "Certificate password:"
msgstr "Senha do certificado:"
-#: ../properties/auth-helpers.c:68
+#: ../properties/auth-helpers.c:161
msgid "Choose a Certificate Authority certificate..."
msgstr "Escolha um certificado de Autoridade Certificadora..."
-#: ../properties/auth-helpers.c:87
+#: ../properties/auth-helpers.c:180
msgid "Choose your personal certificate..."
msgstr "Escolha seu certificado pessoal..."
-#: ../properties/auth-helpers.c:105
+#: ../properties/auth-helpers.c:198
msgid "Choose your private key..."
msgstr "Escolha sua chave privada..."
-#: ../properties/auth-helpers.c:159
+#: ../properties/auth-helpers.c:251
msgid "Choose an OpenVPN static key..."
-msgstr "Escolha uma chave privada do OpenVPN..."
+msgstr "Escolha uma chave estática do OpenVPN..."
-#: ../properties/auth-helpers.c:177 ../properties/auth-helpers.c:866
+#: ../properties/auth-helpers.c:275 ../properties/auth-helpers.c:1001
msgid "None"
msgstr "Nenhum"
-#: ../properties/auth-helpers.c:520
-msgid "PEM certificates (*.pem, *.crt, *.key)"
-msgstr "Certificados PEM (*.pem, *.crt, *.key)"
+#: ../properties/auth-helpers.c:660
+msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)"
+msgstr "Certificados PEM (*.pem, *.crt, *.key, *.cer)"
-#: ../properties/auth-helpers.c:580
+#: ../properties/auth-helpers.c:720
msgid "OpenVPN Static Keys (*.key)"
-msgstr "Chaves privadas do OpenVPN (*.key)"
+msgstr "Chaves estáticas do OpenVPN (*.key)"
-#: ../properties/auth-helpers.c:705
+#: ../properties/auth-helpers.c:831
msgid "Default"
msgstr "Padrão"
@@ -109,19 +110,19 @@
msgid "Compatible with the OpenVPN server."
msgstr "Compatível com o servidor OpenVPN."
-#: ../properties/nm-openvpn.c:314 ../properties/nm-openvpn-dialog.glade.h:7
+#: ../properties/nm-openvpn.c:322 ../properties/nm-openvpn-dialog.glade.h:7
msgid "Certificates (TLS)"
msgstr "Certificados (TLS)"
-#: ../properties/nm-openvpn.c:326
+#: ../properties/nm-openvpn.c:336
msgid "Password"
msgstr "Senha"
-#: ../properties/nm-openvpn.c:340
+#: ../properties/nm-openvpn.c:353
msgid "Password with Certificates (TLS)"
msgstr "Senha com certificados (TLS)"
-#: ../properties/nm-openvpn.c:352
+#: ../properties/nm-openvpn.c:365
msgid "Static Key"
msgstr "Chave estática"
@@ -173,72 +174,86 @@
msgstr "Arquivo de chave:"
#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid "Local IP Address:"
+msgstr "Endereço IP local:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+msgid "OpenVPN Advanced Options"
+msgstr "Opções avançadas do OpenVPN"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+msgid "Password:"
+msgstr "Senha:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+msgid "Private Key Password:"
+msgstr "Senha da chave privada:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
msgid "Private Key:"
msgstr "Chave privada:"
-#: ../properties/nm-openvpn-dialog.glade.h:13
+#: ../properties/nm-openvpn-dialog.glade.h:17
+msgid "Show passwords"
+msgstr "Mostrar senhas"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
msgid "Static Key:"
msgstr "Chave estática:"
-#: ../properties/nm-openvpn-dialog.glade.h:14
+#: ../properties/nm-openvpn-dialog.glade.h:19
msgid "Type:"
msgstr "Tipo:"
-#: ../properties/nm-openvpn-dialog.glade.h:15
+#: ../properties/nm-openvpn-dialog.glade.h:20
msgid "Use L_ZO data compression"
msgstr "Utilizar compressão de dados L_ZO"
-#: ../properties/nm-openvpn-dialog.glade.h:16
+#: ../properties/nm-openvpn-dialog.glade.h:21
msgid "Use a TA_P device"
msgstr "Utilizar um dispositivo TA_P"
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:22
msgid "Use a _TCP connection"
msgstr "Utilizar uma conexão _TCP"
-#: ../properties/nm-openvpn-dialog.glade.h:18
+#: ../properties/nm-openvpn-dialog.glade.h:23
msgid "Use additional TLS authentication"
msgstr "Utilizar autenticação TLS adicional"
-#: ../properties/nm-openvpn-dialog.glade.h:19
+#: ../properties/nm-openvpn-dialog.glade.h:24
msgid "Use custom gateway p_ort:"
msgstr "Utilizar p_orta de gateway personalizada:"
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:25
msgid "User Certificate:"
msgstr "Certificado de usuário:"
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:26
msgid "User name:"
msgstr "Nome do usuário:"
-#: ../properties/nm-openvpn-dialog.glade.h:22
+#: ../properties/nm-openvpn-dialog.glade.h:27
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-openvpn-dialog.glade.h:23
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
-#: ../properties/nm-openvpn-dialog.glade.h:24
-msgid "gtk-ok"
-msgstr "gtk-ok"
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
-#: ../properties/nm-openvpn-dialog.glade.h:25
-msgid "page 1"
-msgstr "página 1"
+#~ msgid "page 1"
+#~ msgstr "página 1"
-#: ../properties/nm-openvpn-dialog.glade.h:26
-msgid "page 2"
-msgstr "página 2"
+#~ msgid "page 2"
+#~ msgstr "página 2"
-#: ../properties/nm-openvpn-dialog.glade.h:27
-msgid "page 3"
-msgstr "página 3"
+#~ msgid "page 3"
+#~ msgstr "página 3"
-#: ../properties/nm-openvpn-dialog.glade.h:28
-msgid "page 4"
-msgstr "página 4"
+#~ msgid "page 4"
+#~ msgstr "página 4"
#~ msgid "Add, Remove, and Edit VPN Connections"
#~ msgstr "Adicione, remova e edite conexões VPN"
@@ -270,9 +285,6 @@
#~ msgid "Shared Key: %s"
#~ msgstr "Chave Compartilhada: %s"
-#~ msgid "Local IP: %s"
-#~ msgstr "IP Local: %s"
-
#~ msgid "Remote IP: %s"
#~ msgstr "IP Remoto: %s"
@@ -395,9 +407,6 @@
#~ msgid "Only use _VPN connection for these addresses:"
#~ msgstr "Usar conexões _VPN apenas para estes endereços:"
-#~ msgid "OpenVPN Advanced Options"
-#~ msgstr "Opções Avançadas do OpenVPN"
-
#~ msgid "OpenVPN Configuration"
#~ msgstr "Configurações do OpenVPN"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/po/sv.po new/NetworkManager-openvpn-0.7.0/po/sv.po
--- old/NetworkManager-openvpn-0.7.0/po/sv.po 2008-10-02 14:45:10.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/po/sv.po 2008-10-24 10:56:50.000000000 +0200
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: NetworkManager-openvpn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-01 07:40+0200\n"
-"PO-Revision-Date: 2008-10-01 07:40+0100\n"
+"POT-Creation-Date: 2008-10-22 16:44+0200\n"
+"PO-Revision-Date: 2008-10-22 16:45+0100\n"
"Last-Translator: Daniel Nylander \n"
"Language-Team: Swedish \n"
"MIME-Version: 1.0\n"
@@ -84,13 +84,13 @@
msgstr "Välj en statisk OpenVPN-nyckel..."
#: ../properties/auth-helpers.c:275
-#: ../properties/auth-helpers.c:1002
+#: ../properties/auth-helpers.c:1001
msgid "None"
msgstr "Ingen"
#: ../properties/auth-helpers.c:660
-msgid "PEM certificates (*.pem, *.crt, *.key)"
-msgstr "PEM-certifikat (*.pem, *.crt, *.key)"
+msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)"
+msgstr "PEM-certifikat (*.pem, *.crt, *.key, *.cer)"
#: ../properties/auth-helpers.c:720
msgid "OpenVPN Static Keys (*.key)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/properties/auth-helpers.c new/NetworkManager-openvpn-0.7.0/properties/auth-helpers.c
--- old/NetworkManager-openvpn-0.7.0/properties/auth-helpers.c 2008-10-02 14:45:10.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/properties/auth-helpers.c 2008-10-24 10:56:50.000000000 +0200
@@ -611,7 +611,7 @@
ext = g_ascii_strdown (p, -1);
if (!ext)
return FALSE;
- if (strcmp (ext, ".pem") && strcmp (ext, ".crt") && strcmp (ext, ".key")) {
+ if (strcmp (ext, ".pem") && strcmp (ext, ".crt") && strcmp (ext, ".key") && strcmp (ext, ".cer")) {
g_free (ext);
return FALSE;
}
@@ -657,7 +657,7 @@
filter = gtk_file_filter_new ();
gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, tls_default_filter, NULL, NULL);
- gtk_file_filter_set_name (filter, _("PEM certificates (*.pem, *.crt, *.key)"));
+ gtk_file_filter_set_name (filter, _("PEM certificates (*.pem, *.crt, *.key, *.cer)"));
return filter;
}
@@ -968,10 +968,9 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
}
- if (strcmp (contype, NM_OPENVPN_CONTYPE_TLS) && strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
- widget = glade_xml_get_widget (xml, "options_notebook");
- gtk_notebook_remove_page (GTK_NOTEBOOK (widget), 1);
- } else {
+ if ( !strcmp (contype, NM_OPENVPN_CONTYPE_TLS)
+ || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)
+ || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) {
GtkListStore *store;
GtkTreeIter iter;
int direction = -1, active = -1;
@@ -1020,6 +1019,9 @@
widget = glade_xml_get_widget (xml, "tls_auth_chooser");
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
}
+ } else {
+ widget = glade_xml_get_widget (xml, "options_notebook");
+ gtk_notebook_remove_page (GTK_NOTEBOOK (widget), 1);
}
out:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/properties/Makefile.in new/NetworkManager-openvpn-0.7.0/properties/Makefile.in
--- old/NetworkManager-openvpn-0.7.0/properties/Makefile.in 2008-09-26 14:56:48.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/properties/Makefile.in 2008-10-24 11:55:14.000000000 +0200
@@ -310,9 +310,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu properties/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign properties/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu properties/Makefile
+ $(AUTOMAKE) --foreign properties/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/src/Makefile.in new/NetworkManager-openvpn-0.7.0/src/Makefile.in
--- old/NetworkManager-openvpn-0.7.0/src/Makefile.in 2008-09-26 14:56:48.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/src/Makefile.in 2008-10-24 11:55:14.000000000 +0200
@@ -284,9 +284,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c new/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c
--- old/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c 2008-08-26 13:43:26.000000000 +0200
+++ new/NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c 2008-10-24 10:56:50.000000000 +0200
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* nm-openvpn-service-openvpn-helper - helper called after OpenVPN established
* a connection, uses DBUS to send information back to nm-openvpn-service
*
@@ -298,13 +298,18 @@
config = g_hash_table_new (g_str_hash, g_str_equal);
- /* Gateway */
+ /* External world-visible VPN gateway */
val = addr_to_gvalue (getenv ("trusted_ip"));
if (val)
- g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val);
+ g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, val);
else
helper_failed (connection, "VPN Gateway");
+ /* Internal VPN subnet gateway */
+ val = addr_to_gvalue (getenv ("route_vpn_gateway"));
+ if (val)
+ g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, val);
+
/* Tunnel device */
val = str_to_gvalue (getenv ("dev"), FALSE);
if (val)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org