Version bump for latest stable ISC BIND; removes two patches which are unnecessary since the configure script can now properly take care of GOST and cross compiling.
Index: feeds/packages/net/bind/patches/100-configure-GOST.patch
===================================================================
--- feeds/packages/net/bind/patches/100-configure-GOST.patch (revision 29641)
+++ feeds/packages/net/bind/patches/100-configure-GOST.patch (working copy)
@@ -1,13 +0,0 @@
---- a/configure.in 2011-06-29 19:14:25.053420788 +0400
-+++ b/configure.in 2011-06-29 19:26:34.860280457 +0400
-@@ -699,7 +699,9 @@
- [AC_MSG_RESULT(yes)
- have_gost="yes"],
- [AC_MSG_RESULT(no)
-- have_gost="no"])
-+ have_gost="no"],
-+ [AC_MSG_RESULT(assuming target platform has no GOST support)
-+ have_gost="no"])
- case $have_gost in
- yes)
- OPENSSL_GOST="yes"
Index: feeds/packages/net/bind/patches/001-automake-cross.patch
===================================================================
--- feeds/packages/net/bind/patches/001-automake-cross.patch (revision 29641)
+++ feeds/packages/net/bind/patches/001-automake-cross.patch (working copy)
@@ -1,186 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1759,56 +1759,10 @@ AC_SUBST(ISC_PLATFORM_HAVEIF_LADDRCONF)
- # which provides some (all?) of the desired functions.
- #
-
--AC_MSG_CHECKING([for inet_ntop with IPv6 support])
--AC_TRY_RUN([
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--main() {
--char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}],
-- [AC_MSG_RESULT(yes)
-- ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"],
--
-- [AC_MSG_RESULT(no)
-- ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O"
-- ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c"
-- ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"],
-- [AC_MSG_RESULT(assuming inet_ntop needed)
-- ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O"
-- ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c"
-- ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"])
--
--
--# On NetBSD 1.4.2 and maybe others, inet_pton() incorrectly accepts
--# addresses with less than four octets, like "1.2.3". Also leading
--# zeros should also be rejected.
--
--AC_MSG_CHECKING([for working inet_pton with IPv6 support])
--AC_TRY_RUN([
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
-- inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 :
-- (inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); }],
-- [AC_MSG_RESULT(yes)
-- ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"],
-- [AC_MSG_RESULT(no)
-- ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O"
-- ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c"
-- ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1"],
-- [AC_MSG_RESULT(assuming target platform has working inet_pton)
-- ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"],
-- [AC_MSG_RESULT(assuming inet_pton needed)
-- ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O"
-- ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c"
-- ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1"],
-- [AC_MSG_RESULT(assuming target platform has working inet_pton)
-- ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"])
--
-+ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"
- AC_SUBST(ISC_PLATFORM_NEEDNTOP)
-+
-+ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"
- AC_SUBST(ISC_PLATFORM_NEEDPTON)
-
- #
-@@ -2186,28 +2140,11 @@ AC_SUBST(DST_EXTRA_SRCS)
- # Win32 uses "%I64d", but that's defined elsewhere since we don't use
- # configure on Win32.
- #
--AC_MSG_CHECKING(printf format modifier for 64-bit integers)
--AC_TRY_RUN([
--#include <stdio.h>
--main() {
-- long long int j = 0;
-- char buf[100];
-- buf[0] = 0;
-- sprintf(buf, "%lld", j);
-- exit((sizeof(long long int) != sizeof(long int))? 0 :
-- (strcmp(buf, "0") != 0));
--}
--],
-- [AC_MSG_RESULT(ll)
-- ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'
-- LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "ll"'],
-- [AC_MSG_RESULT(l)
-- ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"'
-- LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "l"'],
-- [AC_MSG_RESULT(assuming target platform uses ll)
-- ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'
-- LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "ll"'])
-+
-+ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'
- AC_SUBST(ISC_PLATFORM_QUADFORMAT)
-+
-+LWRES_PLATFORM_QUADFORMAT='#define LWRES_PLATFORM_QUADFORMAT "ll"'
- AC_SUBST(LWRES_PLATFORM_QUADFORMAT)
-
- #
-@@ -2272,47 +2209,8 @@ AC_DEFINE(NEED_OPTARG, 1, [Defined if ex
- #
- # BSD/OS, and perhaps some others, don't define rlim_t.
- #
--AC_MSG_CHECKING(for type rlim_t)
--AC_TRY_COMPILE([
--#include <sys/types.h>
--#include <sys/time.h>
--#include <sys/resource.h>],
--[rlim_t rl = 19671212; return (0);],
--[AC_MSG_RESULT(yes)
-- ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE rlim_t"],
--[AC_MSG_RESULT(no)
-
--AC_MSG_CHECKING(type of rlim_cur)
--AC_TRY_RUN([
--#include <sys/types.h>
--#include <sys/time.h>
--#include <sys/resource.h>
--main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}],
--[AC_MSG_RESULT(int)
--ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int"],
--[
--AC_TRY_RUN([
--#include <sys/types.h>
--#include <sys/time.h>
--#include <sys/resource.h>
--main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}],
--[AC_MSG_RESULT(long int)
--ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int"],
--[
--AC_TRY_RUN([
--#include <sys/types.h>
--#include <sys/time.h>
--#include <sys/resource.h>
--main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}],
--[AC_MSG_RESULT(long long int)
--ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"],
--[AC_MSG_ERROR([unable to determine sizeof rlim_cur])
--],[AC_MSG_ERROR(this cannot happen)])
--],[AC_MSG_ERROR(this cannot happen)])
--],[
--ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"
--AC_MSG_RESULT(cannot determine type of rlim_cur when cross compiling - assuming long long int)])
--])
-+ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int"
- AC_SUBST(ISC_PLATFORM_RLIMITTYPE)
-
- #
-@@ -2520,27 +2418,22 @@ if test "$use_atomic" = "yes"; then
- [i[3456]86-*])
- # XXX: some old x86 architectures actually do not support
- # (some of) these operations. Do we need stricter checks?
--AC_TRY_RUN([
--main() {
-- exit((sizeof(void *) == 8) ? 0 : 1);
--}
--],
-- [arch=x86_64
-- have_xaddq=yes],
-- [arch=x86_32],
-- [arch=x86_32])
-+AC_CHECK_SIZEOF([void *])
-+ if test $ac_cv_sizeof_void_p = 8; then
-+ arch=x86_64
-+ have_xaddq=yes
-+ else
-+ arch=x86_32
-+ fi
- ;;
- x86_64-*|amd64-*)
--AC_TRY_RUN([
--main() {
-- exit((sizeof(void *) == 8) ? 0 : 1);
--}
--],
-- [arch=x86_64
-- have_xaddq=yes],
-- [arch=x86_32],
-- [arch=x86_64
-- have_xaddq=yes])
-+AC_CHECK_SIZEOF([void *])
-+ if test $ac_cv_sizeof_void_p = 8; then
-+ arch=x86_64
-+ have_xaddq=yes
-+ else
-+ arch=x86_32
-+ fi
- ;;
- alpha*-*)
- arch=alpha
Index: feeds/packages/net/bind/Makefile
===================================================================
--- feeds/packages/net/bind/Makefile (revision 29641)
+++ feeds/packages/net/bind/Makefile (working copy)
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bind
-PKG_VERSION:=9.8.0-P4
+PKG_VERSION:=9.8.1-P1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION) \
http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_MD5SUM:=13e36e3f28dc1ce7675b45a4192e8389
+PKG_MD5SUM:=afa41f8203d50bedad65071f9b6f96d7
PKG_FIXUP:=libtool
@@ -88,6 +88,7 @@
--with-libtool \
--with-libxml2=no \
--enable-epoll=yes \
+ --with-gost=no \
CONFIGURE_VARS += \
BUILD_CC="$(TARGET_CC)" \
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
