Hello community,
here is the log from the commit of package NetworkManager-vpnc for
openSUSE:Factory checked in at 2013-09-23 10:33:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-vpnc (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-vpnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-vpnc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager-vpnc/NetworkManager-vpnc.changes
2013-06-25 14:38:21.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-vpnc.new/NetworkManager-vpnc.changes
2013-09-23 11:17:28.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Sep 13 18:06:12 UTC 2013 - [email protected]
+
+- Update to version 0.9.8.6:
+ + Reverted broken pid file patch from 0.9.8.4.
+- Changes from version 0.9.8.4:
+ + Fixed paths in VPN service file.
+ + Fixed localization in non-UTF-8 locales.
+ + Use /var/run/NetworkManager to store vpnc pid file.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-vpnc-0.9.8.2.tar.xz
New:
----
NetworkManager-vpnc-0.9.8.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-vpnc.spec ++++++
--- /var/tmp/diff_new_pack.vkH2KO/_old 2013-09-23 11:17:29.000000000 +0200
+++ /var/tmp/diff_new_pack.vkH2KO/_new 2013-09-23 11:17:29.000000000 +0200
@@ -20,7 +20,7 @@
Summary: NetworkManager VPN Support for vpnc
License: GPL-2.0+
Group: Productivity/Networking/System
-Version: 0.9.8.2
+Version: 0.9.8.6
Release: 0
# FIXME .desktop icon is currently disabled (on purpose) in the NM tarballs.
They will re-appear later on (when nmce supports --import)
# FIXME: --disable-more-warnings should be dropped from configure when
possible. Added with 0.9.2.0 for Gtk+ 3.3 build.
++++++ NetworkManager-vpnc-0.9.8.2.tar.xz -> NetworkManager-vpnc-0.9.8.6.tar.xz
++++++
++++ 7519 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/Makefile.am
new/NetworkManager-vpnc-0.9.8.6/Makefile.am
--- old/NetworkManager-vpnc-0.9.8.2/Makefile.am 2013-06-07 22:29:51.000000000
+0200
+++ new/NetworkManager-vpnc-0.9.8.6/Makefile.am 2013-06-10 18:52:36.000000000
+0200
@@ -28,7 +28,7 @@
nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
- -e 's|[@]LIBDIR[@]|$(libdir)|g' \
+ -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
$< >$@
DISTCHECK_CONFIGURE_FLAGS = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/NEWS new/NetworkManager-vpnc-0.9.8.6/NEWS
--- old/NetworkManager-vpnc-0.9.8.2/NEWS 2013-06-07 22:49:54.000000000
+0200
+++ new/NetworkManager-vpnc-0.9.8.6/NEWS 2013-09-13 18:16:56.000000000
+0200
@@ -1,3 +1,24 @@
+=========================================================
+network-manager-vpnc-0.9.8.6
+Overview of changes since network-manager-vpnc-0.9.8.4
+=========================================================
+
+This is a new stable release of network-manager-vpnc. Notable changes include:
+
+* Reverted broken pid file patch from 0.9.8.4
+
+=========================================================
+network-manager-vpnc-0.9.8.4
+Overview of changes since network-manager-vpnc-0.9.8.2
+=========================================================
+
+This is a new stable release of network-manager-vpnc. Notable changes include:
+
+* Updated translations
+* Fixed paths in VPN service file
+* Fixed localization in non-UTF-8 locales
+* Use /var/run/NetworkManager to store vpnc pid file
+
=======================================================
network-manager-vpnc-0.9.8.2
Overview of changes since network-manager-vpnc-0.9.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/compile new/NetworkManager-vpnc-0.9.8.6/compile
--- old/NetworkManager-vpnc-0.9.8.2/compile 2012-09-18 04:53:51.000000000
+0200
+++ new/NetworkManager-vpnc-0.9.8.6/compile 2013-06-17 11:16:35.000000000
+0200
@@ -1,10 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -113,6 +112,11 @@
lib=$dir/$lib.lib
break
fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
done
IFS=$save_IFS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/configure.ac
new/NetworkManager-vpnc-0.9.8.6/configure.ac
--- old/NetworkManager-vpnc-0.9.8.2/configure.ac 2013-06-07
22:50:40.000000000 +0200
+++ new/NetworkManager-vpnc-0.9.8.6/configure.ac 2013-09-13
18:16:35.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-vpnc, 0.9.8.2, [email protected], NetworkManager-vpnc)
+AC_INIT(NetworkManager-vpnc, 0.9.8.6, [email protected], NetworkManager-vpnc)
AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/missing new/NetworkManager-vpnc-0.9.8.6/missing
--- old/NetworkManager-vpnc-0.9.8.2/missing 2012-09-18 04:53:51.000000000
+0200
+++ new/NetworkManager-vpnc-0.9.8.6/missing 2013-06-17 11:16:35.000000000
+0200
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <[email protected]>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# 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
@@ -26,68 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <[email protected]>."
exit $?
@@ -99,228 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/nm-vpnc-service.name.in
new/NetworkManager-vpnc-0.9.8.6/nm-vpnc-service.name.in
--- old/NetworkManager-vpnc-0.9.8.2/nm-vpnc-service.name.in 2013-06-07
22:29:51.000000000 +0200
+++ new/NetworkManager-vpnc-0.9.8.6/nm-vpnc-service.name.in 2013-06-10
18:52:36.000000000 +0200
@@ -5,5 +5,5 @@
[GNOME]
auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog
-properties=@LIBDIR@/libnm-vpnc-properties
+properties=@PLUGINDIR@/libnm-vpnc-properties
supports-external-ui-mode=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/po/it.po
new/NetworkManager-vpnc-0.9.8.6/po/it.po
--- old/NetworkManager-vpnc-0.9.8.2/po/it.po 2013-06-07 22:30:13.000000000
+0200
+++ new/NetworkManager-vpnc-0.9.8.6/po/it.po 2013-09-13 18:01:23.000000000
+0200
@@ -1,16 +1,16 @@
-# Italian translation of NetworkManager-VPNC.
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 the NetworkManager-VPNC'S
COPYRIGHT HOLDER
-# This file is distributed under the same license as the NetworkManager-VPNC
package.
+# Italian translation of network-manager-vpnc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 the network-manager-vpnc'S
COPYRIGHT HOLDER
+# This file is distributed under the same license as the network-manager-vpnc
package.
# Francesco Marletta <[email protected]>, 2006, 2007, 2008, 2009,
2010.
# Luca Ferretti <[email protected]>, 2010.
-# Milo Casagrande <[email protected]>, 2012.
+# Milo Casagrande <[email protected]>, 2012, 2013.
#
msgid ""
msgstr ""
-"Project-Id-Version: NetworkManager-VPNC\n"
+"Project-Id-Version: network-manager-vpnc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-20 19:07+0200\n"
-"PO-Revision-Date: 2012-08-20 19:14+0200\n"
+"POT-Creation-Date: 2013-09-13 10:01+0200\n"
+"PO-Revision-Date: 2013-09-13 10:01+0200\n"
"Last-Translator: Milo Casagrande <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
"Language: it\n"
@@ -18,6 +18,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
#: ../auth-dialog/vpn-password-dialog.c:96
msgid "_Secondary Password:"
@@ -85,93 +86,93 @@
"Netscreen e SonicWALL."
# femminile perché riferito a password
-#: ../properties/nm-vpnc.c:331
+#: ../properties/nm-vpnc.c:339
msgid "Saved"
msgstr "Salvata"
# sempre riferito a password
-#: ../properties/nm-vpnc.c:338
+#: ../properties/nm-vpnc.c:346
msgid "Always Ask"
msgstr "Chiedere ogni volta"
# ancora riferito a password
-#: ../properties/nm-vpnc.c:345
+#: ../properties/nm-vpnc.c:353
msgid "Not Required"
msgstr "Non richiesta"
-#: ../properties/nm-vpnc.c:494
+#: ../properties/nm-vpnc.c:502
msgid "Secure (default)"
msgstr "Sicuro (predefinito)"
-#: ../properties/nm-vpnc.c:497
+#: ../properties/nm-vpnc.c:505
msgid "Weak (use with caution)"
msgstr "Debole (usare con cautela)"
-#: ../properties/nm-vpnc.c:505
+#: ../properties/nm-vpnc.c:513
msgid "None (completely insecure)"
msgstr "Nessuno (completamente insicuro)"
-#: ../properties/nm-vpnc.c:571
+#: ../properties/nm-vpnc.c:579
msgid "Cisco (default)"
msgstr "Cisco (predefinita)"
-#: ../properties/nm-vpnc.c:578
+#: ../properties/nm-vpnc.c:586
msgid "Netscreen"
msgstr "Netscreen"
-#: ../properties/nm-vpnc.c:609
+#: ../properties/nm-vpnc.c:617
msgid "NAT-T when available (default)"
msgstr "NAT-T quando disponibile (predefinito)"
-#: ../properties/nm-vpnc.c:616
+#: ../properties/nm-vpnc.c:624
msgid "NAT-T always"
msgstr "NAT-T sempre"
-#: ../properties/nm-vpnc.c:623
+#: ../properties/nm-vpnc.c:631
msgid "Cisco UDP"
msgstr "UDP Cisco"
-#: ../properties/nm-vpnc.c:630
+#: ../properties/nm-vpnc.c:638
msgid "Disabled"
msgstr "Disabilitato"
-#: ../properties/nm-vpnc.c:650 ../properties/nm-vpnc.c:717
+#: ../properties/nm-vpnc.c:658 ../properties/nm-vpnc.c:744
msgid "DH Group 1"
msgstr "Gruppo DH 1"
-#: ../properties/nm-vpnc.c:657
+#: ../properties/nm-vpnc.c:665
msgid "DH Group 2 (default)"
msgstr "Gruppo DH 2 (predefinito)"
-#: ../properties/nm-vpnc.c:664 ../properties/nm-vpnc.c:731
+#: ../properties/nm-vpnc.c:672 ../properties/nm-vpnc.c:758
msgid "DH Group 5"
msgstr "Gruppo DH 5"
-#: ../properties/nm-vpnc.c:703
+#: ../properties/nm-vpnc.c:730
msgid "Server (default)"
msgstr "Server (predefinito)"
-#: ../properties/nm-vpnc.c:710
+#: ../properties/nm-vpnc.c:737
msgid "None"
msgstr "Nessuno"
-#: ../properties/nm-vpnc.c:724
+#: ../properties/nm-vpnc.c:751
msgid "DH Group 2"
msgstr "Gruppo DH 2"
-#: ../properties/nm-vpnc.c:771
+#: ../properties/nm-vpnc.c:798
msgid "Choose a Certificate Authority (CA) certificate..."
msgstr "Scegli certificato di CA..."
-#: ../properties/nm-vpnc.c:775
+#: ../properties/nm-vpnc.c:802
msgid "PEM certificates (*.pem, *.crt, *.cer)"
msgstr "Certificati PEM (*.pem, *.crt, *.cer)"
-#: ../properties/nm-vpnc.c:1499
+#: ../properties/nm-vpnc.c:1522
msgid "TCP tunneling not supported"
msgstr "Tunnel TCP non supportato"
-#: ../properties/nm-vpnc.c:1501
+#: ../properties/nm-vpnc.c:1524
#, c-format
msgid ""
"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
@@ -286,10 +287,23 @@
"config: Perfect Forward Secrecy <nopfs/dh1/dh2/dh5/server>"
#: ../properties/nm-vpnc-dialog.ui.h:25
+msgid "_Local port:"
+msgstr "Porta _locale:"
+
+#: ../properties/nm-vpnc-dialog.ui.h:26
+msgid ""
+"Local ISAKMP port to use (0 means random port; 500 is vpnc's default)\n"
+"config: Local Port <0-65535>"
+msgstr ""
+"Porta ISAKMP locale da usare (0 indica una porta a caso; 500 è quella "
+"predefinita)\n"
+"config: Local Port <0-65535>"
+
+#: ../properties/nm-vpnc-dialog.ui.h:28
msgid "Disable Dead _Peer Detection"
msgstr "Disabilitare riconoscimento del peer morto"
-#: ../properties/nm-vpnc-dialog.ui.h:26
+#: ../properties/nm-vpnc-dialog.ui.h:29
msgid ""
"Disable sending DPD packets (sets timeout to 0)\n"
"config: DPD idle timeout (our side) 0"
@@ -297,15 +311,15 @@
"Disabilita l'invio di pacchetti DPD (imposta timeout a 0)\n"
"config: DPD idle timeout (lato nostro) 0"
-#: ../properties/nm-vpnc-dialog.ui.h:28
+#: ../properties/nm-vpnc-dialog.ui.h:31
msgid "General"
msgstr "Generale"
-#: ../properties/nm-vpnc-dialog.ui.h:29
+#: ../properties/nm-vpnc-dialog.ui.h:32
msgid "Sho_w passwords"
msgstr "Mostrare le pass_word"
-#: ../properties/nm-vpnc-dialog.ui.h:30
+#: ../properties/nm-vpnc-dialog.ui.h:33
msgid ""
"Group password\n"
"config: IPSec secret <group_password>"
@@ -313,19 +327,19 @@
"Password di gruppo\n"
"config: IPSec secret <password_gruppo>"
-#: ../properties/nm-vpnc-dialog.ui.h:32
+#: ../properties/nm-vpnc-dialog.ui.h:35
msgid "Gro_up password:"
msgstr "Password di gr_uppo:"
-#: ../properties/nm-vpnc-dialog.ui.h:33
+#: ../properties/nm-vpnc-dialog.ui.h:36
msgid "_Gateway:"
msgstr "_Gateway:"
-#: ../properties/nm-vpnc-dialog.ui.h:34
+#: ../properties/nm-vpnc-dialog.ui.h:37
msgid "G_roup name:"
msgstr "Nome g_ruppo:"
-#: ../properties/nm-vpnc-dialog.ui.h:35
+#: ../properties/nm-vpnc-dialog.ui.h:38
msgid ""
"IP/hostname of IPsec gateway\n"
"config: IPSec gateway <gateway>"
@@ -333,7 +347,7 @@
"IP/Nome host del gateway IPsec\n"
"config: IPSec gateway <gateway>"
-#: ../properties/nm-vpnc-dialog.ui.h:37
+#: ../properties/nm-vpnc-dialog.ui.h:40
msgid ""
"Group name\n"
"config: IPSec ID <group_name>"
@@ -341,11 +355,11 @@
"Nome gruppo\n"
"config: IPSec ID <nome_gruppo>"
-#: ../properties/nm-vpnc-dialog.ui.h:39
+#: ../properties/nm-vpnc-dialog.ui.h:42
msgid "User _password:"
msgstr "Password _utente:"
-#: ../properties/nm-vpnc-dialog.ui.h:40
+#: ../properties/nm-vpnc-dialog.ui.h:43
msgid ""
"User password for the connection\n"
"config: Xauth password <password>"
@@ -353,7 +367,7 @@
"Password utente per la connessione\n"
"config: Xauth password <password>"
-#: ../properties/nm-vpnc-dialog.ui.h:42
+#: ../properties/nm-vpnc-dialog.ui.h:45
msgid ""
"User name for the connection\n"
"config: Xauth username <user_name>"
@@ -361,15 +375,15 @@
"Nome utente per la connessione\n"
"config: Xauth username <nome_utente>"
-#: ../properties/nm-vpnc-dialog.ui.h:44
+#: ../properties/nm-vpnc-dialog.ui.h:47
msgid "User na_me:"
msgstr "Nome u_tente:"
-#: ../properties/nm-vpnc-dialog.ui.h:45
+#: ../properties/nm-vpnc-dialog.ui.h:48
msgid "Use _hybrid authentication"
msgstr "_Usare autenticazione ibrida"
-#: ../properties/nm-vpnc-dialog.ui.h:46
+#: ../properties/nm-vpnc-dialog.ui.h:49
msgid ""
"Enable hybrid authentication, i.e. use certificate in addition to password.\n"
"config: IKE Authmode hybrid"
@@ -377,11 +391,11 @@
"Abilita autenticazione ibrida, usa il certificato oltre alla password\n"
"config: IKE Authmode hybrid"
-#: ../properties/nm-vpnc-dialog.ui.h:48
+#: ../properties/nm-vpnc-dialog.ui.h:51
msgid "CA _File:"
msgstr "_File CA:"
-#: ../properties/nm-vpnc-dialog.ui.h:49
+#: ../properties/nm-vpnc-dialog.ui.h:52
msgid ""
"CA certificate in PEM format\n"
"config: CA-File"
@@ -389,58 +403,58 @@
"Certificato CA in formato PEM\n"
"config: CA-File"
-#: ../properties/nm-vpnc-dialog.ui.h:51
+#: ../properties/nm-vpnc-dialog.ui.h:54
msgid "Advance_d..."
msgstr "A_vanzate..."
-#: ../src/nm-vpnc-service.c:152
+#: ../src/nm-vpnc-service.c:153
#, c-format
msgid "property '%s' invalid or not supported"
msgstr "proprietà «%s» non valida o non supportata"
-#: ../src/nm-vpnc-service.c:171
+#: ../src/nm-vpnc-service.c:172
#, c-format
msgid "property '%s' file path '%s' is not absolute or does not exist"
msgstr "il percorso «%2$s» della proprietà «%1$s» non è assoluto o non esiste"
-#: ../src/nm-vpnc-service.c:184
+#: ../src/nm-vpnc-service.c:185
#, c-format
msgid "invalid integer property '%s' or out of range [%d -> %d]"
msgstr "proprietà intera «%s» non valida o fuori intervallo [%d → %d]"
-#: ../src/nm-vpnc-service.c:194
+#: ../src/nm-vpnc-service.c:195
#, c-format
msgid "invalid boolean property '%s' (not yes or no)"
msgstr "proprietà booleana «%s» non valida (non yes o no)"
-#: ../src/nm-vpnc-service.c:201
+#: ../src/nm-vpnc-service.c:202
#, c-format
msgid "unhandled property '%s' type %d"
msgstr "proprietà «%s» di topo %d non gestita"
-#: ../src/nm-vpnc-service.c:218
+#: ../src/nm-vpnc-service.c:219
msgid "No VPN configuration options."
msgstr "Nessuna opzione di configurazione VPN."
-#: ../src/nm-vpnc-service.c:236
+#: ../src/nm-vpnc-service.c:237
msgid "No VPN secrets!"
msgstr "Nessun segreto VPN."
-#: ../src/nm-vpnc-service.c:305
+#: ../src/nm-vpnc-service.c:306
msgid "Could not find vpnc binary."
msgstr "Impossibile trovare il file binario di vnpc."
-#: ../src/nm-vpnc-service.c:397
+#: ../src/nm-vpnc-service.c:398
#, c-format
msgid "Config option '%s' invalid or unknown."
msgstr "Opzione di configurazione «%s» non valida o sconosciuta."
-#: ../src/nm-vpnc-service.c:430
+#: ../src/nm-vpnc-service.c:431
#, c-format
msgid "Config option '%s' not an integer."
msgstr "L'opzione di configurazione «%s» non è un intero."
-#: ../src/nm-vpnc-service.c:607
+#: ../src/nm-vpnc-service.c:608
msgid ""
"Could not process the request because the VPN connection settings were "
"invalid."
@@ -448,15 +462,15 @@
"Impossibile elaborare la richiesta poiché le impostazioni della connessione "
"VPN non sono corrette."
-#: ../src/nm-vpnc-service.c:722
+#: ../src/nm-vpnc-service.c:723
msgid "Don't quit when VPN connection terminates"
msgstr "Non esce quando la connessione VPN termina"
-#: ../src/nm-vpnc-service.c:723
+#: ../src/nm-vpnc-service.c:724
msgid "Enable verbose debug logging (may expose passwords)"
msgstr "Abilita output prolisso per il debug (potrebbe visualizzare password)"
-#: ../src/nm-vpnc-service.c:737
+#: ../src/nm-vpnc-service.c:747
msgid ""
"nm-vpnc-service provides integrated Cisco Legacy IPsec VPN capability to "
"NetworkManager."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/properties/Makefile.am
new/NetworkManager-vpnc-0.9.8.6/properties/Makefile.am
--- old/NetworkManager-vpnc-0.9.8.2/properties/Makefile.am 2013-06-07
22:30:13.000000000 +0200
+++ new/NetworkManager-vpnc-0.9.8.6/properties/Makefile.am 2013-09-13
18:01:23.000000000 +0200
@@ -21,8 +21,7 @@
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DG_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\"
libnm_vpnc_properties_la_LIBADD = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-vpnc-0.9.8.2/properties/nm-vpnc.c
new/NetworkManager-vpnc-0.9.8.6/properties/nm-vpnc.c
--- old/NetworkManager-vpnc-0.9.8.2/properties/nm-vpnc.c 2013-06-07
22:30:13.000000000 +0200
+++ new/NetworkManager-vpnc-0.9.8.6/properties/nm-vpnc.c 2013-09-13
18:01:23.000000000 +0200
@@ -1860,6 +1860,9 @@
if (error)
g_return_val_if_fail (*error == NULL, NULL);
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
return NM_VPN_PLUGIN_UI_INTERFACE (g_object_new (VPNC_TYPE_PLUGIN_UI,
NULL));
}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
