Update head to match stable 1.0

scripts/ChangeLog

@@ -1,38 +1,159 @@
-Mon Jul 17 16:35:47 CEST 2000  Werner Koch  <wk@>
+2002-06-21  Stefan Bellon  <sbellon@sbellon.de>
 
-  * config.gues, config.sub: Support for s390-ibm-linux-gnu; thanks
-  to Holger Smolinski.	Add support for QNX; by Sam Roberts.
+	* conf-riscos/Makefile: Changes due to moving around RISC OS
+	specific stuff in the code.
 
-Tue Oct 26 14:10:21 CEST 1999  Werner Koch  <wk@gnupg.de>
+2002-06-07  Stefan Bellon  <sbellon@sbellon.de>
+
+	* conf-riscos/include/config.h [__riscos__]: Fixed macro bug.
+
+2002-05-10  Stefan Bellon  <sbellon@sbellon.de>
+
+	* conf-riscos/include/config.h [__riscos__]: Changes for later
+	Norcroft compilers.
+
+	* conf-riscos/Makefile [__riscos__]: Updated.
+
+2002-04-22  Stefan Bellon  <sbellon@sbellon.de>
+
+	* conf-riscos/include/config.h [__riscos__]: Development
+	versions automatically define DEBUG from now on.
+
+	* conf-riscos/Makefile [__riscos__]: Updated for LDAP keyserver
+	code.
+
+2002-04-19  David Shaw  <dshaw@jabberwocky.com>
+
+	* gnupg.spec.in: Removed pubring.asc and OPTIONS.  Added
+	samplekeys.asc.
+
+2002-03-31  David Shaw  <dshaw@jabberwocky.com>
+
+	* gnupg.spec.in: Added the gpgkeys_xxx keyserver helpers.  Added a
+	* to catch variations on the basic gpg man page (gpg, gpgv).  Mark
+	options.skel as a config file.  Do not include the FAQ/faq.html
+	twice (in /doc/ and /share/).
+	
+2002-01-02  Stefan Bellon  <sbellon@sbellon.de>
+
+	* build-riscos [__riscos__]: Set filetype of Makefile correctly.
+
+	* conf-riscos/include/g10defs.h [__riscos__]: Added GNU GPL
+	header and exec code defines.
+
+	* conf-riscos/include/config.h [__riscos__]: Moved parts to
+	include/util.h where they really belong to.
+
+	* conf-riscos/Makefile [__riscos__]: Updated for new keyserver,
+	exec and photo id code.
+
+2001-12-22  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh: Fixed last change.
+
+2001-12-21  Werner Koch  <wk@gnupg.org>
+
+	* distfiles: Removed those files which which automake installs by
+	default.
+
+	* autogen.sh: Replaced $() by backticks for system without a posix
+	shell.  Removed gawk specific quoting. By David Champion.
+
+2001-10-22  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh (aclocal_vers): Require automalke 1.5.
+
+2001-08-21  Stefan Bellon  <sbellon@sbellon.de>
+
+	* build-riscos [__riscos__]: New.
+	* conf-riscos [__riscos__]: Ditto.
+
+2001-08-13  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh: Test on gettext 0.10.38. By Michael Engels.
+
+2001-08-07  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh: Adjusted --build-w32 for autoconf 2.52 
+
+2001-07-09  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh (autoconf_vers): Require autoconf 2.50
+
+2001-05-06  Werner Koch  <wk@gnupg.org>
+
+	* config.guess, config.sub: Add updates from subversions.gnu.org.
+
+2001-04-19  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh: Add VPATH build support for option --build-w32. 
+
+2001-03-12  Werner Koch  <wk@gnupg.org>
+
+	* config.guess, config.sub: Replaced with the current GNU CVS ones. 
+
+2001-01-18  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh: New options --build-w32
+	* build-w32: Does now call autogen.sh
+
+2000-11-24  Werner Koch  <wk@gnupg.org>
+
+	* build-w32: New script to build the W32 version.
+	* distfiles: And put it into the distribution
+
+Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * gnupg.spec.in: Updated.
+
+Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+        * config.guess, config.sub: Replaced with the latest version from the
+        CVS archive.  Hope that does not break too much.
+
+Fri May 12 14:01:20 CEST 2000  Werner Koch  <wk@openit.de>
+
+	* gnupg.spec.in: New version from Fabio with some updated descriptions.
+
+Mon May  1 15:38:04 CEST 2000  Werner Koch  <wk@openit.de>
+
+	* gnupg.spec.in: New version from Fabio.
+
+Fri Mar 17 16:26:05 CET 2000  Werner Koch  <wk@openit.de>
+
+	* config.gues, config.sub: Support for s390-ibm-linux-gnu. Thanks
+	to Holger Smolinski.
+
+Thu Mar  2 15:37:46 CET 2000  Werner Koch  <wk@gnupg.de>
+
+	* config.guess: Add support for QNX.  By Sam Roberts.
+	* config.sub: Ditto.
+
+Thu Sep 23 09:49:25 1999  Werner Koch  (wk@gnupg.org)
 
 	* commit: Remove leading and trailing empty lines when copying
 	Changes to Changelog
 
 Wed Sep 15 16:22:17 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
-
 	* gnupg.spec: Add Portuguese description
 
 Thu Sep  2 16:40:55 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
-
 	* mkdiff: changed format of diff file name and made script more
 	general.
 
 Wed Aug  4 10:34:18 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
-
 	* 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  <wk@isil.d.shuttle.de>
 
-
 	* ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3
 
 Mon Jul 12 14:55:34 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
-
 	* autogen.sh: Run libtoolize
 
 Sat May 22 22:47:26 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
@@ -105,3 +226,15 @@ Wed Oct 14 09:55:25 1998  Werner Koch  (wk@isil.d.shuttle.de)
 	* config.guess (FreeBSD): Changes from Jun Kuriyama to support ELF
 	* config.sub: (freebsd): Add to maybe_os
 
+
+ Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+

scripts/autogen.sh

