[Astlinux-commits] SF.net SVN: astlinux:[7602] branches/1.0/package/bind

[<abe...@us...>]

Revision: 7602
          http://sourceforge.net/p/astlinux/code/7602
Author:   abelbeck
Date:     2016-03-20 15:23:10 +0000 (Sun, 20 Mar 2016)
Log Message:
-----------
bind, update and only install the libs and the 'dig' command.  If enabled, adds 2.4 MB un-compressed, 1 MB compressed to the image, mostly from the libdns.so library

Modified Paths:
--------------
    branches/1.0/package/bind/Config.in
    branches/1.0/package/bind/bind-cross.patch
    branches/1.0/package/bind/bind.mk

Removed Paths:
-------------
    branches/1.0/package/bind/bind-susv3-legacy.patch
    branches/1.0/package/bind/bind.sysvinit

Modified: branches/1.0/package/bind/Config.in
===================================================================
--- branches/1.0/package/bind/Config.in	2016-03-20 04:13:41 UTC (rev 7601)
+++ branches/1.0/package/bind/Config.in	2016-03-20 15:23:10 UTC (rev 7602)
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_BIND
-	bool "bind"
+	bool "bind libs and dig tool"
 	depends on BR2_LARGEFILE
 	help
 	  BIND (Berkeley Internet Name Domain) is an implementation of
@@ -19,13 +19,9 @@
 	  translation between domain names and Internet addresses and is
 	  intended to be linked with applications requiring name service.
 
+	  Note: **Only the 'dig' command and related libraries are installed**
+
 	  http://www.isc.org/sw/bind/
 
-config BR2_PACKAGE_BIND_TOOLS
-	bool "Install tools"
-	depends on BR2_PACKAGE_BIND
-	help
-	  Install tools (host, nslookup, dig, nsupdate)
-
 comment "bind requires a toolchain with LARGEFILE support"
 	depends on !BR2_LARGEFILE

Modified: branches/1.0/package/bind/bind-cross.patch
===================================================================
--- branches/1.0/package/bind/bind-cross.patch	2016-03-20 04:13:41 UTC (rev 7601)
+++ branches/1.0/package/bind/bind-cross.patch	2016-03-20 15:23:10 UTC (rev 7602)
@@ -1,7 +1,7 @@
 diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in
 --- bind-9.5.1-P1/lib/dns/Makefile.in	2007-09-11 22:09:08.000000000 -0300
 +++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in	2009-03-04 16:35:23.000000000 -0200
-@@ -160,8 +160,8 @@
+@@ -188,8 +188,8 @@
  	./gen -s ${srcdir} > code.h
  
  gen: gen.c
