diff options
| author | dougb <dougb@FreeBSD.org> | 2010-06-18 02:29:06 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-06-18 02:29:06 +0000 |
| commit | 92f0f669e33f77d21f821854982ceb49c0f58e95 (patch) | |
| tree | 565b22930d4878c17e7da1a4fae80d0a6e97beea /dns | |
| parent | c15c1afa42653865e695a455811e51dec315a727 (diff) | |
| download | FreeBSD-ports-92f0f669e33f77d21f821854982ceb49c0f58e95.zip FreeBSD-ports-92f0f669e33f77d21f821854982ceb49c0f58e95.tar.gz | |
The newly added bind.keys.h file requires perl for its creation,
which is a problem, however what it's doing is baking the ISC
DLV key into named which is not something I think is reasonable
to do by default.
So, instead of adding perl as a build dependency eliminate the
need for the file altogether.
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/bind97/files/patch-bind-keys-h | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/dns/bind97/files/patch-bind-keys-h b/dns/bind97/files/patch-bind-keys-h new file mode 100644 index 0000000..749f539 --- /dev/null +++ b/dns/bind97/files/patch-bind-keys-h @@ -0,0 +1,53 @@ +--- bin/named/Makefile.in.orig 2009-12-05 15:31:40.000000000 -0800 ++++ bin/named/Makefile.in 2010-06-17 19:08:13.000000000 -0700 +@@ -118,10 +118,7 @@ + -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ + -DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c + +-bind.keys.h: ${top_srcdir}/bind.keys +- ${PERL} ${srcdir}/bindkeys.pl < ${top_srcdir}/bind.keys > $@ +- +-config.@O@: config.c bind.keys.h ++config.@O@: config.c + ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ + -DVERSION=\"${VERSION}\" \ + -DNS_LOCALSTATEDIR=\"${localstatedir}\" \ +@@ -143,7 +140,7 @@ + rm -f ${MANOBJS} + + clean distclean maintainer-clean:: +- rm -f ${TARGETS} ${OBJS} bind.keys.h ++ rm -f ${TARGETS} ${OBJS} + + bind9.xsl.h: bind9.xsl ${srcdir}/convertxsl.pl + ${PERL} ${srcdir}/convertxsl.pl < ${srcdir}/bind9.xsl > bind9.xsl.h +--- bin/named/config.c.orig 2010-05-14 16:49:18.000000000 -0700 ++++ bin/named/config.c 2010-06-17 19:10:31.000000000 -0700 +@@ -47,8 +47,6 @@ + #include <named/config.h> + #include <named/globals.h> + +-#include "bind.keys.h" +- + /*% default configuration */ + static char defaultconf[] = "\ + options {\n\ +@@ -237,18 +235,6 @@ + database \"_builtin id\";\n\ + };\n\ + };\n\ +-" +-"#\n\ +-# Default trusted key(s) for builtin DLV support\n\ +-# (used if \"dnssec-lookaside auto;\" is set and\n\ +-# sysconfdir/bind.keys doesn't exist).\n\ +-#\n\ +-# BEGIN MANAGED KEYS\n" +- +-/* Imported from bind.keys.h: */ +-MANAGED_KEYS +- +-"# END MANAGED KEYS\n\ + "; + + isc_result_t |