@@ -1,13 +1,76 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+#
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 PGM=GnuPG
-DIE=no
+lib_config_files=""
+autoconf_vers=2.52
+automake_vers=1.5
+aclocal_vers=1.5
+
+
+DIE=no
+if test "$1" = "--build-w32"; then
+    tmp=`dirname $0`
+    tsdir=`cd "$tmp"; cd ..; pwd`
+    shift
+    host=i386--mingw32
+    if [ ! -f $tsdir/scripts/config.guess ]; then
+        echo "$tsdir/scripts/config.guess not found" >&2
+        exit 1
+    fi
+    build=`$tsdir/scripts/config.guess`
+        
+    if ! mingw32 --version >/dev/null; then
+        echo "We need at least version 0.3 of MingW32/CPD" >&2
+        exit 1
+    fi
+
+    if [ -f "$tsdir/config.log" ]; then
+        if ! head $tsdir/config.log | grep i386--mingw32 >/dev/null; then
+            echo "Pease run a 'make distclean' first" >&2
+            exit 1
+        fi
+    fi
+
+    crossbindir=`mingw32 --install-dir`/bin
+    CC=`mingw32 --get-path gcc`
+    CPP=`mingw32 --get-path cpp`
+    AR=`mingw32 --get-path ar`
+    RANLIB=`mingw32 --get-path ranlib`
+    export CC CPP AR RANLIB 
+
+    disable_foo_tests=""
+    if [ -n "$lib_config_files" ]; then
+        for i in $lib_config_files; do
+            j=`echo $i | tr '[a-z-]' '[A-Z_]'`
+            eval "$j=${crossbindir}/$i"
+            export $j
+            disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
+                           sed 's,-config$,,'`-test"
+            if [ ! -f "${crossbindir}/$i" ]; then                   
+                echo "$i not installed for MingW32" >&2
+                DIE=yes
+            fi
+        done
+    fi
+    [ $DIE = yes ] && exit 1
+
+    $tsdir/configure --build=${build} --host=${host} \
+                ${disable_foo_tests} $*
+    exit $?
+fi
+
 
-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') \
@@ -54,42 +117,23 @@ else
 fi
 
 
-if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"\."); \
-    X=10000*A[1]+100*A[2]+A[3]; echo X; if( X >= 1035 ) exit 1; exit 0}')
+if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"."); \
+    X=10000*A[1]+100*A[2]+A[3]; echo X; if( X >= 1038 ) exit 1; exit 0}')
     then
     echo "**Error**: You must have "\`gettext\'" installed to compile $PGM."
-    echo '           (version 0.10.35 or newer is required; get'
-    echo '            ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz'
+    echo '           (version 0.10.38 or newer is required; get'
+    echo '            ftp://alpha.gnu.org/gnu/gettext/gettext-0.10.38.tar.gz'
     echo '            or install the latest Debian package)'
     DIE="yes"
 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

scripts/build-riscos

@@ -0,0 +1,11 @@
+| This is an RISC OS Obey file (filetype &feb) that copies handcrafted files
+| for the RISC OS version into the correct places.
+| It won't run on anything other than RISC OS -- I think ;-)
+
+copy <obey$dir>.conf-riscos.cipher.c.construct <obey$dir>.^.cipher.c.construct ~cf~v
+copy <obey$dir>.conf-riscos.cipher.c.constructv <obey$dir>.^.cipher.c.constructv ~cf~v
+copy <obey$dir>.conf-riscos.include.h.config <obey$dir>.^.include.h.config ~cf~v
+copy <obey$dir>.conf-riscos.include.h.g10defs <obey$dir>.^.include.h.g10defs ~cf~v
+copy <obey$dir>.conf-riscos.Makefile <obey$dir>.^.Makefile ~cf~v
+settype <obey$dir>.^.Makefile &fe1
+echo Done.

scripts/build-w32

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec scripts/autogen.sh --build-w32
+
+
+

scripts/conf-riscos/Makefile

@@ -0,0 +1,465 @@
+# Makefile for the RISC OS version of GnuPG
+CC=cc
+LINK=link
+AS=objasm
+MAKE=amu
+DEPEND=-depend !Depend
+LIBLDAP=^.^.openldap-2/0/18
+CC_FLAGS=-Wp -apcs 3/26bit/fpe2 -throwback -Otime -IUnix:,include,mpi,intl,zlib,$(LIBLDAP).include -JUnix: -D__riscos__ -DHAVE_CONFIG_H -DNO_ASM -UIS_MODULE -DVERSION="\"$(GnuPG$Version)\"" $(GnuPG$DevDefine)
+AS_FLAGS=-apcs 3/26bit/fpe2 -throwback -predefine "ARMv4 SETA 0"
+LD_FLAGS=Unix:o.unixlib
+CIPHER_OBJS=cipher.o.blowfish \
+	cipher.o.cast5 \
+	cipher.o.cipher \
+	cipher.o.construct \
+	cipher.o.des \
+	cipher.o.dsa \
+	cipher.o.dynload \
+	cipher.o.elgamal \
+	cipher.o.g10c \
+	cipher.o.md \
+	cipher.o.md5 \
+	cipher.o.primegen \
+	cipher.o.pubkey \
+	cipher.o.random \
+	cipher.o.rijndael \
+	cipher.o.rmd160 \
+	cipher.o.rndriscos \
+	cipher.o.rsa \
+	cipher.o.sha1 \
+	cipher.o.smallprime \
+	cipher.o.tiger32 \
+	cipher.o.twofish
+GETTEXT_OBJS=intl.o.bindtextdom \
+	intl.o.dcgettext \
+	intl.o.dgettext \
+	intl.o.explodename \
+	intl.o.finddomain \
+	intl.o.gettext \
+	intl.o.intl-compat \
+	intl.o.l10nflist \
+	intl.o.loadmsgcat \
+	intl.o.localealias \
+	intl.o.textdomain
+MPI_OBJS=mpi.o.mpi-add \
+	mpi.o.mpi-bit \
+	mpi.o.mpi-cmp \
+	mpi.o.mpi-div \
+	mpi.o.mpi-gcd \
+	mpi.o.mpi-inline \
+	mpi.o.mpi-inv \
+	mpi.o.mpi-mul \
+	mpi.o.mpi-pow \
+	mpi.o.mpi-mpow \
+	mpi.o.mpi-scan \
+	mpi.o.mpicoder \
+	mpi.o.mpih-div \
+	mpi.o.mpih-mul \
+	mpi.o.mpiutil \
+	mpi.o.g10m \
+	mpi.arm.o.mpih
+UTIL_OBJS=util.o.argparse \
+	util.o.dotlock \
+	util.o.errors \
+	util.o.fileutil \
+	util.o.g10u \
+	util.o.http \
+	util.o.iobuf \
+	util.o.logger \
+	util.o.memory \
+	util.o.miscutil \
+	util.o.secmem \
+	util.o.strgutil \
+	util.o.ttyio \
+	util.o.riscos
+ZLIB_OBJS=zlib.o.adler32 \
+	zlib.o.compress \
+	zlib.o.crc32 \
+	zlib.o.deflate \
+	zlib.o.infblock \
+	zlib.o.infcodes \
+	zlib.o.inffast \
+	zlib.o.inflate \
+	zlib.o.inftrees \
+	zlib.o.infutil \
+	zlib.o.trees \
+	zlib.o.uncompr \
+	zlib.o.zutil
+G10_OBJS=g10.o.armor \
+	g10.o.build-packet \
+	g10.o.cipher \
+	g10.o.comment \
+	g10.o.compress \
+	g10.o.dearmor \
+	g10.o.decrypt \
+	g10.o.delkey \
+	g10.o.encode \
+	g10.o.encr-data \
+	g10.o.exec \
+	g10.o.export \
+	g10.o.free-packet \
+	g10.o.g10 \
+	g10.o.getkey \
+	g10.o.helptext \
+	g10.o.hkp \
+	g10.o.import \
+	g10.o.kbnode \
+	g10.o.keydb \
+	g10.o.keyedit \
+	g10.o.keygen \
+	g10.o.keyid \
+	g10.o.keylist \
+	g10.o.keyring \
+	g10.o.keyserver \
+	g10.o.mainproc \
+	g10.o.mdfilter \
+	g10.o.misc \
+	g10.o.mkdtemp \
+	g10.o.openfile \
+	g10.o.parse-packet \
+	g10.o.passphrase \
+	g10.o.photoid \
+	g10.o.pipemode \
+	g10.o.pkclist \
+	g10.o.plaintext \
+	g10.o.pubkey-enc \
+	g10.o.revoke \
+	g10.o.seckey-cert \
+	g10.o.seskey \
+	g10.o.sig-check \
+	g10.o.sign \
+	g10.o.signal \
+	g10.o.skclist \
+	g10.o.status \
+	g10.o.tdbdump \
+	g10.o.tdbio \
+	g10.o.textfilter \
+	g10.o.trustdb \
+	g10.o.verify
+GPGV_OBJS=g10.o.armor \
+	g10.o.build-packet \
+	g10.o.compress \
+	g10.o.free-packet \
+	g10.o.getkey \
+	g10.o.gpgv \
+	g10.o.keydb \
+	g10.o.keylist \
+	g10.o.kbnode \
+	g10.o.keyid \
+	g10.o.keyring \
+	g10.o.mainproc \
+	g10.o.mdfilter \
+	g10.o.misc \
+	g10.o.openfile \
+	g10.o.parse-packet \
+	g10.o.plaintext \
+	g10.o.seskey \
+	g10.o.sig-check \
+	g10.o.signal \
+	g10.o.status \
+	g10.o.textfilter \
+	g10.o.verify \
+	util.o.argparse \
+	util.o.errors \
+	util.o.fileutil \
+	util.o.g10u \
+	util.o.iobuf \
+	util.o.logger \
+	util.o.memory \
+	util.o.miscutil \
+	util.o.secmem \
+	util.o.strgutil \
+	util.o.riscos \
+	cipher.o.constructv \
+	cipher.o.dsa \
+	cipher.o.dynload \
+	cipher.o.elgamal \
+	cipher.o.g10c \
+	cipher.o.md \
+	cipher.o.pubkey \
+	cipher.o.rmd160 \
+	cipher.o.rsa \
+	mpi.mpi \
+	zlib.zlib
+GPGKEYS_OBJS=util.o.riscos \
+	util.o.strgutil \
+	util.o.memory \
+	util.o.logger \
+	util.o.secmem \
+	intl.gettext
+
+## Rule Patterns ##
+
+.SUFFIXES:	.c .o .s
+
+.c.o:
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o $@ $<
+
+.s.o:
+	$(AS) $(AS_FLAGS) $(DEPEND) $< $@
+
+# Static dependencies:
+
+all:
+	@echo Use one of the following as target:
+	@echo |  dev   to build the development version
+	@echo |  dist  to build the distribution with all archives
+	@echo All other targets are internal and shouldn't be used!
+
+cipher.cipher: $(CIPHER_OBJS)
+	$(LINK) -aof $(CIPHER_OBJS) -o cipher.cipher
+
+intl.gettext: $(GETTEXT_OBJS)
+	$(LINK) -aof $(GETTEXT_OBJS) -o intl.gettext
+
+mpi.mpi: $(MPI_OBJS)
+	$(LINK) -aof $(MPI_OBJS) -o mpi.mpi
+
+tools.gpgsplit: tools.o.gpgsplit util.util intl.gettext zlib.zlib
+	$(LINK) $(LD_FLAGS) tools.o.gpgsplit util.util intl.gettext zlib.zlib -o tools.gpgsplit
+	-squeeze tools.gpgsplit
+	-copy tools.gpgsplit ADFS::A5.$.tmp.!GnuPG.gpgsplit ~CF~V
+
+keyserver.gpgkeys_ldap: keyserver.o.gpgkeys_ldap $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap
+	$(LINK) $(LD_FLAGS) keyserver.o.gpgkeys_ldap $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap -o keyserver.gpgkeys_ldap
+	-squeeze keyserver.gpgkeys_ldap
+	-copy keyserver.gpgkeys_ldap ADFS::A5.$.tmp.!GnuPG.gpgkeys_ldap ~CF~V
+
+riscos.jpegview.jpegview:
+	-dir riscos.jpegview
+	-$(MAKE)
+	-back
+
+util.util: $(UTIL_OBJS)
+	$(LINK) -aof $(UTIL_OBJS) -o util.util
+
+zlib.zlib: $(ZLIB_OBJS)
+	$(LINK) -aof zlib.o.* -o zlib.zlib
+
+g10.gpg: $(G10_OBJS) cipher.o.idea cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib BUILD
+	$(LINK) $(G10_OBJS) $(LD_FLAGS) cipher.o.idea cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib -o g10.gpg
+	-copy g10.gpg ADFS::A5.$.tmp.!GnuPG.gpg ~CFR~V
+
+g10.gpgv: $(GPGV_OBJS) intl.gettext BUILD
+	$(LINK) $(GPGV_OBJS) intl.gettext $(LD_FLAGS) -o g10.gpgv
+	-copy g10.gpgv ADFS::A5.$.tmp.!GnuPG.gpgv ~CFR~V
+
+g10.gpgpart: $(G10_OBJS) cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib BUILD
+	drlink034 -aof $(G10_OBJS) $(LD_FLAGS) cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib -o g10.gpgpart
+
+select-idea-src:
+	-copy distrib.idea-addon.cipher.c.idea cipher.c.idea ~CF~NR~V
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o cipher.o.idea cipher.c.idea
+
+select-gpl-src:
+	-copy distrib.non-idea.cipher.c.idea cipher.c.idea ~CF~NR~V
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o cipher.o.idea cipher.c.idea
+
+distrib.gnupgsrc/zip: select-gpl-src
+	-zip -9@ distrib.gnupgsrc/zip < distrib.resources.distfiles
+
+distrib.gnupg/zip: distrib.gpl-bin.!GnuPG.JPEGview distrib.gpl-bin.!GnuPG.gpgsplit distrib.gpl-bin.!GnuPG.gpg distrib.gpl-bin.!GnuPG.gpgv select-gpl-src
+	-copy distrib.resources.History distrib.gpl-bin.History ~CFR~V
+	-copy distrib.resources.Upgrading distrib.gpl-bin.Upgrading ~CFR~V
+	-copy distrib.resources.ReadMe_bin distrib.gpl-bin.!ReadMe1st ~CFR~V
+	-copy distrib.resources.!GnuPG distrib.gpl-bin.!GnuPG ~CFR~V
+	-copy distrib.resources.!GnuPGUser distrib.gpl-bin.!GnuPGUser ~CFR~V
+	-copy distrib.resources.!System distrib.gpl-bin.!System ~CFR~V
+	-copy distrib.resources.orig_docs distrib.gpl-bin.orig_docs ~CFR~V
+	-dir distrib.gpl-bin
+	-zip -r9 ^.gnupg/zip *
+	-back
+
+distrib.gnupgdev/zip: distrib.private.!GnuPG.JPEGview distrib.private.!GnuPG.gpgsplit distrib.private.!GnuPG.gpgkeys_ldap distrib.private.!GnuPG.gpg distrib.private.!GnuPG.gpgv select-idea-src
+	-ifthere distrib.private.!GnuPG.locale then wipe distrib.private.!GnuPG.locale ~CFR~V
+	-copy distrib.intl.!GnuPG.locale distrib.private.!GnuPG.locale ~CFR~V
+	-copy distrib.resources.History distrib.private.History ~CFR~V
+	-copy distrib.resources.Upgrading distrib.private.Upgrading ~CFR~V
+	-copy distrib.resources.ReadMe_bin distrib.private.!ReadMe1st ~CFR~V
+	-copy distrib.resources.!GnuPG distrib.private.!GnuPG ~CFR~V
+	-copy distrib.resources.!GnuPGUser distrib.private.!GnuPGUser ~CFR~V
+	-copy distrib.resources.!System distrib.private.!System ~CFR~V
+	-copy distrib.resources.orig_docs distrib.private.orig_docs ~CFR~V
+	-dir distrib.private
+	-zip -r9 ^.gnupgdev/zip *
+	-back
+
+distrib.gnupgidea/zip: cipher.o.idea select-idea-src
+	-copy distrib.resources.ReadMe_idea distrib.idea-addon.!ReadMe ~CFR~V
+	-copy cipher.o.idea distrib.idea-addon.cipher.o.idea ~CFR~V
+	-dir distrib.idea-addon
+	-zip -r9 ^.gnupgidea/zip *
+	-back
+
+distrib.gnupgpart/zip: g10.gpgpart select-idea-src
+	-copy distrib.resources.ReadMe_part distrib.part.!ReadMe1st ~CFR~V
+	-copy g10.gpgpart distrib.part.g10.gpgpart ~CFR~V
+	-dir distrib.part
+	-zip -r9 ^.gnupgpart/zip *
+	-back
+
+distrib.gnupgldap/zip: keyserver.gpgkeys_ldap
+	-copy distrib.resources.ReadMe_ldap distrib.ldap.!ReadMe ~CFR~V
+	-copy keyserver.gpgkeys_ldap distrib.ldap.!GnuPG.gpgkeys_ldap ~CFR~V
+	-dir distrib.ldap
+	-zip -r9 ^.gnupgldap/zip *
+	-back
+
+distrib.gnupgintl/zip:
+	-dir distrib.intl
+	-zip -r9 ^.gnupgintl/zip *
+	-back
+
+distrib.gpl-bin.!GnuPG.gpg: g10.gpg
+	-copy g10.gpg distrib.gpl-bin.!GnuPG.gpg ~CFR~V
+	-squeeze distrib.gpl-bin.!GnuPG.gpg
+
+distrib.gpl-bin.!GnuPG.gpgv: g10.gpgv
+	-copy g10.gpgv distrib.gpl-bin.!GnuPG.gpgv ~CFR~V
+	-squeeze distrib.gpl-bin.!GnuPG.gpgv
+
+distrib.gpl-bin.!GnuPG.gpgsplit: tools.gpgsplit
+	-copy tools.gpgsplit distrib.gpl-bin.!GnuPG.gpgsplit ~CFR~V
+	-squeeze distrib.gpl-bin.!GnuPG.gpgsplit
+
+distrib.gpl-bin.!GnuPG.JPEGview: riscos.jpegview.jpegview
+	-copy riscos.jpegview.jpegview distrib.gpl-bin.!GnuPG.JPEGview ~CFR~V
+
+distrib.private.!GnuPG.gpg: g10.gpg
+	-copy g10.gpg distrib.private.!GnuPG.gpg ~CFR~V
+	-squeeze distrib.private.!GnuPG.gpg
+
+distrib.private.!GnuPG.gpgv: g10.gpgv
+	-copy g10.gpgv distrib.private.!GnuPG.gpgv ~CFR~V
+	-squeeze distrib.private.!GnuPG.gpgv
+
+distrib.private.!GnuPG.gpgsplit: tools.gpgsplit
+	-copy tools.gpgsplit distrib.private.!GnuPG.gpgsplit ~CFR~V
+	-squeeze distrib.private.!GnuPG.gpgsplit
+
+distrib.private.!GnuPG.gpgkeys_ldap: keyserver.gpgkeys_ldap
+	-copy keyserver.gpgkeys_ldap distrib.private.!GnuPG.gpgkeys_ldap ~CFR~V
+	-squeeze distrib.private.!GnuPG.gpgkeys_ldap
+
+distrib.private.!GnuPG.JPEGview: riscos.jpegview.jpegview
+	-copy riscos.jpegview.jpegview distrib.private.!GnuPG.JPEGview ~CFR~V
+
+clean-cipher:
+	-ifthere cipher.o.* then wipe cipher.o.* ~CFR~V
+	-ifthere cipher.cipher then wipe cipher.cipher ~CFR~V
+
+clean-intl:
+	-ifthere intl.o.* then wipe intl.o.* ~CFR~V
+	-ifthere intl.gettext then wipe intl.gettext ~CFR~V
+
+clean-mpi:
+	-ifthere mpi.o.* then wipe mpi.o.* ~CFR~V
+	-ifthere mpi.arm.o.* then wipe mpi.arm.o.* ~CFR~V
+	-ifthere mpi.mpi then wipe mpi.mpi ~CFR~V
+
+clean-util:
+	-ifthere util.o.* then wipe util.o.* ~CFR~V
+	-ifthere util.util then wipe util.util ~CFR~V
+
+clean-zlib:
+	-ifthere zlib.o.* then wipe zlib.o.* ~CFR~V
+	-ifthere zlib.zlib then wipe zlib.zlib ~CFR~V
+
+clean-dist:
+	-ifthere distrib.*/zip then wipe distrib.*/zip ~CFR~V
+
+clean-g10:
+	-ifthere g10.gpg then wipe g10.gpg ~CFR~V
+	-ifthere g10.gpgv then wipe g10.gpgv ~CFR~V
+	-ifthere g10.gpgpart then wipe g10.gpgpart ~CFR~V
+	-ifthere g10.o.* then wipe g10.o.* ~CFR~V
+
+clean-keyserver:
+	-ifthere keyserver.gpgkeys_* then wipe keyserver.gpgkeys_* ~CFR~V
+	-ifthere keyserver.o.* then wipe keyserver.o.* ~CFR~V
+
+clean-tools:
+	-ifthere tools.gpgsplit then wipe tools.gpgsplit ~CFR~V
+	-ifthere tools.o.* then wipe tools.o.* ~CFR~V
+
+clean-riscos:
+	-ifthere riscos.jpegview.jpegview then wipe riscos.jpegview.jpegview ~CFR~V
+
+clean-version:
+	-ifthere g10.o.armor then wipe g10.o.armor ~CFR~V
+	-ifthere g10.o.encode then wipe g10.o.encode ~CFR~V
+	-ifthere g10.o.g10 then wipe g10.o.g10 ~CFR~V
+	-ifthere g10.o.gpgv then wipe g10.o.gpgv ~CFR~V
+	-ifthere g10.o.keygen then wipe g10.o.keygen ~CFR~V
+	-ifthere g10.o.sign then wipe g10.o.sign ~CFR~V
+	-ifthere g10.gpg then wipe g10.gpg ~CFR~V
+	-ifthere g10.gpgv then wipe g10.gpgv ~CFR~V
+	-ifthere g10.gpgpart then wipe g10.gpgpart ~CFR~V
+
+clean: clean-dist clean-cipher clean-intl clean-mpi clean-util clean-zlib clean-g10 clean-keyserver clean-tools clean-riscos
+
+g10.o.armor: BUILD
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.armor g10.c.armor
+
+g10.o.encode: BUILD
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.encode g10.c.encode
+
+g10.o.g10: BUILD
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.g10 g10.c.g10
+
+g10.o.gpgv: BUILD
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.gpgv g10.c.gpgv
+
+g10.o.keygen: BUILD
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.keygen g10.c.keygen
+
+g10.o.sign: BUILD
+	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.sign g10.c.sign
+
+dev: clean-version
+	$(MAKE) fast-dev
+
+fast-dev: BUILD
+	setver configure/ac AC_INIT(gnupg, , dev
+	wipe distrib.private.!GnuPG.gpg* ~CFR~V
+	-$(MAKE) keyserver.gpgkeys_ldap
+	$(MAKE) tools.gpgsplit
+	$(MAKE) distrib.gnupgdev/zip
+	ifthere <WebServe$ServeRoot>.private.gnupgdev/zip then wipe <WebServe$ServeRoot>.private.gnupgdev/zip ~CFR~V
+	rename distrib.gnupgdev/zip <WebServe$ServeRoot>.private.gnupgdev/zip
+
+dist: BUILD clean-version tools.gpgsplit
+	setver configure/ac AC_INIT(gnupg, , dist
+	wipe distrib.gpl-bin.!GnuPG.gpg* ~CFR~V
+	$(MAKE) distrib.gnupg/zip
+	$(MAKE) distrib.gnupgidea/zip
+	$(MAKE) distrib.gnupgpart/zip
+	wipe distrib.private.!GnuPG.gpg* ~CFR~V
+	$(MAKE) distrib.gnupgdev/zip
+	$(MAKE) distrib.gnupgsrc/zip
+	$(MAKE) distrib.gnupgintl/zip
+	$(MAKE) distrib.gnupgldap/zip
+	$(MAKE) select-idea-src
+	ifthere <WebServe$ServeRoot>.archives.gnupg/zip then wipe <WebServe$ServeRoot>.archives.gnupg/zip ~CFR~V
+	ifthere <WebServe$ServeRoot>.private.gnupgdev/zip then wipe <WebServe$ServeRoot>.private.gnupgdev/zip ~CFR~V
+	ifthere <WebServe$ServeRoot>.archives.gnupgidea/zip then wipe <WebServe$ServeRoot>.archives.gnupgidea/zip ~CFR~V
+	ifthere <WebServe$ServeRoot>.archives.gnupgpart/zip then wipe <WebServe$ServeRoot>.archives.gnupgpart/zip ~CFR~V
+	ifthere <WebServe$ServeRoot>.archives.gnupgsrc/zip then wipe <WebServe$ServeRoot>.archives.gnupgsrc/zip ~CFR~V
+	ifthere <WebServe$ServeRoot>.archives.gnupgintl/zip then wipe <WebServe$ServeRoot>.archives.gnupgintl/zip ~CFR~V
+	ifthere <WebServe$ServeRoot>.archives.gnupgldap/zip then wipe <WebServe$ServeRoot>.archives.gnupgldap/zip ~CFR~V
+	ifthere <WebServe$ServeRoot>.gnupg_history/txt then wipe <WebServe$ServeRoot>.gnupg_history/txt ~CFR~V
+	ifthere <WebServe$ServeRoot>.gnupg_news/txt then wipe <WebServe$ServeRoot>.gnupg_news/txt ~CFR~V
+	rename distrib.gnupgdev/zip <WebServe$ServeRoot>.private.gnupgdev/zip
+	rename distrib.gnupg/zip <WebServe$ServeRoot>.archives.gnupg/zip
+	rename distrib.gnupgidea/zip <WebServe$ServeRoot>.archives.gnupgidea/zip
+	rename distrib.gnupgpart/zip <WebServe$ServeRoot>.archives.gnupgpart/zip
+	rename distrib.gnupgsrc/zip <WebServe$ServeRoot>.archives.gnupgsrc/zip
+	rename distrib.gnupgintl/zip <WebServe$ServeRoot>.archives.gnupgintl/zip
+	rename distrib.gnupgldap/zip <WebServe$ServeRoot>.archives.gnupgldap/zip
+	copy distrib.resources.History <WebServe$ServeRoot>.gnupg_history/txt ~CFR~V
+	copy distrib.resources.orig_docs.NEWS <WebServe$ServeRoot>.gnupg_news/txt ~CFR~V
+	unset GnuPG$DevDefine
+	unset GnuPG$Version
+	updatesigs <WebServe$ServeRoot>.archives --secring adfs::ap.$.secring/gpg
+
+# Dynamic dependencies:

scripts/conf-riscos/cipher/construct.c

@@ -0,0 +1,38 @@
+/* construct.c  -  RISC OS constructors for cipher algorithms
+ *	Copyright (C) 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+void rndriscos_constructor(void);
+void sha1_constructor(void);
+void rmd160_constructor(void);
+void md5_constructor(void);
+
+void
+cipher_modules_constructor(void)
+{
+    static int done = 0;
+    if( done )
+        return;
+    done = 1;
+
+   rndriscos_constructor();
+   sha1_constructor();
+   rmd160_constructor();
+   md5_constructor();
+}

scripts/conf-riscos/cipher/constructv.c

@@ -0,0 +1,32 @@
+/* constructv.c  -  RISC OS constructors for cipher algorithms (gpgv version)
+ *	Copyright (C) 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+void rmd160_constructor(void);
+
+void
+cipher_modules_constructor(void)
+{
+    static int done = 0;
+    if( done )
+        return;
+    done = 1;
+
+   rmd160_constructor();
+}

scripts/conf-riscos/include/config.h

@@ -0,0 +1,384 @@
+/* config.h - hand edited by Stefan Bellon to suit RISC OS needs
+ *	Copyright (C) 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifndef G10_CONFIG_H
+#define G10_CONFIG_H
+
+/* need this, because some autoconf tests rely on this (e.g. stpcpy)
+ * and it should be used for new programs
+ */
+#define _GNU_SOURCE  1
+
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
+
+/* Define if you have alloca, as a function or macro.  */
+/* #undef HAVE_ALLOCA */
+#define HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+/* #undef HAVE_ALLOCA_H */
+#define HAVE_ALLOCA_H
+
+/* #undef _LIBC */
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+#undef HAVE_DOPRNT
+
+/* Define if you have the vprintf function.  */
+#define HAVE_VPRINTF
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+#undef off_t
+
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#define size_t unsigned int
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS
+
+/* Define if `sys_siglist' is declared by <signal.h>.  */
+#define SYS_SIGLIST_DECLARED
+
+#undef M_DEBUG
+#undef M_GUARD
+#define PRINTABLE_OS_NAME "RISC OS"
+
+/* Define if your locale.h file contains LC_MESSAGES.  */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if NLS is requested.  */
+#define ENABLE_NLS 1
+
+/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
+#undef HAVE_CATGETS
+
+/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
+#undef HAVE_GETTEXT
+
+#undef BIG_ENDIAN_HOST
+#define LITTLE_ENDIAN_HOST 1
+
+#undef HAVE_BYTE_TYPEDEF
+#undef HAVE_USHORT_TYPEDEF
+#undef HAVE_ULONG_TYPEDEF
+#undef HAVE_U16_TYPEDEF
+#undef HAVE_U32_TYPEDEF
+
+#undef HAVE_BROKEN_MLOCK
+
+/* defined if we have a /dev/random and /dev/urandom */
+#undef HAVE_DEV_RANDOM
+/* and the real names of the random devices */
+#undef NAME_OF_DEV_RANDOM
+#undef NAME_OF_DEV_URANDOM
+/* Linux has an ioctl */
+#undef HAVE_DEV_RANDOM_IOCTL
+
+/* see cipher/rndegd.c */
+#undef EGD_SOCKET_NAME
+
+#undef USE_DYNAMIC_LINKING
+#undef HAVE_DL_DLOPEN
+#undef HAVE_DL_SHL_LOAD
+#undef HAVE_DLD_DLD_LINK
+
+#undef USE_SHM_COPROCESSING
+
+#undef IPC_HAVE_SHM_LOCK
+#undef IPC_RMID_DEFERRED_RELEASE
+
+/* set this to limit filenames to the 8.3 format */
+#undef USE_ONLY_8DOT3
+/* defined if we must run on a stupid file system */
+#undef HAVE_DRIVE_LETTERS
+/* defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)
+ * with special properties like no file modes */
+#undef HAVE_DOSISH_SYSTEM
+/* because the Unix gettext has to much overhead on MingW32 systems
+ * and these systems lack Posix functions, we use a simplified version
+ * of gettext */
+#undef USE_SIMPLE_GETTEXT
+/* At some point in the system we need to know that we use the Windows
+ * random module. */
+#undef USE_STATIC_RNDW32
+
+#undef USE_CAPABILITIES
+
+/* Some systems have mkdir that takes a single argument. */
+#undef MKDIR_TAKES_ONE_ARG
+
+/* The number of bytes in a unsigned int.  */
+#define SIZEOF_UNSIGNED_INT 4
+
+/* The number of bytes in a unsigned long.  */
+#define SIZEOF_UNSIGNED_LONG 4
+
+/* The number of bytes in a unsigned long long.  */
+#define SIZEOF_UNSIGNED_LONG_LONG 0
+
+/* The number of bytes in a unsigned short.  */
+#define SIZEOF_UNSIGNED_SHORT 2
+
+/* Define if you have the __argz_count function.  */
+#undef HAVE___ARGZ_COUNT
+
+/* Define if you have the __argz_next function.  */
+#undef HAVE___ARGZ_NEXT
+
+/* Define if you have the __argz_stringify function.  */
+#undef HAVE___ARGZ_STRINGIFY
+
+/* Define if you have the atexit function.  */
+#define HAVE_ATEXIT
+
+/* Define if you have the clock_gettime function.  */
+#undef HAVE_CLOCK_GETTIME
+
+/* Define if you have the dcgettext function.  */
+#undef HAVE_DCGETTEXT
+
+/* Define if you have the dlopen function.  */
+#undef HAVE_DLOPEN
+
+/* Define if you have the fopen64 function.  */
+#undef HAVE_FOPEN64
+
+/* Define if you have the fstat64 function.  */
+#undef HAVE_FSTAT64
+
+/* Define if you have the getcwd function.  */
+#define HAVE_GETCWD
+
+/* Define if you have the gethrtime function.  */
+#undef HAVE_GETHRTIME
+
+/* Define if you have the getpagesize function.  */
+#define HAVE_GETPAGESIZE
+
+/* Define if you have the getrusage function.  */
+#define HAVE_GETRUSAGE
+
+/* Define if you have the gettimeofday function.  */
+#define HAVE_GETTIMEOFDAY
+
+/* Define if you have the memicmp function.  */
+#undef HAVE_MEMICMP
+
+/* Define if you have the memmove function.  */
+#define HAVE_MEMMOVE
+
+/* Define if you have the mlock function.  */
+#undef HAVE_MLOCK
+
+/* Define if you have the mmap function.  */
+#undef HAVE_MMAP
+
+/* Define if you have the munmap function.  */
+#undef HAVE_MUNMAP
+
+/* Define if you have the nl_langinfo function.  */
+#undef HAVE_NL_LANGINFO
+
+/* Define if you have the putenv function.  */
+#define HAVE_PUTENV
+
+/* Define if you have the raise function.  */
+#define HAVE_RAISE
+
+/* Define if you have the rand function.  */
+#define HAVE_RAND
+
+/* Define if you have the setenv function.  */
+#define HAVE_SETENV
+
+/* Define if you have the setlocale function.  */
+#define HAVE_SETLOCALE
+
+/* Define if you have the setrlimit function.  */
+#define HAVE_SETRLIMIT
+
+/* Define if you have the sigaction function.  */
+#define HAVE_SIGACTION
+
+/* Define if you have the sigprocmask function.  */
+#define HAVE_SIGPROCMASK
+
+/* Define if you have the stpcpy function.  */
+#define HAVE_STPCPY
+
+/* Define if you have the strcasecmp function.  */
+#define HAVE_STRCASECMP
+
+/* Define if you have the strchr function.  */
+#define HAVE_STRCHR
+
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP
+
+/* Define if you have the strerror function.  */
+#define HAVE_STRERROR
+
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME
+
+/* Define if you have the stricmp function.  */
+#define HAVE_STRICMP
+
+/* Define if you have the strlwr function.  */
+#undef HAVE_STRLWR
+
+/* Define if you have the strtoul function.  */
+#define HAVE_STRTOUL
+
+/* Define if you have the tcgetattr function.  */
+#define HAVE_TCGETATTR
+
+/* Define if you have the wait4 function.  */
+#define HAVE_WAIT4
+
+/* Define if you have the waitpid function.  */
+#define HAVE_WAITPID
+
+/* Define if you have the <argz.h> header file.  */
+#undef HAVE_ARGZ_H
+
+/* Define if you have the <direct.h> header file.  */
+#undef HAVE_DIRECT_H
+
+/* Define if you have the <gdbm.h> header file.  */
+#undef HAVE_GDBM_H
+
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_H
+
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H
+
+/* Define if you have the <linux/random.h> header file.  */
+#undef HAVE_LINUX_RANDOM_H
+
+/* Define if you have the <locale.h> header file.  */
+#define HAVE_LOCALE_H
+
+/* Define if you have the <malloc.h> header file.  */
+#define HAVE_MALLOC_H
+
+/* Define if you have the <nl_types.h> header file.  */
+#undef HAVE_NL_TYPES_H
+
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H
+
+/* Define if you have the <sys/capability.h> header file.  */
+#undef HAVE_SYS_CAPABILITY_H
+
+/* Define if you have the <sys/ipc.h> header file.  */
+#undef HAVE_SYS_IPC_H
+
+/* Define if you have the <sys/mman.h> header file.  */
+#define HAVE_SYS_MMAN_H
+
+/* Define if you have the <sys/param.h> header file.  */
+#define HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/shm.h> header file.  */
+#undef HAVE_SYS_SHM_H
+
+/* Define if you have the <sys/stat.h> header file.  */
+#define HAVE_SYS_STAT_H
+
+/* Define if you have the <termio.h> header file.  */
+#define HAVE_TERMIO_H
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H
+
+/* Define if you have the <zlib.h> header file.  */
+#define HAVE_ZLIB_H
+
+/* Define if you have the dl library (-ldl).  */
+#undef HAVE_LIBDL
+
+/* Define if you have the dld library (-ldld).  */
+#undef HAVE_LIBDLD
+
+/* Define if you have the gdbm library (-lgdbm).  */
+#undef HAVE_LIBGDBM
+
+/* Define if you have the i library (-li).  */
+#undef HAVE_LIBI
+
+/* Define if you have the nsl library (-lnsl).  */
+#undef HAVE_LIBNSL
+
+/* Define if you have the rt library (-lrt).  */
+#undef HAVE_LIBRT
+
+/* Name of package */
+#define PACKAGE "GnuPG"
+
+
+/* define if compiled symbols have a leading underscore */
+#define WITH_SYMBOL_UNDERSCORE
+
+#ifdef IS_DEVELOPMENT_VERSION
+  #define DEBUG
+/*  #define M_DEBUG */
+  #define M_GUARD
+#endif
+
+
+/* RISC OS specifica */
+#if (__CC_NORCROFT == 1) /* Norcroft */
+# define __attribute__(x) 
+# if (__CC_NORCROFT_VERSION < 544) /* old version of Norcroft */
+#  define inline __inline
+#  define STR(a) #a
+#  define __func__ "[" __FILE__ ":" STR(__LINE__) "]"
+# endif
+#else /* gcc */
+#endif
+
+#include "g10defs.h"
+
+#endif /*G10_CONFIG_H*/

