aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog37
-rw-r--r--debian/control4
-rw-r--r--debian/lintian.override1
-rw-r--r--debian/preinst2
-rw-r--r--debian/rules9
5 files changed, 48 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 823429d99..2f39aaae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+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.
diff --git a/debian/control b/debian/control
index 28eb808c0..5b158daf5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: gnupg
-Section: utils
+Section: non-US
Priority: optional
Maintainer: James Troup <[email protected]>
Standards-Version: 3.1.1.1
@@ -9,7 +9,7 @@ Package: gnupg
Architecture: any
Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13)
Suggests: gnupg-doc
-Conflicts: gpg-rsa, gpg-rsaref
+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.
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/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 d194653ef..d596a024d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -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
@@ -34,11 +36,12 @@ binary-arch: checkroot build # test
install -d debian/tmp/DEBIAN/
install -m 755 debian/preinst debian/prerm debian/postinst debian/postrm debian/tmp/DEBIAN/
$(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install
- strip debian/tmp/usr/bin/*
+ $(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/*
+ $(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 \
@@ -57,6 +60,8 @@ binary-arch: checkroot build # test
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