Update head to match stable 1.0

9 files changed, 235 insertions, 83 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index f59643715..854a2e43a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,18 @@
+GDBM keyring support
+--------------------
+
+GDBM-based keyring support is (and always) was an experimental feature
+which is likely to be removed in future versions.  For that reason it
+is not compiled into the Debian package and won't be until and unless
+GDBM support stabilises.
+
+Upgrading from old (<= 0.3.3) versions GnuPG
+--------------------------------------------
+
 Due to a bug in the way secret keys were encrypted in versions prior
-to 0.3.3, later version of gnupg are not backwards compatible and you
+to 0.3.3, later version of GnuPG are not backwards compatible and you
 will have to convert your secret keys before using old secret keys
-with recent versions of gnupg.
+with recent versions of GnuPG.
 
 The upgrade strategy is described in /usr/doc/gnupg/NEWS.gz, please
 refer to it for more details, but it requires an old copy of the gpg
@@ -9,8 +20,9 @@ and gpgm binaries.  They may be on your system as gpg.old and
 gpgm.old, but if they're not you can find gnupg 0.3.2 source and
 binaries for i386, m68k, alpha, powerpc and hurd-i386 at:
 
-  <URL:http://james.nocrew.org/gnupg/>
+  <URL:http://people.debian.org/~troup/gnupg/>
 
 -- 