scripts/conf-riscos/include/g10defs.h

@@ -0,0 +1,41 @@
+/* g10defs.h - hand edited by Stefan Bellon to suit RISC OS needs
+ *	Copyright (C) 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+/* Path variables and filing system constants for RISC OS */
+#define G10_LOCALEDIR     "<GnuPG$Dir>.locale"
+#define GNUPG_LIBDIR      "<GnuPG$Dir>"
+#define GNUPG_DATADIR     "<GnuPG$Dir>"
+#define GNUPG_HOMEDIR     "<GnuPGUser$Dir>"
+#define LOCALE_ALIAS_PATH "<GnuPG$Dir>.locale"
+#define GNULOCALEDIR      "<GnuPG$Dir>.locale"
+#define DIRSEP_C            '.'
+#define EXTSEP_C            '/'
+#define DIRSEP_S            "."
+#define EXTSEP_S            "/"
+
+/* This file defines some basic constants for the MPI machinery.  We
+ * need to define the types on a per-CPU basis, so it is done with
+ * this file here.  */
+#define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
+
+/* External process spawning mechanism */
+#if !(defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID))
+#define EXEC_TEMPFILE_ONLY
+#endif

scripts/config.sub

@@ -1,6 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-09-07'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -12,7 +16,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
@@ -25,6 +29,8 @@
 # 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 <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -34,7 +40,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.
 
