--- cpu-1.4.3.orig/config.guess +++ cpu-1.4.3/config.guess @@ -1,9 +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 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2003-05-09' +timestamp='2009-06-10' # 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 @@ -17,13 +18,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # 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. @@ -53,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 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." @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,8 +107,9 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; @@ -122,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -157,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -165,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -195,50 +200,32 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -276,39 +263,49 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -316,29 +313,48 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -347,10 +363,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -362,10 +378,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -376,37 +392,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -430,32 +449,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -471,29 +491,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -501,7 +521,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -516,15 +536,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -537,28 +561,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -620,9 +644,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -630,11 +664,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -662,191 +696,227 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + 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 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -857,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + 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 0 ;; + exit ;; + padre:Linux:*:*) + echo sparc-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 @@ -868,22 +941,31 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; + 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 @@ -899,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -926,23 +997,33 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #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 | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + 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 # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -950,24 +1031,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -975,15 +1059,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1075,68 +1173,84 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1144,22 +1258,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1170,25 +1287,50 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1220,7 +1362,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1309,11 +1451,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1322,22 +1465,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1348,7 +1491,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- cpu-1.4.3.orig/config.sub +++ cpu-1.4.3/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2003-05-09' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 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." @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,7 +120,10 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,10 +149,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -169,6 +177,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +197,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -228,44 +244,57 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -275,6 +304,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -294,54 +326,67 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -359,6 +404,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -376,6 +424,9 @@ amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -399,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -407,10 +462,26 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -435,12 +506,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -463,6 +549,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -613,6 +707,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -628,6 +730,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -641,10 +747,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -657,6 +759,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -725,10 +830,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -736,9 +837,12 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -756,6 +860,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -765,24 +877,36 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; @@ -815,6 +939,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -841,6 +969,14 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -848,6 +984,12 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -922,10 +1064,6 @@ basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff @@ -938,6 +1076,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -951,6 +1093,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -994,6 +1140,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1005,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1024,6 +1178,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1040,13 +1197,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1113,25 +1267,30 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1149,12 +1308,15 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1167,6 +1329,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1188,6 +1353,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1210,6 +1378,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1246,6 +1417,12 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1268,6 +1445,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1277,6 +1460,9 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1302,6 +1488,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1320,9 +1509,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1425,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1455,9 +1650,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1482,7 +1683,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- cpu-1.4.3.orig/debian/control +++ cpu-1.4.3/debian/control @@ -0,0 +1,16 @@ +Source: cpu +Section: admin +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Guido Trotter +Uploaders: Paul J Stevens +Build-Depends: debhelper (>= 4.1.6), dpatch, libldap2-dev, cracklib2-dev +Standards-Version: 3.7.3 + +Package: cpu +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.28) +Description: a console based LDAP user management tool + CPU is a suitable replacement for the useradd/usermod/userdel utilities for + administrators using an LDAP backend and wishing to have a suite of command + line tools for doing the administration. --- cpu-1.4.3.orig/debian/NEWS.Debian +++ cpu-1.4.3/debian/NEWS.Debian @@ -0,0 +1,29 @@ +cpu (1.4.1-1) unstable; urgency=low + + A bug in the software has been corrected: now the configuration variable + USER_CN_STRING is actually read and used, whereas in version 1.4.0 it was + mistakenly ignored, defaulting to "cn". + + As such it is likely that cpu will not be able to find your users and + modify them, if you created them with one of the affected versions of this + software. + + As a workaround you can set USER_CN_STRING to "cn" to make it work again. + If you want to change the value back to for instance "uid" you have to + modify all your users. + + An example ldif entry to change + dn: cn=foobar,ou=People,dc=domain,dc=com + into + dn: uid=foobar,ou=People,dc=domain,dc=com + would be: + + --- + dn: cn=foobar,ou=People,dc=domain,dc=com + changetype: moddn + newrdn: uid=foobar + deleteoldrdn: 0 + --- + + -- Guido Trotter Fri, 26 Sep 2003 10:13:31 +0200 + --- cpu-1.4.3.orig/debian/cpu.conf +++ cpu-1.4.3/debian/cpu.conf @@ -0,0 +1,42 @@ +# See cpu.conf(5) for documentation + +[GLOBAL] +DEFAULT_METHOD = ldap +CRACKLIB_DICTIONARY = /var/cache/cracklib/cracklib_dict + +[LDAP] +LDAP_URI = ldap://127.0.0.1 +BIND_DN = cn=Manager,dc=mydomain,dc=com +BIND_PASS = secret +USER_BASE = ou=People,dc=mydomain,dc=com +GROUP_BASE = ou=Groups,dc=mydomain,dc=com +USER_OBJECT_CLASS = account,posixAccount,shadowAccount,top +GROUP_OBJECT_CLASS = posixGroup,top +USER_FILTER = (objectClass=posixAccount) +GROUP_FILTER = (objectClass=posixGroup) +USER_CN_STRING = uid +GROUP_CN_STRING = cn +SKEL_DIR = /etc/skel +DEFAULT_SHELL = /bin/bash +HOME_DIRECTORY = /home +MAX_UIDNUMBER = 10000 +MIN_UIDNUMBER = 1000 +MAX_GIDNUMBER = 10000 +MIN_GIDNUMBER = 1000 +ID_MAX_PASSES = 1000 +# Whether each user should have its own group created or not +USERGROUPS = yes +# If you change usergroup set this to the default group a user should have +#USERS_GID = 100 +RANDOM = "false" +PASSWORD_FILE = "/etc/passfile" +SHADOW_FILE = "/etc/shadowfile" +HASH = "md5" +SHADOWLASTCHANGE = 11192 +SHADOWMAX = 99999 +SHADOWWARING = 7 +SHADOWEXPIRE = -1 +SHADOWFLAG = 134538308 +SHADOWMIN = -1 +SHADOWINACTIVE = -1 + --- cpu-1.4.3.orig/debian/rules +++ cpu-1.4.3/debian/rules @@ -0,0 +1,114 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g -DLDAP_DEPRECATED + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --datadir=\$${prefix}/share/doc/cpu \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc/cpu \ + --libdir=/usr/lib/cpu \ + --with-libcrack --with-ldap + + +build: patch-stamp build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: really-clean unpatch + +really-clean: + dh_testdir + dh_testroot + rm -f build-stamp + rm -f config.log + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/cpu. + $(MAKE) install DESTDIR=$(CURDIR)/debian/cpu + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples debian/cpu.conf +# dh_install +# dh_installmenu + dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb + dh_shlibdeps -Xusr/bin/cpu + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- cpu-1.4.3.orig/debian/compat +++ cpu-1.4.3/debian/compat @@ -0,0 +1 @@ +7 --- cpu-1.4.3.orig/debian/docs +++ cpu-1.4.3/debian/docs @@ -0,0 +1,4 @@ +README +TODO +NEWS +debian/NEWS.Debian --- cpu-1.4.3.orig/debian/changelog +++ cpu-1.4.3/debian/changelog @@ -0,0 +1,246 @@ +cpu (1.4.3-11.1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining Ubuntu change: + - add 08_add-flag-for-O_CREAT.dpatch patch, fix FTBFS caused by + -D_FORTIFY_SOURCE=2 compiler flag enabled in Ubuntu. + + -- Devid Antonio Filoni Sun, 29 Nov 2009 18:40:06 +0100 + +cpu (1.4.3-11.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix out of date libtool scripts that made tha package FTBFS on kFreeBSD + Thanks to Petr Salinger for the patch + Closes: #493704 + * Fix watch file. Thanks to Raphaël Geissert for the patch. + Closes: #449950 + * Refer to explicit version of GPL-2 in debian.copyright + * No longer ignore errors in postinst + * Bump debhelper compatiblity to 7 + * Replace useless dhclean -k by dh_prep + * Fix pending l10n issues. Debconf translations: + - Swedish (Martin Bagge). Closes: #510801 + - Spanish (Francisco Javier Cuadrado). Closes: #537679 + - Russian (Yuri Kozlov). Closes: #546346 + - Finnish (Esko Arajärvi). Closes: #554481 + - Galician (Marce Villarino). Closes: #555455 + + -- Christian Perrier Wed, 11 Nov 2009 08:00:53 +0100 + +cpu (1.4.3-11ubuntu1) intrepid; urgency=low + + * Rebuild for cracklib2 transition (LP: 254788). + * Add add_flag_for_O_CREAT.dpatch patch, fix FTBFS. + + -- Devid Antonio Filoni Wed, 06 Aug 2008 21:43:29 +0200 + +cpu (1.4.3-11) unstable; urgency=low + + * Apply patch from Michael Bienia to correctly handle CFLAGS + (closes: #462844) + + -- Guido Trotter Wed, 13 Feb 2008 16:24:38 +0000 + +cpu (1.4.3-10) unstable; urgency=low + + * Compile with -DLDAP_DEPRECATED to use ldap_get_values() (closes: #462844) + * Acknowledge NMU + * Update FSF address in copyright file, and add copyright notice + * Update Standards Version + + -- Guido Trotter Fri, 08 Feb 2008 17:14:54 +0000 + +cpu (1.4.3-9.1) unstable; urgency=low + + * Non-maintainer upload during BSP. + * depends on non-essential package debconf in postrm (Closes: #416736) + + -- Javier Merino Fri, 18 May 2007 17:51:10 +0200 + +cpu (1.4.3-9) unstable; urgency=low + + * Add swedish and portugese translations (closes: #338737, #349589) + + -- Guido Trotter Mon, 13 Nov 2006 12:37:32 +0000 + +cpu (1.4.3-8) unstable; urgency=low + + * Add debian/watch file + * Add Wichert Akkerman's patch to allow bad passwords (no answer from + upstream in one year, sic) (closes: #246673) + * Add Alexander Zangerl's patch to allow USE_TLS config file option + (closes: #312601) + * Add about tls option in the man page + * More code rework coming... + + -- Guido Trotter Sat, 16 Jul 2005 06:57:18 +0000 + +cpu (1.4.3-7) unstable; urgency=low + + * Retry upload... It somehow got lost somewhere! :/ + + -- Guido Trotter Mon, 11 Jul 2005 13:16:16 +0300 + +cpu (1.4.3-6) unstable; urgency=low + + * Update japanese translation (closes: #307045) + * Update vietnamite translation (closes: #310144) + * Fix a bug building with gcc 4.0 (closes: #289859) + * Thanks to Andreas Jochens, Clytie Siddall, Kenshi Muto + * Update to the latest policy + + -- Guido Trotter Sun, 10 Jul 2005 18:55:43 +0000 + +cpu (1.4.3-5) unstable; urgency=high + + * Sneak in a couple of updated translations, no other changes. + * cs,po by Jan Outrata (closes: #275501) + * pt_BR.po by Andre Luis Lopes (closes: #271192) + + -- Guido Trotter Tue, 12 Oct 2004 22:22:02 -0700 + +cpu (1.4.3-4) unstable; urgency=low + + * Updated nl.po by Luk Claes (closes: #253453) + + -- Guido Trotter Wed, 9 Jun 2004 21:43:04 +0200 + +cpu (1.4.3-3) unstable; urgency=low + + * The "Fix before debconf ends" upload + * English template rearrangement by Christian Perrier + * New translation: + - de.po by Erik Schanze (closes: #251582) + * Updated translations: + - it.po by Valentina Commissari + - fr.po by Christian Perrier + - es.po by Gunnar Wolf + + -- Guido Trotter Wed, 2 Jun 2004 18:58:33 -0300 + +cpu (1.4.3-2) unstable; urgency=low + + * Upgrade ucf stuff to use the new debconf-based ucf + + -- Guido Trotter Tue, 24 Feb 2004 18:30:31 +0100 + +cpu (1.4.3-1) unstable; urgency=low + + * New upstream release + - new password handling (closes: #215437) + - better error recovery (closes: #215258) + - does not segfault when creating an account + giving the user's name (closes: #223326) + + -- Guido Trotter Sat, 17 Jan 2004 15:52:54 +0100 + +cpu (1.4.2-2) unstable; urgency=low + + Paul J Stevens: + * fixed bashism in cpu.config (closes: #219724). + + Guido Trotter: + * clean up debian/rules a bit. + * remove lintian override file. + + -- Guido Trotter Sat, 15 Nov 2003 08:24:42 +0100 + +cpu (1.4.2-1) unstable; urgency=medium + + Guido Trotter: + * New upstream release + - This is an upstream bugfix release; among other things it fixes some + scalability problems that the previous version had while operating on + big directories: urgency medium because of this. + - Has better error messages (helps: #215298) + * Now ship a default config file with USERGROUPS=yes in it (closes: #215298) + * Make postinst use umask 026 when creating the config file, and remove + the call to dpkg-statoverride (closes: #217630) + * Add the spanish translation (es.po) provided by José L. Redrejo + + Paul J Stevens: + * Refactored char escaping in postinst. + * Postinst parses spaces in BIND_DN (closes: #216077). + * Depend on ucf (closes: #217629) + + -- Guido Trotter Fri, 17 Oct 2003 22:08:32 +0200 + +cpu (1.4.1-4) unstable; urgency=low + + * Add back calls to patch and unpatch + targets in debian/rules (closes: #215570) + + -- Guido Trotter Mon, 13 Oct 2003 19:02:46 +0200 + +cpu (1.4.1-3) unstable; urgency=low + + Paul J Stevens: + * Redesign debconf stuff (closes: #213789, #215255) + * Write and add nl.po + + Guido Trotter: + * Add Paul J Stevens as Uploader + * Write and add it.po + * Add fr.po by Christian Perrier (closes: #214262) + * Update copyright file (closes: #215251) + + -- Guido Trotter Fri, 26 Sep 2003 12:12:38 +0200 + +cpu (1.4.1-2) unstable; urgency=low + + * Install NEWS.Debian + * I didn't relly move the libs, so remove the changelog entry that told it. + + -- Guido Trotter Fri, 26 Sep 2003 12:37:04 +0200 + +cpu (1.4.1-1) unstable; urgency=low + + * New upstream release + - now really uses USER_CN_STRING, instead of overridding it with "cn", + tell in NEWS.Debian about this issue and its possible consequences. + - now adds a new group along with the user + * Pass --datadir option to configure, to stop it dropping shings in + /usr/share + * Modified upstream build system not to try to install cpu.conf file: + it tried to install it without respecting the DESTDIR variable and, + moreover, we would have to remove it anyway. + * Add "etc/cpu" to debian/dirs + + -- Guido Trotter Fri, 26 Sep 2003 10:50:58 +0200 + +cpu (1.4.0-3) unstable; urgency=low + + * Ship a reasonable default value (consistent with the cracklib packages + and the FHS) for CRACKLIB_DICTIONARY in the config file (closes: #212733) + * Don't pass -s to seed (closes: #212728) + + -- Guido Trotter Fri, 26 Sep 2003 09:14:25 +0200 + +cpu (1.4.0-2) unstable; urgency=low + + * The "proliferation of the \" release. + * Escape also '\' character in postinst, before passing it to sed. + This, in theory closes: #212534. + * Improve short description a bit. + + -- Guido Trotter Wed, 24 Sep 2003 10:14:16 +0200 + +cpu (1.4.0-1) unstable; urgency=low + + * New upstream release + * Override lintian warnings about symlinks (cpu won't start without them) + * Don't apply 01_ldapv3please, as ldapv3 is enabled upstream + + -- Guido Trotter Tue, 16 Sep 2003 18:19:44 +0200 + +cpu (1.3.100-1) unstable; urgency=low + + * Initial Release (closes: #151829). + * Apply patch to bind using LDAPv3: this renders cpu compatible + with OpenLDAP 2.1, which doesn't allow bind_v2, by default. + * Generate configuration file with debconf. + * Clean up the shared library part: it's not needed. + * Let's release it, at last! + + -- Guido Trotter Thu, 4 Sep 2003 17:32:13 +0200 + --- cpu-1.4.3.orig/debian/copyright +++ cpu-1.4.3/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by unknown on +Fri, 29 Aug 2003 13:14:42 +0200. + +It was downloaded from http://cpu.sourceforge.net/ + +Upstream Author: Blake Matheny + +Copyright: 2003 Blake Matheny (and other contributing authors) + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + + +The Debian packaging is (C) 2003-2007, Guido Trotter and +is licensed under the GPL, see above. + --- cpu-1.4.3.orig/debian/README.Debian +++ cpu-1.4.3/debian/README.Debian @@ -0,0 +1,22 @@ +CPU for Debian +---------------------------------- + +Please pay attention: /etc/cpu/cpu.conf has been configured by you for the +first time using debconf. Anyway feel free to make changes to that file: +the package management will respect any changes you make. + +Also you can tweak the permission on that file: any user with the ability +to read it will be able to manage your LDAP directory. This way you can +create more administrators, perhaps. + + -- Guido Trotter , Tue, 29 Aug 2003 10:15:23 +0200 + +If you are intrested in the standard used to keep user and group information +into an LDAP directory please see RFC2307. The details of the Lightweight +Directory Access Protocol (LDAP) are insted stored in RFC2251. + +You can download the rfcs from http://www.rfc-editor.org/ or have them +installed in your system using the doc-rfc* packages from the non-free +section of the debian ftp site. + + -- Guido Trotter , Tue, 28 Aug 2003 09:12:25 +0200 --- cpu-1.4.3.orig/debian/templates +++ cpu-1.4.3/debian/templates @@ -0,0 +1,45 @@ +Template: cpu/do_debconf +Type: boolean +Default: true +_Description: Do you want to manage cpu's configuration through debconf? + Please confirm if you want to allow debconf to manage some parts of your + cpu.conf. Please note that any further manual changes to cpu.conf + will never be overwritten by debconf. + +Template: cpu/ldap/LDAP_URI +Type: string +Default: ldap://localhost +_Description: LDAP server: + Please insert the URI of the LDAP server you plan to use with CPU. Use + the standard form of "ldap[s]://host[:port]". The default port value is + 389. Use ldaps if you intend to use a TLS encrypted connection. + +Template: cpu/ldap/USER_BASE +Type: string +_Description: Base DN of your user subtree: + Please enter the DN of the part of your directory that contains the users + you wish to manage with CPU. + +Template: cpu/ldap/GROUP_BASE +Type: string +_Description: Base DN of your group subtree: + Please enter the DN of the part of your directory that contains the groups + you wish to manage with CPU. + +Template: cpu/ldap/BIND_DN +Type: string +_Description: LDAP user DN: + Please insert the DN of the user CPU will bind to the LDAP server with. + Usually this will be your LDAP admin DN, but can be any other DN, as long + as it is configured to have full control over at least the subtree under + the base you selected before. + . + Example: "cn=admin,dc=domain,dc=tld" + +Template: cpu/ldap/BIND_PASS +Type: password +_Description: LDAP password: + Please enter the password to use when binding to the LDAP directory. Note + that this password will be stored in cleartext in your /etc/cpu/cpu.conf + file, so don't let that file became readable to anyone you don't want to + give the same power of the user cpu will bind with. --- cpu-1.4.3.orig/debian/dirs +++ cpu-1.4.3/debian/dirs @@ -0,0 +1,2 @@ +usr +etc/cpu --- cpu-1.4.3.orig/debian/watch +++ cpu-1.4.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/cpu/cpu-(.*)\.tar\.gz --- cpu-1.4.3.orig/debian/postrm +++ cpu-1.4.3/debian/postrm @@ -0,0 +1,52 @@ +#! /bin/sh +# postrm script for cpu +# +# see: dh_installdeb(1) + +set -e +# Source debconf library. +[ -e /usr/share/debconf/confmodule ] && . /usr/share/debconf/confmodule + + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abot-upgrade|disappear) + ;; + + purge) + rm -f /etc/cpu/cpu.conf + [ -d /etc/cpu ] && rmdir /etc/cpu || true + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +# Automatically added by dh_installdebconf +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + db_purge + if [ -x /usr/bin/ucf ]; then + ucf --purge /etc/cpu/cpu.conf + fi +fi +# End automatically added section +#DEBHELPER# + +exit 0 --- cpu-1.4.3.orig/debian/postinst +++ cpu-1.4.3/debian/postinst @@ -0,0 +1,82 @@ +#! /bin/sh +# postinst script for cpu +# +# see: dh_installdeb(1) + +test $DEBIAN_SCRIPT_DEBUG && set -v -x + +set -e + +# Source debconf library. +CONFIG=/etc/cpu/cpu.conf +#CONFIG=/home/paul/cpu.conf + + +update_var() { + _field="$1" _value="$2" + _record=`printf "%-23s = %s" "$_field" "$_value"` + sed "s|^$_field.*|$_record|" $CONFIG > $CONFIG.tmp && \ + mv $CONFIG.tmp $CONFIG +} + +escape() { + # escape sed meta chars and pattern delimiter (|) + echo "$*" | sed 's|[\|\$\&\.\*\%\^\+\?]|\\&|g' +} + +case "$1" in + configure) + + . /usr/share/debconf/confmodule + db_get cpu/do_debconf || true; DO_DEBCONF=$RET + if [ "$DO_DEBCONF" = "true" ]; then + db_get cpu/ldap/LDAP_URI || true; LDAP_URI=`escape "$RET"` + db_get cpu/ldap/BIND_DN || true; BIND_DN=`escape "$RET"` + db_get cpu/ldap/BIND_PASS || true; BIND_PASS=`escape "$RET"` + db_get cpu/ldap/USER_BASE || true; USER_BASE=`escape "$RET"` + db_get cpu/ldap/GROUP_BASE || true; GROUP_BASE=`escape "$RET"` + fi + + # Set the umask to 026 so ucf will create the file with the right mode, + # but won't override eventual changes by the sysadm + umask 026 + # this due to debconf not releasing stdin (refer to #193694) + ucf --debconf-ok /usr/share/doc/cpu/examples/cpu.conf $CONFIG + + if [ "$DO_DEBCONF" = "true" ]; then + update_var LDAP_URI "$LDAP_URI" + update_var BIND_DN "$BIND_DN" + update_var BIND_PASS "$BIND_PASS" + update_var USER_BASE "$USER_BASE" + update_var GROUP_BASE "$GROUP_BASE" + + if [ -e /var/cache/cracklib/cracklib_dict.pwd ]; then + sed "s/^#CRACKLIB_DICTIONARY/CRACKLIB_DICTIONARY/" $CONFIG > \ + $CONFIG.tmp && mv $CONFIG.tmp $CONFIG + else + sed "s/^CRACKLIB_DICTIONARY/#CRACKLIB_DICTIONARY/" $CONFIG > \ + $CONFIG.tmp && mv $CONFIG.tmp $CONFIG + fi + fi + db_stop + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + + +exit 0 + + --- cpu-1.4.3.orig/debian/config +++ cpu-1.4.3/debian/config @@ -0,0 +1,56 @@ +#!/bin/sh -e + +export DEBCONF_DEBUG=developer +CONFIGFILE=/etc/cpu/cpu.conf +#DEBIANCONF=/etc/cpu/cpu-debian.conf +. /usr/share/debconf/confmodule + +export PACKAGE=cpu + +read_config() { + for line in `grep '^[^#]' $CONFIGFILE | sed 's/[[:space:]]//g'`; do + NEWSECTION=`echo $line|grep '^\['|sed 's/\(\[\)\(.*\)\(\]\)/\2/'` + if [ -n "$NEWSECTION" ]; then + SECTION=`echo $NEWSECTION|tr '[A-Z]' '[a-z]'` + else + key=`echo $line|cut -f1 -d'='` + val=`echo $line|cut -f2- -d'='` + eval "db_set $PACKAGE/$SECTION/$key '$val' || true" + fi + done +} + +init_config() { + if [ -e $CONFIGFILE ]; then + read_config + fi +} + +db_capb backup + +STATE=1 +LASTSTATE=7 +while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do + case "$STATE" in + 1) db_input medium $PACKAGE/do_debconf || true ;; + 2) + db_get $PACKAGE/do_debconf + [ "$RET" = "false" ] && break + init_config + ;; + 3) db_input medium $PACKAGE/ldap/LDAP_URI || true ;; + 4) db_input medium $PACKAGE/ldap/BIND_DN || true ;; + 5) db_input medium $PACKAGE/ldap/BIND_PASS || true ;; + 6) db_input medium $PACKAGE/ldap/USER_BASE || true ;; + 7) db_input medium $PACKAGE/ldap/GROUP_BASE || true ;; + + esac + if db_go; then + STATE=$(($STATE+1)) + else + STATE=$(($STATE-1)) + fi +done + +exit 0 + --- cpu-1.4.3.orig/debian/patches/07_kfreebsd-build.dpatch +++ cpu-1.4.3/debian/patches/07_kfreebsd-build.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_kfreebsd-build.dpatch by Petr Salinger +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./aclocal.m4~ ./aclocal.m4 +--- ./aclocal.m4~ 2008-08-04 12:28:13.000000000 +0000 ++++ ./aclocal.m4 2008-08-04 12:28:13.000000000 +0000 +@@ -2969,7 +2969,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|kfreebsd*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -4208,7 +4208,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|kfreebsd*) + case $host_cpu in + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + --- cpu-1.4.3.orig/debian/patches/04_lvalue.dpatch +++ cpu-1.4.3/debian/patches/04_lvalue.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_lvalue.dpatch by Guido Trotter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Suppress gcc4 error (invalid lvalue in assignment) + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./src/plugins/ldap/commandline.c /tmp/dpep-work.42rcRj/cpu-1.4.3/src/plugins/ldap/commandline.c +--- ./src/plugins/ldap/commandline.c 2005-07-10 18:34:10.000000000 +0000 ++++ /tmp/dpep-work.42rcRj/cpu-1.4.3/src/plugins/ldap/commandline.c 2005-07-10 18:34:59.000000000 +0000 +@@ -83,7 +83,7 @@ + if (passent == NULL) + return -1; + bzero (passent, sizeof (struct cpass)); +- (int) passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; ++ passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; + passent->sp_warn = passent->sp_inact = passent->sp_expire = -10; + passent->sp_flag = -10; + passent->pw_gid = -10; --- cpu-1.4.3.orig/debian/patches/06_manpage.dpatch +++ cpu-1.4.3/debian/patches/06_manpage.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_manpage.dpatch by Guido Trotter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./doc/man/cpu-ldap.8 /tmp/dpep-work.OSK2eq/cpu-1.4.3/doc/man/cpu-ldap.8 +--- ./doc/man/cpu-ldap.8 2003-12-31 03:22:20.000000000 +0000 ++++ /tmp/dpep-work.OSK2eq/cpu-1.4.3/doc/man/cpu-ldap.8 2005-07-16 07:04:26.000000000 +0000 +@@ -100,6 +100,8 @@ + can be omitted by specifying the password in the configuration file with the + option BIND_PASS. If a value is specified at the command line, the switch + should have no whitespace following it. ++.IP "-x, --tls" ++Try to starttls before talking with the ldap server. + + .IP "The following options can be used for populating LDAP attributes." + --- cpu-1.4.3.orig/debian/patches/00list +++ cpu-1.4.3/debian/patches/00list @@ -0,0 +1,6 @@ +02_dontmesswithetc +04_lvalue +05_allowbadpass +06_manpage +07_kfreebsd-build.dpatch +08_add-flag-for-O_CREAT --- cpu-1.4.3.orig/debian/patches/03_strlenzero.dpatch +++ cpu-1.4.3/debian/patches/03_strlenzero.dpatch @@ -0,0 +1,37 @@ +#!/bin/sh -e +## 03_strlenzero.dpatch by Guido Trotter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/ultrotter/tmp/cpu/cpu-1.4.2/src/plugins/ldap/user.c cpu-1.4.2/src/plugins/ldap/user.c +--- /home/ultrotter/tmp/cpu/cpu-1.4.2/src/plugins/ldap/user.c 2003-10-12 23:59:13.000000000 +0200 ++++ cpu-1.4.2/src/plugins/ldap/user.c 2003-12-25 10:45:48.000000000 +0100 +@@ -340,7 +340,7 @@ + } + else if (globalLdap->unlock == true) + { +- for (i = 0; i < (int) strlen (npass); i++) ++ for (i = 0; i < (npass == NULL)? 0 : (int) strlen (npass); i++) + { + tpass[i] = npass[i]; + if (npass[i] == '}' && npass[i + 1] == '!') --- cpu-1.4.3.orig/debian/patches/02_dontmesswithetc.dpatch +++ cpu-1.4.3/debian/patches/02_dontmesswithetc.dpatch @@ -0,0 +1,82 @@ +#!/bin/sh -e +## 02_dontmesswithetc.dpatch by Guido Trotter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch upstream build system to avoit it trying installing configuration +## DP: files at build time. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/ultrotter/tmp/t/cpu-1.4.1/doc/Makefile.in cpu-1.4.1/doc/Makefile.in +--- /home/ultrotter/tmp/t/cpu-1.4.1/doc/Makefile.in 2003-09-23 18:29:49.000000000 +0200 ++++ cpu-1.4.1/doc/Makefile.in 2003-10-06 18:33:12.000000000 +0200 +@@ -396,7 +396,7 @@ + + info-am: + +-install-data-am: install-data-local install-dataDATA ++install-data-am: install-dataDATA + + install-exec-am: + +@@ -422,7 +422,7 @@ + + ps-am: + +-uninstall-am: uninstall-dataDATA uninstall-info-am uninstall-local ++uninstall-am: uninstall-dataDATA uninstall-info-am + + uninstall-info: uninstall-info-recursive + +@@ -445,20 +445,21 @@ + uninstall-info-recursive uninstall-local uninstall-recursive + + +-install-data-local: +- @if test -f $(sysconfdir)/cpu.conf ; then \ +- echo "$@ will not overwrite existing $(sysconfdir)/cpu.conf"; \ +- else \ +- $(mkinstalldirs) $(sysconfdir); \ +- echo "$(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf"; \ +- $(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf; \ +- fi ++#install-data-local: ++# @if test -f $(sysconfdir)/cpu.conf ; then \ ++# echo "$@ will not overwrite existing $(sysconfdir)/cpu.conf"; \ ++# else \ ++# $(mkinstalldirs) $(sysconfdir); \ ++# echo "$(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf"; \ ++# $(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf; \ ++# fi ++# ++#uninstall-local: ++# @if test -f $(sysconfdir)/cpu.conf ; then \ ++# echo "rm -f $(sysconfdir)/cpu.conf"; \ ++# $(RM) -f $(sysconfdir)/cpu.conf; \ ++# fi + +-uninstall-local: +- @if test -f $(sysconfdir)/cpu.conf ; then \ +- echo "rm -f $(sysconfdir)/cpu.conf"; \ +- $(RM) -f $(sysconfdir)/cpu.conf; \ +- fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: --- cpu-1.4.3.orig/debian/patches/08_add-flag-for-O_CREAT.dpatch +++ cpu-1.4.3/debian/patches/08_add-flag-for-O_CREAT.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_add-flag-for-O_CREAT.dpatch by Devid Antonio Filoni +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS in Intrepid caused by -D_FORTIFY_SOURCE=2 flag. + +@DPATCH@ +diff -urNad cpu-1.4.3~/src/util/fileaction.c cpu-1.4.3/src/util/fileaction.c +--- cpu-1.4.3~/src/util/fileaction.c 2003-02-18 00:25:37.000000000 +0100 ++++ cpu-1.4.3/src/util/fileaction.c 2008-08-06 21:49:42.000000000 +0200 +@@ -197,7 +197,7 @@ + } + close (fd1); + +- if ((fd2 = open (homefile, O_CREAT | O_EXCL | O_WRONLY)) == -1) ++ if ((fd2 = open (homefile, O_CREAT | O_EXCL | O_WRONLY, S_IRUSR|S_IWUSR)) == -1) + { + perror ("open"); + free (data); --- cpu-1.4.3.orig/debian/patches/01_ldapv3please.dpatch +++ cpu-1.4.3/debian/patches/01_ldapv3please.dpatch @@ -0,0 +1,42 @@ +#!/bin/sh -e +## 01_ldapv3please.dpatch by Guido Trotter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Connect using LDAPv3 (ensures compatibility with OpenLDAP 2.1) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/ultrotter/docs/projects/deb/cpu/cpu-1.3.100/src/plugins/ldap/ld.c cpu-1.3.100/src/plugins/ldap/ld.c +--- /home/ultrotter/docs/projects/deb/cpu/cpu-1.3.100/src/plugins/ldap/ld.c 2003-04-30 01:17:42.000000000 +0200 ++++ cpu-1.3.100/src/plugins/ldap/ld.c 2003-09-02 08:57:13.000000000 +0200 +@@ -81,7 +81,13 @@ + ldap_perror(ld, "ldap: ldapOperation: ldap_start_tls" ); + return -1; + } ++ } else { ++ /* Even If we are not using a TLS connection try to set protocol ++ * version to 3 but don't bother too much if we fail. ++ */ ++ ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + } ++ + if ( ldap_bind_s(ld, globalLdap->bind_dn, globalLdap->bind_password, + LDAP_AUTH_SIMPLE) != LDAP_SUCCESS ) + { --- cpu-1.4.3.orig/debian/patches/05_allowbadpass.dpatch +++ cpu-1.4.3/debian/patches/05_allowbadpass.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_allowbadpass.dpatch by Guido Trotter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Allow specyfing bad passwords + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./src/include/main/cpu.h /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/include/main/cpu.h +--- ./src/include/main/cpu.h 2003-12-31 03:24:20.000000000 +0000 ++++ /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/include/main/cpu.h 2005-07-15 10:52:51.000000000 +0000 +@@ -130,7 +130,8 @@ + {"tls", 2, 0, 'x'}, \ + {"exec", 2, 0, 'X'}, \ + {"yes", 2, 0, 'y'}, \ +- {"uri", 2, 0, 'Z'} ++ {"uri", 2, 0, 'Z'}, \ ++ {"allow-badpass", 2, 0, 'q'} + + #ifdef __cplusplus + } +diff -urNad --exclude=CVS --exclude=.svn ./src/include/util/parseconfig.h /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/include/util/parseconfig.h +--- ./src/include/util/parseconfig.h 2003-02-10 20:09:15.000000000 +0000 ++++ /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/include/util/parseconfig.h 2005-07-15 10:52:51.000000000 +0000 +@@ -40,5 +40,6 @@ + int cfg_get_signed_int(char *sec, char *ent); + float cfg_get_float(char *sec, char *ent); + long cfg_get_long(char *sec, char *ent); ++void cfg_set_option(const char* sec, const char* name, const char* val); + + #endif +diff -urNad --exclude=CVS --exclude=.svn ./src/main/cpu.c /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/main/cpu.c +--- ./src/main/cpu.c 2003-10-22 21:17:15.000000000 +0000 ++++ /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/main/cpu.c 2005-07-15 10:52:51.000000000 +0000 +@@ -34,6 +34,7 @@ + #endif + + char * method = NULL; ++static bool badpass = false; + + int + main(int argc, char *argv[]) +@@ -76,6 +77,10 @@ + fprintf(stderr, "There was an error parsing the configuration file. Exiting.\n"); + exit(EXIT_FAILURE); + } ++ ++ if (badpass) ++ cfg_set_option("GLOBAL", "ALLOW_BADPASS", "1"); ++ + optind = 0; + if ( method == NULL ) + { +@@ -150,6 +155,9 @@ + case 'V': + version_flag = 1; + break; ++ case 'q': ++ badpass = true; ++ break; + default: + break; + } +diff -urNad --exclude=CVS --exclude=.svn ./src/util/hash.c /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/util/hash.c +--- ./src/util/hash.c 2003-10-22 21:29:19.000000000 +0000 ++++ /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/util/hash.c 2005-07-15 10:52:51.000000000 +0000 +@@ -154,7 +154,11 @@ + if ( password[0] != '*' ) + while ( (msg = (char*)FascistCheck(newpass, dict)) != NULL ) + { +- fprintf(stdout, "%s is a bad password: %s\n", newpass, msg); ++ fprintf(stdout, "Bad password: %s\n", msg); ++ if (cfg_get_int("GLOBAL", "ALLOW_BADPASS")) { ++ fprintf(stdout, "But allowing anyway since allow-badpass is enabled\n"); ++ break; ++ } + newpass = NULL; + msg = NULL; + while ( (newpass = CPU_getpass("Enter a new password: ")) == NULL ) +diff -urNad --exclude=CVS --exclude=.svn ./src/util/parseconfig.c /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/util/parseconfig.c +--- ./src/util/parseconfig.c 2003-02-10 20:09:16.000000000 +0000 ++++ /tmp/dpep-work.ipaiOK/cpu-1.4.3/src/util/parseconfig.c 2005-07-15 10:52:51.000000000 +0000 +@@ -297,4 +297,13 @@ + return atof(val); + } + ++void ++cfg_set_option(const char* sec, const char* name, const char* val) ++{ ++ struct CFG_ENTRIES* e; ++ ++ e=cfg_find_section(c, sec); ++ cfg_set_entry(e, name, val); ++ ++} + /* end of parseconfig.c */ --- cpu-1.4.3.orig/debian/po/fi.po +++ cpu-1.4.3/debian/po/fi.po @@ -0,0 +1,129 @@ +# Copyright (C) 2009 +# This file is distributed under the same license as the cpu package. +# +# Esko Arajärvi , 2009. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2009-11-04 22:16+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Hallinnoidaanko paketin cpu asetuksia debconfin avulla?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Valitse haluatko muokata debconfin avulla joitain tiedoston cpu.conf osia. " +"Debconf ei tule koskaan kirjoittamaan minkään tämän jälkeen käsin tehtyjen " +"muutosten päälle." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "LDAP-palvelin:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Anna CPU:n kanssa käytettävän LDAP-palvelimen URI. Käytä standardimuotoa " +"”ldap[s]://host[:port]”. Oletusportti on 389. Käytä skeemaa ldaps, jos " +"yhteys aiotaan salata TLS:n avulla." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Käyttäjäalipuun erittelevä nimi (Base DN):" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Anna sen hakemiston DN-osa, jossa olevia käyttäjiä CPU:lla aiotaan " +"hallinnoida." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Ryhmäalipuun erittelevä nimi (Base DN):" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Anna sen hakemiston DN-osa, jossa olevia ryhmiä CPU:lla aiotaan hallinnoida." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "LDAP-käyttäjätunnuksen erittelevä nimi:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Anna sen käyttäjän erittelevä nimi, jonka avulla CPU ottaa yhteyttä LDAP-" +"palvelimeen. Yleensä tämä on LDAP:in admin DN, mutta se voi olla mikä " +"tahansa muukin DN, kunhan sillä on täydet oikeudet hallinnoida aiemmin " +"annettuja alipuita." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Esimerkki: \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "LDAP-tunnuksen salasana:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Anna salasana, jota käytetään otettaessa yhteyttä LDAP-hakemistoon. Tämä " +"salasana kirjoitetaan selväkielisenä tiedostoon /etc/cpu/cpu.conf, joten " +"varmista että tiedoston käyttöoikeudet ovat kunnossa." --- cpu-1.4.3.orig/debian/po/gl.po +++ cpu-1.4.3/debian/po/gl.po @@ -0,0 +1,132 @@ +# Copyright (C) 2009 Debian +# This file is distributed under the same license as the cpu package. +# +# Marce Villarino , 2009. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2009-11-09 21:25+0100\n" +"Last-Translator: Marce Villarino \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Desexa xestionar a configuración de CPU mediante debconf?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Confirme que desexa permitirlle a debconf xestionar algunhas partes do seu " +"cpu.conf. Lembre que debconf non sobrescribirá as modificacións que faga " +"manualmente en cpu.conf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Servidor LDAP:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Indique a URI do servidor LDAP que teña previsto empregar con CPU. Empregue " +"a forma estándar «ldap[s]://servidor[:porto]». O valor predeterminado do " +"porto é 389. Empregue ldaps se pretende empregar unha conexión cifrada " +"mediante TLS." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "DN base da subárbore do usuario:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Indique o nome de dominio (DN) da parte do seu directorio que contén os " +"usuarios que desexa xestionar mediante CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "DN base da subárbore do grupo:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Indique o nome de dominio (DN) da parte do seu directorio que contén os " +"grupos que desexa xestionar mediante CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "DN do usuario de LDAP:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Indique o DN do usuario co que CPU ha conectarse ao servidor LDAP. Polo " +"xeral será o DN do administrador de LDAP, pero pode ser outro DN que estea " +"configurado para ter control completo sobre polo menos a subárbore baixo a " +"base que escollese antes." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Exemplo: «cn=admin,dc=dominio,dc=tld»" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Contrasinal de LDAP:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Indique o contrasinal que se ha empregar para conectar co directorio LDAP. " +"Lembre que se garda como texto simple no ficheiro /etc/cpu/cpu.conf, polo " +"que non debe permitir que ese ficheiro sexa lexíbel por ninguén a quen non " +"lle queira dar o mesmo poder co que se conectará o usuario cpu." --- cpu-1.4.3.orig/debian/po/ru.po +++ cpu-1.4.3/debian/po/ru.po @@ -0,0 +1,133 @@ +# translation of cpu_1.4.3-11_ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2009. +msgid "" +msgstr "" +"Project-Id-Version: cpu 1.4.3-11\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2009-09-01 20:37+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \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" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Управлять настройкой cpu через debconf?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Ответьте утвердительно, если хотите позволить debconf управлять некоторыми " +"частями cpu.conf. Заметим, что все дальнейшие ручные изменения в cpu.conf " +"никогда не будут перезаписаны debconf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Сервер LDAP:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Укажите URI сервера LDAP, который вы планируете использовать с CPU. " +"Стандартный формат: \"ldap[s]://хост[:порт]\". Значение порта по умолчанию " +"равно 389. Укажите ldaps, если намереваетесь использовать шифрованное TLS-" +"соединение." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Базовый DN поддерева пользователей:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Введите DN части вашего каталога, содержащего пользователей, которыми вы " +"хотите управлять с помощью CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Базовый DN поддерева групп:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Введите DN части вашего каталога, содержащего группы, которыми вы хотите " +"управлять с помощью CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "DN пользователя в LDAP:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Введите DN пользователя, которым CPU будет подключаться к серверу LDAP. " +"Обычно, это DN admin, но может быть и другой DN, которому предоставлены все " +"права, как минимум, над частью дерева, указанной ранее." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Пример: \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Пароль к LDAP:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Введите пароль, который будет использоваться для подключения к каталогу " +"LDAP. Заметим, что пароль будет сохранён в нешифрованном виде в файле /etc/" +"cpu/cpu.conf, поэтому не допускайте его чтение посторонними, если не хотите " +"предоставить им возможности пользователя cpu в каталоге LDAP." --- cpu-1.4.3.orig/debian/po/de.po +++ cpu-1.4.3/debian/po/de.po @@ -0,0 +1,143 @@ +# translation of cpu_1.4.3-2_templates.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Erik Schanze , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: cpu_1.4.3-2_templates\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2004-05-31 22:45+0200\n" +"Last-Translator: Erik Schanze \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "" +"Sollen die Einstellungen für dieses Paket von debconf verwaltet werden?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Bitte stimmen Sie zu, wenn debconf einige Teile der Datei cpu.conf verwalten " +"soll. Beachten Sie, dass Ihre eigenen Änderungen, durch Editieren der Datei " +"cpu.conf, bei einem späteren Aufruf von debconf mittels dpkg-reconfigure " +"nicht überschrieben werden." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "LDAP-Server:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Bitte geben Sie die URI des LDAP-Servers in der Form ldap[s]://host[:port] " +"(Port 389 ist Standard) ein, den Sie für CPU benutzen wollen. Nehmen Sie " +"ldaps, wenn Sie eine Verbindung mit TLS-Verschlüsselung nutzen." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Basis-DN Ihres Benutzer-Unterverzeichnisses:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Bitte geben Sie den DN des Teils Ihres Verzeichnisses an, das die Benutzer " +"enthält, die mit CPU verwaltet werden sollen." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Basis-DN Ihres Gruppen-Unterverzeichnisses:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Bitte geben Sie den DN des Teils Ihres Verzeichnisses an, das die Gruppen " +"enthält, die mit CPU verwaltet werden sollen." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "LDAP-Benutzer DN:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Bitte geben Sie den DN des Benutzers ein, als der sich CPU mit dem LDAP-" +"Server verbinden soll. Normalerweise ist das der DN des LDAP-Administrators, " +"aber es kann jeder andere DN sein, wenn er zumindest so eingerichtet ist, " +"dass er die volle Kontrolle über die Unterverzeichnisse hat, die Sie vorhin " +"als Basis eingeben haben." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Beispiel: \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "LDAP-Passwort:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Bitte geben Sie das Passwort für die Verbindung zum LDAP-Server ein. " +"Beachten Sie, dass dieses Passwort im Klartext in der Datei /etc/cpu/cpu." +"conf gespeichert wird. Diese Datei sollte nicht von Benutzern zu lesen sein, " +"denen Sie nicht die gleichen Rechte einräumen wollen, wie dem Benutzer, der " +"sich mit dem LDAP-Server verbindet." --- cpu-1.4.3.orig/debian/po/cs.po +++ cpu-1.4.3/debian/po/cs.po @@ -0,0 +1,138 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cpu\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2004-10-08 16:34+0200\n" +"Last-Translator: Jan Outrata \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Chcete spravovat konfiguraci cpu pomoc debconf?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Potvrte, zda chcete povolit debconfu spravovat nkter sti cpu.conf. " +"Poznamenejme, e debconf nikdy nepepe dn dal run proveden zmny v " +"cpu.conf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "LDAP server:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Zadejte URI adresu LDAP serveru, kter chcete pouvat s CPU. Pouijte " +"standardn formu \"ldap[s]://host[:port]\". Vchoz hodnota portu je 389. " +"Pouijte ldaps, pokud hodlte pouvat ifrovan TLS spojen." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Zkladn DN podstromu uivatel:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Zadejte DN (Distinguished Name) sti adrese, kter obsahuje uivatele, " +"kter si pejete spravovat pomoc CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Zkladn DN podstromu skupin:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Zadejte DN (Distinguished Name) sti adrese, kter obsahuje skupiny, " +"kter si pejete spravovat pomoc CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "DN uivatele LDAP:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Zadejte DN uivatele, pod kterm se bude CPU pipojovat k LDAP serveru. " +"Obvykle to bv DN sprvce LDAP, ale me to bt jakkoliv jin DN, pokud je " +"nastaveno na plnou kontrolu nad pinejmenm tmi podstromy pod zkladnmy " +"DN, kter jste dve zadali." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Pklad: \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Heslo pro LDAP:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Zadejte heslo pro pipojen k LDAP adresi. Uvdomte si, e toto heslo bude " +"uloeno v iteln podob v souboru /etc/cpu/cpu.conf, nenechte tedy tento " +"soubor iteln pro kohokoliv, komu nechcete dt moc stejnou jako uivateli, " +"pod kterm se bude cpu pipojovat." --- cpu-1.4.3.orig/debian/po/vi.po +++ cpu-1.4.3/debian/po/vi.po @@ -0,0 +1,134 @@ +# Vietnamese Translation for cpu. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: cpu 1.4.3-5\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2005-05-22 11:34+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Bạn có muốn quản lý cấu hình của trình cpu thông qua debconf không?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Hãy xác nhận nếu bạn muốn cho phép trình debconf quản lý một số phần của cấu " +"hình trình cpu. Ghi chú rằng nếu bạn tự sửa đổi cpu.conf lần sau, trình " +"debconf sẽ không ghi đè lên nó." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Máy chủ LDAP:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Hãy chèn địa chỉ Mạng của máy chủ LDAP bạn định sử dụng với trình cpu. Bạn " +"nên sử dụng dạng thức chuẩn:\n" +"ldap[s]://máy[:cổng]\n" +"Giá trị cổng mặc định là 389. Hãy sử dụng «ldaps» nếu bạn định sử dụng sự kết " +"nối được mật mã hóa cách TLS." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Tên thư mục cơ bản của cây con người dùng:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Hãy nhập tên thư mục (DN) của phần thư mục bạn chứa các người dùng mà bạn " +"muốn quản lý dùng trình CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Tên thư mục cơ bản của cây con nhóm:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Hãy nhập tên thư mục (DN) của phần thư mục bạn chứa các nhóm mà bạn muốn " +"quản lý dùng trình CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "Tên thư mục người dùng LDAP:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Hãy chèn vào đây tên thư mục (DN) của người dùng mà trình CPU sẽ sử dụng để " +"đóng kết đến máy chủ LDAP. Thường nó là tên thư mục quản lý LDAP của bạn, " +"nhưng mà nó có thể là bất cứ tên thư mục nào khác, với điều kiện là nó được " +"cấu hình để điều khiển hoàn thành ít nhất cây con dưới cơ bản mà bạn đã chọn " +"trước này." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Ví dụ: «cn=admin,dc=domain,dc=tld»" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Mật khẩu LDAP:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Hãy nhập mật khẩu để sử dụng khi đóng kết đến thư mục LDAP. Ghi chú rằng sẽ " +"cất giữ mật khẩu này có dạng chữ rõ, vào tập tin /etc/cpu/cpu.conf của bạn. " +"Như thế thì bạn nên ngăn cản người khác có quyền đọc tập tin ấy, trừ bạn " +"muốn cho phép họ có cùng quyền của người dùng mà trình cpu sẽ đóng kết với " +"họ." --- cpu-1.4.3.orig/debian/po/ja.po +++ cpu-1.4.3/debian/po/ja.po @@ -0,0 +1,138 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cpu\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2005-04-30 18:08+0900\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "cpu debconf ǴǤ?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"debconf cpu ΤĤβսΤǤС֤ϤפƤ" +"ʤcpu.conf ؤμưѹ debconf ˤäƾ񤭤뤳ȤϤʤ" +"ȤդƤ" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "LDAP :" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"CPU Ѥײ褷Ƥ LDAP Ф URI Ƥ\"ldap[s]://" +"[:ݡ]\" ɸȤäƤǥեȥݡͤ 389 Ǥ" +"TLS Ź沽³ȤΤǤСldaps ȤäƤ" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "ʤΥ桼֥ĥ꡼Υ١ DN:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"CPU Ǵ桼ޤढʤΥǥ쥯ȥʬ DN ϤƤ" +"" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "ʤΥ롼ץ֥ĥ꡼Υ١DN:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"CPU Ǵ롼פޤढʤΥǥ쥯ȥʬ DN ϤƤ" +"" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "LDAP 桼 DN:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"CPU LDAP Ф˥ХɤΤ˻Ȥ桼 DN Ƥ̾" +"ϡʤ LDAP admin DN ǤʤȤ⤢ʤ򤷤١" +"Υ֥ĥ꡼δ椬Ǥ褦ꤵƤСۤ DN ˤ" +"Ǥޤ" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr ": \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "LDAP ѥ:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"CPU LDAP Ф˥ХɤΤ˻ȤѥɤϤƤΥ" +"ɤϡ/etc/cpu/cpu.conf ˰Ź沽ƤʤƥȤdzǼ뤳Ȥ" +"դƤcpu ХɤΤƱϤ桼ͿƤޤʤ" +"Υեɤ߼ǽˤƤϤʤޤ" --- cpu-1.4.3.orig/debian/po/fr.po +++ cpu-1.4.3/debian/po/fr.po @@ -0,0 +1,142 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cpu\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2004-05-31 13:21-0300\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: french \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Faut-il grer la configuration de CPU avec debconf?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Veuilluez confirmer si vous souhaitez que debconf gre certaines parties de " +"votre fichier cpu.conf. Notez que les modifications ultrieures que vous " +"effectuerez directement dans le fichier ne seront jamais crases par " +"debconf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Serveur LDAP :" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Veuillez indiquer l'URI du serveur LDAP que vous souhaitez utiliser avec " +"CPU. Vous devez utiliser la forme normalise ldap[s]@hte[:port] . Le " +"port par dfaut est 389. Utilisez ldaps si vous prvoyez d'utiliser une " +"connexion chiffre par TLS." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "" +"Nom distinctif de la base (base dn) du sous-arbre des utilisateurs:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Veuillez indiquer le nom distinctif (DN) qui contient les utilisateurs que " +"vous souhaitez grer avec CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Nom distinctif de la base (base dn) du sous-arbre des groupes:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Veuillez indiquer le nom distinctif (DN) de la partie de votre rpertoire " +"qui contient les groupes que vous souhaitez grer avec CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "Nom distinctif (DN) de l'utilisateur LDAP :" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Veuillez indiquer le nom distinctif (DN) de l'utilisateur dont se servira " +"CPU pour se connecter au serveur LDAP. Ce sera en gnral celui de votre " +"administrateur LDAP. Cela n'est toutefois pas indispensable, condition que " +"cette identit ait le contrle total sur l'ensemble du sous-rpertoire " +"indiqu prcdemment." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Exemple : cn=admin,dc=domain,dc=tld." + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Mot de passe LDAP :" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Veuillez indiquer le mot de passe qui sera utilis pour la connexion au " +"serveur LDAP. Veuillez noter que ce mot de passe sera conserv en clair dans " +"le fichier /etc/cpu/cpu.conf. Ne laissez donc pas ce fichier accessible en " +"lecture tous les utilisateurs." --- cpu-1.4.3.orig/debian/po/POTFILES.in +++ cpu-1.4.3/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates --- cpu-1.4.3.orig/debian/po/pt_BR.po +++ cpu-1.4.3/debian/po/pt_BR.po @@ -0,0 +1,142 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cpu\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2004-09-11 16:36-0300\n" +"Last-Translator: Andr Lus Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Voc deseja gerenciar a configurao do cpu atravs do debconf ?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Por favor, confirme se voc deseja permitir ao debconf gerenciar algumas " +"sees de seu arquivo cpu.conf. Por favor, note que quaisquer futuras " +"mudanas manuais feitas no arquivo cpu.conf nunca sero sobreescritas pelo " +"debconf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Servidor LDAP :" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Por favor, insira a URI do servidor LDAP que voc planeja utilizar com o " +"CPU. Utilize o formato padro de \"ldap[s]://host[:porta]\". A valor padro " +"de porta 398. Utilize ldaps caso voc planeje utilizar uma conexo TLS " +"encriptada." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Base DN da subrvore de seu usurio :" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Por favor, informe o DN da parte de seu diretrio que contm os usurios que " +"voc deseja gerenciar com o CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Base DN da subrvore de seu grupo :" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Por favor, informe o DN da parte de seu diretrio que contm os grupos que " +"voc deseja gerenciar com o CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "DN do usurio LDAP :" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Por favor, insira o DN do usurio que o CPU utilizar para se conectar ao " +"servidor LDAP. Normalmente, este ser o seu DN administrativo do LDAP, mas " +"pode ser qualquer outro DN, contanto que o mesmo esteja configurado para ter " +"controle total sobre pelo menos a subrvore sob a base que voc selecionou " +"previamente." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Exemplo : \"cn=admin,dc=dominio,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Senha LDAP :" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Por favor, informe a senha a ser usada para conexo ao diretrio LDAP. Note " +"que essa senha ser armazenada em texto puro em seu arquivo /etc/cpu/cpu." +"conf, portanto, no deixe esse arquivo legvel para ningum para quem voc " +"no queira dar o mesmo poder do usurio com o qual o cpu ir se conectar ao " +"LDAP." --- cpu-1.4.3.orig/debian/po/templates.pot +++ cpu-1.4.3/debian/po/templates.pot @@ -0,0 +1,113 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" --- cpu-1.4.3.orig/debian/po/es.po +++ cpu-1.4.3/debian/po/es.po @@ -0,0 +1,167 @@ +# cpu po-debconf translation to Spanish +# Copyright (C) 2003, 2009 Software in the Public Interest +# This file is distributed under the same license as the cpu package. +# +# Changes: +# - Initial translation +# Jose L. Redrejo , 2003 +# +# - Updates +# Francisco Javier Cuadrado , 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cpu 1.4.3-11\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2009-07-10 11:08+0100\n" +"Last-Translator: Francisco Javier Cuadrado \n" +"Language-Team: Debian l10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "¿Desea gestionar la configuración de cpu mediante debconf?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Confirme si desea que debconf gestione algunas partes del archivo «cpu.conf». " +"Tenga en cuenta que cualquier cambio que haga manualmente al archivo «cpu." +"conf» no se sobrescribirá más tarde por debconf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Servidor de LDAP:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Introduzca la URI del servidor de LDAP que planea usar con CPU en la forma " +"«ldap[s]://servidor[:puerto]». El puerto predeterminado es 389. Especifique " +"ldaps si va a usar una conexión cifrada con TLS." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "DN base del subárbol de usuarios:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Introduzca el DN de la parte del directorio que contiene los usuarios que " +"desea administrar con CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "DN base del subárbol de grupos:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Introduzca el DN de la parte del directorio que contiene los grupos que " +"desea administrar con CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "DN del usuario de LDAP:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Introduzca el DN del usuario que CPU usará para conectar al servidor de " +"LDAP. Normalmente, será su DN del administrador de LDAP, pero puede ser " +"cualquier otro DN, siempre y cuando esté configurado para tener control " +"total al menos sobre el subárbol dentro de la base que seleccionó antes." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Ejemplo: «cn=admin,dc=dominio,dc=tld»" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Contraseña de LDAP:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Introduzca la contraseña que utilizará para conectar al directorio LDAP. " +"Tenga en cuenta que esta contraseña se almacenará en texto plano en el " +"archivo «/etc/cpu/cpu.conf», por lo que no deje que este archivo tenga " +"permisos de lectura para nadie a quien no quiera darle el mismo poder que " +"tendrá el usuario de cpu." + +#~ msgid "User to bind your LDAP directory with:" +#~ msgstr "¿Con qué usuario desea conectar a su directorio LDAP?" + +#~ msgid "What LDAP server do you plan using CPU with?" +#~ msgstr "¿Con qué servidor LDAP planea usar CPU?" + +#~ msgid "What is the password of the user CPU will bind with?" +#~ msgstr "¿Cual es la contraseña del usuario con el que se conectará CPU?" + +#~ msgid "What is your LDAP administrator password?" +#~ msgstr "¿Cuál es la contraseña LDAP de su administrador?" --- cpu-1.4.3.orig/debian/po/it.po +++ cpu-1.4.3/debian/po/it.po @@ -0,0 +1,128 @@ +# Translation of debconf for cpu. +# This file is distributed under the same license as the cpu package. +# Copyright 2004 by Valentina Commissari . +msgid "" +msgstr "" +"Project-Id-Version: cpu 1.4.1\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2004-06-02 17:48-0300\n" +"Last-Translator: Valentina Commissari \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Si vuole gestire la configurazione di cpu tramite debconf?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Confermare che si intende gestire alcune parti di cpu.conf tramite debconf. " +"Nessuna delle modifiche effettuate manualmente al file cpu.conf sarà " +"sovrascritta da debconf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Server LDAP:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Inserire l'URI del server LDAP che si intende amministrare con CPU. Usare il " +"formato standard di \"ldap[s]://host[:porta]\". Il valore predefinito della " +"porta è 389. Usare ldaps se si intende usare una connessione TLS criptata." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "DN di base del sottoramo degli utenti:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Inserire il DN della parte di directory LDAP che contiene gli utenti che si " +"intende amministrare con CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "DN di base del sottoramo dei gruppi:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Inserire il DN della parte di directory LDAP che contiene i gruppi che si " +"intende amministrare con CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "LDAP user DN:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Inserire il DN con il quale si intende connettersi al server LDAP. Questo " +"normalmente sarà il DN dell'amministratore LDAP, ma potrebbe essere un " +"qualsiasi altro utente, purchè sia configurato per avere pieno controllo nei " +"sottorami scelti precedentemente." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Esempio: \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Password LDAP:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Inserire la password da usare per connettersi alla directory LDAP. Questa " +"password sara` conservata in chiaro nel file /etc/cpu/cpu.conf, quindi non " +"permettere che tale file possa esser letto da nessuno a cui non si voglia " +"dare lo stesso potere dell'utente che cpu userà per collegarsi a LDAP." --- cpu-1.4.3.orig/debian/po/nl.po +++ cpu-1.4.3/debian/po/nl.po @@ -0,0 +1,138 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cpu 1.4.3-2\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2004-06-09 17:21+0100\n" +"Last-Translator: Luk Claes \n" +"Language-Team: Debian l10n Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Wilt u cpu's configuratie door debconf laten beheren?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Stem toe indien u debconf wilt toestaan delen van uw cpu.conf te laten " +"beheren. Merk op dat veranderingen die u later handmatig aanbrengt in cpu." +"conf, nooit door debconf zullen worden overschreven." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "LDAP-server:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Geef de URI van de LDAP-server die u met CPU wilt gebruiken. Gebruik het " +"standaardformaat \"ldap[s]://host[:poort]\". De standaard poortwaarde is " +"389. Gebruik ldaps als u van plan bent gebruik te maken van een TLS-" +"versleutelde verbinding." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Wat is de basis DN van uw gebruikers-boomstructuur?" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Geef de DN van het deel van uw map die de gebruikers bevat die met CPU " +"zullen worden beheerd." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Wat is de basis DN van uw groepen-boomstructuur?" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Geef de DN van het deel van uw map die de groepen bevat die met CPU zullen " +"worden beheerd." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "DN van de LDAP-gebruiker:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Geef de DN van de gebruiker waarmee CPU met de LDAP-server zal verbinden. " +"Meestal zal dit de DN van de LDAP-beheerder zijn, maar het kan elke andere " +"DN zijn, mits die volledige toegang heeft tot het deel van de boomstructuur " +"onder de eerder geselecteerde basis." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Voorbeeld: \"cn=beheerder,dc=domein,dc=be\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "LDAP-wachtwoord:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Geen het wachtwoord om te verbinden met de LDAP-map. Let er op dat dit " +"wachtwoord onversleuteld wordt opgeslagen in uw /etc/cpu/cpu.conf-bestand: " +"maak en houd dit bestand onleesbaar voor onbevoegden." --- cpu-1.4.3.orig/debian/po/sv.po +++ cpu-1.4.3/debian/po/sv.po @@ -0,0 +1,130 @@ +# Swedish debconf translation of cpu +# Copyright (C) 2009 Martin Bagge +# This file is distributed under the same license as the cpu package. +# Martin Bagge , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2009-01-04 22:39+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Swedish\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Vill du låta debconf göra inställningarna för cpu?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Ange om du vill hantera delar av cpu.conf med hjälp av debconf. Kom ihåg att " +"framtida eventuella ändringar i cpu.conf inte kommer att skrivas över av " +"debconf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "LDAP-server:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Ange URI till LDAP-servern du kommer att använda tillsammans med CPU. Använd " +"standardformatet \"ldap[s]://värd[:port]\". Standardporten är 389, använd " +"ldaps om du kommer att använda TLS-kryptering för anslutningen." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Bas-DN för ditt användarträd:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Ange DN för den del av katalogen som innehållet användarna som du vill " +"hantera med CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Bas-DN för ditt gruppträd:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Ange DN för den del av katalogen som innehåller de grupper du vill hantera " +"med CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "Användar-DN för LDAP:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Ange det DN som CPU-användaren kommer att använda för att ansluta till LDAP-" +"servern. Vanligen är detta din LDAP-admin-DN men det kan vara vilken DN som " +"helst om den har full kontroll på åtminstone de underträd som du angav " +"tidigare." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Exempel: \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "LDAP-lösenord:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Ange lösenordet som ska användas för att ansluta till LDAP-katalogen. Detta " +"lösenord kommer att sparas i klartext i filen /etc/cpu/cpu.conf så tillse " +"att den filen inte kan läsas av obehöriga." --- cpu-1.4.3.orig/debian/po/pt.po +++ cpu-1.4.3/debian/po/pt.po @@ -0,0 +1,127 @@ +# Portuguese translation of cpu's debconf messages. +# 2006, Carlos Lisboa +# +msgid "" +msgstr "" +"Project-Id-Version: cpu 1.4.3-8\n" +"Report-Msgid-Bugs-To: cpu@packages.debian.org\n" +"POT-Creation-Date: 2009-11-04 07:09+0100\n" +"PO-Revision-Date: 2006-01-21 22:39+0000\n" +"Last-Translator: Carlos Lisboa \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to manage cpu's configuration through debconf?" +msgstr "Deseja gerir a configuração do cpu através do debconf?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Please confirm if you want to allow debconf to manage some parts of your cpu." +"conf. Please note that any further manual changes to cpu.conf will never be " +"overwritten by debconf." +msgstr "" +"Por favor confirme se pretende que o debconf faça a gestão de algumas partes " +"do seu cpu.conf. Tome atenção que quaisquer alterações manuais ao cpu.conf " +"não serão sobre-escritas pelo debconf." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "LDAP server:" +msgstr "Servidor LDAP:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please insert the URI of the LDAP server you plan to use with CPU. Use the " +"standard form of \"ldap[s]://host[:port]\". The default port value is 389. " +"Use ldaps if you intend to use a TLS encrypted connection." +msgstr "" +"Por favor introduza o URI do servidor LDAP que pretende usar com o CPU. " +"Utilize a forma standard: \"ldap[s]://host[:port]\". O porto por omissão é " +"389. Utilize ldaps se pretende utilizar uma ligação encriptada TLS." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Base DN of your user subtree:" +msgstr "Base DN da sub-árvore do seu utilizador:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Please enter the DN of the part of your directory that contains the users " +"you wish to manage with CPU." +msgstr "" +"Por favor introduza o DN do directório que contém os utilizadores que " +"pretende que façam a gestão do CPU." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Base DN of your group subtree:" +msgstr "Base DN da sub-árvore do seu grupo:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"Please enter the DN of the part of your directory that contains the groups " +"you wish to manage with CPU." +msgstr "" +"Por favor introduza o DN do directório que contém os grupos que pretende que " +"façam a gestão do CPU." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "LDAP user DN:" +msgstr "DN do utilizador LDAP:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please insert the DN of the user CPU will bind to the LDAP server with. " +"Usually this will be your LDAP admin DN, but can be any other DN, as long as " +"it is configured to have full control over at least the subtree under the " +"base you selected before." +msgstr "" +"Por favor introduza o DN do utilizador CPU que irá ligar ao servidor LDAP." +"Normalmente será o DN do administrador LDAP, mas pode ser qualquer outro DN " +"desde que esteja configurado para ter controlo total sobre a sub-árvore da " +"base que seleccionou anteriormente." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Example: \"cn=admin,dc=domain,dc=tld\"" +msgstr "Exemplo: \"cn=admin,dc=domain,dc=tld\"" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "LDAP password:" +msgstr "Password LDAP:" + +#. Type: password +#. Description +#: ../templates:6001 +msgid "" +"Please enter the password to use when binding to the LDAP directory. Note " +"that this password will be stored in cleartext in your /etc/cpu/cpu.conf " +"file, so don't let that file became readable to anyone you don't want to " +"give the same power of the user cpu will bind with." +msgstr "" +"Por favor introduza a password a usar quando ligar ao directório LDAP. Note " +"que esta password será armazenada em texto no ficheiro /etc/cpu/cpu.conf, " +"por isso não permita que seja lido por alguém que não queira." --- cpu-1.4.3.orig/doc/cpu.conf +++ cpu-1.4.3/doc/cpu.conf @@ -33,8 +33,6 @@ PASSWORD_FILE = "/etc/passfile" SHADOW_FILE = "/etc/shadowfile" HASH = "md5" -#ADD_SCRIPT = "contrib/postaddscript.sh" -#DEL_SCRIPT = "foo" SHADOWLASTCHANGE = 11192 SHADOWMAX = 99999 SHADOWWARING = 7