[Pkg-gnupg-commit] [gnupg] 01/01: Merge remote-tracking branch 'origin/experimental'
Thijs Kinkhorst
thijs at moszumanska.debian.org
Mon May 4 18:59:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
thijs pushed a commit to branch master
in repository gnupg.
commit eec100e83a7f4b657ab611affdca0c79fedf2894
Merge: 0a16e20 64b5b92
Author: Thijs Kinkhorst <thijs at debian.org>
Date: Mon May 4 18:44:31 2015 +0000
Merge remote-tracking branch 'origin/experimental'
Conflicts:
debian/changelog
debian/patches/series
ChangeLog | 297 +
INSTALL | 261 +-
Makefile.am | 1 -
Makefile.in | 330 +-
NEWS | 40 +-
README | 8 +-
VERSION | 2 +-
aclocal.m4 | 847 +-
bzlib/Makefile.in | 210 +-
checks/Makefile.in | 134 +-
cipher/Makefile.in | 209 +-
cipher/elgamal.c | 63 +-
cipher/rijndael.c | 38 +-
cipher/rndlinux.c | 29 +-
cipher/rndunix.c | 8 +-
cipher/sha1.c | 19 +-
config.h.in | 135 +-
configure | 1616 ++--
configure.ac | 43 +-
debian/changelog | 17 +
debian/compat | 2 +-
debian/control | 21 +-
debian/gbp.conf | 1 +
debian/gnupg.udev | 2 +
debian/patches/0003-Update-POT-file.patch | 195 -
debian/patches/0004-Update-PO-files.patch | 5871 -------------
.../patches/0005-Update-French-translation.patch | 560 --
.../patches/0006-Update-Danish-translation.patch | 78 +-
.../0007-Update-Ukrainian-translation.patch | 81 -
...-mpi-Improve-mpi_invm-to-detect-bad-input.patch | 35 -
.../patches/0008-Update-Russian-translation.patch | 5046 ------------
...09-Update-Chinese-traditional-translation.patch | 147 -
.../patches/0010-Update-Italian-translation.patch | 8581 --------------------
.../patches/0011-Update-Polish-translation.patch | 6690 ---------------
.../patches/0012-Update-Spanish-translation.patch | 7032 ----------------
debian/patches/0013-Update-Dutch-translation.patch | 7481 -----------------
debian/patches/0014-Update-Czech-translation.patch | 7739 ------------------
...e-use-of-verify-FILE-for-detached-sigs-ha.patch | 316 -
...g-Fix-a-NULL-deref-for-invalid-input-data.patch | 50 -
...-by-one-read-in-the-attribute-subpacket-p.patch | 43 -
...se-of-uninit.value-in-listing-sig-subpkts.patch | 52 -
.../0019-gpg-release-DEK-soon-after-its-use.patch | 42 -
...d-fix-get_public_key-for-OpenPGPcard-v1.0.patch | 33 -
...sibly-inhibited-checkpin-of-the-admin-pin.patch | 29 -
...g-Fix-possible-read-of-unallocated-memory.patch | 48 -
.../0023-doc-Fix-memory-leak-in-yat2m.patch | 28 -
...ture-chance-of-using-uninitialized-memory.patch | 44 -
...iphertext-blinding-for-Elgamal-decryption.patch | 114 -
...he-size-of-key-packets-to-a-sensible-valu.patch | 109 -
...ULL-deref-due-to-empty-ring-trust-packets.patch | 57 -
...ULL-deref-in-export-due-to-invalid-packet.patch | 40 -
...-an-invalid-memory-read-using-a-garbled-k.patch | 78 -
...remaining-http-links-to-gnupg.org-to-http.patch | 67 -
...functions-to-convert-buffer-data-to-scala.patch | 741 --
.../patches/0039-curl-shim-clean-up-varargs.patch | 40 -
...gv-due-to-NULL-value-stored-as-opaque-MPI.patch | 89 -
...ect-against-NULL-return-of-mpi_get_opaque.patch | 55 -
...ning-note-about-not-acting-as-an-oracle-t.patch | 48 -
...ata-dependent-timing-variations-in-mpi_po.patch | 237 -
...ld-and-runtime-support-for-larger-RSA-key.patch | 254 -
debian/patches/fix_760273.patch | 30 -
debian/patches/fix_import_filter_regression.patch | 249 -
debian/patches/series | 38 -
debian/patches/sync-docs-with-upstream.patch | 975 ---
debian/rules | 5 +-
debian/tests/control | 2 +
debian/tests/gpgv-win32 | 28 +
doc/DETAILS | 30 +
doc/Makefile.am | 21 +-
doc/Makefile.in | 258 +-
doc/gnupg1.info | 4122 +++++-----
doc/gpg.texi | 456 +-
doc/gpl.texi | 25 +-
doc/stamp-vti | 8 +-
doc/version.texi | 8 +-
doc/yat2m.c | 103 +-
g10/Makefile.in | 221 +-
g10/apdu.c | 27 +-
g10/app-openpgp.c | 7 +-
g10/armor.c | 37 +
g10/build-packet.c | 15 +-
g10/ccid-driver.c | 3 +-
g10/filter.h | 2 +
g10/getkey.c | 19 +-
g10/global.h | 1 +
g10/gpg.c | 29 +-
g10/import.c | 67 +-
g10/keyedit.c | 58 +
g10/keygen.c | 45 +-
g10/keyid.c | 36 +-
g10/keyring.c | 24 +-
g10/keyserver.c | 154 +-
g10/main.h | 9 +-
g10/mainproc.c | 56 +-
g10/misc.c | 63 +-
g10/openfile.c | 91 +-
g10/options.h | 2 +
g10/parse-packet.c | 109 +-
g10/plaintext.c | 21 +-
g10/seckey-cert.c | 17 +-
g10/sig-check.c | 2 +-
g10/tdbio.c | 22 +-
g10/trustdb.c | 2 +-
gnupg.spec | 2 +-
include/cipher.h | 1 +
include/host2net.h | 80 +-
include/mpi.h | 1 +
include/types.h | 9 +
include/util.h | 19 +-
intl/ChangeLog | 3 -
intl/Makefile.in | 59 +-
intl/VERSION | 2 +-
intl/bindtextdom.c | 18 +-
intl/config.charset | 20 +-
intl/dcgettext.c | 18 +-
intl/dcigettext.c | 52 +-
intl/dcngettext.c | 18 +-
intl/dgettext.c | 18 +-
intl/dngettext.c | 18 +-
intl/eval-plural.h | 18 +-
intl/explodename.c | 18 +-
intl/finddomain.c | 18 +-
intl/gettext.c | 18 +-
intl/gettextP.h | 18 +-
intl/gmo.h | 18 +-
intl/hash-string.c | 5 +-
intl/hash-string.h | 18 +-
intl/intl-compat.c | 20 +-
intl/intl-exports.c | 24 +-
intl/l10nflist.c | 18 +-
intl/langprefs.c | 18 +-
intl/{libgnuintl.h.in => libgnuintl.in.h} | 30 +-
intl/libintl.rc | 2 +-
intl/loadinfo.h | 18 +-
intl/loadmsgcat.c | 52 +-
intl/localcharset.c | 98 +-
intl/localcharset.h | 18 +-
intl/locale.alias | 22 +-
intl/localealias.c | 18 +-
intl/localename.c | 336 +-
intl/lock.c | 26 +-
intl/lock.h | 33 +-
intl/log.c | 18 +-
intl/ngettext.c | 18 +-
intl/os2compat.c | 18 +-
intl/os2compat.h | 18 +-
intl/osdep.c | 20 +-
intl/plural-exp.c | 18 +-
intl/plural-exp.h | 20 +-
intl/plural.c | 899 +-
intl/plural.y | 40 +-
intl/printf-args.c | 18 +-
intl/printf-args.h | 24 +-
intl/printf-parse.c | 66 +-
intl/printf-parse.h | 31 +-
intl/printf.c | 38 +-
intl/ref-add.sin | 18 +-
intl/ref-del.sin | 18 +-
intl/relocatable.c | 91 +-
intl/relocatable.h | 18 +-
intl/setlocale.c | 79 +-
intl/textdomain.c | 18 +-
intl/threadlib.c | 18 +-
intl/tsearch.c | 18 +-
intl/tsearch.h | 18 +-
intl/vasnprintf.c | 327 +-
intl/vasnprintf.h | 22 +-
intl/vasnwprintf.h | 18 +-
intl/verify.h | 279 +
intl/version.c | 18 +-
intl/wprintf-parse.h | 33 +-
intl/xsize.c | 3 +
intl/xsize.h | 38 +-
keyserver/Makefile.am | 19 +-
keyserver/Makefile.in | 464 +-
keyserver/curl-shim.c | 2 +
m4/Makefile.in | 108 +-
m4/codeset.m4 | 14 +-
m4/fcntl-o.m4 | 95 +-
m4/gettext.m4 | 58 +-
m4/glibc2.m4 | 7 +-
m4/glibc21.m4 | 14 +-
m4/iconv.m4 | 110 +-
m4/intdiv0.m4 | 15 +-
m4/intl.m4 | 74 +-
m4/intldir.m4 | 2 +-
m4/intlmacosx.m4 | 25 +-
m4/intmax.m4 | 13 +-
m4/inttypes-pri.m4 | 16 +-
m4/inttypes_h.m4 | 19 +-
m4/lcmessage.m4 | 12 +-
m4/lib-ld.m4 | 77 +-
m4/lib-link.m4 | 43 +-
m4/lib-prefix.m4 | 2 +-
m4/lock.m4 | 25 +-
m4/longlong.m4 | 87 +-
m4/nls.m4 | 2 +-
m4/po.m4 | 38 +-
m4/printf-posix.m4 | 23 +-
m4/progtest.m4 | 21 +-
m4/size_max.m4 | 16 +-
m4/stdint_h.m4 | 17 +-
m4/threadlib.m4 | 162 +-
m4/uintmax_t.m4 | 2 +-
m4/visibility.m4 | 25 +-
m4/wchar_t.m4 | 14 +-
m4/wint_t.m4 | 14 +-
m4/xsize.m4 | 5 +-
mpi/Makefile.am | 6 +-
mpi/Makefile.in | 215 +-
mpi/mpi-internal.h | 3 +-
mpi/mpi-inv.c | 5 +
mpi/mpi-pow.c | 93 +-
mpi/mpih-div.c | 4 +-
mpi/mpiutil.c | 28 +
po/Makefile.in.in | 57 +-
po/Makevars | 42 +-
po/Rules-quot | 15 +-
po/be.gmo | Bin 12245 -> 12247 bytes
po/be.po | 1579 ++--
po/ca.gmo | Bin 74420 -> 74422 bytes
po/ca.po | 1582 ++--
po/cs.gmo | Bin 125636 -> 145929 bytes
po/cs.po | 4527 ++++++-----
po/da.gmo | Bin 140892 -> 140894 bytes
po/da.po | 1583 ++--
po/de.gmo | Bin 150247 -> 150821 bytes
po/de.po | 1583 ++--
po/el.gmo | Bin 74127 -> 74129 bytes
po/el.po | 1582 ++--
po/en at boldquot.gmo | Bin 135959 -> 136491 bytes
po/en at boldquot.po | 1603 ++--
po/en at quot.gmo | Bin 134323 -> 134847 bytes
po/en at quot.po | 1591 ++--
po/eo.gmo | Bin 53200 -> 53202 bytes
po/eo.po | 1582 ++--
po/es.gmo | Bin 125794 -> 144853 bytes
po/es.po | 4046 ++++-----
po/et.gmo | Bin 69808 -> 69810 bytes
po/et.po | 1582 ++--
po/fi.gmo | Bin 73434 -> 73436 bytes
po/fi.po | 1582 ++--
po/fr.gmo | Bin 152514 -> 152742 bytes
po/fr.po | 1725 ++--
po/gl.gmo | Bin 72587 -> 72589 bytes
po/gl.po | 1582 ++--
po/gnupg.pot | 1581 ++--
po/hu.gmo | Bin 72723 -> 72725 bytes
po/hu.po | 1582 ++--
po/id.gmo | Bin 70881 -> 70883 bytes
po/id.po | 1582 ++--
po/it.gmo | Bin 72938 -> 144891 bytes
po/it.po | 5790 ++++++-------
po/ja.gmo | Bin 108595 -> 108597 bytes
po/ja.po | 1582 ++--
po/nb.gmo | Bin 89938 -> 89940 bytes
po/nb.po | 1581 ++--
po/nl.gmo | Bin 132896 -> 151715 bytes
po/nl.po | 4448 +++++-----
po/pl.gmo | Bin 142901 -> 146345 bytes
po/pl.po | 3877 +++++----
po/pt.gmo | Bin 64151 -> 64153 bytes
po/pt.po | 1582 ++--
po/pt_BR.gmo | Bin 37351 -> 37353 bytes
po/pt_BR.po | 1582 ++--
po/ro.gmo | Bin 144521 -> 144523 bytes
po/ro.po | 1583 ++--
po/ru.gmo | Bin 158592 -> 182708 bytes
po/ru.po | 3457 ++++----
po/sk.gmo | Bin 71772 -> 71774 bytes
po/sk.po | 1582 ++--
po/sv.gmo | Bin 139376 -> 139378 bytes
po/sv.po | 1583 ++--
po/tr.gmo | Bin 129316 -> 129318 bytes
po/tr.po | 1582 ++--
po/uk.gmo | Bin 191723 -> 192371 bytes
po/uk.po | 1599 ++--
po/zh_CN.gmo | Bin 131133 -> 131135 bytes
po/zh_CN.po | 1583 ++--
po/zh_TW.gmo | Bin 134063 -> 135000 bytes
po/zh_TW.po | 1626 ++--
scripts/compile | 99 +-
scripts/config.guess | 164 +-
scripts/config.rpath | 120 +-
scripts/config.sub | 26 +-
scripts/depcomp | 471 +-
scripts/install-sh | 552 +-
scripts/mdate-sh | 113 +-
scripts/missing | 450 +-
scripts/mkinstalldirs | 36 +-
scripts/texinfo.tex | 521 +-
tools/Makefile.in | 239 +-
util/Makefile.am | 6 +-
util/Makefile.in | 223 +-
util/argparse.c | 2 +-
util/cert.c | 14 +-
util/iobuf.c | 2 +-
util/pka.c | 405 +-
util/strgutil.c | 167 +-
zlib/Makefile.in | 210 +-
300 files changed, 45327 insertions(+), 95574 deletions(-)
diff --cc debian/changelog
index a67834a,dafdcf0..c40de85
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,27 @@@
-gnupg (1.4.19-2) experimental; urgency=medium
++gnupg (1.4.19-2) unstable; urgency=medium
+
++ [ Daniel Kahn Gillmor ]
+ * added gnupg-dbg package.
+
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Wed, 01 Apr 2015 15:01:10 -0400
++ -- Thijs Kinkhorst <thijs at debian.org> Mon, 04 May 2015 18:41:44 +0000
+
+ gnupg (1.4.19-1) experimental; urgency=medium
+
+ * New upstream version.
+ * Make debian build reproducible (Closes: #778877).
+ * added udev rule for Alcor smartcard reader in ThinkPad X250 (Closes:
+ #780469)
+ * bump to debhelper 9
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Mon, 02 Mar 2015 01:48:15 +0100
+
+gnupg (1.4.18-7) unstable; urgency=medium
+
+ * import a series of DoS and vulnerability fixes from upstream, including
+ CVE-2014-3591
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Mon, 02 Mar 2015 19:29:26 +0100
+
gnupg (1.4.18-6) unstable; urgency=medium
* revert to debhelper 7
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg.git
More information about the Pkg-gnupg-commit
mailing list