Unverified Commit 1d670bfb authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

bind: 9.18.28 -> 9.20.6 (#377339)

parents 63aa55f6 589ff831

pkgs/by-name/bi/bind/dont-keep-configure-flags.patch

+14 −13
Original line number Diff line number Diff line 
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h

index 82b632ef04..dedfd4d33b 100644

index 25d03fff60..c1920c3a80 100644

--- a/bin/named/include/named/globals.h

+++ b/bin/named/include/named/globals.h

@@ -69,7 +69,9 @@ EXTERN const char *named_g_version	INIT(PACKAGE_VERSION);

@@ -71,7 +71,9 @@ EXTERN const char *named_g_version     INIT(PACKAGE_VERSION);

 EXTERN const char *named_g_product     INIT(PACKAGE_NAME);

 EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION);

 EXTERN const char *named_g_srcid       INIT(PACKAGE_SRCID);
@@ -13,10 +13,10 @@ index 82b632ef04..dedfd4d33b 100644 
 EXTERN in_port_t named_g_port	       INIT(0);

 EXTERN in_port_t named_g_tlsport       INIT(0);

diff --git a/bin/named/main.c b/bin/named/main.c

index 9ad2d0e277..9729a2b3fc 100644

index be3c629f30..58325fc1b5 100644

--- a/bin/named/main.c

+++ b/bin/named/main.c

@@ -481,7 +481,9 @@ printversion(bool verbose) {

@@ -574,7 +574,9 @@ printversion(bool verbose) {

 	}

 

 	printf("running on %s\n", named_os_uname());
@@ -26,10 +26,11 @@ index 9ad2d0e277..9729a2b3fc 100644 
 #ifdef __clang__

 	printf("compiled by CLANG %s\n", __VERSION__);

 #else /* ifdef __clang__ */

@@ -1027,9 +1029,11 @@ setup(void) {

@@ -1124,10 +1126,11 @@ setup(void) {

 	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,

 		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",

 		      named_os_uname());

 

-

+#if 0

 	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,

 		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",

pkgs/by-name/bi/bind/package.nix

+5 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
  libtool,

  libxml2,

  openssl,

  liburcu,

  libuv,

  nghttp2,

  jemalloc,
@@ -27,11 +28,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "bind";

  version = "9.18.33";

  version = "9.20.6";



  src = fetchurl {

    url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";

    hash = "sha256-+zc/rF67xBxkUWCv1an7RRkY9sDmmrHZR0FU4rUV3kA=";

    hash = "sha256-7X9UtE+EpyAaL6epSfMCHqVoUpv62Q/KZk/VXAUQQTQ=";

  };



  outputs = [
@@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { 
      libtool

      libxml2

      openssl

      liburcu

      libuv

      nghttp2

      jemalloc
@@ -92,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { 
      sed -i "$f" -e 's|-L${openssl.dev}|-L${lib.getLib openssl}|g'

    done



    mkdir -p $out/etc

    cat <<EOF >$out/etc/rndc.conf

    include "/etc/bind/rndc.key";

    options {