@@ -45,30 +51,73 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`
 
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+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."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -94,7 +143,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -105,9 +154,17 @@ case $os in
 	-scout)
 		;;
 	-wrs)
-		os=vxworks
+		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -156,64 +213,105 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| 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] | s390 \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v)
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
+	| mn10200 | mn10300 \
+	| ns16k | ns32k \
+	| openrisc \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| s390 | s390x \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| stormy16 | strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 \
+	| we32k \
+	| x86 | xscale \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
+	i*86 | x86_64)
 	  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
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | armv*-* | t3e-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alphapca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| m32r-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| s390-* | s390x-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| ymp-* \
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -250,14 +348,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
@@ -304,13 +402,16 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -358,6 +459,10 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -431,22 +536,21 @@ case $basic_machine in
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
-		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -458,14 +562,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
-	i386-go32 | go32)
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-mingw32 | mingw32)
-		basic_machine=i386-unknown
-		os=-mingw32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -491,10 +587,14 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | *MiNT)
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
@@ -512,14 +612,22 @@ case $basic_machine in
 	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
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -529,7 +637,7 @@ case $basic_machine in
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-corel
+		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -577,9 +685,16 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -606,45 +721,59 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=rs6000-ibm
+	power)	basic_machine=power-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/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+	        ;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+	        ;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -724,6 +853,10 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -732,6 +865,10 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -762,8 +899,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
@@ -784,11 +921,15 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
 		;;
-	xps | xps100)
+        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	z8k-*-coff)
@@ -827,16 +968,23 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc | sparcv9)
+	sh3 | sh4 | sh3eb | sh4eb)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -855,6 +1003,9 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -878,8 +1029,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|'`
@@ -887,9 +1038,6 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-qnx)
-		os=-qnx
-		;;
 	-svr4*)
 		os=-sysv4
 		;;
