Patches for gnupg 1.0.7 / cygwin 1.3.10
Volker Quetschke
quetschke@scytek.de
Wed Aug 21 00:05:05 2002
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigE3C86F66ED83F103EB4B9373
Content-Type: multipart/mixed;
boundary="------------010607010408050903070503"
This is a multi-part message in MIME format.
--------------010607010408050903070503
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Hi Werner,
>>Most patches won't touch any other OS than cygwin so it should be save
>>to commit them already (if approved) to the cvs. All other patches have
>>to wait then until 1.2.0 is released.
>
> Well, we need legal papers to apply larger changes (copyright does
> only know about text so code complexity is not a matter). Assuming
> that you are able to sign the papers, it takes some while to process
If you mean that I have the rights to do so, yes that should be possible.
> them; so it is probably better when I do the changes.
>
> You might want to send me the current patches anyway so that I can
> check whether I forgot something.
Ok, attached are the patches for the cygwin gnupg 1.0.7-3 release.
To see what I changed here are my cygwin port notes:
---------------------------------------------------------------------------
Port Notes:
----- version 1.0.7-3 -----
* Fixed locale files.
----- version 1.0.7-2 -----
* Fixed textmount usage:
- gpg now handles configuration/key/trustdb files on textmounts correctly.
- All files to be de-/encrypted are now opened in binary mode. Consider the
use of dos2unix or unix2dos if you have problems with this.
* Disabled the "Please note that you don't have secure memory on this system"
warning. PLEASE NOTE you really don't have secure memory on your windows
system
* Fixed the use of loadable modules. Now all modules can be loaded with the
--load-extension=<modulename> command. The standard build will link
rndlinux statically, but if you run
$ ./configure --enable-static-rnd=none
then also the rndegd random generator modules will be build as a loadable
module. Attention! Now you have to call gpg with --load-extension=rnd???
to make it work properly.
If you are entitled to use the idea algorythm you can have a look into
build_idea.sh and find some instructions how to build this module.
WE DONT PROVIDE THE NEEDED SOURCECODE! You have to get the idea.c file
somewhere else.
----- version 1.0.7-1 -----
Initial release.
* Uses /dev/random
* Uses cygwin file system.
* Use env. variable GNUPGHOME instead of windows registry for cygwin.
* You find build instructions for a windows native executable (MinGW) after
$ cd /usr/src
$ ./gnupg-1.0.7-X.sh prep
in /usr/src/gnupg-1.0.7-X/CYGWIN-PATCHES/gnupg.MinGW.README
---------------------------------------------------------------------------
and the ChangeLog:
---------------------------------------------------------------------------
2002-08-11 Volker Quetschke <quetschke@scytek.de>
* configure.ac: (Native w32 build) Added check for strcasecmp.
* cipher/rndw32.c: (Native w32 build) __MINGW32_ also needs winioctl.h.
* Makefile.am, configure.ac, g10/Makefile.am, po/Makevars,
tools/Makefile.am, util/Makefile.am: Changes to use gettext 0.11.2.
* cipher/random.c, g10/tdbdump.c, g10/tdbio.c, util/iobuf.c: Changes
to allow the use of cygwin textmounts.
* util.h: Add check if stricmp is already defined before defining it.
* util/secmem.c: Disables the unsecure memory warning on cygwin.
2002-08-10 Volker Quetschke <quetschke@scytek.de>
* scripts/autogen.sh: Add check for the correct libtool version and
the libtoolize command.
* configure.ac: Add prerequisites for libtool and change object
fileendings to libtool style ".lo" and ".la". Removed tiger and
rndegd from the list of non-buildable modules for cygwin.
* cipher/Makefile.am: Use libtool for the build of the extension
modules.
* cipher/rndegd.c: Add function strusage when rndegd is build
as a module.
* cipher/rndlinux.c: Add function strusage when rndegd is build
as a module.
* mpi/Makefile.am: Use/create libtool libraries instead of ".a"
libraries and add a rule to create ".lo" objects from ".S" files.
* util/Makefile.am: Use/create libtool libraries instead of ".a"
libraries.
* g10/Makefile.am: Use libtool libraries instead of ".a" libraries.
* tools/Makefile.am: Use libtool libraries instead of ".a" libraries.
* checks/Makefile.am: Search for modules in .libs directory.
2002-07-04 Volker Quetschke <quetschke@scytek.de>
* g10/tdbio.c: Removed special case for cygwin.
* util/w32reg.c: Removed special case for cygwin.
2002-06-15 Volker Quetschke <quetschke@scytek.de>
* acinclude.m4: Removed hardcoded ac_cv_sys_symbol_underscore=yes
setting for cygwin, fixed the WITH_SYMBOL_UNDERSCORE detection for
all (?) systems with symbols with underscores (works with cygwin).
* cipher/dynload.c: dlsym doesn't need the symbol underscore on
cygwin.
2002-06-10 Release of 1.0.7-1
2002-06-10 Volker Quetschke <quetschke@scytek.de>
* scripts/autogen.sh: Added --copy to gettextize and automake.
2002-06-05 Volker Quetschke <quetschke@scytek.de>
* configure.ac: (same as patch in cvs) Added check for strcasecmp
and strncasecmp. Removed stricmp and memicmp checks.
* cipher/rndw32.c: [mingw] Enabled winioctl.h for mingw builds with
cygwin, I don't know if this bothers pure mingw installations
without cygwin.
2002-06-01 Volker Quetschke <quetschke@scytek.de>
* configure.ac: Remove unnecessary cases for cygwin. Cygwin (Version
1.3.10 and up) doesn't need the AC_DEFINE()s for USE_ONLY_8DOT3,
HAVE_DRIVE_LETTERS, HAVE_DOSISH_SYSTEM, USE_SIMPLE_GETTEXT and does
have a /dev/random. This repairs also the $(RANLIB) variable for
cygwin, it wasn't set for cygwin and try_gettext="no" and the build
stopped. Also added $(EXEEXT) for the files in DYNAMIC_CIPHER_MODS
to help automake.
* g10/exec.c: Use cygwin fileaccess instead of windows fileaccess for
cygwin. ATTENTION! Gnupg now uses the mount table of cygwin. You can
still use drive letters but use "/" instead of "\".
E.g: gnupg -e c:/temp/important.doc
* g10/passphrase: Use cygwin fileaccess instead of windows fileaccess
for cygwin. Use the POSIX variant of gpg agent for cygwin not the
windows registry. See warning above.
* g10/g10.c: Use env. variable GNUPGHOME instead of windows registry
for cygwin.
* g10/gpgv.c: Use env. variable GNUPGHOME instead of windows registry
for cygwin.
---------------------------------------------------------------------------
Some of the changes are not longer needed because you decided to remove the use
of shared libraries. I changed the build process to use libtool (it was easier for
the shared libraries) and also had to use a newer gettext (0.11.2). To make this
1.0.7 compilable with cygwin you have to use the patched scripts/autogen.sh. to
generate/copy the needed auto* and gettext scrips/files.
If you have questions, feel free to ask!
The 1.1.90 wasn't that different to the 1.0.7 and does not have the textmode
fixes, if you like to have it anyway, just ask.
Bye
Volker
P.S. You can get the sources plus patch also with the setup.exe (The
download/install program for cygwin and packages) from www.cygwin.com.
--------------010607010408050903070503
Content-Type: text/plain;
name="gnupg-1.0.7-3.dev.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="gnupg-1.0.7-3.dev.patch"
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/ChangeLog gnupg-1.0.7/CYGWIN-PATCHES/ChangeLog
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/ChangeLog 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,86 @@
+2002-08-11 Volker Quetschke <quetschke@scytek.de>
+
+ * configure.ac: (Native w32 build) Added check for strcasecmp.
+ * cipher/rndw32.c: (Native w32 build) __MINGW32_ also needs winioctl.h.
+ * Makefile.am, configure.ac, g10/Makefile.am, po/Makevars,
+ tools/Makefile.am, util/Makefile.am: Changes to use gettext 0.11.2.
+ * cipher/random.c, g10/tdbdump.c, g10/tdbio.c, util/iobuf.c: Changes
+ to allow the use of cygwin textmounts.
+ * util.h: Add check if stricmp is already defined before defining it.
+ * util/secmem.c: Disables the unsecure memory warning on cygwin.
+
+2002-08-10 Volker Quetschke <quetschke@scytek.de>
+
+ * scripts/autogen.sh: Add check for the correct libtool version and
+ the libtoolize command.
+ * configure.ac: Add prerequisites for libtool and change object
+ fileendings to libtool style ".lo" and ".la". Removed tiger and
+ rndegd from the list of non-buildable modules for cygwin.
+ * cipher/Makefile.am: Use libtool for the build of the extension
+ modules.
+ * cipher/rndegd.c: Add function strusage when rndegd is build
+ as a module.
+ * cipher/rndlinux.c: Add function strusage when rndegd is build
+ as a module.
+ * mpi/Makefile.am: Use/create libtool libraries instead of ".a"
+ libraries and add a rule to create ".lo" objects from ".S" files.
+ * util/Makefile.am: Use/create libtool libraries instead of ".a"
+ libraries.
+ * g10/Makefile.am: Use libtool libraries instead of ".a" libraries.
+ * tools/Makefile.am: Use libtool libraries instead of ".a" libraries.
+ * checks/Makefile.am: Search for modules in .libs directory.
+
+2002-07-04 Volker Quetschke <quetschke@scytek.de>
+
+ * g10/tdbio.c: Removed special case for cygwin.
+ * util/w32reg.c: Removed special case for cygwin.
+
+2002-06-15 Volker Quetschke <quetschke@scytek.de>
+
+ * acinclude.m4: Removed hardcoded ac_cv_sys_symbol_underscore=yes
+ setting for cygwin, fixed the WITH_SYMBOL_UNDERSCORE detection for
+ all (?) systems with symbols with underscores (works with cygwin).
+
+ * cipher/dynload.c: dlsym doesn't need the symbol underscore on
+ cygwin.
+
+2002-06-10 Release of 1.0.7-1
+
+2002-06-10 Volker Quetschke <quetschke@scytek.de>
+
+ * scripts/autogen.sh: Added --copy to gettextize and automake.
+
+2002-06-05 Volker Quetschke <quetschke@scytek.de>
+
+ * configure.ac: (same as patch in cvs) Added check for strcasecmp
+ and strncasecmp. Removed stricmp and memicmp checks.
+
+ * cipher/rndw32.c: [mingw] Enabled winioctl.h for mingw builds with
+ cygwin, I don't know if this bothers pure mingw installations
+ without cygwin.
+
+2002-06-01 Volker Quetschke <quetschke@scytek.de>
+
+ * configure.ac: Remove unnecessary cases for cygwin. Cygwin (Version
+ 1.3.10 and up) doesn't need the AC_DEFINE()s for USE_ONLY_8DOT3,
+ HAVE_DRIVE_LETTERS, HAVE_DOSISH_SYSTEM, USE_SIMPLE_GETTEXT and does
+ have a /dev/random. This repairs also the $(RANLIB) variable for
+ cygwin, it wasn't set for cygwin and try_gettext="no" and the build
+ stopped. Also added $(EXEEXT) for the files in DYNAMIC_CIPHER_MODS
+ to help automake.
+
+ * g10/exec.c: Use cygwin fileaccess instead of windows fileaccess for
+ cygwin. ATTENTION! Gnupg now uses the mount table of cygwin. You can
+ still use drive letters but use "/" instead of "\".
+ E.g: gnupg -e c:/temp/important.doc
+
+ * g10/passphrase: Use cygwin fileaccess instead of windows fileaccess
+ for cygwin. Use the POSIX variant of gpg agent for cygwin not the
+ windows registry. See warning above.
+
+ * g10/g10.c: Use env. variable GNUPGHOME instead of windows registry
+ for cygwin.
+
+ * g10/gpgv.c: Use env. variable GNUPGHOME instead of windows registry
+ for cygwin.
+
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/build_gpg_native.sh gnupg-1.0.7/CYGWIN-PATCHES/build_gpg_native.sh
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/build_gpg_native.sh 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/build_gpg_native.sh 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,46 @@
+#!/bin/sh
+# This script will build gpg as a native windows application with cygwin.
+# (You need the patched sourcecode!)
+
+echo ----------------------------------------------------------
+echo You have to get your build environement right:
+echo $ cd /usr/src
+echo $ tar xjvf gnupg-1.0.7-2-src.tar.bz2
+echo $ ./gnupg-1.0.7-2.sh prep
+echo
+echo Now you can enter the gnupg-1.0.7/CYGWIN-PATCHES directory,
+echo start this script and build the native windows GnuPG
+echo $ cd CYGWIN-PATCHES
+echo $ ./build_gpg_native.sh
+echo
+echo The executables will be put in /tmp/gpg_w32
+echo
+echo ----------------------------------------------------------
+
+if [ ! -d "../CYGWIN-PATCHES" ] ; then
+echo "You must be in CYGWIN-PATCHES"
+exit 0
+fi
+
+
+export CC="gcc -mno-cygwin"
+export RANLIB="ranlib"
+
+cd ..
+./scripts/autogen.sh
+# Just in case ..
+make distclean
+./configure --host=i686-pc-mingw32 --target=i686-pc-mingw32 --program-transform-name='' --prefix=/tmp/gpg_w32
+
+# create a dummy Makefile (Better would be to remove po from
+# Makefile.am for w32 builds
+echo "all:" > po/Makefile
+echo "clean:" >> po/Makefile
+echo "check:" >> po/Makefile
+echo "distclean:" >> po/Makefile
+echo "install:" >> po/Makefile
+echo "install-strip:" >> po/Makefile
+
+make
+
+make install-strip
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/build_idea.sh gnupg-1.0.7/CYGWIN-PATCHES/build_idea.sh
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/build_idea.sh 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/build_idea.sh 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Build script for idea.dll for cygwin
+
+echo ----------------------------------------------------------
+echo You have to get your build environement right:
+echo $ cd /usr/src
+echo $ tar xjvf gnupg-1.0.7-2-src.tar.bz2
+echo $ ./gnupg-1.0.7-2.sh prep
+echo $ ./gnupg-1.0.7-2.sh conv
+echo $ ./gnupg-1.0.7-2.sh build
+echo
+echo Now copy idea.c to the gnupg-1.0.7/CYGWIN-PATCHES directory
+echo and start this script.
+echo $ cd CYGWIN-PATCHES
+echo $ ./build_idea.sh
+echo ----------------------------------------------------------
+
+if [ ! -f idea.c ] ; then
+echo "You must have idea.c"
+exit 0
+fi
+
+# Building .o
+gcc -c -I. -g -Wall -o idea.o idea.c
+
+# Building .dll
+DLL_NAME="idea.dll"
+DLL_EXP_LIB="libidea.dll.a"
+DLL_LDLIBS="../.build/cipher/.libs/libcipher.a ../.build/util/.libs/libutil.a -lintl"
+DLL_LDFLAGS="-Wl,--export-all-symbols"
+gcc -shared -Wl,--out-implib=$DLL_EXP_LIB -o $DLL_NAME idea.o $DLL_LDLIBS $DLL_LDFLAGS
+
+echo
+echo
+echo ----------------------------------------------------------
+echo You have to copy idea.dll to the gnupg library directory.
+echo $ gpg --load-extension idea
+echo will tell you where gpg looks for the file.
+echo ----------------------------------------------------------
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/build_idea_native.sh gnupg-1.0.7/CYGWIN-PATCHES/build_idea_native.sh
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/build_idea_native.sh 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/build_idea_native.sh 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Build script for native w32 idea.dll with cygwin
+
+echo ----------------------------------------------------------
+echo You have to get your build environement right!
+echo
+echo First build the native gpg. See build_gpg_native.sh
+echo
+echo Now copy idea.c to the gnupg-1.0.7/CYGWIN-PATCHES directory
+echo and start this script.
+echo $ cd CYGWIN-PATCHES
+echo $ ./build_idea_native.sh
+echo ----------------------------------------------------------
+
+if [ ! -f idea.c ] ; then
+echo "You must have idea.c"
+exit 0
+fi
+
+# Building .o
+gcc -mno-cygwin -c -I. -g -Wall -o idea.o idea.c
+
+# Building .dll
+DLL_NAME="idea.dll"
+DLL_EXP_LIB="libidea.dll.a"
+DLL_LDLIBS="../cipher/.libs/libcipher.a ../util/.libs/libutil.a -lintl"
+DLL_LDFLAGS="-Wl,--export-all-symbols"
+gcc -mno-cygwin -shared -Wl,--out-implib=$DLL_EXP_LIB -o $DLL_NAME idea.o $DLL_LDLIBS $DLL_LDFLAGS
+
+strip idea.dll
+echo
+echo
+echo ----------------------------------------------------------
+echo You have to copy idea.dll to the gnupg library directory.
+echo $ gpg --load-extension idea
+echo will tell you where gpg looks for the file.
+echo ----------------------------------------------------------
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/gnupg.MinGW.README gnupg-1.0.7/CYGWIN-PATCHES/gnupg.MinGW.README
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/gnupg.MinGW.README 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/gnupg.MinGW.README 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,7 @@
+In this directory you will find the following two scripts to
+generate a native w32 version of GnuPG and a native w32 version
+of the idea.dll.
+
+Scripts:
+ build_gpg_native.sh
+ build_idea_native.sh
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/gnupg.README gnupg-1.0.7/CYGWIN-PATCHES/gnupg.README
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/gnupg.README 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/gnupg.README 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,164 @@
+gnupg
+------------------------------------------
+GNU Privacy Guard is GNU's tool for secure communication and data storage.
+It can be used to encrypt data and to create digital signatures. GnuPG is
+a complete and free replacement for PGP. It includes an advanced key
+management facility and is compliant with the proposed OpenPGP Internet
+standard as described in RFC 2440.
+
+Legal stuff
+-----------
+Some countries have regulations on the use of cryptographics systems; It
+may be unlawful to use GnuPG in these countries. Please visit
+ http://www.gnupg.org/legal.html
+for more informations concerning this topic.
+
+-------------------------------------------
+
+Runtime requirements:
+ cygwin-1.3.12 or newer
+ libintl2
+ libiconv2
+ zlib
+
+Build requirements:
+ cygwin-1.3.12 or newer
+ autoconf
+ automake
+ libtool
+ gcc
+ gettext
+ libintl2
+ libiconv2
+ zlib
+
+Canonical homepage:
+ http://www.gnupg.org
+
+Canonical download:
+ ftp://ftp.gnupg.org/gcrypt/
+
+-------------------------------------------
+
+Build instructions:
+ unpack gnupg-1.0.7-X-src.tar.bz2
+ if you use setup to install this src package, it will be
+ unpacked under /usr/src automatically
+
+ - To rebuild the binary and source archiv type:
+ $ cd /usr/src
+ $ ./gnupg-1.0.7-X.sh all
+
+ This will create:
+ /usr/src/gnupg-1.0.7-X.tar.bz2
+ /usr/src/gnupg-1.0.7-X-src.tar.bz2
+
+ - To get the modified source to build the cygwin executables type:
+ $ cd /usr/src
+ $ ./gnupg-1.0.7-X.sh prep
+
+ This will unpack and patch gnupg to:
+ /usr/src/gnupg-1.0.7-X
+
+-------------------------------------------
+
+Files included in the binary distro
+
+ /etc/postinstall/gnupg.sh
+ /usr/bin/gpg.exe
+ /usr/bin/gpgkeys_mailto
+ /usr/bin/gpgsplit.exe
+ /usr/bin/gpgv.exe
+ /usr/doc/Cygwin/gnupg-1.0.7.README
+ /usr/doc/gnupg-1.0.7/AUTHORS
+ /usr/doc/gnupg-1.0.7/BUGS
+ /usr/doc/gnupg-1.0.7/COPYING
+ /usr/doc/gnupg-1.0.7/FAQ
+ /usr/doc/gnupg-1.0.7/HACKING
+ /usr/doc/gnupg-1.0.7/INSTALL
+ /usr/doc/gnupg-1.0.7/NEWS
+ /usr/doc/gnupg-1.0.7/OpenPGP
+ /usr/doc/gnupg-1.0.7/PROJECTS
+ /usr/doc/gnupg-1.0.7/README
+ /usr/doc/gnupg-1.0.7/THANKS
+ /usr/doc/gnupg-1.0.7/TODO
+ /usr/doc/gnupg-1.0.7/VERSION
+ /usr/info/gpg.info
+ /usr/info/gpgv.info
+ /usr/lib/gnupg/rndegd.a
+ /usr/lib/gnupg/rndegd.dll
+ /usr/lib/gnupg/rndegd.dll.a
+ /usr/lib/gnupg/rndegd.la
+ /usr/lib/gnupg/tiger.a
+ /usr/lib/gnupg/tiger.dll
+ /usr/lib/gnupg/tiger.dll.a
+ /usr/lib/gnupg/tiger.la
+ /usr/man/man1/gpg.1
+ /usr/man/man1/gpgv.1
+ /usr/share/gnupg/FAQ
+ /usr/share/gnupg/faq.html
+ /usr/share/gnupg/options.skel
+ /usr/share/locale/cs/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/da/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/de/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/el/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/eo/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/es/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/et/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/fr/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/gl/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/id/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/it/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/ja/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/nl/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/pl/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/pt/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/pt_BR/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/sv/LC_MESSAGES/gnupg.mo
+ /usr/share/locale/tr/LC_MESSAGES/gnupg.mo
+
+-------------------------------------------
+
+Port Notes:
+----- version 1.0.7-3 -----
+* Fixed locale files.
+
+----- version 1.0.7-2 -----
+* Fixed textmount usage:
+ - gpg now handles configuration/key/trustdb files on textmounts correctly.
+ - All files to be de-/encrypted are now opened in binary mode. Consider the
+ use of dos2unix or unix2dos if you have problems with this.
+* Disabled the "Please note that you don't have secure memory on this system"
+ warning. PLEASE NOTE you really don't have secure memory on your windows
+ system
+* Fixed the use of loadable modules. Now all modules can be loaded with the
+ --load-extension=<modulename> command. The standard build will link
+ rndlinux statically, but if you run
+ $ ./configure --enable-static-rnd=none
+ then also the rndegd random generator modules will be build as a loadable
+ module. Attention! Now you have to call gpg with --load-extension=rnd???
+ to make it work properly.
+ If you are entitled to use the idea algorythm you can have a look into
+ build_idea.sh and find some instructions how to build this module.
+ WE DONT PROVIDE THE NEEDED SOURCECODE! You have to get the idea.c file
+ somewhere else.
+
+----- version 1.0.7-1 -----
+Initial release.
+* Uses /dev/random
+* Uses cygwin file system.
+* Use env. variable GNUPGHOME instead of windows registry for cygwin.
+* You find build instructions for a windows native executable (MinGW) after
+ $ cd /usr/src
+ $ ./gnupg-1.0.7-X.sh prep
+ in /usr/src/gnupg-1.0.7-X/CYGWIN-PATCHES/gnupg.MinGW.README
+
+-------------------------------------------
+
+ChangeLog
+---------
+For a detailed list of changes please read the CYGWIN-PATCHES/ChangeLog.
+
+
+-------------------------------------------
+Cygwin port maintained by: Volker Quetschke <quetschke@scytek.de>
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/postinstall.sh gnupg-1.0.7/CYGWIN-PATCHES/postinstall.sh
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/postinstall.sh 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/postinstall.sh 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+prefix=/usr
+infodir=${prefix}/info
+cd ${infodir}
+for fn in gpg.info gpgv.info ; do
+ install-info --dir-file=./dir --info-file=${fn}
+done
+
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/CYGWIN-PATCHES/setup.hint gnupg-1.0.7/CYGWIN-PATCHES/setup.hint
--- gnupg-1.0.7-orig/CYGWIN-PATCHES/setup.hint 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/CYGWIN-PATCHES/setup.hint 2002-08-20 17:17:05.000000000 +0200
@@ -0,0 +1,9 @@
+# No comment
+sdesc: "GnuPG is GNU's tool for secure communication and data storage."
+ldesc: "GNU Privacy Guard is GNU's tool for secure communication and data
+storage. It can be used to encrypt data and to create digital signatures.
+GnuPG is a complete and free replacement for PGP. It includes an advanced
+key management facility and is compliant with the proposed OpenPGP
+Internet standard as described in RFC 2440."
+category: Utils
+requires: cygwin libintl2 libiconv2 zlib
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/Makefile.am gnupg-1.0.7/Makefile.am
--- gnupg-1.0.7-orig/Makefile.am 2001-12-21 20:49:30.000000000 +0100
+++ gnupg-1.0.7/Makefile.am 2002-08-20 17:17:05.000000000 +0200
@@ -24,8 +24,8 @@
checks = checks
endif
-SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
-EXTRA_DIST = PROJECTS BUGS config.h.in
+SUBDIRS = intl m4 zlib util mpi cipher tools g10 keyserver po doc ${checks}
+EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in
DISTCLEANFILES = g10defs.h
# Add all the files listed in "distfiles" files to the distribution,
@@ -48,7 +48,4 @@
echo "$(VERSION)" > $(distdir)/VERSION
-
-
-
-
+ACLOCAL_AMFLAGS = -I m4
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/acinclude.m4 gnupg-1.0.7/acinclude.m4
--- gnupg-1.0.7-orig/acinclude.m4 2001-12-19 18:16:30.000000000 +0100
+++ gnupg-1.0.7/acinclude.m4 2002-08-20 17:17:05.000000000 +0200
@@ -570,8 +570,9 @@
fi
# Make sure that we snagged all the symbols we need.
- if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
- if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+ # Fix: Adding the _? makes this test also work with underscore symbols
+ if egrep ' _?nm_test_var$' "$ac_nlist" >/dev/null; then
+ if egrep ' _?nm_test_func$' "$ac_nlist" >/dev/null; then
cat <<EOF > conftest.c
#ifdef __cplusplus
extern "C" {
@@ -579,7 +580,8 @@
EOF
# Now generate the symbol file.
- sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+ # Fix: Adding the ?_ makes this test also work with underscore symbols
+ sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
cat <<EOF >> conftest.c
#if defined (__STDC__) && __STDC__
@@ -601,7 +603,8 @@
changequote([,])dnl
{
EOF
- sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+ # Fix: Adding the ?_ makes this test also work with underscore symbols
+ sed 's/^_\?\(.*\) _\?\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
cat <<\EOF >> conftest.c
{0, (__ptr_t) 0}
};
@@ -661,7 +664,7 @@
AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE,
[tmp_do_check="no"
case "${target}" in
- i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp | *-*-cygwin)
+ i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
ac_cv_sys_symbol_underscore=yes
;;
*)
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/checks/Makefile.am gnupg-1.0.7/checks/Makefile.am
--- gnupg-1.0.7-orig/checks/Makefile.am 2001-12-21 20:46:28.000000000 +0100
+++ gnupg-1.0.7/checks/Makefile.am 2002-08-20 17:17:05.000000000 +0200
@@ -62,7 +62,7 @@
./options: $(srcdir)/options.in
cat $(srcdir)/options.in >./options
@set -e; if echo "@DYNAMIC_CIPHER_MODS@" |grep tiger >/dev/null ;then \
- echo load-extension ../cipher/tiger >>./options; fi
+ echo load-extension ../cipher/.libs/tiger >>./options; fi
./gpg_dearmor:
echo '#!/bin/sh' >./gpg_dearmor
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/cipher/Makefile.am gnupg-1.0.7/cipher/Makefile.am
--- gnupg-1.0.7-orig/cipher/Makefile.am 2001-12-21 20:45:44.000000000 +0100
+++ gnupg-1.0.7/cipher/Makefile.am 2002-08-20 17:17:05.000000000 +0200
@@ -21,32 +21,50 @@
INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
-noinst_LIBRARIES = libcipher.a
-
-# The configure script greps the module names from the EXTRA_PROGRAMS line
-EXTRA_PROGRAMS = rndlinux rndunix rndegd rndw32 sha1 rmd160 md5 tiger
-
-EXTRA_rndlinux_SOURCES = rndlinux.c
-EXTRA_rndunix_SOURCES = rndunix.c
-EXTRA_rndegd_SOURCES = rndegd.c
-EXTRA_rndw32_SOURCES = rndw32.c
-EXTRA_md5_SOURCES = md5.c
-EXTRA_rmd160_SOURCES = rmd160.c
-EXTRA_sha1_SOURCES = sha1.c
-EXTRA_tiger_SOURCES = tiger.c
+noinst_LTLIBRARIES = libcipher.la
+# The configure script greps the module names from the CIPHER_MODULES line
+CIPHER_MODULES = rndlinux rndunix rndegd rndw32 sha1 rmd160 md5 tiger
+# Define all available modules as possible shared libraries
+EXTRA_LTLIBRARIES = rndlinux.la rndunix.la rndegd.la rndw32.la sha1.la rmd160.la md5.la tiger.la
+rndlinux_la_SOURCES = rndlinux.c
+rndlinux_la_LIBADD = ../cipher/libcipher.la ../mpi/libmpi.la ../util/libutil.la -lintl
+rndlinux_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+rndlinux_la_CFLAGS = -DIS_MODULE
+rndunix_la_SOURCES = rndunix.c
+rndunix_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+rndunix_la_CFLAGS = -DIS_MODULE
+rndegd_la_SOURCES = rndegd.c
+rndegd_la_LIBADD = ../cipher/libcipher.la ../mpi/libmpi.la ../util/libutil.la -lintl
+rndegd_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+rndegd_la_CFLAGS = -DIS_MODULE
+rndw32_la_SOURCES = rndw32.c
+rndw32_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+rndw32_la_CFLAGS = -DIS_MODULE
+sha1_la_SOURCES = sha1.c
+sha1_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+sha1_la_CFLAGS = -DIS_MODULE
+rmd160_la_SOURCES = rmd160.c
+rmd160_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+rmd160_la_CFLAGS = -DIS_MODULE
+md5_la_SOURCES = md5.c
+md5_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+md5_la_CFLAGS = -DIS_MODULE
+tiger_la_SOURCES = tiger.c
+tiger_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
+tiger_la_CFLAGS = -DIS_MODULE
if ENABLE_GNUPG_EXTENSIONS
-pkglib_PROGRAMS = @DYNAMIC_CIPHER_MODS@
+pkglib_LTLIBRARIES = @DYNAMIC_CIPHER_MODS@
else
-pkglib_PROGRAMS =
+pkglib_LTLIBRARIES =
endif
DYNLINK_MOD_CFLAGS = -DIS_MODULE @DYNLINK_MOD_CFLAGS@
-#libcipher_a_LDFLAGS =
-libcipher_a_SOURCES = cipher.c \
+libcipher_la_LDFLAGS = -static
+libcipher_la_SOURCES = cipher.c \
pubkey.c \
md.c \
dynload.c \
@@ -78,20 +96,13 @@
BUILT_SOURCES = construct.c
DISTCLEANFILES = construct.c
-libcipher_a_DEPENDENCIES = @STATIC_CIPHER_OBJS@
-libcipher_a_LIBADD = @STATIC_CIPHER_OBJS@
+libcipher_la_DEPENDENCIES = @STATIC_CIPHER_OBJS@
+libcipher_la_LIBADD = @STATIC_CIPHER_OBJS@
# If I remember it correct, automake 1.4 has a feature to set
# fooFLAGS depending on the program. So we should check it out.
-tiger$(EXEEXT): $(srcdir)/tiger.c
- `echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o tiger $(srcdir)/tiger.c | \
- sed -e 's/-O[2-9s]*/-O/g' `
-
-tiger.o: $(srcdir)/tiger.c
- `echo $(COMPILE) -c $(srcdir)/tiger.c | sed -e 's/-O[2-9s]*/-O1/g' `
-
#twofish: $(srcdir)/twofish.c
# `echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o twofish $(srcdir)/twofish.c | \
# sed -e 's/-O[0-9s]*/ /g' `
@@ -103,12 +114,5 @@
# `echo $(COMPILE) -c $(srcdir)/twofish.c | sed -e 's/-O[0-9s]*/ /g' `
-rndunix$(EXEEXT): $(srcdir)/rndunix.c
- $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndunix $(srcdir)/rndunix.c
-
-rndlinux$(EXEEXT): $(srcdir)/rndlinux.c
- $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndlinux $(srcdir)/rndlinux.c
-
-rndegd$(EXEEXT): $(srcdir)/rndegd.c
- $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndegd $(srcdir)/rndegd.c
-
+#rndunix$(EXEEXT): $(srcdir)/rndunix.c
+# $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndunix $(srcdir)/rndunix.c
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/cipher/dynload.c gnupg-1.0.7/cipher/dynload.c
--- gnupg-1.0.7-orig/cipher/dynload.c 2001-08-20 10:51:53.000000000 +0200
+++ gnupg-1.0.7/cipher/dynload.c 2002-08-20 17:17:05.000000000 +0200
@@ -38,7 +38,8 @@
#include "cipher.h"
#include "dynload.h"
-#ifdef WITH_SYMBOL_UNDERSCORE
+/* This should use something like DLSYM_NEED_UNDERSCORE */
+#if defined(WITH_SYMBOL_UNDERSCORE) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define SYMBOL_VERSION "_gnupgext_version"
#define SYMBOL_ENUM "_gnupgext_enum_func"
#else
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/cipher/random.c gnupg-1.0.7/cipher/random.c
--- gnupg-1.0.7-orig/cipher/random.c 2002-02-14 12:27:41.000000000 +0100
+++ gnupg-1.0.7/cipher/random.c 2002-08-20 17:17:05.000000000 +0200
@@ -306,7 +306,7 @@
if( !seed_file_name )
return 0;
- #ifdef HAVE_DOSISH_SYSTEM
+ #if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) /* cygwin textmode */
fd = open( seed_file_name, O_RDONLY | O_BINARY );
#else
fd = open( seed_file_name, O_RDONLY );
@@ -396,7 +396,7 @@
mix_pool(rndpool); rndstats.mixrnd++;
mix_pool(keypool); rndstats.mixkey++;
- #ifdef HAVE_DOSISH_SYSTEM
+ #if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) /* cygwin textmode */
fd = open( seed_file_name, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY,
S_IRUSR|S_IWUSR );
#else
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/cipher/rndegd.c gnupg-1.0.7/cipher/rndegd.c
--- gnupg-1.0.7-orig/cipher/rndegd.c 2002-04-18 20:41:27.000000000 +0200
+++ gnupg-1.0.7/cipher/rndegd.c 2002-08-20 17:17:05.000000000 +0200
@@ -253,3 +253,11 @@
}
#endif
+/* Otherwise libtool complains about undefined reference */
+#ifdef IS_MODULE
+const char *
+strusage( int level )
+{
+ return default_strusage(level);
+}
+#endif
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/cipher/rndlinux.c gnupg-1.0.7/cipher/rndlinux.c
--- gnupg-1.0.7-orig/cipher/rndlinux.c 2002-04-18 20:41:27.000000000 +0200
+++ gnupg-1.0.7/cipher/rndlinux.c 2002-08-20 17:17:05.000000000 +0200
@@ -240,3 +240,11 @@
}
#endif
+/* Otherwise libtool complains about undefined reference */
+#ifdef IS_MODULE
+const char *
+strusage( int level )
+{
+ return default_strusage(level);
+}
+#endif
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/cipher/rndw32.c gnupg-1.0.7/cipher/rndw32.c
--- gnupg-1.0.7-orig/cipher/rndw32.c 2001-12-19 19:05:04.000000000 +0100
+++ gnupg-1.0.7/cipher/rndw32.c 2002-08-20 17:17:05.000000000 +0200
@@ -67,7 +67,7 @@
#include <string.h>
#include <windows.h>
-#ifdef __CYGWIN32__
+#if defined(__CYGWIN__) || defined(__MINGW32__) /* Does pure MingW32 have this header? */
# include <winioctl.h>
#endif
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/configure.ac gnupg-1.0.7/configure.ac
--- gnupg-1.0.7-orig/configure.ac 2002-04-29 16:56:08.000000000 +0200
+++ gnupg-1.0.7/configure.ac 2002-08-20 17:17:06.000000000 +0200
@@ -37,6 +37,9 @@
AC_CANONICAL_TARGET()
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AM_CONFIG_HEADER(config.h)
+AM_PROG_AS
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
@@ -46,7 +49,7 @@
AC_PROG_AWK
-MODULES_IN_CIPHER=`$AWK '/^EXTRA_PROGRAMS/ { for(i=3;i<=NF;i++) print $i}' \
+MODULES_IN_CIPHER=`$AWK '/^CIPHER_MODULES/ { for(i=3;i<=NF;i++) print $i}' \
$srcdir/cipher/Makefile.am`
dnl
@@ -167,7 +170,7 @@
disallowed_modules="rndunix rndlinux rndegd"
;;
*-*-cygwin*)
- disallowed_modules="rndunix rndlinux rndegd tiger"
+ disallowed_modules="rndw32 rndunix"
;;
*)
disallowed_modules="rndw32"
@@ -199,7 +202,7 @@
try_gettext=yes
case "${target}" in
- *-*-mingw32*|*-*-cygwin*)
+ *-*-mingw32*)
# special stuff for Windoze NT
ac_cv_have_dev_random=no
AC_DEFINE(USE_ONLY_8DOT3,1,
@@ -382,7 +385,8 @@
dnl Checks for libraries.
if test "$try_gettext" = yes; then
-AM_GNU_GETTEXT
+AM_INTL_SUBDIR()
+AM_GNU_GETTEXT([use-libtool])
else
USE_NLS=no
USE_INCLUDED_LIBINTL=no
@@ -482,7 +486,7 @@
AC_FUNC_FSEEKO
AC_FUNC_VPRINTF
AC_FUNC_FORK
-AC_CHECK_FUNCS(strerror stpcpy strsep strlwr stricmp tcgetattr strtoul mmap)
+AC_CHECK_FUNCS(strerror stpcpy strsep strlwr stricmp strcasecmp tcgetattr strtoul mmap)
AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime nl_langinfo setlocale)
AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat)
@@ -610,7 +614,7 @@
static_random_module="rndlinux"
else
case "${target}" in
- *-*-mingw32*|*-*-cygwin*)
+ *-*-mingw32*)
static_random_module="rndw32"
AC_DEFINE(USE_STATIC_RNDW32,1,
[At some point in the code we need to know that
@@ -688,9 +692,10 @@
done;
if test $x = yes; then
STATIC_CIPHER_NAMES="$STATIC_CIPHER_NAMES $name"
- STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.o"
+ STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.lo"
else
- DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name"
+ DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name.la"
+ # The .la is needed to help automake/libtool
show_dynlink="$show_dynlink $name"
fi
fi
@@ -753,15 +758,15 @@
AC_MSG_RESULT(failed)
AC_MSG_ERROR([mpi/config.links missing!])
fi
-MPI_EXTRA_ASM_OBJS=""
+MPI_EXTRA_ASM_LTOBJS=""
show_extraasm=""
if test "$ac_cv_mpi_extra_asm_modules" != ""; then
for i in $ac_cv_mpi_extra_asm_modules; do
show_extraasm="$show_extraasm $i"
- MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o"
+ MPI_EXTRA_ASM_LTOBJS="$MPI_EXTRA_ASM_OBJS $i.o"
done
fi
-AC_SUBST(MPI_EXTRA_ASM_OBJS)
+AC_SUBST(MPI_EXTRA_ASM_LTOBJS)
MPI_SFLAGS="$ac_cv_mpi_sflags"
AC_SUBST(MPI_SFLAGS)
@@ -879,9 +884,8 @@
]])
-AC_CONFIG_FILES([
+AC_CONFIG_FILES([ intl/Makefile m4/Makefile
Makefile
-intl/Makefile
po/Makefile.in
util/Makefile
mpi/Makefile
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/g10/Makefile.am gnupg-1.0.7/g10/Makefile.am
--- gnupg-1.0.7-orig/g10/Makefile.am 2002-04-02 12:15:55.000000000 +0200
+++ gnupg-1.0.7/g10/Makefile.am 2002-08-20 17:17:06.000000000 +0200
@@ -23,7 +23,7 @@
# it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h
LDFLAGS = @LDFLAGS@ @DYNLINK_LDFLAGS@
-needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+needed_libs = ../cipher/libcipher.la ../mpi/libmpi.la ../util/libutil.la
#noinst_PROGRAMS = gpgd
bin_PROGRAMS = gpg gpgv
@@ -108,7 +108,7 @@
# ks-db.h \
# $(common_source)
-LDADD = $(needed_libs) @ZLIBS@ @INTLLIBS@
+LDADD = $(needed_libs) @ZLIBS@ @LIBINTL@
# gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it
gpg_LDADD = @LIBOBJS@ $(LDADD)
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/g10/exec.c gnupg-1.0.7/g10/exec.c
--- gnupg-1.0.7-orig/g10/exec.c 2002-04-29 16:31:08.000000000 +0200
+++ gnupg-1.0.7/g10/exec.c 2002-08-20 17:17:06.000000000 +0200
@@ -62,7 +62,7 @@
#ifdef __riscos__
tmp="<Wimp$ScrapDir>.GnuPG";
mkdir(tmp,0700); /* Error checks occur later on */
-#elif defined (__MINGW32__) || defined (__CYGWIN32__)
+#elif defined (__MINGW32__)
tmp=m_alloc(256);
if(GetTempPath(256,tmp)==0)
strcpy(tmp,"c:\\temp");
@@ -88,7 +88,7 @@
sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp);
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (__MINGW32__)
m_free(tmp);
#endif
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/g10/g10.c gnupg-1.0.7/g10/g10.c
--- gnupg-1.0.7-orig/g10/g10.c 2002-04-25 09:57:21.000000000 +0200
+++ gnupg-1.0.7/g10/g10.c 2002-08-20 17:17:06.000000000 +0200
@@ -807,7 +807,7 @@
opt.pgp2_workarounds = 1;
opt.force_v3_sigs = 1;
opt.escape_from = 1;
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (__MINGW32__)
opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" );
#else
opt.homedir = getenv("GNUPGHOME");
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/g10/gpgv.c gnupg-1.0.7/g10/gpgv.c
--- gnupg-1.0.7-orig/g10/gpgv.c 2002-04-29 16:32:46.000000000 +0200
+++ gnupg-1.0.7/g10/gpgv.c 2002-08-20 17:17:06.000000000 +0200
@@ -151,7 +151,7 @@
opt.always_trust = 1;
opt.batch = 1;
- #if defined (__MINGW32__) || defined (__CYGWIN32__)
+ #if defined (__MINGW32__)
opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" );
#else
opt.homedir = getenv("GNUPGHOME");
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/g10/passphrase.c gnupg-1.0.7/g10/passphrase.c
--- gnupg-1.0.7-orig/g10/passphrase.c 2002-04-29 16:36:35.000000000 +0200
+++ gnupg-1.0.7/g10/passphrase.c 2002-08-20 17:17:06.000000000 +0200
@@ -97,7 +97,7 @@
static char *next_pw = NULL;
static char *last_pw = NULL;
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (__MINGW32__)
static int read_fd = 0;
static int write_fd = 0;
#endif
@@ -176,7 +176,7 @@
static int
writen ( int fd, const void *buf, size_t nbytes )
{
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (__MINGW32__)
DWORD nwritten, nleft = nbytes;
while (nleft > 0) {
@@ -219,7 +219,7 @@
static int
readn ( int fd, void *buf, size_t buflen, size_t *ret_nread )
{
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (__MINGW32__)
DWORD nread, nleft = buflen;
while (nleft > 0) {
@@ -313,7 +313,7 @@
#if !defined (__riscos__)
-#if !defined (__MINGW32__) && !defined (__CYGWIN32__)
+#if !defined (__MINGW32__)
/* For the new Assuan protocol we may have to send options */
static int
agent_send_option (int fd, const char *name, const char *value)
@@ -418,7 +418,7 @@
#endif
return rc;
}
-#endif /*!__MINGW32__ && !__CYGWIN32__*/
+#endif /*!__MINGW32__ */
/*
@@ -429,7 +429,7 @@
static int
agent_open (int *ret_prot)
{
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (__MINGW32__)
int fd;
char *infostr, *p;
HANDLE h;
@@ -574,7 +574,7 @@
static void
agent_close ( int fd )
{
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (__MINGW32__)
HANDLE h = OpenEvent(EVENT_ALL_ACCESS, FALSE, "gpg_agent");
ResetEvent(h);
#else
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/g10/tdbdump.c gnupg-1.0.7/g10/tdbdump.c
--- gnupg-1.0.7-orig/g10/tdbdump.c 2001-09-28 12:38:35.000000000 +0200
+++ gnupg-1.0.7/g10/tdbdump.c 2002-08-20 17:17:06.000000000 +0200
@@ -136,7 +136,7 @@
fname = "[stdin]";
is_stdin = 1;
}
- else if( !(fp = fopen( fname, "r" )) ) {
+ else if( !(fp = fopen( fname, "rb" )) ) { /* cygwin textmode */
log_error_f(fname, _("can't open file: %s\n"), strerror(errno) );
return;
}
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/g10/tdbio.c gnupg-1.0.7/g10/tdbio.c
--- gnupg-1.0.7-orig/g10/tdbio.c 2002-04-29 16:40:47.000000000 +0200
+++ gnupg-1.0.7/g10/tdbio.c 2002-08-20 17:17:06.000000000 +0200
@@ -39,7 +39,7 @@
#include "trustdb.h"
#include "tdbio.h"
-#if defined(HAVE_DOSISH_SYSTEM) && !defined(__CYGWIN32__)
+#if defined(HAVE_DOSISH_SYSTEM)
#define ftruncate chsize
#endif
@@ -483,7 +483,7 @@
if( !fp )
log_fatal( _("%s: can't create: %s\n"), fname, strerror(errno) );
fclose(fp);
- #ifdef HAVE_DOSISH_SYSTEM
+ #if defined( HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) /* cygwin textmode */
db_fd = open( db_name, O_RDWR | O_BINARY );
#else
db_fd = open( db_name, O_RDWR );
@@ -543,7 +543,7 @@
if (make_dotlock( lockhandle, -1 ) )
log_fatal( _("%s: can't make lock\n"), db_name );
#endif /* __riscos__ */
-#ifdef HAVE_DOSISH_SYSTEM
+#if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) /* cygwin textmode */
db_fd = open (db_name, O_RDWR | O_BINARY );
#else
db_fd = open (db_name, O_RDWR );
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/include/util.h gnupg-1.0.7/include/util.h
--- gnupg-1.0.7-orig/include/util.h 2002-04-25 10:26:23.000000000 +0200
+++ gnupg-1.0.7/include/util.h 2002-08-20 17:17:06.000000000 +0200
@@ -222,7 +222,7 @@
#ifndef HAVE_MEMMOVE
#define memmove(d, s, n) bcopy((s), (d), (n))
#endif
-#ifndef HAVE_STRICMP
+#if !defined(HAVE_STRICMP) && !defined(stricmp)
#define stricmp(a,b) strcasecmp( (a), (b) )
#endif
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/mpi/Makefile.am gnupg-1.0.7/mpi/Makefile.am
--- gnupg-1.0.7-orig/mpi/Makefile.am 2001-07-26 10:24:29.000000000 +0200
+++ gnupg-1.0.7/mpi/Makefile.am 2002-08-20 17:17:07.000000000 +0200
@@ -30,10 +30,10 @@
# Note: we only use .S files so we should delete all left over .s
CLEANFILES = _*.s
-noinst_LIBRARIES = libmpi.a
+noinst_LTLIBRARIES = libmpi.la
-# libmpi_a_LDFLAGS =
-libmpi_a_SOURCES = longlong.h \
+libmpi_la_LDFLAGS = -static
+libmpi_la_SOURCES = longlong.h \
mpi-add.c \
mpi-bit.c \
mpi-cmp.c \
@@ -56,24 +56,18 @@
# Note this objects are actually links, the sourcefiles are
# distributed by special code in dist-hook
-common_asm_objects = mpih-mul1.o \
- mpih-mul2.o \
- mpih-mul3.o \
- mpih-add1.o \
- mpih-sub1.o \
- mpih-lshift.o \
- mpih-rshift.o
-
-libmpi_a_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
-libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
-
-# cancel the default rules used by libtool which do not really
-# work and add one to cpp .S files
-.S.o:
- $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s
- $(COMPILE) -c _$*.s
- mv -f _$*.o $*.o
+common_asm_objects = mpih-mul1.lo \
+ mpih-mul2.lo \
+ mpih-mul3.lo \
+ mpih-add1.lo \
+ mpih-sub1.lo \
+ mpih-lshift.lo \
+ mpih-rshift.lo
-.S.lo:
+libmpi_la_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_LTOBJS@
+libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_LTOBJS@
+# shouldn't this rule exist by default?
+.S.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/po/Makevars gnupg-1.0.7/po/Makevars
--- gnupg-1.0.7-orig/po/Makevars 1970-01-01 01:00:00.000000000 +0100
+++ gnupg-1.0.7/po/Makevars 2002-08-20 17:17:07.000000000 +0200
@@ -0,0 +1,25 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/scripts/autogen.sh gnupg-1.0.7/scripts/autogen.sh
--- gnupg-1.0.7-orig/scripts/autogen.sh 2001-12-22 14:24:57.000000000 +0100
+++ gnupg-1.0.7/scripts/autogen.sh 2002-08-20 17:17:07.000000000 +0200
@@ -16,6 +16,9 @@
autoconf_vers=2.52
automake_vers=1.5
aclocal_vers=1.5
+libtool_vers_1=1
+libtool_vers_2=4
+libtool_vers_x=d
DIE=no
@@ -116,6 +119,40 @@
DIE="yes"
fi
+if (libtoolize --version) < /dev/null > /dev/null 2>&1; then
+ _libtool=`libtoolize --version 2>&1 | awk 'NR==1 { print \$4 }'`
+ _libtool_1=`echo $_libtool | awk -F. '{ print \$1 }'`
+ _libtool_2=`echo $_libtool | awk -F. '{ print int(\$2) }'`
+ _libtool_2raw=`echo $_libtool | awk -F. '{ print \$2 }'`
+ _libtool="FALSE"
+ if test "$_libtool_1" -gt "$libtool_vers_1" ; then
+ _libtool="OK"
+ else
+ if test "$_libtool_1" -eq "1" ; then
+ if test "$_libtool_2" -gt "$libtool_vers_2" ; then
+ _libtool="OK"
+ else
+ _libvar=`echo $_libtool_2raw | grep -E "^4[d-z]"`
+ if test -n "$_libvar" ; then
+ _libtool="OK"
+ fi
+ fi
+ fi
+ fi
+else
+ echo
+ echo "**Error**: You must have "\`libtool\'" installed to compile $PGM."
+ echo ' (version ' ${libtool_vers_1}.${libtool_vers_2}${libtool_vers_x} ' or newer is required)'
+ DIE="yes"
+ _libtool="NONE"
+fi
+
+if test "$_libtool" = "FALSE" ; then
+ echo
+ echo "**Error**: "\`libtoolize\'" is too old."
+ echo ' (version ' ${libtool_vers_1}.${libtool_vers_2}${libtool_vers_x} ' or newer is required)'
+ DIE="yes"
+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 >= 1038 ) exit 1; exit 0}')
@@ -133,16 +170,29 @@
fi
echo "Running gettextize... Ignore non-fatal messages."
-echo "no" | gettextize --force
-
+# This is a brutal workaround! Each time gettextize creates m4 and intl
+# it modifies configure.ac and makefile.am!
+if test ! -d m4 -o ! -d intl ; then
+ rm -rf m4 intl scripts/config.rpath
+ cp Makefile.am Makefile.am~
+ cat Makefile.am~ | sed 's% intl m4 %%g' > Makefile.am
+ cp Makefile.am Makefile.am~
+ cat Makefile.am~ | sed 's% scripts/config.rpath %%g' > Makefile.am
+ cp configure.ac configure.ac~
+ cat configure.ac~ | sed 's% intl/Makefile m4/Makefile %%g' > configure.ac
+fi
+gettextize --force --copy --intl --no-changelog
echo "Running aclocal..."
-aclocal
+aclocal -I m4
+echo "Running libtoolize..."
+libtoolize --copy --force
echo "Running autoheader..."
autoheader
echo "Running automake --gnu ..."
-automake --gnu;
+# Vorher /usr/autotool/devel/share/automake-1.6/INSTALL umbenennen
+# sonst ersetzt --force-missing die gnupg Variante
+automake --gnu --add-missing --force-missing --copy
echo "Running autoconf..."
autoconf
echo "You can now run \"./configure\" and then \"make\"."
-
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/tools/Makefile.am gnupg-1.0.7/tools/Makefile.am
--- gnupg-1.0.7-orig/tools/Makefile.am 2002-04-25 10:26:23.000000000 +0200
+++ gnupg-1.0.7/tools/Makefile.am 2002-08-20 17:17:07.000000000 +0200
@@ -20,7 +20,7 @@
EXTRA_DIST = lspgpot ring-a-party mail-signed-keys
INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
-needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+needed_libs = ../cipher/libcipher.la ../mpi/libmpi.la ../util/libutil.la
bin_PROGRAMS = gpgsplit
noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest
@@ -36,10 +36,10 @@
gpgsplit_SOURCES = gpgsplit.c
-mpicalc_LDADD = $(needed_libs) @INTLLIBS@
-bftest_LDADD = $(needed_libs) @INTLLIBS@
+mpicalc_LDADD = $(needed_libs) @LIBINTL@
+bftest_LDADD = $(needed_libs) @LIBINTL@
-shmtest_LDADD = $(needed_libs) @INTLLIBS@
-gpgsplit_LDADD = @ZLIBS@ $(needed_libs) @INTLLIBS@
+shmtest_LDADD = $(needed_libs) @LIBINTL@
+gpgsplit_LDADD = @ZLIBS@ $(needed_libs) @LIBINTL@
mpicalc bftest shmtest gpgsplit: $(needed_libs)
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/util/Makefile.am gnupg-1.0.7/util/Makefile.am
--- gnupg-1.0.7-orig/util/Makefile.am 2001-07-26 10:25:16.000000000 +0200
+++ gnupg-1.0.7/util/Makefile.am 2002-08-20 17:17:07.000000000 +0200
@@ -20,18 +20,18 @@
INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
-noinst_LIBRARIES = libutil.a
+noinst_LTLIBRARIES = libutil.la
-#libutil_a_LDFLAGS =
-libutil_a_SOURCES = g10u.c logger.c fileutil.c miscutil.c strgutil.c \
+libutil_la_LDFLAGS =
+libutil_la_SOURCES = g10u.c logger.c fileutil.c miscutil.c strgutil.c \
ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \
dotlock.c http.c simple-gettext.c w32reg.c
-
+# FixMe: This target will fail!
http-test: http.c
gcc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) -g -Wall -DTEST \
- -o http-test http.c libutil.a ../mpi/libmpi.a @INTLLIBS@
+ -o http-test http.c libutil.a ../mpi/libmpi.a @LIBINTL@
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/util/iobuf.c gnupg-1.0.7/util/iobuf.c
--- gnupg-1.0.7-orig/util/iobuf.c 2002-04-22 21:30:09.000000000 +0200
+++ gnupg-1.0.7/util/iobuf.c 2002-08-20 17:17:07.000000000 +0200
@@ -208,6 +208,9 @@
else {
oflag = O_RDONLY;
}
+ if ( strchr (mode, 'b') ) {
+ oflag |= O_BINARY; /* cygwin textmode */
+ }
#ifndef __riscos__
return open (fname, oflag, cflag );
#else
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache -x aclocal.m4 -x '*.in' -x '*~' -x gpg.info -x configure -x Makefile -x stamp-h1 -x compile -x depcomp -x install-sh -x missing -x mkinstalldirs -x construct.c -x 'config.*' -x g10defs.h -x m4 -x intl -x '*.po' -x .pot -x Rules-quot -x '*.sed' -x '*.header' -x '*.sin' -x '*.gmo' -x ABOUT-NLS -x COPYING -x Makevars.template -x ltmain.sh -x zconf.h -x zlib.h gnupg-1.0.7-orig/util/secmem.c gnupg-1.0.7/util/secmem.c
--- gnupg-1.0.7-orig/util/secmem.c 2002-01-08 20:33:23.000000000 +0100
+++ gnupg-1.0.7/util/secmem.c 2002-08-20 17:17:07.000000000 +0200
@@ -179,7 +179,7 @@
* wipes out the memory on a free().
* Therefore it is sufficient to suppress the warning
*/
- #elif defined (HAVE_DOSISH_SYSTEM)
+ #elif defined (HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) /* disables secmem warning for cygwin */
/* It does not make sense to print such a warning, given the fact that
* this whole Windows !@#$% and their user base are inherently insecure
*/
--------------010607010408050903070503--
--------------enigE3C86F66ED83F103EB4B9373
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQE9YncmPTXJup+KeF0RAjavAJ4tgkTDogVisMbLZos0Hn2ivLFF2QCeJLYm
A677ocx6LZrb/B2DMavIRNM=
=5X2E
-----END PGP SIGNATURE-----
--------------enigE3C86F66ED83F103EB4B9373--