From: Shawn Routhier Date: Wed, 6 Aug 2014 22:01:34 +0000 (-0700) Subject: [master] Restore #define and hack bind.sh X-Git-Tag: v4_3_1~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db72e67d3a512d38f34688ef36a8d6ee5a2283d4;p=thirdparty%2Fdhcp.git [master] Restore #define and hack bind.sh Resore the R_MULTIPLE #define so we have the same code in final as we did in rc1. Change the bind.sh file so we use 9.9.5-P1 for testing master, 4.2 and 4.3 until we do remove the #define --- diff --git a/includes/omapip/result.h b/includes/omapip/result.h index 5a4d03658..3e4cf6a73 100644 --- a/includes/omapip/result.h +++ b/includes/omapip/result.h @@ -86,6 +86,7 @@ #define ISC_R_INVALIDARG DHCP_R_INVALIDARG #define ISC_R_NOTYET DHCP_R_NOTYET #define ISC_R_UNCHANGED DHCP_R_UNCHANGED +#define ISC_R_MULTIPLE DHCP_R_MULTIPLE #define ISC_R_KEYCONFLICT DHCP_R_KEYCONFLICT #define ISC_R_BADPARSE DHCP_R_BADPARSE #define ISC_R_NOKEYS DHCP_R_NOKEYS diff --git a/util/bind.sh b/util/bind.sh index f07457ad3..22c6f761e 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -49,11 +49,11 @@ case $# in ### tarball with vastly different values. So the version.tmp can not ### be used to chdir down into the directory that is unpacked. ### - v4_2) noSNAP=snapshot BINDTAG=v9_9 ;; - v4_3) noSNAP=snapshot BINDTAG=v9_9 ;; + v4_2) noSNAP=snapshot BINDTAG=v9_9_5_P1 ;; + v4_3) noSNAP=snapshot BINDTAG=v9_9_5_P1 ;; ### change to using the head of v9_9 until we upgrade DHCP ### to use shared libraries - HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=v9_9 ;; + HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=v9_9_5_P1 ;; ### HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=HEAD ;; ### ### For ease of use, this records the sticky tag of versions