@@ -914,14 +1062,30 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto*)
+		os=-nto-qnx
+		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -935,6 +1099,12 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -957,7 +1127,10 @@ case $os in
 		os=-sysv
 		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
@@ -993,8 +1166,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -*MiNT)
-		os=-mint
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1021,13 +1194,16 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
 		os=-aout
 		;;
-	pdp11-*)
+	pdp10-*)
+		os=-tops20
+		;;
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1117,25 +1293,25 @@ 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)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1195,7 +1371,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -1213,12 +1389,23 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -*MiNT)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

scripts/db2html.in

@@ -1,151 +0,0 @@
-#!/bin/sh
-# db2html.in - Docbook to HTML rendering (wk 2000-02-15)
-#
-#	Copyright (C) 2000 Free Software Foundation
-#
-# This 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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-nosplit=no
-copyfiles=no
-stylesheet=@DSL_FOR_HTML@
-JADE=@JADE@
-
-usage () {
-    echo 'usage: db2html [--nosplit] [--copyfiles] filename' >&2
-    exit 1
-}
-
-
-while test "`echo $1 | head -c1`" = "-"; do
-    case $1 in
-      --version)
-	cat <<EOF
-db2html 0.5
-Copyright (C) 2000 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.
-
-stylesteet: $stylesheet
-EOF
-	exit 0
-	;;
-      --help|-h|-help)
-	usage
-	;;
-      --nosplit)
-	nosplit=yes
-	;;
-      --copyfiles)
-	copyfiles=yes
-	;;
-      --)
-	shift
-	break
-	;;
-      *)
-	echo "invalid option $1" >&2
-	exit 1
-	;;
-    esac
-    shift
-done
-
-if test $# = 1; then
-   input="$1"
-else
-   usage
-fi
-
-# grep the document type
-doctype=`grep -i '\<doctype' $input|awk 'NR==1 {print $2}'| tr '[A-Z]' '[a-z]'`
-if test -z $doctype; then
-    doctype=book
-    echo "no DOCTYPE found - assuming '$doctype'" >&2
-else
-    echo "DOCTYPE is '$doctype'" >&2
-fi
-
-output="`basename $input| sed 's/\.sgml$//'`.html"
-
-
-if test $nosplit = yes; then
-    echo "running jade on '$input' ..." >&2
-    $JADE -d $stylesheet -t sgml -i html -V nochunks $input > $output
-    echo "$output created"
-    exit 0
-fi
-
-if test -d html ; then
-    :
-else
-    if mkdir html; then
-	echo "'html' directory created" >&2
-    else
-	echo "failed to create 'html' directory" >&2
-	exit 1
-    fi
-fi
-
-outputdir="html/`basename $input| sed 's/\.sgml$//'`"
-
-if test -d $outputdir ; then
-    :
-else
-    if mkdir $outputdir; then
-	echo "'$outputdir' created" >&2
-    else
-	echo "failed to create '$outputdir'" >&2
-	exit 1
-    fi
-fi
-echo "creating html pages in '$outputdir' ..." >&2
-if test "$input" = "`basename $input`"; then
-    inp="../../$input"
-else
-    inp="$input"
-fi
-echo "running jade on '$inp' ..." >&2
-(cd $outputdir && $JADE -t sgml -i html -d $stylesheet $inp )
-echo "html version in '$outputdir' created" >&2
-
-# break out all filerefs and copy them to the outputdirectory
-# fixme: handling of path components is wrong
-if test $copyfiles = yes; then
-    echo "looking for filerefs ..." >&2
-    for file in `nsgmls -i html $input \
-		    | awk '/^AFILEREF[ \t]+CDATA/ {print $3}'`; do
-	d=$outputdir/`basename $file`
-	if cat $file > $outputdir/`basename $file` ; then
-	    echo "  $file -> $d" >&2
-	fi
-    done
-fi
-
-mainfile=`ls $outputdir/${doctype}* | head -1`
-
-cat > $output <<EOF
-<html><title>$output</title>
-<body>
-
-<a href="$mainfile">$mainfile</a>
-
-</body>
-</html>
-EOF
-
-echo "$output created with link to '$mainfile'" >&2
-
-exit 0
-

