diff --git a/ldns-1.6.16-manpage-fixes-bundle.patch b/ldns-1.6.16-manpage-fixes-bundle.patch deleted file mode 100644 index 7951ec1..0000000 --- a/ldns-1.6.16-manpage-fixes-bundle.patch +++ /dev/null @@ -1,269 +0,0 @@ -From 8481a8f65fec3b6b9bc0984f6ba36fbc82cc78ff Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 14:52:28 +0200 -Subject: [PATCH 1/8] ldns-compare: add missing options into usage - -Signed-off-by: Tomas Hozza ---- - examples/ldns-compare-zones.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/examples/ldns-compare-zones.c b/examples/ldns-compare-zones.c -index 663b744..084b801 100644 ---- a/examples/ldns-compare-zones.c -+++ b/examples/ldns-compare-zones.c -@@ -33,6 +33,8 @@ usage(char *prog) - printf(" -a - print all differences (-i -d -c)\n"); - printf(" -s - do not exclude SOA record from comparison\n"); - printf(" -z - do not sort zones\n"); -+ printf(" -h - show usage and exit\n"); -+ printf(" -v - show the version and exit\n"); - } - - int --- -1.8.3.1 - - -From 911a2bdcb03cbf36ac4591e1eea3c142b236350f Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 15:01:39 +0200 -Subject: [PATCH 2/8] ldns-key2ds: Add -f option into man page - -Signed-off-by: Tomas Hozza ---- - examples/ldns-key2ds.1 | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/examples/ldns-key2ds.1 b/examples/ldns-key2ds.1 -index 6fdbee5..a20ab96 100644 ---- a/examples/ldns-key2ds.1 -+++ b/examples/ldns-key2ds.1 -@@ -17,6 +17,10 @@ SHA1 for RSASHA1, and so on. - - .SH OPTIONS - .TP -+\fB-f\fR -+Ignore SEP flag (i.e. make DS records for any key) -+ -+.TP - \fB-n\fR - Write the result DS Resource Record to stdout instead of a file - --- -1.8.3.1 - - -From 4d9ea09fac2965316381336e83e78a30cd9b0573 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 15:07:51 +0200 -Subject: [PATCH 3/8] ldns-keygen: remove unused options - -Signed-off-by: Tomas Hozza ---- - examples/ldns-keygen.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/ldns-keygen.c b/examples/ldns-keygen.c -index 5765417..38ecfc1 100644 ---- a/examples/ldns-keygen.c -+++ b/examples/ldns-keygen.c -@@ -71,7 +71,7 @@ main(int argc, char *argv[]) - random = NULL; - ksk = false; /* don't create a ksk per default */ - -- while ((c = getopt(argc, argv, "a:kb:r:v25")) != -1) { -+ while ((c = getopt(argc, argv, "a:kb:r:v")) != -1) { - switch (c) { - case 'a': - if (algorithm != 0) { --- -1.8.3.1 - - -From 8726559f93ed85ae85b3667e4d8018c80714f3af Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 15:17:58 +0200 -Subject: [PATCH 4/8] ldns-read-zone: document -b option in man page - -Signed-off-by: Tomas Hozza ---- - examples/ldns-read-zone.1 | 4 ++++ - examples/ldns-read-zone.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/examples/ldns-read-zone.1 b/examples/ldns-read-zone.1 -index 7d4fd7d..e166658 100644 ---- a/examples/ldns-read-zone.1 -+++ b/examples/ldns-read-zone.1 -@@ -22,6 +22,10 @@ that is not of type NSEC, NSEC3, RRSIG or DNSKEY. DS records are not - printed. - - .TP -+\fB-b\fR -+Include Bubble Babble encoding of DS's. -+ -+.TP - \fB-0\fR - Print a (null) for the RRSIG inception, expiry and key data. This option - can be used when comparing different signing systems that use the same -diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c -index efe187e..b0f5c3c 100644 ---- a/examples/ldns-read-zone.c -+++ b/examples/ldns-read-zone.c -@@ -63,7 +63,7 @@ main(int argc, char **argv) - printf("Usage: %s [OPTIONS] \n", argv[0]); - printf("\tReads the zonefile and prints it.\n"); - printf("\tThe RR count of the zone is printed to stderr.\n"); -- printf("\t-b include bubblebabble of DS's.\n"); -+ printf("\t-b include Bubble Babble encoding of DS's.\n"); - printf("\t-0 zeroize timestamps and signature in RRSIG records.\n"); - printf("\t-c canonicalize all rrs in the zone.\n"); - printf("\t-d only show DNSSEC data from the zone\n"); --- -1.8.3.1 - - -From 9292d3ffc9e929b50e23d6ccc71fe2201af11e25 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 15:22:47 +0200 -Subject: [PATCH 5/8] ldns-sigzone: remove unused -l option - -Signed-off-by: Tomas Hozza ---- - examples/ldns-signzone.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c -index 25ece3a..be505f4 100644 ---- a/examples/ldns-signzone.c -+++ b/examples/ldns-signzone.c -@@ -379,7 +379,7 @@ main(int argc, char *argv[]) - - OPENSSL_config(NULL); - -- while ((c = getopt(argc, argv, "a:bde:f:i:k:lno:ps:t:vAE:K:")) != -1) { -+ while ((c = getopt(argc, argv, "a:bde:f:i:k:no:ps:t:vAE:K:")) != -1) { - switch (c) { - case 'a': - nsec3_algorithm = (uint8_t) atoi(optarg); --- -1.8.3.1 - - -From 76a188d66f919b25d553c94e41781d6bf14704f1 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 15:28:21 +0200 -Subject: [PATCH 6/8] ldns-walk: add missing options into man page - -Signed-off-by: Tomas Hozza ---- - examples/ldns-walk.1 | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/examples/ldns-walk.1 b/examples/ldns-walk.1 -index c8ace40..d4d1b6e 100644 ---- a/examples/ldns-walk.1 -+++ b/examples/ldns-walk.1 -@@ -22,6 +22,14 @@ Of course the nameserver that is used must be DNSSEC-aware. - - .SH OPTIONS - .TP -+\fB-4\fR -+Use only IPv4. -+ -+.TP -+\fB-6\fR -+Use only IPv6. -+ -+.TP - \fB-f\fR - Do a 'full' zone walk; by default, ldns-walk will only show the names, and types present at those names. If this option is given, all resource records will be printed. - -@@ -31,6 +39,10 @@ Start the walk with this owner name. Useful when continuing the walk for a - large zone. - - .TP -+\fB-v\fR \fIverbosity\fR -+Verbosity level [1-5]. -+ -+.TP - \fB@\fR \fInameserver\fR - Send the queries to this nameserver. - --- -1.8.3.1 - - -From 4317011bef2f58c045300ff7e479635d2e680809 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 15:35:35 +0200 -Subject: [PATCH 7/8] ldns-zcat: remove unused option -n and document option -v - in man page - -Signed-off-by: Tomas Hozza ---- - examples/ldns-zcat.1 | 4 ++++ - examples/ldns-zcat.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/examples/ldns-zcat.1 b/examples/ldns-zcat.1 -index 9c4054d..4fd7ba6 100644 ---- a/examples/ldns-zcat.1 -+++ b/examples/ldns-zcat.1 -@@ -18,6 +18,10 @@ The resulted zone file is printed to standard output. - .B -o ORIGIN - use ORIGIN when reading in the zone - -+.TP -+.B -v -+show the version number and exit -+ - .SH AUTHOR - Written by the ldns team as an example for ldns usage. - -diff --git a/examples/ldns-zcat.c b/examples/ldns-zcat.c -index df4ecba..eea6ea7 100644 ---- a/examples/ldns-zcat.c -+++ b/examples/ldns-zcat.c -@@ -54,7 +54,7 @@ main(int argc, char **argv) - progname = strdup(argv[0]); - origin = NULL; - -- while ((c = getopt(argc, argv, "n:o:v")) != -1) { -+ while ((c = getopt(argc, argv, "o:v")) != -1) { - switch(c) { - case 'o': - origin = ldns_dname_new_frm_str(strdup(optarg)); --- -1.8.3.1 - - -From 147b12971f4308f6ebf1085fde5e61327c192ed5 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Thu, 18 Jul 2013 15:39:03 +0200 -Subject: [PATCH 8/8] ldns-zsplit: document -v option in man page - -Signed-off-by: Tomas Hozza ---- - examples/ldns-zsplit.1 | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/examples/ldns-zsplit.1 b/examples/ldns-zsplit.1 -index 8e64668..02dce40 100644 ---- a/examples/ldns-zsplit.1 -+++ b/examples/ldns-zsplit.1 -@@ -27,6 +27,10 @@ use ORIGIN as origin when reading the zonefile. - .B -z - Sort the zone before splitting. - -+.TP -+.B -v -+Show version number and exit. -+ - .SH AUTHOR - Written by the ldns team as an example for ldns usage. - --- -1.8.3.1 - diff --git a/ldns-1.6.16-uninitialized-value-compiler-warnings.patch b/ldns-1.6.16-uninitialized-value-compiler-warnings.patch deleted file mode 100644 index 81cd9e1..0000000 --- a/ldns-1.6.16-uninitialized-value-compiler-warnings.patch +++ /dev/null @@ -1,147 +0,0 @@ -From ab321a4f77eba0048c4cfb1081ae2c8e3496f3fd Mon Sep 17 00:00:00 2001 -From: willem -Date: Tue, 12 Mar 2013 13:34:18 +0000 -Subject: [PATCH] - Uninitialized variable in securetrace.c - New install-sh - (apperantly :) - Get rid of "dereferencing type-punned pointer will break - strict-aliasing rules" warnings in sha2.c with gcc >= 4.7 - -git-svn-id: http://www.nlnetlabs.nl/svn/ldns@3826 af62348d-a3ea-0310-b058-bb613a78d823 ---- - trunk/drill/securetrace.c | 2 +- - trunk/install-sh | 14 +++++++------- - trunk/sha2.c | 15 ++++++++++++--- - 3 files changed, 20 insertions(+), 11 deletions(-) - -diff --git a/trunk/drill/securetrace.c b/trunk/drill/securetrace.c -index c6e7e58..9d61ec0 100644 ---- a/trunk/drill/securetrace.c -+++ b/trunk/drill/securetrace.c -@@ -138,7 +138,7 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t, - size_t j; - size_t k; - size_t l; -- uint8_t labels_count; -+ uint8_t labels_count = 0; - - /* dnssec */ - ldns_rr_list *key_list; -diff --git a/trunk/install-sh b/trunk/install-sh -index a9244eb..377bb86 100755 ---- a/trunk/install-sh -+++ b/trunk/install-sh -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2011-01-19.21; # UTC -+scriptversion=2011-11-20.07; # UTC - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC - # FSF changes to this file are in the public domain. - # - # Calling this script install-sh is preferred over install.sh, to prevent --# `make' implicit rules from creating a file called install from it -+# 'make' implicit rules from creating a file called install from it - # when there is no Makefile. - # - # This script is compatible with the BSD install script, but was written -@@ -156,7 +156,7 @@ while test $# -ne 0; do - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 -- # Protect names problematic for `test' and other utilities. -+ # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac -@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - fi - shift # arg - dst_arg=$arg -- # Protect names problematic for `test' and other utilities. -+ # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac -@@ -202,7 +202,7 @@ if test $# -eq 0; then - echo "$0: no input file specified." >&2 - exit 1 - fi -- # It's OK to call `install-sh -d' without argument. -+ # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 - fi -@@ -240,7 +240,7 @@ fi - - for src - do -- # Protect names problematic for `test' and other utilities. -+ # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac -@@ -354,7 +354,7 @@ do - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or -- # other-writeable bit of parent directory when it shouldn't. -+ # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in -diff --git a/trunk/sha2.c b/trunk/sha2.c -index 6ba4ab5..9a27122 100644 ---- a/trunk/sha2.c -+++ b/trunk/sha2.c -@@ -546,9 +546,15 @@ void ldns_sha256_update(ldns_sha256_CTX* context, const sha2_byte *data, size_t - usedspace = freespace = 0; - } - -+typedef union _ldns_sha2_buffer_union { -+ uint8_t* theChars; -+ uint64_t* theLongs; -+} ldns_sha2_buffer_union; -+ - void ldns_sha256_final(sha2_byte digest[], ldns_sha256_CTX* context) { - sha2_word32 *d = (sha2_word32*)digest; - size_t usedspace; -+ ldns_sha2_buffer_union cast_var; - - /* Sanity check: */ - assert(context != (ldns_sha256_CTX*)0); -@@ -585,7 +591,8 @@ void ldns_sha256_final(sha2_byte digest[], ldns_sha256_CTX* context) { - *context->buffer = 0x80; - } - /* Set the bit count: */ -- *(sha2_word64*)&context->buffer[ldns_sha256_SHORT_BLOCK_LENGTH] = context->bitcount; -+ cast_var.theChars = context->buffer; -+ cast_var.theLongs[ldns_sha256_SHORT_BLOCK_LENGTH / 8] = context->bitcount; - - /* final transform: */ - ldns_sha256_Transform(context, (sha2_word32*)context->buffer); -@@ -850,6 +857,7 @@ void ldns_sha512_update(ldns_sha512_CTX* context, const sha2_byte *data, size_t - - static void ldns_sha512_Last(ldns_sha512_CTX* context) { - size_t usedspace; -+ ldns_sha2_buffer_union cast_var; - - usedspace = (context->bitcount[0] >> 3) % LDNS_SHA512_BLOCK_LENGTH; - #if BYTE_ORDER == LITTLE_ENDIAN -@@ -882,8 +890,9 @@ static void ldns_sha512_Last(ldns_sha512_CTX* context) { - *context->buffer = 0x80; - } - /* Store the length of input data (in bits): */ -- *(sha2_word64*)&context->buffer[ldns_sha512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; -- *(sha2_word64*)&context->buffer[ldns_sha512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; -+ cast_var.theChars = context->buffer; -+ cast_var.theLongs[ldns_sha512_SHORT_BLOCK_LENGTH / 8] = context->bitcount[1]; -+ cast_var.theLongs[ldns_sha512_SHORT_BLOCK_LENGTH / 8 + 1] = context->bitcount[0]; - - /* final transform: */ - ldns_sha512_Transform(context, (sha2_word64*)context->buffer); --- -1.8.3.1 - diff --git a/ldns.spec b/ldns.spec index 88013d9..491b0b5 100644 --- a/ldns.spec +++ b/ldns.spec @@ -14,9 +14,6 @@ Release: 1%{?dist} License: BSD Url: http://www.nlnetlabs.nl/%{name}/ Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-1.6.16-uninitialized-value-compiler-warnings.patch -Patch1: %{name}-1.6.16-multilib.patch -Patch2: %{name}-1.6.16-manpage-fixes-bundle.patch Group: System Environment/Libraries BuildRequires: libpcap-devel, openssl-devel, gcc-c++, doxygen, # for snapshots only @@ -75,9 +72,6 @@ This package contains documentation for the ldns library %prep %setup -q -%patch0 -p2 -%patch1 -p1 -%patch2 -p1 -b .manpage # To built svn snapshots # rm config.guess config.sub ltmain.sh # aclocal @@ -194,6 +188,7 @@ rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/*.la - Updated to 1.6.17 - Enable perl bindings via new ldns-perl sub-package - Enable ECDSA/GOST which is now allowed in Fedora +- Removed patches merged upstream * Sat Aug 03 2013 Fedora Release Engineering - 1.6.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild