Package: gnupg
Version: 1.4.11-3
Severity: wishlist
Tags: patch

Hi,

mingw-w64, which is intended to eventually replace mingw32 and the
assorted packages, is now available in Debian along with new builds of
binutils and gcc. The attached patch allows gzip to build using
mingw-w64 rather than mingw32. I've checked the resulting executable
and it seems to work fine.

The patch disables ldap support for the Win32 build because of a
change in the parameters expected for the ldap_start_tls_sA function
(see
http://msdn.microsoft.com/en-us/library/aa366997%28v=vs.85%29.aspx -
the MinGW-w64 headers use the new definition with five parameters).
This doesn't affect gpgv so I reckoned it was innocuous as far as the
Debian package is concerned, but it would have to be fixed for
upstream to use mingw-w64 too (the gnupg site mentions that the
Windows builds are prepared using the Debian mingw32 package).

Regards,

Stephen

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (200, 'unstable'), (1, 
'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.38-2-686-bigmem (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages gnupg depends on:
ii  dpkg                    1.16.0.2         Debian package management system
ii  gpgv                    1.4.11-3         GNU privacy guard - signature veri
ii  install-info            4.13a.dfsg.1-6   Manage installed documentation in 
ii  libbz2-1.0              1.0.5-6          high-quality block-sorting file co
ii  libc6                   2.11.2-11        Embedded GNU C Library: Shared lib
ii  libreadline6            6.1-3            GNU readline and history libraries
ii  libusb-0.1-4            2:0.1.12-17      userspace USB programming library
ii  zlib1g                  1:1.2.3.4.dfsg-3 compression library - runtime

Versions of packages gnupg recommends:
ii  gnupg-curl                    1.4.11-3   GNU privacy guard - a free PGP rep
ii  libldap-2.4-2                 2.4.23-7   OpenLDAP libraries

Versions of packages gnupg suggests:
ii  eog                          2.30.2-1    Eye of GNOME graphics viewer progr
pn  gnupg-doc                    <none>      (no description available)
ii  imagemagick                  8:6.6.0.4-3 image manipulation programs
ii  libpcsclite1                 1.7.2-1     Middleware to access a smart card 

-- no debconf information
diff -urN gnupg-1.4.11.orig/debian/changelog gnupg-1.4.11/debian/changelog
--- gnupg-1.4.11.orig/debian/changelog	2011-04-21 00:02:21.000000000 +0200
+++ gnupg-1.4.11/debian/changelog	2011-04-21 00:01:52.000000000 +0200
@@ -1,3 +1,10 @@
+gnupg (1.4.11-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild with Debian dependencies only.
+
+ -- Stephen Kitt <[email protected]>  Thu, 21 Apr 2011 00:01:52 +0200
+
 gnupg (1.4.11-3) unstable; urgency=low
 
   * Install gpg setuid root again on kFreeBSD. We dropped this
diff -urN gnupg-1.4.11.orig/debian/control gnupg-1.4.11/debian/control
--- gnupg-1.4.11.orig/debian/control	2011-04-21 00:02:21.000000000 +0200
+++ gnupg-1.4.11/debian/control	2011-04-20 08:30:21.000000000 +0200
@@ -10,7 +10,7 @@
  libusb-dev [!hurd-i386],
  libreadline-dev, file, gettext, dpatch,
  libcurl4-gnutls-dev
-Build-Depends-Indep: mingw32
+Build-Depends-Indep: mingw-w64
 Homepage: http://www.gnupg.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/gnupg/trunk/
diff -urN gnupg-1.4.11.orig/debian/rules gnupg-1.4.11/debian/rules
--- gnupg-1.4.11.orig/debian/rules	2011-04-21 00:02:21.000000000 +0200
+++ gnupg-1.4.11/debian/rules	2011-04-20 23:58:30.000000000 +0200
@@ -55,8 +55,8 @@
 build-win32/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
-	    ../configure $(CONFARGS) --host i586-mingw32msvc \
-	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl)
+	    ../configure $(CONFARGS) --host i686-w64-mingw32 \
+	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl --disable-ldap)
 
 ##################################### build ##################################
 

Reply via email to