scripts/distfiles

@@ -1,13 +1,5 @@
-config.guess
-config.sub
-install-sh
-mkinstalldirs
 mkdiff
-missing
+build-w32
 gnupg.spec.in
 autogen.sh
-ChangeLog
-ltconfig
-ltmain.sh
-db2html.in
 

scripts/gnupg.spec.in

@@ -4,32 +4,70 @@
 #
 %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
+Summary(pl): Narzedzie GNU do szyfrowania i podpisywania danych
+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
+Group(it): Applicazioni/Crittografia
 Source: ftp://ftp.gnupg.org/pub/gcrypt/%{name}-%{version}.tar.gz
 URL: http://www.gnupg.org
 Provides: gpg openpgp
 BuildRoot: /tmp/rpmbuild_%{name}
 
 %changelog
+* Fri Apr 19 2002 David Shaw <dshaw@jabberwocky.com>
+- Removed OPTIONS and pubring.asc - no longer used
+- Added doc/samplekeys.asc
+* Sun Mar 31 2002 David Shaw <dshaw@jabberwocky.com>
+- Added the gpgkeys_xxx keyserver helpers.
+- Added a * to catch variations on the basic gpg man page (gpg, gpgv).
+- Mark options.skel as a config file.
+- Do not include the FAQ/faq.html twice (in /doc/ and /share/).
+
+* Wed Sep 06 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Added Polish description and summary (Kindly provided by  
+  Lukasz Stelmach <stelmacl@ee.pw.edu.pl>)
+  
+* Thu Jul 13 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Added a * to catch all formats for man pages (plain, gz, bz2...)    
+
+* Mon May 01 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Some corrections in French description, thanks to Gaël Quéri
+  <gqueri@mail.dotcom.fr>; Some corrections to Italian descriptions.
+
+* Tue Apr 25 2000 Fabio Coatti <cova@ferrara.linux.it>
+- Removed the no longer needed patch for man page by Keith Owens
+
+* Wed Mar 1 2000 Petr Kri¹tof <Petr@Kristof.CZ> 
+- Czech descriptions added; some fixes and updates.
+
+* Sat Jan 15 2000 Keith Owens <kaos@ocs.com.au>
+- Add missing man page as separate patch instead of updating the tar file.
+
+* Mon Dec 27 1999 Fabio Coatti <cova@ferrara.linux.it> 
+- Upgraded for 1.0.1 (added missing gpg.1 man page)
+
 * Sat May 29 1999 Fabio Coatti <cova@ferrara.linux.it>
-- Some corrections in French description, thanks to 
-Gaël Quéri <gqueri@mail.dotcom.fr>  
+- Some corrections in French description, thanks to Gaël Quéri <gqueri@mail.dotcom.fr>  
 
 * Mon May 17 1999 Fabio Coatti <cova@felix.unife.it>
 - Added French description, provided by 
