From 0b677ba499545b5529c611a50266f38d115f8a3d Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Sun, 15 Apr 2007 16:37:01 +0000
Subject: [PATCH] * argparse.c (default_strusage): Copyright 2007.

* cert.c, srv.c, pka.c: Need arpa/inet.h for ntohs().
---
 util/ChangeLog  | 6 ++++++
 util/argparse.c | 6 +++---
 util/cert.c     | 3 ++-
 util/pka.c      | 3 ++-
 util/srv.c      | 3 ++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/util/ChangeLog b/util/ChangeLog
index 6a3a7850e..226f24592 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-15  David Shaw  <dshaw@jabberwocky.com>
+
+	* argparse.c (default_strusage): Copyright 2007.
+
+	* cert.c, srv.c, pka.c: Need arpa/inet.h for ntohs().
+
 2007-02-26  Werner Koch  <wk@g10code.com>
 
 	* simple-gettext.c (set_gettext_file): Make use of the envvar
diff --git a/util/argparse.c b/util/argparse.c
index cdc56bf3a..cd29c0cef 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -1,6 +1,6 @@
 /* [argparse.c wk 17.06.97] Argument Parser for option handling
- *  Copyright (C) 1998, 1999, 2000, 2001, 2003,
- *                2004 Free Software Foundation, Inc.
+ *  Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+ *                2007 Free Software Foundation, Inc.
  *
  *  This file is part of GnuPG.
  *
@@ -914,7 +914,7 @@ default_strusage( int level )
     switch( level ) {
       case 11: p = "foo"; break;
       case 13: p = "0.0"; break;
-      case 14: p = "Copyright (C) 2006 Free Software Foundation, Inc."; break;
+      case 14: p = "Copyright (C) 2007 Free Software Foundation, Inc."; break;
       case 15: p =
 "This program comes with ABSOLUTELY NO WARRANTY.\n"
 "This is free software, and you are welcome to redistribute it\n"
diff --git a/util/cert.c b/util/cert.c
index 1b3390b80..317c14b37 100644
--- a/util/cert.c
+++ b/util/cert.c
@@ -1,5 +1,5 @@
 /* cert.c - DNS CERT code
- * Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -27,6 +27,7 @@
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#include <arpa/inet.h>
 #include <resolv.h>
 #endif
 #include <string.h>
diff --git a/util/pka.c b/util/pka.c
index 3c9e5c437..2a39a4feb 100644
--- a/util/pka.c
+++ b/util/pka.c
@@ -1,5 +1,5 @@
 /* pka.c - DNS Public Key Association RR access
- * Copyright (C) 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -32,6 +32,7 @@
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#include <arpa/inet.h>
 #include <resolv.h>
 #endif
 #endif /* USE_DNS_PKA */
diff --git a/util/srv.c b/util/srv.c
index 95187dbc8..1cbc52eb6 100644
--- a/util/srv.c
+++ b/util/srv.c
@@ -1,5 +1,5 @@
 /* srv.c - DNS SRV code
- * Copyright (C) 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -26,6 +26,7 @@
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#include <arpa/inet.h>
 #include <resolv.h>
 #endif
 #include <unistd.h>