← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnupg/natty

« back to all changes in this revision

Viewing changes to debian/patches/50_disable_mlock_test.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2008-07-21 02:02:14 UTC
  • mfrom: (1.1.9 lenny)
  • Revision ID: james.westby@ubuntu.com-20080721020214-uh0hl0rfbog71as4
Tags: 1.4.9-3ubuntu1
https://launchpad.net/bugs/225005
https://launchpad.net/bugs/247679
* Merge from debian unstable (lp: #225005), remaining changes:
  - Add 'debian/patches/50_disable_mlock_test.dpatch': Disable mlock() test
    since it fails with ulimit 0 (on buildds).
  - Add 'debian/patches/61_use_agent_default.dpatch': Patch to set gpg
    (or gpg2) and gpgsm to use a passphrase agent by default (lp: 15485)
  - Add libcurl4-gnutls-dev to Build-Depends to fix gpg running into a
    timeout updating the keyring (lp: 62864)
* Dropped Ubuntu patches, applied upstream:
  - 50_show_primary_only.dpatch
  - 60_install_options_skel.dpatch
* Add 'debian/patches/55_curl_typefix.dpatch': Fix a build error with recent
  curl and gcc 4.3 (lp: #247679). Patch taken from upstream:
  http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/50_disable_mlock_test.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 50_disable_mlock_test.dpatch by Michael Bienia <geser@ubuntu.com>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Disable mlock() test since it fails with ulimit 0 (on Ubuntu buildds).
 
6
 
 
7
 
 
8
@DPATCH@
 
9
diff -urNad gnupg-1.4.9~/config.h.in gnupg-1.4.9/config.h.in
 
10
--- gnupg-1.4.9~/config.h.in    2008-03-26 18:33:29.000000000 +0100
 
11
+++ gnupg-1.4.9/config.h.in     2008-07-21 00:57:44.000000000 +0200
 
12
@@ -82,8 +82,11 @@
 
13
 /* Define if `gethrtime(2)' does not work correctly i.e. issues a SIGILL. */
 
14
 #undef HAVE_BROKEN_GETHRTIME
 
15
 
 
16
+/* Test doesn't work, since ulimit is sometimes 0... */
 
17
+#if 0
 
18
 /* Defined if the mlock() call does not work */
 
19
 #undef HAVE_BROKEN_MLOCK
 
20
+#endif
 
21
 
 
22
 /* Define to 1 if the compiler understands __builtin_expect. */
 
23
 #undef HAVE_BUILTIN_EXPECT