diff -pruN 1.4.6-1/config.guess 1.4.6-1ubuntu3/config.guess --- 1.4.6-1/config.guess 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/config.guess 2011-04-01 14:43:15.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-06-10' +timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ timestamp='2009-06-10' # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +56,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -807,12 +811,12 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -854,6 +858,20 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -876,6 +894,17 @@ EOF frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -901,39 +930,18 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -942,8 +950,11 @@ EOF *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -966,58 +977,6 @@ EOF xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1247,6 +1206,16 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -pruN 1.4.6-1/config.sub 1.4.6-1ubuntu3/config.sub --- 1.4.6-1/config.sub 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/config.sub 2011-04-01 14:43:15.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-06-11' +timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ timestamp='2009-06-11' # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -72,8 +75,9 @@ Report bugs and patches to Fri, 01 Apr 2011 12:20:43 +0200 + +davfs2 (1.4.6-1ubuntu2) natty; urgency=low + + * Revert previous changes, causes regression. + + -- Martin Pitt Thu, 31 Mar 2011 21:36:49 +0200 + +davfs2 (1.4.6-1ubuntu1) natty; urgency=low + + * Add kernoops to ignore_home to allow mounts under / in Ubuntu. + (LP: #459998) + * Add distccd to ignore_home to allow mount under / in Debian & Ubuntu. + + -- Michael R. Crusoe Wed, 30 Mar 2011 14:42:35 +0200 + davfs2 (1.4.6-1) unstable; urgency=low * New upstream version 1.4.6. diff -pruN 1.4.6-1/debian/control 1.4.6-1ubuntu3/debian/control --- 1.4.6-1/debian/control 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/control 2011-04-01 14:43:15.000000000 +0100 @@ -1,7 +1,8 @@ Source: davfs2 Section: utils Priority: extra -Maintainer: Luciano Bello +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Luciano Bello Build-Depends: debhelper (>= 7.0.0), po-debconf, libneon27-gnutls-dev Standards-Version: 3.8.4 Homepage: http://savannah.nongnu.org/projects/davfs2 diff -pruN 1.4.6-1/debian/po/cs.po 1.4.6-1ubuntu3/debian/po/cs.po --- 1.4.6-1/debian/po/cs.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/cs.po 2011-04-01 14:43:15.000000000 +0100 @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-06-07 16:24+0200\n" "Last-Translator: Viktor Matys \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -pruN 1.4.6-1/debian/po/de.po 1.4.6-1ubuntu3/debian/po/de.po --- 1.4.6-1/debian/po/de.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/de.po 2011-04-01 14:43:15.000000000 +0100 @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-06-21 23:07-0400\n" "Last-Translator: Matthias Julius \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -pruN 1.4.6-1/debian/po/es.po 1.4.6-1ubuntu3/debian/po/es.po --- 1.4.6-1/debian/po/es.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/es.po 2011-04-01 14:43:15.000000000 +0100 @@ -35,6 +35,7 @@ msgstr "" "PO-Revision-Date: 2009-04-29 14:04+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -43,19 +44,30 @@ msgstr "" #. Description #: ../templates:2001 msgid "Should unprivileged users be allowed to mount WebDAV resources?" -msgstr "¿Se debería permitir que los usuarios sin privilegios puedan montar recursos WebDAV?" +msgstr "" +"¿Se debería permitir que los usuarios sin privilegios puedan montar recursos " +"WebDAV?" #. Type: boolean #. Description #: ../templates:2001 -msgid "The file /sbin/mount.davfs must have the SUID bit set if you want to allow unprivileged (non-root) users to mount WebDAV resources." -msgstr "El archivo «/sbin/mount.davfs» debe tener activo el bit SUID si quiere que los usuarios sin privilegios de administrador puedan montar recursos WebDAV." +msgid "" +"The file /sbin/mount.davfs must have the SUID bit set if you want to allow " +"unprivileged (non-root) users to mount WebDAV resources." +msgstr "" +"El archivo «/sbin/mount.davfs» debe tener activo el bit SUID si quiere que " +"los usuarios sin privilegios de administrador puedan montar recursos WebDAV." #. Type: boolean #. Description #: ../templates:2001 -msgid "If you do not choose this option, only root will be allowed to mount WebDAV resources. This can later be changed by running 'dpkg-reconfigure davfs2'." -msgstr "Si no escoge esta opción, sólo el administrador («root») podrá montar recursos WebDAV. Puede cambiar esta elección más tarde, ejecutando la orden «dpkg-reconfigure davfs2»." +msgid "" +"If you do not choose this option, only root will be allowed to mount WebDAV " +"resources. This can later be changed by running 'dpkg-reconfigure davfs2'." +msgstr "" +"Si no escoge esta opción, sólo el administrador («root») podrá montar " +"recursos WebDAV. Puede cambiar esta elección más tarde, ejecutando la orden " +"«dpkg-reconfigure davfs2»." #. Type: string #. Description @@ -66,8 +78,13 @@ msgstr "Usuario que ejecutará el demoni #. Type: string #. Description #: ../templates:3001 -msgid "Once the davfs resource has been mounted, the daemon will drop the root privileges and will run with an unprivileged user ID." -msgstr "Una vez que davfs haya montado el recurso, el demonio se despojará de los privilegios de administrador («root») y se ejecutará con un ID de un usuario sin privilegios." +msgid "" +"Once the davfs resource has been mounted, the daemon will drop the root " +"privileges and will run with an unprivileged user ID." +msgstr "" +"Una vez que davfs haya montado el recurso, el demonio se despojará de los " +"privilegios de administrador («root») y se ejecutará con un ID de un usuario " +"sin privilegios." #. Type: string #. Description @@ -84,8 +101,12 @@ msgstr "Grupo de usuarios que podrán mo #. Type: string #. Description #: ../templates:4001 -msgid "Mounting WebDAV resources creates a file in /var/run/mount.davfs. This directory will be owned by the group specified here." -msgstr "Al montar recursos WebDAV se crea un archivo en «/var/run/mount.davfs». Este directorio pertenecerá al grupo especificado aquí." +msgid "" +"Mounting WebDAV resources creates a file in /var/run/mount.davfs. This " +"directory will be owned by the group specified here." +msgstr "" +"Al montar recursos WebDAV se crea un archivo en «/var/run/mount.davfs». Este " +"directorio pertenecerá al grupo especificado aquí." #. Type: boolean #. Description @@ -96,8 +117,12 @@ msgstr "¿Desea crear este nuevo usuario #. Type: boolean #. Description #: ../templates:5001 -msgid "The \"${user_name}\" user does not exist on the system and will be created if you choose this option." -msgstr "El usuario «${user_name}» no existe en el sistema, se creará si confirma esta pregunta." +msgid "" +"The \"${user_name}\" user does not exist on the system and will be created " +"if you choose this option." +msgstr "" +"El usuario «${user_name}» no existe en el sistema, se creará si confirma " +"esta pregunta." #. Type: boolean #. Description @@ -108,8 +133,12 @@ msgstr "¿Deseea crear este nuevo grupo? #. Type: boolean #. Description #: ../templates:6001 -msgid "The \"${group_name}\" group does not exist on the system and will be created if you choose this option." -msgstr "El grupo \"${group_name}\" no existe en el sistema, se creará si confirma esta pregunta." +msgid "" +"The \"${group_name}\" group does not exist on the system and will be created " +"if you choose this option." +msgstr "" +"El grupo \"${group_name}\" no existe en el sistema, se creará si confirma " +"esta pregunta." #. Type: note #. Description @@ -120,8 +149,14 @@ msgstr "Los usuarios sin privilegios pue #. Type: note #. Description #: ../templates:7001 -msgid "The \"${group_name}\" group and the \"${user_name}\" user will be used by davfs2. All users who should be granted the right to mount WebDAV resources should be added to the group \"${group_name}\" using the following command:" -msgstr "Davfs2 utilizará el grupo «${group_name}» y el usuario «${user_name}». Todos los usuarios que deban tener permisos para montar recursos WebDAV se deberían añadir al grupo «${group_name}» utilizando la siguiente orden:" +msgid "" +"The \"${group_name}\" group and the \"${user_name}\" user will be used by " +"davfs2. All users who should be granted the right to mount WebDAV resources " +"should be added to the group \"${group_name}\" using the following command:" +msgstr "" +"Davfs2 utilizará el grupo «${group_name}» y el usuario «${user_name}». Todos " +"los usuarios que deban tener permisos para montar recursos WebDAV se " +"deberían añadir al grupo «${group_name}» utilizando la siguiente orden:" #. Type: note #. Description @@ -132,8 +167,12 @@ msgstr "Esto también se debería agrega #. Type: note #. Description #: ../templates:7001 -msgid "Additional options are available. Please read the mount.davfs man page for more information." -msgstr "Existen más opciones disponibles. Para más información lea la página del manual de mount.davfs." +msgid "" +"Additional options are available. Please read the mount.davfs man page for " +"more information." +msgstr "" +"Existen más opciones disponibles. Para más información lea la página del " +"manual de mount.davfs." #~ msgid "" #~ "Choosing this option is discouraged for security reasons. If you choose " @@ -141,8 +180,10 @@ msgstr "Existen más opciones disponible #~ msgstr "" #~ "Elegir esta opción es desaconsejado por razones de seguridad. Si la " #~ "contesta afirmativamenteinformación adicional le será requerida." + #~ msgid "Files with SUID root are normally avoided." #~ msgstr "Los archivos con SUID de root normalmente se evitan." + #~ msgid "" #~ "If you answer confirmative to this question, more details will be " #~ "required. Otherwise, non-root users can not mount webdav resources." @@ -150,12 +191,15 @@ msgstr "Existen más opciones disponible #~ "Si responde afirmativamente a esta pregunta se le pedirán más detalles. " #~ "En caso contrario, los usuarios sin privilegios de administrador no " #~ "podrán montar recursos webdav." + #~ msgid "You can always change your opinion with \"dpkg-reconfigure davfs2\"" #~ msgstr "Siempre podrá cambiar de opinión con \"dpkg-reconfigure davfs2\"" + #~ msgid "When invoked by root, the mount.davfs daemon will run as this user:" #~ msgstr "" #~ "Cuando sea invocado como root, el demonio mount.davfs correrá como este " #~ "usuario:" + #~ msgid "" #~ "mount.davfs starts with effective user-id 'root' to be able to mount. " #~ "After mounting it changes its id permanently to that of the mounting " @@ -166,10 +210,12 @@ msgstr "Existen más opciones disponible #~ "poder montar. Despuués de montar, cambia su identificador permanentemente " #~ "al usuario de montaje. Cuando el usuario de montaje es root, el demonio " #~ "mount.davfs correrá como el usuario declarado a continuación." + #~ msgid "The non-root users of davfs2 must be part of this group:" #~ msgstr "" #~ "Los usuarios de davfs2 que no tengan privilegios de root deben formar " #~ "parte de este grupo:" + #~ msgid "" #~ "For creating a file in /var/run/mount.davfs you must provide a group to " #~ "own this directory. If you give a non-existant group, it will be created " @@ -178,6 +224,7 @@ msgstr "Existen más opciones disponible #~ "Para que se pueda crear un archivo dentro de /var/run/mount.davfs se debe " #~ "tener un grupo dueño de este directorio. Si se provee un grupo no " #~ "existente, será creado para usted." + #~ msgid "" #~ "The group \"${group_name}\" and the user \"${user_name}\" will be used by " #~ "davfs2. You must add to this group all your users that you want to grant " @@ -186,12 +233,16 @@ msgstr "Existen más opciones disponible #~ "Davfs2 utilizará el grupo \"${group_name}\". Debe agregar a este grupo a " #~ "todos los usuarios a los que quiera conceder acceso. Recuerde agregar una " #~ "linea similar a esta en el archivo /etc/fstab:" + #~ msgid "usermod -a -G ${group_name} " #~ msgstr "usermod -a -G ${group_name} " + #~ msgid "Remember to add a line similar to this one in the /etc/fstab:" #~ msgstr "Recuerde agregar una linea similar a ésta en el archivo /etc/fstab:" + #~ msgid "https://webdav.site.com/path /mnt davfs rw,users,noauto 0 0" #~ msgstr "https://webdav.site.com/path /mnt davfs rw,users,noauto 0 0" + #~ msgid "" #~ "Please, note that you should use http if your server doesn't support " #~ "https connections. The mount point, the name of the server and the path " @@ -200,4 +251,3 @@ msgstr "Existen más opciones disponible #~ "Por favor, tenga en cuenta que debe usar http si su servidor no soporta " #~ "conexiones https. El punto de montaje, el nombre del servidor y la ruta " #~ "deben ser adaptadas a sus requerimientos." - diff -pruN 1.4.6-1/debian/po/fi.po 1.4.6-1ubuntu3/debian/po/fi.po --- 1.4.6-1/debian/po/fi.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/fi.po 2011-04-01 14:43:15.000000000 +0100 @@ -6,6 +6,7 @@ msgstr "" "PO-Revision-Date: 2008-02-05 01:18+0200\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -125,9 +126,10 @@ msgid "" "davfs2. All users who should be granted the right to mount WebDAV resources " "should be added to the group \"${group_name}\" using the following command:" msgstr "" -"Ohjelma davfs2 käyttää ryhmää ”${group_name}\" ja käyttäjää \"${user_name}" -"\". Kaikki käyttäjät, joilla tulisi olla oikeus liittää WebDAV-resursseja, " -"tulisi lisätä ryhmään ”${group_name}” käyttäen seuraavaa komentoa:" +"Ohjelma davfs2 käyttää ryhmää ”${group_name}\" ja käyttäjää " +"\"${user_name}\". Kaikki käyttäjät, joilla tulisi olla oikeus liittää WebDAV-" +"resursseja, tulisi lisätä ryhmään ”${group_name}” käyttäen seuraavaa " +"komentoa:" #. Type: note #. Description diff -pruN 1.4.6-1/debian/po/fr.po 1.4.6-1ubuntu3/debian/po/fr.po --- 1.4.6-1/debian/po/fr.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/fr.po 2011-04-01 14:43:15.000000000 +0100 @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2006-05-29 19:14+0200\n" "Last-Translator: Ivan Buresi \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -127,10 +128,10 @@ msgid "" "davfs2. All users who should be granted the right to mount WebDAV resources " "should be added to the group \"${group_name}\" using the following command:" msgstr "" -"Le groupe « ${group_name} » et l'utilisateur « ${user_name} » seront utilisés " -"par davfs2. Tous les utilisateurs que vous voulez autoriser à monter des " -"ressources WebDAV doivent être ajoutés au groupe « ${group_name} » avec la " -"commande :" +"Le groupe « ${group_name} » et l'utilisateur « ${user_name} » seront " +"utilisés par davfs2. Tous les utilisateurs que vous voulez autoriser à " +"monter des ressources WebDAV doivent être ajoutés au groupe " +"« ${group_name} » avec la commande :" #. Type: note #. Description diff -pruN 1.4.6-1/debian/po/gl.po 1.4.6-1ubuntu3/debian/po/gl.po --- 1.4.6-1/debian/po/gl.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/gl.po 2011-04-01 14:43:15.000000000 +0100 @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-06-05 11:40+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,8 +39,8 @@ msgid "" "resources. This can later be changed by running 'dpkg-reconfigure davfs2'." msgstr "" "Se non escolle esta opción, só o administrador ha poder montar recursos " -"WebDAV. Isto pódese cambiar máis tarde executando \"dpkg-reconfigure davfs2" -"\"." +"WebDAV. Isto pódese cambiar máis tarde executando \"dpkg-reconfigure " +"davfs2\"." #. Type: string #. Description diff -pruN 1.4.6-1/debian/po/ja.po 1.4.6-1ubuntu3/debian/po/ja.po --- 1.4.6-1/debian/po/ja.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/ja.po 2011-04-01 14:43:15.000000000 +0100 @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2009-04-23 05:02+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -pruN 1.4.6-1/debian/po/nl.po 1.4.6-1ubuntu3/debian/po/nl.po --- 1.4.6-1/debian/po/nl.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/nl.po 2011-04-01 14:43:15.000000000 +0100 @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2008-01-31 19:01+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -pruN 1.4.6-1/debian/po/pt.po 1.4.6-1ubuntu3/debian/po/pt.po --- 1.4.6-1/debian/po/pt.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/pt.po 2011-04-01 14:43:15.000000000 +0100 @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-06-05 21:19+0100\n" "Last-Translator: Ricardo Silva \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -pruN 1.4.6-1/debian/po/ru.po 1.4.6-1ubuntu3/debian/po/ru.po --- 1.4.6-1/debian/po/ru.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/ru.po 2011-04-01 14:43:15.000000000 +0100 @@ -11,12 +11,13 @@ msgstr "" "PO-Revision-Date: 2007-06-14 21:54+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: boolean #. Description diff -pruN 1.4.6-1/debian/po/sv.po 1.4.6-1ubuntu3/debian/po/sv.po --- 1.4.6-1/debian/po/sv.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/sv.po 2011-04-01 14:43:15.000000000 +0100 @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-06-06 11:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -pruN 1.4.6-1/debian/po/ta.po 1.4.6-1ubuntu3/debian/po/ta.po --- 1.4.6-1/debian/po/ta.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/ta.po 2011-04-01 14:43:15.000000000 +0100 @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2007-06-09 12:34+0530\n" "Last-Translator: Dr.T.Vasudevan \n" "Language-Team: TAMIL \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -pruN 1.4.6-1/debian/po/vi.po 1.4.6-1ubuntu3/debian/po/vi.po --- 1.4.6-1/debian/po/vi.po 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/debian/po/vi.po 2011-04-01 14:43:15.000000000 +0100 @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2007-06-05 16:07+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -30,9 +31,9 @@ msgid "" "The file /sbin/mount.davfs must have the SUID bit set if you want to allow " "unprivileged (non-root) users to mount WebDAV resources." msgstr "" -"Tập tin « /sbin/mount.davfs » phải có bit SUID được lập nếu bạn muốn cho phép " -"người dùng không có quyền đặc biệt (người dùng khác người chủ) gắn kết tài " -"nguyên WebDAV." +"Tập tin « /sbin/mount.davfs » phải có bit SUID được lập nếu bạn muốn cho " +"phép người dùng không có quyền đặc biệt (người dùng khác người chủ) gắn kết " +"tài nguyên WebDAV." #. Type: boolean #. Description @@ -129,9 +130,9 @@ msgid "" "davfs2. All users who should be granted the right to mount WebDAV resources " "should be added to the group \"${group_name}\" using the following command:" msgstr "" -"Nhóm « ${group_name} » và người dùng « ${user_name} » sẽ được dùng bởi davfs2. " -"Tất cả các người dùng nên có quyền gắn kết tài nguyên WebDAV nên được thêm " -"vào nhóm « ${group_name} » bằng lệnh này:" +"Nhóm « ${group_name} » và người dùng « ${user_name} » sẽ được dùng bởi " +"davfs2. Tất cả các người dùng nên có quyền gắn kết tài nguyên WebDAV nên " +"được thêm vào nhóm « ${group_name} » bằng lệnh này:" #. Type: note #. Description diff -pruN 1.4.6-1/etc/davfs2.conf 1.4.6-1ubuntu3/etc/davfs2.conf --- 1.4.6-1/etc/davfs2.conf 2009-10-18 09:07:49.000000000 +0100 +++ 1.4.6-1ubuntu3/etc/davfs2.conf 2011-04-01 14:43:15.000000000 +0100 @@ -21,7 +21,7 @@ # dav_user davfs2 # system wide config file only # dav_group davfs2 # system wide config file only -# ignore_home # system wide config file only +ignore_home kernoops,distccd # system wide config file only # kernel_fs fuse # buf_size 16 # KiByte diff -pruN 1.4.6-1/src/mount_davfs.c 1.4.6-1ubuntu3/src/mount_davfs.c --- 1.4.6-1/src/mount_davfs.c 2011-04-01 14:46:53.000000000 +0100 +++ 1.4.6-1ubuntu3/src/mount_davfs.c 2011-04-01 14:43:15.000000000 +0100 @@ -2174,18 +2174,33 @@ read_config(dav_args *args, const char * } else if (applies && count == 2) { - if (system && strcmp(parmv[0], "dav_user") == 0) { - if (args->dav_user) - free(args->dav_user); - args->dav_user = ne_strdup(parmv[1]); - } else if (system && strcmp(parmv[0], "dav_group") == 0) { - if (args->dav_group) - free(args->dav_group); - args->dav_group = ne_strdup(parmv[1]); - } else if (system && strcmp(parmv[0], "ignore_home") == 0) { - if (args->ignore_home) - free(args->ignore_home); - args->ignore_home = ne_strdup(parmv[1]); + if (strcmp(parmv[0], "dav_user") == 0) { + if (system) { + if (args->dav_user) + free(args->dav_user); + args->dav_user = ne_strdup(parmv[1]); + } else { + error_at_line(0, 0, filename, lineno, + _("system option in user configuration file")); + } + } else if (strcmp(parmv[0], "dav_group") == 0) { + if (system) { + if (args->dav_group) + free(args->dav_group); + args->dav_group = ne_strdup(parmv[1]); + } else { + error_at_line(0, 0, filename, lineno, + _("system option in user configuration file")); + } + } else if (strcmp(parmv[0], "ignore_home") == 0) { + if (system) { + if (args->ignore_home) + free(args->ignore_home); + args->ignore_home = ne_strdup(parmv[1]); + } else { + error_at_line(0, 0, filename, lineno, + _("system option in user configuration file")); + } } else if (strcmp(parmv[0], "kernel_fs") == 0) { if (args->kernel_fs) free(args->kernel_fs); @@ -2196,21 +2211,36 @@ read_config(dav_args *args, const char * if (args->servercert) free(args->servercert); args->servercert = ne_strdup(parmv[1]); - } else if (!system && strcmp(parmv[0], "secrets") == 0) { - if (args->secrets) - free(args->secrets); - args->secrets = ne_strdup(parmv[1]); + } else if (strcmp(parmv[0], "secrets") == 0) { + if (system) { + error_at_line(0, 0, filename, lineno, + _("user option in system configuration file")); + } else { + if (args->secrets) + free(args->secrets); + args->secrets = ne_strdup(parmv[1]); + } } else if (strcmp(parmv[0], "clientcert") == 0) { if (args->clicert) free(args->clicert); args->clicert = ne_strdup(parmv[1]); - } else if (system && strcmp(parmv[0], "proxy") == 0) { - if (split_uri(NULL, &args->p_host, &args->p_port, NULL, - parmv[1]) != 0) - error_at_line(EXIT_FAILURE, 0, filename, lineno, - _("malformed line")); - } else if (system && strcmp(parmv[0], "use_proxy") == 0) { - args->useproxy = arg_to_int(parmv[1], 10, parmv[0]); + } else if (strcmp(parmv[0], "proxy") == 0) { + if (system) { + if (split_uri(NULL, &args->p_host, &args->p_port, NULL, + parmv[1]) != 0) + error_at_line(EXIT_FAILURE, 0, filename, lineno, + _("malformed line")); + } else { + error_at_line(0, 0, filename, lineno, + _("system option in user configuration file")); + } + } else if (strcmp(parmv[0], "use_proxy") == 0) { + if (system) { + args->useproxy = arg_to_int(parmv[1], 10, parmv[0]); + } else { + error_at_line(0, 0, filename, lineno, + _("system option in non-system config")); + } } else if (strcmp(parmv[0], "ask_auth") == 0) { args->askauth = arg_to_int(parmv[1], 10, parmv[0]); } else if (strcmp(parmv[0], "use_locks") == 0) { @@ -2249,14 +2279,24 @@ read_config(dav_args *args, const char * if (args->s_charset) free(args->s_charset); args->s_charset = ne_strdup(parmv[1]); - } else if (system && strcmp(parmv[0], "cache_dir") == 0) { - if (args->sys_cache) - free(args->sys_cache); - args->sys_cache = ne_strdup(parmv[1]); - } else if (!system && strcmp(parmv[0], "cache_dir") == 0) { - if (args->cache_dir != NULL) - free(args->cache_dir); - args->cache_dir = ne_strdup(parmv[1]); + } else if (strcmp(parmv[0], "cache_dir") == 0) { + if (system) { + if (args->sys_cache) + free(args->sys_cache); + args->sys_cache = ne_strdup(parmv[1]); + } else { + error_at_line(0, 0, filename, lineno, + _("system option in user configuration file")); + } + } else if (strcmp(parmv[0], "cache_dir") == 0) { + if (system) { + if (args->cache_dir != NULL) + free(args->cache_dir); + args->cache_dir = ne_strdup(parmv[1]); + } else { + error_at_line(0, 0, filename, lineno, + _("user option in system configuration file")); + } } else if (strcmp(parmv[0], "backup_dir") == 0) { if (args->backup_dir) free(args->backup_dir);