[Pkg-gnupg-commit] r98 - in /gnupg/trunk/debian: changelog control patches/00list patches/55_curl_typefix.dpatch rules
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Mon May 11 16:12:09 UTC 2009
Author: dleidert-guest
Date: Mon May 11 16:12:09 2009
New Revision: 98
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=98
Log:
* debian/control (Build-Depends): Added libcurl4-gnutls-dev (LP: #62864).
* debian/rules (CONFARGS): Add --enable-noexecstack to build gnupg without
executable stack on i386 (LP: #49323; closes: #527630).
(binary-arch): Register .info documentation (closes: #527570).
* debian/patches/55_curl_typefix.dpatch: Added to fix FTBFS (taken from
upstream/Ubuntu).
- gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all
libcurl number options are passed as long (closes: #502558).
Added:
gnupg/trunk/debian/patches/55_curl_typefix.dpatch
Modified:
gnupg/trunk/debian/changelog
gnupg/trunk/debian/control
gnupg/trunk/debian/patches/00list
gnupg/trunk/debian/rules
Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=98&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Mon May 11 16:12:09 2009
@@ -1,7 +1,18 @@
gnupg (1.4.9-5) UNRELEASED; urgency=low
+ [ Thijs Kinkhorst ]
* Re-enable build-time tests, accidentally disabled due to false
logic in debian/rules. Thanks Neil Williams, closes: #521884.
+
+ [ Daniel Leidert ]
+ * debian/control (Build-Depends): Added libcurl4-gnutls-dev (LP: #62864).
+ * debian/rules (CONFARGS): Add --enable-noexecstack to build gnupg without
+ executable stack on i386 (LP: #49323; closes: #527630).
+ (binary-arch): Register .info documentation (closes: #527570).
+ * debian/patches/55_curl_typefix.dpatch: Added to fix FTBFS (taken from
+ upstream/Ubuntu).
+ - gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all
+ libcurl number options are passed as long (closes: #502558).
-- Thijs Kinkhorst <thijs at debian.org> Tue, 31 Mar 2009 00:01:52 +0200
Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=98&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Mon May 11 16:12:09 2009
@@ -8,7 +8,8 @@
Standards-Version: 3.8.0
Build-Depends: debhelper (>> 5), libz-dev, libldap2-dev, libbz2-dev,
libusb-dev [!hurd-i386],
- libreadline5-dev, file, gettext, dpatch
+ libreadline5-dev, file, gettext, dpatch,
+ libcurl4-gnutls-dev
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/
Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=98&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Mon May 11 16:12:09 2009
@@ -2,4 +2,5 @@
25_de.po_fixes
25_it.po_fixes
25_fr.po_fixes
+55_curl_typefix
99_yat2m_fix_samp_handling
Added: gnupg/trunk/debian/patches/55_curl_typefix.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/55_curl_typefix.dpatch?rev=98&op=file
==============================================================================
--- gnupg/trunk/debian/patches/55_curl_typefix.dpatch (added)
+++ gnupg/trunk/debian/patches/55_curl_typefix.dpatch Mon May 11 16:12:09 2009
@@ -1,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_curl_typefix.dpatch by Michael Bienia <geser at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Apply patch from upstream to fix a build error with recent curl
+## DP: and gcc 4.3 (error: 'typeof' applied to a bit-field)
+## DP:
+## DP: - gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all
+## DP: libcurl number options are passed as long.
+## DP:
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html>
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2008-April/007685.html>
+## DP: <URL:http://bugs.debian.org/502558>
+
+ at DPATCH@
+diff -urNad gnupg-1.4.9~/keyserver/gpgkeys_curl.c gnupg-1.4.9/keyserver/gpgkeys_curl.c
+--- gnupg-1.4.9~/keyserver/gpgkeys_curl.c 2007-10-23 11:59:12.000000000 +0200
++++ gnupg-1.4.9/keyserver/gpgkeys_curl.c 2008-07-21 01:59:06.000000000 +0200
+@@ -286,7 +286,7 @@
+
+ if(follow_redirects)
+ {
+- curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1);
++ curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L);
+ if(follow_redirects>0)
+ curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects);
+ }
+@@ -298,10 +298,10 @@
+ {
+ fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
+ curl_easy_setopt(curl,CURLOPT_STDERR,console);
+- curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
++ curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
+ }
+
+- curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
++ curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert);
+ curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
+
+ if(proxy)
+diff -urNad gnupg-1.4.9~/keyserver/gpgkeys_hkp.c gnupg-1.4.9/keyserver/gpgkeys_hkp.c
+--- gnupg-1.4.9~/keyserver/gpgkeys_hkp.c 2007-10-23 11:59:12.000000000 +0200
++++ gnupg-1.4.9/keyserver/gpgkeys_hkp.c 2008-07-21 01:59:06.000000000 +0200
+@@ -202,9 +202,9 @@
+ fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
+
+ curl_easy_setopt(curl,CURLOPT_URL,request);
+- curl_easy_setopt(curl,CURLOPT_POST,1);
++ curl_easy_setopt(curl,CURLOPT_POST,1L);
+ curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key);
+- curl_easy_setopt(curl,CURLOPT_FAILONERROR,1);
++ curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L);
+
+ res=curl_easy_perform(curl);
+ if(res!=0)
+@@ -661,7 +661,7 @@
+ {
+ fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
+ curl_easy_setopt(curl,CURLOPT_STDERR,console);
+- curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
++ curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
+ }
+
+ if(proxy)
Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=98&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Mon May 11 16:12:09 2009
@@ -19,7 +19,9 @@
DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-CONFARGS = --prefix=/usr --libexecdir=/usr/lib/ --enable-mailto --with-mailprog=/usr/sbin/sendmail
+CONFARGS = --prefix=/usr --libexecdir=/usr/lib/ \
+ --enable-mailto --with-mailprog=/usr/sbin/sendmail \
+ --enable-noexecstack
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
CONFARGS += --host=$(DEB_HOST_GNU_TYPE)
@@ -98,6 +100,7 @@
dh_installexamples
dh_movefiles -pgpgv --sourcedir=debian/gnupg
dh_install
+ dh_installinfo doc/gnupg1.info
dh_installman
dh_link
dh_strip
More information about the Pkg-gnupg-commit
mailing list