commit 0561e14c3b91893fcd55e78cde9fbd216c0f3d18 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/networking/bind.nix

···

       154
       154
        
               chown ${bindUser} /var/run/named

     

       155
       155
        
             '';

     

       156
       156
        
       

     

       157
       157
       -
             script = "${pkgs.bind}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";

     

       157
       157
       +
             script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";

     

       158
       158
        
           };

     

       159
       159
        
         };

     

       160
       160
        
       }

+8 -1

pkgs/servers/dns/bind/default.nix

···

       10
       10
        
           sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         patches = [ ./remove-mkdir-var.patch ] ++

     

       13
       13
       +
         outputs = [ "dev" "bin" "out" "man" ];

     

       14
       14
       +
       

     

       15
       15
       +
         patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++

     

       14
       16
        
           stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;

     

       15
       17
        
       

     

       16
       18
        
         buildInputs = [ openssl libtool perl libxml2 ];

     
···

       30
       32
        
           "--without-purify"

     

       31
       33
        
           "--without-python"

     

       32
       34
        
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         postInstall = ''

     

       37
       37
       +
           moveToOutput bin/bind9-config $dev

     

       38
       38
       +
           moveToOutput bin/isc-config.sh $dev

     

       39
       39
       +
         '';

     

       33
       40
        
       

     

       34
       41
        
         meta = {

     

       35
       42
        
           homepage = "http://www.isc.org/software/bind";

+40

pkgs/servers/dns/bind/dont-keep-configure-flags.patch

···

       1
       1
       +
       diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h

     

       2
       2
       +
       index f354cfb..2aa0cc5 100644

     

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

     

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

     

       5
       5
       +
       @@ -71,7 +71,9 @@ EXTERN const char *		ns_g_version		INIT(VERSION);

     

       6
       6
       +
        EXTERN const char *		ns_g_product		INIT(PRODUCT);

     

       7
       7
       +
        EXTERN const char *		ns_g_description	INIT(DESCRIPTION);

     

       8
       8
       +
        EXTERN const char *		ns_g_srcid		INIT(SRCID);

     

       9
       9
       +
       +#if 0

     

       10
       10
       +
        EXTERN const char *		ns_g_configargs		INIT(CONFIGARGS);

     

       11
       11
       +
       +#endif

     

       12
       12
       +
        EXTERN const char *		ns_g_builder		INIT(BUILDER);

     

       13
       13
       +
        EXTERN in_port_t		ns_g_port		INIT(0);

     

       14
       14
       +
        EXTERN isc_dscp_t		ns_g_dscp		INIT(-1);

     

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

     

       16
       16
       +
       index 556db54..edab41d 100644

     

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

     

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

     

       19
       19
       +
       @@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) {

     

       20
       20
       +
        			       (*ns_g_description != '\0') ? " " : "",

     

       21
       21
       +
        			       ns_g_description, ns_g_srcid);

     

       22
       22
       +
        			printf("running on %s\n", ns_os_uname());

     

       23
       23
       +
       +#if 0

     

       24
       24
       +
        			printf("built by %s with %s\n",

     

       25
       25
       +
        			       ns_g_builder, ns_g_configargs);

     

       26
       26
       +
       +#endif

     

       27
       27
       +
        #ifdef __clang__

     

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

     

       29
       29
       +
        #else

     

       30
       30
       +
       @@ -998,8 +1000,10 @@ setup(void) {

     

       31
       31
       +
        	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,

     

       32
       32
       +
        		      ISC_LOG_NOTICE, "running on %s", ns_os_uname());

     

       33
       33
       +
        

     

       34
       34
       +
       +#if 0

     

       35
       35
       +
        	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,

     

       36
       36
       +
        		      ISC_LOG_NOTICE, "built with %s", ns_g_configargs);

     

       37
       37
       +
       +#endif

     

       38
       38
       +
        

     

       39
       39
       +
        	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,

     

       40
       40
       +
        		      ISC_LOG_NOTICE,