-Christophe Labouisse <labouiss@cybercable.fr>
+  Christophe Labouisse <labouiss@cybercable.fr>
 
 * Thu May 06 1999 Fabio Coatti <cova@felix.unife.it> 
 - Upgraded for 0.9.6 (removed gpgm)
 
 * Tue Jan 12 1999 Fabio Coatti <cova@felix.unife.it>
-- LINGUAS variable is now unset in configure to ensure that all
-  languages will be built. (Thanks to Luca Olivetti <luca@luca.ddns.org>)
+- LINGUAS variable is now unset in configure to ensure that all languages will be built. (Thanks to Luca Olivetti <luca@luca.ddns.org>)
  
 * Sat Jan 02 1999 Fabio Coatti <cova@felix.unife.it>
 - Added pl language file.
@@ -38,24 +76,57 @@ Christophe Labouisse <labouiss@cybercable.fr>
 * Sat Dec 19 1998 Fabio Coatti <cova@felix.unife.it>
 - Modified the spec file provided by Caskey L. Dickson <caskey-at-technocage.com>
 - Now it can be built also by non-root. Installation has to be done as
-root, gpg is suid.
+  root, gpg is suid.
 - Added some changes by  Ross Golder <rossigee@bigfoot.com>
 - 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ù.
+
+%description -l pl
+GnuPG (GNU Privacy Guard) jest nazedziem do szfrowania danych i tworzenia
+cyfrowych podpisów. GnuPG posiada zaawansowane mozliwosci obslugi kluczy
+i jest zgodne z OpenPGP, proponowanym standardem internetowym opisanym
+w RFC2440. Poniewaz GnuPG nie uzywa zadnych opatentowanych algorytmów
+nie jest wiec zgodne z jaka kolwiek wersja PGP2 (PGP2.x kozysta jedynie
+z algorytmów: IDEA, opatentowanego na calym swiecie, oraz RSA, którego
+patent na terenie Stanów Zjednoczonych wygasa 20 wrzesnia 2000).         
 
 %prep
 rm -rf $RPM_BUILD_ROOT
@@ -67,7 +138,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
@@ -86,25 +157,20 @@ make install-strip prefix=$RPM_BUILD_ROOT/usr
 %doc %attr (-,root,root) PROJECTS
 %doc %attr (-,root,root) doc/DETAILS
 %doc %attr (-,root,root) doc/FAQ
+%doc %attr (-,root,root) doc/faq.html
 %doc %attr (-,root,root) doc/HACKING
 %doc %attr (-,root,root) doc/OpenPGP
-%doc %attr (-,root,root) g10/pubring.asc
-%doc %attr (-,root,root) g10/OPTIONS
+%doc %attr (-,root,root) doc/samplekeys.asc
 
-%attr (-,root,root) /usr/man/man1/gpg.1
+%attr (-,root,root) /usr/man/man1/gpg*.1*
 %attr (4755,root,root) /usr/bin/gpg
+%attr (-,root,root) /usr/bin/gpgkeys_*
 
-%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}
+
+%config %attr (-,root,root) /usr/share/%{name}/options.skel
 
 %clean
 rm -rf $RPM_BUILD_ROOT

scripts/gnupgbug

@@ -0,0 +1,185 @@
+#!/bin/sh
+
+#
+#     File a bug against the GNU Privacy Guard.
+#
+
+#
+#     Copyright (c) 2000 Thomas Roessler <roessler@guug.de>
+#
+#
+#     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="submit@bugs.guug.de"
+DEBIAN_SUBMIT="submit@bugs.debian.org"
+
+
+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
+

scripts/install-sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # install - install a program, script, or datafile
 # This comes from X11R5 (mit/util/scripts/install.sh).
@@ -109,7 +109,7 @@ then
 	echo "install:	no input file specified"
 	exit 1
 else
-	true
+	:
 fi
 
 if [ x"$dir_arg" != x ]; then
@@ -118,8 +118,9 @@ if [ x"$dir_arg" != x ]; then
 	
 	if [ -d $dst ]; then
 		instcmd=:
+		chmodcmd=""
 	else
-		instcmd=mkdir
+		instcmd=$mkdirprog
 	fi
 else
 
@@ -129,7 +130,7 @@ else
 
 	if [ -f $src -o -d $src ]
 	then
-		true
+		:
 	else
 		echo "install:  $src does not exist"
 		exit 1
@@ -140,7 +141,7 @@ else
 		echo "install:	no destination specified"
 		exit 1
 	else
-		true
+		:
 	fi
 
 # If destination is a directory, append the input filename; if your system
@@ -150,7 +151,7 @@ else
 	then
 		dst="$dst"/`basename $src`
 	else
-		true
+		:
 	fi
 fi
 
@@ -162,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
+defaultIFS='
+	'
 IFS="${IFS-${defaultIFS}}"
 
 oIFS="${IFS}"
@@ -182,7 +183,7 @@ while [ $# -ne 0 ] ; do
         then
 		$mkdirprog "${pathcomp}"
 	else
-		true
+		:
 	fi
 
 	pathcomp="${pathcomp}/"
@@ -193,10 +194,10 @@ if [ x"$dir_arg" != x ]
 then
 	$doit $instcmd $dst &&
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
 else
 
 # If we're going to rename the final executable, determine the name now.
@@ -215,7 +216,7 @@ else
 	then
 		dstfile=`basename $dst`
 	else
-		true
+		:
 	fi
 
 # Make a temp file name in the proper directory.
@@ -234,10 +235,10 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
 
 # Now rename the file to the real destination.
 

scripts/mail-to-translators

@@ -0,0 +1,64 @@
+#!/bin/sh
+# mail a compressed version of the current translation to the Last-Translator
+#
+
+SENDMAIL="/usr/sbin/sendmail"
+
+for file in *.po; do
+    addr=$(awk '/Last-Translator:/ { printf "%s", $0; exit 0}' $file | sed 's/.*\(<.*>\).*/\1/')
+    ll=$(basename $file .po)    
+
+    if ! msgfmt -vc $file 2>&1| egrep -q 'fuzzy|untranslated|error'; then
+        echo "$file: okay" >&2
+        continue;
+    fi    
+
+    if [ -z "$addr" ]; then
+        echo "$file: no translator known" >&2
+        continue;
+    fi
+
+    echo "$file: sending to $addr"
+    ( cat <<EOF
+From: translations@gnupg.org
+To: $addr
+Subject: GnuPG translation ($ll)
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary="=-=-="
+
+--=-=-=
+
+Hi!
+
+Please find attached the latest version of the PO file for your GnuPG
+translation ($file).  I would appreciate if you can fix any remaining
+fuzzy or untranslated entries.  If you need access to the code
+please use http://cvs.gnupg.org or get the latest snapshot from
+ftp://ftp.gnupg.org/gcrypt/devel/.
+
+Output of msgfmt is:
+$(msgfmt --check --statistics $file 2>&1 | head)
+
+If you are not able to continue the translation work, I suggest to
+pass this message on to another translator and drop me a short note.
+
+Thanks,
+
+  Werner
+
+
+--=-=-=
+Content-Type: application/octet-stream
+Content-Disposition: attachment; filename=gnupg-${file}.gz
+Content-Transfer-Encoding: base64
+
+EOF
+
+gzip <$file | mimencode 
+
+echo ""
+echo "--=-=-=--"
+echo ""
+    ) | $SENDMAIL -oi "$addr"
+
+done

scripts/missing

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,37 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, 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.
+
 if test $# -eq 0; then
   echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
 
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
 case "$1" in
 
   -h|--h|--he|--hel|--help)
