[csw-devel] SF.net SVN: gar:[11544] csw/mgar/pkg/unbound/trunk

idogan23 at users.sourceforge.net idogan23 at users.sourceforge.net
Wed Nov 10 13:34:34 CET 2010


Revision: 11544
          http://gar.svn.sourceforge.net/gar/?rev=11544&view=rev
Author:   idogan23
Date:     2010-11-10 12:34:33 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
unbound: bump version to 1.4.7, split into multiple packages

Modified Paths:
--------------
    csw/mgar/pkg/unbound/trunk/Makefile
    csw/mgar/pkg/unbound/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch

Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile	2010-11-10 12:34:21 UTC (rev 11543)
+++ csw/mgar/pkg/unbound/trunk/Makefile	2010-11-10 12:34:33 UTC (rev 11544)
@@ -1,5 +1,5 @@
 GARNAME = unbound
-GARVERSION = 1.4.6
+GARVERSION = 1.4.7
 CATEGORIES = server
 
 DESCRIPTION = A validating, recursive, and caching DNS resolver
@@ -9,8 +9,10 @@
   a server, but are linked into an application) are easily possible.
 endef
 
-PACKAGES = CSWunbound
-CATALOGNAME = unbound
+PACKAGES = CSWunbound CSWlibunbound2 CSWunbound-devel
+CATALOGNAME_CSWunbound = unbound
+CATALOGNAME_CSWlibunbound2 = libunbound2
+CATALOGNAME_CSWunbound-devel = unbound_devel
 LICENSE = LICENSE
 
 MASTER_SITES = http://unbound.net/downloads/
@@ -18,9 +20,7 @@
 DISTFILES += cswunbound
 DISTFILES += cswusergroup
 
-PATCHFILES += 0001-disable-default-cflags-on-sparc.patch
-
-SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf
+SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf
 PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }'
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -41,12 +41,29 @@
 CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid
 CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 
+# Gost requiers OpenSSL 1.0
+CONFIGURE_ARGS += --disable-gost
+
 STRIP_LIBTOOL = 0
 
-RUNTIME_DEP_PKGS += CSWosslrt
-RUNTIME_DEP_PKGS += CSWldns
-RUNTIME_DEP_PKGS += CSWlibevent
+SPKG_DESC_CSWunbound = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWunbound += CSWlibunbound2
+RUNTIME_DEP_PKGS_CSWunbound += CSWexpat
+RUNTIME_DEP_PKGS_CSWunbound += CSWlibevent
+RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1
+RUNTIME_DEP_PKGS_CSWunbound += CSWosslrt
 
+SPKG_DESC_CSWlibunbound2 = Library implementing DNS resolution and validation
+#PKGFILES_CSWlibunbound2 += /opt/csw/lib/libunbound.so.2.*
+PKGFILES_CSWlibunbound2 += $(PKGFILES_RT)
+RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1
+RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent
+
+SPKG_DESC_CSWunbound-devel = $(DESCRIPTION) development package
+#PKGFILES_CSWunbound-devel += /opt/csw/lib/libunbound.so
+PKGFILES_CSWunbound-devel += $(PKGFILES_DEVEL)
+
 # make test doesn't work for the moment on Solaris
 SKIPTEST = 1
 

Modified: csw/mgar/pkg/unbound/trunk/checksums
===================================================================
--- csw/mgar/pkg/unbound/trunk/checksums	2010-11-10 12:34:21 UTC (rev 11543)
+++ csw/mgar/pkg/unbound/trunk/checksums	2010-11-10 12:34:33 UTC (rev 11544)
@@ -1 +1 @@
-2cdcfe0ca45373c6b22e274560ae9943  unbound-1.4.6.tar.gz
+97ee3c4a9877ff725fad23e31ecadfe0  unbound-1.4.7.tar.gz

