diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChangeLog | 28 | ||||
| -rwxr-xr-x | scripts/autogen.sh | 20 | ||||
| -rwxr-xr-x | scripts/commit | 30 | ||||
| -rwxr-xr-x | scripts/config.guess | 186 | ||||
| -rwxr-xr-x | scripts/config.sub | 49 | ||||
| -rw-r--r-- | scripts/distfiles | 2 | ||||
| -rw-r--r-- | scripts/gnupg.spec.in | 84 | ||||
| -rw-r--r-- | scripts/gnupgbug | 185 | ||||
| -rwxr-xr-x | scripts/mk-w32-dist | 28 |
9 files changed, 441 insertions, 171 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index ce00b3698..1b00eae3b 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,28 +1,46 @@ -Wed Sep 15 16:22:17 CEST 1999 Werner Koch <[email protected]> +Fri May 12 14:01:20 CEST 2000 Werner Koch <[email protected]> + + * gnupg.spec.in: New version from Fabio with some updated descriptions. + +Mon May 1 15:38:04 CEST 2000 Werner Koch <[email protected]> + + * gnupg.spec.in: New version from Fabio. + +Fri Mar 17 16:26:05 CET 2000 Werner Koch <[email protected]> + + * config.gues, config.sub: Support for s390-ibm-linux-gnu. Thanks + to Holger Smolinski. + +Thu Mar 2 15:37:46 CET 2000 Werner Koch <[email protected]> + + * config.guess: Add support for QNX. By Sam Roberts. + * config.sub: Ditto. +Thu Sep 23 09:49:25 1999 Werner Koch ([email protected]) + + * commit: Remove leading and trailing empty lines when copying + Changes to Changelog + +Wed Sep 15 16:22:17 CEST 1999 Werner Koch <[email protected]> * gnupg.spec: Add Portuguese description Thu Sep 2 16:40:55 CEST 1999 Werner Koch <[email protected]> - * mkdiff: changed format of diff file name and made script more general. Wed Aug 4 10:34:18 CEST 1999 Werner Koch <[email protected]> - * config.guess: Updated from gnu/common and applied my emx patch again. * config.sub: Updated from gnu/common. Wed Jul 14 19:42:08 CEST 1999 Werner Koch <[email protected]> - * ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3 Mon Jul 12 14:55:34 CEST 1999 Werner Koch <[email protected]> - * autogen.sh: Run libtoolize Sat May 22 22:47:26 CEST 1999 Werner Koch <[email protected]> diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 23cb5bd0d..e1ed0f645 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -7,7 +7,6 @@ DIE=no autoconf_vers=2.13 automake_vers=1.4 aclocal_vers=1.4 -libtool_vers=1.3 if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \ @@ -65,31 +64,12 @@ if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"\."); \ fi -if (libtool --version) < /dev/null > /dev/null 2>&1 ; then - if (libtool --version | awk 'NR==1 { if( $4 >= '$libtool_vers') \ - exit 1; exit 0; }'); - then - echo "**Error**: "\`libtool\'" is too old." - echo ' (version ' $libtool_vers ' or newer is required)' - DIE="yes" - fi -else - echo - echo "**Error**: You must have "\`libtool\'" installed to compile $PGM." - echo ' (version ' $libtool_vers ' or newer is required)' - DIE="yes" -fi - - if test "$DIE" = "yes"; then exit 1 fi echo "Running gettextize... Ignore non-fatal messages." echo "no" | gettextize --force -echo "Running libtoolize... Ignore non-fatal messages." -echo "no" | libtoolize - echo "Running aclocal..." aclocal diff --git a/scripts/commit b/scripts/commit index 992f93c3d..6bfa0a615 100755 --- a/scripts/commit +++ b/scripts/commit @@ -11,15 +11,25 @@ addr="<`id -un`@`hostname -d`>" for i in `find . -name Changes -print`; do dir=`dirname $i` if [ -s $dir/Changes ]; then - lines=`wc -l <$dir/Changes` - echo "$date $name $addr" >$dir/ChangeLog.new - echo >>$dir/ChangeLog.new - cat $dir/Changes >>$dir/ChangeLog.new - [ -f $dir/ChangeLog ] && cat $dir/ChangeLog >>$dir/ChangeLog.new - echo -n > $dir/Changes - [ -f $dir/ChangeLog ] && rm $dir/ChangeLog - mv $dir/ChangeLog.new $dir/ChangeLog - echo "$lines new lines in $dir/ChangeLog" + awk ' + state == 0 && /^[ \t]*$/ { next } + state == 0 { state = 1 } + /^[ \t]*$/ { empty++; next } + { while ( empty > 0 ) { print ""; empty--; }; print } + ' < $dir/Changes > $dir/Changes.tmp + if [ -s $dir/Changes.tmp ]; then + lines=`wc -l <$dir/Changes.tmp` + echo "$date $name $addr" >$dir/ChangeLog.new + echo >>$dir/ChangeLog.new + cat $dir/Changes.tmp >>$dir/ChangeLog.new + echo >>$dir/ChangeLog.new + [ -f $dir/ChangeLog ] && cat $dir/ChangeLog >>$dir/ChangeLog.new + echo -n > $dir/Changes + [ -f $dir/ChangeLog ] && rm $dir/ChangeLog + mv $dir/ChangeLog.new $dir/ChangeLog + echo "$lines new lines in $dir/ChangeLog" + fi + rm $dir/Changes.tmp || true fi done @@ -49,5 +59,5 @@ for i in `find . -name cvs-add -print`; do fi done -cvs commit -m "See ChangeLog: $date $name" $* +cvs -z3 commit -m "See ChangeLog: $date $name" $* diff --git a/scripts/config.guess b/scripts/config.guess index 46b3ea319..50fd53e39 100755 --- a/scripts/config.guess +++ b/scripts/config.guess @@ -10,7 +10,7 @@ # # This program 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 +# 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 @@ -68,6 +68,9 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:QNX:*:*) + echo i386-pc-qnx + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -226,30 +229,30 @@ EOF exit 0 ;; # 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 + # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; sun3*:NetBSD:*:*) echo m68k-sun-netbsd${UNAME_RELEASE} exit 0 ;; @@ -272,8 +275,8 @@ EOF echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-apple-netbsd${UNAME_RELEASE} + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -287,7 +290,7 @@ EOF echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus int main (int argc, char *argv[]) { #else @@ -326,19 +329,19 @@ EOF echo m88k-motorola-sysv3 exit 0 ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ -o ${TARGET_BINARY_INTERFACE}x = x ] ; then echo m88k-dg-dgux${UNAME_RELEASE} else echo m88k-dg-dguxbcs${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) + else echo i586-dg-dgux${UNAME_RELEASE} + fi + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit 0 ;; M88*:*:R3*:*) @@ -356,13 +359,13 @@ EOF exit 0 ;; ????????: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 ' + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i?86:AIX:*:*) echo i386-ibm-aix exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #include <sys/systemcfg.h> main() @@ -402,9 +405,9 @@ EOF ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx exit 0 ;; @@ -419,39 +422,39 @@ EOF exit 0 ;; 9000/[34678]??:HP-UX:*:*) case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - sed 's/^ //' << EOF >$dummy.c - #include <stdlib.h> - #include <unistd.h> + sed 's/^ //' << EOF >$dummy.c + #include <stdlib.h> + #include <unistd.h> - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` rm -f $dummy.c $dummy @@ -460,7 +463,7 @@ EOF echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #include <unistd.h> int main () @@ -468,7 +471,7 @@ EOF long cpu = sysconf (_SC_CPU_VERSION); /* The order matters, because CPU_IS_HP_MC68K erroneously returns true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ + results, however. */ if (CPU_IS_PA_RISC (cpu)) { switch (cpu) @@ -519,25 +522,25 @@ EOF exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit 0 ;; CRAY*X-MP:*:*:*) echo xmp-cray-unicos - exit 0 ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} exit 0 ;; @@ -554,12 +557,12 @@ EOF exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos - exit 0 ;; + exit 0 ;; F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; F301:UNIX_System_V:*:*) echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` exit 0 ;; @@ -631,16 +634,17 @@ EOF ld_help_string=`cd /; ld --help 2>&1` ld_supported_emulations=`echo $ld_help_string \ | sed -ne '/supported emulations:/!d - s/[ ][ ]*/ /g + s/[ ][ ]*/ /g s/.*supported emulations: *// s/ .*// p'` - case "$ld_supported_emulations" in + case "$ld_supported_emulations" in i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + elf_s390) echo "${UNAME_MACHINE}-ibm-linux-gnu" ; exit 0 ;; elf32ppc) # Determine Lib Version cat >$dummy.c <<EOF @@ -668,13 +672,13 @@ EOF if test "$?" = 0 ; then LIBC="libc1" fi - fi + fi rm -f $dummy.c $dummy echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <<EOF >$dummy.s + sed 's/^ //' <<EOF >$dummy.s .globl main .ent main main: @@ -789,11 +793,11 @@ EOF echo i386-sequent-sysv4 exit 0 ;; i?86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) @@ -830,10 +834,10 @@ EOF fi exit 0 ;; pc:*:*:*) - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit 0 ;; + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit 0 ;; @@ -862,8 +866,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -897,9 +901,9 @@ EOF fi exit 0 ;; PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <[email protected]> - echo i586-unisys-sysv4 - exit 0 ;; + # says <[email protected]> + echo i586-unisys-sysv4 + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <[email protected]>. # How about differentiating between stratus architectures? -djm @@ -917,11 +921,11 @@ EOF exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit 0 ;; @@ -964,11 +968,11 @@ main () #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else "" #endif - ); exit (0); + ); exit (0); #endif #endif @@ -1046,7 +1050,7 @@ main () #endif #if defined(__EMX__) - printf ("i386-pc-os2_emx"); exit(0); + printf ("i386-pc-os2_emx"); exit(0); #endif exit (1); diff --git a/scripts/config.sub b/scripts/config.sub index 2436b4534..0159f7208 100755 --- a/scripts/config.sub +++ b/scripts/config.sub @@ -12,7 +12,7 @@ # # This program 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 +# 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 @@ -34,7 +34,7 @@ # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. # Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish +# it does not support. The user should be able to distinguish # a failure to support a valid configuration from a meaningless # configuration. @@ -166,7 +166,7 @@ case $basic_machine in | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ + | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] | s390 \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ @@ -185,6 +185,12 @@ case $basic_machine in i[34567]86) basic_machine=$basic_machine-pc ;; + s390 | s390-ibm) + basic_machine=s390-ibm + ;; + s390-redhat) + basic_machine=s390-redhat + ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -600,7 +606,7 @@ case $basic_machine in pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pentium | p5 | k5 | k6 | nexen) @@ -627,12 +633,12 @@ case $basic_machine in power) basic_machine=rs6000-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -756,8 +762,8 @@ case $basic_machine in os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -782,7 +788,7 @@ case $basic_machine in basic_machine=xmp-cray os=-unicos ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; z8k-*-coff) @@ -830,7 +836,7 @@ case $basic_machine in sparc | sparcv9) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -872,8 +878,8 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -881,6 +887,9 @@ case $os in -solaris) os=-solaris2 ;; + -qnx) + os=-qnx + ;; -svr4*) os=-sysv4 ;; @@ -948,7 +957,7 @@ case $os in os=-sysv ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; # Preserve the version number of sinix5. -sinix5.*) @@ -984,8 +993,8 @@ case $os in -xenix) os=-xenix ;; - -*mint | -*MiNT) - os=-mint + -*mint | -*MiNT) + os=-mint ;; -none) ;; @@ -1018,7 +1027,7 @@ case $basic_machine in arm*-semi) os=-aout ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1108,19 +1117,19 @@ case $basic_machine in *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) diff --git a/scripts/distfiles b/scripts/distfiles index 804b73f88..13127323a 100644 --- a/scripts/distfiles +++ b/scripts/distfiles @@ -7,6 +7,4 @@ missing gnupg.spec.in autogen.sh ChangeLog -ltconfig -ltmain.sh diff --git a/scripts/gnupg.spec.in b/scripts/gnupg.spec.in index e116ea3b4..5ee69276c 100644 --- a/scripts/gnupg.spec.in +++ b/scripts/gnupg.spec.in @@ -4,21 +4,42 @@ # %define version @pkg_version@ %define name gnupg -Summary: GPL public key crypto +Summary: GNU Utility for data encryption and digital signatures +Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati. +Summary(cs): GNU n�stroj pro �ifrovanou komunikaci a bezpe�n� ukl�d�n� dat +Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des donn�es +Vendor: GNU Privacy Guard Project Name: %{name} Version: %{version} Release: 1 Copyright: GPL Group: Applications/Cryptography +Group(cs): Aplikace/�ifrov�n� +Group(fr): Applications/Cryptographie Source: ftp://ftp.gnupg.org/pub/gcrypt/%{name}-%{version}.tar.gz URL: http://www.gnupg.org Provides: gpg openpgp BuildRoot: /tmp/rpmbuild_%{name} %changelog +* Mon May 01 2000 Fabio Coatti <[email protected]> +- Some corrections in French description, thanks to Ga�l Qu�ri +<[email protected]>; Some corrections to Italian descriptions. + +* Tue Apr 25 2000 Fabio Coatti <[email protected]> +- Removed the no longer needed patch for man page by Keith Owens + +* Wed Mar 1 2000 Petr Kri�tof <[email protected]> +- Czech descriptions added; some fixes and updates. + +* Sat Jan 15 2000 Keith Owens <[email protected]> +- Add missing man page as separate patch instead of updating the tar file. + +* Mon Dec 27 1999 Fabio Coatti <[email protected]> +- Upgraded for 1.0.1 (added missing gpg.1 man page) + * Sat May 29 1999 Fabio Coatti <[email protected]> -- Some corrections in French description, thanks to -Ga�l Qu�ri <[email protected]> +- Some corrections in French description, thanks to Ga�l Qu�ri <[email protected]> * Mon May 17 1999 Fabio Coatti <[email protected]> - Added French description, provided by @@ -28,8 +49,7 @@ Christophe Labouisse <[email protected]> - Upgraded for 0.9.6 (removed gpgm) * Tue Jan 12 1999 Fabio Coatti <[email protected]> -- LINGUAS variable is now unset in configure to ensure that all - languages will be built. (Thanks to Luca Olivetti <[email protected]>) +- LINGUAS variable is now unset in configure to ensure that all languages will be built. (Thanks to Luca Olivetti <[email protected]>) * Sat Jan 02 1999 Fabio Coatti <[email protected]> - Added pl language file. @@ -43,19 +63,44 @@ root, gpg is suid. - Updates for version 0.4.5 of GnuPG (.mo files) %description -GnuPG is a complete and free replacement for PGP. Because it does not -use IDEA or RSA it can be used without any restrictions. GnuPG is in -compliance with the OpenPGP specification (RFC2440). +GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and +creating digital signatures. GnuPG has advanced key management +capabilities and is compliant with the proposed OpenPGP Internet +standard described in RFC2440. Since GnuPG doesn't use any patented +algorithm, it is not compatible with any version of PGP2 (PGP2.x uses +only IDEA, patented worldwide, and RSA, which is patented in the US +until 9/20/00). %description -l it -GnuPG � un sostituto completo e gratuito per il PGP. Non utilizzando -IDEA o RSA pu� essere utilizzato senza restrizioni. GnuPG � conforme -alle specifiche OpenPGP (RFC2440). +GnuPG (GNU Privacy Guard) � una utility GNU per la cifratura di dati e +la creazione di firme digitali. Possiede una gestione avanzata delle +chiavi ed � conforme allo standard Internet OpenPGP, descritto nella +RFC 2440. Non utilizzando algoritmi brevettati, non � compatibile con +PGP2 (PGP2.x usa solo IDEA, coperto da brevetto mondiale, ed RSA, +brevettato negli USA con scadenza 20/09/2000). Questi algoritmi sono +utilizzabili da GnuPG tramite moduli esterni. %description -l fr -GnuPG est un remplacement complet et � libre � de PGP. Comme il n'utilise -ni IDEA ni RSA il peut �tre utilis� sans restriction. GnuPG est conforme -� la sp�cification OpenPGP (RFC2440). +GnuPG est un utilitaire GNU destin� � chiffrer des donn�es et � cr�er +des signatures �lectroniques. Il a des capacit�s avanc�es de gestion de +cl�s et il est conforme � la norme propos�e OpenPGP d�crite dans la +RFC2440. Comme GnuPG n'utilise pas d'algorithme brevet�, il n'est +compatible avec aucune version de PGP2 (PGP2.x ne sait utiliser que +l'IDEA brevet� dans le monde entier et RSA, brevet� aux �tats-Unis +jusqu'au 20 septembre 2000). + +%description -l cs +GnuPG je GNU n�stroj pro bezpe�nou komunikaci a ukl�d�n� dat. M��e b�t +pou�it na �ifrov�n� dat a vytv��en� digit�ln�ch podpis�. Obsahuje +funkce pro pokro�ilou spr�vu kl��� a vyhovuje navrhovan�mu OpenPGP +Internet standardu podle RFC2440. Byl vytvo�en jako kompletn� +n�hrada za PGP. Proto�e neobsahuje �ifrovac� algoritmy IDEA nebo RSA, +m��e b�t pou��v�n bez omezen�. +Proto�e GnuPG nepou��v� ��dn� patentovan� algoritmus, nem��e b�t �pln� +kompatibiln� s PGP verze 2. PGP 2.x pou��v� algoritmy IDEA (patentov�no +celosv�tov�) a RSA (patentov�no ve Spojen�ch st�tech do 20. z��� +2000). Tyto algoritmy lze zav�st do GnuPG pomoc� extern�ch modul�. + %prep rm -rf $RPM_BUILD_ROOT @@ -67,7 +112,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} if test -n "$LINGUAS"; then unset LINGUAS fi -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --enable-shared make %install @@ -94,14 +139,7 @@ make install-strip prefix=$RPM_BUILD_ROOT/usr %attr (-,root,root) /usr/man/man1/gpg.1 %attr (4755,root,root) /usr/bin/gpg -%attr (-,root,root) /usr/share/locale/de/LC_MESSAGES/%{name}.mo -%attr (-,root,root) /usr/share/locale/it/LC_MESSAGES/%{name}.mo -%attr (-,root,root) /usr/share/locale/fr/LC_MESSAGES/%{name}.mo -%attr (-,root,root) /usr/share/locale/ru/LC_MESSAGES/%{name}.mo -%attr (-,root,root) /usr/share/locale/es_ES/LC_MESSAGES/%{name}.mo -%attr (-,root,root) /usr/share/locale/pt_BR/LC_MESSAGES/%{name}.mo -%attr (-,root,root) /usr/share/locale/pl/LC_MESSAGES/%{name}.mo - +%attr (-,root,root) /usr/share/locale/*/*/%{name}.mo %attr (-,root,root) /usr/lib/%{name} %attr (-,root,root) /usr/share/%{name} diff --git a/scripts/gnupgbug b/scripts/gnupgbug new file mode 100644 index 000000000..7cde6aa16 --- /dev/null +++ b/scripts/gnupgbug @@ -0,0 +1,185 @@ +#!/bin/sh + +# +# File a bug against the GNU Privacy Guard. +# + +# +# Copyright (c) 2000 Thomas Roessler <[email protected]> +# +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +SUBMIT="[email protected]" +DEBIAN_SUBMIT="[email protected]" + + +include_file () +{ + echo + echo "--- Begin $1" + sed -e 's/^-/- -/' $1 | egrep -v '^[ ]*(#|$)' + echo "--- End $1" + echo +} + +case `echo -n` in +"") n=-n; c= ;; + *) n=; c='\c' ;; +esac + + +exec > /dev/tty +exec < /dev/tty + +SCRATCH=${TMPDIR-/tmp}/`basename $0`.`hostname`.$$ + +mkdir ${SCRATCH} || \ +{ + echo "`basename $0`: Can't create temporary directory." >& 2 ; + exit 1 ; +} + +trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2 + +TEMPLATE=${SCRATCH}/template.txt + +echo "Please enter a one-line description of the problem you experience:" +echo $n "> $c" +read SUBJECT + +echo $n "Do you want to include your personal GnuPG configuration files? [Y|n]$c" +read personal +case "$personal" in +[nN]*) personal=no ;; + *) personal=yes ;; +esac + +if test -f /etc/debian_version ; then + DEBIAN=yes + echo $n "Checking whether GnuPG has been installed as a package... $c" + GNUPGVERSION="`dpkg -l gnupg | grep ^i | awk '{print $3}'`" 2> /dev/null + if test "$GNUPGVERSION" ; then + DPKG=yes + else + DPKG=no + fi + echo "$DPKG" + if test "$DPKG" = "no" ; then + echo $n "File this bug with Debian? [Y|n]$c" + read $DPKG + case "$DPKG" in + [nN]) DPKG=no ;; + *) DPKG=yes ;; + esac + fi +else + DEBIAN=no + DPKG=no +fi + +test "$MUTTVERSION" || MUTTVERSION="`mutt -v | head -1 | awk '{print $2}' | tr -d i`" +test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT" + + +exec > ${TEMPLATE} + +echo "Subject: mutt-$MUTTVERSION: $SUBJECT" +echo "To: $SUBMIT" +echo "Cc: $LOGNAME" +echo +echo "Package: mutt" +echo "Version: $MUTTVERSION" +echo +echo "-- Please type your report below this line" +echo +echo +echo + +if test "$DEBIAN" = "yes" ; then + echo "Obtaining Debian-specific information..." > /dev/tty + bug -p -s dummy mutt | \ + sed -n -e "/^-- System Information/,/^---/p" | \ + grep -v '^---' +fi + +echo +echo "-- Mutt Version Information" +echo +mutt -v + +if test "$personal" = "yes" ; then + CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc" + MATCHED="none" + for f in $CANDIDATES; do + if test -f "${HOME}/$f" ; then + MATCHED="${HOME}/$f" + break + fi + done + + if test "$MATCHED" = "none" ; then + echo "Warning: Can't find your personal .muttrc." >&2 + else + include_file $MATCHED + fi +fi + +if test "$global" = "yes" ; then + CANDIDATES="Muttrc-${MUTTVERSION} Muttrc" + DIRECTORIES="/etc /usr/local/share/mutt" + MATCHED="none" + for d in $DIRECTORIES ; do + for f in $CANDIDATES; do + if test -f $d/$f ; then + MATCHED="$d/$f" + break + fi + done + test "$MATCHED" = "none" || break + done + + if test "$MATCHED" = "none" ; then + echo "Warning: Can't find global Muttrc." >&2 + else + include_file $MATCHED + fi +fi + +exec > /dev/tty + +cp $TEMPLATE $SCRATCH/mutt-bug.txt + +input="e" +while : ; do + if test "$input" = "e" ; then + ${VISUAL-vi} $SCRATCH/mutt-bug.txt + if cmp $SCRATCH/mutt-bug.txt ${TEMPLATE} > /dev/null ; then + echo "Warning: Bug report was not modified!" + fi + fi + + echo $n "Submit, Edit, Print, Quit? [S|e|p|q]$c" + read _input + input="`echo $_input | tr EPSQ epsq`" + case $input in + e*) ;; + p*) ${PAGER-more} $SCRATCH/mutt-bug.txt ;; + s*|"") /usr/sbin/sendmail -t < $SCRATCH/mutt-bug.txt ; exit ;; + q*) exit + esac +done + diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist new file mode 100755 index 000000000..4761d0dfb --- /dev/null +++ b/scripts/mk-w32-dist @@ -0,0 +1,28 @@ +#!/bin/sh +# Hmm, we need the not real free zip utility - this should be +# avoided. The easiest way will be to use an installer program. + +set -e + +cd dist-w32 + +if [ -f ../README ]; then + srcdir=.. +elif [ -f ../../gnupg-stable/README ]; then + srcdir=../../gnupg-stable +elif [ -f ../../../gnupg-stable/README ]; then + srcdir=../../../gnupg-stable +else + echo "cannot figure out the source dir" >&2 + exit 1 +fi + +rm * || true +ln ../g10/gpg gpg.exe +i386--mingw32-strip gpg.exe +man -T latin1 -l ../doc/gpg.1 >gpg.man +todos gpg.man +ln ${srcdir}/README . +ln ${srcdir}/doc/README.W32 . +for i in ${srcdir}/po/*.gmo; do ln $i "$(basename $i .gmo).mo" ; done +zip "gnupg-w32-$(cat ${srcdir}/VERSION).zip" * |