← Back to branch summary

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

« back to all changes in this revision

Viewing changes to keyserver/gpgkeys_finger.c

  • 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:
keyserver/gpgkeys_finger.c
5
5
 *
6
6
 * GnuPG is free software; you can redistribute it and/or modify
7
7
 * it under the terms of the GNU General Public License as published by
8
 
 * the Free Software Foundation; either version 2 of the License, or
 
8
 * the Free Software Foundation; either version 3 of the License, or
9
9
 * (at your option) any later version.
10
10
 *
11
11
 * GnuPG is distributed in the hope that it will be useful,
14
14
 * GNU General Public License for more details.
15
15
 *
16
16
 * You should have received a copy of the GNU General Public License
17
 
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
19
 
 * USA.
 
17
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
20
18
 */
21
19
 
22
20
#include <config.h>