[Pkg-gnupg-commit] [gnupg2] 03/07: adopt gpgv-win32 from the 1.4 packaging

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 03540194c7c0d9427e226f119a9236b132421f7d
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Mar 28 23:26:57 2016 -0400

    adopt gpgv-win32 from the 1.4 packaging
---
 debian/changelog |  6 ++++++
 debian/clean     |  1 +
 debian/control   | 24 ++++++++++++++++++++++++
 debian/rules     | 24 ++++++++++++++++++++++++
 4 files changed, 55 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ff1b65..3469d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnupg2 (2.1.11-6+exp1) experimental; urgency=medium
+
+  * take over gpgv-win32 from gnupg 1.4 packaging
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Mon, 28 Mar 2016 23:27:43 -0400
+
 gnupg2 (2.1.11-6) unstable; urgency=medium
 
   * avoid FTBFS with patch from upstream (Closes: #814842)
diff --git a/debian/clean b/debian/clean
index 1e7ff66..c41ea11 100644
--- a/debian/clean
+++ b/debian/clean
@@ -4,3 +4,4 @@ po/*.gmo
 po/stamp-po
 build-gpgv-udeb/
 build/
+build-gpgv-win32/
diff --git a/debian/control b/debian/control
index 7280a80..a86a979 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,14 @@ Build-Depends: automake,
                texinfo,
                transfig,
                zlib1g-dev | libz-dev
+Build-Depends-Indep: libassuan-mingw-w64-dev,
+                     libgcrypt-mingw-w64-dev,
+                     libgpg-error-mingw-w64-dev,
+                     libksba-mingw-w64-dev,
+                     libnpth-mingw-w64-dev,
+                     libz-mingw-w64-dev,
+                     mingw-w64,
+                     win-iconv-mingw-w64-dev
 Vcs-Git: https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-gnupg/gnupg2.git
 Homepage: https://www.gnupg.org/
@@ -148,3 +156,19 @@ Description: minimal signature verification tool
  .
  This is GnuPG's signature verification tool, gpgv, packaged in minimal
  form for use in debian-installer.
+
+Package: gpgv-win32
+Architecture: all
+Priority: extra
+Depends: ${misc:Depends}
+Suggests: wine
+Description: GNU privacy guard - signature verification tool (win32 build)
+ GnuPG is GNU's tool for secure communication and data storage.
+ .
+ gpgv is a stripped-down version of gnupg which is only able to check
+ signatures.  It is smaller than the full-blown gnupg and uses a
+ different (and simpler) way to check that the public keys used to
+ make the signature are trustworthy.
+ .
+ This is a win32 version of gpgv.  It's meant to be used by the win32-loader
+ component of Debian-Installer.
diff --git a/debian/rules b/debian/rules
index d87e104..5d95dc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,8 @@ endif
 
 GPGV_UDEB_UNNEEDED = gpgtar bzip2 gpgsm scdaemon dirmngr doc tofu exec ldap gnutls dns-srv sqlite
 
+WIN32_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp -static" CFLAGS="-g -Os" CPPFLAGS=
+
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-gpgv-udeb -- \
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
@@ -37,6 +39,20 @@ override_dh_auto_build-arch:
 	ln build-gpgv-udeb/g10/gpgv2 build-gpgv-udeb/g10/gpgv
 	dh_auto_build --builddirectory=build
 
+override_dh_auto_build-indep:
+	mkdir -p build-gpgv-win32
+	cd build-gpgv-win32 && $(WIN32_FLAGS) ../configure \
+	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x)) \
+		$(foreach x, libgpg-error libgcrypt libassuan libiconv ksba npth, --with-$x-prefix=/usr/i686-w64-mingw32) \
+		--with-zlib=/usr/i686-w64-mingw \
+		--prefix=/usr/i686-w64-mingw32 \
+		--host i686-w64-mingw32
+	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommon.a
+	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
+	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
+	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
+	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv2.exe
+
 override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.
 	dpkg-shlibdeps -Tdebian/dirmngr.substvars -dRecommends debian/dirmngr/usr/lib/gnupg2/dirmngr_ldap -dDepends debian/dirmngr/usr/bin/dirmngr*
@@ -48,6 +64,14 @@ override_dh_auto_install-arch:
 	install -m 644 debian/gnupg-agent.xsession \
 		debian/gnupg-agent/etc/X11/Xsession.d/90gpg-agent
 
+override_dh_auto_install-indep:
+	mkdir -p debian/gpgv-win32/usr/share/win32
+	install build-gpgv-win32/g10/gpgv2.exe debian/gpgv-win32/usr/share/win32/gpgv.exe
+
+override_dh_strip:
+	dh_strip
+	strip debian/gpgv-win32/usr/share/win32/*.exe
+
 override_dh_installman:
 	help2man --no-info -n "List, export, import Keybox data" \
 		debian/tmp/usr/bin/kbxutil > debian/kbxutil.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git