Initialize git-dpm

1 files changed, 24 insertions, 12 deletions

diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch
index 0615de097..3cb291e97 100644
--- a/debian/patches/dnssec-sshfp.patch
+++ b/debian/patches/dnssec-sshfp.patch
@@ -1,15 +1,27 @@
-Description: Force use of DNSSEC even if "options edns0" isn't in resolv.conf
- This allows SSHFP DNS records to be verified if glibc 2.11 is installed.
+From 145099bdca1b959e2ef3555cd6ce0bc44fb69ce8 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Sun, 9 Feb 2014 16:10:01 +0000
+Subject: Force use of DNSSEC even if "options edns0" isn't in resolv.conf
+
+This allows SSHFP DNS records to be verified if glibc 2.11 is installed.
+
 Origin: vendor, https://cvs.fedoraproject.org/viewvc/F-12/openssh/openssh-5.2p1-edns.patch?revision=1.1&view=markup
 Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049
 Last-Update: 2010-04-06
 
-Index: b/dns.c
-===================================================================
+Patch-Name: dnssec-sshfp.patch
+---
+ dns.c                           | 14 +++++++++++++-
+ openbsd-compat/getrrsetbyname.c | 10 +++++-----
+ openbsd-compat/getrrsetbyname.h |  3 +++
+ 3 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/dns.c b/dns.c
+index 630b97a..478c3d9 100644
 --- a/dns.c
 +++ b/dns.c
-@@ -196,6 +196,7 @@
+@@ -196,6 +196,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
  {
         u_int counter;
         int result;
@@ -17,7 +29,7 @@ Index: b/dns.c
         struct rrsetinfo *fingerprints = NULL;
  
         u_int8_t hostkey_algorithm;
-@@ -219,8 +220,19 @@
+@@ -219,8 +220,19 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
                 return -1;
         }
  
@@ -38,11 +50,11 @@ Index: b/dns.c
         if (result) {
                 verbose("DNS lookup error: %s", dns_result_totext(result));
                 return -1;
-Index: b/openbsd-compat/getrrsetbyname.c
-===================================================================
+diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
+index dc6fe05..e061a29 100644
 --- a/openbsd-compat/getrrsetbyname.c
 +++ b/openbsd-compat/getrrsetbyname.c
-@@ -209,8 +209,8 @@
+@@ -209,8 +209,8 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
                 goto fail;
         }
  
@@ -53,7 +65,7 @@ Index: b/openbsd-compat/getrrsetbyname.c
                 result = ERRSET_INVAL;
                 goto fail;
         }
-@@ -226,9 +226,9 @@
+@@ -226,9 +226,9 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
  #endif /* DEBUG */
  
  #ifdef RES_USE_DNSSEC
@@ -66,8 +78,8 @@ Index: b/openbsd-compat/getrrsetbyname.c
  #endif /* RES_USE_DNSEC */
  
         /* make query */
-Index: b/openbsd-compat/getrrsetbyname.h
-===================================================================
+diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
+index 1283f55..dbbc85a 100644
 --- a/openbsd-compat/getrrsetbyname.h
 +++ b/openbsd-compat/getrrsetbyname.h
 @@ -72,6 +72,9 @@