diff --git a/bind.spec b/bind.spec index 8e4dded..64995f6 100644 --- a/bind.spec +++ b/bind.spec @@ -194,7 +194,7 @@ Name Domain (BIND) DNS server is found in the package named bind. %if 0%{?suse_version} <= 1010 %patch100 -p1 %endif -%patch110 -p0 +#%patch110 -p0 # modify settings of some files regarding to OS version and vendor function replaceStrings() { diff --git a/perl-path.diff b/perl-path.diff index dd5a939..d9fc1c4 100644 --- a/perl-path.diff +++ b/perl-path.diff @@ -1,21 +1,27 @@ ---- bin/tests/t_api.pl -+++ bin/tests/t_api.pl 2012/05/22 07:59:27 +Index: bin/tests/t_api.pl +=================================================================== +--- bin/tests/t_api.pl.orig ++++ bin/tests/t_api.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # - # Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + # Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2001 Internet Software Consortium. ---- contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl -+++ contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl 2012/05/22 07:59:17 +Index: contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl +=================================================================== +--- contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl.orig ++++ contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl @@ -1,4 +1,4 @@ -#! /usr/local/bin/perl -w +#! /usr/bin/perl -w # $Id: generate_nameprep_data.pl,v 1.1 2003/06/04 00:27:54 marka Exp $ # # Copyright (c) 2001 Japan Network Information Center. All rights reserved. ---- contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl -+++ contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl 2012/05/22 07:58:58 +Index: contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl +=================================================================== +--- contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl.orig ++++ contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl @@ -1,4 +1,4 @@ -#! /usr/local/bin/perl -w +#! /usr/bin/perl -w diff --git a/pie_compile.diff b/pie_compile.diff index a453968..0314da2 100644 --- a/pie_compile.diff +++ b/pie_compile.diff @@ -3,7 +3,7 @@ Index: bin/Makefile.in --- bin/Makefile.in.orig +++ bin/Makefile.in @@ -23,4 +23,8 @@ SUBDIRS = named rndc dig dnssec tests to - check confgen @PKCS11_TOOLS@ + check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ TARGETS = +EXT_CFLAGS = -fPIE @@ -32,7 +32,7 @@ Index: bin/dnssec/Makefile.in =================================================================== --- bin/dnssec/Makefile.in.orig +++ bin/dnssec/Makefile.in -@@ -60,8 +60,12 @@ HTMLPAGES = dnssec-dsfromkey.html dnssec +@@ -64,8 +64,12 @@ HTMLPAGES = dnssec-dsfromkey.html dnssec MANOBJS = ${MANPAGES} ${HTMLPAGES} diff --git a/workaround-compile-problem.diff b/workaround-compile-problem.diff index f3560cc..7b93547 100644 --- a/workaround-compile-problem.diff +++ b/workaround-compile-problem.diff @@ -1,11 +1,13 @@ ---- bin/tests/system/Makefile.in -+++ bin/tests/system/Makefile.in 2012/05/04 14:43:22 -@@ -21,7 +21,7 @@ +Index: bin/tests/system/Makefile.in +=================================================================== +--- bin/tests/system/Makefile.in.orig ++++ bin/tests/system/Makefile.in +@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ --SUBDIRS = dlzexternal filter-aaaa lwresd rpz tkey tsiggss -+SUBDIRS = filter-aaaa lwresd rpz tkey tsiggss +-SUBDIRS = dlzexternal filter-aaaa lwresd rpz rsabigexponent tkey tsiggss ++SUBDIRS = filter-aaaa lwresd rpz rsabigexponent tkey tsiggss TARGETS = @BIND9_MAKE_RULES@