-James Troup <[email protected]>, Bradford, UK
-Sun,  8 Nov 1998 19:11:40 +0000
+James Troup <[email protected]>, Horsforth, UK
+Sun,  1 Oct 2000 13:53:12 +0100
+
diff --git a/debian/changelog b/debian/changelog
index 5cf71aec8..8d33a87ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,155 @@
+gnupg (1.0.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/README.Debian: fix spelling and update URL.
+  * debian/rules (binary): remove the new info files.
+  * scripts/config.{guess,sub}: sync with subversions, closes: #95729.
+
+ -- James Troup <[email protected]>  Mon, 30 Apr 2001 02:12:38 +0100
+
+gnupg (1.0.4-4) unstable; urgency=low
+
+  * po/ru.po: patch by Ilya Martynov <[email protected]> to replace German
+    entries and add missing translations, closes: #93987.
+  * g10/revoke.c (ask_revocation_reason): typo fix (s/non longer/no
+    longer/g); noticed by Colin Watson <[email protected]>, closes:
+    #93664.
+
+  * Deprecated depreciated; noticed by Vincent Broman
+    <[email protected]>.
+
+  * Following two patches are from Vincent Broman.
+  * g10/mainproc.c (proc_tree): use iobuf_get_real_fname() in preference
+    to iobuf_get_fname().
+  * g10/openfile.c (open_sigfile): handle .sign prefixed files correctly.
+
+ -- James Troup <[email protected]>  Fri, 20 Apr 2001 23:32:44 +0100
+
+gnupg (1.0.4-3) unstable; urgency=medium
+
+  * debian/rules (binary): make gpg binary suid, closes: #86433.
+  * debian/postinst: don't use suidregister.
+  * debian/postrm: removed (only called suidunregister).
+  * debian/control: conflict with suidmanager << 0.50.
+  * mpi/longlong.h: apply fix for ARM long long artimetic from Philip
+    Blundell <[email protected]>, closes: #87487.
+  * debian/preinst: the old GnuPG debs have moved to people.debian.org.
+  * cipher/random.c: #include <time.h> as well as <sys/time.h>
+  * g10/misc.c: likewise.
+  * debian/rules: define a strip alias which removes the .comment and
+    .note sections.
+  * debian/rules (binary-arch): use it.
+  * debian/lintian.override: new file; override the SUID warning from
+    lintian.
+  * debian/rules (binary-arch): install it.
+
+ -- James Troup <[email protected]>  Sun, 25 Feb 2001 05:24:58 +0000
+
+gnupg (1.0.4-2) stable unstable; urgency=high
+
+  * Apply security fix patch from Werner.
+  * Apply another patch from Werner to fix bogus warning on Rijndael
+    usage.
+  * Change section to 'non-US'.
+
+ -- James Troup <[email protected]>  Mon, 12 Feb 2001 07:47:02 +0000
+
+gnupg (1.0.4-1) stable unstable; urgency=high
+
+  * New upstream version.
+  * Fixes a serious bug which could lead to false signature verification
+    results when more than one signature is fed to gpg.
+
+ -- James Troup <[email protected]>  Tue, 17 Oct 2000 17:26:17 +0100
+
+gnupg (1.0.3b-1) unstable; urgency=low
+
+  * New upstream snapshot version.
+
+ -- James Troup <[email protected]>  Fri, 13 Oct 2000 18:08:14 +0100
+
+gnupg (1.0.3-2) unstable; urgency=low
+
+  * debian/control: Conflict, Replace and Provide gpg-rsa & gpg-rsaref.
+    Fix long description to reflect the fact that RSA is no longer
+    patented and now included. [#72177]
+  * debian/rules: move faq.html to /usr/share/doc/gnupg/ and remove FAQ
+    from /usr/share/gnupg/.  Thanks to Robert Luberda
+    <[email protected]> for noticing. [#72151]
+  * debian/control: Suggest new package gnupg-doc. [#64323, #65560]
+  * utils/secmem.c (lock_pool): don't bomb out if mlock() returns ENOMEM,
+    as Linux will do this if resource limits (or other reasons) prevent
+    memory from being locked, instead treat it like permission was denied
+    and warn but continue.  Thanks to Topi Miettinen
+    <[email protected]>. [#70446]
+  * g10/hkp.c (not_implemented): s/ist/is/ in error message.
+  * debian/README.Debian: add a note about GDBM support and why it is
+    disabled.  Upstream already fixed the manpage.  [#65913]
+  * debian/rules (binary-arch): fix the Spanish translation to be 'es' not
+    'es_ES' at Nicol�s Lichtmaier <[email protected]>'s request. [#57314]
+
+ -- James Troup <[email protected]>  Sun,  1 Oct 2000 14:55:03 +0100
+
+gnupg (1.0.3-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- James Troup <[email protected]>  Mon, 18 Sep 2000 15:56:54 +0100
+
+gnupg (1.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- James Troup <[email protected]>  Thu, 13 Jul 2000 20:26:50 +0100
+
+gnupg (1.0.1-2) unstable; urgency=low
+
+  * debian/control (Build-Depends): added.
+  * debian/copyright: corrected location of copyright file.  Removed
+    references to Linux.  Removed warnings about beta nature of GnuPG.
+  * debian/rules (binary-arch): install documentation into
+    /usr/share/doc/gnupg/ and pass mandir to make install to ensure the
+    manpages go to /usr/share/man/.
+  * debian/postinst: create /usr/doc/gnupg symlink.
+  * debian/prerm: new file; remove /usr/doc/gnupg symlink.
+  * debian/rules (binary-arch): install prerm.
+  * debian/control (Standards-Version): updated to 3.1.1.1.
+
+ -- James Troup <[email protected]>  Thu, 30 Dec 1999 16:16:49 +0000
+
+gnupg (1.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * doc/gpg.1: updated to something usable from
+    ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gpg.1.gz.
+
+ -- James Troup <[email protected]>  Sun, 19 Dec 1999 23:47:10 +0000
+
+gnupg (1.0.0-3) unstable; urgency=low
+
+  * debian/rules (build): remove the stunningly ill-advised --host option
+    to configure.  [#44698, #48212, #48281]
+
+ -- James Troup <[email protected]>  Tue, 26 Oct 1999 01:12:59 +0100
+
+gnupg (1.0.0-2) unstable; urgency=low
+
+  * debian/rules (binary-arch): fix the permissions on the
+    modules. [#47280]
+  * debian/postinst, debian/postrm: fix the package name passed to
+    suidregister. [#45013]
+  * debian/control: update long description. [#44636]
+  * debian/rules (build): pass the host explicitly to configure to avoid
+    problems on sparc64. [(Should fix) #44698].
+
+ -- James Troup <[email protected]>  Wed, 20 Oct 1999 23:39:05 +0100
+
+gnupg (1.0.0-1) unstable; urgency=low
+
+  * New upstream release. [#44545]
+
+ -- James Troup <[email protected]>  Wed,  8 Sep 1999 00:53:02 +0100
+
 gnupg (0.9.10-2) unstable; urgency=low
 
   * debian/rules (binary-arch): install lspgpot.  Requested by Kai
diff --git a/debian/control b/debian/control
index 0b6120ea6..5b158daf5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,24 @@
 Source: gnupg
-Section: utils
+Section: non-US
 Priority: optional
 Maintainer: James Troup <[email protected]>
-Standards-Version: 2.5.0.0
+Standards-Version: 3.1.1.1
+Build-Depends: gettext, libgdbmg1-dev, libz-dev
 
 Package: gnupg
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13)
+Suggests: gnupg-doc
+Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50)
+Replaces: gpg-rsa, gpg-rsaref
+Provides: gpg-rsa, gpg-rsaref
 Description: GNU privacy guard - a free PGP replacement.
- GnuPG is the GNU encryption and signing tool.  As you can see from the
- version number, the program may have some bugs and some features may not
- work at all.
+ GnuPG is GNU's tool for secure communication and data storage.
+ It can be used to encrypt data and to create digital signatures.
+ It includes an advanced key management facility and is compliant
+ with the proposed OpenPGP Internet standard as described in RFC2440.
  .
- Due to the fact that GnuPG does not use use any patented algorithm,
- it cannot be compatible to old PGP versions, because those use
- IDEA (which is worldwide patented) and RSA (which is patented in
- the United States until Sep 20, 2000).
- .
- GnuPG is in almost all aspects compatible with other OpenPGP
- implementations. The default algorithms are DSA and ELGamal.
- Symmetric algorithms are: Blowfish and CAST5, Digest algorithms are
- MD5, RIPEMD160, SHA1 and TIGER/192.
+ GnuPG does not use use any patented algorithms so it cannot be
+ compatible with PGP2 because it uses IDEA (which is patented
+ worldwide) and RSA.  RSA's patent expired on the 20th September 2000,
+ and it is now included in GnuPG.
diff --git a/debian/copyright b/debian/copyright
index 6c08adfc7..e5d99f688 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,29 @@
-This is Debian/GNU Linux's prepackaged version of GNUPG, a free PGP
-replacement. As you can see from the version number, the program may
-have some bugs and some features may not work at all.
+This is Debian GNU's prepackaged version of GnuPG, a free PGP
+replacement.
 
-This package was put together by me, James Troup
-<[email protected]>, from the sources, which I obtained from
-ftp://ftp.gnupg.org/pub/gcrypt/gnupg-0.9.10.tar.gz.  The changes were
-minimal, namely:
+This package was put together by me, James Troup <[email protected]>,
+from the sources, which I obtained from
+ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.5.tar.gz.  The changes
+were minimal, namely:
 
 - adding support for the Debian package maintenance scheme, by adding
   various debian/* files.
 
-Program Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-Modifications for Debian Copyright (C) 1998,1999 James Troup.
+Program Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+Modifications for Debian Copyright (C) 1998, 1999, 2000, 2001 James Troup.
 
-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, or (at your option)
-any later version.
+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, 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.
+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 with
-your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
-Debian GNU/Linux gnupg source package as the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place, Suite
-330, Boston, MA 02111-1307, USA.
+your Debian GNU system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU gnupg source package as the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA 02111-1307, USA.
diff --git a/debian/lintian.override b/debian/lintian.override
new file mode 100644
index 000000000..c35ed27b3
--- /dev/null
+++ b/debian/lintian.override
@@ -0,0 +1 @@
+gnupg: setuid-binary usr/bin/gpg 4755 root/root
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 98825f605..000000000
--- a/debian/postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-       configure|abort-upgrade|abort-remove|abort-deconfigure)
-	    if [ -x /usr/sbin/suidregister ]; then
-		suidregister -s gpg /usr/bin/gpg root root 4755
-	    else
-		chmod 4755 /usr/bin/gpg
-	    fi
-            ;;
-esac
-
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index f640fb0b4..000000000
--- a/debian/postrm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	    if [ -x /usr/sbin/suidunregister ]; then
-		suidunregister -s gpg /usr/bin/gpg
-	    fi
-	    ;;
-esac
diff --git a/debian/preinst b/debian/preinst
index 8369e2013..607944c7c 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -34,7 +34,7 @@ EOF
 If at any stage you need a pre-0.3.3 gnupg, you can find source and
 binaries for i386, m68k, alpha, powerpc and hurd-i386 at 
 
-   http://james.nocrew.org/gnupg/
+   http://people.debian.org/~troup/gnupg/
 
 Press return to continue
 EOF
diff --git a/debian/rules b/debian/rules
index 3583ed4f7..400472edf 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file - for GNUPG (0.9.10)
+# debian/rules file - for GNUPG (1.0.5)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998 James Troup
@@ -9,6 +9,8 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
+STRIP=strip --remove-section=.comment --remove-section=.note
+
 build:
 	$(checkdir)
 	./configure --prefix=/usr --with-included-gettext
@@ -32,26 +34,36 @@ binary-arch:	checkroot build # test
 	$(checkdir)
 	-rm -rf debian/tmp
 	install -d debian/tmp/DEBIAN/
-	install -m 755 debian/preinst debian/postinst debian/postrm debian/tmp/DEBIAN/
-	$(MAKE) prefix=`pwd`/debian/tmp/usr install
-	strip debian/tmp/usr/bin/*
+	install -m 755 debian/preinst debian/prerm debian/postinst debian/tmp/DEBIAN/
+	$(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install
+	# copies of the manpage which can't be grokked by install-info
+	rm debian/tmp/usr/info/*
+	$(STRIP) debian/tmp/usr/bin/*
+	chmod 4755 debian/tmp/usr/bin/gpg
+	chmod 644 debian/tmp/usr/lib/gnupg/*
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
 	chmod 755 debian/tmp/usr/bin/lspgpot
-	strip --strip-unneeded debian/tmp/usr/lib/gnupg/*
-	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/man/man1/gpg.1 \
-	    > debian/tmp/usr/man/man1/gpg.1.new
-	mv debian/tmp/usr/man/man1/gpg.1.new debian/tmp/usr/man/man1/gpg.1
-	gzip -9v debian/tmp/usr/man/man1/*
-	install -d debian/tmp/usr/doc/gnupg/
-	install -m 644 debian/changelog debian/tmp/usr/doc/gnupg/changelog.Debian
+	$(STRIP) --strip-unneeded debian/tmp/usr/lib/gnupg/*
+	# In response to #53714... no idea if it's correct, will check with upstream
+	mv debian/tmp/usr/share/locale/es_ES debian/tmp/usr/share/locale/es
+	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
+	    > debian/tmp/usr/share/man/man1/gpg.1.new
+	mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1
+	gzip -9v debian/tmp/usr/share/man/man1/*
+	# Remove from /usr/share/gnupg that we install into /usr/share/doc/gnupg/
+	rm debian/tmp/usr/share/gnupg/FAQ debian/tmp/usr/share/gnupg/faq.html
+	install -d debian/tmp/usr/share/doc/gnupg/
+	install -m 644 debian/changelog debian/tmp/usr/share/doc/gnupg/changelog.Debian
 	install -m 644 debian/README.Debian README NEWS THANKS TODO doc/DETAILS \
-		doc/FAQ doc/OpenPGP debian/tmp/usr/doc/gnupg/
+		doc/FAQ doc/faq.html doc/OpenPGP debian/tmp/usr/share/doc/gnupg/
 	for i in po util mpi cipher tools g10 checks include; do \
-		install -m 644 $$i/ChangeLog debian/tmp/usr/doc/gnupg/changelog.$$i; done
-	install -m 644 ChangeLog debian/tmp/usr/doc/gnupg/changelog.toplevel
-	gzip -9v debian/tmp/usr/doc/gnupg/*
-	ln -s changelog.g10.gz debian/tmp/usr/doc/gnupg/changelog.gz
-	install -m 644 debian/copyright debian/tmp/usr/doc/gnupg/
+		install -m 644 $$i/ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.$$i; done
+	install -m 644 ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.toplevel
+	gzip -9v debian/tmp/usr/share/doc/gnupg/*
+	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
+	install -m 644 debian/copyright debian/tmp/usr/share/doc/gnupg/
+	install -d debian/tmp/usr/share/lintian/overrides/
+	install -m 644 debian/lintian.override debian/tmp/usr/share/lintian/overrides/gnupg
 	dpkg-shlibdeps g10/gpg
 	dpkg-gencontrol -isp
 	chown -R root.root debian/tmp