Ubuntu
gnupg package

[Merge] gnupg 1.4.11-3 from debian (unstable)

Bug #720905 reported by Rico Tzschichholz
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
gnupg (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

Binary package hint: gnupg

I have merged the current debian unstable version 1.4.11-3.
The debdiff is attached and the package is located here http://people.ubuntu.com/~ricotz/gnupg/

gnupg (1.4.11-3ubuntu1) natty; urgency=low

  * Resynchronise with Debian (LP: #720905). Remaining changes:
    - Disable mlock() test since it fails with ulimit 0 (on buildds).
    - Set gpg (or gpg2) and gpgsm to use a passphrase agent by default.
    - Fix udeb build failure on powerpc, building with -O2 instead of -Os.
    - Only suggest gnupg-curl and libldap; recommendations are pulled into
      minimal, and we don't need the keyserver utilities in a minimal Ubuntu
      system.
  * debian/{control,rules}: Remove the Win32 build (and mingw32
    build-dependency), since mingw32 is in universe, and will remain so for
    the forseeable future.

 -- Rico Tzschichholz <email address hidden> Tue, 22 Feb 2011 10:54:10 +0100

See original description
Tags: merge

Related branches

lp:~ricotz/ubuntu/natty/gnupg/natty
Ubuntu branches: Pending requested
Diff: 146727 lines (+27423/-42771)
143 files modified
AUTHORS (+7/-1)
ChangeLog (+24/-0)
Makefile.am (+4/-1)
Makefile.in (+8/-4)
NEWS (+8/-0)
README (+4/-4)
TODO (+79/-69)
VERSION (+1/-1)
aclocal.m4 (+28/-18)
checks/ChangeLog (+4/-0)
checks/Makefile.in (+26/-12)
checks/armor.test (+575/-2)
cipher/ChangeLog (+16/-0)
cipher/Makefile.in (+6/-5)
cipher/rand-internal.h (+2/-0)
cipher/random.c (+48/-3)
cipher/rndw32.c (+11/-0)
config.h.in (+47/-6)
configure (+6369/-17032)
configure.ac (+13/-3)
debian/README.Debian (+18/-0)
debian/changelog (+57/-0)
debian/control (+5/-5)
debian/gnupg.doc-base.faq (+0/-11)
debian/gnupg.docs (+0/-1)
debian/patches/00list (+0/-8)
debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch (+0/-28)
debian/patches/551709_fix_info_link_entry.dpatch (+0/-33)
debian/patches/553175_document_primary_uid_sign.dpatch (+0/-23)
debian/patches/560692_fix_fatal_after_homedir_creation.dpatch (+0/-25)
debian/patches/560995_fix_ftbfs_on_sparc64.dpatch (+0/-52)
debian/patches/567580_menu_prompt_reflects_program.dpatch (+0/-36)
debian/patches/567593_improve_info_and_faq.dpatch (+0/-134)
debian/patches/fix_infinite_loop_r5264.dpatch (+0/-23)
debian/patches/mips_gcc4.4.dpatch (+38/-40)
debian/rules (+33/-27)
doc/ChangeLog (+14/-0)
doc/FAQ (+11/-1298)
doc/Makefile.am (+3/-22)
doc/Makefile.in (+16/-31)
doc/README.W32 (+1/-1)
doc/faq.html (+0/-1655)
doc/faq.raw (+0/-1343)
doc/gnupg1.info (+33/-32)
doc/gnupg1.texi (+1/-1)
doc/gpg.texi (+126/-30)
doc/stamp-vti (+4/-4)
doc/version.texi (+4/-4)
g10/ChangeLog (+111/-2)
g10/Makefile.in (+6/-5)
g10/app-openpgp.c (+2/-2)
g10/armor.c (+5/-4)
g10/build-packet.c (+5/-0)
g10/card-util.c (+6/-3)
g10/cardglue.c (+7/-1)
g10/cardglue.h (+1/-0)
g10/ccid-driver.c (+3/-3)
g10/gpg.c (+8/-1)
g10/gpgv.c (+4/-0)
g10/import.c (+59/-1)
g10/iso7816.c (+3/-3)
g10/keydb.c (+3/-3)
g10/keyedit.c (+1/-1)
g10/keygen.c (+1/-1)
g10/keyring.c (+4/-4)
g10/keyserver.c (+3/-1)
g10/mainproc.c (+8/-0)
g10/misc.c (+12/-2)
g10/openfile.c (+19/-0)
g10/options.skel (+8/-7)
g10/parse-packet.c (+10/-2)
g10/passphrase.c (+5/-3)
g10/photoid.c (+4/-2)
g10/plaintext.c (+18/-3)
g10/sig-check.c (+5/-1)
g10/sign.c (+9/-6)
g10/signal.c (+10/-0)
g10/tdbio.c (+2/-1)
g10/trustdb.c (+8/-2)
gnupg.spec (+1/-1)
include/ChangeLog (+8/-0)
include/ttyio.h (+5/-0)
include/util.h (+1/-2)
keyserver/Makefile.in (+6/-5)
m4/Makefile.in (+5/-4)
m4/estream.m4 (+1/-0)
mpi/ChangeLog (+10/-0)
mpi/Makefile.in (+6/-5)
mpi/config.links (+10/-12)
mpi/longlong.h (+9/-2)
po/ChangeLog (+21/-1)
po/be.po (+547/-539)
po/ca.po (+547/-539)
po/cs.po (+547/-539)
po/da.po (+543/-538)
po/de.po (+551/-543)
po/el.po (+547/-539)
po/en@boldquot.po (+594/-589)
po/en@quot.po (+594/-589)
po/eo.po (+547/-539)
po/es.po (+547/-539)
po/et.po (+547/-539)
po/fi.po (+547/-539)
po/fr.po (+548/-540)
po/gl.po (+547/-539)
po/gnupg.pot (+543/-538)
po/hu.po (+547/-539)
po/id.po (+547/-539)
po/it.po (+547/-539)
po/ja.po (+547/-539)
po/nb.po (+547/-539)
po/nl.po (+547/-539)
po/pl.po (+761/-2205)
po/pt.po (+547/-539)
po/pt_BR.po (+547/-539)
po/ro.po (+1936/-1946)
po/ru.po (+547/-539)
po/sk.po (+547/-539)
po/sv.po (+548/-540)
po/tr.po (+547/-539)
po/zh_CN.po (+547/-539)
po/zh_TW.po (+731/-729)
scripts/ChangeLog (+13/-0)
scripts/autogen.sh (+4/-0)
scripts/config.guess (+145/-153)
scripts/config.sub (+149/-40)
scripts/mk-w32-dist (+2/-2)
scripts/w32installer.nsi (+2/-1)
tools/ChangeLog (+4/-0)
tools/Makefile.in (+6/-5)
util/ChangeLog (+30/-0)
util/Makefile.in (+6/-5)
util/argparse.c (+1/-1)
util/cert.c (+4/-1)
util/estream-printf.c (+15/-337)
util/iobuf.c (+21/-3)
util/logger.c (+27/-0)
util/pka.c (+16/-9)
util/secmem.c (+5/-1)
util/srv.c (+4/-1)
util/strgutil.c (+13/-0)
util/ttyio.c (+37/-7)
zlib/Makefile.in (+6/-5)
lp:ubuntu/natty/gnupg
Rico Tzschichholz (ricotz)
summary: - [Merge] gnupg 1.4.11-3 from debian (experimental)
+ [Merge] gnupg 1.4.11-3 from debian (unstable)
description: updated
Benjamin Drung (bdrung)
tags: added: merge
Revision history for this message
Benjamin Drung (bdrung) wrote :

You forgot to close this bug with the merge. Why do you install gpgv.exe in /usr/bin?

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

You are right, i have follow debian to close here. Shipping the win32 executeable won't work on ubuntu with the mingw32 compiler in universe. I am going to drop this gpgv-win32 package.

Rico Tzschichholz (ricotz)
description: updated
Revision history for this message
Benjamin Drung (bdrung) wrote :

There speaks nothing against keeping the gpgv-win32 package even if the mingw32 compiler is in universe. The question was why you changed the install location for gpgv.exe.

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

I didnt change the installation location. This is where the -3 debian package installs it, but they will change it to /usr/bin/win32 to follow the other *-win32 packages. Anyway dropping it seems to be the way since for gzip and cpio the *-win32 was dropped too.

Revision history for this message
Benjamin Drung (bdrung) wrote :

The Win32 build should be a separate point and not be under "Remaining changes", because this diff wasn't there by the last merge.

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

I don't really understand what you mean. This change is also a difference to the Debian packagine and should be listed as one like the others.

Revision history for this message
Benjamin Drung (bdrung) wrote :

Here's an example for the changelog:

* Remaining change:
  - carried change 1
  - carried change 2
* New difference 1
* New difference 2

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

It's fixed now

description: updated
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package gnupg - 1.4.11-3ubuntu1

---------------
gnupg (1.4.11-3ubuntu1) natty; urgency=low

  * Resynchronise with Debian (LP: #720905). Remaining changes:
    - Disable mlock() test since it fails with ulimit 0 (on buildds).
    - Set gpg (or gpg2) and gpgsm to use a passphrase agent by default.
    - Fix udeb build failure on powerpc, building with -O2 instead of -Os.
    - Only suggest gnupg-curl and libldap; recommendations are pulled into
      minimal, and we don't need the keyserver utilities in a minimal Ubuntu
      system.
  * debian/{control,rules}: Remove the Win32 build (and mingw32
    build-dependency), since mingw32 is in universe, and will remain so for
    the forseeable future.

gnupg (1.4.11-3) unstable; urgency=low

  * Install gpg setuid root again on kFreeBSD. We dropped this
    bit earlier because it's not necessary anymore on Linux, but
    the kFreeBSD kernel still requires it for secure memory.
    Thanks Robert Millan for the patch. (Closes: 598471)
  * Add a gpgv-win32 package, to be used by win32-loader. Patch
    from Didier Raboud (Closes: #612462).

gnupg (1.4.11-2) experimental; urgency=low

  * Update standards-version to 3.9.1, no changes needed.
  * Apply patch based on Werner Koch's work that (again)
    resolves a build failure on mips(el); issue addressed
    in 1.4.10-4 was only partly solved upstream.
  * Add README.Debian with smart card reader info, thanks
    Jonathan Nieder (Closes: #575763).

gnupg (1.4.11-1) experimental; urgency=low

  * New upstream release (Closes: #600587).
    + Obsoletes all previously existing Debian patches:
      567580_menu_prompt_reflects_program.dpatch
      560692_fix_fatal_after_homedir_creation.dpatch
      489225_catch_expired_primary_key_with_valid_subkey.dpatch
      fix_infinite_loop_r5264.dpatch
      567593_improve_info_and_faq.dpatch
      551709_fix_info_link_entry.dpatch
      560995_fix_ftbfs_on_sparc64.dpatch
      mips_gcc4.4.dpatch
      553175_document_primary_uid_sign.dpatch
    + No longer ships outdated faq.html.

  * Update references to RFC 2440 into RFC 4880. Thanks
    Christoph Anton Mitterer (Closes: #592294).
 -- Rico Tzschichholz <email address hidden> Tue, 22 Feb 2011 11:00:25 +0100

Changed in gnupg (Ubuntu):
status: New → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.