@@ -10,5 +10,5 @@
 +	${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
 +	${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
  
- rbtdb64.@O@: rbtdb.c
+ rbtdb64.@O@: rbtdb64.c rbtdb.c
  

Deleted: branches/1.0/package/bind/bind-susv3-legacy.patch
===================================================================
--- branches/1.0/package/bind/bind-susv3-legacy.patch	2016-03-20 04:13:41 UTC (rev 7601)
+++ branches/1.0/package/bind/bind-susv3-legacy.patch	2016-03-20 15:23:10 UTC (rev 7602)
@@ -1,12 +0,0 @@
-diff -Nura bind-9.5.2-P1/lib/isc/unix/ifiter_ioctl.c bind-9.5.2-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c
---- bind-9.5.2-P1/lib/isc/unix/ifiter_ioctl.c	2009-02-15 22:53:58.000000000 -0200
-+++ bind-9.5.2-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c	2009-12-03 13:12:56.000000000 -0300
-@@ -17,6 +17,8 @@
- 
- /* $Id: ifiter_ioctl.c,v 1.58.90.3 2009/02/16 00:53:58 marka Exp $ */
- 
-+#include <string.h>
-+
- /*! \file
-  * \brief
-  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.

Modified: branches/1.0/package/bind/bind.mk
===================================================================
--- branches/1.0/package/bind/bind.mk	2016-03-20 04:13:41 UTC (rev 7601)
+++ branches/1.0/package/bind/bind.mk	2016-03-20 15:23:10 UTC (rev 7602)
@@ -4,55 +4,75 @@
 #
 #############################################################
 
-BIND_VERSION = 9.6-ESV-R4
+BIND_VERSION = 9.10.3-P4
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_MAKE = $(MAKE1)
-BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
-BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen dnssec-dsfromkey
-BIND_TARGET_SBINS += dnssec-keyfromlabel dnssec-keygen dnssec-signzone
-BIND_TARGET_BINS = dig host nslookup nsupdate
-BIND_TARGET_LIBS = libbind9.* libdns.* libisc.* libisccc.* libisccfg.* liblwres.*
-BIND_CONF_ENV =	BUILD_CC="$(TARGET_CC)" \
-		BUILD_CFLAGS="$(TARGET_CFLAGS)"
-BIND_CONF_OPT =	--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-randomdev=/dev/urandom \
-		--enable-epoll --with-libtool
+BIND_INSTALL_STAGING = YES
+BIND_TARGET_LIBS = libbind9.so* libdns.so* libisc.so* libisccc.so* libisccfg.so* liblwres.so*
+BIND_CONF_ENV = \
+	BUILD_CC="$(TARGET_CC)" \
+	BUILD_CFLAGS="$(TARGET_CFLAGS)"
+BIND_CONF_OPT = \
+	--with-libjson=no \
+	--with-randomdev=/dev/urandom \
+	--enable-epoll \
+	--with-libtool \
+	--with-gssapi=no \
+	--enable-rrl \
+	--enable-filter-aaaa
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+BIND_CONF_OPT += --enable-linux-caps
+BIND_DEPENDENCIES += libcap
+else
+BIND_CONF_OPT += --disable-linux-caps
+endif
+
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
-	BIND_CONF_OPT += --with-libxml2=$(STAGING_DIR)/usr
-	BIND_DEPENDENCIES += libxml2
+BIND_CONF_OPT += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats
+BIND_DEPENDENCIES += libxml2
 else
-	BIND_CONF_OPT += --with-libxml2=no
+BIND_CONF_OPT += --with-libxml2=no
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-	BIND_DEPENDENCIES += openssl
-	BIND_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
+BIND_DEPENDENCIES += openssl
+BIND_CONF_ENV += \
+	ac_cv_func_EVP_sha256=yes \
+	ac_cv_func_EVP_sha384=yes \
+	ac_cv_func_EVP_sha512=yes
+BIND_CONF_OPT += \
+	--with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \
+	--with-ecdsa=yes
+# GOST cipher support requires openssl extra engines
+ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
+BIND_CONF_OPT += --with-gost=yes
 else
-	BIND_CONF_OPT += --with-openssl=no
+BIND_CONF_OPT += --with-gost=no
 endif
+else
+BIND_CONF_OPT += --with-openssl=no
+endif
 
-define BIND_TARGET_INSTALL_FIXES
-	rm -f $(TARGET_DIR)/usr/bin/isc-config.sh
-	$(INSTALL) -m 0755 -D package/bind/bind.sysvinit $(TARGET_DIR)/etc/init.d/S81named
-endef
+# Used by dnssec-checkds and dnssec-coverage
+BIND_CONF_OPT += --with-python=no
 
-BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_INSTALL_FIXES
+ifeq ($(BR2_PACKAGE_READLINE),y)
+BIND_DEPENDENCIES += readline
+else
+BIND_CONF_OPT += --with-readline=no
+endif
 
-define BIND_TARGET_REMOVE_TOOLS
-	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))
+define BIND_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(STAGING_DIR)/usr/bin/dig $(TARGET_DIR)/usr/bin/dig
+	cp -a $(addprefix $(STAGING_DIR)/usr/lib/, $(BIND_TARGET_LIBS)) $(TARGET_DIR)/usr/lib/
 endef
 
-ifneq ($(BR2_PACKAGE_BIND_TOOLS),y)
-BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_TOOLS
-endif
+BIND_UNINSTALL_STAGING_OPT = --version
 
 define BIND_UNINSTALL_TARGET_CMDS
-	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SBINS))
-	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))
-	rm -rf $(addprefix $(TARGET_DIR)/usr/lib/, $(BIND_TARGET_LIBS))
-	rm -f $(TARGET_DIR)/etc/init.d/S81named
+	rm -f $(TARGET_DIR)/usr/bin/dig
+	rm -f $(addprefix $(TARGET_DIR)/usr/lib/, $(BIND_TARGET_LIBS))
 endef
 
 $(eval $(call AUTOTARGETS,package,bind))

Deleted: branches/1.0/package/bind/bind.sysvinit
===================================================================
--- branches/1.0/package/bind/bind.sysvinit	2016-03-20 04:13:41 UTC (rev 7601)
+++ branches/1.0/package/bind/bind.sysvinit	2016-03-20 15:23:10 UTC (rev 7602)
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# System-V init to control the bind DNS Daemon
-#
-
-NAME=named
-DAEMON=/usr/sbin/$NAME
-
-# this file contains a few tunable parameters
-test -r /etc/default/named && . /etc/default/named
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-	start)
-		test -z "$CHROOT" || ARGS="$ARGS -t $CHROOT"
-		test -z "$SETUID" || ARGS="$ARGS -u $SETUID"
-		if [ ! -f $CHROOT/etc/rndc.key ]; then
-		    echo "Initializing $NAME control key: rndc-confgen"
-		    set +e
-
-                    # if rndc.key is a symlink, the target must exist
-		    touch $CHROOT/etc/rndc.key
-		    touch etc/rndc.key
-
-		    rndc-confgen -a -r /dev/urandom $ARGS || true
-		    set -e
-		fi
-		test -z "$CONF" || ARGS="$ARGS -c $CONF"
-		echo -n "Starting domain name daemon: $NAME"
-		trap 'echo failed' 0
-		start-stop-daemon -S -x $DAEMON -- $ARGS
-		trap - 0
-		echo "."
-		;;
-	stop)
-		echo -n "Stopping domain name daemon: $NAME"
-		rndc stop || start-stop-daemon -K -x $DAEMON
-		echo "."
-		;;
-	restart)
-		$0 stop || true
-		sleep 2
-		$0 start
-		;;
-	reload|force-reload)
-		rndc reload || $0 restart
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|reload|force-reload}"
-		exit 1 
-esac
-
-exit 0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.