From 35ff26c2d524ca0adaf40e9b0d10c42795734967 Mon Sep 17 00:00:00 2001 From: he Date: Thu, 4 Dec 2014 15:58:21 +0000 Subject: Update to version 1.4.7. Changes: * The patch for SUPPORT-147 got integrated upstream. * Regenerate enforcer/utils/Makefile.in diff Upstream changes: * SUPPORT-147: Zone updating via zone transfer can get stuck * Crash on 'retransfer command when not using DNS adapters. --- security/opendnssec/Makefile | 5 +- security/opendnssec/distinfo | 11 +- .../patches/patch-enforcer_utils_Makefile.in | 417 ++------------------- .../patches/patch-signer_src_wire_xfrd.c | 36 -- 4 files changed, 37 insertions(+), 432 deletions(-) delete mode 100644 security/opendnssec/patches/patch-signer_src_wire_xfrd.c (limited to 'security') diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index 21bbd44b0b2..52c5830f91e 100644 --- a/security/opendnssec/Makefile +++ b/security/opendnssec/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.48 2014/11/04 09:41:02 he Exp $ +# $NetBSD: Makefile,v 1.49 2014/12/04 15:58:21 he Exp $ # -DISTNAME= opendnssec-1.4.6 -PKGREVISION= 4 +DISTNAME= opendnssec-1.4.7 CATEGORIES= security net MASTER_SITES= http://www.opendnssec.org/files/source/ diff --git a/security/opendnssec/distinfo b/security/opendnssec/distinfo index 29f96249455..dc778968be7 100644 --- a/security/opendnssec/distinfo +++ b/security/opendnssec/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.28 2014/11/04 09:41:02 he Exp $ +$NetBSD: distinfo,v 1.29 2014/12/04 15:58:21 he Exp $ -SHA1 (opendnssec-1.4.6.tar.gz) = 2318b31546d0d4118cd03b9591ba76d259e1b0b0 -RMD160 (opendnssec-1.4.6.tar.gz) = a7c3bbfa42edd64fffbb0680db6f9c372ded2c85 -Size (opendnssec-1.4.6.tar.gz) = 1014314 bytes +SHA1 (opendnssec-1.4.7.tar.gz) = c8a5808d68a50db8ed7edf806a58f54428ad7aa8 +RMD160 (opendnssec-1.4.7.tar.gz) = f14f7a19b0072754ac7cb242ad2ee610d933364e +Size (opendnssec-1.4.7.tar.gz) = 1038884 bytes SHA1 (patch-aa) = 104e077af6c368cbb5fc3034d58b2f2249fcf991 SHA1 (patch-enforcer_utils_Makefile.am) = bee7cb4f3cfe5aae96c5726a115eb8b6587288dd -SHA1 (patch-enforcer_utils_Makefile.in) = da9fce97e631bb81607851f9758b206ea975b052 -SHA1 (patch-signer_src_wire_xfrd.c) = ebf381c7c8e3bb7d48a647e9941b936f59fc88db +SHA1 (patch-enforcer_utils_Makefile.in) = 4d40385e4d6a70c2722ec43268832ca27ca89cbc diff --git a/security/opendnssec/patches/patch-enforcer_utils_Makefile.in b/security/opendnssec/patches/patch-enforcer_utils_Makefile.in index d79fc7502e0..5c71d32c611 100644 --- a/security/opendnssec/patches/patch-enforcer_utils_Makefile.in +++ b/security/opendnssec/patches/patch-enforcer_utils_Makefile.in @@ -1,366 +1,10 @@ -$NetBSD: patch-enforcer_utils_Makefile.in,v 1.1 2013/08/22 11:05:45 he Exp $ +$NetBSD: patch-enforcer_utils_Makefile.in,v 1.2 2014/12/04 15:58:21 he Exp $ Regenerate after adding installation of migration scripts to Makefile.am. ---- enforcer/utils/Makefile.in.orig 2013-06-27 08:04:17.000000000 +0000 +--- enforcer/utils/Makefile.in.orig 2014-12-04 15:18:00.000000000 +0000 +++ enforcer/utils/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -19,6 +18,23 @@ - - - VPATH = @srcdir@ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ -+ esac; \ -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -39,9 +55,10 @@ build_triplet = @build@ - host_triplet = @host@ - bin_PROGRAMS = ods-ksmutil$(EXEEXT) ods-kaspcheck$(EXEEXT) - subdir = enforcer/utils --DIST_COMMON = README $(am__dist_opendnssecdata_DATA_DIST) \ -- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -- $(srcdir)/ods-kaspcheck.1.in $(srcdir)/ods-ksmutil.1.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(srcdir)/ods-kaspcheck.1.in $(srcdir)/ods-ksmutil.1.in \ -+ $(top_srcdir)/depcomp $(am__dist_opendnssecdata_DATA_DIST) \ -+ README - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/acx_broken_setres.m4 \ - $(top_srcdir)/m4/acx_check_strptime.m4 \ -@@ -77,24 +94,54 @@ PROGRAMS = $(bin_PROGRAMS) - am_ods_kaspcheck_OBJECTS = kaspcheck.$(OBJEXT) kc_helper.$(OBJEXT) - ods_kaspcheck_OBJECTS = $(am_ods_kaspcheck_OBJECTS) - ods_kaspcheck_DEPENDENCIES = $(LIBHSM) $(LIBCOMPAT) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = - am_ods_ksmutil_OBJECTS = ksmutil.$(OBJEXT) - ods_ksmutil_OBJECTS = $(am_ods_ksmutil_OBJECTS) - ods_ksmutil_DEPENDENCIES = $(LIBKSM) $(LIBHSM) $(LIBCOMPAT) -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/common - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(ods_kaspcheck_SOURCES) $(ods_ksmutil_SOURCES) - DIST_SOURCES = $(ods_kaspcheck_SOURCES) $(ods_ksmutil_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -128,11 +175,29 @@ MANS = $(man1_MANS) - am__dist_opendnssecdata_DATA_DIST = database_create.sqlite3 \ - database_create.mysql - DATA = $(dist_opendnssecdata_DATA) -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -400,14 +465,19 @@ ods-ksmutil.1: $(top_builddir)/config.st - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ -+ fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ -- while read p p1; do if test -f $$p || test -f $$p1; \ -- then echo "$$p"; echo "$$p"; else :; fi; \ -+ while read p p1; do if test -f $$p \ -+ || test -f $$p1 \ -+ ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ -- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ -+ sed -e 'p;s,.*/,,;n;h' \ -+ -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -@@ -428,7 +498,8 @@ uninstall-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -- -e 's/$$/$(EXEEXT)/' `; \ -+ -e 's/$$/$(EXEEXT)/' \ -+ `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files -@@ -443,10 +514,10 @@ clean-binPROGRAMS: - rm -f $$list - ods-kaspcheck$(EXEEXT): $(ods_kaspcheck_OBJECTS) $(ods_kaspcheck_DEPENDENCIES) $(EXTRA_ods_kaspcheck_DEPENDENCIES) - @rm -f ods-kaspcheck$(EXEEXT) -- $(LINK) $(ods_kaspcheck_OBJECTS) $(ods_kaspcheck_LDADD) $(LIBS) -+ $(AM_V_CCLD)$(LINK) $(ods_kaspcheck_OBJECTS) $(ods_kaspcheck_LDADD) $(LIBS) - ods-ksmutil$(EXEEXT): $(ods_ksmutil_OBJECTS) $(ods_ksmutil_DEPENDENCIES) $(EXTRA_ods_ksmutil_DEPENDENCIES) - @rm -f ods-ksmutil$(EXEEXT) -- $(LINK) $(ods_ksmutil_OBJECTS) $(ods_ksmutil_LDADD) $(LIBS) -+ $(AM_V_CCLD)$(LINK) $(ods_ksmutil_OBJECTS) $(ods_ksmutil_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -459,25 +530,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksmutil.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -486,9 +557,18 @@ clean-libtool: - -rm -rf .libs _libs - install-man1: $(man1_MANS) - @$(NORMAL_INSTALL) -- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" -- @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ -- { for i in $$list; do echo "$$i"; done; \ -+ @list1='$(man1_MANS)'; \ -+ list2=''; \ -+ test -n "$(man1dir)" \ -+ && test -n "`echo $$list1$$list2`" \ -+ || exit 0; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ -+ { for i in $$list1; do echo "$$i"; done; \ -+ if test -n "$$list2"; then \ -+ for i in $$list2; do echo "$$i"; done \ -+ | sed -n '/\.1[a-z]*$$/p'; \ -+ fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ -@@ -518,8 +598,11 @@ uninstall-man1: - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) - install-dist_opendnssecdataDATA: $(dist_opendnssecdata_DATA) - @$(NORMAL_INSTALL) -- test -z "$(opendnssecdatadir)" || $(MKDIR_P) "$(DESTDIR)$(opendnssecdatadir)" - @list='$(dist_opendnssecdata_DATA)'; test -n "$(opendnssecdatadir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(opendnssecdatadir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(opendnssecdatadir)" || exit 1; \ -+ fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ -@@ -535,26 +618,15 @@ uninstall-dist_opendnssecdataDATA: - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(opendnssecdatadir)'; $(am__uninstall_files_from_dir) - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -566,15 +638,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -583,24 +651,26 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @list='$(MANS)'; if test -n "$$list"; then \ -- list=`for p in $$list; do \ -- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ -- if test -n "$$list" && \ -- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ -- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ -- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ -- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ -- echo " typically \`make maintainer-clean' will remove them" >&2; \ -- exit 1; \ -- else :; fi; \ -- else :; fi - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ -@@ -690,7 +760,8 @@ info: info-am +@@ -788,7 +788,8 @@ info: info-am info-am: @@ -370,40 +14,39 @@ Regenerate after adding installation of migration scripts to Makefile.am. install-dvi: install-dvi-am -@@ -743,11 +814,12 @@ uninstall-man: uninstall-man1 - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ -- clean-generic clean-libtool ctags distclean distclean-compile \ -- distclean-generic distclean-libtool distclean-tags distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-binPROGRAMS install-data install-data-am \ -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ -+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ -+ ctags ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-binPROGRAMS \ +@@ -846,17 +847,24 @@ uninstall-man: uninstall-man1 + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ +- install-data install-data-am install-dist_opendnssecdataDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-man1 install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ +- uninstall-am uninstall-binPROGRAMS \ +- uninstall-dist_opendnssecdataDATA uninstall-man uninstall-man1 +- + install-data install-data-am install-data-local \ - install-dist_opendnssecdataDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ -@@ -755,11 +827,17 @@ uninstall-man: uninstall-man1 - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ install-dist_opendnssecdataDATA install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-man1 \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dist_opendnssecdataDATA \ - uninstall-man uninstall-man1 - - ++ uninstall-binPROGRAMS uninstall-dist_opendnssecdataDATA \ ++ uninstall-man uninstall-man1 ++ ++ +install-data-local: $(EXTRA_DIST) + for f in $(EXTRA_DIST); do \ + $(INSTALL_DATA) "$$f" $(DESTDIR)$(opendnssecdatadir) \ + || exit $$?; \ + done -+ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/security/opendnssec/patches/patch-signer_src_wire_xfrd.c b/security/opendnssec/patches/patch-signer_src_wire_xfrd.c deleted file mode 100644 index 55372997b27..00000000000 --- a/security/opendnssec/patches/patch-signer_src_wire_xfrd.c +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-signer_src_wire_xfrd.c,v 1.2 2014/11/04 09:41:02 he Exp $ - -Hm, there's no need for htonl() on values restored from a file. -This causes IXFRs to fail, because the wrong SOA version number -is being stuffed into the IXFR requests(!) - ---- signer/src/wire/xfrd.c.orig 2014-07-21 09:30:09.000000000 +0000 -+++ signer/src/wire/xfrd.c -@@ -265,12 +265,12 @@ xfrd_recover(xfrd_type* xfrd) - xfrd->timeout.tv_sec = timeout; - xfrd->timeout.tv_nsec = 0; - xfrd->master = NULL; /* acl_find_num(...) */ -- xfrd->soa.ttl = htonl(soa_ttl); -- xfrd->soa.serial = htonl(soa_serial); -- xfrd->soa.refresh = htonl(soa_refresh); -- xfrd->soa.retry = htonl(soa_retry); -- xfrd->soa.expire = htonl(soa_expire); -- xfrd->soa.minimum = htonl(soa_minimum); -+ xfrd->soa.ttl = soa_ttl; -+ xfrd->soa.serial = soa_serial; -+ xfrd->soa.refresh = soa_refresh; -+ xfrd->soa.retry = soa_retry; -+ xfrd->soa.expire = soa_expire; -+ xfrd->soa.minimum = soa_minimum; - xfrd->soa.mname[0] = xfrd_recover_dname(xfrd->soa.mname+1, - soa_mname); - xfrd->soa.rname[0] = xfrd_recover_dname(xfrd->soa.rname+1, -@@ -2097,7 +2097,7 @@ xfrd_backup(xfrd_type* xfrd) - fprintf(fd, "%s\n", ODS_SE_FILE_MAGIC_V3); - fprintf(fd, ";;Zone: name %s ttl %u mname ", - zone->name, -- (unsigned) ntohl(xfrd->soa.ttl)); -+ (unsigned) xfrd->soa.ttl); - xfrd_backup_dname(fd, xfrd->soa.mname), - fprintf(fd, " rname "); - xfrd_backup_dname(fd, xfrd->soa.rname), -- cgit v1.2.3