@@ -35,19 +61,24 @@ error status if there is no known handling for PROGRAM.
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
   automake     touch all \`Makefile.in' files
-  bison        touch file \`y.tab.c'
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  yacc         touch file \`y.tab.c'"
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
+    echo "missing 0.4 - GNU automake"
     ;;
 
   -*)
@@ -56,42 +87,100 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal)
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
+         you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    touch config.h.in
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
     ;;
 
-  automake)
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print \
-      | sed 's/^\(.*\).am$/touch \1.in/' \
-      | sh
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
     ;;
 
   bison|yacc)
@@ -100,10 +189,84 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
-    touch y.tab.c
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
     ;;
 
   makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -119,6 +282,45 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $file
     ;;
 
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar ${1+"$@"} && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar ${1+"$@"} && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your

scripts/mk-w32-dist

@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+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
+mingw32 strip gpg.exe
+if [ -f ../doc/gpg.man ] ; then
+  sed `printf "s/\b.//g"` ../doc/gpg.man >gpg.man
+else
+  man -Tlatin1 -l ../doc/gpg.1 | sed `printf "s/\b.//g"`  >gpg.man
+fi
+todos gpg.man
+cp ${srcdir}/README .
+todos README
+cp ${srcdir}/COPYING .
+todos COPYING
+ln ${srcdir}/doc/README.W32 .
+todos README.W32
+ln ${srcdir}/doc/FAQ .
+todos FAQ
+for i in ${srcdir}/po/*.gmo; do ln $i "$(basename $i .gmo).mo" ; done
+zip "gnupg-w32-$(cat ${srcdir}/VERSION).zip" *
+
+
+
+
+
+

scripts/mkdiff

@@ -1,25 +1,34 @@
 #!/bin/sh
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-if [ $# = 1 ]; then
-    pack="$1"
-    vprf=""
-elif [ $# = 2 ] ; then
-    pack="$1"
-    vprf="$2"
-else
-    echo "usage: mkdiff package-name [version-prefix]" >&2
+# Please note that this script is now maintained outside of GNUPG.
+# To get the most up to date version use
+# cvs -d :pserver:anoncvs@cvs.gnupg.org:/cvs/wk checkout misc-scripts/mkdiff
+
+if [ $# != 1 ] ; then
+    echo "usage: mkdiff package-name" >&2
     exit 1
 fi
 
+pack="$1"
+
 set -e
 
-curr_ver=$(ls $pack-${vprf}*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\
+curr_ver=$(ls $pack-*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\
 	   | sort -r -t '.' -n +0 -1 +1 -2 +2 | head -1 )
 if [ ! -f $pack-$curr_ver.tar.gz ]; then
     echo "mkdiff: no current version of package $pack found" >&2
     exit 1
 fi
-prev_ver=$(ls $pack-${vprf}*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\
+prev_ver=$(ls $pack-*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\
 	   | sort -r -t '.' -n +0 -1 +1 -2 +2 | head -2 | tail -1 )
 if [ "$prev_ver" = "$curr_ver"  ]; then
     echo "mkdiff: no previous version of package $pack found" >&2

scripts/mkinstalldirs

@@ -16,18 +16,44 @@ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
 while test $# -gt 0 ; do
    case "${1}" in
      -h | --help | --h* )			# -h for help
-        echo "${usage}" 1>&2; exit 0 ;;
+	echo "${usage}" 1>&2; exit 0 ;;
      -m )					# -m PERM arg
-        shift
-        test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-        dirmode="${1}"
-        shift ;;
+	shift
+	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+	dirmode="${1}"
+	shift ;;
      -- ) shift; break ;;			# stop option processing
      -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
      * )  break ;;				# first non-opt arg
    esac
 done
 
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+0) exit 0 ;;
+esac
+
+case $dirmode in
+'')
+  if mkdir -p -- . 2>/dev/null; then
+    echo "mkdir -p -- $*"
+    exec mkdir -p -- "$@"
+  fi ;;
+*)
+  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    echo "mkdir -m $dirmode -p -- $*"
+    exec mkdir -m "$dirmode" -p -- "$@"
+  fi ;;
+esac
+
 for file
 do
    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
@@ -42,24 +68,24 @@ do
      esac
 
      if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
+	echo "mkdir $pathcomp"
 
-        mkdir "$pathcomp" || lasterr=$?
+	mkdir "$pathcomp" || lasterr=$?
 
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
+	if test ! -d "$pathcomp"; then
+	  errstatus=$lasterr
 	else
 	  if test ! -z "$dirmode"; then
 	     echo "chmod $dirmode $pathcomp"
 
 	     lasterr=""
-	     chmod $dirmode "$pathcomp" || lasterr=$?
+	     chmod "$dirmode" "$pathcomp" || lasterr=$?
 
 	     if test ! -z "$lasterr"; then
 	       errstatus=$lasterr
 	     fi
 	  fi
-        fi
+	fi
      fi
 
      pathcomp="$pathcomp/"
@@ -69,6 +95,7 @@ done
 exit $errstatus
 
 # Local Variables:
-# mode:shell-script
-# sh-indentation:3
+# mode: shell-script
+# sh-indentation: 3
 # End:
+# mkinstalldirs ends here

scripts/mksnapshot

@@ -21,7 +21,7 @@ This is a snapshot of the current CVS head branch!
 
 It may not compile or not work.  Please don't report
 bugs about this snapshot release it is just for your
-convenience and to reduce the load of our CVS server.
+convenience and to reduce the load of out CVS server.
 
 Thanks,
 

scripts/mkwebpage

@@ -1,44 +1,105 @@
 #!/bin/sh
 # Make a snapshot of the CVS head revision for the gnupg webpages
 
+
 set -e
 
-myhome="$HOME/pub"
-pgm="gnupg-www"
-mod="gnupg-www"
-MKWEBSITE=$HOME/bin/mkwebsite
+cd $HOME/pub
 
-cd $myhome
+extract_date () {
+    # This strange construct is to speed up things.  Grouping a "s" and a "q"
+    # does not work. Anyway we should use awk instead.
+    # Have to quote the I from $Id so that CVS does not expand it
+    sed '/^.*\$[I]d:.*\$.*$/q' $1 |
+    sed -n 's!^.*\$[I]d: [^ ]\+ [^ ]\+ \([0-9]*\)/\([0-9]*\)/\([0-9]*\) [^ ]\+ \([^ ]\+\).*$!\1-\2-\3 \4!p'
+}
 
-rm -rf $pgm.tmp 2>/dev/null || true
-rm -rf $pgm.new || true
-mkdir  $pgm.new || true
-rm -rf $pgm.old || true
-cvs -Q export -r HEAD -d $pgm.tmp $mod
-cat <<EOF >$pgm.tmp/en/NEWS
+# We have to edit most files
+sed_it () {
+    src=$1
+    dst=$2
+
+    for srcdir in `find $src -type d -print` ; do
+	dstdir=`echo "$srcdir" | sed "s/^$src/$dst/g"`
+	mkdir $dstdir || true
+	for sf in `find $srcdir -type f -maxdepth 1 -print`; do
+	    updated=`extract_date $sf`
+	    df="$dstdir/`basename $sf`"
+	    case "$df" in
+		*.html)
+		    sed "/@FOOTER@/ {
+			r $src/footer.html.inc
+			d
+			}
+			/^<body>$/ {
+			r $src/body-tag.html.inc
+			d
+			}
+			/@UPDATED@/c\\
+Updated: $updated \\
+<hr>
+			/@INSERT_BUGLIST_HERE@/ {
+			r $src/BUGS
+			d
+			}
+			/@HOSTEDBY@/ {
+			r $src/hostedby.html.inc
+			d
+			}
+		     " $sf > $df
+		    ;;
+		*.html.inc | *~ | *.tmp | */BUGS )
+		    :
+		    ;;
+		*)
+		    cat $sf > $df
+		    ;;
+	    esac
+	done
+    done
+}
+
+
+do_export () {
+    pgm=$1
+    mod=$2
+
+    rm -rf $pgm.tmp 2>/dev/null || true
+    rm -rf $pgm.new || true
+    rm -rf $pgm.old || true
+    cvs -Q export -r HEAD -d $pgm.tmp $mod
+    cat <<EOF >$pgm.tmp/NEWS
 [ This is a snapshot of the NEWS file from the CVS head revision.
   You will find the NEWS for the latest revision below the line
-  "Noteworthy changes in version 1.x.y".
+  "Noteworthy changes in version 0.x.y".
 						     (wk $(date +%Y-%m-%d)) ]
 
 
 EOF
-cvs -Q checkout -p gnupg/NEWS >>$pgm.tmp/en/NEWS
-cvs -Q checkout -p gnupg/BUGS | sed  '1,/^~~~~~~~~~~~/ d' > $pgm.tmp/en/include-file-1.tmp
-echo "(List generated from CVS: " $(date +%Y-%m-%d) ")"  >> $pgm.tmp/en/include-file-1.tmp
-cd $pgm.tmp
-$MKWEBSITE --cvs --use-this-dir $myhome/$pgm.new
-cd $myhome
-cp -a gph $pgm.new/ || true
+    cvs -Q checkout -p gnupg/NEWS >>$pgm.tmp/NEWS
+    cvs -Q checkout -p gnupg/BUGS | sed  '1,/^~~~~~~~~~~~/ d' > $pgm.tmp/BUGS
+    echo "(List generated from CVS: " $(date +%Y-%m-%d) ")"  >> $pgm.tmp/BUGS
+    sed_it $pgm.tmp $pgm.new
+    rm -rf $pgm.tmp || true
+    ln -sf gnupg.html $pgm.new/index.html
 
-rm -rf $pgm.tmp || true
+    rm -rf $pgm.old || true
+    [ -d $pgm ] && mv $pgm $pgm.old
+    if ! mv $pgm.new $pgm ; then
+	echo "rename failed - restoring" >&2
+	mv $pgm.old $pgm
+	exit 1
+    fi
+    rm -rf $pgm.old || true
+}
 
-rm -rf $pgm.old || true
-[ -d $pgm ] && mv $pgm $pgm.old
-if ! mv $pgm.new $pgm ; then
-    echo "rename failed - restoring" >&2
-    mv $pgm.old $pgm
-    exit 1
-fi
-rm -rf $pgm.old || true
+
+do_export gnupg-www gnupg-www
+
+#cd gnupg-www
+#tar czf /home/ftp/pub/gcrypt/.old/webpages.tmp *
+#mv /home/ftp/pub/gcrypt/old/webpages.tmp /home/ftp/pub/gcrypt/old/webpages.tar.gz
+
+
+exit 0