Deleted: csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch
===================================================================
--- csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch	2010-11-10 12:34:21 UTC (rev 11543)
+++ csw/mgar/pkg/unbound/trunk/files/0001-disable-default-cflags-on-sparc.patch	2010-11-10 12:34:33 UTC (rev 11544)
@@ -1,751 +0,0 @@
-From b37f71e0473b23b92dc55238362c259bfbbe4e6c Mon Sep 17 00:00:00 2001
-From: Ihsan Dogan <ihsan at opencsw.org>
-Date: Sat, 23 Oct 2010 13:57:53 +0200
-Subject: [PATCH] disable default cflags on sparc
-
----
- configure    |  298 +++++++++++++++++++++++++++++++++++++++++-----------------
- configure.ac |  111 ++++++++++++++++++++--
- doc/README   |   15 +++-
- 3 files changed, 326 insertions(+), 98 deletions(-)
-
-diff --git a/configure b/configure
-index fa2b6df..6dc8502 100755
---- a/configure
-+++ b/configure
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for unbound 1.4.6.
-+# Generated by GNU Autoconf 2.65 for unbound 1.4.7.
- #
- # Report bugs to <unbound-bugs at nlnetlabs.nl>.
- #
-@@ -701,8 +701,8 @@ MAKEFLAGS=
- # Identity of this package.
- PACKAGE_NAME='unbound'
- PACKAGE_TARNAME='unbound'
--PACKAGE_VERSION='1.4.6'
--PACKAGE_STRING='unbound 1.4.6'
-+PACKAGE_VERSION='1.4.7'
-+PACKAGE_STRING='unbound 1.4.7'
- PACKAGE_BUGREPORT='unbound-bugs at nlnetlabs.nl'
- PACKAGE_URL=''
- 
-@@ -797,6 +797,8 @@ LEX
- debug_enabled
- DEPFLAG
- UNBOUND_USERNAME
-+UNBOUND_ROOTCERT_FILE
-+UNBOUND_ROOTKEY_FILE
- UNBOUND_PIDFILE
- UNBOUND_SHARE_DIR
- UNBOUND_CHROOT_DIR
-@@ -873,6 +875,8 @@ with_run_dir
- with_chroot_dir
- with_share_dir
- with_pidfile
-+with_rootkey_file
-+with_rootcert_file
- with_username
- enable_checking
- enable_debug
-@@ -892,6 +896,7 @@ with_ssl
- enable_sha2
- enable_gost
- with_libevent
-+with_libexpat
- enable_staticexe
- enable_lock_checks
- enable_alloc_checks
-@@ -1453,7 +1458,7 @@ if test "$ac_init_help" = "long"; then
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures unbound 1.4.6 to adapt to many kinds of systems.
-+\`configure' configures unbound 1.4.7 to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -1519,7 +1524,7 @@ fi
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of unbound 1.4.6:";;
-+     short | recursive ) echo "Configuration of unbound 1.4.7:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -1563,6 +1568,13 @@ Optional Packages:
-                           same as share/unbound)
-   --with-pidfile=filename set default pathname to unbound pidfile (default
-                           run-dir/unbound.pid)
-+  --with-rootkey-file=filename
-+                          set default pathname to root key file (default
-+                          run-dir/root.key). This file is read and written.
-+  --with-rootcert-file=filename
-+                          set default pathname to root update certificate file
-+                          (default run-dir/icannbundle.pem). This file need
-+                          not exist if you are content with the builtin.
-   --with-username=user    set default user that unbound changes to (default
-                           user is unbound)
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-@@ -1583,6 +1595,7 @@ Optional Packages:
-                           /usr/lib /usr/pkg /usr/sfw /usr or you can specify
-                           an explicit path). Slower, but allows use of large
-                           outgoing port ranges.
-+  --with-libexpat=path    specify explicit path for libexpat.
-   --with-ldns=PATH        specify prefix of path of ldns library to use
-   --with-ldns-builtin     forces use of package included with this one
- 
-@@ -1671,7 +1684,7 @@ fi
- test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
--unbound configure 1.4.6
-+unbound configure 1.4.7
- generated by GNU Autoconf 2.65
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
-@@ -2135,7 +2148,7 @@ cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by unbound $as_me 1.4.6, which was
-+It was created by unbound $as_me 1.4.7, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
-@@ -2484,7 +2497,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- LIBUNBOUND_CURRENT=2
--LIBUNBOUND_REVISION=6
-+LIBUNBOUND_REVISION=7
- LIBUNBOUND_AGE=0
- # 1.0.0 had 0:12:0
- # 1.0.1 had 0:13:0
-@@ -2506,6 +2519,7 @@ LIBUNBOUND_AGE=0
- # 1.4.4 had 2:4:0
- # 1.4.5 had 2:5:0
- # 1.4.6 had 2:6:0
-+# 1.4.7 had 2:7:0
- 
- #   Current  -- the number of the binary API that we're implementing
- #   Revision -- which iteration of the implementation of the binary
-@@ -4059,6 +4073,50 @@ _ACEOF
- 
- 
- 
-+# Check whether --with-rootkey-file was given.
-+if test "${with_rootkey_file+set}" = set; then :
-+  withval=$with_rootkey_file; UNBOUND_ROOTKEY_FILE="$withval"
-+else
-+  if test $on_mingw = no; then
-+    UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
-+else
-+    UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
-+fi
-+
-+fi
-+
-+
-+hdr_rkey="`echo $UNBOUND_ROOTKEY_FILE | sed -e 's/\\\\/\\\\\\\\/g'`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ROOT_ANCHOR_FILE "$hdr_rkey"
-+_ACEOF
-+
-+
-+
-+# Check whether --with-rootcert-file was given.
-+if test "${with_rootcert_file+set}" = set; then :
-+  withval=$with_rootcert_file; UNBOUND_ROOTCERT_FILE="$withval"
-+else
-+  if test $on_mingw = no; then
-+    UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
-+else
-+    UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
-+fi
-+
-+fi
-+
-+
-+hdr_rpem="`echo $UNBOUND_ROOTCERT_FILE | sed -e 's/\\\\/\\\\\\\\/g'`"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ROOT_CERT_FILE "$hdr_rpem"
-+_ACEOF
-+
-+
-+
- # Check whether --with-username was given.
- if test "${with_username+set}" = set; then :
-   withval=$with_username; UNBOUND_USERNAME="$withval"
-@@ -5531,70 +5589,6 @@ fi
- 
- 
- 
--# for Sun studio 11.
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -xO4" >&5
--$as_echo_n "checking whether $CC supports -xO4... " >&6; }
--cache=`echo xO4 | sed 'y%.=/+-%___p_%'`
--if { as_var=cv_prog_cc_flag_$cache; eval "test \"\${$as_var+set}\" = set"; }; then :
--  $as_echo_n "(cached) " >&6
--else
--
--echo 'void f(){}' >conftest.c
--if test -z "`$CC $CPPFLAGS $CFLAGS -xO4 -c conftest.c 2>&1`"; then
--eval "cv_prog_cc_flag_$cache=yes"
--else
--eval "cv_prog_cc_flag_$cache=no"
--fi
--rm -f conftest conftest.o conftest.c
--
--fi
--
--if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--:
--CFLAGS="$CFLAGS -xO4"
--else
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--:
--
--fi
--
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -xtarget=generic" >&5
--$as_echo_n "checking whether $CC supports -xtarget=generic... " >&6; }
--cache=`echo xtarget=generic | sed 'y%.=/+-%___p_%'`
--if { as_var=cv_prog_cc_flag_$cache; eval "test \"\${$as_var+set}\" = set"; }; then :
--  $as_echo_n "(cached) " >&6
--else
--
--echo 'void f(){}' >conftest.c
--if test -z "`$CC $CPPFLAGS $CFLAGS -xtarget=generic -c conftest.c 2>&1`"; then
--eval "cv_prog_cc_flag_$cache=yes"
--else
--eval "cv_prog_cc_flag_$cache=no"
--fi
--rm -f conftest conftest.o conftest.c
--
--fi
--
--if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--:
--CFLAGS="$CFLAGS -xtarget=generic"
--else
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--:
--
--fi
--
--
- # debug mode flags warnings
- # Check whether --enable-checking was given.
- if test "${enable_checking+set}" = set; then :
-@@ -6818,13 +6812,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:6821: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6815: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6824: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6818: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6827: output\"" >&5)
-+  (eval echo "\"\$as_me:6821: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -8029,7 +8023,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 8032 "configure"' > conftest.$ac_ext
-+  echo '#line 8026 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -9289,11 +9283,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9292: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9286: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9296: \$? = $ac_status" >&5
-+   echo "$as_me:9290: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -9628,11 +9622,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9631: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9625: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9635: \$? = $ac_status" >&5
-+   echo "$as_me:9629: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -9733,11 +9727,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9736: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9730: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9740: \$? = $ac_status" >&5
-+   echo "$as_me:9734: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -9788,11 +9782,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9791: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9785: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9795: \$? = $ac_status" >&5
-+   echo "$as_me:9789: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -12158,7 +12152,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12161 "configure"
-+#line 12155 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12254,7 +12248,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12257 "configure"
-+#line 12251 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15664,6 +15658,47 @@ $as_echo "#define USE_MINI_EVENT 1" >>confdefs.h
- 
- fi
- 
-+# check for libexpat
-+
-+# Check whether --with-libexpat was given.
-+if test "${with_libexpat+set}" = set; then :
-+  withval=$with_libexpat;
-+else
-+   withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexpat" >&5
-+$as_echo_n "checking for libexpat... " >&6; }
-+found_libexpat="no"
-+for dir in $withval ; do
-+            if test -f "$dir/include/expat.h"; then
-+		found_libexpat="yes"
-+				if test "$dir" != "/usr"; then
-+                    CPPFLAGS="$CPPFLAGS -I$dir/include"
-+		    LDFLAGS="$LDFLAGS -L$dir/lib"
-+		fi
-+            	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $dir" >&5
-+$as_echo "found in $dir" >&6; }
-+                break;
-+            fi
-+done
-+if test x_$found_libexpat != x_yes; then
-+	as_fn_error "Could not find libexpat, expat.h" "$LINENO" 5
-+fi
-+for ac_header in expat.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_expat_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXPAT_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
- # set static linking if requested
- 
- staticexe=""
-@@ -16096,6 +16131,73 @@ fi
- 
- fi
- 
-+# check wether strptime also works
-+for ac_func in strptime
-+do :
-+  ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime"
-+if test "x$ac_cv_func_strptime" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRPTIME 1
-+_ACEOF
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime works" >&5
-+$as_echo_n "checking whether strptime works... " >&6; }
-+if test c${cross_compiling} = cno; then
-+if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#define _XOPEN_SOURCE
-+#include <time.h>
-+int main(void) { struct tm tm; char *res;
-+res = strptime("20070207111842", "%Y%m%d%H%M%S", &tm);
-+if (!res) return 1; return 0; }
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  eval "ac_cv_c_strptime_works=yes"
-+else
-+  eval "ac_cv_c_strptime_works=no"
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+else
-+eval "ac_cv_c_strptime_works=maybe"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_strptime_works" >&5
-+$as_echo "$ac_cv_c_strptime_works" >&6; }
-+if test $ac_cv_c_strptime_works = no; then
-+case " $LIBOBJS " in
-+  *" strptime.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS strptime.$ac_objext"
-+ ;;
-+esac
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define STRPTIME_WORKS 1
-+_ACEOF
-+
-+fi
-+
-+else
-+  case " $LIBOBJS " in
-+  *" strptime.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS strptime.$ac_objext"
-+ ;;
-+esac
-+
-+fi
-+done
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setusercontext" >&5
- $as_echo_n "checking for library containing setusercontext... " >&6; }
- if test "${ac_cv_search_setusercontext+set}" = set; then :
-@@ -16484,6 +16586,26 @@ done
- 	for ac_header in ldns/ldns.h
- do :
-   ac_fn_c_check_header_compile "$LINENO" "ldns/ldns.h" "ac_cv_header_ldns_ldns_h" "$ac_includes_default
-+#ifdef HAVE_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
-+
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif
-+
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
-+
-+#ifdef HAVE_WINSOCK2_H
-+#include <winsock2.h>
-+#endif
-+
-+#ifdef HAVE_WS2TCPIP_H
-+#include <ws2tcpip.h>
-+#endif
-+
- "
- if test "x$ac_cv_header_ldns_ldns_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
-@@ -17114,7 +17236,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by unbound $as_me 1.4.6, which was
-+This file was extended by unbound $as_me 1.4.7, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-@@ -17180,7 +17302,7 @@ _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--unbound config.status 1.4.6
-+unbound config.status 1.4.7
- configured by $0, generated by GNU Autoconf 2.65,
-   with options \\"\$ac_cs_config\\"
- 
-diff --git a/configure.ac b/configure.ac
-index 304e876..6aadeb4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,10 +6,10 @@ sinclude(acx_pthread.m4)
- sinclude(acx_python.m4)
- sinclude(ac_pkg_swig.m4)
- 
--AC_INIT(unbound, 1.4.6, unbound-bugs at nlnetlabs.nl, unbound)
-+AC_INIT(unbound, 1.4.7, unbound-bugs at nlnetlabs.nl, unbound)
- 
- LIBUNBOUND_CURRENT=2
--LIBUNBOUND_REVISION=6
-+LIBUNBOUND_REVISION=7
- LIBUNBOUND_AGE=0
- # 1.0.0 had 0:12:0
- # 1.0.1 had 0:13:0
-@@ -31,6 +31,7 @@ LIBUNBOUND_AGE=0
- # 1.4.4 had 2:4:0
- # 1.4.5 had 2:5:0
- # 1.4.6 had 2:6:0
-+# 1.4.7 had 2:7:0
- 
- #   Current  -- the number of the binary API that we're implementing
- #   Revision -- which iteration of the implementation of the binary
-@@ -153,6 +154,34 @@ AC_SUBST(UNBOUND_PIDFILE)
- ACX_ESCAPE_BACKSLASH($UNBOUND_PIDFILE, hdr_pid)
- AC_DEFINE_UNQUOTED(PIDFILE, ["$hdr_pid"], [default pidfile location])
- 
-+AC_ARG_WITH(rootkey-file, 
-+    AC_HELP_STRING([--with-rootkey-file=filename], 
-+    [set default pathname to root key file (default run-dir/root.key). This file is read and written.]), 
-+    UNBOUND_ROOTKEY_FILE="$withval", 
-+if test $on_mingw = no; then
-+    UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
-+else
-+    UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
-+fi
-+)
-+AC_SUBST(UNBOUND_ROOTKEY_FILE)
-+ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTKEY_FILE, hdr_rkey)
-+AC_DEFINE_UNQUOTED(ROOT_ANCHOR_FILE, ["$hdr_rkey"], [default rootkey location])
-+
-+AC_ARG_WITH(rootcert-file, 
-+    AC_HELP_STRING([--with-rootcert-file=filename], 
-+    [set default pathname to root update certificate file (default run-dir/icannbundle.pem).  This file need not exist if you are content with the builtin.]), 
-+    UNBOUND_ROOTCERT_FILE="$withval", 
-+if test $on_mingw = no; then
-+    UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
-+else
-+    UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
-+fi
-+)
-+AC_SUBST(UNBOUND_ROOTCERT_FILE)
-+ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTCERT_FILE, hdr_rpem)
-+AC_DEFINE_UNQUOTED(ROOT_CERT_FILE, ["$hdr_rpem"], [default rootcert location])
-+
- AC_ARG_WITH(username, 
-     AC_HELP_STRING([--with-username=user], 
-     [set default user that unbound changes to (default user is unbound)]), 
-@@ -174,10 +203,6 @@ AC_PROG_CC
- ACX_DEPFLAG
- ACX_DETERMINE_EXT_FLAGS_UNBOUND
- 
--# for Sun studio 11.
--ACX_CHECK_COMPILER_FLAG(xO4, [CFLAGS="$CFLAGS -xO4"])
--ACX_CHECK_COMPILER_FLAG(xtarget=generic, [CFLAGS="$CFLAGS -xtarget=generic"])
--
- # debug mode flags warnings
- AC_ARG_ENABLE(checking, AC_HELP_STRING([--enable-checking], [Enable warnings, asserts, makefile-dependencies]))
- AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [same as enable-checking]))
-@@ -531,6 +556,29 @@ else
- 	AC_DEFINE(USE_MINI_EVENT, 1, [Define if you want to use internal select based events])
- fi
- 
-+# check for libexpat
-+AC_ARG_WITH(libexpat, AC_HELP_STRING([--with-libexpat=path],
-+    [specify explicit path for libexpat.]),
-+    [ ],[ withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" ])
-+AC_MSG_CHECKING(for libexpat)
-+found_libexpat="no"
-+for dir in $withval ; do
-+            if test -f "$dir/include/expat.h"; then
-+		found_libexpat="yes"
-+		dnl assume /usr is in default path.
-+		if test "$dir" != "/usr"; then
-+                    CPPFLAGS="$CPPFLAGS -I$dir/include"
-+		    LDFLAGS="$LDFLAGS -L$dir/lib"
-+		fi
-+            	AC_MSG_RESULT(found in $dir)
-+                break;
-+            fi
-+done
-+if test x_$found_libexpat != x_yes; then
-+	AC_ERROR([Could not find libexpat, expat.h])
-+fi
-+AC_CHECK_HEADERS([expat.h],,, [AC_INCLUDES_DEFAULT])
-+
- # set static linking if requested
- AC_SUBST(staticexe)
- staticexe=""
-@@ -606,6 +654,29 @@ if test $ac_cv_func_daemon = yes; then
- ])
- fi
- 
-+# check wether strptime also works
-+AC_DEFUN([AC_CHECK_STRPTIME_WORKS],
-+[AC_REQUIRE([AC_PROG_CC])
-+AC_MSG_CHECKING(whether strptime works)
-+if test c${cross_compiling} = cno; then
-+AC_TRY_RUN([
-+#define _XOPEN_SOURCE
-+#include <time.h>
-+int main(void) { struct tm tm; char *res;
-+res = strptime("20070207111842", "%Y%m%d%H%M%S", &tm);
-+if (!res) return 1; return 0; }
-+] , [eval "ac_cv_c_strptime_works=yes"], [eval "ac_cv_c_strptime_works=no"])
-+else
-+eval "ac_cv_c_strptime_works=maybe"
-+fi
-+AC_MSG_RESULT($ac_cv_c_strptime_works)
-+if test $ac_cv_c_strptime_works = no; then
-+AC_LIBOBJ(strptime)
-+else
-+AC_DEFINE_UNQUOTED([STRPTIME_WORKS], 1, [use default strptime.])
-+fi
-+])dnl
-+AC_CHECK_FUNCS([strptime],[AC_CHECK_STRPTIME_WORKS],[AC_LIBOBJ([strptime])])
- AC_SEARCH_LIBS([setusercontext], [util])
- AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam getrlimit setrlimit setsid sbrk chroot kill sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex])
- AC_CHECK_FUNCS([setresuid],,[AC_CHECK_FUNCS([setreuid])])
-@@ -655,7 +726,27 @@ if test "$use_ldns_builtin" = "no"; then
- 	else
- 	    ac_cv_func_ldns_key_EVP_load_gost_id="yes"
- 	fi
--	AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT])
-+	AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT
-+#ifdef HAVE_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
-+
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif
-+
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
-+
-+#ifdef HAVE_WINSOCK2_H
-+#include <winsock2.h>
-+#endif
-+
-+#ifdef HAVE_WS2TCPIP_H
-+#include <ws2tcpip.h>
-+#endif
-+])
- 	if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \
- 	    -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
- 	    -a $ac_cv_header_ldns_ldns_h = yes \
-@@ -773,6 +864,12 @@ AHX_MEMCMP_BROKEN(unbound)
- char *ctime_r(const time_t *timep, char *buf);
- #endif
- 
-+#if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS)
-+#define strptime unbound_strptime
-+struct tm;
-+char *strptime(const char *s, const char *format, struct tm *tm);
-+#endif
-+
- #if defined(HAVE_EVENT_H) && !defined(HAVE_EVENT_BASE_ONCE) && (defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS))
-    /* using version of libevent that is not threadsafe. */
- #  define LIBEVENT_SIGNAL_PROBLEM 1
-diff --git a/doc/README b/doc/README
-index a572250..5f13384 100644
---- a/doc/README
-+++ b/doc/README
-@@ -1,4 +1,4 @@
--README for Unbound 1.4.6
-+README for Unbound @version@
- Copyright 2007 NLnet Labs
- http://unbound.net
- 
-@@ -28,6 +28,8 @@ This software is under BSD license, see LICENSE for details.
- 	of outgoing ports. This improves randomization and spoof 
- 	resistance. For the default of 16 ports the builtin alternative 
- 	works well and is a little faster.
-+  * --with-libexpat=/path/to/libexpat
-+  	Can be set to the install directory of libexpat.
-   * --without-pthreads 
- 	This disables pthreads. Without this option the pthreads library 
- 	is detected automatically. Use this option to disable threading
-@@ -59,6 +61,13 @@ This software is under BSD license, see LICENSE for details.
-   * --with-chroot-dir=path
-   	Set default chroot directory,
- 	the default is /usr/local/etc/unbound.
-+  * --with-rootkey-file=path
-+  	Set the default root.key path.  This file is read and written.
-+	the default is /usr/local/etc/unbound/root.key
-+  * --with-rootcert-file=path
-+  	Set the default root update certificate path.  A builtin certificate
-+	is used if this file is empty or does not exist.
-+	the default is /usr/local/etc/unbound/icannbundle.pem
-   * --with-username=user
-   	Set default user name to change to,
- 	the default is the "unbound" user.
-@@ -72,8 +81,7 @@ This software is under BSD license, see LICENSE for details.
-   * --disable-gost
-   	Disable support for GOST crypto, RFC 5933.
- 
--* 'make test' attempts to run a series of tests, depending on the support
--  programs that are installed.
-+* 'make test' runs a series of self checks.
- 
- Known issues
- ------------
-@@ -97,6 +105,7 @@ o The warning 'openssl has no entropy, seeding with time', with chroot
- o On Solaris 5.10 some libtool packages from repositories do not work with
-   gcc, showing errors gcc: unrecognized option `-KPIC'
-   To solve this do ./configure libtool=./libtool [your options...].
-+  On Solaris you may pass CFLAGS="-xO4 -xtarget=generic" if you use sun-cc.
- o If unbound-control (or munin graphs) do not work, this can often be because
-   the unbound-control-setup script creates the keys with restricted 
-   permissions, and the files need to be made readable or ownered by both the
--- 
-1.7.3
-


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


More information about the devel mailing list