Merge pull request #5236 from lynxis/rb_perl
authorPhilip Prindeville <philipp@redfish-solutions.com>
Sat, 16 Dec 2017 20:41:23 +0000 (13:41 -0700)
committerGitHub <noreply@github.com>
Sat, 16 Dec 2017 20:41:23 +0000 (13:41 -0700)
perl: remove build timestamp

115 files changed:
.travis_do.sh
lang/lua-rs232/Makefile
lang/lua-rs232/patches/100-remove-build-timestamps.patch [new file with mode: 0644]
lang/php7/Makefile
lang/php7/patches/0050-remove-build-timestamps.patch [new file with mode: 0644]
lang/python/python-curl/Makefile
lang/python/python-pip-conf/Makefile [new file with mode: 0644]
lang/python/python-pip-conf/files/pip.conf [new file with mode: 0644]
lang/python/python/Config-python-light.in [new file with mode: 0644]
lang/python/python/Makefile
lang/python/python/files/pip.conf [deleted file]
lang/python/python3/Config-python3-light.in [new file with mode: 0644]
lang/python/python3/Makefile
libs/gnutls/Makefile
libs/icu/Makefile
libs/libdbi-drivers/Makefile
libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch [new file with mode: 0644]
libs/libp11/Makefile
libs/libwebsockets/Makefile
libs/libwebsockets/patches/001-CMakeLists-build-reproducible-by-default.patch [new file with mode: 0644]
libs/openldap/Makefile
libs/openldap/patches/110-reproducible-builds.patch [new file with mode: 0644]
multimedia/mjpg-streamer/Makefile
multimedia/mjpg-streamer/patches/035-remove_build_date-time.patch [new file with mode: 0644]
net/cgi-io/Makefile
net/cgi-io/src/main.c
net/cifs-utils/Makefile
net/cifs-utils/patches/001-fix-musl-build.patch [deleted file]
net/danish/Makefile [new file with mode: 0644]
net/ddns-scripts/Makefile
net/ethtool/Makefile
net/i2pd/Makefile [new file with mode: 0644]
net/i2pd/files/i2pd.init [new file with mode: 0755]
net/i2pd/patches/010-cross-compile.patch [new file with mode: 0644]
net/iodine/Makefile
net/iodine/patches/101-musl-workaround-incomplete-nameser-h.patch [new file with mode: 0644]
net/mosquitto/Makefile
net/mosquitto/patches/100-remove-build-timestamps.patch [new file with mode: 0644]
net/mwan3/Makefile
net/mwan3/files/lib/mwan3/mwan3.sh
net/nlbwmon/Makefile
net/ola/Makefile
net/ola/patches/001-Eliminate-protobuf-AddDescriptors-call.patch [new file with mode: 0644]
net/ola/patches/001-include-endian_h.patch [deleted file]
net/ola/patches/003-Make-DNS-SD-functionality-optional-at-build-time.patch [deleted file]
net/openconnect/Makefile
net/openconnect/patches/0001-Fix-compilation-with-libp11-version-0.4.7.patch [new file with mode: 0644]
net/rsync/Makefile
net/rsync/patches/000-remove-configure.sh.patch [new file with mode: 0644]
net/rsync/patches/001-tweak-indentation-only.patch [new file with mode: 0644]
net/rsync/patches/002-Add-checksum-choice-option.patch [new file with mode: 0644]
net/rsync/patches/003-support-sparse-combined-with.patch [new file with mode: 0644]
net/rsync/patches/004-we-need-a-LF-after-filelist.patch [new file with mode: 0644]
net/rsync/patches/005-more-fixes-for-progress-quirks.patch [new file with mode: 0644]
net/rsync/patches/006-handle-archaic-checksums-properly.patch [new file with mode: 0644]
net/rsync/patches/007-dont-forget-to-tweak-sum_update.patch [new file with mode: 0644]
net/rsync/patches/008-only-allow-a-modern-checksum.patch [new file with mode: 0644]
net/rsync/patches/009-Use-full-MD4-len.patch [new file with mode: 0644]
net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch [new file with mode: 0644]
net/rsync/patches/011-more-archaic-checksum-improvements.patch [new file with mode: 0644]
net/shorewall-core/Makefile
net/shorewall-core/patches/110-lib.common.patch
net/shorewall-lite/Makefile
net/shorewall-lite/files/hostname
net/shorewall-lite/files/hotplug_iface
net/shorewall-lite/files/shorewall-lite.init [new file with mode: 0644]
net/shorewall-lite/patches/010-install_cp.patch
net/shorewall-lite/patches/120-LOGFILE.patch [deleted file]
net/shorewall-lite/patches/120-logfile.patch [new file with mode: 0644]
net/shorewall/Makefile [new file with mode: 0644]
net/shorewall/files/hostname [new file with mode: 0644]
net/shorewall/files/hotplug_iface [new file with mode: 0644]
net/shorewall/files/shorewall.init [new file with mode: 0644]
net/shorewall/files/vardir [new file with mode: 0644]
net/shorewall/patches/120-logfile.patch [new file with mode: 0644]
net/shorewall6-lite/Makefile
net/shorewall6-lite/files/hostname
net/shorewall6-lite/files/hotplug_iface
net/shorewall6-lite/files/shorewall6-lite.init [new file with mode: 0644]
net/shorewall6-lite/patches/010-install_cp.patch
net/shorewall6-lite/patches/120-LOGFILE.patch [deleted file]
net/shorewall6-lite/patches/120-logfile.patch [new file with mode: 0644]
net/shorewall6/Makefile [new file with mode: 0644]
net/shorewall6/files/hostname [new file with mode: 0644]
net/shorewall6/files/hotplug_iface [new file with mode: 0644]
net/shorewall6/files/shorewall6.init [new file with mode: 0644]
net/shorewall6/files/vardir [new file with mode: 0644]
net/shorewall6/patches/120-logfile.patch [new file with mode: 0644]
net/stunnel/Makefile
net/stunnel/files/stunnel.init
net/stunnel/files/stunnel.uci [new file with mode: 0644]
net/tgt/Makefile
net/tor/Makefile
net/travelmate/Makefile
net/travelmate/files/README.md
net/travelmate/files/travelmate.init
net/travelmate/files/travelmate.sh
net/wavemon/Makefile
sound/fdk-aac/Makefile
utils/acl/Makefile
utils/attr/Makefile
utils/gawk/Makefile
utils/lcdproc/Makefile
utils/lcdproc/patches/100-remove-build-timestamp.patch [new file with mode: 0644]
utils/lsof/Makefile
utils/lsof/patches/005-reproducable-build.patch [new file with mode: 0644]
utils/lxc/Makefile
utils/lxc/files/lxc-unprivileged.defaults [new file with mode: 0644]
utils/open-plc-utils/Makefile
utils/open-plc-utils/patches/100-remove-build-timestamp.patch [new file with mode: 0644]
utils/setserial/Makefile [new file with mode: 0644]
utils/smartmontools/Makefile
utils/smartmontools/patches/001-musl-compat-realpath.patch [new file with mode: 0644]
utils/unrar/Makefile
utils/unrar/patches/100-makefile_fixes.patch

index 26597f6ffe4becbc98e2adfb33aace4a8a051f3f..3c88d1768dcdb2e1d1604203ea4c2bede8eb7ece 100755 (executable)
@@ -6,7 +6,7 @@ set -e
 
 SDK_HOME="$HOME/sdk"
 SDK_PATH=https://downloads.lede-project.org/snapshots/targets/ar71xx/generic/
-SDK=lede-sdk-ar71xx-generic_gcc-5.5.0_musl.Linux-x86_64
+SDK=openwrt-sdk-ar71xx-generic_gcc-5.5.0_musl.Linux-x86_64
 PACKAGES_DIR="$PWD"
 
 echo_red()   { printf "\033[1;31m$*\033[m\n"; }
@@ -68,7 +68,7 @@ download_sdk() {
 # test_package call make download check for very new/modified package
 test_packages2() {
        local commit_range=$TRAVIS_COMMIT_RANGE
-       if [ "$TRAVIS_PULL_REQUEST" = false ]; then
+       if [ -z "$TRAVIS_PULL_REQUEST_SHA" ]; then
                echo_blue "Using only the latest commit, since we're not in a Pull Request"
                commit_range=HEAD~1
        fi
@@ -148,7 +148,7 @@ EOF
 
 test_commits() {
        RET=0
-       if [ "$TRAVIS_PULL_REQUEST" = false ]; then
+       if [ -z "$TRAVIS_PULL_REQUEST_SHA" ]; then
                echo_blue "Skipping commits tests (not in a Pull Request)"
                return 0
        fi
@@ -196,12 +196,7 @@ echo_blue "=== Travis ENV"
 env
 echo_blue "=== Travis ENV"
 
-if [ -z "$TRAVIS_COMMIT_RANGE" ] && [ "$TRAVIS_PULL_REQUEST" = true ] ; then
-       echo_red "TRAVIS_COMMIT_RANGE variable is empty in a Pull Request"
-       exit 1
-fi
-
-if [ "$TRAVIS_PULL_REQUEST" = true ]; then
+if [ -n "$TRAVIS_PULL_REQUEST_SHA" ]; then
        while true; do
                # if clone depth is too small, git rev-list / diff return incorrect or empty results
                C="$(git rev-list ${TRAVIS_COMMIT_RANGE/.../..} | tail -n1)" 2>/dev/null
index cf4ad7e7ef691c167e9342ad6164415e2a922012..492d8cc83f2e66a216df5113f694bb0d0f8d3ce4 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua-rs232
 PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
 PKG_LICENSE:=MIT
 
diff --git a/lang/lua-rs232/patches/100-remove-build-timestamps.patch b/lang/lua-rs232/patches/100-remove-build-timestamps.patch
new file mode 100644 (file)
index 0000000..fe59e2c
--- /dev/null
@@ -0,0 +1,22 @@
+Index: lua-rs232-1.0.3/bindings/lua/luars232.c
+===================================================================
+--- lua-rs232-1.0.3.orig/bindings/lua/luars232.c       2014-06-05 09:48:23.000000000 +0200
++++ lua-rs232-1.0.3/bindings/lua/luars232.c    2017-12-03 13:03:51.008917783 +0100
+@@ -31,7 +31,6 @@
+ #include "librs232/rs232.h"
+-#define MODULE_TIMESTAMP __DATE__ " " __TIME__
+ #define MODULE_NAMESPACE "luars232"
+ #define MODULE_VERSION "1.0.3"
+ #define MODULE_BUILD "$Id: luars232.c 15 2011-02-23 09:02:20Z sp $"
+@@ -483,9 +482,6 @@
+       lua_pushstring(L, MODULE_BUILD);
+       lua_setfield(L, -2, "_BUILD");
+-      lua_pushstring(L, MODULE_TIMESTAMP);
+-      lua_setfield(L, -2, "_TIMESTAMP");
+-
+       lua_pushstring(L, MODULE_COPYRIGHT);
+       lua_setfield(L, -2, "_COPYRIGHT");
index fe259628d466e766e8c0d382166ed43e0bdb2b62..f50f554044eaac924dfdbeb44ea2bd8458fe566f 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=7.1.12
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 
diff --git a/lang/php7/patches/0050-remove-build-timestamps.patch b/lang/php7/patches/0050-remove-build-timestamps.patch
new file mode 100644 (file)
index 0000000..fa90170
--- /dev/null
@@ -0,0 +1,32 @@
+Index: php-7.1.12/ext/opcache/ZendAccelerator.c
+===================================================================
+--- php-7.1.12.orig/ext/opcache/ZendAccelerator.c
++++ php-7.1.12/ext/opcache/ZendAccelerator.c
+@@ -2604,11 +2604,6 @@ static void accel_gen_system_id(void)
+       PHP_MD5Update(&context, PHP_VERSION, sizeof(PHP_VERSION)-1);
+       PHP_MD5Update(&context, ZEND_EXTENSION_BUILD_ID, sizeof(ZEND_EXTENSION_BUILD_ID)-1);
+       PHP_MD5Update(&context, ZEND_BIN_ID, sizeof(ZEND_BIN_ID)-1);
+-      if (strstr(PHP_VERSION, "-dev") != 0) {
+-              /* Development versions may be changed from build to build */
+-              PHP_MD5Update(&context, __DATE__, sizeof(__DATE__)-1);
+-              PHP_MD5Update(&context, __TIME__, sizeof(__TIME__)-1);
+-      }
+       PHP_MD5Final(digest, &context);
+       for (i = 0; i < 16; i++) {
+               c = digest[i] >> 4;
+Index: php-7.1.12/sapi/litespeed/lsapi_main.c
+===================================================================
+--- php-7.1.12.orig/sapi/litespeed/lsapi_main.c
++++ php-7.1.12/sapi/litespeed/lsapi_main.c
+@@ -1036,9 +1036,9 @@ static int cli_main( int argc, char * ar
+             case 'v':
+                 if (php_request_startup() != FAILURE) {
+ #if ZEND_DEBUG
+-                    php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++                    php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
+ #else
+-                    php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++                    php_printf("PHP %s (%s)\nCopyright (c) 1997-2017 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
+ #endif
+ #ifdef PHP_OUTPUT_NEWAPI
+                     php_output_end_all();
index cc29f8ec54219965a751589349b0b120b427fed8..679ffef3ce9fcc24df84a0b9bd7a7f34d1be2520 100644 (file)
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pycurl
-PKG_VERSION:=7.43.0
+PKG_VERSION:=7.43.0.1
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Waldemar Konik <informatyk74@interia.pl>
 PKG_LICENSE:=LGPL-2.1
@@ -13,7 +13,7 @@ PKG_LICENSE_FILE=COPYING-LGPL
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://dl.bintray.com/pycurl/pycurl/
-PKG_HASH:=aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c
+PKG_HASH:=43231bf2bafde923a6d9bb79e2407342a5f3382c1ef0a3b2e491c6a4e50b91aa
 
 PKG_BUILD_DEPENDS:=python libcurl
 
diff --git a/lang/python/python-pip-conf/Makefile b/lang/python/python-pip-conf/Makefile
new file mode 100644 (file)
index 0000000..b8ef7f6
--- /dev/null
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2017 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-pip-conf
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/python-pip-conf
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Configuration file for pip/pip3
+  URL:=https://pip.pypa.io
+  MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+endef
+
+define Package/python-pip-conf/description
+ Configuration file for pip/pip3
+endef
+
+Build/Compile:=
+
+define Package/python-pip-conf/install
+       $(INSTALL_DIR) $(1)/etc
+       $(CP) ./files/pip.conf $(1)/etc
+endef
+
+$(eval $(call BuildPackage,python-pip-conf))
diff --git a/lang/python/python-pip-conf/files/pip.conf b/lang/python/python-pip-conf/files/pip.conf
new file mode 100644 (file)
index 0000000..89339e9
--- /dev/null
@@ -0,0 +1,3 @@
+[global]
+cache-dir=/tmp/.cache
+log-file=/tmp/pip-log.txt
diff --git a/lang/python/python/Config-python-light.in b/lang/python/python/Config-python-light.in
new file mode 100644 (file)
index 0000000..c6c2041
--- /dev/null
@@ -0,0 +1,7 @@
+menu "Configuration"
+
+config PYTHON_BLUETOOTH_SUPPORT
+       bool "Enable Bluetooth support"
+       default n
+
+endmenu
index 13a16a37f8363534e12d7eeb3376ef34e9cb9ac9..0e0ffc25c61cffb5533433145bb301bb61256f4f 100644 (file)
@@ -14,7 +14,7 @@ PKG_NAME:=python
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
 # XXX: reset PKG_RELEASE to 1 only if Python's pip & setuptools versions have also bumped;
 #      otherwise, keep bumping PKG_RELEASE
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
@@ -39,9 +39,9 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_python-setuptools CONFIG_PACKAGE_python-pip \
-       CONFIG_PACKAGE_bluez-libs
+       CONFIG_PYTHON_BLUETOOTH_SUPPORT
 
-PKG_BUILD_DEPENDS:=python/host PACKAGE_bluez-libs:bluez-libs
+PKG_BUILD_DEPENDS:=python/host
 HOST_BUILD_DEPENDS:=bzip2/host expat/host
 
 include $(INCLUDE_DIR)/host-build.mk
@@ -65,16 +65,6 @@ define Package/python/Default/description
  the development of higher quality, more maintainable code.
 endef
 
-define Package/python-pip-conf
-$(call Package/python/Default)
-  TITLE:=Configuration file for pip/pip3
-  URL:=https://pip.pypa.io
-endef
-
-define Package/python-pip-conf/description
- Configuration file for pip/pip3
-endef
-
 define Package/python-base
 $(call Package/python/Default)
   TITLE:=Python $(PYTHON_VERSION) interpreter
@@ -89,7 +79,11 @@ endef
 define Package/python-light
 $(call Package/python/Default)
   TITLE:=Python $(PYTHON_VERSION) light installation
-  DEPENDS:=+python-base +libffi +libbz2 +PACKAGE_bluez-libs:bluez-libs
+  DEPENDS:=+python-base +libffi +libbz2 +PYTHON_BLUETOOTH_SUPPORT:bluez-libs
+endef
+
+define Package/python-light/config
+  source "$(SOURCE)/Config-python-light.in"
 endef
 
 define Package/python-light/description
@@ -150,6 +144,10 @@ PYTHON_FOR_BUILD:= \
        _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata \
        $(HOST_PYTHON_BIN)
 
+DISABLE_BLUETOOTH:= \
+    ac_cv_header_bluetooth_bluetooth_h=no \
+    ac_cv_header_bluetooth_h=no
+
 CONFIGURE_ARGS+= \
        --sysconfdir=/etc \
        --enable-shared \
@@ -158,6 +156,7 @@ CONFIGURE_ARGS+= \
        --with-system-ffi \
        --with-ensurepip=no \
        --without-pymalloc \
+       $(if $(CONFIG_PYTHON_BLUETOOTH_SUPPORT),,$(DISABLE_BLUETOOTH)) \
        PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)" \
        $(ENABLE_IPV6) \
        CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
@@ -281,11 +280,6 @@ define PyPackage/python/filespec
 -|$(PYTHON_PKG_DIR)
 endef
 
-define Package/python-pip-conf/install
-       $(INSTALL_DIR) $(1)/etc
-       $(CP) ./files/pip.conf $(1)/etc
-endef
-
 HOST_LDFLAGS += \
        -Wl,--no-as-needed -lrt \
        $$$$(pkg-config --static --libs libcrypto libssl)
@@ -324,8 +318,6 @@ $(eval $(call PyPackage,python-base))
 $(eval $(call PyPackage,python-light))
 $(eval $(call PyPackage,python))
 
-$(eval $(call BuildPackage,python-pip-conf))
-
 $(eval $(call BuildPackage,python-base))
 $(eval $(call BuildPackage,python-light))
 $(eval $(call BuildPackage,python))
diff --git a/lang/python/python/files/pip.conf b/lang/python/python/files/pip.conf
deleted file mode 100644 (file)
index 89339e9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[global]
-cache-dir=/tmp/.cache
-log-file=/tmp/pip-log.txt
diff --git a/lang/python/python3/Config-python3-light.in b/lang/python/python3/Config-python3-light.in
new file mode 100644 (file)
index 0000000..eb22262
--- /dev/null
@@ -0,0 +1,7 @@
+menu "Configuration"
+
+config PYTHON3_BLUETOOTH_SUPPORT
+       bool "Enable Bluetooth support"
+       default n
+
+endmenu
index 38e55ba542f3cc3ca9eab72a5cd45306c4f6abc1..924fec58f050338ffd95eed9c0ee6187a04b6c61 100644 (file)
@@ -16,7 +16,7 @@ PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
 PKG_NAME:=python3
 # XXX: reset PKG_RELEASE to 1 only if Python's pip & setuptools versions have also bumped;
 #      otherwise, keep bumping PKG_RELEASE
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
@@ -42,10 +42,9 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_python3-setuptools CONFIG_PACKAGE_python3-pip \
-       CONFIG_PACKAGE_bluez-libs
+       CONFIG_PYTHON3_BLUETOOTH_SUPPORT
 
-
-PKG_BUILD_DEPENDS:=python3/host PACKAGE_bluez-libs:bluez-libs
+PKG_BUILD_DEPENDS:=python3/host
 HOST_BUILD_DEPENDS:=bzip2/host expat/host libffi/host
 
 include $(INCLUDE_DIR)/host-build.mk
@@ -83,7 +82,11 @@ endef
 define Package/python3-light
 $(call Package/python3/Default)
   TITLE:=Python $(PYTHON_VERSION) light installation
-  DEPENDS:=+python3-base +libffi +libbz2 +PACKAGE_bluez-libs:bluez-libs
+  DEPENDS:=+python3-base +libffi +libbz2 +PYTHON3_BLUETOOTH_SUPPORT:bluez-libs
+endef
+
+define Package/python3-light/config
+  source "$(SOURCE)/Config-python3-light.in"
 endef
 
 define Package/python3-light/description
@@ -145,6 +148,10 @@ PYTHON_FOR_BUILD:= \
        _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata \
        $(HOST_PYTHON3_BIN)
 
+DISABLE_BLUETOOTH:= \
+       ac_cv_header_bluetooth_bluetooth_h=no \
+       ac_cv_header_bluetooth_h=no
+
 CONFIGURE_ARGS+= \
        --sysconfdir=/etc \
        --enable-shared \
@@ -153,6 +160,7 @@ CONFIGURE_ARGS+= \
        --with-system-ffi \
        --with-ensurepip=no \
        --without-pymalloc \
+       $(if $(CONFIG_PYTHON3_BLUETOOTH_SUPPORT),,$(DISABLE_BLUETOOTH)) \
        PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)" \
        $(ENABLE_IPV6) \
        CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
index e060e33facabc5cdc739f8cf4ae14fefa70aa5fd..b5bbd157c16f1c717a9ac002df41b56ad120a9e5 100644 (file)
@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5
+PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5
 PKG_HASH:=0924dec90c37c05f49fec966eba3672dab4d336d879e5c06e06e13325cbfec25
 #PKG_FIXUP:=autoreconf gettext-version
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
index 9d25f3a0eb6f321e685eabd3e99a6f5b94aea884..02b0f2e4891852ad37761fac8924154464704937 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icu4c
-PKG_VERSION:=60.1
+PKG_VERSION:=60.2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-60_1-src.tgz
+PKG_SOURCE:=$(PKG_NAME)-60_2-src.tgz
 PKG_SOURCE_URL:=http://download.icu-project.org/files/$(PKG_NAME)/$(PKG_VERSION)
-PKG_HASH:=f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
+PKG_HASH:=f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418
 
 PKG_LICENSE:=ICU-1.8.1+
 PKG_LICENSE_FILES:=LICENSE
index 6cca9b0e0acef7ff7a17c9c10bf738793d320ccd..1dc57a909041368056fc07d45c9d4245c4306c2e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdbi-drivers
 PKG_VERSION:=0.9.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libdbi-drivers
diff --git a/libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch b/libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch
new file mode 100644 (file)
index 0000000..a106c20
--- /dev/null
@@ -0,0 +1,140 @@
+Index: libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/db2/dbd_db2.c    2013-01-09 22:30:19.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c 2017-12-02 00:28:50.354329791 +0100
+@@ -57,8 +57,7 @@
+   "IBM DB2 database support (using DB2 Call Level Interface)",
+   "João Henrique F. Freitas <joaohf@users.sourceforge.net>",
+   "http://libdbi-drivers.sourceforge.net",
+-  "dbd_db2 v" VERSION,
+-  __DATE__
++  "dbd_db2 v" VERSION
+ };
+ static const char *custom_functions[] = {NULL}; // TODO
+Index: libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/firebird/dbd_firebird.c  2013-01-09 22:20:07.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c       2017-12-02 00:28:47.418270022 +0100
+@@ -67,8 +67,7 @@
+       "Firebird/Interbase database support",
+       "Christian M. Stamgren <cms@cention.se>",
+       "http://libdbi-drivers.sourceforge.net",
+-      "dbd_firebird v" VERSION,
+-      __DATE__
++      "dbd_firebird v" VERSION
+ };
+Index: libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/freetds/dbd_freetds.c    2013-01-09 22:21:11.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c 2017-12-02 00:29:05.482637950 +0100
+@@ -63,8 +63,7 @@
+     "MS SQL and Sybase databases support (using libct)",
+     "Vadym Kononenko <konan_v@users.sourceforge.net>",
+     "http://libdbi.sourceforge.net",
+-    "dbd_freetds v" VERSION,
+-    __DATE__
++    "dbd_freetds v" VERSION
+ };
+ static const char APP_NAME[] = "libdbi-freetds-driver";
+Index: libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/ingres/dbd_ingres.c      2013-01-09 22:30:19.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c   2017-12-02 00:29:02.370574535 +0100
+@@ -44,8 +44,7 @@
+       "Ingres database support",
+       "Toby Thain <qu1j0t3@sourceforge.net>",
+       "http://libdbi-drivers.sourceforge.net",
+-      "dbd_ingres v" VERSION,
+-      __DATE__
++      "dbd_ingres v" VERSION
+ };
+ static const char *custom_functions[] = {NULL};
+Index: libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/msql/dbd_msql.c  2013-01-09 22:26:20.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c       2017-12-02 00:29:09.034710349 +0100
+@@ -57,8 +57,7 @@
+       "Mini SQL (mSQL) database support",
+       "Christian M. Stamgren <christian@centiongroup.com>",
+       "libdbi-drivers.sourceforge.net", 
+-      "dbd_msql v" VERSION,
+-      __DATE__
++      "dbd_msql v" VERSION
+ };
+ static const char *custom_functions[] = {NULL}; 
+Index: libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/mysql/dbd_mysql.c        2013-02-28 00:16:20.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c     2017-12-02 00:28:42.438168678 +0100
+@@ -59,8 +59,7 @@
+       "MySQL database support (using libmysqlclient)",
+       "Mark M. Tobenkin <mark@brentwoodradio.com>",
+       "http://libdbi-drivers.sourceforge.net",
+-      "dbd_mysql v" VERSION,
+-      __DATE__
++      "dbd_mysql v" VERSION
+ };
+ static const char *custom_functions[] = MYSQL_CUSTOM_FUNCTIONS;
+Index: libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/oracle/dbd_oracle.c      2013-01-09 22:27:16.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c   2017-12-02 00:28:55.958443910 +0100
+@@ -54,8 +54,7 @@
+       "Oracle database support (using Oracle Call Interface)",
+       "Ashish Ranjan <ashishwave@yahoo.com>", 
+       "http://libdbi-drivers.sourceforge.net",
+-      "dbd_Oracle v" VERSION,
+-      __DATE__
++      "dbd_Oracle v" VERSION
+ };
+ static const char *custom_functions[] = {NULL}; 
+Index: libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/pgsql/dbd_pgsql.c        2017-12-02 00:28:08.737484155 +0100
++++ libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c     2017-12-02 00:28:53.386391528 +0100
+@@ -61,8 +61,7 @@
+       "PostgreSQL database support (using libpq)",
+       "David A. Parker <david@neongoat.com>",
+       "http://libdbi-drivers.sourceforge.net",
+-      "dbd_pgsql v" VERSION,
+-      __DATE__
++      "dbd_pgsql v" VERSION
+ };
+ static const char *custom_functions[] = PGSQL_CUSTOM_FUNCTIONS;
+Index: libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/sqlite/dbd_sqlite.c      2013-01-09 22:30:20.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c   2017-12-02 00:28:59.370513412 +0100
+@@ -65,8 +65,7 @@
+   "SQLite database support (using libsqlite)",
+   "Markus Hoenicka <mhoenicka@users.sourceforge.net>",
+   "http://libdbi-drivers.sourceforge.net",
+-  "dbd_sqlite v" VERSION,
+-  __DATE__
++  "dbd_sqlite v" VERSION
+ };
+ static const char *custom_functions[] = SQLITE_CUSTOM_FUNCTIONS;
+Index: libdbi-drivers-0.9.0/drivers/sqlite3/dbd_sqlite3.c
+===================================================================
+--- libdbi-drivers-0.9.0.orig/drivers/sqlite3/dbd_sqlite3.c    2013-01-23 00:29:13.000000000 +0100
++++ libdbi-drivers-0.9.0/drivers/sqlite3/dbd_sqlite3.c 2017-12-02 00:29:11.706764820 +0100
+@@ -65,8 +65,7 @@
+   "SQLite3 database support (using libsqlite3)",
+   "Markus Hoenicka <mhoenicka@users.sourceforge.net>",
+   "http://libdbi-drivers.sourceforge.net",
+-  "dbd_sqlite3 v" VERSION,
+-  __DATE__
++  "dbd_sqlite3 v" VERSION
+ };
+ static const char *custom_functions[] = SQLITE3_CUSTOM_FUNCTIONS;
index 6d86cd1a7483f9add2736b1e90b745b1f8fe2c26..448521260a37a802175093873ab317063e335b4f 100644 (file)
@@ -42,7 +42,7 @@ CONFIGURE_ARGS += --with-enginesdir=/usr/lib/engines
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libp11.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11.{a,so} $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11.so* $(1)/usr/lib/
index be1945d6fd84789c58699f7752dc5dcdfdf6146e..fcafa90df12fc71f5bfc0bbee719be2622943cac 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebsockets
-PKG_VERSION:=2.4.0
-PKG_RELEASE:=1
+PKG_VERSION:=2.4.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=0dc355c1f9a660b98667cc616fa4c4fe08dacdaeff2d5cc9f74e49e9d4af2d95
+PKG_HASH:=29414be4f79f6abc0e6aadccd09a4da0f0c431e3b5691f496acd081ae6a8240c
 
 
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
diff --git a/libs/libwebsockets/patches/001-CMakeLists-build-reproducible-by-default.patch b/libs/libwebsockets/patches/001-CMakeLists-build-reproducible-by-default.patch
new file mode 100644 (file)
index 0000000..c36a81d
--- /dev/null
@@ -0,0 +1,78 @@
+From d7b6c04aaf416344332e73f49fe457013e3ccf36 Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis@fe80.eu>
+Date: Sun, 10 Dec 2017 00:54:06 +0100
+Subject: [PATCH] CMakeLists: build reproducible by default
+Merged-upstream: yes
+
+Using the build user and build hostname as part of the git hash breaks
+reproducible builds. Make this part optional, but build reproducible by
+default.
+---
+ CMakeLists.txt | 47 +++++++++++++++++++++++++++--------------------
+ 1 file changed, 27 insertions(+), 20 deletions(-)
+
+Index: libwebsockets-2.4.0/CMakeLists.txt
+===================================================================
+--- libwebsockets-2.4.0.orig/CMakeLists.txt
++++ libwebsockets-2.4.0/CMakeLists.txt
+@@ -39,26 +39,32 @@ message(STATUS "CMAKE_TOOLCHAIN_FILE='${
+ find_package(Git)
+ if(GIT_EXECUTABLE)
+       execute_process(
+-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-    COMMAND "${GIT_EXECUTABLE}" describe
+-    OUTPUT_VARIABLE GIT_HASH
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-      execute_process(
+-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-    COMMAND "whoami"
+-    OUTPUT_VARIABLE GIT_USER
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-      execute_process(
+-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-    COMMAND "hostname"
+-    OUTPUT_VARIABLE GIT_HOST
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-      string(REGEX REPLACE "([^\\])[\\]([^\\])" "\\1\\\\\\\\\\2" GIT_USER ${GIT_USER})
+-    set(LWS_BUILD_HASH ${GIT_USER}@${GIT_HOST}-${GIT_HASH})
+-    message("Git commit hash: ${LWS_BUILD_HASH}")
++              WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++              COMMAND "${GIT_EXECUTABLE}" describe
++              OUTPUT_VARIABLE GIT_HASH
++              OUTPUT_STRIP_TRAILING_WHITESPACE
++              )
++      set(LWS_BUILD_HASH ${GIT_HASH})
++
++      # appen the build user and hostname
++      if(NOT LWS_REPRODUCIBLE)
++              execute_process(
++                      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++                      COMMAND "whoami"
++                      OUTPUT_VARIABLE GIT_USER
++                      OUTPUT_STRIP_TRAILING_WHITESPACE
++                      )
++              execute_process(
++                      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++                      COMMAND "hostname"
++                      OUTPUT_VARIABLE GIT_HOST
++                      OUTPUT_STRIP_TRAILING_WHITESPACE
++                      )
++              string(REGEX REPLACE "([^\\])[\\]([^\\])" "\\1\\\\\\\\\\2" GIT_USER ${GIT_USER})
++              set(LWS_BUILD_HASH ${GIT_USER}@${GIT_HOST}-${GIT_HASH})
++      endif()
++
++      message("Git commit hash: ${LWS_BUILD_HASH}")
+ endif()
+ set(LWS_WITH_BUNDLED_ZLIB_DEFAULT OFF)
+@@ -121,6 +127,7 @@ option(LWS_AVOID_SIGPIPE_IGN "Android 7+
+ option(LWS_WITH_STATS "Keep statistics of lws internal operations" OFF)
+ option(LWS_WITH_SOCKS5 "Allow use of SOCKS5 proxy on client connections" OFF)
+ option(LWS_WITH_PEER_LIMITS "Track peers and restrict resources a single peer can allocate" OFF)
++option(LWS_REPRODUCIBLE "Build libwebsockets reproducible. It removes the build user and hostname from the build" ON)
+ macro(confirm_command CMD NOCMD)
+       find_program (HAVE_CMD_${CMD} ${CMD} )
index 8f978a793c7a20fb753cf5e90f653671d1f03262..7269cf67a1815cbb59588474119dc6884f05c8f9 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
 PKG_VERSION:=2.4.45
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
diff --git a/libs/openldap/patches/110-reproducible-builds.patch b/libs/openldap/patches/110-reproducible-builds.patch
new file mode 100644 (file)
index 0000000..2cdce8e
--- /dev/null
@@ -0,0 +1,21 @@
+Index: openldap-2.4.45/build/mkversion
+===================================================================
+--- openldap-2.4.45.orig/build/mkversion
++++ openldap-2.4.45/build/mkversion
+@@ -50,7 +50,6 @@ if test $# != 1 ; then
+ fi
+ APPLICATION=$1
+-WHOWHERE="$USER@`uname -n`:`pwd`"
+ cat << __EOF__
+ /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+@@ -72,7 +71,6 @@ static const char copyright[] =
+ "COPYING RESTRICTIONS APPLY\n";
+ $static $const char $SYMBOL[] =
+-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n"
+-"\t$WHOWHERE\n";
++"@(#) \$$PACKAGE: $APPLICATION $VERSION\$\n";
+ __EOF__
index 1c18e5d92312f0dd38f226b34dde8a7a660e6280..bc8e44ce7f67fd726440790193b3afd85c241106 100644 (file)
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mjpg-streamer
 PKG_REV:=182
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>, \
                Ted Hess <thess@kitschensync.net>
 
@@ -71,6 +71,10 @@ define Build/Prepare
     endif
 endef
 
+define Build/Configure
+    $(RM) $(PKG_BUILD_DIR)/plugins/input_uvc/uvcvideo.h
+endef
+
 ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y)
     TARGET_CFLAGS+= -DUSE_LIBV4L2
     TARGET_LDFLAGS+= -lv4l2
diff --git a/multimedia/mjpg-streamer/patches/035-remove_build_date-time.patch b/multimedia/mjpg-streamer/patches/035-remove_build_date-time.patch
new file mode 100644 (file)
index 0000000..f2d0519
--- /dev/null
@@ -0,0 +1,34 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,8 +15,8 @@ DESTDIR = /usr/local
+ # set the compiler to use
+ CC = gcc
+-SVNDEV := -D'SVN_REV="$(shell svnversion -c .)"'
+-CFLAGS += $(SVNDEV)
++#SVNDEV := -D'SVN_REV="$(shell svnversion -c .)"'
++#CFLAGS += $(SVNDEV)
+ # general compile flags, enable all warnings to make compile more verbose
+ CFLAGS += -DLINUX -D_GNU_SOURCE -Wall 
+--- a/mjpg_streamer.c
++++ b/mjpg_streamer.c
+@@ -253,15 +253,12 @@ int main(int argc, char *argv[])
+             /* v, version */
+         case 6:
+         case 7:
+-            printf("MJPG Streamer Version: %s\n" \
+-            "Compilation Date.....: %s\n" \
+-            "Compilation Time.....: %s\n",
++            printf("MJPG Streamer Version: %s\n",
+ #ifdef SVN_REV
+-            SVN_REV,
++            SVN_REV);
+ #else
+-            SOURCE_VERSION,
++            SOURCE_VERSION);
+ #endif
+-            __DATE__, __TIME__);
+             return 0;
+             break;
index b8dd6f0713864b71e9769584deda91905b75830f..cda049463bfa8203192f9b1602a64102cc6bdd9a 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cgi-io
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_LICENSE:=GPL-2.0+
 
index 7760edaf4f853c31327b3b9518ac87e9db35ac93..2bfec623b00d84b37defb4bccfcc08ff95008924 100644 (file)
@@ -117,11 +117,11 @@ out:
 }
 
 static char *
-md5sum(const char *file)
+checksum(const char *applet, size_t sumlen, const char *file)
 {
        pid_t pid;
        int fds[2];
-       static char md5[33];
+       static char chksum[65];
 
        if (pipe(fds))
                return NULL;
@@ -141,20 +141,20 @@ md5sum(const char *file)
                close(fds[0]);
                close(fds[1]);
 
-               if (execl("/bin/busybox", "/bin/busybox", "md5sum", file, NULL))
+               if (execl("/bin/busybox", "/bin/busybox", applet, file, NULL))
                        return NULL;
 
                break;
 
        default:
-               memset(md5, 0, sizeof(md5));
-               read(fds[0], md5, 32);
+               memset(chksum, 0, sizeof(chksum));
+               read(fds[0], chksum, sumlen);
                waitpid(pid, NULL, 0);
                close(fds[0]);
                close(fds[1]);
        }
 
-       return md5;
+       return chksum;
 }
 
 static char *
@@ -266,7 +266,7 @@ postdecode(char **fields, int n_fields)
 static int
 response(bool success, const char *message)
 {
-       char *md5;
+       char *chksum;
        struct stat s;
 
        printf("Status: 200 OK\r\n");
@@ -274,9 +274,22 @@ response(bool success, const char *message)
 
        if (success)
        {
-               if (!stat(st.filename, &s) && (md5 = md5sum(st.filename)) != NULL)
-                       printf("\t\"size\": %u,\n\t\"checksum\": \"%s\"\n",
-                                  (unsigned int)s.st_size, md5);
+               if (!stat(st.filename, &s))
+                       printf("\t\"size\": %u,\n", (unsigned int)s.st_size);
+               else
+                       printf("\t\"size\": null,\n");
+
+               chksum = checksum("md5sum", 32, st.filename);
+               printf("\t\"checksum\": %s%s%s,\n",
+                       chksum ? "\"" : "",
+                       chksum ? chksum : "null",
+                       chksum ? "\"" : "");
+
+               chksum = checksum("sha256sum", 64, st.filename);
+               printf("\t\"sha256sum\": %s%s%s\n",
+                       chksum ? "\"" : "",
+                       chksum ? chksum : "null",
+                       chksum ? "\"" : "");
        }
        else
        {
index a825a529de9121db435d10fe5cebdaa5085c7764..db7ba3f266454e4e2782904abbe4496dc54a3d8b 100644 (file)
@@ -8,23 +8,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cifs-utils
-PKG_VERSION:=6.4
-PKG_RELEASE:=2
+PKG_VERSION:=6.7
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://download.samba.org/pub/linux-cifs/cifs-utils/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3
+PKG_HASH:=b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab
 
 PKG_MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
 
+PKG_FIXUP:=libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/cifsmount
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-fs-cifs
+  DEPENDS:=+kmod-fs-cifs +libtalloc
   TITLE:=CIFS mount utilities
   URL:=http://wiki.samba.org/index.php/LinuxCIFS_utils
 endef
diff --git a/net/cifs-utils/patches/001-fix-musl-build.patch b/net/cifs-utils/patches/001-fix-musl-build.patch
deleted file mode 100644 (file)
index e34d4f1..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6603cef0f06c450196a1bca06bb143d8fcda5651 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Fri, 5 Dec 2014 23:19:29 +0100
-Subject: [PATCH 1/1] mtab.c: include <paths.h> for _PATH_MOUNTED
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Backported from: 6603cef0f06c450196a1bca06bb143d8fcda5651
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- mtab.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mtab.c b/mtab.c
-index 7b365b3..a662a3c 100644
---- a/mtab.c
-+++ b/mtab.c
-@@ -38,6 +38,7 @@
- #include <mntent.h>
- #include <stdlib.h>
- #include <signal.h>
-+#include <paths.h>
- #include "mount.h"
- #include "config.h"
--- 
-2.5.0
diff --git a/net/danish/Makefile b/net/danish/Makefile
new file mode 100644 (file)
index 0000000..2e3d432
--- /dev/null
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2017 Andrew McConachie
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=danish
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Andrew McConachie <andrew@depht.com>
+PKG_LICENSE:=GPL-3.0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/smutt/danish.git
+PKG_SOURCE_VERSION:=f726656a4e37c46c037f61334ac48b35b7de25be
+PKG_MIRROR_HASH:=cb0b4bb7a210091d807ee8e4a2876865f32a9bf195836eb2e1edf6c5975d1130
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=python python-setuptools
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/danish
+       SECTION:=net
+       CATEGORY:=Network
+       SUBMENU:=IP Addresses and Names
+       TITLE:=A middle box implementation of RFC 6698 for HTTPS.
+       URL:=https://github.com/smutt/danish
+       DEPENDS:=+python +python-dns +python-pcapy +python-dpkt +kmod-ipt-filter +iptables-mod-filter +dnsmasq-full
+endef
+
+define Package/danish/description
+  Danish is an experiment in middle-box DANE (RFC 6698) for HTTPS.
+  https://www.middlebox-dane.org/
+endef
+
+define Build/Compile
+       $(call Build/Compile/PyMod,,\
+               install --prefix=/usr --root="$(PKG_INSTALL_DIR)", \
+       )
+endef
+
+define Package/danish/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/danish.py $(1)/usr/sbin/danish
+       $(INSTALL_DIR) $(1)/etc/config
+       $(CP) $(PKG_BUILD_DIR)/danish.conf $(1)/etc/config/danish 
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(CP) $(PKG_BUILD_DIR)/danish.init $(1)/etc/init.d/danish
+endef
+
+$(eval $(call BuildPackage,danish))
index d20956a3e7623ed805423284e1dceb45fb066057..d4023c01fa88bd8ffe3d5b9196c10462af1f3c96 100755 (executable)
@@ -12,7 +12,7 @@ PKG_NAME:=ddns-scripts
 PKG_VERSION:=2.7.6
 # Release == build
 # increase on changes of services files or tld_names.dat
-PKG_RELEASE:=20
+PKG_RELEASE:=21
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
@@ -129,7 +129,7 @@ define Build/Compile
                -e '/^[[:space:]]*$$$$/d'       $$$$FILE; \
        done
        # compress public_suffix_list.dat
-       gzip -f9 $(PKG_BUILD_DIR)/files/public_suffix_list.dat
+       gzip -nf9 $(PKG_BUILD_DIR)/files/public_suffix_list.dat
 endef
 
 define Package/ddns-scripts/conffiles
index bf752d87492b84e58808ad4137fda3163b84e258..d8a904b181df80d41b08a51b7d884f22ee11e220 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethtool
-PKG_VERSION:=4.8
+PKG_VERSION:=4.13
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/network/ethtool
-PKG_HASH:=403dfe288e2d8031eab0be3f5d0ca9128e120d61c52c3dc434474fa026eb4a43
+PKG_HASH:=b7c1a380007d30eaf261a63b3cfc000f9d93f9eb7626dcd48b5d2a733af99cba
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
diff --git a/net/i2pd/Makefile b/net/i2pd/Makefile
new file mode 100644 (file)
index 0000000..e78e7b0
--- /dev/null
@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2015, 2016 gxcreator
+# Copyright (C) 2017 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=i2pd
+PKG_VERSION:=2.17.0
+PKG_RELEASE:=1
+PKG_BUILD_PARALLEL:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/PurpleI2P/i2pd.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_MIRROR_HASH:=d389615366e603468c6d213e6545dfea99090d4a83aac121b6e2e4e5d0aac925
+PKG_LICENSE:=BSD-3-clause
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/i2pd
+       SECTION:=net
+       CATEGORY:=Network
+       DEPENDS:=+libopenssl +boost +boost-system +boost-filesystem +boost-regex \
+                +boost-program_options +boost-date_time +libatomic +zlib
+       TITLE:=full-featured C++ implementation of I2P client
+       URL:=https://github.com/PurpleI2P/i2pd
+       MAINTAINER:=David Yang <mmyangfl@gmail.com>
+endef
+
+define Package/i2pd/description
+       I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
+       communications over I2P are anonymous and end-to-end encrypted, participants
+       don't reveal their real IP addresses.
+endef
+
+define Package/i2pd/conffiles
+       /etc/i2pd/i2pd.conf
+       /etc/i2pd/subscriptions.txt
+       /etc/i2pd/tunnels.conf
+endef
+
+MAKE_FLAGS+=USE_AESNI=no USE_AVX=no
+
+define Package/i2pd/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/i2pd $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/etc/i2pd
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/i2pd.conf $(1)/etc/i2pd
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/subscriptions.txt $(1)/etc/i2pd
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/tunnels.conf $(1)/etc/i2pd
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/i2pd.init $(1)/etc/init.d/i2pd
+endef
+
+$(eval $(call BuildPackage,i2pd))
diff --git a/net/i2pd/files/i2pd.init b/net/i2pd/files/i2pd.init
new file mode 100755 (executable)
index 0000000..36a1990
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2017 OpenWrt.org
+
+START=70
+STOP=70
+
+USE_PROCD=1
+PROG=/usr/sbin/i2pd
+
+
+start_service() {
+       procd_open_instance
+       procd_set_param command $PROG --conf=/etc/i2pd/i2pd.conf
+       procd_close_instance
+}
diff --git a/net/i2pd/patches/010-cross-compile.patch b/net/i2pd/patches/010-cross-compile.patch
new file mode 100644 (file)
index 0000000..614de4a
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/Makefile.linux   2017-11-14 03:20:41.000000000 +0800
++++ b/Makefile.linux   2017-11-29 23:55:38.919136211 +0800
+@@ -44,7 +44,7 @@
+       LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl
+       USE_AESNI := no
+ else
+-      LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
++      LDLIBS = -latomic -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
+ endif
+ # UPNP Support (miniupnpc 1.5 and higher)
index 842d188c98ecb0bc5cb3a2f06f1c2c5f62544043..e6cf46c398ae772ed16ced2a82f6a63e988ea1c1 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iodine
 PKG_VERSION:=0.7.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://code.kryo.se/iodine/
diff --git a/net/iodine/patches/101-musl-workaround-incomplete-nameser-h.patch b/net/iodine/patches/101-musl-workaround-incomplete-nameser-h.patch
new file mode 100644 (file)
index 0000000..1f075d0
--- /dev/null
@@ -0,0 +1,27 @@
+The arpa/nameser.h header of musl libc indirectly depends on the endian.h
+header but fails to explicitely include it to properly define
+`__BYTE_ORDER` and `__BIG_ENDIAN` prior to declaring the DNS `HEADER`
+structure.
+
+When both the appropriate `__BYTE_ORDER` and `__BIG_ENDIAN` defines are
+unset, the `#if __BYTE_ORDER == __BIG_ENDIAN` condition in `nameser.h`
+evaluates to true, causing it to declare a bad (big endian) DNS packet
+header structure on little endian systems.
+
+Work around this musl bug by forcibly passing `-include endian.h` through
+the `osflags` file.
+
+An upstream fix for musl libc has been submitted with
+http://www.openwall.com/lists/musl/2017/12/04/3
+
+--- a/src/osflags
++++ b/src/osflags
+@@ -27,7 +27,7 @@ cflags)
+                       echo '-Dsocklen_t=int';
+               ;;
+               Linux)
+-                      FLAGS="-D_GNU_SOURCE"
++                      FLAGS="-D_GNU_SOURCE -include endian.h"
+                       echo $FLAGS;
+               ;;
+       esac
index 3756d7e0d5d3d6519a5f0ddb40007cb5de6c687c..189ac5a14f295947cfc18aad38ea9de570ef21ee 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto
 PKG_VERSION:=1.4.14
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.txt
 
@@ -144,7 +144,7 @@ endef
 define Package/libmosquittopp
     SECTION:=libs
     CATEGORY:=Libraries
-    DEPENDS:=+libmosquitto-ssl +libstdcpp
+    DEPENDS:=libmosquitto +libstdcpp
     TITLE:= mosquitto - client c++ library
 endef
 
diff --git a/net/mosquitto/patches/100-remove-build-timestamps.patch b/net/mosquitto/patches/100-remove-build-timestamps.patch
new file mode 100644 (file)
index 0000000..c5a923f
--- /dev/null
@@ -0,0 +1,50 @@
+From ebfccff8735ca0f8b6c9e8d06f2d3efe916affaf Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis@fe80.eu>
+Date: Sun, 10 Dec 2017 01:23:29 +0100
+Subject: [PATCH] fix reproducible builds by removing build timestamp
+
+Build timestamps prevents reproducible builds. [0]
+
+[0] https://reproducible-builds.org/docs/timestamps/
+
+Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
+---
+ src/conf.c      | 2 +-
+ src/mosquitto.c | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/conf.c b/src/conf.c
+index a3e233de..e8162031 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -309,7 +309,7 @@ void mqtt3_config_cleanup(struct mqtt3_config *config)
+ static void print_usage(void)
+ {
+-      printf("mosquitto version %s (build date %s)\n\n", VERSION, TIMESTAMP);
++      printf("mosquitto version %s\n\n", VERSION);
+       printf("mosquitto is an MQTT v3.1.1/v3.1 broker.\n\n");
+       printf("Usage: mosquitto [-c config_file] [-d] [-h] [-p port]\n\n");
+       printf(" -c : specify the broker config file.\n");
+diff --git a/src/mosquitto.c b/src/mosquitto.c
+index b28150ce..dcf3a72a 100644
+--- a/src/mosquitto.c
++++ b/src/mosquitto.c
+@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
+               rc = 1;
+               return rc;
+       }
+-      _mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "mosquitto version %s (build date %s) starting", VERSION, TIMESTAMP);
++      _mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "mosquitto version %s starting", VERSION);
+       if(config.config_file){
+               _mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "Config loaded from %s.", config.config_file);
+       }else{
+@@ -308,8 +308,6 @@ int main(int argc, char *argv[])
+               /* Set static $SYS messages */
+               snprintf(buf, 1024, "mosquitto version %s", VERSION);
+               mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/version", 2, strlen(buf), buf, 1);
+-              snprintf(buf, 1024, "%s", TIMESTAMP);
+-              mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/timestamp", 2, strlen(buf), buf, 1);
+       }
+ #endif
index 3085a6ff71f71688c3de43211c6df4a1523c78f5..4cdaed9ee350e6cbab996299a8c117eeabdeecf1 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
-PKG_VERSION:=2.6.8
+PKG_VERSION:=2.6.9
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
 PKG_LICENSE:=GPLv2
index c24db3cae1c40dce08b8dbbb06973175e37bc0fb..05ee9eedfee46dddddaabbcaa0dcbb19aff8f98e 100644 (file)
@@ -10,6 +10,7 @@ CONNTRACK_FILE="/proc/net/nf_conntrack"
 
 MWAN3_STATUS_DIR="/var/run/mwan3"
 MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
+DEFAULT_LOWEST_METRIC=256
 
 [ -d $MWAN3_STATUS_DIR ] || mkdir -p $MWAN3_STATUS_DIR/iface_state
 # mwan3's MARKing mask (at least 3 bits should be set)
@@ -480,6 +481,7 @@ mwan3_set_policy()
        config_get weight $1 weight 1
 
        [ -n "$iface" ] || return 0
+       [ "$metric" -gt $DEFAULT_LOWEST_METRIC ] && $LOG warn "Member interface $iface has >$DEFAULT_LOWEST_METRIC metric. Not appending to policy" && return 0
 
        mwan3_get_iface_id id $iface
 
@@ -587,10 +589,10 @@ mwan3_create_policies_iptables()
                esac
        done
 
-       lowest_metric_v4=256
+       lowest_metric_v4=$DEFAULT_LOWEST_METRIC
        total_weight_v4=0
 
-       lowest_metric_v6=256
+       lowest_metric_v6=$DEFAULT_LOWEST_METRIC
        total_weight_v6=0
 
        config_list_foreach $1 use_member mwan3_set_policy
index 9aa83d155fe3fdec858448a63e5ecaf13d3c36ce..c8ce443ccbb4905276bd682999280524dbf983e0 100644 (file)
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nlbwmon
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/jow-/nlbwmon.git
-PKG_SOURCE_DATE:=2017-08-02
-PKG_SOURCE_VERSION:=32fc0925cbc30a4a8f71392e976aa94b586c4086
-PKG_MIRROR_HASH:=caedb66cf6dcbdcee0d1525923e203d003ef15f34a13a328686794666f16171f
+PKG_SOURCE_DATE:=2017-12-05
+PKG_SOURCE_VERSION:=75accd647459a8a4167f9baa402d116cad41caa9
+PKG_MIRROR_HASH:=821572fdd11bba4a62ecea0b0ddee24645d2ceccdfe7a83dfe5f5edea433ef02
 
 CMAKE_INSTALL:=1
 
@@ -18,6 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+CMAKE_OPTIONS += -DLIBNL_LIBRARY_TINY=ON
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
 
 define Package/nlbwmon
index e058fe0eaad4a80898aeb16e4de969f360937216..2c9528c5dd8090e381b0c2fd65c886a982c93a17 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2006-2015 OpenWrt.org
-# Copyright (C) 2015 Christian Beier <dontmind@freeshell.org>
+# Copyright (C) 2015-2017 Christian Beier <dontmind@freeshell.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,15 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ola
-PKG_VERSION:=0.10.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.10.5
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OpenLightingProject/ola.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5b86f5802e2e5b23c6a010dc8d10788e6dc57614
+PKG_SOURCE_VERSION:=32db3c49d435398d017c6b5c0b25e02a7a831f5c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=626ebac2f68ea368c5886f12364d32d34fa59d1cd3b870bacedcca74f968e74c
+PKG_MIRROR_HASH:=11ed6540bd667c1662d91de93a260a9a63a98725851f768647e2b9b2efe1ae34
 PKG_LICENSE:=LGPL-2.1+
 
 PKG_FIXUP:=libtool
diff --git a/net/ola/patches/001-Eliminate-protobuf-AddDescriptors-call.patch b/net/ola/patches/001-Eliminate-protobuf-AddDescriptors-call.patch
new file mode 100644 (file)
index 0000000..a7ac379
--- /dev/null
@@ -0,0 +1,91 @@
+From d7f13fdc516ffa36b16b89e7f398a8a36b4188d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christoph=20M=C3=BCllner?= <christophm30@gmail.com>
+Date: Sat, 2 Dec 2017 00:08:55 +0100
+Subject: [PATCH 1/6] Eliminate protobuf AddDescriptors() call.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Eliminating protobuf's AddDescriptors() calls enabled
+forward-compatibility with libprotobuf. That allows to
+run OLA on recent Linux distrubutions.
+
+Tested on x86_64 running Fedora 27 with protobuf 3.3.1
+in combination with QLC+ and a uDMX controller.
+
+See #1192.
+
+Signed-off-by: Christoph Müllner <christophm30@gmail.com>
+---
+ config/ola.m4               | 3 ---
+ protoc/CppFileGenerator.cpp | 8 --------
+ protoc/GeneratorHelpers.cpp | 5 -----
+ protoc/GeneratorHelpers.h   | 3 ---
+ 4 files changed, 19 deletions(-)
+
+diff --git a/config/ola.m4 b/config/ola.m4
+index 6080932e9..d3b8cc8f8 100644
+--- a/config/ola.m4
++++ b/config/ola.m4
+@@ -24,9 +24,6 @@ AC_DEFUN([PROTOBUF_SUPPORT],
+ AC_REQUIRE_CPP()
+ PKG_CHECK_MODULES(libprotobuf, [protobuf >= $1])
+-PKG_CHECK_MODULES(libprotobuf2, [protobuf < 3.2], [],
+-                  [AC_MSG_ERROR([OLA currently requires protobuf < 3.2, see issue 1192])])
+-
+ AC_SUBST([libprotobuf_CFLAGS])
+ AC_ARG_WITH([protoc],
+diff --git a/protoc/CppFileGenerator.cpp b/protoc/CppFileGenerator.cpp
+index 518c17879..e7dd95ccb 100644
+--- a/protoc/CppFileGenerator.cpp
++++ b/protoc/CppFileGenerator.cpp
+@@ -196,14 +196,6 @@ void FileGenerator::GenerateBuildDescriptors(Printer* printer) {
+       "assigndescriptorsname", GlobalAssignDescriptorsName(m_output_name));
+     printer->Indent();
+-    // Make sure the file has found its way into the pool.  If a descriptor
+-    // is requested *during* static init then AddDescriptors() may not have
+-    // been called yet, so we call it manually.  Note that it's fine if
+-    // AddDescriptors() is called multiple times.
+-    printer->Print(
+-      "$adddescriptorsname$();\n",
+-      "adddescriptorsname", GlobalAddDescriptorsName(m_file->name()));
+-
+     // Get the file's descriptor from the pool.
+     printer->Print(
+       "const ::google::protobuf::FileDescriptor* file =\n"
+diff --git a/protoc/GeneratorHelpers.cpp b/protoc/GeneratorHelpers.cpp
+index 19609181e..6f619b5c0 100644
+--- a/protoc/GeneratorHelpers.cpp
++++ b/protoc/GeneratorHelpers.cpp
+@@ -104,11 +104,6 @@ string FilenameIdentifier(const string& filename) {
+   return result;
+ }
+-// Return the name of the AddDescriptors() function for a given file.
+-string GlobalAddDescriptorsName(const string& filename) {
+-  return "protobuf_AddDesc_" + FilenameIdentifier(filename);
+-}
+-
+ // Return the name of the AssignDescriptors() function for a given file.
+ string GlobalAssignDescriptorsName(const string& filename) {
+   return "protobuf_AssignDesc_" + FilenameIdentifier(filename);
+diff --git a/protoc/GeneratorHelpers.h b/protoc/GeneratorHelpers.h
+index 35efdbb04..fa91a915d 100644
+--- a/protoc/GeneratorHelpers.h
++++ b/protoc/GeneratorHelpers.h
+@@ -67,9 +67,6 @@ string StripProto(const string& filename);
+ // Convert a file name into a valid identifier.
+ string FilenameIdentifier(const string& filename);
+-// Return the name of the AddDescriptors() function for a given file.
+-string GlobalAddDescriptorsName(const string& filename);
+-
+ // Return the name of the AssignDescriptors() function for a given file.
+ string GlobalAssignDescriptorsName(const string& filename);
+-- 
+2.11.0
+
diff --git a/net/ola/patches/001-include-endian_h.patch b/net/ola/patches/001-include-endian_h.patch
deleted file mode 100644 (file)
index 784f10c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/common/network/NetworkUtils.cpp b/common/network/NetworkUtils.cpp
-index 3914818..094a311 100644
---- a/common/network/NetworkUtils.cpp
-+++ b/common/network/NetworkUtils.cpp
-@@ -39,6 +39,10 @@ typedef uint32_t in_addr_t;
- #include <resolv.h>
- #endif
-+#ifdef HAVE_ENDIAN_H
-+#include <endian.h>
-+#endif
-+
- #if defined(HAVE_LINUX_NETLINK_H) && defined(HAVE_LINUX_RTNETLINK_H)
- #define USE_NETLINK_FOR_DEFAULT_ROUTE 1
- #include <linux/netlink.h>
diff --git a/net/ola/patches/003-Make-DNS-SD-functionality-optional-at-build-time.patch b/net/ola/patches/003-Make-DNS-SD-functionality-optional-at-build-time.patch
deleted file mode 100644 (file)
index 84878a1..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From a88d6d31fc5a04be4378095e03b4aac133954026 Mon Sep 17 00:00:00 2001
-From: Christian Beier <dontmind@freeshell.org>
-Date: Tue, 15 Mar 2016 15:09:25 +0100
-Subject: [PATCH] Make DNS-SD functionality optional at build time.
-
-When building for embedded systems, for instance, we
-want to limit dependencies to a minimum and it seems
-that OLA is able to perform its core tasks without
-DNS-SD perfectly fine.
-
-Signed-off-by: Christian Beier <dontmind@freeshell.org>
----
- configure.ac | 27 +++++++++++++++------------
- 1 file changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6654354..0d1947c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,23 +411,26 @@ AS_IF([test "x$use_ossp_uuid" = xyes],
- # DNS-SD support
- # We use either avahi or the Apple DNS-SD library.
--
--# dns_sd
--AC_CHECK_HEADER(
--  [dns_sd.h],
--  [AC_SEARCH_LIBS(DNSServiceRegister, [dns_sd], [have_dnssd="yes"])])
-+AC_ARG_WITH(dns-sd,
-+[AS_HELP_STRING([--without-dns-sd], [disable DNS-SD support])],,)
-+if test "x$with_dns_sd" != "xno"; then
-+      # dns_sd
-+      AC_CHECK_HEADER(
-+        [dns_sd.h],
-+        [AC_SEARCH_LIBS(DNSServiceRegister, [dns_sd], [have_dnssd="yes"])])
-+
-+      # avahi
-+      PKG_CHECK_MODULES(
-+        avahi,
-+        [avahi-client],
-+        [have_avahi="yes"],
-+        [true])
-+fi
- AS_IF([test "x$have_dnssd" = xyes],
-       [AC_DEFINE([HAVE_DNSSD], [1], [Defined to use Bonjour DNS_SD])])
- AM_CONDITIONAL([HAVE_DNSSD], [test "x$have_dnssd" = xyes])
--# avahi
--PKG_CHECK_MODULES(
--  avahi,
--  [avahi-client],
--  [have_avahi="yes"],
--  [true])
--
- AS_IF([test "x$have_avahi" = xyes],
-       [AC_DEFINE([HAVE_AVAHI], [1], [Defined to use Avahi])])
- AM_CONDITIONAL([HAVE_AVAHI], [test "x$have_avahi" = xyes])
--- 
-2.1.4
-
index 4e70f5a5e85664b50d8fb8550de418fcf58b09c7..604a00557196de6c1aab1d40f7436826f161fd14 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openconnect
 PKG_VERSION:=7.08
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/net/openconnect/patches/0001-Fix-compilation-with-libp11-version-0.4.7.patch b/net/openconnect/patches/0001-Fix-compilation-with-libp11-version-0.4.7.patch
new file mode 100644 (file)
index 0000000..c6e139a
--- /dev/null
@@ -0,0 +1,50 @@
+From 03ecd34e0137b3f0bf0d2fc3ab7f7d8b3682785e Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <yszhou4tech@gmail.com>
+Date: Thu, 14 Dec 2017 18:03:35 +0800
+Subject: [PATCH] Fix compilation with libp11 version >= 0.4.7
+
+libp11 0.4.7 renamed then dropped macro definition in commits
+
+ 4f0fce4: Error reporting fixes
+ e4c641b: PKCS11 errors separated into P11 and CKR
+
+This change assumes that libp11 will restore compatibility by bringing
+back old forms of macro definition
+
+Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
+---
+ openssl-pkcs11.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/openssl-pkcs11.c b/openssl-pkcs11.c
+index 61da123..ba7e491 100644
+--- a/openssl-pkcs11.c
++++ b/openssl-pkcs11.c
+@@ -30,6 +30,24 @@
+ #include <libp11.h>
+ #include <p11-kit/pkcs11.h>
++#ifndef ERR_LIB_PKCS11
++#     if defined(ERR_LIB_CKR)
++#             define ERR_LIB_PKCS11 ERR_LIB_CKR
++#     elif defined(ERR_LIB_USER)
++#             define ERR_LIB_PKCS11 ERR_LIB_USER
++#     else
++#             error undefined macro ERR_LIB_PKCS11
++#     endif
++#endif
++
++#ifndef PKCS11_F_PKCS11_LOGIN
++#     if defined(CKR_F_PKCS11_LOGIN)
++#             define PKCS11_F_PKCS11_LOGIN CKR_F_PKCS11_LOGIN
++#     else
++#             error undefined macro PKCS11_F_PKCS11_LOGIN
++#     endif
++#endif
++
+ static PKCS11_CTX *pkcs11_ctx(struct openconnect_info *vpninfo)
+ {
+       PKCS11_CTX *ctx;
+-- 
+1.8.3.1
+
index 5b23c3314e7409e18ca0c7ba52d30eb16d560bac..006c16f64a1258a8b2b35d6a26eb711d0bb41b36 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rsync
 PKG_VERSION:=3.1.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.samba.org/pub/rsync/src
diff --git a/net/rsync/patches/000-remove-configure.sh.patch b/net/rsync/patches/000-remove-configure.sh.patch
new file mode 100644 (file)
index 0000000..173e682
--- /dev/null
@@ -0,0 +1,10362 @@
+commit af5bb175ec78d97d34e0c140cfbb1039c52c7159
+Author: Maxim Storchak <m.storchak@gmail.com>
+Date:   Thu Dec 7 22:48:00 2017 +0200
+
+    rm
+
+diff --git a/configure.sh b/configure.sh
+deleted file mode 100755
+index d6e9c8d..0000000
+--- a/configure.sh
++++ /dev/null
+@@ -1,10350 +0,0 @@
+-#! /bin/sh
+-# Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.69 for rsync 3.1.2.
+-#
+-# Report bugs to <http://rsync.samba.org/bugzilla.html>.
+-#
+-#
+-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+-#
+-#
+-# This configure script is free software; the Free Software Foundation
+-# gives unlimited permission to copy, distribute and modify it.
+-## -------------------- ##
+-## M4sh Initialization. ##
+-## -------------------- ##
+-
+-# Be more Bourne compatible
+-DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+-  emulate sh
+-  NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in #(
+-  *posix*) :
+-    set -o posix ;; #(
+-  *) :
+-     ;;
+-esac
+-fi
+-
+-
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-# Prefer a ksh shell builtin over an external printf program on Solaris,
+-# but without wasting forks for bash or zsh.
+-if test -z "$BASH_VERSION$ZSH_VERSION" \
+-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+-  as_echo='print -r --'
+-  as_echo_n='print -rn --'
+-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+-  as_echo='printf %s\n'
+-  as_echo_n='printf %s'
+-else
+-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+-    as_echo_n='/usr/ucb/echo -n'
+-  else
+-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+-    as_echo_n_body='eval
+-      arg=$1;
+-      case $arg in #(
+-      *"$as_nl"*)
+-      expr "X$arg" : "X\\(.*\\)$as_nl";
+-      arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+-      esac;
+-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+-    '
+-    export as_echo_n_body
+-    as_echo_n='sh -c $as_echo_n_body as_echo'
+-  fi
+-  export as_echo_body
+-  as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  PATH_SEPARATOR=:
+-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+-      PATH_SEPARATOR=';'
+-  }
+-fi
+-
+-
+-# IFS
+-# We need space, tab and new line, in precisely that order.  Quoting is
+-# there to prevent editors from complaining about space-tab.
+-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+-# splitting by setting IFS to empty value.)
+-IFS=" ""      $as_nl"
+-
+-# Find who we are.  Look in the path if we contain no directory separator.
+-as_myself=
+-case $0 in #((
+-  *[\\/]* ) as_myself=$0 ;;
+-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-  done
+-IFS=$as_save_IFS
+-
+-     ;;
+-esac
+-# We did not find ourselves, most probably we were run as `sh COMMAND'
+-# in which case we are not to be found in the path.
+-if test "x$as_myself" = x; then
+-  as_myself=$0
+-fi
+-if test ! -f "$as_myself"; then
+-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+-  exit 1
+-fi
+-
+-# Unset variables that we do not need and which cause bugs (e.g. in
+-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+-# suppresses any "Segmentation fault" message there.  '((' could
+-# trigger a bug in pdksh 5.2.14.
+-for as_var in BASH_ENV ENV MAIL MAILPATH
+-do eval test x\${$as_var+set} = xset \
+-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+-done
+-PS1='$ '
+-PS2='> '
+-PS4='+ '
+-
+-# NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
+-
+-# CDPATH.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-# Use a proper internal environment variable to ensure we don't fall
+-  # into an infinite loop, continuously re-executing ourselves.
+-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+-    _as_can_reexec=no; export _as_can_reexec;
+-    # We cannot yet assume a decent shell, so we have to provide a
+-# neutralization value for shells without unset; and this also
+-# works around shells that cannot unset nonexistent variables.
+-# Preserve -v and -x to the replacement shell.
+-BASH_ENV=/dev/null
+-ENV=/dev/null
+-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-case $- in # ((((
+-  *v*x* | *x*v* ) as_opts=-vx ;;
+-  *v* ) as_opts=-v ;;
+-  *x* ) as_opts=-x ;;
+-  * ) as_opts= ;;
+-esac
+-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+-# Admittedly, this is quite paranoid, since all the known shells bail
+-# out after a failed `exec'.
+-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+-as_fn_exit 255
+-  fi
+-  # We don't want this to propagate to other subprocesses.
+-          { _as_can_reexec=; unset _as_can_reexec;}
+-if test "x$CONFIG_SHELL" = x; then
+-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+-  emulate sh
+-  NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case \`(set -o) 2>/dev/null\` in #(
+-  *posix*) :
+-    set -o posix ;; #(
+-  *) :
+-     ;;
+-esac
+-fi
+-"
+-  as_required="as_fn_return () { (exit \$1); }
+-as_fn_success () { as_fn_return 0; }
+-as_fn_failure () { as_fn_return 1; }
+-as_fn_ret_success () { return 0; }
+-as_fn_ret_failure () { return 1; }
+-
+-exitcode=0
+-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+-
+-else
+-  exitcode=1; echo positional parameters were not saved.
+-fi
+-test x\$exitcode = x0 || exit 1
+-test -x / || exit 1"
+-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+-test \$(( 1 + 1 )) = 2 || exit 1"
+-  if (eval "$as_required") 2>/dev/null; then :
+-  as_have_required=yes
+-else
+-  as_have_required=no
+-fi
+-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+-
+-else
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_found=false
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  as_found=:
+-  case $as_dir in #(
+-       /*)
+-         for as_base in sh bash ksh sh5; do
+-           # Try only shells that exist, to save several forks.
+-           as_shell=$as_dir/$as_base
+-           if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+-                  { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+-  CONFIG_SHELL=$as_shell as_have_required=yes
+-                 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+-  break 2
+-fi
+-fi
+-         done;;
+-       esac
+-  as_found=false
+-done
+-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+-            { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+-  CONFIG_SHELL=$SHELL as_have_required=yes
+-fi; }
+-IFS=$as_save_IFS
+-
+-
+-      if test "x$CONFIG_SHELL" != x; then :
+-  export CONFIG_SHELL
+-             # We cannot yet assume a decent shell, so we have to provide a
+-# neutralization value for shells without unset; and this also
+-# works around shells that cannot unset nonexistent variables.
+-# Preserve -v and -x to the replacement shell.
+-BASH_ENV=/dev/null
+-ENV=/dev/null
+-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-case $- in # ((((
+-  *v*x* | *x*v* ) as_opts=-vx ;;
+-  *v* ) as_opts=-v ;;
+-  *x* ) as_opts=-x ;;
+-  * ) as_opts= ;;
+-esac
+-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+-# Admittedly, this is quite paranoid, since all the known shells bail
+-# out after a failed `exec'.
+-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+-exit 255
+-fi
+-
+-    if test x$as_have_required = xno; then :
+-  $as_echo "$0: This script requires a shell more modern than all"
+-  $as_echo "$0: the shells that I found on your system."
+-  if test x${ZSH_VERSION+set} = xset ; then
+-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+-  else
+-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+-$0: http://rsync.samba.org/bugzilla.html about your system,
+-$0: including any error possibly output before this
+-$0: message. Then install a modern shell, or manually run
+-$0: the script under such a shell if you do have one."
+-  fi
+-  exit 1
+-fi
+-fi
+-fi
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-export SHELL
+-# Unset more variables known to interfere with behavior of common tools.
+-CLICOLOR_FORCE= GREP_OPTIONS=
+-unset CLICOLOR_FORCE GREP_OPTIONS
+-
+-## --------------------- ##
+-## M4sh Shell Functions. ##
+-## --------------------- ##
+-# as_fn_unset VAR
+-# ---------------
+-# Portably unset VAR.
+-as_fn_unset ()
+-{
+-  { eval $1=; unset $1;}
+-}
+-as_unset=as_fn_unset
+-
+-# as_fn_set_status STATUS
+-# -----------------------
+-# Set $? to STATUS, without forking.
+-as_fn_set_status ()
+-{
+-  return $1
+-} # as_fn_set_status
+-
+-# as_fn_exit STATUS
+-# -----------------
+-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+-as_fn_exit ()
+-{
+-  set +e
+-  as_fn_set_status $1
+-  exit $1
+-} # as_fn_exit
+-
+-# as_fn_mkdir_p
+-# -------------
+-# Create "$as_dir" as a directory, including parents if necessary.
+-as_fn_mkdir_p ()
+-{
+-
+-  case $as_dir in #(
+-  -*) as_dir=./$as_dir;;
+-  esac
+-  test -d "$as_dir" || eval $as_mkdir_p || {
+-    as_dirs=
+-    while :; do
+-      case $as_dir in #(
+-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+-      *) as_qdir=$as_dir;;
+-      esac
+-      as_dirs="'$as_qdir' $as_dirs"
+-      as_dir=`$as_dirname -- "$as_dir" ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-       X"$as_dir" : 'X\(//\)[^/]' \| \
+-       X"$as_dir" : 'X\(//\)$' \| \
+-       X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)[^/].*/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\).*/{
+-          s//\1/
+-          q
+-        }
+-        s/.*/./; q'`
+-      test -d "$as_dir" && break
+-    done
+-    test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+-
+-
+-} # as_fn_mkdir_p
+-
+-# as_fn_executable_p FILE
+-# -----------------------
+-# Test if FILE is an executable regular file.
+-as_fn_executable_p ()
+-{
+-  test -f "$1" && test -x "$1"
+-} # as_fn_executable_p
+-# as_fn_append VAR VALUE
+-# ----------------------
+-# Append the text in VALUE to the end of the definition contained in VAR. Take
+-# advantage of any shell optimizations that allow amortized linear growth over
+-# repeated appends, instead of the typical quadratic growth present in naive
+-# implementations.
+-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+-  eval 'as_fn_append ()
+-  {
+-    eval $1+=\$2
+-  }'
+-else
+-  as_fn_append ()
+-  {
+-    eval $1=\$$1\$2
+-  }
+-fi # as_fn_append
+-
+-# as_fn_arith ARG...
+-# ------------------
+-# Perform arithmetic evaluation on the ARGs, and store the result in the
+-# global $as_val. Take advantage of shells that can avoid forks. The arguments
+-# must be portable across $(()) and expr.
+-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+-  eval 'as_fn_arith ()
+-  {
+-    as_val=$(( $* ))
+-  }'
+-else
+-  as_fn_arith ()
+-  {
+-    as_val=`expr "$@" || test $? -eq 1`
+-  }
+-fi # as_fn_arith
+-
+-
+-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+-# ----------------------------------------
+-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with STATUS, using 1 if that was 0.
+-as_fn_error ()
+-{
+-  as_status=$1; test $as_status -eq 0 && as_status=1
+-  if test "$4"; then
+-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+-  fi
+-  $as_echo "$as_me: error: $2" >&2
+-  as_fn_exit $as_status
+-} # as_fn_error
+-
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+-  as_basename=basename
+-else
+-  as_basename=false
+-fi
+-
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+-  as_dirname=dirname
+-else
+-  as_dirname=false
+-fi
+-
+-as_me=`$as_basename -- "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-       X"$0" : 'X\(//\)$' \| \
+-       X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\/\(\/\/\)$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\/\(\/\).*/{
+-          s//\1/
+-          q
+-        }
+-        s/.*/./; q'`
+-
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-
+-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+-  sed -n '
+-    p
+-    /[$]LINENO/=
+-  ' <$as_myself |
+-    sed '
+-      s/[$]LINENO.*/&-/
+-      t lineno
+-      b
+-      :lineno
+-      N
+-      :loop
+-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+-      t loop
+-      s/-\n.*//
+-    ' >$as_me.lineno &&
+-  chmod +x "$as_me.lineno" ||
+-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+-
+-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+-  # already done that, so ensure we don't try to do so again and fall
+-  # in an infinite loop.  This has already happened in practice.
+-  _as_can_reexec=no; export _as_can_reexec
+-  # Don't try to exec as it changes $[0], causing all sort of problems
+-  # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensitive to this).
+-  . "./$as_me.lineno"
+-  # Exit status is that of the last command.
+-  exit
+-}
+-
+-ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in #(((((
+--n*)
+-  case `echo 'xy\c'` in
+-  *c*) ECHO_T='       ';;     # ECHO_T is single tab character.
+-  xy)  ECHO_C='\c';;
+-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+-       ECHO_T='       ';;
+-  esac;;
+-*)
+-  ECHO_N='-n';;
+-esac
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-if test -d conf$$.dir; then
+-  rm -f conf$$.dir/conf$$.file
+-else
+-  rm -f conf$$.dir
+-  mkdir conf$$.dir 2>/dev/null
+-fi
+-if (echo >conf$$.file) 2>/dev/null; then
+-  if ln -s conf$$.file conf$$ 2>/dev/null; then
+-    as_ln_s='ln -s'
+-    # ... but there are two gotchas:
+-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -pR'.
+-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -pR'
+-  elif ln conf$$.file conf$$ 2>/dev/null; then
+-    as_ln_s=ln
+-  else
+-    as_ln_s='cp -pR'
+-  fi
+-else
+-  as_ln_s='cp -pR'
+-fi
+-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+-rmdir conf$$.dir 2>/dev/null
+-
+-if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p='mkdir -p "$as_dir"'
+-else
+-  test -d ./-p && rmdir ./-p
+-  as_mkdir_p=false
+-fi
+-
+-as_test_x='test -x'
+-as_executable_p=as_fn_executable_p
+-
+-# Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+-
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+-
+-
+-test -n "$DJDIR" || exec 7<&0 </dev/null
+-exec 6>&1
+-
+-# Name of the host.
+-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+-# so uname gets run too.
+-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+-
+-#
+-# Initializations.
+-#
+-ac_default_prefix=/usr/local
+-ac_clean_files=
+-ac_config_libobj_dir=.
+-LIBOBJS=
+-cross_compiling=no
+-subdirs=
+-MFLAGS=
+-MAKEFLAGS=
+-
+-# Identity of this package.
+-PACKAGE_NAME='rsync'
+-PACKAGE_TARNAME='rsync'
+-PACKAGE_VERSION='3.1.2'
+-PACKAGE_STRING='rsync 3.1.2'
+-PACKAGE_BUGREPORT='http://rsync.samba.org/bugzilla.html'
+-PACKAGE_URL=''
+-
+-ac_unique_file="byteorder.h"
+-ac_config_libobj_dir=lib
+-# Factoring default headers for most tests.
+-ac_includes_default="\
+-#include <stdio.h>
+-#ifdef HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-#ifdef HAVE_SYS_STAT_H
+-# include <sys/stat.h>
+-#endif
+-#ifdef STDC_HEADERS
+-# include <stdlib.h>
+-# include <stddef.h>
+-#else
+-# ifdef HAVE_STDLIB_H
+-#  include <stdlib.h>
+-# endif
+-#endif
+-#ifdef HAVE_STRING_H
+-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#endif
+-#ifdef HAVE_STRINGS_H
+-# include <strings.h>
+-#endif
+-#ifdef HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#endif
+-#ifdef HAVE_STDINT_H
+-# include <stdint.h>
+-#endif
+-#ifdef HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif"
+-
+-ac_header_list=
+-ac_subst_vars='LTLIBOBJS
+-STUNNEL4
+-STUNNEL
+-MAKE_MAN
+-BUILD_ZLIB
+-BUILD_POPT
+-CC_SHOBJ_FLAG
+-OBJ_RESTORE
+-OBJ_SAVE
+-ALLOCA
+-LIBOBJS
+-FAKEROOT_PATH
+-SHELL_PATH
+-HAVE_YODL2MAN
+-HAVE_REMSH
+-PERL
+-MKDIR_P
+-INSTALL_DATA
+-INSTALL_SCRIPT
+-INSTALL_PROGRAM
+-EGREP
+-GREP
+-CPP
+-OBJEXT
+-EXEEXT
+-ac_ct_CC
+-CPPFLAGS
+-LDFLAGS
+-CFLAGS
+-CC
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+-RSYNC_VERSION
+-target_alias
+-host_alias
+-build_alias
+-LIBS
+-ECHO_T
+-ECHO_N
+-ECHO_C
+-DEFS
+-mandir
+-localedir
+-libdir
+-psdir
+-pdfdir
+-dvidir
+-htmldir
+-infodir
+-docdir
+-oldincludedir
+-includedir
+-localstatedir
+-sharedstatedir
+-sysconfdir
+-datadir
+-datarootdir
+-libexecdir
+-sbindir
+-bindir
+-program_transform_name
+-prefix
+-exec_prefix
+-PACKAGE_URL
+-PACKAGE_BUGREPORT
+-PACKAGE_STRING
+-PACKAGE_VERSION
+-PACKAGE_TARNAME
+-PACKAGE_NAME
+-PATH_SEPARATOR
+-SHELL'
+-ac_subst_files=''
+-ac_user_opts='
+-enable_option_checking
+-enable_debug
+-enable_profile
+-enable_maintainer_mode
+-with_included_popt
+-with_included_zlib
+-with_protected_args
+-with_rsync_path
+-with_rsyncd_conf
+-with_rsh
+-with_nobody_group
+-enable_largefile
+-enable_ipv6
+-enable_locale
+-enable_iconv_open
+-enable_iconv
+-enable_acl_support
+-enable_xattr_support
+-'
+-      ac_precious_vars='build_alias
+-host_alias
+-target_alias
+-CC
+-CFLAGS
+-LDFLAGS
+-LIBS
+-CPPFLAGS
+-CPP'
+-
+-
+-# Initialize some variables set by options.
+-ac_init_help=
+-ac_init_version=false
+-ac_unrecognized_opts=
+-ac_unrecognized_sep=
+-# The variables have the same names as the options, with
+-# dashes changed to underlines.
+-cache_file=/dev/null
+-exec_prefix=NONE
+-no_create=
+-no_recursion=
+-prefix=NONE
+-program_prefix=NONE
+-program_suffix=NONE
+-program_transform_name=s,x,x,
+-silent=
+-site=
+-srcdir=
+-verbose=
+-x_includes=NONE
+-x_libraries=NONE
+-
+-# Installation directory options.
+-# These are left unexpanded so users can "make install exec_prefix=/foo"
+-# and all the variables that are supposed to be based on exec_prefix
+-# by default will actually change.
+-# Use braces instead of parens because sh, perl, etc. also accept them.
+-# (The list follows the same order as the GNU Coding Standards.)
+-bindir='${exec_prefix}/bin'
+-sbindir='${exec_prefix}/sbin'
+-libexecdir='${exec_prefix}/libexec'
+-datarootdir='${prefix}/share'
+-datadir='${datarootdir}'
+-sysconfdir='${prefix}/etc'
+-sharedstatedir='${prefix}/com'
+-localstatedir='${prefix}/var'
+-includedir='${prefix}/include'
+-oldincludedir='/usr/include'
+-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+-infodir='${datarootdir}/info'
+-htmldir='${docdir}'
+-dvidir='${docdir}'
+-pdfdir='${docdir}'
+-psdir='${docdir}'
+-libdir='${exec_prefix}/lib'
+-localedir='${datarootdir}/locale'
+-mandir='${datarootdir}/man'
+-
+-ac_prev=
+-ac_dashdash=
+-for ac_option
+-do
+-  # If the previous option needs an argument, assign it.
+-  if test -n "$ac_prev"; then
+-    eval $ac_prev=\$ac_option
+-    ac_prev=
+-    continue
+-  fi
+-
+-  case $ac_option in
+-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+-  *=)   ac_optarg= ;;
+-  *)    ac_optarg=yes ;;
+-  esac
+-
+-  # Accept the important Cygnus configure options, so we can diagnose typos.
+-
+-  case $ac_dashdash$ac_option in
+-  --)
+-    ac_dashdash=yes ;;
+-
+-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+-    ac_prev=bindir ;;
+-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+-    bindir=$ac_optarg ;;
+-
+-  -build | --build | --buil | --bui | --bu)
+-    ac_prev=build_alias ;;
+-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+-    build_alias=$ac_optarg ;;
+-
+-  -cache-file | --cache-file | --cache-fil | --cache-fi \
+-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+-    ac_prev=cache_file ;;
+-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+-    cache_file=$ac_optarg ;;
+-
+-  --config-cache | -C)
+-    cache_file=config.cache ;;
+-
+-  -datadir | --datadir | --datadi | --datad)
+-    ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+-    datadir=$ac_optarg ;;
+-
+-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+-  | --dataroo | --dataro | --datar)
+-    ac_prev=datarootdir ;;
+-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+-    datarootdir=$ac_optarg ;;
+-
+-  -disable-* | --disable-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error $? "invalid feature name: $ac_useropt"
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"enable_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+-       ac_unrecognized_sep=', ';;
+-    esac
+-    eval enable_$ac_useropt=no ;;
+-
+-  -docdir | --docdir | --docdi | --doc | --do)
+-    ac_prev=docdir ;;
+-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+-    docdir=$ac_optarg ;;
+-
+-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+-    ac_prev=dvidir ;;
+-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+-    dvidir=$ac_optarg ;;
+-
+-  -enable-* | --enable-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error $? "invalid feature name: $ac_useropt"
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"enable_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+-       ac_unrecognized_sep=', ';;
+-    esac
+-    eval enable_$ac_useropt=\$ac_optarg ;;
+-
+-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+-  | --exec | --exe | --ex)
+-    ac_prev=exec_prefix ;;
+-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+-  | --exec=* | --exe=* | --ex=*)
+-    exec_prefix=$ac_optarg ;;
+-
+-  -gas | --gas | --ga | --g)
+-    # Obsolete; use --with-gas.
+-    with_gas=yes ;;
+-
+-  -help | --help | --hel | --he | -h)
+-    ac_init_help=long ;;
+-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+-    ac_init_help=recursive ;;
+-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+-    ac_init_help=short ;;
+-
+-  -host | --host | --hos | --ho)
+-    ac_prev=host_alias ;;
+-  -host=* | --host=* | --hos=* | --ho=*)
+-    host_alias=$ac_optarg ;;
+-
+-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+-    ac_prev=htmldir ;;
+-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+-  | --ht=*)
+-    htmldir=$ac_optarg ;;
+-
+-  -includedir | --includedir | --includedi | --included | --include \
+-  | --includ | --inclu | --incl | --inc)
+-    ac_prev=includedir ;;
+-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+-  | --includ=* | --inclu=* | --incl=* | --inc=*)
+-    includedir=$ac_optarg ;;
+-
+-  -infodir | --infodir | --infodi | --infod | --info | --inf)
+-    ac_prev=infodir ;;
+-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+-    infodir=$ac_optarg ;;
+-
+-  -libdir | --libdir | --libdi | --libd)
+-    ac_prev=libdir ;;
+-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+-    libdir=$ac_optarg ;;
+-
+-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+-  | --libexe | --libex | --libe)
+-    ac_prev=libexecdir ;;
+-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+-  | --libexe=* | --libex=* | --libe=*)
+-    libexecdir=$ac_optarg ;;
+-
+-  -localedir | --localedir | --localedi | --localed | --locale)
+-    ac_prev=localedir ;;
+-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+-    localedir=$ac_optarg ;;
+-
+-  -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst | --locals)
+-    ac_prev=localstatedir ;;
+-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+-    localstatedir=$ac_optarg ;;
+-
+-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+-    ac_prev=mandir ;;
+-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+-    mandir=$ac_optarg ;;
+-
+-  -nfp | --nfp | --nf)
+-    # Obsolete; use --without-fp.
+-    with_fp=no ;;
+-
+-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c | -n)
+-    no_create=yes ;;
+-
+-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+-    no_recursion=yes ;;
+-
+-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+-  | --oldin | --oldi | --old | --ol | --o)
+-    ac_prev=oldincludedir ;;
+-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+-    oldincludedir=$ac_optarg ;;
+-
+-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+-    ac_prev=prefix ;;
+-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+-    prefix=$ac_optarg ;;
+-
+-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+-  | --program-pre | --program-pr | --program-p)
+-    ac_prev=program_prefix ;;
+-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+-    program_prefix=$ac_optarg ;;
+-
+-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+-  | --program-suf | --program-su | --program-s)
+-    ac_prev=program_suffix ;;
+-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+-    program_suffix=$ac_optarg ;;
+-
+-  -program-transform-name | --program-transform-name \
+-  | --program-transform-nam | --program-transform-na \
+-  | --program-transform-n | --program-transform- \
+-  | --program-transform | --program-transfor \
+-  | --program-transfo | --program-transf \
+-  | --program-trans | --program-tran \
+-  | --progr-tra | --program-tr | --program-t)
+-    ac_prev=program_transform_name ;;
+-  -program-transform-name=* | --program-transform-name=* \
+-  | --program-transform-nam=* | --program-transform-na=* \
+-  | --program-transform-n=* | --program-transform-=* \
+-  | --program-transform=* | --program-transfor=* \
+-  | --program-transfo=* | --program-transf=* \
+-  | --program-trans=* | --program-tran=* \
+-  | --progr-tra=* | --program-tr=* | --program-t=*)
+-    program_transform_name=$ac_optarg ;;
+-
+-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+-    ac_prev=pdfdir ;;
+-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+-    pdfdir=$ac_optarg ;;
+-
+-  -psdir | --psdir | --psdi | --psd | --ps)
+-    ac_prev=psdir ;;
+-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+-    psdir=$ac_optarg ;;
+-
+-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+-  | -silent | --silent | --silen | --sile | --sil)
+-    silent=yes ;;
+-
+-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+-    ac_prev=sbindir ;;
+-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+-  | --sbi=* | --sb=*)
+-    sbindir=$ac_optarg ;;
+-
+-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+-  | --sharedst | --shareds | --shared | --share | --shar \
+-  | --sha | --sh)
+-    ac_prev=sharedstatedir ;;
+-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+-  | --sha=* | --sh=*)
+-    sharedstatedir=$ac_optarg ;;
+-
+-  -site | --site | --sit)
+-    ac_prev=site ;;
+-  -site=* | --site=* | --sit=*)
+-    site=$ac_optarg ;;
+-
+-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+-    ac_prev=srcdir ;;
+-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+-    srcdir=$ac_optarg ;;
+-
+-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+-  | --syscon | --sysco | --sysc | --sys | --sy)
+-    ac_prev=sysconfdir ;;
+-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+-    sysconfdir=$ac_optarg ;;
+-
+-  -target | --target | --targe | --targ | --tar | --ta | --t)
+-    ac_prev=target_alias ;;
+-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+-    target_alias=$ac_optarg ;;
+-
+-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+-    verbose=yes ;;
+-
+-  -version | --version | --versio | --versi | --vers | -V)
+-    ac_init_version=: ;;
+-
+-  -with-* | --with-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error $? "invalid package name: $ac_useropt"
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"with_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+-       ac_unrecognized_sep=', ';;
+-    esac
+-    eval with_$ac_useropt=\$ac_optarg ;;
+-
+-  -without-* | --without-*)
+-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error $? "invalid package name: $ac_useropt"
+-    ac_useropt_orig=$ac_useropt
+-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+-    case $ac_user_opts in
+-      *"
+-"with_$ac_useropt"
+-"*) ;;
+-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+-       ac_unrecognized_sep=', ';;
+-    esac
+-    eval with_$ac_useropt=no ;;
+-
+-  --x)
+-    # Obsolete; use --with-x.
+-    with_x=yes ;;
+-
+-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+-  | --x-incl | --x-inc | --x-in | --x-i)
+-    ac_prev=x_includes ;;
+-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+-    x_includes=$ac_optarg ;;
+-
+-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+-    ac_prev=x_libraries ;;
+-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+-    x_libraries=$ac_optarg ;;
+-
+-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information"
+-    ;;
+-
+-  *=*)
+-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+-    # Reject names that are not valid shell variable names.
+-    case $ac_envvar in #(
+-      '' | [0-9]* | *[!_$as_cr_alnum]* )
+-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+-    esac
+-    eval $ac_envvar=\$ac_optarg
+-    export $ac_envvar ;;
+-
+-  *)
+-    # FIXME: should be removed in autoconf 3.0.
+-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+-    ;;
+-
+-  esac
+-done
+-
+-if test -n "$ac_prev"; then
+-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  as_fn_error $? "missing argument to $ac_option"
+-fi
+-
+-if test -n "$ac_unrecognized_opts"; then
+-  case $enable_option_checking in
+-    no) ;;
+-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+-  esac
+-fi
+-
+-# Check all directory arguments for consistency.
+-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+-              datadir sysconfdir sharedstatedir localstatedir includedir \
+-              oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-              libdir localedir mandir
+-do
+-  eval ac_val=\$$ac_var
+-  # Remove trailing slashes.
+-  case $ac_val in
+-    */ )
+-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+-      eval $ac_var=\$ac_val;;
+-  esac
+-  # Be sure to have absolute directory names.
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* )  continue;;
+-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+-  esac
+-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+-done
+-
+-# There might be people who depend on the old broken behavior: `$host'
+-# used to hold the argument of --host etc.
+-# FIXME: To remove some day.
+-build=$build_alias
+-host=$host_alias
+-target=$target_alias
+-
+-# FIXME: To remove some day.
+-if test "x$host_alias" != x; then
+-  if test "x$build_alias" = x; then
+-    cross_compiling=maybe
+-  elif test "x$build_alias" != "x$host_alias"; then
+-    cross_compiling=yes
+-  fi
+-fi
+-
+-ac_tool_prefix=
+-test -n "$host_alias" && ac_tool_prefix=$host_alias-
+-
+-test "$silent" = yes && exec 6>/dev/null
+-
+-
+-ac_pwd=`pwd` && test -n "$ac_pwd" &&
+-ac_ls_di=`ls -di .` &&
+-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  as_fn_error $? "working directory cannot be determined"
+-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  as_fn_error $? "pwd does not report name of working directory"
+-
+-
+-# Find the source files, if location was not specified.
+-if test -z "$srcdir"; then
+-  ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then the parent directory.
+-  ac_confdir=`$as_dirname -- "$as_myself" ||
+-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-       X"$as_myself" : 'X\(//\)[^/]' \| \
+-       X"$as_myself" : 'X\(//\)$' \| \
+-       X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_myself" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)[^/].*/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\).*/{
+-          s//\1/
+-          q
+-        }
+-        s/.*/./; q'`
+-  srcdir=$ac_confdir
+-  if test ! -r "$srcdir/$ac_unique_file"; then
+-    srcdir=..
+-  fi
+-else
+-  ac_srcdir_defaulted=no
+-fi
+-if test ! -r "$srcdir/$ac_unique_file"; then
+-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+-fi
+-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+-ac_abs_confdir=`(
+-      cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+-      pwd)`
+-# When building in place, set srcdir=.
+-if test "$ac_abs_confdir" = "$ac_pwd"; then
+-  srcdir=.
+-fi
+-# Remove unnecessary trailing slashes from srcdir.
+-# Double slashes in file names in object file debugging info
+-# mess up M-x gdb in Emacs.
+-case $srcdir in
+-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+-esac
+-for ac_var in $ac_precious_vars; do
+-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+-  eval ac_env_${ac_var}_value=\$${ac_var}
+-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+-done
+-
+-#
+-# Report the --help message.
+-#
+-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 rsync 3.1.2 to adapt to many kinds of systems.
+-
+-Usage: $0 [OPTION]... [VAR=VALUE]...
+-
+-To assign environment variables (e.g., CC, CFLAGS...), specify them as
+-VAR=VALUE.  See below for descriptions of some of the useful variables.
+-
+-Defaults for the options are specified in brackets.
+-
+-Configuration:
+-  -h, --help              display this help and exit
+-      --help=short        display options specific to this package
+-      --help=recursive    display the short help of all the included packages
+-  -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking ...' messages
+-      --cache-file=FILE   cache test results in FILE [disabled]
+-  -C, --config-cache      alias for \`--cache-file=config.cache'
+-  -n, --no-create         do not create output files
+-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+-
+-Installation directories:
+-  --prefix=PREFIX         install architecture-independent files in PREFIX
+-                          [$ac_default_prefix]
+-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-                          [PREFIX]
+-
+-By default, \`make install' will install all the files in
+-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+-for instance \`--prefix=\$HOME'.
+-
+-For better control, use the options below.
+-
+-Fine tuning of the installation directories:
+-  --bindir=DIR            user executables [EPREFIX/bin]
+-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+-  --libexecdir=DIR        program executables [EPREFIX/libexec]
+-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR            object code libraries [EPREFIX/lib]
+-  --includedir=DIR        C header files [PREFIX/include]
+-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+-  --infodir=DIR           info documentation [DATAROOTDIR/info]
+-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+-  --mandir=DIR            man documentation [DATAROOTDIR/man]
+-  --docdir=DIR            documentation root [DATAROOTDIR/doc/rsync]
+-  --htmldir=DIR           html documentation [DOCDIR]
+-  --dvidir=DIR            dvi documentation [DOCDIR]
+-  --pdfdir=DIR            pdf documentation [DOCDIR]
+-  --psdir=DIR             ps documentation [DOCDIR]
+-_ACEOF
+-
+-  cat <<\_ACEOF
+-
+-System types:
+-  --build=BUILD     configure for building on BUILD [guessed]
+-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+-_ACEOF
+-fi
+-
+-if test -n "$ac_init_help"; then
+-  case $ac_init_help in
+-     short | recursive ) echo "Configuration of rsync 3.1.2:";;
+-   esac
+-  cat <<\_ACEOF
+-
+-Optional Features:
+-  --disable-option-checking  ignore unrecognized --enable/--with options
+-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --disable-debug         disable debugging symbols and features
+-  --enable-profile        turn on CPU profiling
+-  --enable-maintainer-mode
+-                          turn on extra debug features
+-  --disable-largefile     omit support for large files
+-  --disable-ipv6          do not even try to use IPv6
+-  --disable-locale        disable locale features
+-  --disable-iconv-open    disable all use of iconv_open() function
+-  --disable-iconv         disable rsync's --iconv option
+-  --disable-acl-support   disable ACL support
+-  --disable-xattr-support disable extended attributes
+-
+-Optional Packages:
+-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-included-popt    use bundled popt library, not from system
+-  --with-included-zlib    use bundled zlib library, not from system
+-  --with-protected-args   make --protected-args option the default
+-  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)
+-  --with-rsyncd-conf=PATH set configuration file for rsync server to PATH
+-                          (default: /etc/rsyncd.conf)
+-  --with-rsh=CMD          set remote shell command to CMD (default: ssh)
+-  --with-nobody-group=GROUP
+-                          set the default unprivileged group (default nobody
+-                          or nogroup)
+-
+-Some influential environment variables:
+-  CC          C compiler command
+-  CFLAGS      C compiler flags
+-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+-              nonstandard directory <lib dir>
+-  LIBS        libraries to pass to the linker, e.g. -l<library>
+-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+-              you have headers in a nonstandard directory <include dir>
+-  CPP         C preprocessor
+-
+-Use these variables to override the choices made by `configure' or to help
+-it to find libraries and programs with nonstandard names/locations.
+-
+-Report bugs to <http://rsync.samba.org/bugzilla.html>.
+-_ACEOF
+-ac_status=$?
+-fi
+-
+-if test "$ac_init_help" = "recursive"; then
+-  # If there are subdirs, report their specific --help.
+-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d "$ac_dir" ||
+-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+-      continue
+-    ac_builddir=.
+-
+-case "$ac_dir" in
+-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-*)
+-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+-  # A ".." for each directory in $ac_dir_suffix.
+-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+-  case $ac_top_builddir_sub in
+-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+-  esac ;;
+-esac
+-ac_abs_top_builddir=$ac_pwd
+-ac_abs_builddir=$ac_pwd$ac_dir_suffix
+-# for backward compatibility:
+-ac_top_builddir=$ac_top_build_prefix
+-
+-case $srcdir in
+-  .)  # We are building in place.
+-    ac_srcdir=.
+-    ac_top_srcdir=$ac_top_builddir_sub
+-    ac_abs_top_srcdir=$ac_pwd ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute name.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir
+-    ac_abs_top_srcdir=$srcdir ;;
+-  *) # Relative name.
+-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_build_prefix$srcdir
+-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+-esac
+-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+-
+-    cd "$ac_dir" || { ac_status=$?; continue; }
+-    # Check for guested configure.
+-    if test -f "$ac_srcdir/configure.gnu"; then
+-      echo &&
+-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+-    elif test -f "$ac_srcdir/configure"; then
+-      echo &&
+-      $SHELL "$ac_srcdir/configure" --help=recursive
+-    else
+-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-    fi || ac_status=$?
+-    cd "$ac_pwd" || { ac_status=$?; break; }
+-  done
+-fi
+-
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+-  cat <<\_ACEOF
+-rsync configure 3.1.2
+-generated by GNU Autoconf 2.69
+-
+-Copyright (C) 2012 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
+-_ACEOF
+-  exit
+-fi
+-
+-## ------------------------ ##
+-## Autoconf initialization. ##
+-## ------------------------ ##
+-
+-# ac_fn_c_try_compile LINENO
+-# --------------------------
+-# Try to compile conftest.$ac_ext, and return whether this succeeded.
+-ac_fn_c_try_compile ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  rm -f conftest.$ac_objext
+-  if { { ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_compile") 2>conftest.err
+-  ac_status=$?
+-  if test -s conftest.err; then
+-    grep -v '^ *+' conftest.err >conftest.er1
+-    cat conftest.er1 >&5
+-    mv -f conftest.er1 conftest.err
+-  fi
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } && {
+-       test -z "$ac_c_werror_flag" ||
+-       test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then :
+-  ac_retval=0
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-      ac_retval=1
+-fi
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-  as_fn_set_status $ac_retval
+-
+-} # ac_fn_c_try_compile
+-
+-# ac_fn_c_try_cpp LINENO
+-# ----------------------
+-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+-ac_fn_c_try_cpp ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if { { ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+-  ac_status=$?
+-  if test -s conftest.err; then
+-    grep -v '^ *+' conftest.err >conftest.er1
+-    cat conftest.er1 >&5
+-    mv -f conftest.er1 conftest.err
+-  fi
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } > conftest.i && {
+-       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-       test ! -s conftest.err
+-       }; then :
+-  ac_retval=0
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-    ac_retval=1
+-fi
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-  as_fn_set_status $ac_retval
+-
+-} # ac_fn_c_try_cpp
+-
+-# ac_fn_c_try_run LINENO
+-# ----------------------
+-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+-# that executables *can* be run.
+-ac_fn_c_try_run ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if { { ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; }; then :
+-  ac_retval=0
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-       $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-       ac_retval=$ac_status
+-fi
+-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-  as_fn_set_status $ac_retval
+-
+-} # ac_fn_c_try_run
+-
+-# ac_fn_c_try_link LINENO
+-# -----------------------
+-# Try to link conftest.$ac_ext, and return whether this succeeded.
+-ac_fn_c_try_link ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  rm -f conftest.$ac_objext conftest$ac_exeext
+-  if { { ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_link") 2>conftest.err
+-  ac_status=$?
+-  if test -s conftest.err; then
+-    grep -v '^ *+' conftest.err >conftest.er1
+-    cat conftest.er1 >&5
+-    mv -f conftest.er1 conftest.err
+-  fi
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } && {
+-       test -z "$ac_c_werror_flag" ||
+-       test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-       test "$cross_compiling" = yes ||
+-       test -x conftest$ac_exeext
+-       }; then :
+-  ac_retval=0
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-      ac_retval=1
+-fi
+-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+-  # interfere with the next link command; also delete a directory that is
+-  # left behind by Apple's compiler.  We do this before executing the actions.
+-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-  as_fn_set_status $ac_retval
+-
+-} # ac_fn_c_try_link
+-
+-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+-# -------------------------------------------------------
+-# Tests whether HEADER exists and can be compiled using the include files in
+-# INCLUDES, setting the cache variable VAR accordingly.
+-ac_fn_c_check_header_compile ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-#include <$2>
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  eval "$3=yes"
+-else
+-  eval "$3=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-eval ac_res=\$$3
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-
+-} # ac_fn_c_check_header_compile
+-
+-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+-# -------------------------------------------------------
+-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+-# the include files in INCLUDES and setting the cache variable VAR
+-# accordingly.
+-ac_fn_c_check_header_mongrel ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if eval \${$3+:} false; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-fi
+-eval ac_res=\$$3
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+-$as_echo_n "checking $2 usability... " >&6; }
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-#include <$2>
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_header_compiler=yes
+-else
+-  ac_header_compiler=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+-$as_echo_n "checking $2 presence... " >&6; }
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <$2>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-  ac_header_preproc=yes
+-else
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+-  yes:no: )
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+-( $as_echo "## --------------------------------------------------- ##
+-## Report this to http://rsync.samba.org/bugzilla.html ##
+-## --------------------------------------------------- ##"
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$3=\$ac_header_compiler"
+-fi
+-eval ac_res=\$$3
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-fi
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-
+-} # ac_fn_c_check_header_mongrel
+-
+-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+-# --------------------------------------------
+-# Tries to find the compile-time value of EXPR in a program that includes
+-# INCLUDES, setting VAR accordingly. Returns whether the value could be
+-# computed
+-ac_fn_c_compute_int ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if test "$cross_compiling" = yes; then
+-    # Depending upon the size, compute the lo and hi bounds.
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) >= 0)];
+-test_array [0] = 0;
+-return test_array [0];
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0;
+-return test_array [0];
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_hi=$ac_mid; break
+-else
+-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+-                      if test $ac_lo -le $ac_mid; then
+-                        ac_lo= ac_hi=
+-                        break
+-                      fi
+-                      as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) < 0)];
+-test_array [0] = 0;
+-return test_array [0];
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+-test_array [0] = 0;
+-return test_array [0];
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_lo=$ac_mid; break
+-else
+-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+-                      if test $ac_mid -le $ac_hi; then
+-                        ac_lo= ac_hi=
+-                        break
+-                      fi
+-                      as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  ac_lo= ac_hi=
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+-test_array [0] = 0;
+-return test_array [0];
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_hi=$ac_mid
+-else
+-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in #((
+-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+-'') ac_retval=1 ;;
+-esac
+-  else
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-static long int longval () { return $2; }
+-static unsigned long int ulongval () { return $2; }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (($2) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ($2))
+-      return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ($2))
+-      return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+-else
+-  ac_retval=1
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -f conftest.val
+-
+-  fi
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-  as_fn_set_status $ac_retval
+-
+-} # ac_fn_c_compute_int
+-
+-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+-# -------------------------------------------
+-# Tests whether TYPE exists after having included INCLUDES, setting cache
+-# variable VAR accordingly.
+-ac_fn_c_check_type ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$3=no"
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-int
+-main ()
+-{
+-if (sizeof ($2))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$4
+-int
+-main ()
+-{
+-if (sizeof (($2)))
+-          return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-else
+-  eval "$3=yes"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-eval ac_res=\$$3
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-
+-} # ac_fn_c_check_type
+-
+-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+-# ----------------------------------------------------
+-# Tries to find if the field MEMBER exists in type AGGR, after including
+-# INCLUDES, setting cache variable VAR accordingly.
+-ac_fn_c_check_member ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+-$as_echo_n "checking for $2.$3... " >&6; }
+-if eval \${$4+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$5
+-int
+-main ()
+-{
+-static $2 ac_aggr;
+-if (ac_aggr.$3)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  eval "$4=yes"
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$5
+-int
+-main ()
+-{
+-static $2 ac_aggr;
+-if (sizeof ac_aggr.$3)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  eval "$4=yes"
+-else
+-  eval "$4=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-eval ac_res=\$$4
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-
+-} # ac_fn_c_check_member
+-
+-# ac_fn_c_check_func LINENO FUNC VAR
+-# ----------------------------------
+-# Tests whether FUNC exists, setting the cache variable VAR accordingly
+-ac_fn_c_check_func ()
+-{
+-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+-$as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $2 innocuous_$2
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $2 (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $2
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $2 ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$2 || defined __stub___$2
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $2 ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  eval "$3=yes"
+-else
+-  eval "$3=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-eval ac_res=\$$3
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+-
+-} # ac_fn_c_check_func
+-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 rsync $as_me 3.1.2, which was
+-generated by GNU Autoconf 2.69.  Invocation command line was
+-
+-  $ $0 $@
+-
+-_ACEOF
+-exec 5>>config.log
+-{
+-cat <<_ASUNAME
+-## --------- ##
+-## Platform. ##
+-## --------- ##
+-
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+-
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+-
+-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+-
+-_ASUNAME
+-
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    $as_echo "PATH: $as_dir"
+-  done
+-IFS=$as_save_IFS
+-
+-} >&5
+-
+-cat >&5 <<_ACEOF
+-
+-
+-## ----------- ##
+-## Core tests. ##
+-## ----------- ##
+-
+-_ACEOF
+-
+-
+-# Keep a trace of the command line.
+-# Strip out --no-create and --no-recursion so they do not pile up.
+-# Strip out --silent because we don't want to record it for future runs.
+-# Also quote any args containing shell meta-characters.
+-# Make two passes to allow for proper duplicate-argument suppression.
+-ac_configure_args=
+-ac_configure_args0=
+-ac_configure_args1=
+-ac_must_keep_next=false
+-for ac_pass in 1 2
+-do
+-  for ac_arg
+-  do
+-    case $ac_arg in
+-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+-    | -silent | --silent | --silen | --sile | --sil)
+-      continue ;;
+-    *\'*)
+-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    esac
+-    case $ac_pass in
+-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+-    2)
+-      as_fn_append ac_configure_args1 " '$ac_arg'"
+-      if test $ac_must_keep_next = true; then
+-      ac_must_keep_next=false # Got value, back to normal.
+-      else
+-      case $ac_arg in
+-        *=* | --config-cache | -C | -disable-* | --disable-* \
+-        | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+-        | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+-        | -with-* | --with-* | -without-* | --without-* | --x)
+-          case "$ac_configure_args0 " in
+-            "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+-          esac
+-          ;;
+-        -* ) ac_must_keep_next=true ;;
+-      esac
+-      fi
+-      as_fn_append ac_configure_args " '$ac_arg'"
+-      ;;
+-    esac
+-  done
+-done
+-{ ac_configure_args0=; unset ac_configure_args0;}
+-{ ac_configure_args1=; unset ac_configure_args1;}
+-
+-# When interrupted or exit'd, cleanup temporary files, and complete
+-# config.log.  We remove comments because anyway the quotes in there
+-# would cause problems or look ugly.
+-# WARNING: Use '\'' to represent an apostrophe within the trap.
+-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+-trap 'exit_status=$?
+-  # Save into config.log some information that might help in debugging.
+-  {
+-    echo
+-
+-    $as_echo "## ---------------- ##
+-## Cache variables. ##
+-## ---------------- ##"
+-    echo
+-    # The following way of writing the cache mishandles newlines in values,
+-(
+-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+-    eval ac_val=\$$ac_var
+-    case $ac_val in #(
+-    *${as_nl}*)
+-      case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+-      esac
+-      case $ac_var in #(
+-      _ | IFS | as_nl) ;; #(
+-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+-      *) { eval $ac_var=; unset $ac_var;} ;;
+-      esac ;;
+-    esac
+-  done
+-  (set) 2>&1 |
+-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+-    *${as_nl}ac_space=\ *)
+-      sed -n \
+-      "s/'\''/'\''\\\\'\'''\''/g;
+-        s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+-      ;; #(
+-    *)
+-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+-      ;;
+-    esac |
+-    sort
+-)
+-    echo
+-
+-    $as_echo "## ----------------- ##
+-## Output variables. ##
+-## ----------------- ##"
+-    echo
+-    for ac_var in $ac_subst_vars
+-    do
+-      eval ac_val=\$$ac_var
+-      case $ac_val in
+-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+-      esac
+-      $as_echo "$ac_var='\''$ac_val'\''"
+-    done | sort
+-    echo
+-
+-    if test -n "$ac_subst_files"; then
+-      $as_echo "## ------------------- ##
+-## File substitutions. ##
+-## ------------------- ##"
+-      echo
+-      for ac_var in $ac_subst_files
+-      do
+-      eval ac_val=\$$ac_var
+-      case $ac_val in
+-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+-      esac
+-      $as_echo "$ac_var='\''$ac_val'\''"
+-      done | sort
+-      echo
+-    fi
+-
+-    if test -s confdefs.h; then
+-      $as_echo "## ----------- ##
+-## confdefs.h. ##
+-## ----------- ##"
+-      echo
+-      cat confdefs.h
+-      echo
+-    fi
+-    test "$ac_signal" != 0 &&
+-      $as_echo "$as_me: caught signal $ac_signal"
+-    $as_echo "$as_me: exit $exit_status"
+-  } >&5
+-  rm -f core *.core core.conftest.* &&
+-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+-    exit $exit_status
+-' 0
+-for ac_signal in 1 2 13 15; do
+-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+-done
+-ac_signal=0
+-
+-# confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -f -r conftest* confdefs.h
+-
+-$as_echo "/* confdefs.h */" > confdefs.h
+-
+-# Predefined preprocessor variables.
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_NAME "$PACKAGE_NAME"
+-_ACEOF
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+-_ACEOF
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_VERSION "$PACKAGE_VERSION"
+-_ACEOF
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_STRING "$PACKAGE_STRING"
+-_ACEOF
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+-_ACEOF
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_URL "$PACKAGE_URL"
+-_ACEOF
+-
+-
+-# Let the site file select an alternate cache file if it wants to.
+-# Prefer an explicitly selected file to automatically selected ones.
+-ac_site_file1=NONE
+-ac_site_file2=NONE
+-if test -n "$CONFIG_SITE"; then
+-  # We do not want a PATH search for config.site.
+-  case $CONFIG_SITE in #((
+-    -*)  ac_site_file1=./$CONFIG_SITE;;
+-    */*) ac_site_file1=$CONFIG_SITE;;
+-    *)   ac_site_file1=./$CONFIG_SITE;;
+-  esac
+-elif test "x$prefix" != xNONE; then
+-  ac_site_file1=$prefix/share/config.site
+-  ac_site_file2=$prefix/etc/config.site
+-else
+-  ac_site_file1=$ac_default_prefix/share/config.site
+-  ac_site_file2=$ac_default_prefix/etc/config.site
+-fi
+-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+-do
+-  test "x$ac_site_file" = xNONE && continue
+-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+-    sed 's/^/| /' "$ac_site_file" >&5
+-    . "$ac_site_file" \
+-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
+-  fi
+-done
+-
+-if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special files
+-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+-$as_echo "$as_me: loading cache $cache_file" >&6;}
+-    case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+-      *)                      . "./$cache_file";;
+-    esac
+-  fi
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+-$as_echo "$as_me: creating cache $cache_file" >&6;}
+-  >$cache_file
+-fi
+-
+-as_fn_append ac_header_list " utime.h"
+-# Check that the precious variables saved in the cache have kept the same
+-# value.
+-ac_cache_corrupted=false
+-for ac_var in $ac_precious_vars; do
+-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+-  eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+-  eval ac_new_val=\$ac_env_${ac_var}_value
+-  case $ac_old_set,$ac_new_set in
+-    set,)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+-      ac_cache_corrupted=: ;;
+-    ,set)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+-      ac_cache_corrupted=: ;;
+-    ,);;
+-    *)
+-      if test "x$ac_old_val" != "x$ac_new_val"; then
+-      # differences in whitespace do not lead to failure.
+-      ac_old_val_w=`echo x $ac_old_val`
+-      ac_new_val_w=`echo x $ac_new_val`
+-      if test "$ac_old_val_w" != "$ac_new_val_w"; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        ac_cache_corrupted=:
+-      else
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+-        eval $ac_var=\$ac_old_val
+-      fi
+-      { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+-      { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+-      fi;;
+-  esac
+-  # Pass precious variables to config.status.
+-  if test "$ac_new_set" = set; then
+-    case $ac_new_val in
+-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    *) ac_arg=$ac_var=$ac_new_val ;;
+-    esac
+-    case " $ac_configure_args " in
+-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+-    esac
+-  fi
+-done
+-if $ac_cache_corrupted; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+-fi
+-## -------------------- ##
+-## Main body of script. ##
+-## -------------------- ##
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-
+-
+-
+-ac_config_headers="$ac_config_headers config.h"
+-
+-
+-
+-RSYNC_VERSION=$PACKAGE_VERSION
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring rsync $PACKAGE_VERSION" >&5
+-$as_echo "$as_me: Configuring rsync $PACKAGE_VERSION" >&6;}
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define RSYNC_VERSION "$PACKAGE_VERSION"
+-_ACEOF
+-
+-
+-LDFLAGS=${LDFLAGS-""}
+-
+-ac_aux_dir=
+-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+-  if test -f "$ac_dir/install-sh"; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install-sh -c"
+-    break
+-  elif test -f "$ac_dir/install.sh"; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install.sh -c"
+-    break
+-  elif test -f "$ac_dir/shtool"; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/shtool install -c"
+-    break
+-  fi
+-done
+-if test -z "$ac_aux_dir"; then
+-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+-fi
+-
+-# These three variables are undocumented and unsupported,
+-# and are intended to be withdrawn in a future Autoconf release.
+-# They can cause serious problems if a builder's source tree is in a directory
+-# whose full name contains unusual characters.
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+-
+-
+-# Make sure we can run config.sub.
+-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
+-if ${ac_cv_build+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_build_alias=$build_alias
+-test "x$ac_build_alias" = x &&
+-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+-test "x$ac_build_alias" = x &&
+-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
+-case $ac_cv_build in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+-esac
+-build=$ac_cv_build
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_build
+-shift
+-build_cpu=$1
+-build_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-build_os=$*
+-IFS=$ac_save_IFS
+-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
+-if ${ac_cv_host+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "x$host_alias" = x; then
+-  ac_cv_host=$ac_cv_build
+-else
+-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
+-case $ac_cv_host in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+-esac
+-host=$ac_cv_host
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_host
+-shift
+-host_cpu=$1
+-host_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-host_os=$*
+-IFS=$ac_save_IFS
+-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+-
+-
+-
+-
+-
+-# We must decide this before testing the compiler.
+-
+-# Please allow this to default to yes, so that your users have more
+-# chance of getting a useful stack trace if problems occur.
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5
+-$as_echo_n "checking whether to include debugging symbols... " >&6; }
+-# Check whether --enable-debug was given.
+-if test "${enable_debug+set}" = set; then :
+-  enableval=$enable_debug;
+-fi
+-
+-
+-if test x"$enable_debug" = x"no"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-    ac_cv_prog_cc_g=no
+-else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-        # leave ac_cv_prog_cc_g alone; AC_PROG_CC will try to include -g if it can
+-fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="gcc"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_ct_CC" = x; then
+-    CC=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    CC=$ac_ct_CC
+-  fi
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-if test -z "$CC"; then
+-          if test -n "$ac_tool_prefix"; then
+-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  fi
+-fi
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+-       ac_prog_rejected=yes
+-       continue
+-     fi
+-    ac_cv_prog_CC="cc"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-if test $ac_prog_rejected = yes; then
+-  # We found a bogon in the path, so make sure we never use it.
+-  set dummy $ac_cv_prog_CC
+-  shift
+-  if test $# != 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+-  fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl.exe
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-    test -n "$CC" && break
+-  done
+-fi
+-if test -z "$CC"; then
+-  ac_ct_CC=$CC
+-  for ac_prog in cl.exe
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="$ac_prog"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+-$as_echo "$ac_ct_CC" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  test -n "$ac_ct_CC" && break
+-done
+-
+-  if test "x$ac_ct_CC" = x; then
+-    CC=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    CC=$ac_ct_CC
+-  fi
+-fi
+-
+-fi
+-
+-
+-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-# Provide some information about the compiler.
+-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
+-for ac_option in --version -v -V -qversion; do
+-  { { ac_try="$ac_compiler $ac_option >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+-  ac_status=$?
+-  if test -s conftest.err; then
+-    sed '10a\
+-... rest of stderr output deleted ...
+-         10q' conftest.err >conftest.er1
+-    cat conftest.er1 >&5
+-  fi
+-  rm -f conftest.er1 conftest.err
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }
+-done
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+-# Try to create an executable without -o first, disregard a.out.
+-# It will help us diagnose broken compilers, and finding out an intuition
+-# of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-
+-# The possible output files:
+-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+-
+-ac_rmfiles=
+-for ac_file in $ac_files
+-do
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+-  esac
+-done
+-rm -f $ac_rmfiles
+-
+-if { { ac_try="$ac_link_default"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_link_default") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then :
+-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+-# so that the user can short-circuit this test for compilers unknown to
+-# Autoconf.
+-for ac_file in $ac_files ''
+-do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+-      ;;
+-    [ab].out )
+-      # We found the default executable, but exeext='' is most
+-      # certainly right.
+-      break;;
+-    *.* )
+-      if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+-      then :; else
+-         ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-      fi
+-      # We set ac_cv_exeext here because the later test for it is not
+-      # safe: cross compilers may not add the suffix if given an `-o'
+-      # argument, so we may need to know it at that point already.
+-      # Even if this section looks crufty: it has the advantage of
+-      # actually working.
+-      break;;
+-    * )
+-      break;;
+-  esac
+-done
+-test "$ac_cv_exeext" = no && ac_cv_exeext=
+-
+-else
+-  ac_file=''
+-fi
+-if test -z "$ac_file"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+-ac_exeext=$ac_cv_exeext
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+-$as_echo_n "checking for suffix of executables... " >&6; }
+-if { { ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then :
+-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-        break;;
+-    * ) break;;
+-  esac
+-done
+-else
+-  { { $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 compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
+-fi
+-rm -f conftest conftest$ac_cv_exeext
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+-$as_echo "$ac_cv_exeext" >&6; }
+-
+-rm -f conftest.$ac_ext
+-EXEEXT=$ac_cv_exeext
+-ac_exeext=$EXEEXT
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-FILE *f = fopen ("conftest.out", "w");
+- return ferror (f) || fclose (f) != 0;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-ac_clean_files="$ac_clean_files conftest.out"
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-if test "$cross_compiling" != yes; then
+-  { { ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }
+-  if { ac_try='./conftest$ac_cv_exeext'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-      cross_compiling=yes
+-    else
+-      { { $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 C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
+-    fi
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+-ac_clean_files=$ac_clean_files_save
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+-$as_echo_n "checking for suffix of object files... " >&6; }
+-if ${ac_cv_objext+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
+-if { { ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_compile") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then :
+-  for ac_file in conftest.o conftest.obj conftest.*; do
+-  test -f "$ac_file" || continue;
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+-       break;;
+-  esac
+-done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-{ { $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 compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
+-fi
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+-$as_echo "$ac_cv_objext" >&6; }
+-OBJEXT=$ac_cv_objext
+-ac_objext=$OBJEXT
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if ${ac_cv_c_compiler_gnu+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+-       choke me
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_compiler_gnu=yes
+-else
+-  ac_compiler_gnu=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+-  GCC=yes
+-else
+-  GCC=
+-fi
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+-$as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if ${ac_cv_prog_cc_g+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_save_c_werror_flag=$ac_c_werror_flag
+-   ac_c_werror_flag=yes
+-   ac_cv_prog_cc_g=no
+-   CFLAGS="-g"
+-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_prog_cc_g=yes
+-else
+-  CFLAGS=""
+-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-else
+-  ac_c_werror_flag=$ac_save_c_werror_flag
+-       CFLAGS="-g"
+-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_prog_cc_g=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-   ac_c_werror_flag=$ac_save_c_werror_flag
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+-$as_echo "$ac_cv_prog_cc_g" >&6; }
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if ${ac_cv_prog_cc_c89+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_prog_cc_c89=no
+-ac_save_CC=$CC
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdio.h>
+-struct stat;
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+-   function prototypes and stuff, but not '\xHH' hex character constants.
+-   These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std is added to get
+-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+-   array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std.  */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+-   inside strings and character constants.  */
+-#define FOO(x) 'x'
+-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+-
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+-      -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_prog_cc_c89=$ac_arg
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+-  test "x$ac_cv_prog_cc_c89" != "xno" && break
+-done
+-rm -f conftest.$ac_ext
+-CC=$ac_save_CC
+-
+-fi
+-# AC_CACHE_VAL
+-case "x$ac_cv_prog_cc_c89" in
+-  x)
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
+-  xno)
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
+-  *)
+-    CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+-esac
+-if test "x$ac_cv_prog_cc_c89" != xno; then :
+-
+-fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+-  CPP=
+-fi
+-if test -z "$CPP"; then
+-  if ${ac_cv_prog_CPP+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-      # Double quotes because CPP needs to be expanded
+-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+-    do
+-      ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-                   Syntax error
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-
+-else
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether nonexistent headers
+-  # can be detected and how.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-  # Broken: success on invalid input.
+-continue
+-else
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+-  break
+-fi
+-
+-    done
+-    ac_cv_prog_CPP=$CPP
+-
+-fi
+-  CPP=$ac_cv_prog_CPP
+-else
+-  ac_cv_prog_CPP=$CPP
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+-$as_echo "$CPP" >&6; }
+-ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-                   Syntax error
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-
+-else
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether nonexistent headers
+-  # can be detected and how.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-  # Broken: success on invalid input.
+-continue
+-else
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+-
+-else
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
+-fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if ${ac_cv_path_GREP+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -z "$GREP"; then
+-  ac_path_GREP_found=false
+-  # Loop through the user's path and test for each of PROGNAME-LIST
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_prog in grep ggrep; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_GREP" || continue
+-# Check for GNU ac_path_GREP and select it if it is found.
+-  # Check for GNU $ac_path_GREP
+-case `"$ac_path_GREP" --version 2>&1` in
+-*GNU*)
+-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+-*)
+-  ac_count=0
+-  $as_echo_n 0123456789 >"conftest.in"
+-  while :
+-  do
+-    cat "conftest.in" "conftest.in" >"conftest.tmp"
+-    mv "conftest.tmp" "conftest.in"
+-    cp "conftest.in" "conftest.nl"
+-    $as_echo 'GREP' >> "conftest.nl"
+-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+-      # Best one so far, save it but keep looking for a better one
+-      ac_cv_path_GREP="$ac_path_GREP"
+-      ac_path_GREP_max=$ac_count
+-    fi
+-    # 10*(2^10) chars as input seems more than enough
+-    test $ac_count -gt 10 && break
+-  done
+-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
+-
+-      $ac_path_GREP_found && break 3
+-    done
+-  done
+-  done
+-IFS=$as_save_IFS
+-  if test -z "$ac_cv_path_GREP"; then
+-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+-  fi
+-else
+-  ac_cv_path_GREP=$GREP
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+-$as_echo "$ac_cv_path_GREP" >&6; }
+- GREP="$ac_cv_path_GREP"
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+-$as_echo_n "checking for egrep... " >&6; }
+-if ${ac_cv_path_EGREP+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+-   then ac_cv_path_EGREP="$GREP -E"
+-   else
+-     if test -z "$EGREP"; then
+-  ac_path_EGREP_found=false
+-  # Loop through the user's path and test for each of PROGNAME-LIST
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_prog in egrep; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_EGREP" || continue
+-# Check for GNU ac_path_EGREP and select it if it is found.
+-  # Check for GNU $ac_path_EGREP
+-case `"$ac_path_EGREP" --version 2>&1` in
+-*GNU*)
+-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+-*)
+-  ac_count=0
+-  $as_echo_n 0123456789 >"conftest.in"
+-  while :
+-  do
+-    cat "conftest.in" "conftest.in" >"conftest.tmp"
+-    mv "conftest.tmp" "conftest.in"
+-    cp "conftest.in" "conftest.nl"
+-    $as_echo 'EGREP' >> "conftest.nl"
+-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+-      # Best one so far, save it but keep looking for a better one
+-      ac_cv_path_EGREP="$ac_path_EGREP"
+-      ac_path_EGREP_max=$ac_count
+-    fi
+-    # 10*(2^10) chars as input seems more than enough
+-    test $ac_count -gt 10 && break
+-  done
+-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
+-
+-      $ac_path_EGREP_found && break 3
+-    done
+-  done
+-  done
+-IFS=$as_save_IFS
+-  if test -z "$ac_cv_path_EGREP"; then
+-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+-  fi
+-else
+-  ac_cv_path_EGREP=$EGREP
+-fi
+-
+-   fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+-$as_echo "$ac_cv_path_EGREP" >&6; }
+- EGREP="$ac_cv_path_EGREP"
+-
+-
+-# Find a good install program.  We prefer a C program (faster),
+-# so one script is as good as another.  But avoid the broken or
+-# incompatible versions:
+-# SysV /etc/install, /usr/sbin/install
+-# SunOS /usr/etc/install
+-# IRIX /sbin/install
+-# AIX /bin/install
+-# AmigaOS /C/install, which installs bootblocks on floppy discs
+-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+-# OS/2's system install, which has a completely different semantic
+-# ./install, which can be erroneously created by make from ./install.sh.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+-if test -z "$INSTALL"; then
+-if ${ac_cv_path_install+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in #((
+-  ./ | .// | /[cC]/* | \
+-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+-  /usr/ucb/* ) ;;
+-  *)
+-    # OSF1 and SCO ODT 3.0 have their own names for install.
+-    # Don't use installbsd from OSF since it installs stuff as root
+-    # by default.
+-    for ac_prog in ginstall scoinst install; do
+-      for ac_exec_ext in '' $ac_executable_extensions; do
+-      if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+-        if test $ac_prog = install &&
+-          grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-          # AIX install.  It has an incompatible calling convention.
+-          :
+-        elif test $ac_prog = install &&
+-          grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-          # program-specific install script used by HP pwplus--don't use.
+-          :
+-        else
+-          rm -rf conftest.one conftest.two conftest.dir
+-          echo one > conftest.one
+-          echo two > conftest.two
+-          mkdir conftest.dir
+-          if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+-            test -s conftest.one && test -s conftest.two &&
+-            test -s conftest.dir/conftest.one &&
+-            test -s conftest.dir/conftest.two
+-          then
+-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-            break 3
+-          fi
+-        fi
+-      fi
+-      done
+-    done
+-    ;;
+-esac
+-
+-  done
+-IFS=$as_save_IFS
+-
+-rm -rf conftest.one conftest.two conftest.dir
+-
+-fi
+-  if test "${ac_cv_path_install+set}" = set; then
+-    INSTALL=$ac_cv_path_install
+-  else
+-    # As a last resort, use the slow shell script.  Don't cache a
+-    # value for INSTALL within a source directory, because that will
+-    # break other packages using the cache if that directory is
+-    # removed, or if the value is a relative name.
+-    INSTALL=$ac_install_sh
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
+-
+-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+-# It thinks the first close brace ends the variable substitution.
+-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+-
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+-
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+-if test -z "$MKDIR_P"; then
+-  if ${ac_cv_path_mkdir+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_prog in mkdir gmkdir; do
+-       for ac_exec_ext in '' $ac_executable_extensions; do
+-         as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+-         case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+-           'mkdir (GNU coreutils) '* | \
+-           'mkdir (coreutils) '* | \
+-           'mkdir (fileutils) '4.1*)
+-             ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+-             break 3;;
+-         esac
+-       done
+-       done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-
+-  test -d ./--version && rmdir ./--version
+-  if test "${ac_cv_path_mkdir+set}" = set; then
+-    MKDIR_P="$ac_cv_path_mkdir -p"
+-  else
+-    # As a last resort, use the slow shell script.  Don't cache a
+-    # value for MKDIR_P within a source directory, because that will
+-    # break other packages using the cache if that directory is
+-    # removed, or if the value is a relative name.
+-    MKDIR_P="$ac_install_sh -d"
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+-$as_echo "$MKDIR_P" >&6; }
+-
+-   case $ac_cv_prog_cc_stdc in #(
+-  no) :
+-    ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
+-  *) :
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+-$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+-if ${ac_cv_prog_cc_c99+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_prog_cc_c99=no
+-ac_save_CC=$CC
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdbool.h>
+-#include <stdlib.h>
+-#include <wchar.h>
+-#include <stdio.h>
+-
+-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+-#define debug(...) fprintf (stderr, __VA_ARGS__)
+-#define showlist(...) puts (#__VA_ARGS__)
+-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+-static void
+-test_varargs_macros (void)
+-{
+-  int x = 1234;
+-  int y = 5678;
+-  debug ("Flag");
+-  debug ("X = %d\n", x);
+-  showlist (The first, second, and third items.);
+-  report (x>y, "x is %d but y is %d", x, y);
+-}
+-
+-// Check long long types.
+-#define BIG64 18446744073709551615ull
+-#define BIG32 4294967295ul
+-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+-#if !BIG_OK
+-  your preprocessor is broken;
+-#endif
+-#if BIG_OK
+-#else
+-  your preprocessor is broken;
+-#endif
+-static long long int bignum = -9223372036854775807LL;
+-static unsigned long long int ubignum = BIG64;
+-
+-struct incomplete_array
+-{
+-  int datasize;
+-  double data[];
+-};
+-
+-struct named_init {
+-  int number;
+-  const wchar_t *name;
+-  double average;
+-};
+-
+-typedef const char *ccp;
+-
+-static inline int
+-test_restrict (ccp restrict text)
+-{
+-  // See if C++-style comments work.
+-  // Iterate through items via the restricted pointer.
+-  // Also check for declarations in for loops.
+-  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+-    continue;
+-  return 0;
+-}
+-
+-// Check varargs and va_copy.
+-static void
+-test_varargs (const char *format, ...)
+-{
+-  va_list args;
+-  va_start (args, format);
+-  va_list args_copy;
+-  va_copy (args_copy, args);
+-
+-  const char *str;
+-  int number;
+-  float fnumber;
+-
+-  while (*format)
+-    {
+-      switch (*format++)
+-      {
+-      case 's': // string
+-        str = va_arg (args_copy, const char *);
+-        break;
+-      case 'd': // int
+-        number = va_arg (args_copy, int);
+-        break;
+-      case 'f': // float
+-        fnumber = va_arg (args_copy, double);
+-        break;
+-      default:
+-        break;
+-      }
+-    }
+-  va_end (args_copy);
+-  va_end (args);
+-}
+-
+-int
+-main ()
+-{
+-
+-  // Check bool.
+-  _Bool success = false;
+-
+-  // Check restrict.
+-  if (test_restrict ("String literal") == 0)
+-    success = true;
+-  char *restrict newvar = "Another string";
+-
+-  // Check varargs.
+-  test_varargs ("s, d' f .", "string", 65, 34.234);
+-  test_varargs_macros ();
+-
+-  // Check flexible array members.
+-  struct incomplete_array *ia =
+-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+-  ia->datasize = 10;
+-  for (int i = 0; i < ia->datasize; ++i)
+-    ia->data[i] = i * 1.234;
+-
+-  // Check named initializers.
+-  struct named_init ni = {
+-    .number = 34,
+-    .name = L"Test wide string",
+-    .average = 543.34343,
+-  };
+-
+-  ni.number = 58;
+-
+-  int dynamic_array[ni.number];
+-  dynamic_array[ni.number - 1] = 543;
+-
+-  // work around unused variable warnings
+-  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+-        || dynamic_array[ni.number - 1] != 543);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_prog_cc_c99=$ac_arg
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+-  test "x$ac_cv_prog_cc_c99" != "xno" && break
+-done
+-rm -f conftest.$ac_ext
+-CC=$ac_save_CC
+-
+-fi
+-# AC_CACHE_VAL
+-case "x$ac_cv_prog_cc_c99" in
+-  x)
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
+-  xno)
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
+-  *)
+-    CC="$CC $ac_cv_prog_cc_c99"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+-$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+-esac
+-if test "x$ac_cv_prog_cc_c99" != xno; then :
+-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if ${ac_cv_prog_cc_c89+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_prog_cc_c89=no
+-ac_save_CC=$CC
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdio.h>
+-struct stat;
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+-   function prototypes and stuff, but not '\xHH' hex character constants.
+-   These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std is added to get
+-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+-   array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std.  */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+-   inside strings and character constants.  */
+-#define FOO(x) 'x'
+-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+-
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+-      -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_prog_cc_c89=$ac_arg
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+-  test "x$ac_cv_prog_cc_c89" != "xno" && break
+-done
+-rm -f conftest.$ac_ext
+-CC=$ac_save_CC
+-
+-fi
+-# AC_CACHE_VAL
+-case "x$ac_cv_prog_cc_c89" in
+-  x)
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;;
+-  xno)
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;;
+-  *)
+-    CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+-esac
+-if test "x$ac_cv_prog_cc_c89" != xno; then :
+-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+-else
+-  ac_cv_prog_cc_stdc=no
+-fi
+-
+-fi
+- ;;
+-esac
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
+-$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
+-  if ${ac_cv_prog_cc_stdc+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-fi
+-
+-  case $ac_cv_prog_cc_stdc in #(
+-  no) :
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+-$as_echo "unsupported" >&6; } ;; #(
+-  '') :
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+-$as_echo "none needed" >&6; } ;; #(
+-  *) :
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5
+-$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
+-esac
+-
+-
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PERL+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $PERL in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-PERL=$ac_cv_path_PERL
+-if test -n "$PERL"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+-$as_echo "$PERL" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-
+-
+-$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+-
+-
+-if test x"$ac_cv_prog_cc_stdc" = x"no"; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rsync requires an ANSI C compiler and you do not seem to have one" >&5
+-$as_echo "$as_me: WARNING: rsync requires an ANSI C compiler and you do not seem to have one" >&2;}
+-fi
+-
+-# Check whether --enable-profile was given.
+-if test "${enable_profile+set}" = set; then :
+-  enableval=$enable_profile;
+-fi
+-
+-if test x"$enable_profile" = x"yes"; then
+-      CFLAGS="$CFLAGS -pg"
+-fi
+-
+-
+-# Specifically, this turns on panic_action handling.
+-# Check whether --enable-maintainer-mode was given.
+-if test "${enable_maintainer_mode+set}" = set; then :
+-  enableval=$enable_maintainer_mode;
+-fi
+-
+-if test x"$enable_maintainer_mode" = x"yes"; then
+-      CFLAGS="$CFLAGS -DMAINTAINER_MODE"
+-fi
+-
+-
+-# This is needed for our included version of popt.  Kind of silly, but
+-# I don't want our version too far out of sync.
+-CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-
+-# If GCC, turn on warnings.
+-if test x"$GCC" = x"yes"; then
+-      CFLAGS="$CFLAGS -Wall -W"
+-fi
+-
+-
+-# Check whether --with-included-popt was given.
+-if test "${with_included_popt+set}" = set; then :
+-  withval=$with_included_popt;
+-fi
+-
+-
+-
+-# Check whether --with-included-zlib was given.
+-if test "${with_included_zlib+set}" = set; then :
+-  withval=$with_included_zlib;
+-fi
+-
+-
+-
+-# Check whether --with-protected-args was given.
+-if test "${with_protected_args+set}" = set; then :
+-  withval=$with_protected_args;
+-fi
+-
+-if test x"$with_protected_args" = x"yes"; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define RSYNC_USE_PROTECTED_ARGS 1
+-_ACEOF
+-
+-fi
+-
+-
+-# Check whether --with-rsync-path was given.
+-if test "${with_rsync_path+set}" = set; then :
+-  withval=$with_rsync_path;  RSYNC_PATH="$with_rsync_path"
+-else
+-   RSYNC_PATH="rsync"
+-fi
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define RSYNC_PATH "$RSYNC_PATH"
+-_ACEOF
+-
+-
+-
+-# Check whether --with-rsyncd-conf was given.
+-if test "${with_rsyncd_conf+set}" = set; then :
+-  withval=$with_rsyncd_conf;  if test ! -z "$with_rsyncd_conf" ; then
+-              case $with_rsyncd_conf in
+-                      yes|no)
+-                              RSYNCD_SYSCONF="/etc/rsyncd.conf"
+-                              ;;
+-                      /*)
+-                              RSYNCD_SYSCONF="$with_rsyncd_conf"
+-                              ;;
+-                      *)
+-                                as_fn_error $? "You must specify an absolute path to --with-rsyncd-conf=PATH" "$LINENO" 5
+-                              ;;
+-              esac
+-      else
+-              RSYNCD_SYSCONF="/etc/rsyncd.conf"
+-      fi
+-else
+-   RSYNCD_SYSCONF="/etc/rsyncd.conf"
+-fi
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define RSYNCD_SYSCONF "$RSYNCD_SYSCONF"
+-_ACEOF
+-
+-
+-
+-# Check whether --with-rsh was given.
+-if test "${with_rsh+set}" = set; then :
+-  withval=$with_rsh;
+-fi
+-
+-
+-# Extract the first word of "remsh", so it can be a program name with args.
+-set dummy remsh; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_HAVE_REMSH+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$HAVE_REMSH"; then
+-  ac_cv_prog_HAVE_REMSH="$HAVE_REMSH" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_HAVE_REMSH="1"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_prog_HAVE_REMSH" && ac_cv_prog_HAVE_REMSH="0"
+-fi
+-fi
+-HAVE_REMSH=$ac_cv_prog_HAVE_REMSH
+-if test -n "$HAVE_REMSH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_REMSH" >&5
+-$as_echo "$HAVE_REMSH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test x$HAVE_REMSH = x1; then
+-
+-$as_echo "#define HAVE_REMSH 1" >>confdefs.h
+-
+-fi
+-
+-if test x"$with_rsh" != x; then
+-      RSYNC_RSH="$with_rsh"
+-else
+-      RSYNC_RSH="ssh"
+-fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define RSYNC_RSH "$RSYNC_RSH"
+-_ACEOF
+-
+-
+-# Extract the first word of "yodl2man", so it can be a program name with args.
+-set dummy yodl2man; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_HAVE_YODL2MAN+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$HAVE_YODL2MAN"; then
+-  ac_cv_prog_HAVE_YODL2MAN="$HAVE_YODL2MAN" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_HAVE_YODL2MAN="1"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_prog_HAVE_YODL2MAN" && ac_cv_prog_HAVE_YODL2MAN="0"
+-fi
+-fi
+-HAVE_YODL2MAN=$ac_cv_prog_HAVE_YODL2MAN
+-if test -n "$HAVE_YODL2MAN"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_YODL2MAN" >&5
+-$as_echo "$HAVE_YODL2MAN" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test x$HAVE_YODL2MAN = x1; then
+-    MAKE_MAN=man
+-else
+-    MAKE_MAN=man-copy
+-fi
+-
+-# Some programs on solaris are only found in /usr/xpg4/bin (or work better than others versions).
+-# Extract the first word of "sh", so it can be a program name with args.
+-set dummy sh; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_SHELL_PATH+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $SHELL_PATH in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_SHELL_PATH="$SHELL_PATH" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/xpg4/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_SHELL_PATH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_SHELL_PATH" && ac_cv_path_SHELL_PATH="/bin/sh"
+-  ;;
+-esac
+-fi
+-SHELL_PATH=$ac_cv_path_SHELL_PATH
+-if test -n "$SHELL_PATH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELL_PATH" >&5
+-$as_echo "$SHELL_PATH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-# Extract the first word of "fakeroot", so it can be a program name with args.
+-set dummy fakeroot; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_FAKEROOT_PATH+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $FAKEROOT_PATH in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_FAKEROOT_PATH="$FAKEROOT_PATH" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/xpg4/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_FAKEROOT_PATH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_FAKEROOT_PATH" && ac_cv_path_FAKEROOT_PATH="/usr/bin/fakeroot"
+-  ;;
+-esac
+-fi
+-FAKEROOT_PATH=$ac_cv_path_FAKEROOT_PATH
+-if test -n "$FAKEROOT_PATH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FAKEROOT_PATH" >&5
+-$as_echo "$FAKEROOT_PATH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-
+-
+-# Check whether --with-nobody-group was given.
+-if test "${with_nobody_group+set}" = set; then :
+-  withval=$with_nobody_group;  NOBODY_GROUP="$with_nobody_group"
+-fi
+-
+-
+-if test x"$with_nobody_group" = x; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking the group for user \"nobody\"" >&5
+-$as_echo_n "checking the group for user \"nobody\"... " >&6; }
+-    if grep '^nobody:' /etc/group >/dev/null 2>&1; then
+-      NOBODY_GROUP=nobody
+-    elif grep '^nogroup:' /etc/group >/dev/null 2>&1; then
+-      NOBODY_GROUP=nogroup
+-    else
+-      NOBODY_GROUP=nobody # test for others?
+-    fi
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NOBODY_GROUP" >&5
+-$as_echo "$NOBODY_GROUP" >&6; }
+-fi
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define NOBODY_USER "nobody"
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define NOBODY_GROUP "$NOBODY_GROUP"
+-_ACEOF
+-
+-
+-# arrgh. libc in some old debian version screwed up the largefile
+-# stuff, getting byte range locking wrong
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken largefile support" >&5
+-$as_echo_n "checking for broken largefile support... " >&6; }
+-if ${rsync_cv_HAVE_BROKEN_LARGEFILE+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_HAVE_BROKEN_LARGEFILE=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#define _FILE_OFFSET_BITS 64
+-#include <stdio.h>
+-#include <fcntl.h>
+-#include <sys/types.h>
+-#include <sys/wait.h>
+-
+-int main(void)
+-{
+-      struct flock lock;
+-      int status;
+-      char tpl[32] = "/tmp/locktest.XXXXXX";
+-      int fd = mkstemp(tpl);
+-      if (fd < 0) {
+-              strcpy(tpl, "conftest.dat");
+-              fd = open(tpl, O_CREAT|O_RDWR, 0600);
+-      }
+-
+-      lock.l_type = F_WRLCK;
+-      lock.l_whence = SEEK_SET;
+-      lock.l_start = 0;
+-      lock.l_len = 1;
+-      lock.l_pid = 0;
+-      fcntl(fd,F_SETLK,&lock);
+-      if (fork() == 0) {
+-              lock.l_start = 1;
+-              _exit(fcntl(fd,F_SETLK,&lock) == 0);
+-      }
+-      wait(&status);
+-      unlink(tpl);
+-      exit(WEXITSTATUS(status));
+-}
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_HAVE_BROKEN_LARGEFILE=yes
+-else
+-  rsync_cv_HAVE_BROKEN_LARGEFILE=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_BROKEN_LARGEFILE" >&5
+-$as_echo "$rsync_cv_HAVE_BROKEN_LARGEFILE" >&6; }
+-if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then
+-   # Check whether --enable-largefile was given.
+-if test "${enable_largefile+set}" = set; then :
+-  enableval=$enable_largefile;
+-fi
+-
+-if test "$enable_largefile" != no; then
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+-if ${ac_cv_sys_largefile_CC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_sys_largefile_CC=no
+-     if test "$GCC" != yes; then
+-       ac_save_CC=$CC
+-       while :; do
+-       # IRIX 6.2 and later do not support large files by default,
+-       # so use the C compiler's -n32 option if that helps.
+-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+- /* Check that off_t can represent 2**63 - 1 correctly.
+-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+-    since some C++ compilers masquerading as C compilers
+-    incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+-                     && LARGE_OFF_T % 2147483647 == 1)
+-                    ? 1 : -1];
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-       if ac_fn_c_try_compile "$LINENO"; then :
+-  break
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+-       CC="$CC -n32"
+-       if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_sys_largefile_CC=' -n32'; break
+-fi
+-rm -f core conftest.err conftest.$ac_objext
+-       break
+-       done
+-       CC=$ac_save_CC
+-       rm -f conftest.$ac_ext
+-    fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+-  if test "$ac_cv_sys_largefile_CC" != no; then
+-    CC=$CC$ac_cv_sys_largefile_CC
+-  fi
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+-if ${ac_cv_sys_file_offset_bits+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  while :; do
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+- /* Check that off_t can represent 2**63 - 1 correctly.
+-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+-    since some C++ compilers masquerading as C compilers
+-    incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+-                     && LARGE_OFF_T % 2147483647 == 1)
+-                    ? 1 : -1];
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_sys_file_offset_bits=no; break
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#define _FILE_OFFSET_BITS 64
+-#include <sys/types.h>
+- /* Check that off_t can represent 2**63 - 1 correctly.
+-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+-    since some C++ compilers masquerading as C compilers
+-    incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+-                     && LARGE_OFF_T % 2147483647 == 1)
+-                    ? 1 : -1];
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_sys_file_offset_bits=64; break
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  ac_cv_sys_file_offset_bits=unknown
+-  break
+-done
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+-case $ac_cv_sys_file_offset_bits in #(
+-  no | unknown) ;;
+-  *)
+-cat >>confdefs.h <<_ACEOF
+-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+-_ACEOF
+-;;
+-esac
+-rm -rf conftest*
+-  if test $ac_cv_sys_file_offset_bits = unknown; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+-if ${ac_cv_sys_large_files+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  while :; do
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+- /* Check that off_t can represent 2**63 - 1 correctly.
+-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+-    since some C++ compilers masquerading as C compilers
+-    incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+-                     && LARGE_OFF_T % 2147483647 == 1)
+-                    ? 1 : -1];
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_sys_large_files=no; break
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#define _LARGE_FILES 1
+-#include <sys/types.h>
+- /* Check that off_t can represent 2**63 - 1 correctly.
+-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+-    since some C++ compilers masquerading as C compilers
+-    incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+-                     && LARGE_OFF_T % 2147483647 == 1)
+-                    ? 1 : -1];
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_sys_large_files=1; break
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  ac_cv_sys_large_files=unknown
+-  break
+-done
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+-$as_echo "$ac_cv_sys_large_files" >&6; }
+-case $ac_cv_sys_large_files in #(
+-  no | unknown) ;;
+-  *)
+-cat >>confdefs.h <<_ACEOF
+-#define _LARGE_FILES $ac_cv_sys_large_files
+-_ACEOF
+-;;
+-esac
+-rm -rf conftest*
+-  fi
+-
+-
+-fi
+-
+-fi
+-
+-ipv6type=unknown
+-ipv6lib=none
+-ipv6trylibc=yes
+-
+-# Check whether --enable-ipv6 was given.
+-if test "${enable_ipv6+set}" = set; then :
+-  enableval=$enable_ipv6;
+-fi
+-
+-if test x"$enable_ipv6" != x"no"; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
+-$as_echo_n "checking ipv6 stack type... " >&6; }
+-      for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do
+-              case $i in
+-              inria)
+-                      # http://www.kame.net/
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <netinet/in.h>
+-#ifdef IPV6_INRIA_VERSION
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              kame)
+-                      # http://www.kame.net/
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <netinet/in.h>
+-#ifdef __KAME__
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              linux-glibc)
+-                      # http://www.v6.linux.or.jp/
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <features.h>
+-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              linux-inet6)
+-                      # http://www.v6.linux.or.jp/
+-                      if test -d /usr/inet6 -o -f /usr/inet6/lib/libinet6.a; then
+-                              ipv6type=$i
+-                              ipv6lib=inet6
+-                              ipv6libdir=/usr/inet6/lib
+-                              ipv6trylibc=yes;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-                              CFLAGS="-I/usr/inet6/include $CFLAGS"
+-                      fi
+-                      ;;
+-              solaris)
+-                      # http://www.sun.com
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <netinet/ip6.h>
+-#ifdef __sun
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              toshiba)
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <sys/param.h>
+-#ifdef _TOSHIBA_INET6
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-                              ipv6lib=inet6;
+-                              ipv6libdir=/usr/local/v6/lib;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              v6d)
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include </usr/local/v6/include/sys/v6config.h>
+-#ifdef __V6D__
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-                              ipv6lib=v6;
+-                              ipv6libdir=/usr/local/v6/lib;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              zeta)
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <sys/param.h>
+-#ifdef _ZETA_MINAMI_INET6
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-                              ipv6lib=inet6;
+-                              ipv6libdir=/usr/local/v6/lib;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              cygwin)
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <netinet/in.h>
+-#ifdef _CYGWIN_IN6_H
+-yes
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  ipv6type=$i;
+-
+-$as_echo "#define INET6 1" >>confdefs.h
+-
+-fi
+-rm -f conftest*
+-
+-                      ;;
+-              esac
+-              if test "$ipv6type" != "unknown"; then
+-                      break
+-              fi
+-      done
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5
+-$as_echo "$ipv6type" >&6; }
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
+-$as_echo_n "checking for library containing getaddrinfo... " >&6; }
+-if ${ac_cv_search_getaddrinfo+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char getaddrinfo ();
+-int
+-main ()
+-{
+-return getaddrinfo ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' inet6; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_getaddrinfo=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_getaddrinfo+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_getaddrinfo+:} false; then :
+-
+-else
+-  ac_cv_search_getaddrinfo=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
+-$as_echo "$ac_cv_search_getaddrinfo" >&6; }
+-ac_res=$ac_cv_search_getaddrinfo
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-fi
+-
+-# Check whether --enable-locale was given.
+-if test "${enable_locale+set}" = set; then :
+-  enableval=$enable_locale;
+-fi
+-
+-
+-if test x"$enable_locale" != x"no"; then
+-      $as_echo "#define CONFIG_LOCALE 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to call shutdown on all sockets" >&5
+-$as_echo_n "checking whether to call shutdown on all sockets... " >&6; }
+-case $host_os in
+-      *cygwin* ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define SHUTDOWN_ALL_SOCKETS 1" >>confdefs.h
+-
+-                 ;;
+-             * ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; };;
+-esac
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
+-if ${ac_cv_header_stdc+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_header_stdc=yes
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <string.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then :
+-  :
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ctype.h>
+-#include <stdlib.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) \
+-                 (('a' <= (c) && (c) <= 'i') \
+-                   || ('j' <= (c) && (c) <= 'r') \
+-                   || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
+-
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+-  int i;
+-  for (i = 0; i < 256; i++)
+-    if (XOR (islower (i), ISLOWER (i))
+-      || toupper (i) != TOUPPER (i))
+-      return 2;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
+-if test $ac_cv_header_stdc = yes; then
+-
+-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+-
+-fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-                inttypes.h stdint.h unistd.h
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+-"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+-if ${ac_cv_c_bigendian+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_c_bigendian=unknown
+-    # See if we're dealing with a universal compiler.
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifndef __APPLE_CC__
+-             not a universal capable compiler
+-           #endif
+-           typedef int dummy;
+-
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-      # Check for potential -arch flags.  It is not universal unless
+-      # there are at least two -arch flags with different values.
+-      ac_arch=
+-      ac_prev=
+-      for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+-       if test -n "$ac_prev"; then
+-         case $ac_word in
+-           i?86 | x86_64 | ppc | ppc64)
+-             if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+-               ac_arch=$ac_word
+-             else
+-               ac_cv_c_bigendian=universal
+-               break
+-             fi
+-             ;;
+-         esac
+-         ac_prev=
+-       elif test "x$ac_word" = "x-arch"; then
+-         ac_prev=arch
+-       fi
+-       done
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-    if test $ac_cv_c_bigendian = unknown; then
+-      # See if sys/param.h defines the BYTE_ORDER macro.
+-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-           #include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+-                   && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+-                   && LITTLE_ENDIAN)
+-            bogus endian macros
+-           #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  # It does; now see whether it defined to BIG_ENDIAN or not.
+-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-              #include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if BYTE_ORDER != BIG_ENDIAN
+-               not big endian
+-              #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_c_bigendian=yes
+-else
+-  ac_cv_c_bigendian=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-    fi
+-    if test $ac_cv_c_bigendian = unknown; then
+-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+-            bogus endian macros
+-           #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  # It does; now see whether it defined to _BIG_ENDIAN or not.
+-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#ifndef _BIG_ENDIAN
+-               not big endian
+-              #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_c_bigendian=yes
+-else
+-  ac_cv_c_bigendian=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-    fi
+-    if test $ac_cv_c_bigendian = unknown; then
+-      # Compile a test program.
+-      if test "$cross_compiling" = yes; then :
+-  # Try to guess by grepping values from an object file.
+-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-short int ascii_mm[] =
+-                { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-              short int ascii_ii[] =
+-                { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+-              int use_ascii (int i) {
+-                return ascii_mm[i] + ascii_ii[i];
+-              }
+-              short int ebcdic_ii[] =
+-                { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-              short int ebcdic_mm[] =
+-                { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+-              int use_ebcdic (int i) {
+-                return ebcdic_mm[i] + ebcdic_ii[i];
+-              }
+-              extern int foo;
+-
+-int
+-main ()
+-{
+-return use_ascii (foo) == use_ebcdic (foo);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+-            ac_cv_c_bigendian=yes
+-          fi
+-          if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+-            if test "$ac_cv_c_bigendian" = unknown; then
+-              ac_cv_c_bigendian=no
+-            else
+-              # finding both strings is unlikely to happen, but who knows?
+-              ac_cv_c_bigendian=unknown
+-            fi
+-          fi
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-
+-           /* Are we little or big endian?  From Harbison&Steele.  */
+-           union
+-           {
+-             long int l;
+-             char c[sizeof (long int)];
+-           } u;
+-           u.l = 1;
+-           return u.c[sizeof (long int) - 1] == 1;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_c_bigendian=no
+-else
+-  ac_cv_c_bigendian=yes
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-    fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+-$as_echo "$ac_cv_c_bigendian" >&6; }
+- case $ac_cv_c_bigendian in #(
+-   yes)
+-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+-;; #(
+-   no)
+-      ;; #(
+-   universal)
+-
+-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+-
+-     ;; #(
+-   *)
+-     as_fn_error $? "unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+- esac
+-
+-ac_header_dirent=no
+-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+-if eval \${$as_ac_Header+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <$ac_hdr>
+-
+-int
+-main ()
+-{
+-if ((DIR *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  eval "$as_ac_Header=yes"
+-else
+-  eval "$as_ac_Header=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-eval ac_res=\$$as_ac_Header
+-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+-_ACEOF
+-
+-ac_header_dirent=$ac_hdr; break
+-fi
+-
+-done
+-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+-if test $ac_header_dirent = dirent.h; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+-$as_echo_n "checking for library containing opendir... " >&6; }
+-if ${ac_cv_search_opendir+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char opendir ();
+-int
+-main ()
+-{
+-return opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' dir; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_opendir=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_opendir+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_opendir+:} false; then :
+-
+-else
+-  ac_cv_search_opendir=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+-$as_echo "$ac_cv_search_opendir" >&6; }
+-ac_res=$ac_cv_search_opendir
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+-$as_echo_n "checking for library containing opendir... " >&6; }
+-if ${ac_cv_search_opendir+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char opendir ();
+-int
+-main ()
+-{
+-return opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' x; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_opendir=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_opendir+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_opendir+:} false; then :
+-
+-else
+-  ac_cv_search_opendir=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+-$as_echo "$ac_cv_search_opendir" >&6; }
+-ac_res=$ac_cv_search_opendir
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+-if ${ac_cv_header_time+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
+-
+-int
+-main ()
+-{
+-if ((struct tm *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_header_time=yes
+-else
+-  ac_cv_header_time=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+-$as_echo "$ac_cv_header_time" >&6; }
+-if test $ac_cv_header_time = yes; then
+-
+-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+-if ${ac_cv_header_sys_wait_h+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/wait.h>
+-#ifndef WEXITSTATUS
+-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+-#endif
+-#ifndef WIFEXITED
+-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+-#endif
+-
+-int
+-main ()
+-{
+-  int s;
+-  wait (&s);
+-  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_header_sys_wait_h=yes
+-else
+-  ac_cv_header_sys_wait_h=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+-$as_echo "$ac_cv_header_sys_wait_h" >&6; }
+-if test $ac_cv_header_sys_wait_h = yes; then
+-
+-$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+-
+-fi
+-
+-for ac_header in sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
+-    unistd.h utime.h grp.h compat.h sys/param.h ctype.h sys/wait.h \
+-    sys/ioctl.h sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h \
+-    sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
+-    netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
+-    sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
+-    popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netinet/ip.h \
+-    zlib.h
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
+-$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
+-if ${ac_cv_header_sys_types_h_makedev+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-int
+-main ()
+-{
+-return makedev(0, 0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_header_sys_types_h_makedev=yes
+-else
+-  ac_cv_header_sys_types_h_makedev=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
+-$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
+-
+-if test $ac_cv_header_sys_types_h_makedev = no; then
+-ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
+-
+-$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
+-
+-fi
+-
+-
+-
+-  if test $ac_cv_header_sys_mkdev_h = no; then
+-    ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
+-
+-$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
+-
+-fi
+-
+-
+-  fi
+-fi
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if makedev takes 3 args" >&5
+-$as_echo_n "checking if makedev takes 3 args... " >&6; }
+-if ${rsync_cv_MAKEDEV_TAKES_3_ARGS+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_MAKEDEV_TAKES_3_ARGS=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <sys/types.h>
+-#ifdef MAJOR_IN_MKDEV
+-#include <sys/mkdev.h>
+-# if !defined makedev && (defined mkdev || defined _WIN32 || defined __WIN32__)
+-#  define makedev mkdev
+-# endif
+-#elif defined MAJOR_IN_SYSMACROS
+-#include <sys/sysmacros.h>
+-#endif
+-
+-int main(void)
+-{
+-      dev_t dev = makedev(0, 5, 7);
+-      if (major(dev) != 5 || minor(dev) != 7)
+-              exit(1);
+-      return 0;
+-}
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_MAKEDEV_TAKES_3_ARGS=yes
+-else
+-  rsync_cv_MAKEDEV_TAKES_3_ARGS=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_MAKEDEV_TAKES_3_ARGS" >&5
+-$as_echo "$rsync_cv_MAKEDEV_TAKES_3_ARGS" >&6; }
+-if test x"$rsync_cv_MAKEDEV_TAKES_3_ARGS" = x"yes"; then
+-
+-$as_echo "#define MAKEDEV_TAKES_3_ARGS 1" >>confdefs.h
+-
+-fi
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+-$as_echo_n "checking size of int... " >&6; }
+-if ${ac_cv_sizeof_int+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_int" = 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 77 "cannot compute sizeof (int)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_int=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+-$as_echo "$ac_cv_sizeof_int" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_INT $ac_cv_sizeof_int
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+-$as_echo_n "checking size of long... " >&6; }
+-if ${ac_cv_sizeof_long+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_long" = 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 77 "cannot compute sizeof (long)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_long=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+-$as_echo "$ac_cv_sizeof_long" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+-$as_echo_n "checking size of long long... " >&6; }
+-if ${ac_cv_sizeof_long_long+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_long_long" = 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 77 "cannot compute sizeof (long long)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_long_long=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+-$as_echo_n "checking size of short... " >&6; }
+-if ${ac_cv_sizeof_short+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_short" = 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 77 "cannot compute sizeof (short)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_short=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+-$as_echo "$ac_cv_sizeof_short" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SHORT $ac_cv_sizeof_short
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int16_t" >&5
+-$as_echo_n "checking size of int16_t... " >&6; }
+-if ${ac_cv_sizeof_int16_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int16_t))" "ac_cv_sizeof_int16_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_int16_t" = 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 77 "cannot compute sizeof (int16_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_int16_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int16_t" >&5
+-$as_echo "$ac_cv_sizeof_int16_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_INT16_T $ac_cv_sizeof_int16_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint16_t" >&5
+-$as_echo_n "checking size of uint16_t... " >&6; }
+-if ${ac_cv_sizeof_uint16_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint16_t))" "ac_cv_sizeof_uint16_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_uint16_t" = 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 77 "cannot compute sizeof (uint16_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_uint16_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint16_t" >&5
+-$as_echo "$ac_cv_sizeof_uint16_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_UINT16_T $ac_cv_sizeof_uint16_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int32_t" >&5
+-$as_echo_n "checking size of int32_t... " >&6; }
+-if ${ac_cv_sizeof_int32_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int32_t))" "ac_cv_sizeof_int32_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_int32_t" = 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 77 "cannot compute sizeof (int32_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_int32_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int32_t" >&5
+-$as_echo "$ac_cv_sizeof_int32_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_INT32_T $ac_cv_sizeof_int32_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint32_t" >&5
+-$as_echo_n "checking size of uint32_t... " >&6; }
+-if ${ac_cv_sizeof_uint32_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint32_t))" "ac_cv_sizeof_uint32_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_uint32_t" = 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 77 "cannot compute sizeof (uint32_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_uint32_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint32_t" >&5
+-$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_UINT32_T $ac_cv_sizeof_uint32_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int64_t" >&5
+-$as_echo_n "checking size of int64_t... " >&6; }
+-if ${ac_cv_sizeof_int64_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int64_t))" "ac_cv_sizeof_int64_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_int64_t" = 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 77 "cannot compute sizeof (int64_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_int64_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int64_t" >&5
+-$as_echo "$ac_cv_sizeof_int64_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_INT64_T $ac_cv_sizeof_int64_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+-$as_echo_n "checking size of off_t... " >&6; }
+-if ${ac_cv_sizeof_off_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_off_t" = 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 77 "cannot compute sizeof (off_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_off_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
+-$as_echo "$ac_cv_sizeof_off_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off64_t" >&5
+-$as_echo_n "checking size of off64_t... " >&6; }
+-if ${ac_cv_sizeof_off64_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off64_t))" "ac_cv_sizeof_off64_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_off64_t" = 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 77 "cannot compute sizeof (off64_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_off64_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off64_t" >&5
+-$as_echo "$ac_cv_sizeof_off64_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_OFF64_T $ac_cv_sizeof_off64_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-# This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
+-$as_echo_n "checking size of time_t... " >&6; }
+-if ${ac_cv_sizeof_time_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "$ac_includes_default"; then :
+-
+-else
+-  if test "$ac_cv_type_time_t" = 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 77 "cannot compute sizeof (time_t)
+-See \`config.log' for more details" "$LINENO" 5; }
+-   else
+-     ac_cv_sizeof_time_t=0
+-   fi
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5
+-$as_echo "$ac_cv_sizeof_time_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
+-_ACEOF
+-
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+-$as_echo_n "checking for inline... " >&6; }
+-if ${ac_cv_c_inline+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_c_inline=no
+-for ac_kw in inline __inline__ __inline; do
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifndef __cplusplus
+-typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
+-#endif
+-
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_c_inline=$ac_kw
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  test "$ac_cv_c_inline" != no && break
+-done
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+-$as_echo "$ac_cv_c_inline" >&6; }
+-
+-case $ac_cv_c_inline in
+-  inline | yes) ;;
+-  *)
+-    case $ac_cv_c_inline in
+-      no) ac_val=;;
+-      *) ac_val=$ac_cv_c_inline;;
+-    esac
+-    cat >>confdefs.h <<_ACEOF
+-#ifndef __cplusplus
+-#define inline $ac_val
+-#endif
+-_ACEOF
+-    ;;
+-esac
+-
+-
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5
+-$as_echo_n "checking for long double with more range or precision than double... " >&6; }
+-if ${ac_cv_type_long_double_wider+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <float.h>
+-          long double const a[] =
+-            {
+-               0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON,
+-               LDBL_MIN, LDBL_MAX, LDBL_EPSILON
+-            };
+-          long double
+-          f (long double x)
+-          {
+-             return ((x + (unsigned long int) 10) * (-1 / x) + a[0]
+-                      + (x ? f (x) : 'c'));
+-          }
+-
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
+-                 + (DBL_MANT_DIG < LDBL_MANT_DIG)
+-                 - (LDBL_MAX_EXP < DBL_MAX_EXP)
+-                 - (LDBL_MANT_DIG < DBL_MANT_DIG)))
+-          && (int) LDBL_EPSILON == 0
+-        )];
+-test_array [0] = 0;
+-return test_array [0];
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_type_long_double_wider=yes
+-else
+-  ac_cv_type_long_double_wider=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double_wider" >&5
+-$as_echo "$ac_cv_type_long_double_wider" >&6; }
+-  if test $ac_cv_type_long_double_wider = yes; then
+-
+-$as_echo "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h
+-
+-  fi
+-
+-ac_cv_c_long_double=$ac_cv_type_long_double_wider
+-if test $ac_cv_c_long_double = yes; then
+-
+-$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+-if ${ac_cv_type_uid_t+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "uid_t" >/dev/null 2>&1; then :
+-  ac_cv_type_uid_t=yes
+-else
+-  ac_cv_type_uid_t=no
+-fi
+-rm -f conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+-$as_echo "$ac_cv_type_uid_t" >&6; }
+-if test $ac_cv_type_uid_t = no; then
+-
+-$as_echo "#define uid_t int" >>confdefs.h
+-
+-
+-$as_echo "#define gid_t int" >>confdefs.h
+-
+-fi
+-
+-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+-if test "x$ac_cv_type_mode_t" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_MODE_T 1
+-_ACEOF
+-
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+-if test "x$ac_cv_type_off_t" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_OFF_T 1
+-_ACEOF
+-
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+-if test "x$ac_cv_type_size_t" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_SIZE_T 1
+-_ACEOF
+-
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+-if test "x$ac_cv_type_pid_t" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_PID_T 1
+-_ACEOF
+-
+-
+-fi
+-ac_fn_c_check_type "$LINENO" "id_t" "ac_cv_type_id_t" "$ac_includes_default"
+-if test "x$ac_cv_type_id_t" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_ID_T 1
+-_ACEOF
+-
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5
+-$as_echo_n "checking type of array argument to getgroups... " >&6; }
+-if ${ac_cv_type_getgroups+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_type_getgroups=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-/* Thanks to Mike Rendell for this test.  */
+-$ac_includes_default
+-#define NGID 256
+-#undef MAX
+-#define MAX(x, y) ((x) > (y) ? (x) : (y))
+-
+-int
+-main ()
+-{
+-  gid_t gidset[NGID];
+-  int i, n;
+-  union { gid_t gval; long int lval; }  val;
+-
+-  val.lval = -1;
+-  for (i = 0; i < NGID; i++)
+-    gidset[i] = val.gval;
+-  n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
+-               gidset);
+-  /* Exit non-zero if getgroups seems to require an array of ints.  This
+-     happens when gid_t is short int but getgroups modifies an array
+-     of ints.  */
+-  return n > 0 && gidset[n] != val.gval;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_type_getgroups=gid_t
+-else
+-  ac_cv_type_getgroups=int
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-if test $ac_cv_type_getgroups = cross; then
+-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <unistd.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then :
+-  ac_cv_type_getgroups=gid_t
+-else
+-  ac_cv_type_getgroups=int
+-fi
+-rm -f conftest*
+-
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5
+-$as_echo "$ac_cv_type_getgroups" >&6; }
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GETGROUPS_T $ac_cv_type_getgroups
+-_ACEOF
+-
+-
+-ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#ifdef HAVE_SYS_STAT_H
+-#include <sys/stat.h>
+-#endif
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-"
+-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_RDEV 1
+-_ACEOF
+-
+-
+-fi
+-ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#ifdef HAVE_SYS_STAT_H
+-#include <sys/stat.h>
+-#endif
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-"
+-if test "x$ac_cv_member_struct_stat_st_mtimensec" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
+-_ACEOF
+-
+-
+-fi
+-ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#ifdef HAVE_SYS_STAT_H
+-#include <sys/stat.h>
+-#endif
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-"
+-if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
+-_ACEOF
+-
+-
+-fi
+-
+-
+-
+-   ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h>
+-#include <sys/socket.h>
+-"
+-if test "x$ac_cv_type_socklen_t" = xyes; then :
+-
+-else
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5
+-$as_echo_n "checking for socklen_t equivalent... " >&6; }
+-      if ${rsync_cv_socklen_t_equiv+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-         # Systems have either "struct sockaddr *" or
+-         # "void *" as the second argument to getpeername
+-         rsync_cv_socklen_t_equiv=
+-         for arg2 in "struct sockaddr" void; do
+-            for t in int size_t unsigned long "unsigned long"; do
+-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-                  int getpeername (int, $arg2 *, $t *);
+-
+-int
+-main ()
+-{
+-
+-                  $t len;
+-                  getpeername(0,0,&len);
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-                  rsync_cv_socklen_t_equiv="$t"
+-                  break
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-            done
+-         done
+-
+-         if test "x$rsync_cv_socklen_t_equiv" = x; then
+-            as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5
+-         fi
+-
+-fi
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_socklen_t_equiv" >&5
+-$as_echo "$rsync_cv_socklen_t_equiv" >&6; }
+-
+-cat >>confdefs.h <<_ACEOF
+-#define socklen_t $rsync_cv_socklen_t_equiv
+-_ACEOF
+-
+-fi
+-
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno in errno.h" >&5
+-$as_echo_n "checking for errno in errno.h... " >&6; }
+-if ${rsync_cv_errno+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <errno.h>
+-int
+-main ()
+-{
+-int i = errno
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  rsync_cv_errno=yes
+-else
+-  rsync_cv_have_errno_decl=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_errno" >&5
+-$as_echo "$rsync_cv_errno" >&6; }
+-if test x"$rsync_cv_errno" = x"yes"; then
+-
+-$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
+-
+-fi
+-
+-# The following test taken from the cvs sources
+-# If we can't find connect, try looking in -lsocket, -lnsl, and -linet.
+-# These need checks to be before checks for any other functions that
+-#    might be in the same libraries.
+-# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has
+-# libsocket.so which has a bad implementation of gethostbyname (it
+-# only looks in /etc/hosts), so we only look for -lsocket if we need
+-# it.
+-for ac_func in connect
+-do :
+-  ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+-if test "x$ac_cv_func_connect" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_CONNECT 1
+-_ACEOF
+-
+-fi
+-done
+-
+-if test x"$ac_cv_func_connect" = x"no"; then
+-    case "$LIBS" in
+-    *-lnsl*) ;;
+-    *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for printf in -lnsl_s" >&5
+-$as_echo_n "checking for printf in -lnsl_s... " >&6; }
+-if ${ac_cv_lib_nsl_s_printf+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl_s  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char printf ();
+-int
+-main ()
+-{
+-return printf ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_nsl_s_printf=yes
+-else
+-  ac_cv_lib_nsl_s_printf=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_s_printf" >&5
+-$as_echo "$ac_cv_lib_nsl_s_printf" >&6; }
+-if test "x$ac_cv_lib_nsl_s_printf" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBNSL_S 1
+-_ACEOF
+-
+-  LIBS="-lnsl_s $LIBS"
+-
+-fi
+- ;;
+-    esac
+-    case "$LIBS" in
+-    *-lnsl*) ;;
+-    *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for printf in -lnsl" >&5
+-$as_echo_n "checking for printf in -lnsl... " >&6; }
+-if ${ac_cv_lib_nsl_printf+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char printf ();
+-int
+-main ()
+-{
+-return printf ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_nsl_printf=yes
+-else
+-  ac_cv_lib_nsl_printf=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_printf" >&5
+-$as_echo "$ac_cv_lib_nsl_printf" >&6; }
+-if test "x$ac_cv_lib_nsl_printf" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBNSL 1
+-_ACEOF
+-
+-  LIBS="-lnsl $LIBS"
+-
+-fi
+- ;;
+-    esac
+-    case "$LIBS" in
+-    *-lsocket*) ;;
+-    *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+-$as_echo_n "checking for connect in -lsocket... " >&6; }
+-if ${ac_cv_lib_socket_connect+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char connect ();
+-int
+-main ()
+-{
+-return connect ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_socket_connect=yes
+-else
+-  ac_cv_lib_socket_connect=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+-$as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBSOCKET 1
+-_ACEOF
+-
+-  LIBS="-lsocket $LIBS"
+-
+-fi
+- ;;
+-    esac
+-    case "$LIBS" in
+-    *-linet*) ;;
+-    *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
+-$as_echo_n "checking for connect in -linet... " >&6; }
+-if ${ac_cv_lib_inet_connect+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-linet  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char connect ();
+-int
+-main ()
+-{
+-return connect ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_inet_connect=yes
+-else
+-  ac_cv_lib_inet_connect=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_connect" >&5
+-$as_echo "$ac_cv_lib_inet_connect" >&6; }
+-if test "x$ac_cv_lib_inet_connect" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBINET 1
+-_ACEOF
+-
+-  LIBS="-linet $LIBS"
+-
+-fi
+- ;;
+-    esac
+-            if test x"$ac_cv_lib_socket_connect" = x"yes" ||
+-       test x"$ac_cv_lib_inet_connect" = x"yes"; then
+-        # ac_cv_func_connect=yes
+-        # don't!  it would cause AC_CHECK_FUNC to succeed next time configure is run
+-
+-$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
+-
+-    fi
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5
+-$as_echo_n "checking for library containing inet_ntop... " >&6; }
+-if ${ac_cv_search_inet_ntop+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char inet_ntop ();
+-int
+-main ()
+-{
+-return inet_ntop ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' resolv; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_inet_ntop=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_inet_ntop+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_inet_ntop+:} false; then :
+-
+-else
+-  ac_cv_search_inet_ntop=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5
+-$as_echo "$ac_cv_search_inet_ntop" >&6; }
+-ac_res=$ac_cv_search_inet_ntop
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-
+-# For OS X, Solaris, HP-UX, etc.: figure out if -liconv is needed.  We'll
+-# accept either iconv_open or libiconv_open, since some include files map
+-# the former to the latter.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing iconv_open" >&5
+-$as_echo_n "checking for library containing iconv_open... " >&6; }
+-if ${ac_cv_search_iconv_open+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char iconv_open ();
+-int
+-main ()
+-{
+-return iconv_open ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' iconv; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_iconv_open=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_iconv_open+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_iconv_open+:} false; then :
+-
+-else
+-  ac_cv_search_iconv_open=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_iconv_open" >&5
+-$as_echo "$ac_cv_search_iconv_open" >&6; }
+-ac_res=$ac_cv_search_iconv_open
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing libiconv_open" >&5
+-$as_echo_n "checking for library containing libiconv_open... " >&6; }
+-if ${ac_cv_search_libiconv_open+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char libiconv_open ();
+-int
+-main ()
+-{
+-return libiconv_open ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' iconv; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_libiconv_open=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_libiconv_open+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_libiconv_open+:} false; then :
+-
+-else
+-  ac_cv_search_libiconv_open=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_libiconv_open" >&5
+-$as_echo "$ac_cv_search_libiconv_open" >&6; }
+-ac_res=$ac_cv_search_libiconv_open
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+-$as_echo_n "checking for iconv declaration... " >&6; }
+-if ${am_cv_proto_iconv+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <stdlib.h>
+-#include <iconv.h>
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-#if defined(__STDC__) || defined(__cplusplus)
+-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+-#else
+-size_t iconv();
+-#endif
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  am_cv_proto_iconv_arg1=""
+-else
+-  am_cv_proto_iconv_arg1="const"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+-fi
+-
+-    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+-         }$am_cv_proto_iconv" >&5
+-$as_echo "${ac_t:-
+-         }$am_cv_proto_iconv" >&6; }
+-
+-cat >>confdefs.h <<_ACEOF
+-#define ICONV_CONST $am_cv_proto_iconv_arg1
+-_ACEOF
+-
+-
+-
+-ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
+-if test "x$ac_cv_func_inet_ntop" = xyes; then :
+-  $as_echo "#define HAVE_INET_NTOP 1" >>confdefs.h
+-
+-else
+-  case " $LIBOBJS " in
+-  *" inet_ntop.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS inet_ntop.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
+-if test "x$ac_cv_func_inet_pton" = xyes; then :
+-  $as_echo "#define HAVE_INET_PTON 1" >>confdefs.h
+-
+-else
+-  case " $LIBOBJS " in
+-  *" inet_pton.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS inet_pton.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-
+-
+-
+-
+-cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
+-$as_echo_n "checking for struct addrinfo... " >&6; }
+-if eval \${ac_cv_type_$cv+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-$ac_includes_default
+-#include <netdb.h>
+-int
+-main ()
+-{
+-struct addrinfo foo;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  eval "ac_cv_type_$cv=yes"
+-else
+-  eval "ac_cv_type_$cv=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
+-if test "$ac_foo" = yes; then
+-  ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+-if false; then
+-      ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
+-if test "x$ac_cv_type_struct_addrinfo" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_ADDRINFO 1
+-_ACEOF
+-
+-
+-fi
+-
+-fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define $ac_tr_hdr 1
+-_ACEOF
+-
+-fi
+-
+-
+-
+-cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
+-$as_echo_n "checking for struct sockaddr_storage... " >&6; }
+-if eval \${ac_cv_type_$cv+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-$ac_includes_default
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-int
+-main ()
+-{
+-struct sockaddr_storage foo;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  eval "ac_cv_type_$cv=yes"
+-else
+-  eval "ac_cv_type_$cv=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
+-if test "$ac_foo" = yes; then
+-  ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+-if false; then
+-      ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
+-if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+-_ACEOF
+-
+-
+-fi
+-
+-fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define $ac_tr_hdr 1
+-_ACEOF
+-
+-fi
+-
+-
+-# Irix 6.5 has getaddrinfo but not the corresponding defines, so use
+-#   builtin getaddrinfo if one of the defines don't exist
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether defines needed by getaddrinfo exist" >&5
+-$as_echo_n "checking whether defines needed by getaddrinfo exist... " >&6; }
+-if ${rsync_cv_HAVE_GETADDR_DEFINES+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-                      #include <sys/types.h>
+-                      #include <sys/socket.h>
+-                      #include <netdb.h>
+-                      #ifdef AI_PASSIVE
+-                      yes
+-                      #endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then :
+-  rsync_cv_HAVE_GETADDR_DEFINES=yes
+-else
+-  rsync_cv_HAVE_GETADDR_DEFINES=no
+-fi
+-rm -f conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_GETADDR_DEFINES" >&5
+-$as_echo "$rsync_cv_HAVE_GETADDR_DEFINES" >&6; }
+-if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addrinfo" = x"yes"; then :
+-
+-      # Tru64 UNIX has getaddrinfo() but has it renamed in libc as
+-      # something else so we must include <netdb.h> to get the
+-      # redefinition.
+-      for ac_func in getaddrinfo
+-do :
+-  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
+-if test "x$ac_cv_func_getaddrinfo" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_GETADDRINFO 1
+-_ACEOF
+-
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo by including <netdb.h>" >&5
+-$as_echo_n "checking for getaddrinfo by including <netdb.h>... " >&6; }
+-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-              #include <sys/socket.h>
+-              #include <netdb.h>
+-int
+-main ()
+-{
+-getaddrinfo(NULL, NULL, NULL, NULL);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
+-
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                      case " $LIBOBJS " in
+-  *" getaddrinfo.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS getaddrinfo.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-done
+-
+-
+-else
+-  case " $LIBOBJS " in
+-  *" getaddrinfo.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS getaddrinfo.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-"
+-if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
+-
+-$as_echo "#define HAVE_SOCKADDR_LEN 1" >>confdefs.h
+-
+-fi
+-
+-
+-ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netinet/in.h>
+-
+-"
+-if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then :
+-
+-$as_echo "#define HAVE_SOCKADDR_IN_LEN 1" >>confdefs.h
+-
+-fi
+-
+-
+-ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netinet/in.h>
+-
+-"
+-if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = xyes; then :
+-
+-$as_echo "#define HAVE_SOCKADDR_UN_LEN 1" >>confdefs.h
+-
+-fi
+-
+-
+-ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netinet/in.h>
+-
+-"
+-if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes; then :
+-
+-$as_echo "#define HAVE_SOCKADDR_IN6_SCOPE_ID 1" >>confdefs.h
+-
+-fi
+-
+-
+-
+-
+-cv=`echo "struct stat64" | sed 'y%./+- %__p__%'`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat64" >&5
+-$as_echo_n "checking for struct stat64... " >&6; }
+-if eval \${ac_cv_type_$cv+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-$ac_includes_default
+-#include <stdio.h>
+-#if HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-#if HAVE_SYS_STAT_H
+-# include <sys/stat.h>
+-#endif
+-#if STDC_HEADERS
+-# include <stdlib.h>
+-# include <stddef.h>
+-#else
+-# if HAVE_STDLIB_H
+-#  include <stdlib.h>
+-# endif
+-#endif
+-
+-int
+-main ()
+-{
+-struct stat64 foo;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  eval "ac_cv_type_$cv=yes"
+-else
+-  eval "ac_cv_type_$cv=no"
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_foo=`eval echo \\$ac_cv_type_$cv`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+-$as_echo "$ac_foo" >&6; }
+-if test "$ac_foo" = yes; then
+-  ac_tr_hdr=HAVE_`echo struct stat64 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+-if false; then
+-      ac_fn_c_check_type "$LINENO" "struct stat64" "ac_cv_type_struct_stat64" "$ac_includes_default"
+-if test "x$ac_cv_type_struct_stat64" = xyes; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT64 1
+-_ACEOF
+-
+-
+-fi
+-
+-fi
+-
+-cat >>confdefs.h <<_ACEOF
+-#define $ac_tr_hdr 1
+-_ACEOF
+-
+-fi
+-
+-
+-# if we can't find strcasecmp, look in -lresolv (for Unixware at least)
+-#
+-for ac_func in strcasecmp
+-do :
+-  ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+-if test "x$ac_cv_func_strcasecmp" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRCASECMP 1
+-_ACEOF
+-
+-fi
+-done
+-
+-if test x"$ac_cv_func_strcasecmp" = x"no"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp in -lresolv" >&5
+-$as_echo_n "checking for strcasecmp in -lresolv... " >&6; }
+-if ${ac_cv_lib_resolv_strcasecmp+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char strcasecmp ();
+-int
+-main ()
+-{
+-return strcasecmp ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_resolv_strcasecmp=yes
+-else
+-  ac_cv_lib_resolv_strcasecmp=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_strcasecmp" >&5
+-$as_echo "$ac_cv_lib_resolv_strcasecmp" >&6; }
+-if test "x$ac_cv_lib_resolv_strcasecmp" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
+-_ACEOF
+-
+-  LIBS="-lresolv $LIBS"
+-
+-fi
+-
+-fi
+-
+-for ac_func in aclsort
+-do :
+-  ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort"
+-if test "x$ac_cv_func_aclsort" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_ACLSORT 1
+-_ACEOF
+-
+-fi
+-done
+-
+-if test x"$ac_cv_func_aclsort" = x"no"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aclsort in -lsec" >&5
+-$as_echo_n "checking for aclsort in -lsec... " >&6; }
+-if ${ac_cv_lib_sec_aclsort+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsec  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char aclsort ();
+-int
+-main ()
+-{
+-return aclsort ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_sec_aclsort=yes
+-else
+-  ac_cv_lib_sec_aclsort=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_aclsort" >&5
+-$as_echo "$ac_cv_lib_sec_aclsort" >&6; }
+-if test "x$ac_cv_lib_sec_aclsort" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBSEC 1
+-_ACEOF
+-
+-  LIBS="-lsec $LIBS"
+-
+-fi
+-
+-fi
+-
+-
+-
+-
+-
+-  for ac_header in $ac_header_list
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+-"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5
+-$as_echo_n "checking whether utime accepts a null argument... " >&6; }
+-if ${ac_cv_func_utime_null+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  rm -f conftest.data; >conftest.data
+-# Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
+-if test "$cross_compiling" = yes; then :
+-  ac_cv_func_utime_null='guessing yes'
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-             #ifdef HAVE_UTIME_H
+-             # include <utime.h>
+-             #endif
+-int
+-main ()
+-{
+-struct stat s, t;
+-  return ! (stat ("conftest.data", &s) == 0
+-          && utime ("conftest.data", 0) == 0
+-          && stat ("conftest.data", &t) == 0
+-          && t.st_mtime >= s.st_mtime
+-          && t.st_mtime - s.st_mtime < 120);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_utime_null=yes
+-else
+-  ac_cv_func_utime_null=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5
+-$as_echo "$ac_cv_func_utime_null" >&6; }
+-if test "x$ac_cv_func_utime_null" != xno; then
+-  ac_cv_func_utime_null=yes
+-
+-$as_echo "#define HAVE_UTIME_NULL 1" >>confdefs.h
+-
+-fi
+-rm -f conftest.data
+-
+-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+-if test "x$ac_cv_type_size_t" = xyes; then :
+-
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned int
+-_ACEOF
+-
+-fi
+-
+-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+-# for constant arguments.  Useless!
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+-$as_echo_n "checking for working alloca.h... " >&6; }
+-if ${ac_cv_working_alloca_h+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <alloca.h>
+-int
+-main ()
+-{
+-char *p = (char *) alloca (2 * sizeof (int));
+-                        if (p) return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_working_alloca_h=yes
+-else
+-  ac_cv_working_alloca_h=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+-$as_echo "$ac_cv_working_alloca_h" >&6; }
+-if test $ac_cv_working_alloca_h = yes; then
+-
+-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+-$as_echo_n "checking for alloca... " >&6; }
+-if ${ac_cv_func_alloca_works+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifdef __GNUC__
+-# define alloca __builtin_alloca
+-#else
+-# ifdef _MSC_VER
+-#  include <malloc.h>
+-#  define alloca _alloca
+-# else
+-#  ifdef HAVE_ALLOCA_H
+-#   include <alloca.h>
+-#  else
+-#   ifdef _AIX
+- #pragma alloca
+-#   else
+-#    ifndef alloca /* predefined by HP cc +Olibcalls */
+-void *alloca (size_t);
+-#    endif
+-#   endif
+-#  endif
+-# endif
+-#endif
+-
+-int
+-main ()
+-{
+-char *p = (char *) alloca (1);
+-                                  if (p) return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_func_alloca_works=yes
+-else
+-  ac_cv_func_alloca_works=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+-$as_echo "$ac_cv_func_alloca_works" >&6; }
+-
+-if test $ac_cv_func_alloca_works = yes; then
+-
+-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+-
+-else
+-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+-# that cause trouble.  Some versions do not even contain alloca or
+-# contain a buggy version.  If you still want to use their alloca,
+-# use ar to extract alloca.o from them instead of compiling alloca.c.
+-
+-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+-
+-$as_echo "#define C_ALLOCA 1" >>confdefs.h
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+-if ${ac_cv_os_cray+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#if defined CRAY && ! defined CRAY2
+-webecray
+-#else
+-wenotbecray
+-#endif
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "webecray" >/dev/null 2>&1; then :
+-  ac_cv_os_cray=yes
+-else
+-  ac_cv_os_cray=no
+-fi
+-rm -f conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+-$as_echo "$ac_cv_os_cray" >&6; }
+-if test $ac_cv_os_cray = yes; then
+-  for ac_func in _getb67 GETB67 getb67; do
+-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-
+-cat >>confdefs.h <<_ACEOF
+-#define CRAY_STACKSEG_END $ac_func
+-_ACEOF
+-
+-    break
+-fi
+-
+-  done
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+-$as_echo_n "checking stack direction for C alloca... " >&6; }
+-if ${ac_cv_c_stack_direction+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_c_stack_direction=0
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-find_stack_direction (int *addr, int depth)
+-{
+-  int dir, dummy = 0;
+-  if (! addr)
+-    addr = &dummy;
+-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+-  return dir + dummy;
+-}
+-
+-int
+-main (int argc, char **argv)
+-{
+-  return find_stack_direction (0, argc + !argv + 20) < 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_c_stack_direction=1
+-else
+-  ac_cv_c_stack_direction=-1
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+-$as_echo "$ac_cv_c_stack_direction" >&6; }
+-cat >>confdefs.h <<_ACEOF
+-#define STACK_DIRECTION $ac_cv_c_stack_direction
+-_ACEOF
+-
+-
+-fi
+-
+-for ac_func in waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
+-    fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
+-    memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
+-    strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
+-    setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
+-    seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+-    extattr_get_link sigaction sigprocmask setattrlist getgrouplist \
+-    initgroups utimensat posix_fallocate attropen setvbuf usleep
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-if test x"$ac_cv_func_iconv_open" != x"yes"; then
+-    ac_fn_c_check_func "$LINENO" "libiconv_open" "ac_cv_func_libiconv_open"
+-if test "x$ac_cv_func_libiconv_open" = xyes; then :
+-  ac_cv_func_iconv_open=yes; $as_echo "#define HAVE_ICONV_OPEN 1" >>confdefs.h
+-
+-fi
+-
+-fi
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for useable fallocate" >&5
+-$as_echo_n "checking for useable fallocate... " >&6; }
+-if ${rsync_cv_have_fallocate+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <fcntl.h>
+-#include <sys/types.h>
+-int
+-main ()
+-{
+-fallocate(0, 0, 0, 0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  rsync_cv_have_fallocate=yes
+-else
+-  rsync_cv_have_fallocate=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_have_fallocate" >&5
+-$as_echo "$rsync_cv_have_fallocate" >&6; }
+-if test x"$rsync_cv_have_fallocate" = x"yes"; then
+-
+-$as_echo "#define HAVE_FALLOCATE 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYS_fallocate" >&5
+-$as_echo_n "checking for SYS_fallocate... " >&6; }
+-if ${rsync_cv_have_sys_fallocate+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/syscall.h>
+-#include <sys/types.h>
+-int
+-main ()
+-{
+-syscall(SYS_fallocate, 0, 0, (loff_t)0, (loff_t)0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  rsync_cv_have_sys_fallocate=yes
+-else
+-  rsync_cv_have_sys_fallocate=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_have_sys_fallocate" >&5
+-$as_echo "$rsync_cv_have_sys_fallocate" >&6; }
+-if test x"$rsync_cv_have_sys_fallocate" = x"yes"; then
+-
+-$as_echo "#define HAVE_SYS_FALLOCATE 1" >>confdefs.h
+-
+-fi
+-
+-if test x"$ac_cv_func_posix_fallocate" = x"yes"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether posix_fallocate is efficient" >&5
+-$as_echo_n "checking whether posix_fallocate is efficient... " >&6; }
+-    case $host_os in
+-    *cygwin*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_EFFICIENT_POSIX_FALLOCATE 1" >>confdefs.h
+-
+-      ;;
+-    *)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-      ;;
+-    esac
+-fi
+-
+-
+-for ac_func in getpgrp tcgetpgrp
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-if test $ac_cv_func_getpgrp = yes; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
+-$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
+-if ${ac_cv_func_getpgrp_void+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  # Use it with a single arg.
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-getpgrp (0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_func_getpgrp_void=no
+-else
+-  ac_cv_func_getpgrp_void=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpgrp_void" >&5
+-$as_echo "$ac_cv_func_getpgrp_void" >&6; }
+-if test $ac_cv_func_getpgrp_void = yes; then
+-
+-$as_echo "#define GETPGRP_VOID 1" >>confdefs.h
+-
+-fi
+-
+-fi
+-
+-# Check whether --enable-iconv-open was given.
+-if test "${enable_iconv_open+set}" = set; then :
+-  enableval=$enable_iconv_open;
+-else
+-  enable_iconv_open=$ac_cv_func_iconv_open
+-fi
+-
+-
+-if test x"$enable_iconv_open" != x"no"; then
+-
+-$as_echo "#define USE_ICONV_OPEN 1" >>confdefs.h
+-
+-fi
+-
+-# Check whether --enable-iconv was given.
+-if test "${enable_iconv+set}" = set; then :
+-  enableval=$enable_iconv;
+-else
+-  enable_iconv=$enable_iconv_open
+-fi
+-
+-
+-if test x"$enable_iconv" != x"no"; then
+-      if test x"$enable_iconv" = x"yes"; then
+-              $as_echo "#define ICONV_OPTION NULL" >>confdefs.h
+-
+-      else
+-              cat >>confdefs.h <<_ACEOF
+-#define ICONV_OPTION "$enable_iconv"
+-_ACEOF
+-
+-      fi
+-
+-$as_echo "#define UTF8_CHARSET \"UTF-8\"" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether chown() modifies symlinks" >&5
+-$as_echo_n "checking whether chown() modifies symlinks... " >&6; }
+-if ${rsync_cv_chown_modifies_symlink+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-  if test "$cross_compiling" = yes; then :
+-  rsync_cv_chown_modifies_symlink=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
+-#include <stdlib.h>
+-#include <errno.h>
+-    main() {
+-      char const *dangling_symlink = "conftest.dangle";
+-      unlink(dangling_symlink);
+-      if (symlink("conftest.no-such", dangling_symlink) < 0) abort();
+-      if (chown(dangling_symlink, getuid(), getgid()) < 0 && errno == ENOENT) exit(1);
+-      exit(0);
+-    }
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_chown_modifies_symlink=yes
+-else
+-  rsync_cv_chown_modifies_symlink=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_chown_modifies_symlink" >&5
+-$as_echo "$rsync_cv_chown_modifies_symlink" >&6; }
+-if test $rsync_cv_chown_modifies_symlink = yes; then
+-
+-$as_echo "#define CHOWN_MODIFIES_SYMLINK 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether link() can hard-link symlinks" >&5
+-$as_echo_n "checking whether link() can hard-link symlinks... " >&6; }
+-if ${rsync_cv_can_hardlink_symlink+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-  if test "$cross_compiling" = yes; then :
+-  rsync_cv_can_hardlink_symlink=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
+-#include <stdlib.h>
+-#include <errno.h>
+-#define FILENAME "conftest.dangle"
+-    main() {
+-      unlink(FILENAME);
+-      if (symlink("conftest.no-such", FILENAME) < 0) abort();
+-      unlink(FILENAME "2");
+-      if (link(FILENAME, FILENAME "2") < 0) exit(1);
+-      exit(0);
+-    }
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_can_hardlink_symlink=yes
+-else
+-  rsync_cv_can_hardlink_symlink=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_can_hardlink_symlink" >&5
+-$as_echo "$rsync_cv_can_hardlink_symlink" >&6; }
+-if test $rsync_cv_can_hardlink_symlink = yes; then
+-
+-$as_echo "#define CAN_HARDLINK_SYMLINK 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether link() can hard-link special files" >&5
+-$as_echo_n "checking whether link() can hard-link special files... " >&6; }
+-if ${rsync_cv_can_hardlink_special+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-  if test "$cross_compiling" = yes; then :
+-  rsync_cv_can_hardlink_special=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
+-#include <stdlib.h>
+-#include <errno.h>
+-#define FILENAME "conftest.fifi"
+-    main() {
+-      unlink(FILENAME);
+-      if (mkfifo(FILENAME, 0777) < 0) abort();
+-      unlink(FILENAME "2");
+-      if (link(FILENAME, FILENAME "2") < 0) exit(1);
+-      exit(0);
+-    }
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_can_hardlink_special=yes
+-else
+-  rsync_cv_can_hardlink_special=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_can_hardlink_special" >&5
+-$as_echo "$rsync_cv_can_hardlink_special" >&6; }
+-if test $rsync_cv_can_hardlink_special = yes; then
+-
+-$as_echo "#define CAN_HARDLINK_SPECIAL 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working socketpair" >&5
+-$as_echo_n "checking for working socketpair... " >&6; }
+-if ${rsync_cv_HAVE_SOCKETPAIR+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_HAVE_SOCKETPAIR=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-main() {
+-       int fd[2];
+-       exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_HAVE_SOCKETPAIR=yes
+-else
+-  rsync_cv_HAVE_SOCKETPAIR=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_SOCKETPAIR" >&5
+-$as_echo "$rsync_cv_HAVE_SOCKETPAIR" >&6; }
+-if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then
+-
+-$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+-
+-fi
+-
+-ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
+-if test "x$ac_cv_func_getpass" = xyes; then :
+-  $as_echo "#define HAVE_GETPASS 1" >>confdefs.h
+-
+-else
+-  case " $LIBOBJS " in
+-  *" getpass.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS getpass.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-
+-
+-if test x"$with_included_popt" != x"yes"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptGetContext in -lpopt" >&5
+-$as_echo_n "checking for poptGetContext in -lpopt... " >&6; }
+-if ${ac_cv_lib_popt_poptGetContext+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpopt  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char poptGetContext ();
+-int
+-main ()
+-{
+-return poptGetContext ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_popt_poptGetContext=yes
+-else
+-  ac_cv_lib_popt_poptGetContext=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptGetContext" >&5
+-$as_echo "$ac_cv_lib_popt_poptGetContext" >&6; }
+-if test "x$ac_cv_lib_popt_poptGetContext" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBPOPT 1
+-_ACEOF
+-
+-  LIBS="-lpopt $LIBS"
+-
+-else
+-  with_included_popt=yes
+-fi
+-
+-fi
+-if test x"$ac_cv_header_popt_popt_h" = x"yes"; then
+-    # If the system has /usr/include/popt/popt.h, we enable the
+-    # included popt because an attempt to "#include <popt/popt.h>"
+-    # would use our included header file anyway (due to -I.), and
+-    # might conflict with the system popt.
+-    with_included_popt=yes
+-elif test x"$ac_cv_header_popt_h" != x"yes"; then
+-    with_included_popt=yes
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use included libpopt" >&5
+-$as_echo_n "checking whether to use included libpopt... " >&6; }
+-if test x"$with_included_popt" = x"yes"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $srcdir/popt" >&5
+-$as_echo "$srcdir/popt" >&6; }
+-    BUILD_POPT='$(popt_OBJS)'
+-    CFLAGS="-I$srcdir/popt $CFLAGS"
+-    if test x"$ALLOCA" != x
+-    then
+-      # this can be removed when/if we add an included alloca.c;
+-      #  see autoconf documentation on AC_FUNC_ALLOCA
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: included libpopt will use malloc, not alloca (which wastes a small amount of memory)" >&5
+-$as_echo "$as_me: WARNING: included libpopt will use malloc, not alloca (which wastes a small amount of memory)" >&2;}
+-    fi
+-else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-# We default to using our zlib unless --with-included-zlib=no is given.
+-if test x"$with_included_zlib" != x"no"; then
+-    with_included_zlib=yes
+-elif test x"$ac_cv_header_zlib_h" != x"yes"; then
+-    with_included_zlib=yes
+-fi
+-if test x"$with_included_zlib" != x"yes"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflateParams in -lz" >&5
+-$as_echo_n "checking for deflateParams in -lz... " >&6; }
+-if ${ac_cv_lib_z_deflateParams+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lz  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char deflateParams ();
+-int
+-main ()
+-{
+-return deflateParams ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_z_deflateParams=yes
+-else
+-  ac_cv_lib_z_deflateParams=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflateParams" >&5
+-$as_echo "$ac_cv_lib_z_deflateParams" >&6; }
+-if test "x$ac_cv_lib_z_deflateParams" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBZ 1
+-_ACEOF
+-
+-  LIBS="-lz $LIBS"
+-
+-else
+-  with_included_zlib=yes
+-fi
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use included zlib" >&5
+-$as_echo_n "checking whether to use included zlib... " >&6; }
+-if test x"$with_included_zlib" = x"yes"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $srcdir/zlib" >&5
+-$as_echo "$srcdir/zlib" >&6; }
+-    BUILD_ZLIB='$(zlib_OBJS)'
+-    CFLAGS="-I$srcdir/zlib $CFLAGS"
+-else
+-
+-$as_echo "#define EXTERNAL_ZLIB 1" >>confdefs.h
+-
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned char" >&5
+-$as_echo_n "checking for unsigned char... " >&6; }
+-if ${rsync_cv_SIGNED_CHAR_OK+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-signed char *s = ""
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  rsync_cv_SIGNED_CHAR_OK=yes
+-else
+-  rsync_cv_SIGNED_CHAR_OK=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_SIGNED_CHAR_OK" >&5
+-$as_echo "$rsync_cv_SIGNED_CHAR_OK" >&6; }
+-if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then
+-
+-$as_echo "#define SIGNED_CHAR_OK 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
+-$as_echo_n "checking for broken readdir... " >&6; }
+-if ${rsync_cv_HAVE_BROKEN_READDIR+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_HAVE_BROKEN_READDIR=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <dirent.h>
+-main() { struct dirent *di; DIR *d = opendir("."); di = readdir(d);
+-if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
+-di->d_name[0] == 0) exit(0); exit(1);}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_HAVE_BROKEN_READDIR=yes
+-else
+-  rsync_cv_HAVE_BROKEN_READDIR=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_BROKEN_READDIR" >&5
+-$as_echo "$rsync_cv_HAVE_BROKEN_READDIR" >&6; }
+-if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then
+-
+-$as_echo "#define HAVE_BROKEN_READDIR 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5
+-$as_echo_n "checking for utimbuf... " >&6; }
+-if ${rsync_cv_HAVE_STRUCT_UTIMBUF+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <utime.h>
+-int
+-main ()
+-{
+-struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  rsync_cv_HAVE_STRUCT_UTIMBUF=yes
+-else
+-  rsync_cv_HAVE_STRUCT_UTIMBUF=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_STRUCT_UTIMBUF" >&5
+-$as_echo "$rsync_cv_HAVE_STRUCT_UTIMBUF" >&6; }
+-if test x"$rsync_cv_HAVE_STRUCT_UTIMBUF" = x"yes"; then
+-
+-$as_echo "#define HAVE_STRUCT_UTIMBUF 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gettimeofday takes tz argument" >&5
+-$as_echo_n "checking if gettimeofday takes tz argument... " >&6; }
+-if ${rsync_cv_HAVE_GETTIMEOFDAY_TZ+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/time.h>
+-#include <unistd.h>
+-int
+-main ()
+-{
+-struct timeval tv; exit(gettimeofday(&tv, NULL));
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes
+-else
+-  rsync_cv_HAVE_GETTIMEOFDAY_TZ=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_GETTIMEOFDAY_TZ" >&5
+-$as_echo "$rsync_cv_HAVE_GETTIMEOFDAY_TZ" >&6; }
+-if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" != x"no"; then
+-
+-$as_echo "#define HAVE_GETTIMEOFDAY_TZ 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
+-$as_echo_n "checking for C99 vsnprintf... " >&6; }
+-if ${rsync_cv_HAVE_C99_VSNPRINTF+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_HAVE_C99_VSNPRINTF=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <sys/types.h>
+-#include <stdarg.h>
+-void foo(const char *format, ...) {
+-       va_list ap;
+-       int len;
+-       char buf[5];
+-
+-       va_start(ap, format);
+-       len = vsnprintf(0, 0, format, ap);
+-       va_end(ap);
+-       if (len != 5) exit(1);
+-
+-       if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1);
+-
+-       exit(0);
+-}
+-main() { foo("hello"); }
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_HAVE_C99_VSNPRINTF=yes
+-else
+-  rsync_cv_HAVE_C99_VSNPRINTF=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_C99_VSNPRINTF" >&5
+-$as_echo "$rsync_cv_HAVE_C99_VSNPRINTF" >&6; }
+-if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
+-
+-$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h
+-
+-fi
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
+-$as_echo_n "checking for secure mkstemp... " >&6; }
+-if ${rsync_cv_HAVE_SECURE_MKSTEMP+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_HAVE_SECURE_MKSTEMP=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <unistd.h>
+-main() {
+-  struct stat st;
+-  char tpl[20]="/tmp/test.XXXXXX";
+-  int fd = mkstemp(tpl);
+-  if (fd == -1) exit(1);
+-  unlink(tpl);
+-  if (fstat(fd, &st) != 0) exit(1);
+-  if ((st.st_mode & 0777) != 0600) exit(1);
+-  exit(0);
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_HAVE_SECURE_MKSTEMP=yes
+-else
+-  rsync_cv_HAVE_SECURE_MKSTEMP=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_HAVE_SECURE_MKSTEMP" >&5
+-$as_echo "$rsync_cv_HAVE_SECURE_MKSTEMP" >&6; }
+-if test x"$rsync_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
+-    case $host_os in
+-    hpux*)
+-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping broken HP-UX mkstemp() -- using mktemp() instead" >&5
+-$as_echo "$as_me: WARNING: Skipping broken HP-UX mkstemp() -- using mktemp() instead" >&2;}
+-      ;;
+-    *)
+-
+-$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
+-
+-      ;;
+-    esac
+-fi
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mknod creates FIFOs" >&5
+-$as_echo_n "checking if mknod creates FIFOs... " >&6; }
+-if ${rsync_cv_MKNOD_CREATES_FIFOS+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_MKNOD_CREATES_FIFOS=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <sys/stat.h>
+-#include <errno.h>
+-main() { int rc, ec; char *fn = "fifo-test";
+-unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn);
+-if (rc) {printf("(%d %d) ",rc,ec); return ec;}
+-return 0;}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_MKNOD_CREATES_FIFOS=yes
+-else
+-  rsync_cv_MKNOD_CREATES_FIFOS=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_MKNOD_CREATES_FIFOS" >&5
+-$as_echo "$rsync_cv_MKNOD_CREATES_FIFOS" >&6; }
+-if test x"$rsync_cv_MKNOD_CREATES_FIFOS" = x"yes"; then
+-
+-$as_echo "#define MKNOD_CREATES_FIFOS 1" >>confdefs.h
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mknod creates sockets" >&5
+-$as_echo_n "checking if mknod creates sockets... " >&6; }
+-if ${rsync_cv_MKNOD_CREATES_SOCKETS+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-if test "$cross_compiling" = yes; then :
+-  rsync_cv_MKNOD_CREATES_SOCKETS=cross
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <sys/stat.h>
+-#include <errno.h>
+-main() { int rc, ec; char *fn = "sock-test";
+-unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn);
+-if (rc) {printf("(%d %d) ",rc,ec); return ec;}
+-return 0;}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  rsync_cv_MKNOD_CREATES_SOCKETS=yes
+-else
+-  rsync_cv_MKNOD_CREATES_SOCKETS=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_MKNOD_CREATES_SOCKETS" >&5
+-$as_echo "$rsync_cv_MKNOD_CREATES_SOCKETS" >&6; }
+-if test x"$rsync_cv_MKNOD_CREATES_SOCKETS" = x"yes"; then
+-
+-$as_echo "#define MKNOD_CREATES_SOCKETS 1" >>confdefs.h
+-
+-fi
+-
+-#
+-# The following test was mostly taken from the tcl/tk plus patches
+-#
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -c -o works" >&5
+-$as_echo_n "checking whether -c -o works... " >&6; }
+-if ${rsync_cv_DASHC_WORKS_WITH_DASHO+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-rm -rf conftest*
+-cat > conftest.$ac_ext <<EOF
+-int main() { return 0; }
+-EOF
+-${CC-cc} -c -o conftest..o conftest.$ac_ext
+-if test -f conftest..o; then
+-    rsync_cv_DASHC_WORKS_WITH_DASHO=yes
+-else
+-    rsync_cv_DASHC_WORKS_WITH_DASHO=no
+-fi
+-rm -rf conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_cv_DASHC_WORKS_WITH_DASHO" >&5
+-$as_echo "$rsync_cv_DASHC_WORKS_WITH_DASHO" >&6; }
+-if test x"$rsync_cv_DASHC_WORKS_WITH_DASHO" = x"yes"; then
+-    OBJ_SAVE="#"
+-    OBJ_RESTORE="#"
+-    CC_SHOBJ_FLAG='-o $@'
+-else
+-    OBJ_SAVE='        @b=`basename $@ .o`;rm -f $$b.o.sav;if test -f $$b.o; then mv $$b.o $$b.o.sav;fi;'
+-    OBJ_RESTORE='     @b=`basename $@ .o`;if test "$$b.o" != "$@"; then mv $$b.o $@; if test -f $$b.o.sav; then mv $$b.o.sav $$b.o; fi; fi'
+-    CC_SHOBJ_FLAG=""
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-# Extract the first word of "stunnel", so it can be a program name with args.
+-set dummy stunnel; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_STUNNEL+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $STUNNEL in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_STUNNEL="$STUNNEL" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_STUNNEL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_STUNNEL" && ac_cv_path_STUNNEL="stunnel"
+-  ;;
+-esac
+-fi
+-STUNNEL=$ac_cv_path_STUNNEL
+-if test -n "$STUNNEL"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STUNNEL" >&5
+-$as_echo "$STUNNEL" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-# Extract the first word of "stunnel4", so it can be a program name with args.
+-set dummy stunnel4; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_STUNNEL4+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $STUNNEL4 in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_STUNNEL4="$STUNNEL4" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_STUNNEL4="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_STUNNEL4" && ac_cv_path_STUNNEL4="$STUNNEL"
+-  ;;
+-esac
+-fi
+-STUNNEL4=$ac_cv_path_STUNNEL4
+-if test -n "$STUNNEL4"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STUNNEL4" >&5
+-$as_echo "$STUNNEL4" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-
+-for ac_func in _acl __acl _facl __facl
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-#################################################
+-# check for ACL support
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support ACLs" >&5
+-$as_echo_n "checking whether to support ACLs... " >&6; }
+-# Check whether --enable-acl-support was given.
+-if test "${enable_acl_support+set}" = set; then :
+-  enableval=$enable_acl_support;
+-fi
+-
+-
+-if test x"$enable_acl_support" = x"no"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-else
+-    case "$host_os" in
+-    *sysv5*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using UnixWare ACLs" >&5
+-$as_echo "Using UnixWare ACLs" >&6; }
+-
+-$as_echo "#define HAVE_UNIXWARE_ACLS 1" >>confdefs.h
+-
+-
+-$as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-      ;;
+-    solaris*|*cygwin*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using solaris ACLs" >&5
+-$as_echo "Using solaris ACLs" >&6; }
+-
+-$as_echo "#define HAVE_SOLARIS_ACLS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-      ;;
+-    *hpux*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using HPUX ACLs" >&5
+-$as_echo "Using HPUX ACLs" >&6; }
+-
+-$as_echo "#define HAVE_HPUX_ACLS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-      ;;
+-    *irix*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using IRIX ACLs" >&5
+-$as_echo "Using IRIX ACLs" >&6; }
+-
+-$as_echo "#define HAVE_IRIX_ACLS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-      ;;
+-    *aix*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using AIX ACLs" >&5
+-$as_echo "Using AIX ACLs" >&6; }
+-
+-$as_echo "#define HAVE_AIX_ACLS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-      ;;
+-    *osf*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Tru64 ACLs" >&5
+-$as_echo "Using Tru64 ACLs" >&6; }
+-
+-$as_echo "#define HAVE_TRU64_ACLS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-      LIBS="$LIBS -lpacl"
+-      ;;
+-    darwin*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OS X ACLs" >&5
+-$as_echo "Using OS X ACLs" >&6; }
+-
+-$as_echo "#define HAVE_OSX_ACLS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-      ;;
+-    *)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: running tests:" >&5
+-$as_echo "running tests:" >&6; }
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
+-$as_echo_n "checking for acl_get_file in -lacl... " >&6; }
+-if ${ac_cv_lib_acl_acl_get_file+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lacl  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char acl_get_file ();
+-int
+-main ()
+-{
+-return acl_get_file ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_acl_acl_get_file=yes
+-else
+-  ac_cv_lib_acl_acl_get_file=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
+-$as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
+-if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBACL 1
+-_ACEOF
+-
+-  LIBS="-lacl $LIBS"
+-
+-fi
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL support" >&5
+-$as_echo_n "checking for ACL support... " >&6; }
+-if ${samba_cv_HAVE_POSIX_ACLS+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/acl.h>
+-int
+-main ()
+-{
+- acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  samba_cv_HAVE_POSIX_ACLS=yes
+-else
+-  samba_cv_HAVE_POSIX_ACLS=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_POSIX_ACLS" >&5
+-$as_echo "$samba_cv_HAVE_POSIX_ACLS" >&6; }
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking ACL test results" >&5
+-$as_echo_n "checking ACL test results... " >&6; }
+-      if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
+-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using posix ACLs" >&5
+-$as_echo "Using posix ACLs" >&6; }
+-
+-$as_echo "#define HAVE_POSIX_ACLS 1" >>confdefs.h
+-
+-          $as_echo "#define SUPPORT_ACLS 1" >>confdefs.h
+-
+-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_perm_np" >&5
+-$as_echo_n "checking for acl_get_perm_np... " >&6; }
+-if ${samba_cv_HAVE_ACL_GET_PERM_NP+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/acl.h>
+-int
+-main ()
+-{
+- acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  samba_cv_HAVE_ACL_GET_PERM_NP=yes
+-else
+-  samba_cv_HAVE_ACL_GET_PERM_NP=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_ACL_GET_PERM_NP" >&5
+-$as_echo "$samba_cv_HAVE_ACL_GET_PERM_NP" >&6; }
+-          if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
+-
+-$as_echo "#define HAVE_ACL_GET_PERM_NP 1" >>confdefs.h
+-
+-          fi
+-      else
+-          if test x"$enable_acl_support" = x"yes"; then
+-              as_fn_error $? "Failed to find ACL support" "$LINENO" 5
+-          else
+-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: No ACL support found" >&5
+-$as_echo "No ACL support found" >&6; }
+-          fi
+-      fi
+-      ;;
+-    esac
+-fi
+-
+-#################################################
+-# check for extended attribute support
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support extended attributes" >&5
+-$as_echo_n "checking whether to support extended attributes... " >&6; }
+-# Check whether --enable-xattr-support was given.
+-if test "${enable_xattr_support+set}" = set; then :
+-  enableval=$enable_xattr_support;
+-else
+-  case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link$ac_cv_func_attropen" in
+-      *yes*) enable_xattr_support=maybe ;;
+-      *) enable_xattr_support=no ;;
+-      esac
+-fi
+-
+-
+-if test x"$enable_xattr_support" = x"no"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-else
+-    case "$host_os" in
+-    *linux*|*netbsd*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Linux xattrs" >&5
+-$as_echo "Using Linux xattrs" >&6; }
+-
+-$as_echo "#define HAVE_LINUX_XATTRS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_XATTRS 1" >>confdefs.h
+-
+-
+-$as_echo "#define NO_SYMLINK_USER_XATTRS 1" >>confdefs.h
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getxattr in -lattr" >&5
+-$as_echo_n "checking for getxattr in -lattr... " >&6; }
+-if ${ac_cv_lib_attr_getxattr+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lattr  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char getxattr ();
+-int
+-main ()
+-{
+-return getxattr ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_attr_getxattr=yes
+-else
+-  ac_cv_lib_attr_getxattr=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_getxattr" >&5
+-$as_echo "$ac_cv_lib_attr_getxattr" >&6; }
+-if test "x$ac_cv_lib_attr_getxattr" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBATTR 1
+-_ACEOF
+-
+-  LIBS="-lattr $LIBS"
+-
+-fi
+-
+-      ;;
+-    darwin*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OS X xattrs" >&5
+-$as_echo "Using OS X xattrs" >&6; }
+-
+-$as_echo "#define HAVE_OSX_XATTRS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_XATTRS 1" >>confdefs.h
+-
+-
+-$as_echo "#define NO_DEVICE_XATTRS 1" >>confdefs.h
+-
+-
+-$as_echo "#define NO_SPECIAL_XATTRS 1" >>confdefs.h
+-
+-      ;;
+-    freebsd*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using FreeBSD extattrs" >&5
+-$as_echo "Using FreeBSD extattrs" >&6; }
+-
+-$as_echo "#define HAVE_FREEBSD_XATTRS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_XATTRS 1" >>confdefs.h
+-
+-      ;;
+-    solaris*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Solaris xattrs" >&5
+-$as_echo "Using Solaris xattrs" >&6; }
+-
+-$as_echo "#define HAVE_SOLARIS_XATTRS 1" >>confdefs.h
+-
+-      $as_echo "#define SUPPORT_XATTRS 1" >>confdefs.h
+-
+-
+-$as_echo "#define NO_SYMLINK_XATTRS 1" >>confdefs.h
+-
+-      ;;
+-    *)
+-      if test x"$enable_xattr_support" = x"yes"; then
+-          as_fn_error $? "Failed to find extended attribute support" "$LINENO" 5
+-      else
+-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: No extended attribute support found" >&5
+-$as_echo "No extended attribute support found" >&6; }
+-      fi
+-      ;;
+-    esac
+-fi
+-
+-if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"$enable_iconv" = x"no"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-unused-parameter" >&5
+-$as_echo_n "checking whether $CC supports -Wno-unused-parameter... " >&6; }
+-    OLD_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS -Wno-unused-parameter"
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdio.h>
+-int
+-main ()
+-{
+-printf("hello\n");
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  rsync_warn_flag=yes
+-else
+-  rsync_warn_flag=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rsync_warn_flag" >&5
+-$as_echo "$rsync_warn_flag" >&6; }
+-    if test x"$rsync_warn_flag" = x"no"; then
+-      CFLAGS="$OLD_CFLAGS"
+-    fi
+-fi
+-
+-case "$CC" in
+-' checker'*|checker*)
+-
+-$as_echo "#define FORCE_FD_ZERO_MEMSET 1" >>confdefs.h
+-
+-    ;;
+-esac
+-
+-ac_config_files="$ac_config_files Makefile lib/dummy zlib/dummy popt/dummy shconfig"
+-
+-cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
+-
+-_ACEOF
+-
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, we kill variables containing newlines.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-(
+-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+-    eval ac_val=\$$ac_var
+-    case $ac_val in #(
+-    *${as_nl}*)
+-      case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+-      esac
+-      case $ac_var in #(
+-      _ | IFS | as_nl) ;; #(
+-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+-      *) { eval $ac_var=; unset $ac_var;} ;;
+-      esac ;;
+-    esac
+-  done
+-
+-  (set) 2>&1 |
+-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+-    *${as_nl}ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes: double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \.
+-      sed -n \
+-      "s/'/'\\\\''/g;
+-        s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;; #(
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+-      ;;
+-    esac |
+-    sort
+-) |
+-  sed '
+-     /^ac_cv_env_/b end
+-     t clear
+-     :clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     :end' >>confcache
+-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+-  if test -w "$cache_file"; then
+-    if test "x$cache_file" != "x/dev/null"; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+-$as_echo "$as_me: updating cache $cache_file" >&6;}
+-      if test ! -f "$cache_file" || test -h "$cache_file"; then
+-      cat confcache >"$cache_file"
+-      else
+-        case $cache_file in #(
+-        */* | ?:*)
+-        mv -f confcache "$cache_file"$$ &&
+-        mv -f "$cache_file"$$ "$cache_file" ;; #(
+-        *)
+-        mv -f confcache "$cache_file" ;;
+-      esac
+-      fi
+-    fi
+-  else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+-  fi
+-fi
+-rm -f confcache
+-
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-# Let make expand exec_prefix.
+-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-
+-DEFS=-DHAVE_CONFIG_H
+-
+-ac_libobjs=
+-ac_ltlibobjs=
+-U=
+-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+-  # 1. Remove the extension, and $U if already installed.
+-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+-  #    will be set to the directory where LIBOBJS objects are built.
+-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+-done
+-LIBOBJS=$ac_libobjs
+-
+-LTLIBOBJS=$ac_ltlibobjs
+-
+-
+-
+-
+-: "${CONFIG_STATUS=./config.status}"
+-ac_write_fail=0
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-as_write_fail=0
+-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+-#! $SHELL
+-# Generated by $as_me.
+-# Run this file to recreate the current configuration.
+-# Compiler output produced by configure, useful for debugging
+-# configure, is in config.log if it exists.
+-
+-debug=false
+-ac_cs_recheck=false
+-ac_cs_silent=false
+-
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-export SHELL
+-_ASEOF
+-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+-## -------------------- ##
+-## M4sh Initialization. ##
+-## -------------------- ##
+-
+-# Be more Bourne compatible
+-DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+-  emulate sh
+-  NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in #(
+-  *posix*) :
+-    set -o posix ;; #(
+-  *) :
+-     ;;
+-esac
+-fi
+-
+-
+-as_nl='
+-'
+-export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
+-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-# Prefer a ksh shell builtin over an external printf program on Solaris,
+-# but without wasting forks for bash or zsh.
+-if test -z "$BASH_VERSION$ZSH_VERSION" \
+-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+-  as_echo='print -r --'
+-  as_echo_n='print -rn --'
+-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+-  as_echo='printf %s\n'
+-  as_echo_n='printf %s'
+-else
+-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+-    as_echo_n='/usr/ucb/echo -n'
+-  else
+-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+-    as_echo_n_body='eval
+-      arg=$1;
+-      case $arg in #(
+-      *"$as_nl"*)
+-      expr "X$arg" : "X\\(.*\\)$as_nl";
+-      arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+-      esac;
+-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+-    '
+-    export as_echo_n_body
+-    as_echo_n='sh -c $as_echo_n_body as_echo'
+-  fi
+-  export as_echo_body
+-  as_echo='sh -c $as_echo_body as_echo'
+-fi
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  PATH_SEPARATOR=:
+-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+-      PATH_SEPARATOR=';'
+-  }
+-fi
+-
+-
+-# IFS
+-# We need space, tab and new line, in precisely that order.  Quoting is
+-# there to prevent editors from complaining about space-tab.
+-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+-# splitting by setting IFS to empty value.)
+-IFS=" ""      $as_nl"
+-
+-# Find who we are.  Look in the path if we contain no directory separator.
+-as_myself=
+-case $0 in #((
+-  *[\\/]* ) as_myself=$0 ;;
+-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-  done
+-IFS=$as_save_IFS
+-
+-     ;;
+-esac
+-# We did not find ourselves, most probably we were run as `sh COMMAND'
+-# in which case we are not to be found in the path.
+-if test "x$as_myself" = x; then
+-  as_myself=$0
+-fi
+-if test ! -f "$as_myself"; then
+-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+-  exit 1
+-fi
+-
+-# Unset variables that we do not need and which cause bugs (e.g. in
+-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+-# suppresses any "Segmentation fault" message there.  '((' could
+-# trigger a bug in pdksh 5.2.14.
+-for as_var in BASH_ENV ENV MAIL MAILPATH
+-do eval test x\${$as_var+set} = xset \
+-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+-done
+-PS1='$ '
+-PS2='> '
+-PS4='+ '
+-
+-# NLS nuisances.
+-LC_ALL=C
+-export LC_ALL
+-LANGUAGE=C
+-export LANGUAGE
+-
+-# CDPATH.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-
+-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+-# ----------------------------------------
+-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with STATUS, using 1 if that was 0.
+-as_fn_error ()
+-{
+-  as_status=$1; test $as_status -eq 0 && as_status=1
+-  if test "$4"; then
+-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+-  fi
+-  $as_echo "$as_me: error: $2" >&2
+-  as_fn_exit $as_status
+-} # as_fn_error
+-
+-
+-# as_fn_set_status STATUS
+-# -----------------------
+-# Set $? to STATUS, without forking.
+-as_fn_set_status ()
+-{
+-  return $1
+-} # as_fn_set_status
+-
+-# as_fn_exit STATUS
+-# -----------------
+-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+-as_fn_exit ()
+-{
+-  set +e
+-  as_fn_set_status $1
+-  exit $1
+-} # as_fn_exit
+-
+-# as_fn_unset VAR
+-# ---------------
+-# Portably unset VAR.
+-as_fn_unset ()
+-{
+-  { eval $1=; unset $1;}
+-}
+-as_unset=as_fn_unset
+-# as_fn_append VAR VALUE
+-# ----------------------
+-# Append the text in VALUE to the end of the definition contained in VAR. Take
+-# advantage of any shell optimizations that allow amortized linear growth over
+-# repeated appends, instead of the typical quadratic growth present in naive
+-# implementations.
+-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+-  eval 'as_fn_append ()
+-  {
+-    eval $1+=\$2
+-  }'
+-else
+-  as_fn_append ()
+-  {
+-    eval $1=\$$1\$2
+-  }
+-fi # as_fn_append
+-
+-# as_fn_arith ARG...
+-# ------------------
+-# Perform arithmetic evaluation on the ARGs, and store the result in the
+-# global $as_val. Take advantage of shells that can avoid forks. The arguments
+-# must be portable across $(()) and expr.
+-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+-  eval 'as_fn_arith ()
+-  {
+-    as_val=$(( $* ))
+-  }'
+-else
+-  as_fn_arith ()
+-  {
+-    as_val=`expr "$@" || test $? -eq 1`
+-  }
+-fi # as_fn_arith
+-
+-
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+-  as_basename=basename
+-else
+-  as_basename=false
+-fi
+-
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+-  as_dirname=dirname
+-else
+-  as_dirname=false
+-fi
+-
+-as_me=`$as_basename -- "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-       X"$0" : 'X\(//\)$' \| \
+-       X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\/\(\/\/\)$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\/\(\/\).*/{
+-          s//\1/
+-          q
+-        }
+-        s/.*/./; q'`
+-
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in #(((((
+--n*)
+-  case `echo 'xy\c'` in
+-  *c*) ECHO_T='       ';;     # ECHO_T is single tab character.
+-  xy)  ECHO_C='\c';;
+-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+-       ECHO_T='       ';;
+-  esac;;
+-*)
+-  ECHO_N='-n';;
+-esac
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-if test -d conf$$.dir; then
+-  rm -f conf$$.dir/conf$$.file
+-else
+-  rm -f conf$$.dir
+-  mkdir conf$$.dir 2>/dev/null
+-fi
+-if (echo >conf$$.file) 2>/dev/null; then
+-  if ln -s conf$$.file conf$$ 2>/dev/null; then
+-    as_ln_s='ln -s'
+-    # ... but there are two gotchas:
+-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -pR'.
+-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -pR'
+-  elif ln conf$$.file conf$$ 2>/dev/null; then
+-    as_ln_s=ln
+-  else
+-    as_ln_s='cp -pR'
+-  fi
+-else
+-  as_ln_s='cp -pR'
+-fi
+-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+-rmdir conf$$.dir 2>/dev/null
+-
+-
+-# as_fn_mkdir_p
+-# -------------
+-# Create "$as_dir" as a directory, including parents if necessary.
+-as_fn_mkdir_p ()
+-{
+-
+-  case $as_dir in #(
+-  -*) as_dir=./$as_dir;;
+-  esac
+-  test -d "$as_dir" || eval $as_mkdir_p || {
+-    as_dirs=
+-    while :; do
+-      case $as_dir in #(
+-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+-      *) as_qdir=$as_dir;;
+-      esac
+-      as_dirs="'$as_qdir' $as_dirs"
+-      as_dir=`$as_dirname -- "$as_dir" ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-       X"$as_dir" : 'X\(//\)[^/]' \| \
+-       X"$as_dir" : 'X\(//\)$' \| \
+-       X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)[^/].*/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\).*/{
+-          s//\1/
+-          q
+-        }
+-        s/.*/./; q'`
+-      test -d "$as_dir" && break
+-    done
+-    test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+-
+-
+-} # as_fn_mkdir_p
+-if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p='mkdir -p "$as_dir"'
+-else
+-  test -d ./-p && rmdir ./-p
+-  as_mkdir_p=false
+-fi
+-
+-
+-# as_fn_executable_p FILE
+-# -----------------------
+-# Test if FILE is an executable regular file.
+-as_fn_executable_p ()
+-{
+-  test -f "$1" && test -x "$1"
+-} # as_fn_executable_p
+-as_test_x='test -x'
+-as_executable_p=as_fn_executable_p
+-
+-# Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+-
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+-
+-
+-exec 6>&1
+-## ----------------------------------- ##
+-## Main body of $CONFIG_STATUS script. ##
+-## ----------------------------------- ##
+-_ASEOF
+-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# Save the log message, to keep $0 and so on meaningful, and to
+-# report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.
+-ac_log="
+-This file was extended by rsync $as_me 3.1.2, which was
+-generated by GNU Autoconf 2.69.  Invocation command line was
+-
+-  CONFIG_FILES    = $CONFIG_FILES
+-  CONFIG_HEADERS  = $CONFIG_HEADERS
+-  CONFIG_LINKS    = $CONFIG_LINKS
+-  CONFIG_COMMANDS = $CONFIG_COMMANDS
+-  $ $0 $@
+-
+-on `(hostname || uname -n) 2>/dev/null | sed 1q`
+-"
+-
+-_ACEOF
+-
+-case $ac_config_files in *"
+-"*) set x $ac_config_files; shift; ac_config_files=$*;;
+-esac
+-
+-case $ac_config_headers in *"
+-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+-esac
+-
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-# Files that config.status was made for.
+-config_files="$ac_config_files"
+-config_headers="$ac_config_headers"
+-
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-ac_cs_usage="\
+-\`$as_me' instantiates files and other configuration actions
+-from templates according to the current configuration.  Unless the files
+-and actions are specified as TAGs, all are instantiated by default.
+-
+-Usage: $0 [OPTION]... [TAG]...
+-
+-  -h, --help       print this help, then exit
+-  -V, --version    print version number and configuration settings, then exit
+-      --config     print configuration, then exit
+-  -q, --quiet, --silent
+-                   do not print progress messages
+-  -d, --debug      don't remove temporary files
+-      --recheck    update $as_me by reconfiguring in the same conditions
+-      --file=FILE[:TEMPLATE]
+-                   instantiate the configuration file FILE
+-      --header=FILE[:TEMPLATE]
+-                   instantiate the configuration header FILE
+-
+-Configuration files:
+-$config_files
+-
+-Configuration headers:
+-$config_headers
+-
+-Report bugs to <http://rsync.samba.org/bugzilla.html>."
+-
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+-ac_cs_version="\\
+-rsync config.status 3.1.2
+-configured by $0, generated by GNU Autoconf 2.69,
+-  with options \\"\$ac_cs_config\\"
+-
+-Copyright (C) 2012 Free Software Foundation, Inc.
+-This config.status script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it."
+-
+-ac_pwd='$ac_pwd'
+-srcdir='$srcdir'
+-INSTALL='$INSTALL'
+-MKDIR_P='$MKDIR_P'
+-test -n "\$AWK" || AWK=awk
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# The default lists apply if the user does not specify any file.
+-ac_need_defaults=:
+-while test $# != 0
+-do
+-  case $1 in
+-  --*=?*)
+-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+-    ac_shift=:
+-    ;;
+-  --*=)
+-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+-    ac_optarg=
+-    ac_shift=:
+-    ;;
+-  *)
+-    ac_option=$1
+-    ac_optarg=$2
+-    ac_shift=shift
+-    ;;
+-  esac
+-
+-  case $ac_option in
+-  # Handling of the options.
+-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+-    ac_cs_recheck=: ;;
+-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+-    $as_echo "$ac_cs_version"; exit ;;
+-  --config | --confi | --conf | --con | --co | --c )
+-    $as_echo "$ac_cs_config"; exit ;;
+-  --debug | --debu | --deb | --de | --d | -d )
+-    debug=: ;;
+-  --file | --fil | --fi | --f )
+-    $ac_shift
+-    case $ac_optarg in
+-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    '') as_fn_error $? "missing file argument" ;;
+-    esac
+-    as_fn_append CONFIG_FILES " '$ac_optarg'"
+-    ac_need_defaults=false;;
+-  --header | --heade | --head | --hea )
+-    $ac_shift
+-    case $ac_optarg in
+-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    esac
+-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+-    ac_need_defaults=false;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    as_fn_error $? "ambiguous option: \`$1'
+-Try \`$0 --help' for more information.";;
+-  --help | --hel | -h )
+-    $as_echo "$ac_cs_usage"; exit ;;
+-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+-    ac_cs_silent=: ;;
+-
+-  # This is an error.
+-  -*) as_fn_error $? "unrecognized option: \`$1'
+-Try \`$0 --help' for more information." ;;
+-
+-  *) as_fn_append ac_config_targets " $1"
+-     ac_need_defaults=false ;;
+-
+-  esac
+-  shift
+-done
+-
+-ac_configure_extra_args=
+-
+-if $ac_cs_silent; then
+-  exec 6>/dev/null
+-  ac_configure_extra_args="$ac_configure_extra_args --silent"
+-fi
+-
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-if \$ac_cs_recheck; then
+-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+-  shift
+-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+-  CONFIG_SHELL='$SHELL'
+-  export CONFIG_SHELL
+-  exec "\$@"
+-fi
+-
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-  $as_echo "$ac_log"
+-} >&5
+-
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-
+-# Handling of arguments.
+-for ac_config_target in $ac_config_targets
+-do
+-  case $ac_config_target in
+-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+-    "lib/dummy") CONFIG_FILES="$CONFIG_FILES lib/dummy" ;;
+-    "zlib/dummy") CONFIG_FILES="$CONFIG_FILES zlib/dummy" ;;
+-    "popt/dummy") CONFIG_FILES="$CONFIG_FILES popt/dummy" ;;
+-    "shconfig") CONFIG_FILES="$CONFIG_FILES shconfig" ;;
+-
+-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+-  esac
+-done
+-
+-
+-# If the user did not use the arguments to specify the items to instantiate,
+-# then the envvar interface is used.  Set only those that are not.
+-# We use the long form for the default assignment because of an extremely
+-# bizarre bug on SunOS 4.1.3.
+-if $ac_need_defaults; then
+-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+-fi
+-
+-# Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason against having it here, and in addition,
+-# creating and moving files from /tmp can sometimes cause problems.
+-# Hook for its removal unless debugging.
+-# Note that there is a small window in which the directory will not be cleaned:
+-# after its creation but before its name has been assigned to `$tmp'.
+-$debug ||
+-{
+-  tmp= ac_tmp=
+-  trap 'exit_status=$?
+-  : "${ac_tmp:=$tmp}"
+-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+-' 0
+-  trap 'as_fn_exit 1' 1 2 13 15
+-}
+-# Create a (secure) tmp directory for tmp files.
+-
+-{
+-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+-  test -d "$tmp"
+-}  ||
+-{
+-  tmp=./conf$$-$RANDOM
+-  (umask 077 && mkdir "$tmp")
+-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+-ac_tmp=$tmp
+-
+-# Set up the scripts for CONFIG_FILES section.
+-# No need to generate them if there are no CONFIG_FILES.
+-# This happens for instance with `./config.status config.h'.
+-if test -n "$CONFIG_FILES"; then
+-
+-
+-ac_cr=`echo X | tr X '\015'`
+-# On cygwin, bash can eat \r inside `` if the user requested igncr.
+-# But we know of no other shell where ac_cr would be empty at this
+-# point, so we can use a bashism as a fallback.
+-if test "x$ac_cr" = x; then
+-  eval ac_cr=\$\'\\r\'
+-fi
+-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\\r'
+-else
+-  ac_cs_awk_cr=$ac_cr
+-fi
+-
+-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+-_ACEOF
+-
+-
+-{
+-  echo "cat >conf$$subs.awk <<_ACEOF" &&
+-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+-  echo "_ACEOF"
+-} >conf$$subs.sh ||
+-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+-ac_delim='%!_!# '
+-for ac_last_try in false false false false false :; do
+-  . ./conf$$subs.sh ||
+-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+-
+-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+-  if test $ac_delim_n = $ac_delim_num; then
+-    break
+-  elif $ac_last_try; then
+-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+-  else
+-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+-  fi
+-done
+-rm -f conf$$subs.sh
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+-_ACEOF
+-sed -n '
+-h
+-s/^/S["/; s/!.*/"]=/
+-p
+-g
+-s/^[^!]*!//
+-:repl
+-t repl
+-s/'"$ac_delim"'$//
+-t delim
+-:nl
+-h
+-s/\(.\{148\}\)..*/\1/
+-t more1
+-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+-p
+-n
+-b repl
+-:more1
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t nl
+-:delim
+-h
+-s/\(.\{148\}\)..*/\1/
+-t more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"/
+-p
+-b
+-:more2
+-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+-p
+-g
+-s/.\{148\}//
+-t delim
+-' <conf$$subs.awk | sed '
+-/^[^""]/{
+-  N
+-  s/\n//
+-}
+-' >>$CONFIG_STATUS || ac_write_fail=1
+-rm -f conf$$subs.awk
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-_ACAWK
+-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+-  for (key in S) S_is_set[key] = 1
+-  FS = "\a"
+-
+-}
+-{
+-  line = $ 0
+-  nfields = split(line, field, "@")
+-  substed = 0
+-  len = length(field[1])
+-  for (i = 2; i < nfields; i++) {
+-    key = field[i]
+-    keylen = length(key)
+-    if (S_is_set[key]) {
+-      value = S[key]
+-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+-      len += length(value) + length(field[++i])
+-      substed = 1
+-    } else
+-      len += 1 + keylen
+-  }
+-
+-  print line
+-}
+-
+-_ACAWK
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+-else
+-  cat
+-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+-_ACEOF
+-
+-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[        ]*VPATH[        ]*=[    ]*/{
+-h
+-s///
+-s/^/:/
+-s/[    ]*$/:/
+-s/:\$(srcdir):/:/g
+-s/:\${srcdir}:/:/g
+-s/:@srcdir@:/:/g
+-s/^:*//
+-s/:*$//
+-x
+-s/\(=[         ]*\).*/\1/
+-G
+-s/\n//
+-s/^[^=]*=[     ]*$//
+-}'
+-fi
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-fi # test -n "$CONFIG_FILES"
+-
+-# Set up the scripts for CONFIG_HEADERS section.
+-# No need to generate them if there are no CONFIG_HEADERS.
+-# This happens for instance with `./config.status Makefile'.
+-if test -n "$CONFIG_HEADERS"; then
+-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+-BEGIN {
+-_ACEOF
+-
+-# Transform confdefs.h into an awk script `defines.awk', embedded as
+-# here-document in config.status, that substitutes the proper values into
+-# config.h.in to produce config.h.
+-
+-# Create a delimiter string that does not exist in confdefs.h, to ease
+-# handling of long lines.
+-ac_delim='%!_!# '
+-for ac_last_try in false false :; do
+-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+-  if test -z "$ac_tt"; then
+-    break
+-  elif $ac_last_try; then
+-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+-  else
+-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+-  fi
+-done
+-
+-# For the awk script, D is an array of macro values keyed by name,
+-# likewise P contains macro parameters if any.  Preserve backslash
+-# newline sequences.
+-
+-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+-sed -n '
+-s/.\{148\}/&'"$ac_delim"'/g
+-t rset
+-:rset
+-s/^[   ]*#[    ]*define[       ][      ]*/ /
+-t def
+-d
+-:def
+-s/\\$//
+-t bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[   ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3"/p
+-s/^ \('"$ac_word_re"'\)[       ]*\(.*\)/D["\1"]=" \2"/p
+-d
+-:bsnl
+-s/["\\]/\\&/g
+-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[   ]*\(.*\)/P["\1"]="\2"\
+-D["\1"]=" \3\\\\\\n"\\/p
+-t cont
+-s/^ \('"$ac_word_re"'\)[       ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+-t cont
+-d
+-:cont
+-n
+-s/.\{148\}/&'"$ac_delim"'/g
+-t clear
+-:clear
+-s/\\$//
+-t bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/"/p
+-d
+-:bsnlc
+-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+-b cont
+-' <confdefs.h | sed '
+-s/'"$ac_delim"'/"\\\
+-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+-
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-  for (key in D) D_is_set[key] = 1
+-  FS = "\a"
+-}
+-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+-  line = \$ 0
+-  split(line, arg, " ")
+-  if (arg[1] == "#") {
+-    defundef = arg[2]
+-    mac1 = arg[3]
+-  } else {
+-    defundef = substr(arg[1], 2)
+-    mac1 = arg[2]
+-  }
+-  split(mac1, mac2, "(") #)
+-  macro = mac2[1]
+-  prefix = substr(line, 1, index(line, defundef) - 1)
+-  if (D_is_set[macro]) {
+-    # Preserve the white space surrounding the "#".
+-    print prefix "define", macro P[macro] D[macro]
+-    next
+-  } else {
+-    # Replace #undef with comments.  This is necessary, for example,
+-    # in the case of _POSIX_SOURCE, which is predefined and required
+-    # on some systems where configure will not decide to define it.
+-    if (defundef == "undef") {
+-      print "/*", prefix defundef, macro, "*/"
+-      next
+-    }
+-  }
+-}
+-{ print }
+-_ACAWK
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+-fi # test -n "$CONFIG_HEADERS"
+-
+-
+-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+-shift
+-for ac_tag
+-do
+-  case $ac_tag in
+-  :[FHLC]) ac_mode=$ac_tag; continue;;
+-  esac
+-  case $ac_mode$ac_tag in
+-  :[FHL]*:*);;
+-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+-  :[FH]-) ac_tag=-:-;;
+-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+-  esac
+-  ac_save_IFS=$IFS
+-  IFS=:
+-  set x $ac_tag
+-  IFS=$ac_save_IFS
+-  shift
+-  ac_file=$1
+-  shift
+-
+-  case $ac_mode in
+-  :L) ac_source=$1;;
+-  :[FH])
+-    ac_file_inputs=
+-    for ac_f
+-    do
+-      case $ac_f in
+-      -) ac_f="$ac_tmp/stdin";;
+-      *) # Look for the file first in the build tree, then in the source tree
+-       # (if the path is not absolute).  The absolute path cannot be DOS-style,
+-       # because $ac_f cannot contain `:'.
+-       test -f "$ac_f" ||
+-         case $ac_f in
+-         [\\/$]*) false;;
+-         *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+-         esac ||
+-         as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+-      esac
+-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+-      as_fn_append ac_file_inputs " '$ac_f'"
+-    done
+-
+-    # Let's still pretend it is `configure' which instantiates (i.e., don't
+-    # use $as_me), people would be surprised to read:
+-    #    /* config.h.  Generated by config.status.  */
+-    configure_input='Generated from '`
+-        $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+-      `' by configure.'
+-    if test x"$ac_file" != x-; then
+-      configure_input="$ac_file.  $configure_input"
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+-$as_echo "$as_me: creating $ac_file" >&6;}
+-    fi
+-    # Neutralize special characters interpreted by sed in replacement strings.
+-    case $configure_input in #(
+-    *\&* | *\|* | *\\* )
+-       ac_sed_conf_input=`$as_echo "$configure_input" |
+-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+-    *) ac_sed_conf_input=$configure_input;;
+-    esac
+-
+-    case $ac_tag in
+-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+-    esac
+-    ;;
+-  esac
+-
+-  ac_dir=`$as_dirname -- "$ac_file" ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-       X"$ac_file" : 'X\(//\)[^/]' \| \
+-       X"$ac_file" : 'X\(//\)$' \| \
+-       X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)[^/].*/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\/\)$/{
+-          s//\1/
+-          q
+-        }
+-        /^X\(\/\).*/{
+-          s//\1/
+-          q
+-        }
+-        s/.*/./; q'`
+-  as_dir="$ac_dir"; as_fn_mkdir_p
+-  ac_builddir=.
+-
+-case "$ac_dir" in
+-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-*)
+-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+-  # A ".." for each directory in $ac_dir_suffix.
+-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+-  case $ac_top_builddir_sub in
+-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+-  esac ;;
+-esac
+-ac_abs_top_builddir=$ac_pwd
+-ac_abs_builddir=$ac_pwd$ac_dir_suffix
+-# for backward compatibility:
+-ac_top_builddir=$ac_top_build_prefix
+-
+-case $srcdir in
+-  .)  # We are building in place.
+-    ac_srcdir=.
+-    ac_top_srcdir=$ac_top_builddir_sub
+-    ac_abs_top_srcdir=$ac_pwd ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute name.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir
+-    ac_abs_top_srcdir=$srcdir ;;
+-  *) # Relative name.
+-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_build_prefix$srcdir
+-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+-esac
+-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+-
+-
+-  case $ac_mode in
+-  :F)
+-  #
+-  # CONFIG_FILE
+-  #
+-
+-  case $INSTALL in
+-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+-  esac
+-  ac_MKDIR_P=$MKDIR_P
+-  case $MKDIR_P in
+-  [\\/$]* | ?:[\\/]* ) ;;
+-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+-  esac
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-# If the template does not know about datarootdir, expand it.
+-# FIXME: This hack should be removed a few years after 2.60.
+-ac_datarootdir_hack=; ac_datarootdir_seen=
+-ac_sed_dataroot='
+-/datarootdir/ {
+-  p
+-  q
+-}
+-/@datadir@/p
+-/@docdir@/p
+-/@infodir@/p
+-/@localedir@/p
+-/@mandir@/p'
+-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+-*datarootdir*) ac_datarootdir_seen=yes;;
+-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-  ac_datarootdir_hack='
+-  s&@datadir@&$datadir&g
+-  s&@docdir@&$docdir&g
+-  s&@infodir@&$infodir&g
+-  s&@localedir@&$localedir&g
+-  s&@mandir@&$mandir&g
+-  s&\\\${datarootdir}&$datarootdir&g' ;;
+-esac
+-_ACEOF
+-
+-# Neutralize VPATH when `$srcdir' = `.'.
+-# Shell code in configure.ac might set extrasub.
+-# FIXME: do we really want to maintain this feature?
+-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-ac_sed_extra="$ac_vpsub
+-$extrasub
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-:t
+-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s|@configure_input@|$ac_sed_conf_input|;t t
+-s&@top_builddir@&$ac_top_builddir_sub&;t t
+-s&@top_build_prefix@&$ac_top_build_prefix&;t t
+-s&@srcdir@&$ac_srcdir&;t t
+-s&@abs_srcdir@&$ac_abs_srcdir&;t t
+-s&@top_srcdir@&$ac_top_srcdir&;t t
+-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+-s&@builddir@&$ac_builddir&;t t
+-s&@abs_builddir@&$ac_abs_builddir&;t t
+-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+-s&@INSTALL@&$ac_INSTALL&;t t
+-s&@MKDIR_P@&$ac_MKDIR_P&;t t
+-$ac_datarootdir_hack
+-"
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+-
+-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+-  { ac_out=`sed -n '/^[        ]*datarootdir[  ]*:*=/p' \
+-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined" >&5
+-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined" >&2;}
+-
+-  rm -f "$ac_tmp/stdin"
+-  case $ac_file in
+-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+-  esac \
+-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+- ;;
+-  :H)
+-  #
+-  # CONFIG_HEADER
+-  #
+-  if test x"$ac_file" != x-; then
+-    {
+-      $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+-    } >"$ac_tmp/config.h" \
+-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+-    else
+-      rm -f "$ac_file"
+-      mv "$ac_tmp/config.h" "$ac_file" \
+-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+-    fi
+-  else
+-    $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+-      || as_fn_error $? "could not create -" "$LINENO" 5
+-  fi
+- ;;
+-
+-
+-  esac
+-
+-done # for ac_tag
+-
+-
+-as_fn_exit 0
+-_ACEOF
+-ac_clean_files=$ac_clean_files_save
+-
+-test $ac_write_fail = 0 ||
+-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+-
+-
+-# configure is writing to config.log, and then calls config.status.
+-# config.status does its own redirection, appending to config.log.
+-# Unfortunately, on DOS this fails, as config.log is still kept open
+-# by configure, so config.status won't be able to write to it; its
+-# output is simply discarded.  So we exec the FD to /dev/null,
+-# effectively closing config.log, so it can be properly (re)opened and
+-# appended to by config.status.  When coming back to configure, we
+-# need to make the FD available again.
+-if test "$no_create" != yes; then
+-  ac_cs_success=:
+-  ac_config_status_args=
+-  test "$silent" = yes &&
+-    ac_config_status_args="$ac_config_status_args --quiet"
+-  exec 5>/dev/null
+-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+-  exec 5>>config.log
+-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+-  # would make configure fail if this is the last instruction.
+-  $ac_cs_success || as_fn_exit 1
+-fi
+-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+-fi
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+-$as_echo "" >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:     rsync ${RSYNC_VERSION} configuration successful" >&5
+-$as_echo "    rsync ${RSYNC_VERSION} configuration successful" >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+-$as_echo "" >&6; }
+-if test x$HAVE_YODL2MAN != x1; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result:     Note that yodl2man was not found, so pre-existing manpage files will be" >&5
+-$as_echo "    Note that yodl2man was not found, so pre-existing manpage files will be" >&6; }
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result:     used w/o change (if available) -- no .yo file changes will be used." >&5
+-$as_echo "    used w/o change (if available) -- no .yo file changes will be used." >&6; }
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+-$as_echo "" >&6; }
+-fi
diff --git a/net/rsync/patches/001-tweak-indentation-only.patch b/net/rsync/patches/001-tweak-indentation-only.patch
new file mode 100644 (file)
index 0000000..dd043ce
--- /dev/null
@@ -0,0 +1,83 @@
+commit 4fc78878e01451d6465e2072f3f0653182f885c1
+Author: Wayne Davison <wayned@samba.org>
+Date:   Sun May 1 16:29:34 2016 -0700
+
+    Tweak indentation only.
+
+diff --git a/checksum.c b/checksum.c
+index 6ebb56b..bac775d 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -188,32 +188,31 @@ void sum_update(const char *p, int32 len)
+ {
+       if (protocol_version >= 30) {
+               md5_update(&md, (uchar *)p, len);
+-              return;
+-      }
++      } else {
++              if (len + sumresidue < CSUM_CHUNK) {
++                      memcpy(md.buffer + sumresidue, p, len);
++                      sumresidue += len;
++                      return;
++              }
+-      if (len + sumresidue < CSUM_CHUNK) {
+-              memcpy(md.buffer + sumresidue, p, len);
+-              sumresidue += len;
+-              return;
+-      }
++              if (sumresidue) {
++                      int32 i = CSUM_CHUNK - sumresidue;
++                      memcpy(md.buffer + sumresidue, p, i);
++                      mdfour_update(&md, (uchar *)md.buffer, CSUM_CHUNK);
++                      len -= i;
++                      p += i;
++              }
+-      if (sumresidue) {
+-              int32 i = CSUM_CHUNK - sumresidue;
+-              memcpy(md.buffer + sumresidue, p, i);
+-              mdfour_update(&md, (uchar *)md.buffer, CSUM_CHUNK);
+-              len -= i;
+-              p += i;
+-      }
++              while (len >= CSUM_CHUNK) {
++                      mdfour_update(&md, (uchar *)p, CSUM_CHUNK);
++                      len -= CSUM_CHUNK;
++                      p += CSUM_CHUNK;
++              }
+-      while (len >= CSUM_CHUNK) {
+-              mdfour_update(&md, (uchar *)p, CSUM_CHUNK);
+-              len -= CSUM_CHUNK;
+-              p += CSUM_CHUNK;
++              sumresidue = len;
++              if (sumresidue)
++                      memcpy(md.buffer, p, sumresidue);
+       }
+-
+-      sumresidue = len;
+-      if (sumresidue)
+-              memcpy(md.buffer, p, sumresidue);
+ }
+ int sum_end(char *sum)
+@@ -221,12 +220,12 @@ int sum_end(char *sum)
+       if (protocol_version >= 30) {
+               md5_result(&md, (uchar *)sum);
+               return MD5_DIGEST_LEN;
+-      }
+-
+-      if (sumresidue || protocol_version >= 27)
+-              mdfour_update(&md, (uchar *)md.buffer, sumresidue);
++      } else {
++              if (sumresidue || protocol_version >= 27)
++                      mdfour_update(&md, (uchar *)md.buffer, sumresidue);
+-      mdfour_result(&md, (uchar *)sum);
++              mdfour_result(&md, (uchar *)sum);
+-      return MD4_DIGEST_LEN;
++              return MD4_DIGEST_LEN;
++      }
+ }
diff --git a/net/rsync/patches/002-Add-checksum-choice-option.patch b/net/rsync/patches/002-Add-checksum-choice-option.patch
new file mode 100644 (file)
index 0000000..f4a1053
--- /dev/null
@@ -0,0 +1,650 @@
+commit a5a7d3a297b836387b0ac677383bdddaf2ac3598
+Author: Wayne Davison <wayned@samba.org>
+Date:   Sun May 1 16:32:45 2016 -0700
+
+    Add --checksum-choice option to choose the checksum algorithms.
+
+diff --git a/authenticate.c b/authenticate.c
+index 5f125de..d60ee20 100644
+--- a/authenticate.c
++++ b/authenticate.c
+@@ -71,7 +71,7 @@ static void gen_challenge(const char *addr, char *challenge)
+       SIVAL(input, 20, tv.tv_usec);
+       SIVAL(input, 24, getpid());
+-      sum_init(0);
++      sum_init(-1, 0);
+       sum_update(input, sizeof input);
+       len = sum_end(digest);
+@@ -85,7 +85,7 @@ static void generate_hash(const char *in, const char *challenge, char *out)
+       char buf[MAX_DIGEST_LEN];
+       int len;
+-      sum_init(0);
++      sum_init(-1, 0);
+       sum_update(in, strlen(in));
+       sum_update(challenge, strlen(challenge));
+       len = sum_end(buf);
+diff --git a/checksum.c b/checksum.c
+index bac775d..8b38833 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -24,6 +24,76 @@
+ extern int checksum_seed;
+ extern int protocol_version;
+ extern int proper_seed_order;
++extern char *checksum_choice;
++
++#define CSUM_NONE 0
++#define CSUM_ARCHAIC 1
++#define CSUM_MD4_BUSTED 2
++#define CSUM_MD4_OLD 3
++#define CSUM_MD4 4
++#define CSUM_MD5 5
++
++int xfersum_type = 0; /* used for the file transfer checksums */
++int checksum_type = 0; /* used for the pre-transfer (--checksum) checksums */
++
++/* Returns 1 if --whole-file must be enabled. */
++int parse_checksum_choice(void)
++{
++      char *cp = checksum_choice ? strchr(checksum_choice, ',') : NULL;
++      if (cp) {
++              xfersum_type = parse_csum_name(checksum_choice, cp - checksum_choice);
++              checksum_type = parse_csum_name(cp+1, -1);
++      } else
++              xfersum_type = checksum_type = parse_csum_name(checksum_choice, -1);
++      return xfersum_type == CSUM_NONE;
++}
++
++int parse_csum_name(const char *name, int len)
++{
++      if (len < 0 && name)
++              len = strlen(name);
++
++      if (!name || (len == 4 && strncasecmp(name, "auto", 4) == 0)) {
++              if (protocol_version >= 30)
++                      return CSUM_MD5;
++              if (protocol_version >= 27)
++                      return CSUM_MD4_OLD;
++              if (protocol_version >= 21)
++                      return CSUM_MD4_BUSTED;
++              return CSUM_ARCHAIC;
++      }
++      if (len == 3 && strncasecmp(name, "md4", 3) == 0)
++              return CSUM_MD4;
++      if (len == 3 && strncasecmp(name, "md5", 3) == 0)
++              return CSUM_MD5;
++      if (len == 4 && strncasecmp(name, "none", 4) == 0)
++              return CSUM_NONE;
++
++      rprintf(FERROR, "unknown checksum name: %s\n", name);
++      exit_cleanup(RERR_UNSUPPORTED);
++}
++
++int csum_len_for_type(int cst)
++{
++      switch (cst) {
++        case CSUM_NONE:
++              return 1;
++        case CSUM_ARCHAIC:
++              return 2;
++        case CSUM_MD4:
++        case CSUM_MD4_OLD:
++        case CSUM_MD4_BUSTED:
++              return MD4_DIGEST_LEN;
++        case CSUM_MD5:
++              return MD5_DIGEST_LEN;
++      }
++      return 0;
++}
++
++int canonical_checksum(int csum_type)
++{
++    return csum_type >= CSUM_MD4 ? 1 : 0;
++}
+ /*
+   a simple 32 bit checksum that can be upadted from either end
+@@ -47,12 +117,12 @@ uint32 get_checksum1(char *buf1, int32 len)
+     return (s1 & 0xffff) + (s2 << 16);
+ }
+-
+ void get_checksum2(char *buf, int32 len, char *sum)
+ {
+       md_context m;
+-      if (protocol_version >= 30) {
++      switch (xfersum_type) {
++        case CSUM_MD5: {
+               uchar seedbuf[4];
+               md5_begin(&m);
+               if (proper_seed_order) {
+@@ -69,7 +139,11 @@ void get_checksum2(char *buf, int32 len, char *sum)
+                       }
+               }
+               md5_result(&m, (uchar *)sum);
+-      } else {
++              break;
++        }
++        case CSUM_MD4:
++        case CSUM_MD4_OLD:
++        case CSUM_MD4_BUSTED: {
+               int32 i;
+               static char *buf1;
+               static int32 len1;
+@@ -100,10 +174,12 @@ void get_checksum2(char *buf, int32 len, char *sum)
+                * are multiples of 64.  This is fixed by calling mdfour_update()
+                * even when there are no more bytes.
+                */
+-              if (len - i > 0 || protocol_version >= 27)
++              if (len - i > 0 || xfersum_type != CSUM_MD4_BUSTED)
+                       mdfour_update(&m, (uchar *)(buf1+i), len-i);
+               mdfour_result(&m, (uchar *)sum);
++              break;
++        }
+       }
+ }
+@@ -123,7 +199,8 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+       buf = map_file(fd, len, MAX_MAP_SIZE, CSUM_CHUNK);
+-      if (protocol_version >= 30) {
++      switch (checksum_type) {
++        case CSUM_MD5:
+               md5_begin(&m);
+               for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+@@ -136,7 +213,10 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+                       md5_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
+               md5_result(&m, (uchar *)sum);
+-      } else {
++              break;
++        case CSUM_MD4:
++        case CSUM_MD4_OLD:
++        case CSUM_MD4_BUSTED:
+               mdfour_begin(&m);
+               for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+@@ -149,10 +229,14 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+                * are multiples of 64.  This is fixed by calling mdfour_update()
+                * even when there are no more bytes. */
+               remainder = (int32)(len - i);
+-              if (remainder > 0 || protocol_version >= 27)
++              if (remainder > 0 || checksum_type != CSUM_MD4_BUSTED)
+                       mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
+               mdfour_result(&m, (uchar *)sum);
++              break;
++        default:
++              rprintf(FERROR, "invalid checksum-choice for the --checksum option (%d)\n", checksum_type);
++              exit_cleanup(RERR_UNSUPPORTED);
+       }
+       close(fd);
+@@ -161,18 +245,33 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+ static int32 sumresidue;
+ static md_context md;
++static int cursum_type;
+-void sum_init(int seed)
++void sum_init(int csum_type, int seed)
+ {
+       char s[4];
+-      if (protocol_version >= 30)
++      if (csum_type < 0)
++              csum_type = parse_csum_name(NULL, 0);
++      cursum_type = csum_type;
++
++      switch (csum_type) {
++        case CSUM_MD5:
+               md5_begin(&md);
+-      else {
++              break;
++        case CSUM_MD4:
++              mdfour_begin(&md);
++              sumresidue = 0;
++              break;
++        case CSUM_MD4_OLD:
++        case CSUM_MD4_BUSTED:
+               mdfour_begin(&md);
+               sumresidue = 0;
+               SIVAL(s, 0, seed);
+               sum_update(s, 4);
++              break;
++        case CSUM_NONE:
++              break;
+       }
+ }
+@@ -186,13 +285,17 @@ void sum_init(int seed)
+  **/
+ void sum_update(const char *p, int32 len)
+ {
+-      if (protocol_version >= 30) {
++      switch (cursum_type) {
++        case CSUM_MD5:
+               md5_update(&md, (uchar *)p, len);
+-      } else {
++              break;
++        case CSUM_MD4:
++        case CSUM_MD4_OLD:
++        case CSUM_MD4_BUSTED:
+               if (len + sumresidue < CSUM_CHUNK) {
+                       memcpy(md.buffer + sumresidue, p, len);
+                       sumresidue += len;
+-                      return;
++                      break;
+               }
+               if (sumresidue) {
+@@ -212,20 +315,32 @@ void sum_update(const char *p, int32 len)
+               sumresidue = len;
+               if (sumresidue)
+                       memcpy(md.buffer, p, sumresidue);
++              break;
++        case CSUM_NONE:
++              break;
+       }
+ }
+ int sum_end(char *sum)
+ {
+-      if (protocol_version >= 30) {
++      switch (cursum_type) {
++        case CSUM_MD5:
+               md5_result(&md, (uchar *)sum);
+-              return MD5_DIGEST_LEN;
+-      } else {
+-              if (sumresidue || protocol_version >= 27)
++              break;
++        case CSUM_MD4:
++        case CSUM_MD4_OLD:
++              mdfour_update(&md, (uchar *)md.buffer, sumresidue);
++              mdfour_result(&md, (uchar *)sum);
++              break;
++        case CSUM_MD4_BUSTED:
++              if (sumresidue)
+                       mdfour_update(&md, (uchar *)md.buffer, sumresidue);
+-
+               mdfour_result(&md, (uchar *)sum);
+-
+-              return MD4_DIGEST_LEN;
++              break;
++        case CSUM_NONE:
++              *sum = '\0';
++              break;
+       }
++
++      return csum_len_for_type(cursum_type);
+ }
+diff --git a/compat.c b/compat.c
+index c792312..505cb7f 100644
+--- a/compat.c
++++ b/compat.c
+@@ -338,4 +338,6 @@ void setup_protocol(int f_out,int f_in)
+       } else {
+               checksum_seed = read_int(f_in);
+       }
++
++      init_flist();
+ }
+diff --git a/flist.c b/flist.c
+index c1e48b3..acb95f7 100644
+--- a/flist.c
++++ b/flist.c
+@@ -33,6 +33,7 @@ extern int am_sender;
+ extern int am_generator;
+ extern int inc_recurse;
+ extern int always_checksum;
++extern int checksum_type;
+ extern int module_id;
+ extern int ignore_errors;
+ extern int numeric_ids;
+@@ -137,9 +138,8 @@ void init_flist(void)
+               rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n",
+                       (int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
+       }
+-      checksum_len = protocol_version < 21 ? 2
+-                   : protocol_version < 30 ? MD4_DIGEST_LEN
+-                   : MD5_DIGEST_LEN;
++      parse_checksum_choice(); /* Sets checksum_type && xfersum_type */
++      checksum_len = csum_len_for_type(checksum_type);
+ }
+ static int show_filelist_p(void)
+diff --git a/log.c b/log.c
+index 24256de..f7da1e5 100644
+--- a/log.c
++++ b/log.c
+@@ -31,12 +31,13 @@ extern int am_generator;
+ extern int local_server;
+ extern int quiet;
+ extern int module_id;
+-extern int checksum_len;
+ extern int allow_8bit_chars;
+ extern int protocol_version;
+ extern int always_checksum;
+ extern int preserve_times;
+ extern int msgs2stderr;
++extern int xfersum_type;
++extern int checksum_type;
+ extern int stdout_format_has_i;
+ extern int stdout_format_has_o_or_i;
+ extern int logfile_format_has_i;
+@@ -46,6 +47,7 @@ extern int64 total_data_written;
+ extern int64 total_data_read;
+ extern mode_t orig_umask;
+ extern char *auth_user;
++extern char *checksum_choice;
+ extern char *stdout_format;
+ extern char *logfile_format;
+ extern char *logfile_name;
+@@ -669,13 +671,15 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+                       n = buf2;
+                       break;
+               case 'C':
+-                      if (protocol_version >= 30
+-                       && (iflags & ITEM_TRANSFER
+-                        || (always_checksum && S_ISREG(file->mode)))) {
+-                              const char *sum = iflags & ITEM_TRANSFER
+-                                              ? sender_file_sum : F_SUM(file);
+-                              n = sum_as_hex(sum);
+-                      } else {
++                      n = NULL;
++                      if (S_ISREG(file->mode)) {
++                              if (always_checksum && canonical_checksum(checksum_type))
++                                      n = sum_as_hex(checksum_type, F_SUM(file));
++                              else if (iflags & ITEM_TRANSFER && canonical_checksum(xfersum_type))
++                                      n = sum_as_hex(xfersum_type, sender_file_sum);
++                      }
++                      if (!n) {
++                              int checksum_len = csum_len_for_type(always_checksum ? checksum_type : xfersum_type);
+                               memset(buf2, ' ', checksum_len*2);
+                               buf2[checksum_len*2] = '\0';
+                               n = buf2;
+diff --git a/main.c b/main.c
+index 3132aa9..3908ccf 100644
+--- a/main.c
++++ b/main.c
+@@ -1595,8 +1595,6 @@ int main(int argc,char *argv[])
+        * that implement getcwd that way "pwd" can't be found after chroot. */
+       change_dir(NULL, CD_NORMAL);
+-      init_flist();
+-
+       if ((write_batch || read_batch) && !am_server) {
+               if (write_batch)
+                       write_batch_shell_file(orig_argc, orig_argv, argc);
+diff --git a/match.c b/match.c
+index b15f2eb..ff10310 100644
+--- a/match.c
++++ b/match.c
+@@ -24,7 +24,7 @@
+ extern int checksum_seed;
+ extern int append_mode;
+-extern int checksum_len;
++extern int xfersum_type;
+ int updating_basis_file;
+ char sender_file_sum[MAX_DIGEST_LEN];
+@@ -360,13 +360,15 @@ static void hash_search(int f,struct sum_struct *s,
+  **/
+ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
+ {
++      int checksum_len;
++
+       last_match = 0;
+       false_alarms = 0;
+       hash_hits = 0;
+       matches = 0;
+       data_transfer = 0;
+-      sum_init(checksum_seed);
++      sum_init(xfersum_type, checksum_seed);
+       if (append_mode > 0) {
+               if (append_mode == 2) {
+@@ -407,8 +409,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
+               matched(f, s, buf, len, -1);
+       }
+-      if (sum_end(sender_file_sum) != checksum_len)
+-              overflow_exit("checksum_len"); /* Impossible... */
++      checksum_len = sum_end(sender_file_sum);
+       /* If we had a read error, send a bad checksum.  We use all bits
+        * off as long as the checksum doesn't happen to be that, in
+diff --git a/options.c b/options.c
+index 4a5cdc8..308443b 100644
+--- a/options.c
++++ b/options.c
+@@ -182,6 +182,7 @@ char *dest_option = NULL;
+ static int remote_option_alloc = 0;
+ int remote_option_cnt = 0;
+ const char **remote_options = NULL;
++const char *checksum_choice = NULL;
+ int quiet = 0;
+ int output_motd = 1;
+@@ -721,6 +722,7 @@ void usage(enum logcode F)
+ #endif
+   rprintf(F," -n, --dry-run               perform a trial run with no changes made\n");
+   rprintf(F," -W, --whole-file            copy files whole (without delta-xfer algorithm)\n");
++  rprintf(F,"     --checksum-choice=STR   choose the checksum algorithms\n");
+   rprintf(F," -x, --one-file-system       don't cross filesystem boundaries\n");
+   rprintf(F," -B, --block-size=SIZE       force a fixed checksum block-size\n");
+   rprintf(F," -e, --rsh=COMMAND           specify the remote shell to use\n");
+@@ -953,6 +955,7 @@ static struct poptOption long_options[] = {
+   {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
+   {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
+   {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
++  {"checksum-choice",  0,  POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
+   {"no-W",             0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
+   {"checksum",        'c', POPT_ARG_VAL,    &always_checksum, 1, 0, 0 },
+   {"no-checksum",      0,  POPT_ARG_VAL,    &always_checksum, 0, 0, 0 },
+@@ -1814,6 +1817,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+               }
+       }
++      if (checksum_choice && strcmp(checksum_choice, "auto") != 0 && strcmp(checksum_choice, "auto,auto") != 0) {
++              /* Call this early to verify the args and figure out if we need to force
++               * --whole-file. Note that the parse function will get called again later,
++               * just in case an "auto" choice needs to know the protocol_version. */
++              if (parse_checksum_choice())
++                      whole_file = 1;
++      } else
++              checksum_choice = NULL;
++
+       if (human_readable > 1 && argc == 2 && !am_server) {
+               /* Allow the old meaning of 'h' (--help) on its own. */
+               usage(FINFO);
+@@ -2597,6 +2609,12 @@ void server_options(char **args, int *argc_p)
+               args[ac++] = arg;
+       }
++      if (checksum_choice) {
++              if (asprintf(&arg, "--checksum-choice=%s", checksum_choice) < 0)
++                      goto oom;
++              args[ac++] = arg;
++      }
++
+       if (am_sender) {
+               if (max_delete > 0) {
+                       if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
+diff --git a/receiver.c b/receiver.c
+index 4ea4c09..f9b97dd 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -48,11 +48,11 @@ extern int append_mode;
+ extern int sparse_files;
+ extern int preallocate_files;
+ extern int keep_partial;
+-extern int checksum_len;
+ extern int checksum_seed;
+ extern int inplace;
+ extern int allowed_lull;
+ extern int delay_updates;
++extern int xfersum_type;
+ extern mode_t orig_umask;
+ extern struct stats stats;
+ extern char *tmpdir;
+@@ -234,6 +234,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+       static char file_sum1[MAX_DIGEST_LEN];
+       struct map_struct *mapbuf;
+       struct sum_struct sum;
++      int checksum_len;
+       int32 len;
+       OFF_T offset = 0;
+       OFF_T offset2;
+@@ -269,7 +270,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+       } else
+               mapbuf = NULL;
+-      sum_init(checksum_seed);
++      sum_init(xfersum_type, checksum_seed);
+       if (append_mode > 0) {
+               OFF_T j;
+@@ -393,8 +394,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+               exit_cleanup(RERR_FILEIO);
+       }
+-      if (sum_end(file_sum1) != checksum_len)
+-              overflow_exit("checksum_len"); /* Impossible... */
++      checksum_len = sum_end(file_sum1);
+       if (mapbuf)
+               unmap_file(mapbuf);
+diff --git a/rsync.yo b/rsync.yo
+index 8971828..0ec5e55 100644
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -380,6 +380,7 @@ to the detailed description below for a complete description.  verb(
+      --preallocate           allocate dest files before writing
+  -n, --dry-run               perform a trial run with no changes made
+  -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
++     --checksum-choice=STR   choose the checksum algorithms
+  -x, --one-file-system       don't cross filesystem boundaries
+  -B, --block-size=SIZE       force a fixed checksum block-size
+  -e, --rsh=COMMAND           specify the remote shell to use
+@@ -1280,14 +1281,27 @@ the "bytes sent", "bytes received", "literal data", and "matched data"
+ statistics are too small, and the "speedup" value is equivalent to a run
+ where no file transfers were needed.
+-dit(bf(-W, --whole-file)) With this option rsync's delta-transfer algorithm
+-is not used and the whole file is sent as-is instead.  The transfer may be
++dit(bf(-W, --whole-file)) This option disables rsync's delta-transfer algorithm,
++which causes all transferred files to be sent whole.  The transfer may be
+ faster if this option is used when the bandwidth between the source and
+ destination machines is higher than the bandwidth to disk (especially when the
+ "disk" is actually a networked filesystem).  This is the default when both
+ the source and destination are specified as local paths, but only if no
+ batch-writing option is in effect.
++dit(bf(--checksum-choice=STR)) This option overrides the checksum algoriths.
++If one algorithm name is specified, it is used for both the transfer checksums
++and (assuming bf(--checksum) is specifed) the pre-transfer checksumming. If two
++comma-separated names are supplied, the first name affects the transfer
++checksums, and the second name affects the pre-transfer checksumming.
++
++The algorithm choices are "auto", "md4", "md5", and "none".  If "none" is
++specified for the first name, the bf(--whole-file) option is forced on and no
++checksum verification is performed on the transferred data.  If "none" is
++specified for the second name, the bf(--checksum) option cannot be used. The
++"auto" option is the default, where rsync bases its algorithm choice on the
++protocol version (for backward compatibility with older rsync versions).
++
+ dit(bf(-x, --one-file-system)) This tells rsync to avoid crossing a
+ filesystem boundary when recursing.  This does not limit the user's ability
+ to specify items to copy from multiple filesystems, just rsync's recursion
+diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
+index 1813354..64156ae 100644
+--- a/rsyncd.conf.yo
++++ b/rsyncd.conf.yo
+@@ -656,7 +656,7 @@ quote(itemization(
+   it() %b the number of bytes actually transferred
+   it() %B the permission bits of the file (e.g. rwxrwxrwt)
+   it() %c the total size of the block checksums received for the basis file (only when sending)
+-  it() %C the full-file MD5 checksum if bf(--checksum) is enabled or a file was transferred (only for protocol 30 or above).
++  it() %C the full-file checksum if it is known for the file. For older rsync protocols/versions, the checksum was salted, and is thus not a useful value (and is not displayed when that is the case). For the checksum to output for a file, either the bf(--checksum) option must be in-effect or the file must have been transferred without a salted checksum being used. See the bf(--checksum-choice) option for a way to choose the algorithm.
+   it() %f the filename (long form on sender; no trailing "/")
+   it() %G the gid of the file (decimal) or "DEFAULT"
+   it() %h the remote host name (only available for a daemon)
+diff --git a/t_stub.c b/t_stub.c
+index 6002250..26951a6 100644
+--- a/t_stub.c
++++ b/t_stub.c
+@@ -25,7 +25,6 @@ int modify_window = 0;
+ int preallocate_files = 0;
+ int protect_args = 0;
+ int module_id = -1;
+-int checksum_len = 0;
+ int relative_paths = 0;
+ int module_dirlen = 0;
+ int preserve_acls = 0;
+@@ -97,3 +96,8 @@ filter_rule_list daemon_filter_list;
+ {
+       return "tester";
+ }
++
++ int csum_len_for_type(int cst)
++{
++      return cst ? 16 : 1;
++}
+diff --git a/util2.c b/util2.c
+index cc368af..a892e51 100644
+--- a/util2.c
++++ b/util2.c
+@@ -25,8 +25,6 @@
+ #include "itypes.h"
+ #include "inums.h"
+-extern int checksum_len;
+-
+ /**
+  * Sleep for a specified number of milliseconds.
+  *
+@@ -79,10 +77,11 @@ void *_realloc_array(void *ptr, unsigned int size, size_t num)
+       return realloc(ptr, size * num);
+ }
+-const char *sum_as_hex(const char *sum)
++const char *sum_as_hex(int csum_type, const char *sum)
+ {
+       static char buf[MAX_DIGEST_LEN*2+1];
+       int i, x1, x2;
++      int checksum_len = csum_len_for_type(csum_type);
+       char *c = buf + checksum_len*2;
+       assert(c - buf < (int)sizeof buf);
+diff --git a/xattrs.c b/xattrs.c
+index 57833e5..6a77a0b 100644
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -258,7 +258,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+               if (datum_len > MAX_FULL_DATUM) {
+                       /* For large datums, we store a flag and a checksum. */
+                       name_offset = 1 + MAX_DIGEST_LEN;
+-                      sum_init(checksum_seed);
++                      sum_init(-1, checksum_seed);
+                       sum_update(ptr, datum_len);
+                       free(ptr);
+@@ -821,7 +821,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
+                               goto still_abbrev;
+                       }
+-                      sum_init(checksum_seed);
++                      sum_init(-1, checksum_seed);
+                       sum_update(ptr, len);
+                       sum_end(sum);
+                       if (memcmp(sum, rxas[i].datum + 1, MAX_DIGEST_LEN) != 0) {
diff --git a/net/rsync/patches/003-support-sparse-combined-with.patch b/net/rsync/patches/003-support-sparse-combined-with.patch
new file mode 100644 (file)
index 0000000..259f411
--- /dev/null
@@ -0,0 +1,593 @@
+commit f3873b3d88b61167b106e7b9227a20147f8f6197
+Author: Wayne Davison <wayned@samba.org>
+Date:   Mon Oct 10 11:49:50 2016 -0700
+
+    Support --sparse combined with --preallocate or --inplace.
+    
+    The new code tries to punch holes in the destination file using newer
+    Linux fallocate features. It also supports a --whole-file + --sparse +
+    --inplace copy on any filesystem by truncating the destination file.
+
+diff --git a/configure.ac b/configure.ac
+index b5e4049..e01e124 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -614,6 +614,36 @@ if test x"$rsync_cv_have_fallocate" = x"yes"; then
+     AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the fallocate function and it compiles and links without error])
+ fi
++AC_MSG_CHECKING([for FALLOC_FL_PUNCH_HOLE])
++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
++        #define _GNU_SOURCE 1
++        #include <linux/falloc.h>
++        #ifndef FALLOC_FL_PUNCH_HOLE
++        #error FALLOC_FL_PUNCH_HOLE is missing
++        #endif
++    ]])], [
++        AC_MSG_RESULT([yes])
++        AC_DEFINE([HAVE_FALLOC_FL_PUNCH_HOLE], [1], [Define if FALLOC_FL_PUNCH_HOLE is available.])
++    ], [
++        AC_MSG_RESULT([no])
++    ]
++)
++
++AC_MSG_CHECKING([for FALLOC_FL_ZERO_RANGE])
++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
++        #define _GNU_SOURCE 1
++        #include <linux/falloc.h>
++        #ifndef FALLOC_FL_ZERO_RANGE
++        #error FALLOC_FL_ZERO_RANGE is missing
++        #endif
++    ]])], [
++        AC_MSG_RESULT([yes])
++        AC_DEFINE([HAVE_FALLOC_FL_ZERO_RANGE], [1], [Define if FALLOC_FL_ZERO_RANGE is available.])
++    ], [
++        AC_MSG_RESULT([no])
++    ]
++)
++
+ AC_CACHE_CHECK([for SYS_fallocate],rsync_cv_have_sys_fallocate,[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/syscall.h>
+ #include <sys/types.h>]], [[syscall(SYS_fallocate, 0, 0, (loff_t)0, (loff_t)0);]])],[rsync_cv_have_sys_fallocate=yes],[rsync_cv_have_sys_fallocate=no])])
+diff --git a/fileio.c b/fileio.c
+index 70e079d..1e8a562 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -35,7 +35,10 @@
+ extern int sparse_files;
++OFF_T preallocated_len = 0;
++
+ static OFF_T sparse_seek = 0;
++static OFF_T sparse_past_write = 0;
+ int sparse_end(int f, OFF_T size)
+ {
+@@ -63,8 +66,10 @@ int sparse_end(int f, OFF_T size)
+       return ret;
+ }
+-
+-static int write_sparse(int f, char *buf, int len)
++/* Note that the offset is just the caller letting us know where
++ * the current file position is in the file. The use_seek arg tells
++ * us that we should seek over matching data instead of writing it. */
++static int write_sparse(int f, int use_seek, OFF_T offset, const char *buf, int len)
+ {
+       int l1 = 0, l2 = 0;
+       int ret;
+@@ -77,9 +82,24 @@ static int write_sparse(int f, char *buf, int len)
+       if (l1 == len)
+               return len;
+-      if (sparse_seek)
+-              do_lseek(f, sparse_seek, SEEK_CUR);
++      if (sparse_seek) {
++              if (sparse_past_write >= preallocated_len) {
++                      if (do_lseek(f, sparse_seek, SEEK_CUR) < 0)
++                              return -1;
++              } else if (do_punch_hole(f, sparse_past_write, sparse_seek) < 0) {
++                      sparse_seek = 0;
++                      return -1;
++              }
++      }
+       sparse_seek = l2;
++      sparse_past_write = offset + len - l2;
++
++      if (use_seek) {
++              /* The in-place data already matches. */
++              if (do_lseek(f, len - (l1+l2), SEEK_CUR) < 0)
++                      return -1;
++              return len;
++      }
+       while ((ret = write(f, buf + l1, len - (l1+l2))) <= 0) {
+               if (ret < 0 && errno == EINTR)
+@@ -96,7 +116,6 @@ static int write_sparse(int f, char *buf, int len)
+       return len;
+ }
+-
+ static char *wf_writeBuf;
+ static size_t wf_writeBufSize;
+ static size_t wf_writeBufCnt;
+@@ -118,12 +137,10 @@ int flush_write_file(int f)
+       return ret;
+ }
+-
+-/*
+- * write_file does not allow incomplete writes.  It loops internally
+- * until len bytes are written or errno is set.
+- */
+-int write_file(int f, char *buf, int len)
++/* write_file does not allow incomplete writes.  It loops internally
++ * until len bytes are written or errno is set.  Note that use_seek and
++ * offset are only used in sparse processing (see write_sparse()). */
++int write_file(int f, int use_seek, OFF_T offset, const char *buf, int len)
+ {
+       int ret = 0;
+@@ -131,7 +148,8 @@ int write_file(int f, char *buf, int len)
+               int r1;
+               if (sparse_files > 0) {
+                       int len1 = MIN(len, SPARSE_WRITE_SIZE);
+-                      r1 = write_sparse(f, buf, len1);
++                      r1 = write_sparse(f, use_seek, offset, buf, len1);
++                      offset += r1;
+               } else {
+                       if (!wf_writeBuf) {
+                               wf_writeBufSize = WRITE_SIZE * 8;
+@@ -164,6 +182,30 @@ int write_file(int f, char *buf, int len)
+       return ret;
+ }
++/* An in-place update found identical data at an identical location. We either
++ * just seek past it, or (for an in-place sparse update), we give the data to
++ * the sparse processor with the use_seek flag set. */
++int skip_matched(int fd, OFF_T offset, const char *buf, int len)
++{
++      OFF_T pos;
++
++      if (sparse_files > 0) {
++              if (write_file(fd, 1, offset, buf, len) != len)
++                      return -1;
++              return 0;
++      }
++
++      if (flush_write_file(fd) < 0)
++              return -1;
++
++      if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset + len) {
++              rsyserr(FERROR_XFER, errno, "lseek returned %s, not %s",
++                      big_num(pos), big_num(offset));
++              return -1;
++      }
++
++      return 0;
++}
+ /* This provides functionality somewhat similar to mmap() but using read().
+  * It gives sliding window access to a file.  mmap() is not used because of
+@@ -271,7 +313,6 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
+       return map->p + align_fudge;
+ }
+-
+ int unmap_file(struct map_struct *map)
+ {
+       int     ret;
+diff --git a/options.c b/options.c
+index 308443b..6ba13b7 100644
+--- a/options.c
++++ b/options.c
+@@ -714,7 +714,7 @@ void usage(enum logcode F)
+ #ifdef SUPPORT_XATTRS
+   rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
+ #endif
+-  rprintf(F," -S, --sparse                handle sparse files efficiently\n");
++  rprintf(F," -S, --sparse                turn sequences of nulls into sparse blocks\n");
+ #ifdef SUPPORT_PREALLOCATION
+   rprintf(F,"     --preallocate           allocate dest files before writing them\n");
+ #else
+@@ -2237,14 +2237,6 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+                       bwlimit_writemax = 512;
+       }
+-      if (sparse_files && inplace) {
+-              /* Note: we don't check for this below, because --append is
+-               * OK with --sparse (as long as redos are handled right). */
+-              snprintf(err_buf, sizeof err_buf,
+-                       "--sparse cannot be used with --inplace\n");
+-              return 0;
+-      }
+-
+       if (append_mode) {
+               if (whole_file > 0) {
+                       snprintf(err_buf, sizeof err_buf,
+diff --git a/receiver.c b/receiver.c
+index f9b97dd..bed5328 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -49,6 +49,7 @@ extern int sparse_files;
+ extern int preallocate_files;
+ extern int keep_partial;
+ extern int checksum_seed;
++extern int whole_file;
+ extern int inplace;
+ extern int allowed_lull;
+ extern int delay_updates;
+@@ -61,6 +62,9 @@ extern char *basis_dir[MAX_BASIS_DIRS+1];
+ extern char sender_file_sum[MAX_DIGEST_LEN];
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern filter_rule_list daemon_filter_list;
++#ifdef SUPPORT_PREALLOCATION
++extern OFF_T preallocated_len;
++#endif
+ static struct bitbag *delayed_bits = NULL;
+ static int phase = 0, redoing = 0;
+@@ -241,22 +245,25 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+       char *data;
+       int32 i;
+       char *map = NULL;
+-#ifdef SUPPORT_PREALLOCATION
+-#ifdef PREALLOCATE_NEEDS_TRUNCATE
+-      OFF_T preallocated_len = 0;
+-#endif
++#ifdef SUPPORT_PREALLOCATION
+       if (preallocate_files && fd != -1 && total_size > 0 && (!inplace || total_size > size_r)) {
+               /* Try to preallocate enough space for file's eventual length.  Can
+                * reduce fragmentation on filesystems like ext4, xfs, and NTFS. */
+-              if (do_fallocate(fd, 0, total_size) == 0) {
+-#ifdef PREALLOCATE_NEEDS_TRUNCATE
+-                      preallocated_len = total_size;
+-#endif
+-              } else
++              if ((preallocated_len = do_fallocate(fd, 0, total_size)) < 0)
+                       rsyserr(FWARNING, errno, "do_fallocate %s", full_fname(fname));
+-      }
++      } else
++#endif
++      if (inplace) {
++#ifdef HAVE_FTRUNCATE
++              /* The most compatible way to create a sparse file is to start with no length. */
++              if (sparse_files > 0 && whole_file && fd >= 0 && do_ftruncate(fd, 0) == 0)
++                      preallocated_len = 0;
++              else
+ #endif
++                      preallocated_len = size_r;
++      } else
++              preallocated_len = 0;
+       read_sum_head(f_in, &sum);
+@@ -318,7 +325,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+                       sum_update(data, i);
+-                      if (fd != -1 && write_file(fd,data,i) != i)
++                      if (fd != -1 && write_file(fd, 0, offset, data, i) != i)
+                               goto report_write_error;
+                       offset += i;
+                       continue;
+@@ -348,37 +355,33 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+               if (updating_basis_or_equiv) {
+                       if (offset == offset2 && fd != -1) {
+-                              OFF_T pos;
+-                              if (flush_write_file(fd) < 0)
++                              if (skip_matched(fd, offset, map, len) < 0)
+                                       goto report_write_error;
+                               offset += len;
+-                              if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
+-                                      rsyserr(FERROR_XFER, errno,
+-                                              "lseek of %s returned %s, not %s",
+-                                              full_fname(fname),
+-                                              big_num(pos), big_num(offset));
+-                                      exit_cleanup(RERR_FILEIO);
+-                              }
+                               continue;
+                       }
+               }
+-              if (fd != -1 && map && write_file(fd, map, len) != (int)len)
++              if (fd != -1 && map && write_file(fd, 0, offset, map, len) != (int)len)
+                       goto report_write_error;
+               offset += len;
+       }
+-      if (flush_write_file(fd) < 0)
+-              goto report_write_error;
++      if (fd != -1 && offset > 0) {
++              if (sparse_files > 0) {
++                      if (sparse_end(fd, offset) != 0)
++                              goto report_write_error;
++              } else if (flush_write_file(fd) < 0) {
++                  report_write_error:
++                      rsyserr(FERROR_XFER, errno, "write failed on %s", full_fname(fname));
++                      exit_cleanup(RERR_FILEIO);
++              }
++      }
+ #ifdef HAVE_FTRUNCATE
+       /* inplace: New data could be shorter than old data.
+        * preallocate_files: total_size could have been an overestimate.
+        *     Cut off any extra preallocated zeros from dest file. */
+-      if ((inplace
+-#ifdef PREALLOCATE_NEEDS_TRUNCATE
+-        || preallocated_len > offset
+-#endif
+-        ) && fd != -1 && do_ftruncate(fd, offset) < 0) {
++      if ((inplace || preallocated_len > offset) && fd != -1 && do_ftruncate(fd, offset) < 0) {
+               rsyserr(FERROR_XFER, errno, "ftruncate failed on %s",
+                       full_fname(fname));
+       }
+@@ -387,13 +390,6 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+       if (INFO_GTE(PROGRESS, 1))
+               end_progress(total_size);
+-      if (fd != -1 && offset > 0 && sparse_end(fd, offset) != 0) {
+-          report_write_error:
+-              rsyserr(FERROR_XFER, errno, "write failed on %s",
+-                      full_fname(fname));
+-              exit_cleanup(RERR_FILEIO);
+-      }
+-
+       checksum_len = sum_end(file_sum1);
+       if (mapbuf)
+diff --git a/rsync.yo b/rsync.yo
+index bfe43b9..d1e6fdf 100644
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -376,7 +376,7 @@ to the detailed description below for a complete description.  verb(
+  -J, --omit-link-times       omit symlinks from --times
+      --super                 receiver attempts super-user activities
+      --fake-super            store/recover privileged attrs using xattrs
+- -S, --sparse                handle sparse files efficiently
++ -S, --sparse                turn sequences of nulls into sparse blocks
+      --preallocate           allocate dest files before writing
+  -n, --dry-run               perform a trial run with no changes made
+  -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
+@@ -873,9 +873,7 @@ the same or longer than the size on the sender, the file is skipped.  This
+ does not interfere with the updating of a file's non-content attributes
+ (e.g. permissions, ownership, etc.) when the file does not need to be
+ transferred, nor does it affect the updating of any non-regular files.
+-Implies bf(--inplace),
+-but does not conflict with bf(--sparse) (since it is always extending a
+-file's length).
++Implies bf(--inplace).
+ The use of bf(--append) can be dangerous if you aren't 100% sure that the files
+ that are longer have only grown by the appending of data onto the end.  You
+@@ -1252,20 +1250,30 @@ This option is overridden by both bf(--super) and bf(--no-super).
+ See also the "fake super" setting in the daemon's rsyncd.conf file.
+ dit(bf(-S, --sparse)) Try to handle sparse files efficiently so they take
+-up less space on the destination.  Conflicts with bf(--inplace) because it's
+-not possible to overwrite data in a sparse fashion.
++up less space on the destination.  If combined with bf(--inplace) the
++file created might not end up with sparse blocks with some combinations
++of kernel version and/or filesystem type.  If bf(--whole-file) is in
++effect (e.g. for a local copy) then it will always work because rsync
++truncates the file prior to writing out the updated version.
++
++Note that versions of rsync older than 3.1.3 will reject the combination of
++bf(--sparse) and bf(--inplace).
+ dit(bf(--preallocate)) This tells the receiver to allocate each destination
+-file to its eventual size before writing data to the file.  Rsync will only use
+-the real filesystem-level preallocation support provided by Linux's
++file to its eventual size before writing data to the file.  Rsync will only
++use the real filesystem-level preallocation support provided by Linux's
+ bf(fallocate)(2) system call or Cygwin's bf(posix_fallocate)(3), not the slow
+-glibc implementation that writes a zero byte into each block.
++glibc implementation that writes a null byte into each block.
+ Without this option, larger files may not be entirely contiguous on the
+ filesystem, but with this option rsync will probably copy more slowly.  If the
+ destination is not an extent-supporting filesystem (such as ext4, xfs, NTFS,
+ etc.), this option may have no positive effect at all.
++If combined with bf(--sparse), the file will only have sparse blocks (as
++opposed to allocated sequences of null bytes) if the kernel version and
++filesystem type support creating holes in the allocated data.
++
+ dit(bf(-n, --dry-run)) This makes rsync perform a trial run that doesn't
+ make any changes (and produces mostly the same output as a real run).  It
+ is most commonly used in combination with the bf(-v, --verbose) and/or
+diff --git a/syscall.c b/syscall.c
+index ecca2f1..fa53b63 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -38,6 +38,8 @@ extern int am_root;
+ extern int am_sender;
+ extern int read_only;
+ extern int list_only;
++extern int inplace;
++extern int preallocate_files;
+ extern int preserve_perms;
+ extern int preserve_executability;
+@@ -423,27 +425,80 @@ int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
+ #endif
+ #ifdef SUPPORT_PREALLOCATION
+-int do_fallocate(int fd, OFF_T offset, OFF_T length)
+-{
+ #ifdef FALLOC_FL_KEEP_SIZE
+ #define DO_FALLOC_OPTIONS FALLOC_FL_KEEP_SIZE
+ #else
+ #define DO_FALLOC_OPTIONS 0
+ #endif
++
++OFF_T do_fallocate(int fd, OFF_T offset, OFF_T length)
++{
++      int opts = inplace || preallocate_files ? 0 : DO_FALLOC_OPTIONS;
++      int ret;
+       RETURN_ERROR_IF(dry_run, 0);
+       RETURN_ERROR_IF_RO_OR_LO;
++      if (length & 1) /* make the length not match the desired length */
++              length++;
++      else
++              length--;
+ #if defined HAVE_FALLOCATE
+-      return fallocate(fd, DO_FALLOC_OPTIONS, offset, length);
++      ret = fallocate(fd, opts, offset, length);
+ #elif defined HAVE_SYS_FALLOCATE
+-      return syscall(SYS_fallocate, fd, DO_FALLOC_OPTIONS, (loff_t)offset, (loff_t)length);
++      ret = syscall(SYS_fallocate, fd, opts, (loff_t)offset, (loff_t)length);
+ #elif defined HAVE_EFFICIENT_POSIX_FALLOCATE
+-      return posix_fallocate(fd, offset, length);
++      ret = posix_fallocate(fd, offset, length);
+ #else
+ #error Coding error in SUPPORT_PREALLOCATION logic.
+ #endif
++      if (ret < 0)
++              return ret;
++      if (opts == 0) {
++              STRUCT_STAT st;
++              if (do_fstat(fd, &st) < 0)
++                      return length;
++              return st.st_blocks * 512;
++      }
++      return 0;
+ }
+ #endif
++/* Punch a hole at pos for len bytes. The current file position must be at pos and will be
++ * changed to be at pos + len. */
++int do_punch_hole(int fd, UNUSED(OFF_T pos), int len)
++{
++#ifdef HAVE_FALLOCATE
++# ifdef HAVE_FALLOC_FL_PUNCH_HOLE
++      if (fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, pos, len) == 0) {
++              if (do_lseek(fd, len, SEEK_CUR) != pos + len)
++                      return -1;
++              return 0;
++      }
++# endif
++# ifdef HAVE_FALLOC_FL_ZERO_RANGE
++      if (fallocate(fd, FALLOC_FL_ZERO_RANGE, pos, len) == 0) {
++              if (do_lseek(fd, len, SEEK_CUR) != pos + len)
++                      return -1;
++              return 0;
++      }
++# endif
++#endif
++      {
++              char zeros[4096];
++              memset(zeros, 0, sizeof zeros);
++              while (len > 0) {
++                      int chunk = len > (int)sizeof zeros ? (int)sizeof zeros : len;
++                      int wrote = write(fd, zeros, chunk);
++                      if (wrote <= 0) {
++                              if (wrote < 0 && errno == EINTR)
++                                      continue;
++                              return -1;
++                      }
++                      len -= wrote;
++              }
++      }
++      return 0;
++}
++
+ int do_open_nofollow(const char *pathname, int flags)
+ {
+ #ifndef O_NOFOLLOW
+diff --git a/t_stub.c b/t_stub.c
+index 26951a6..fc1ee3b 100644
+--- a/t_stub.c
++++ b/t_stub.c
+@@ -21,6 +21,7 @@
+ #include "rsync.h"
++int inplace = 0;
+ int modify_window = 0;
+ int preallocate_files = 0;
+ int protect_args = 0;
+diff --git a/tls.c b/tls.c
+index 45d1e10..d5a2896 100644
+--- a/tls.c
++++ b/tls.c
+@@ -51,6 +51,8 @@ int link_owner = 0;
+ int nsec_times = 0;
+ int preserve_perms = 0;
+ int preserve_executability = 0;
++int preallocate_files = 0;
++int inplace = 0;
+ #ifdef SUPPORT_XATTRS
+diff --git a/trimslash.c b/trimslash.c
+index 207eaf2..5db6f3e 100644
+--- a/trimslash.c
++++ b/trimslash.c
+@@ -28,6 +28,8 @@ int read_only = 1;
+ int list_only = 0;
+ int preserve_perms = 0;
+ int preserve_executability = 0;
++int preallocate_files = 0;
++int inplace = 0;
+ int
+ main(int argc, char **argv)
+diff --git a/util.c b/util.c
+index ca38f3e..49c5b71 100644
+--- a/util.c
++++ b/util.c
+@@ -323,9 +323,7 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
+       int ifd;
+       char buf[1024 * 8];
+       int len;   /* Number of bytes read into `buf'. */
+-#ifdef PREALLOCATE_NEEDS_TRUNCATE
+-      OFF_T preallocated_len = 0, offset = 0;
+-#endif
++      OFF_T prealloc_len = 0, offset = 0;
+       if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
+               int save_errno = errno;
+@@ -365,11 +363,8 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
+               if (do_fstat(ifd, &srcst) < 0)
+                       rsyserr(FWARNING, errno, "fstat %s", full_fname(source));
+               else if (srcst.st_size > 0) {
+-                      if (do_fallocate(ofd, 0, srcst.st_size) == 0) {
+-#ifdef PREALLOCATE_NEEDS_TRUNCATE
+-                              preallocated_len = srcst.st_size;
+-#endif
+-                      } else
++                      prealloc_len = do_fallocate(ofd, 0, srcst.st_size);
++                      if (prealloc_len < 0)
+                               rsyserr(FWARNING, errno, "do_fallocate %s", full_fname(dest));
+               }
+       }
+@@ -384,9 +379,7 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
+                       errno = save_errno;
+                       return -1;
+               }
+-#ifdef PREALLOCATE_NEEDS_TRUNCATE
+               offset += len;
+-#endif
+       }
+       if (len < 0) {
+@@ -403,15 +396,13 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
+                       full_fname(source));
+       }
+-#ifdef PREALLOCATE_NEEDS_TRUNCATE
+       /* Source file might have shrunk since we fstatted it.
+        * Cut off any extra preallocated zeros from dest file. */
+-      if (offset < preallocated_len && do_ftruncate(ofd, offset) < 0) {
++      if (offset < prealloc_len && do_ftruncate(ofd, offset) < 0) {
+               /* If we fail to truncate, the dest file may be wrong, so we
+                * must trigger the "partial transfer" error. */
+               rsyserr(FERROR_XFER, errno, "ftruncate %s", full_fname(dest));
+       }
+-#endif
+       if (close(ofd) < 0) {
+               int save_errno = errno;
diff --git a/net/rsync/patches/004-we-need-a-LF-after-filelist.patch b/net/rsync/patches/004-we-need-a-LF-after-filelist.patch
new file mode 100644 (file)
index 0000000..79cdac6
--- /dev/null
@@ -0,0 +1,21 @@
+commit e02b89d0d35ab8acbd522983c08d2519d8bd12d4
+Author: Wayne Davison <wayned@samba.org>
+Date:   Sat Oct 29 14:33:44 2016 -0700
+
+    We need a LF after filelist-progress with a CR.
+    Fixes bug 12367.
+
+diff --git a/flist.c b/flist.c
+index acb95f7..4a9f4e6 100644
+--- a/flist.c
++++ b/flist.c
+@@ -156,7 +156,9 @@ static void start_filelist_progress(char *kind)
+ static void emit_filelist_progress(int count)
+ {
++      output_needs_newline = 0; /* avoid a newline in the middle of this filelist-progress output */
+       rprintf(FCLIENT, " %d files...\r", count);
++      output_needs_newline = 1;
+ }
+ static void maybe_emit_filelist_progress(int count)
diff --git a/net/rsync/patches/005-more-fixes-for-progress-quirks.patch b/net/rsync/patches/005-more-fixes-for-progress-quirks.patch
new file mode 100644 (file)
index 0000000..ee63fa7
--- /dev/null
@@ -0,0 +1,140 @@
+commit ff66fd4bb6cc76488c6ea1e4b651a869847f6375
+Author: Wayne Davison <wayned@samba.org>
+Date:   Sat Oct 29 14:47:58 2016 -0700
+
+    More fixes for --progress quirks.
+    
+    This patch avoids inconsistent evaluation of options in the
+    show_filelist_p() function by turning it into a var.  We
+    also avoid setting "output_needs_newline" if --quiet was
+    specified.
+
+diff --git a/flist.c b/flist.c
+index 4a9f4e6..54ced36 100644
+--- a/flist.c
++++ b/flist.c
+@@ -37,6 +37,7 @@ extern int checksum_type;
+ extern int module_id;
+ extern int ignore_errors;
+ extern int numeric_ids;
++extern int quiet;
+ extern int recurse;
+ extern int use_qsort;
+ extern int xfer_dirs;
+@@ -128,6 +129,7 @@ static char tmp_sum[MAX_DIGEST_LEN];
+ static char empty_sum[MAX_DIGEST_LEN];
+ static int flist_count_offset; /* for --delete --progress */
++static int show_filelist_progress;
+ static void flist_sort_and_clean(struct file_list *flist, int strip_root);
+ static void output_flist(struct file_list *flist);
+@@ -140,15 +142,14 @@ void init_flist(void)
+       }
+       parse_checksum_choice(); /* Sets checksum_type && xfersum_type */
+       checksum_len = csum_len_for_type(checksum_type);
+-}
+-static int show_filelist_p(void)
+-{
+-      return INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse;
++      show_filelist_progress = INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse;
+ }
+ static void start_filelist_progress(char *kind)
+ {
++      if (quiet)
++              return;
+       rprintf(FCLIENT, "%s ... ", kind);
+       output_needs_newline = 1;
+       rflush(FINFO);
+@@ -156,25 +157,28 @@ static void start_filelist_progress(char *kind)
+ static void emit_filelist_progress(int count)
+ {
+-      output_needs_newline = 0; /* avoid a newline in the middle of this filelist-progress output */
++      if (quiet)
++              return;
++      if (output_needs_newline == 2) /* avoid a newline in the middle of this filelist-progress output */
++              output_needs_newline = 0;
+       rprintf(FCLIENT, " %d files...\r", count);
+-      output_needs_newline = 1;
++      output_needs_newline = 2;
+ }
+ static void maybe_emit_filelist_progress(int count)
+ {
+-      if (INFO_GTE(FLIST, 2) && show_filelist_p() && (count % 100) == 0)
++      if (INFO_GTE(FLIST, 2) && show_filelist_progress && (count % 100) == 0)
+               emit_filelist_progress(count);
+ }
+ static void finish_filelist_progress(const struct file_list *flist)
+ {
++      output_needs_newline = 0;
+       if (INFO_GTE(FLIST, 2)) {
+               /* This overwrites the progress line */
+               rprintf(FINFO, "%d file%sto consider\n",
+                       flist->used, flist->used == 1 ? " " : "s ");
+       } else {
+-              output_needs_newline = 0;
+               rprintf(FINFO, "done\n");
+       }
+ }
+@@ -2089,7 +2093,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+       int implied_dot_dir = 0;
+       rprintf(FLOG, "building file list\n");
+-      if (show_filelist_p())
++      if (show_filelist_progress)
+               start_filelist_progress("building file list");
+       else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server)
+               rprintf(FCLIENT, "sending incremental file list\n");
+@@ -2363,7 +2367,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+               idev_destroy();
+ #endif
+-      if (show_filelist_p())
++      if (show_filelist_progress)
+               finish_filelist_progress(flist);
+       gettimeofday(&end_tv, NULL);
+@@ -2445,7 +2449,7 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+       int64 start_read;
+       if (!first_flist) {
+-              if (show_filelist_p())
++              if (show_filelist_progress)
+                       start_filelist_progress("receiving file list");
+               else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server)
+                       rprintf(FCLIENT, "receiving incremental file list\n");
+@@ -2541,7 +2545,7 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+       if (DEBUG_GTE(FLIST, 2))
+               rprintf(FINFO, "received %d names\n", flist->used);
+-      if (show_filelist_p())
++      if (show_filelist_progress)
+               finish_filelist_progress(flist);
+       if (need_unsorted_flist) {
+diff --git a/progress.c b/progress.c
+index 3858fc4..d19fa25 100644
+--- a/progress.c
++++ b/progress.c
+@@ -25,6 +25,7 @@
+ extern int am_server;
+ extern int flist_eof;
++extern int quiet;
+ extern int need_unsorted_flist;
+ extern int output_needs_newline;
+ extern struct stats stats;
+@@ -127,7 +128,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
+       pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
+       rprintf(FCLIENT, "\r%15s %3d%% %7.2f%s %s%s",
+               human_num(ofs), pct, rate, units, rembuf, eol);
+-      if (!is_last) {
++      if (!is_last && !quiet) {
+               output_needs_newline = 1;
+               rflush(FCLIENT);
+       }
diff --git a/net/rsync/patches/006-handle-archaic-checksums-properly.patch b/net/rsync/patches/006-handle-archaic-checksums-properly.patch
new file mode 100644 (file)
index 0000000..81b7585
--- /dev/null
@@ -0,0 +1,100 @@
+commit 7b8a4ecd6ff9cdf4e5d3850ebf822f1e989255b3
+Author: Wayne Davison <wayned@samba.org>
+Date:   Tue Oct 24 15:40:37 2017 -0700
+
+    Handle archaic checksums properly.
+
+diff --git a/checksum.c b/checksum.c
+index 8b38833..9382694 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -27,7 +27,7 @@ extern int proper_seed_order;
+ extern char *checksum_choice;
+ #define CSUM_NONE 0
+-#define CSUM_ARCHAIC 1
++#define CSUM_MD4_ARCHAIC 1
+ #define CSUM_MD4_BUSTED 2
+ #define CSUM_MD4_OLD 3
+ #define CSUM_MD4 4
+@@ -60,7 +60,7 @@ int parse_csum_name(const char *name, int len)
+                       return CSUM_MD4_OLD;
+               if (protocol_version >= 21)
+                       return CSUM_MD4_BUSTED;
+-              return CSUM_ARCHAIC;
++              return CSUM_MD4_ARCHAIC;
+       }
+       if (len == 3 && strncasecmp(name, "md4", 3) == 0)
+               return CSUM_MD4;
+@@ -78,7 +78,7 @@ int csum_len_for_type(int cst)
+       switch (cst) {
+         case CSUM_NONE:
+               return 1;
+-        case CSUM_ARCHAIC:
++        case CSUM_MD4_ARCHAIC:
+               return 2;
+         case CSUM_MD4:
+         case CSUM_MD4_OLD:
+@@ -143,7 +143,8 @@ void get_checksum2(char *buf, int32 len, char *sum)
+         }
+         case CSUM_MD4:
+         case CSUM_MD4_OLD:
+-        case CSUM_MD4_BUSTED: {
++        case CSUM_MD4_BUSTED:
++        case CSUM_MD4_ARCHAIC: {
+               int32 i;
+               static char *buf1;
+               static int32 len1;
+@@ -174,7 +175,7 @@ void get_checksum2(char *buf, int32 len, char *sum)
+                * are multiples of 64.  This is fixed by calling mdfour_update()
+                * even when there are no more bytes.
+                */
+-              if (len - i > 0 || xfersum_type != CSUM_MD4_BUSTED)
++              if (len - i > 0 || xfersum_type > CSUM_MD4_BUSTED)
+                       mdfour_update(&m, (uchar *)(buf1+i), len-i);
+               mdfour_result(&m, (uchar *)sum);
+@@ -217,6 +218,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+         case CSUM_MD4:
+         case CSUM_MD4_OLD:
+         case CSUM_MD4_BUSTED:
++        case CSUM_MD4_ARCHAIC:
+               mdfour_begin(&m);
+               for (i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+@@ -229,7 +231,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+                * are multiples of 64.  This is fixed by calling mdfour_update()
+                * even when there are no more bytes. */
+               remainder = (int32)(len - i);
+-              if (remainder > 0 || checksum_type != CSUM_MD4_BUSTED)
++              if (remainder > 0 || checksum_type > CSUM_MD4_BUSTED)
+                       mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
+               mdfour_result(&m, (uchar *)sum);
+@@ -265,6 +267,7 @@ void sum_init(int csum_type, int seed)
+               break;
+         case CSUM_MD4_OLD:
+         case CSUM_MD4_BUSTED:
++        case CSUM_MD4_ARCHAIC:
+               mdfour_begin(&md);
+               sumresidue = 0;
+               SIVAL(s, 0, seed);
+@@ -321,6 +324,10 @@ void sum_update(const char *p, int32 len)
+       }
+ }
++/* NOTE: all the callers of sum_end() pass in a pointer to a buffer that is
++ * MAX_DIGEST_LEN in size, so even if the csum-len is shorter that that (i.e.
++ * CSUM_MD4_ARCHAIC), we don't have to worry about limiting the data we write
++ * into the "sum" buffer. */
+ int sum_end(char *sum)
+ {
+       switch (cursum_type) {
+@@ -333,6 +340,7 @@ int sum_end(char *sum)
+               mdfour_result(&md, (uchar *)sum);
+               break;
+         case CSUM_MD4_BUSTED:
++        case CSUM_MD4_ARCHAIC:
+               if (sumresidue)
+                       mdfour_update(&md, (uchar *)md.buffer, sumresidue);
+               mdfour_result(&md, (uchar *)sum);
diff --git a/net/rsync/patches/007-dont-forget-to-tweak-sum_update.patch b/net/rsync/patches/007-dont-forget-to-tweak-sum_update.patch
new file mode 100644 (file)
index 0000000..42ecfc9
--- /dev/null
@@ -0,0 +1,18 @@
+commit c252546ceeb0925eb8a4061315e3ff0a8c55b48b
+Author: Wayne Davison <wayned@samba.org>
+Date:   Tue Oct 24 20:42:41 2017 -0700
+
+    Don't forget to tweak sum_update().
+
+diff --git a/checksum.c b/checksum.c
+index 9382694..c119f97 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -295,6 +295,7 @@ void sum_update(const char *p, int32 len)
+         case CSUM_MD4:
+         case CSUM_MD4_OLD:
+         case CSUM_MD4_BUSTED:
++        case CSUM_MD4_ARCHAIC:
+               if (len + sumresidue < CSUM_CHUNK) {
+                       memcpy(md.buffer + sumresidue, p, len);
+                       sumresidue += len;
diff --git a/net/rsync/patches/008-only-allow-a-modern-checksum.patch b/net/rsync/patches/008-only-allow-a-modern-checksum.patch
new file mode 100644 (file)
index 0000000..d38ab0f
--- /dev/null
@@ -0,0 +1,30 @@
+commit 9a480deec4d20277d8e20bc55515ef0640ca1e55
+Author: Wayne Davison <wayned@samba.org>
+Date:   Tue Oct 24 20:44:37 2017 -0700
+
+    Only allow a modern checksum method for passwords.
+
+diff --git a/authenticate.c b/authenticate.c
+index d60ee20..a106b0f 100644
+--- a/authenticate.c
++++ b/authenticate.c
+@@ -22,6 +22,7 @@
+ #include "itypes.h"
+ extern int read_only;
++extern int protocol_version;
+ extern char *password_file;
+ /***************************************************************************
+@@ -237,6 +238,11 @@ char *auth_server(int f_in, int f_out, int module, const char *host,
+       if (!users || !*users)
+               return "";
++      if (protocol_version < 21) { /* Don't allow a weak checksum for the password. */
++              rprintf(FERROR, "ERROR: protocol version is too old!\n");
++              exit_cleanup(RERR_PROTOCOL);
++      }
++
+       gen_challenge(addr, challenge);
+       io_printf(f_out, "%s%s\n", leader, challenge);
diff --git a/net/rsync/patches/009-Use-full-MD4-len.patch b/net/rsync/patches/009-Use-full-MD4-len.patch
new file mode 100644 (file)
index 0000000..21f8b3d
--- /dev/null
@@ -0,0 +1,97 @@
+commit bc112b0e7feece62ce98708092306639a8a53cce
+Author: Wayne Davison <wayned@samba.org>
+Date:   Mon Oct 30 09:11:16 2017 -0700
+
+    Use full MD4 len for archaic protocol auth.
+
+diff --git a/authenticate.c b/authenticate.c
+index a106b0f..519429d 100644
+--- a/authenticate.c
++++ b/authenticate.c
+@@ -22,7 +22,6 @@
+ #include "itypes.h"
+ extern int read_only;
+-extern int protocol_version;
+ extern char *password_file;
+ /***************************************************************************
+@@ -75,6 +74,8 @@ static void gen_challenge(const char *addr, char *challenge)
+       sum_init(-1, 0);
+       sum_update(input, sizeof input);
+       len = sum_end(digest);
++      if (len == 2) /* The archaic checksum is 2 bytes, but sum_end() filled in the full MD4 checksum for us. */
++              len = MD4_DIGEST_LEN;
+       base64_encode(digest, len, challenge, 0);
+ }
+@@ -90,6 +91,8 @@ static void generate_hash(const char *in, const char *challenge, char *out)
+       sum_update(in, strlen(in));
+       sum_update(challenge, strlen(challenge));
+       len = sum_end(buf);
++      if (len == 2) /* The archaic checksum is 2 bytes, but sum_end() filled in the full MD4 checksum for us. */
++              len = MD4_DIGEST_LEN;
+       base64_encode(buf, len, out, 0);
+ }
+@@ -238,11 +241,6 @@ char *auth_server(int f_in, int f_out, int module, const char *host,
+       if (!users || !*users)
+               return "";
+-      if (protocol_version < 21) { /* Don't allow a weak checksum for the password. */
+-              rprintf(FERROR, "ERROR: protocol version is too old!\n");
+-              exit_cleanup(RERR_PROTOCOL);
+-      }
+-
+       gen_challenge(addr, challenge);
+       io_printf(f_out, "%s%s\n", leader, challenge);
+diff --git a/checksum.c b/checksum.c
+index c119f97..741ad7d 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -86,6 +86,8 @@ int csum_len_for_type(int cst)
+               return MD4_DIGEST_LEN;
+         case CSUM_MD5:
+               return MD5_DIGEST_LEN;
++        default: /* paranoia to prevent missing case values */
++              exit_cleanup(RERR_UNSUPPORTED);
+       }
+       return 0;
+ }
+@@ -181,6 +183,8 @@ void get_checksum2(char *buf, int32 len, char *sum)
+               mdfour_result(&m, (uchar *)sum);
+               break;
+         }
++        default: /* paranoia to prevent missing case values */
++              exit_cleanup(RERR_UNSUPPORTED);
+       }
+ }
+@@ -275,6 +279,8 @@ void sum_init(int csum_type, int seed)
+               break;
+         case CSUM_NONE:
+               break;
++        default: /* paranoia to prevent missing case values */
++              exit_cleanup(RERR_UNSUPPORTED);
+       }
+ }
+@@ -322,6 +328,8 @@ void sum_update(const char *p, int32 len)
+               break;
+         case CSUM_NONE:
+               break;
++        default: /* paranoia to prevent missing case values */
++              exit_cleanup(RERR_UNSUPPORTED);
+       }
+ }
+@@ -349,6 +357,8 @@ int sum_end(char *sum)
+         case CSUM_NONE:
+               *sum = '\0';
+               break;
++        default: /* paranoia to prevent missing case values */
++              exit_cleanup(RERR_UNSUPPORTED);
+       }
+       return csum_len_for_type(cursum_type);
diff --git a/net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch b/net/rsync/patches/010-enforce-trailing-0-when-receiving-xattr.patch
new file mode 100644 (file)
index 0000000..688baff
--- /dev/null
@@ -0,0 +1,22 @@
+commit 47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1
+Author: Wayne Davison <wayned@samba.org>
+Date:   Sun Nov 5 11:33:15 2017 -0800
+
+    Enforce trailing \0 when receiving xattr name values.
+    Fixes bug 13112.
+
+diff --git a/xattrs.c b/xattrs.c
+index 68305d7..4867e6f 100644
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
+                       out_of_memory("receive_xattr");
+               name = ptr + dget_len + extra_len;
+               read_buf(f, name, name_len);
++              if (name_len < 1 || name[name_len-1] != '\0') {
++                      rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
++                      exit_cleanup(RERR_FILEIO);
++              }
+               if (dget_len == datum_len)
+                       read_buf(f, ptr, dget_len);
+               else {
diff --git a/net/rsync/patches/011-more-archaic-checksum-improvements.patch b/net/rsync/patches/011-more-archaic-checksum-improvements.patch
new file mode 100644 (file)
index 0000000..906f7a2
--- /dev/null
@@ -0,0 +1,271 @@
+commit 416e719bea4f5466c8dd2b34cac0059b6ff84ff3
+Author: Wayne Davison <wayned@samba.org>
+Date:   Tue Nov 7 14:01:13 2017 -0800
+
+    More archaic-checksum improvements. This makes the len vars clearer
+    and ensures that only the flist code gets the 2-byte digest len.
+
+diff --git a/authenticate.c b/authenticate.c
+index 519429d..d60ee20 100644
+--- a/authenticate.c
++++ b/authenticate.c
+@@ -74,8 +74,6 @@ static void gen_challenge(const char *addr, char *challenge)
+       sum_init(-1, 0);
+       sum_update(input, sizeof input);
+       len = sum_end(digest);
+-      if (len == 2) /* The archaic checksum is 2 bytes, but sum_end() filled in the full MD4 checksum for us. */
+-              len = MD4_DIGEST_LEN;
+       base64_encode(digest, len, challenge, 0);
+ }
+@@ -91,8 +89,6 @@ static void generate_hash(const char *in, const char *challenge, char *out)
+       sum_update(in, strlen(in));
+       sum_update(challenge, strlen(challenge));
+       len = sum_end(buf);
+-      if (len == 2) /* The archaic checksum is 2 bytes, but sum_end() filled in the full MD4 checksum for us. */
+-              len = MD4_DIGEST_LEN;
+       base64_encode(buf, len, out, 0);
+ }
+diff --git a/checksum.c b/checksum.c
+index 741ad7d..4c9351c 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -73,13 +73,15 @@ int parse_csum_name(const char *name, int len)
+       exit_cleanup(RERR_UNSUPPORTED);
+ }
+-int csum_len_for_type(int cst)
++int csum_len_for_type(int cst, int flist_csum)
+ {
+       switch (cst) {
+         case CSUM_NONE:
+               return 1;
+         case CSUM_MD4_ARCHAIC:
+-              return 2;
++              /* The oldest checksum code is rather weird: the file-list code only sent
++               * 2-byte checksums, but all other checksums were full MD4 length. */
++              return flist_csum ? 2 : MD4_DIGEST_LEN;
+         case CSUM_MD4:
+         case CSUM_MD4_OLD:
+         case CSUM_MD4_BUSTED:
+@@ -361,5 +363,5 @@ int sum_end(char *sum)
+               exit_cleanup(RERR_UNSUPPORTED);
+       }
+-      return csum_len_for_type(cursum_type);
++      return csum_len_for_type(cursum_type, 0);
+ }
+diff --git a/flist.c b/flist.c
+index 24b3506..bedba63 100644
+--- a/flist.c
++++ b/flist.c
+@@ -91,7 +91,7 @@ extern iconv_t ic_send, ic_recv;
+ #define PTR_SIZE (sizeof (struct file_struct *))
+ int io_error;
+-int checksum_len;
++int flist_csum_len;
+ dev_t filesystem_dev; /* used to implement -x */
+ struct file_list *cur_flist, *first_flist, *dir_flist;
+@@ -141,7 +141,7 @@ void init_flist(void)
+                       (int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
+       }
+       parse_checksum_choice(); /* Sets checksum_type && xfersum_type */
+-      checksum_len = csum_len_for_type(checksum_type);
++      flist_csum_len = csum_len_for_type(checksum_type, 1);
+       show_filelist_progress = INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse;
+ }
+@@ -638,7 +638,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+                       /* Prior to 28, we sent a useless set of nulls. */
+                       sum = empty_sum;
+               }
+-              write_buf(f, sum, checksum_len);
++              write_buf(f, sum, flist_csum_len);
+       }
+ #ifdef SUPPORT_HARD_LINKS
+@@ -1094,9 +1094,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+               }
+               if (first_hlink_ndx >= flist->ndx_start) {
+                       struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
+-                      memcpy(bp, F_SUM(first), checksum_len);
++                      memcpy(bp, F_SUM(first), flist_csum_len);
+               } else
+-                      read_buf(f, bp, checksum_len);
++                      read_buf(f, bp, flist_csum_len);
+       }
+ #ifdef SUPPORT_ACLS
+@@ -1384,7 +1384,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+       }
+       if (sender_keeps_checksum && S_ISREG(st.st_mode))
+-              memcpy(F_SUM(file), tmp_sum, checksum_len);
++              memcpy(F_SUM(file), tmp_sum, flist_csum_len);
+       if (unsort_ndx)
+               F_NDX(file) = stats.num_dirs;
+diff --git a/generator.c b/generator.c
+index af2e290..3d65839 100644
+--- a/generator.c
++++ b/generator.c
+@@ -74,7 +74,7 @@ extern int protocol_version;
+ extern int file_total;
+ extern int fuzzy_basis;
+ extern int always_checksum;
+-extern int checksum_len;
++extern int flist_csum_len;
+ extern char *partial_dir;
+ extern int compare_dest;
+ extern int copy_dest;
+@@ -583,7 +583,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+       if (always_checksum > 0 && S_ISREG(st->st_mode)) {
+               char sum[MAX_DIGEST_LEN];
+               file_checksum(fn, st, sum);
+-              return memcmp(sum, F_SUM(file), checksum_len) == 0;
++              return memcmp(sum, F_SUM(file), flist_csum_len) == 0;
+       }
+       if (size_only > 0)
+diff --git a/log.c b/log.c
+index b145ee1..7b23a2c 100644
+--- a/log.c
++++ b/log.c
+@@ -673,14 +673,15 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+                       n = NULL;
+                       if (S_ISREG(file->mode)) {
+                               if (always_checksum && canonical_checksum(checksum_type))
+-                                      n = sum_as_hex(checksum_type, F_SUM(file));
++                                      n = sum_as_hex(checksum_type, F_SUM(file), 1);
+                               else if (iflags & ITEM_TRANSFER && canonical_checksum(xfersum_type))
+-                                      n = sum_as_hex(xfersum_type, sender_file_sum);
++                                      n = sum_as_hex(xfersum_type, sender_file_sum, 0);
+                       }
+                       if (!n) {
+-                              int checksum_len = csum_len_for_type(always_checksum ? checksum_type : xfersum_type);
+-                              memset(buf2, ' ', checksum_len*2);
+-                              buf2[checksum_len*2] = '\0';
++                              int sum_len = csum_len_for_type(always_checksum ? checksum_type : xfersum_type,
++                                                              always_checksum);
++                              memset(buf2, ' ', sum_len*2);
++                              buf2[sum_len*2] = '\0';
+                               n = buf2;
+                       }
+                       break;
+diff --git a/match.c b/match.c
+index ff10310..280038b 100644
+--- a/match.c
++++ b/match.c
+@@ -360,7 +360,7 @@ static void hash_search(int f,struct sum_struct *s,
+  **/
+ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
+ {
+-      int checksum_len;
++      int sum_len;
+       last_match = 0;
+       false_alarms = 0;
+@@ -409,22 +409,22 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
+               matched(f, s, buf, len, -1);
+       }
+-      checksum_len = sum_end(sender_file_sum);
++      sum_len = sum_end(sender_file_sum);
+       /* If we had a read error, send a bad checksum.  We use all bits
+        * off as long as the checksum doesn't happen to be that, in
+        * which case we turn the last 0 bit into a 1. */
+       if (buf && buf->status != 0) {
+               int i;
+-              for (i = 0; i < checksum_len && sender_file_sum[i] == 0; i++) {}
+-              memset(sender_file_sum, 0, checksum_len);
+-              if (i == checksum_len)
++              for (i = 0; i < sum_len && sender_file_sum[i] == 0; i++) {}
++              memset(sender_file_sum, 0, sum_len);
++              if (i == sum_len)
+                       sender_file_sum[i-1]++;
+       }
+       if (DEBUG_GTE(DELTASUM, 2))
+               rprintf(FINFO,"sending file_sum\n");
+-      write_buf(f, sender_file_sum, checksum_len);
++      write_buf(f, sender_file_sum, sum_len);
+       if (DEBUG_GTE(DELTASUM, 2)) {
+               rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",
+diff --git a/receiver.c b/receiver.c
+index 3d9bc65..baae3a9 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -236,7 +236,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+       static char file_sum1[MAX_DIGEST_LEN];
+       struct map_struct *mapbuf;
+       struct sum_struct sum;
+-      int checksum_len;
++      int sum_len;
+       int32 len;
+       OFF_T offset = 0;
+       OFF_T offset2;
+@@ -388,15 +388,15 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+       if (INFO_GTE(PROGRESS, 1))
+               end_progress(total_size);
+-      checksum_len = sum_end(file_sum1);
++      sum_len = sum_end(file_sum1);
+       if (mapbuf)
+               unmap_file(mapbuf);
+-      read_buf(f_in, sender_file_sum, checksum_len);
++      read_buf(f_in, sender_file_sum, sum_len);
+       if (DEBUG_GTE(DELTASUM, 2))
+               rprintf(FINFO,"got file_sum\n");
+-      if (fd != -1 && memcmp(file_sum1, sender_file_sum, checksum_len) != 0)
++      if (fd != -1 && memcmp(file_sum1, sender_file_sum, sum_len) != 0)
+               return 0;
+       return 1;
+ }
+diff --git a/t_stub.c b/t_stub.c
+index fc1ee3b..0c49d9c 100644
+--- a/t_stub.c
++++ b/t_stub.c
+@@ -98,7 +98,7 @@ filter_rule_list daemon_filter_list;
+       return "tester";
+ }
+- int csum_len_for_type(int cst)
++ int csum_len_for_type(int cst, int flg)
+ {
+-      return cst ? 16 : 1;
++      return cst || !flg ? 16 : 1;
+ }
+diff --git a/util2.c b/util2.c
+index a892e51..b1adf81 100644
+--- a/util2.c
++++ b/util2.c
+@@ -77,18 +77,18 @@ void *_realloc_array(void *ptr, unsigned int size, size_t num)
+       return realloc(ptr, size * num);
+ }
+-const char *sum_as_hex(int csum_type, const char *sum)
++const char *sum_as_hex(int csum_type, const char *sum, int flist_csum)
+ {
+       static char buf[MAX_DIGEST_LEN*2+1];
+       int i, x1, x2;
+-      int checksum_len = csum_len_for_type(csum_type);
+-      char *c = buf + checksum_len*2;
++      int sum_len = csum_len_for_type(csum_type, flist_csum);
++      char *c = buf + sum_len*2;
+       assert(c - buf < (int)sizeof buf);
+       *c = '\0';
+-      for (i = checksum_len; --i >= 0; ) {
++      for (i = sum_len; --i >= 0; ) {
+               x1 = CVAL(sum, i);
+               x2 = x1 >> 4;
+               x1 &= 0xF;
index e3f0c6ed515699b2d957fae76e78b7af147c985e..cc8c9cbfb0269369a38680865f1a90ac64356c87 100644 (file)
@@ -9,14 +9,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-core
-PKG_VERSION:=5.1.4.1
-PKG_DIRECTORY:=5.1
+PKG_MAJOR_MINOR_VERSION:=5.1
+PKG_BUGFIX_MAJOR_VERSION:=9
+PKG_BUGFIX_MINOR_VERSION:=
+PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
+PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
-PKG_MAINVERSION:=5.1.4
 
-PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_DIRECTORY)/shorewall-$(PKG_MAINVERSION)/
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://slovakia.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629
+PKG_HASH:=a7735b31305678e1c4d21fabb026fbd37bdb8b3e0f5d8887f60ab2969a485e46
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
@@ -27,7 +33,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/shorewall-core
     SECTION:=net
     CATEGORY:=Network
-    DEPENDS:=+ip +iptables
     TITLE:=Shorewall Core
     URL:=http://www.shorewall.net/
     SUBMENU:=Firewall
@@ -51,11 +56,11 @@ define Build/Compile
 endef
 
 define Package/shorewall-core/install
-       $(INSTALL_DIR) $(1)/usr/share
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall/wait4ifup $(1)/usr/share/shorewall
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/shorewall $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/share/shorewall/
+       $(INSTALL_DIR) $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall/wait4ifup $(1)/usr/share/shorewall/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/shorewall $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,shorewall-core))
index 6008d2744a2ee08546575a7d8ccb47f5c5d17598..aeb75797167a0ceefb1b313f56b2065b7fc544cb 100644 (file)
@@ -1,8 +1,8 @@
-Index: shorewall-core-5.0.15.2/lib.common
+Index: shorewall-core-5.1.7.2/lib.common
 ===================================================================
---- shorewall-core-5.0.15.2.orig/lib.common    2016-12-20 23:42:20.000000000 +0100
-+++ shorewall-core-5.0.15.2/lib.common 2017-01-02 11:33:03.026495427 +0100
-@@ -352,7 +352,7 @@
+--- shorewall-core-5.1.7.2.orig/lib.common     2017-10-11 08:01:06.191862789 +0200
++++ shorewall-core-5.1.7.2/lib.common  2017-10-11 08:01:06.187863006 +0200
+@@ -345,7 +345,7 @@
  
      if [ -z "$MODULESDIR" ]; then
        uname=$(uname -r)
@@ -11,7 +11,7 @@ Index: shorewall-core-5.0.15.2/lib.common
        if [ -n "$extras" ]; then
            for directory in $(split "$extras"); do
                MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory"
-@@ -408,7 +408,7 @@
+@@ -399,7 +399,7 @@
  
      if [ -z "$MODULESDIR" ]; then
        uname=$(uname -r)
index 0a08a08907687aa45ee298908390c0b8173bf505..c142b95039606aa1e1cfd9d82f6042e521a1be55 100644 (file)
@@ -9,14 +9,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-lite
-PKG_VERSION:=5.1.4.1
-PKG_DIRECTORY:=5.1
-PKG_MAINVERSION:=5.1.4
+PKG_MAJOR_MINOR_VERSION:=5.1
+PKG_BUGFIX_MAJOR_VERSION:=9
+PKG_BUGFIX_MINOR_VERSION:=
+PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
+PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_DIRECTORY)/shorewall-$(PKG_MAINVERSION)/ 
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://slovakia.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=e90d419ed8a6da615c3a0d6fdcb9481f8e71f89c2bdcff09ab027198ca2ce293
+PKG_HASH:=ed4041004f03d6d0baefa3c3f5be76c5d2e21ad7004c044a95006e95450404d5
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
@@ -46,8 +52,7 @@ define Package/shorewall-lite/description
 endef
 
 define Package/shorewall-lite/conffiles
-/etc/shorewall-lite/shorewall-lite.conf
-/etc/shorewall-lite/vardir
+/etc/shorewall-lite/
 endef
 
 CONFIGURE_ARGS += \
@@ -58,19 +63,19 @@ define Build/Compile
 endef
 
 define Package/shorewall-lite/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DIR) $(1)/etc/shorewall-lite/state
-       $(INSTALL_DIR) $(1)/usr/share
+       $(INSTALL_DIR) $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/init.d/
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface/
+       $(INSTALL_DIR) $(1)/etc/shorewall-lite/state/
+       $(INSTALL_DIR) $(1)/usr/share/shorewall-lite/
        $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall-lite
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall-lite $(1)/usr/share
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall-lite $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall-lite/shorecap $(1)/usr/share/shorewall-lite
-       $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall-lite
-       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall-lite $(1)/etc
-       $(CP) $(PKG_INSTALL_DIR)/etc/init.d $(1)/etc
-       $(CP) ./files/vardir $(1)/etc/shorewall-lite
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall-lite/ $(1)/usr/share/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall-lite $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall-lite/shorecap $(1)/usr/share/shorewall-lite/
+       $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall-lite/
+       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall-lite/ $(1)/etc/
+       $(INSTALL_BIN) ./files/shorewall-lite.init $(1)/etc/init.d/shorewall-lite
+       $(CP) ./files/vardir $(1)/etc/shorewall-lite/
 endef
 
 $(eval $(call BuildPackage,shorewall-lite))
index 42e164371125c92e29571a84fc4621d4ba323dca..db08bac8c345b465d3d356c442b9264bfec3b5f0 100644 (file)
@@ -1,2 +1,2 @@
 #!/bin/sh
-cat /proc/sys/kernel/hostname
+uci get system.@system[0].hostname
index b8b79830afa0beb943397a72eaaba9ba6d73b663..90ed80c8c5c2c8b2370db055f3934c2754a88cff 100644 (file)
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-# should restart shorewall-lite when an interface comes up
+# should restart shorewall when an interface comes up
 
-[ ifup = "$ACTION" ] && {
+case "$ACTION" in
+    ifup)
         /etc/init.d/shorewall-lite restart
-}
-
-[ ifdown = "$ACTION" ] && {
+        ;;
+    ifdown)
         # might need to restore some routing
         /etc/init.d/shorewall-lite restart
-}
+        ;;
+esac
\ No newline at end of file
diff --git a/net/shorewall-lite/files/shorewall-lite.init b/net/shorewall-lite/files/shorewall-lite.init
new file mode 100644 (file)
index 0000000..c3236e5
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=50
+
+load_params () {
+    . /usr/share/shorewall/shorewallrc
+}
+
+start_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -l $OPTIONS start $STARTOPTIONS
+}
+
+stop_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -l $OPTIONS stop $STOPOPTIONS
+}
+
+restart_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -l $OPTIONS restart $RESTARTOPTIONS
+}
+
+reload_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -l $OPTIONS reload $RESTARTOPTIONS
+}
index 0cc8e6cf75c9c41ae1d5dfa9d8df295ed4529fe2..4e47198f4873875e325463641298bd966de4cf54 100644 (file)
@@ -1,10 +1,10 @@
-Index: shorewall-lite-5.0.15.2/install.sh
+Index: shorewall-lite-5.1.7.2/install.sh
 ===================================================================
---- shorewall-lite-5.0.15.2.orig/install.sh    2016-12-20 18:41:05.000000000 +0100
-+++ shorewall-lite-5.0.15.2/install.sh 2017-01-04 12:01:31.018724737 +0100
-@@ -549,7 +549,7 @@
-       chmod 755 ${DESTDIR}${SYSCONFDIR}
-     fi
+--- shorewall-lite-5.1.7.2.orig/install.sh     2017-10-11 08:15:57.201324746 +0200
++++ shorewall-lite-5.1.7.2/install.sh  2017-10-11 08:15:57.197324953 +0200
+@@ -492,7 +492,7 @@
+ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
+     [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755
  
 -    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT} 0640
 +    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT}/${SYSCONFFILE} 0640
diff --git a/net/shorewall-lite/patches/120-LOGFILE.patch b/net/shorewall-lite/patches/120-LOGFILE.patch
deleted file mode 100644 (file)
index 90f0947..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shorewall-lite.conf 2012-08-08 16:29:23.000000000 +0200
-+++ b/shorewall-lite.conf 2012-08-13 11:11:11.687938395 +0200
-@@ -28,7 +28,7 @@
- #                              L O G G I N G
- ###############################################################################
--LOGFILE=
-+LOGFILE=/dev/null
- ###############################################################################
- #       L O C A T I O N   O F   F I L E S   A N D   D I R E C T O R I E S
\ No newline at end of file
diff --git a/net/shorewall-lite/patches/120-logfile.patch b/net/shorewall-lite/patches/120-logfile.patch
new file mode 100644 (file)
index 0000000..ff1c02e
--- /dev/null
@@ -0,0 +1,13 @@
+Index: shorewall-lite-5.1.7.2/shorewall-lite.conf
+===================================================================
+--- shorewall-lite-5.1.7.2.orig/shorewall-lite.conf    2017-10-11 08:19:35.565847520 +0200
++++ shorewall-lite-5.1.7.2/shorewall-lite.conf 2017-10-11 08:19:35.561847733 +0200
+@@ -28,7 +28,7 @@
+ #                            L O G G I N G
+ ###############################################################################
+-LOGFILE=
++LOGFILE=/dev/null
+ ###############################################################################
+ #     L O C A T I O N   O F   F I L E S   A N D   D I R E C T O R I E S
diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
new file mode 100644 (file)
index 0000000..f8f7af7
--- /dev/null
@@ -0,0 +1,82 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+# Copyright (C) 2017 Willem van den Akker <wvdakker@wilsoft.nl>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shorewall
+PKG_MAJOR_MINOR_VERSION:=5.1
+PKG_BUGFIX_MAJOR_VERSION:=9
+PKG_BUGFIX_MINOR_VERSION:=
+PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
+PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://slovakia.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_HASH:=e6375b360e370d4f3f0e161431ff93c6b7a3aa8799f5e8be8dee48b409c35007
+
+PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shorewall
+    SECTION:=devel
+    CATEGORY:=Network
+    DEPENDS:=+ip +iptables +kmod-ipt-hashlimit +kmod-ipt-raw +iptables-mod-hashlimit +shorewall-core \
+               +perl +perlbase-autoloader +perlbase-autouse +perlbase-dynaloader +perlbase-digest \
+               +perlbase-findbin +perlbase-getopt +perlbase-hash
+    TITLE:=Shorewall Central Administration System
+    URL:=http://www.shorewall.net/
+    SUBMENU:=Firewall
+endef
+
+define Package/shorewall/description
+       The Shoreline Firewall, is high-level tool for configuring Netfilter.
+
+       Shorewall allows for central administration of multiple IPv4 firewalls.
+       This is the full Shorewall product which will compile Shorewall scripts.
+       It is not recommended to run it on a low memory system.
+
+       Note: This is the IPv4 implementation of Shorewall.
+             This full Shorewal packages also installs Perl which can make the image big (about +2M).
+endef
+
+CONFIGURE_ARGS += \
+       vendor=openwrt
+
+define Build/Compile
+       DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+endef
+
+define Package/shorewall/conffiles
+/etc/shorewall/
+endef
+
+define Package/shorewall/install
+       $(INSTALL_DIR) $(1)/etc/init.d/
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface/
+       $(INSTALL_DIR) $(1)/etc/shorewall/
+       $(INSTALL_DIR) $(1)/usr/lib/shorewall/
+       $(INSTALL_DIR) $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/share/shorewall/
+       $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall
+       $(INSTALL_BIN) ./files/hostname $(1)/etc/shorewall/
+       $(INSTALL_BIN) ./files/shorewall.init $(1)/etc/init.d/shorewall
+       $(INSTALL_BIN) ./files/vardir $(1)/etc/shorewall/
+       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall/. $(1)/etc/shorewall/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/shorewall/. $(1)/usr/lib/shorewall/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall/. $(1)/usr/share/shorewall/
+endef
+
+$(eval $(call BuildPackage,shorewall))
diff --git a/net/shorewall/files/hostname b/net/shorewall/files/hostname
new file mode 100644 (file)
index 0000000..29c736e
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+uci get system.@system[0].hostname
+
diff --git a/net/shorewall/files/hotplug_iface b/net/shorewall/files/hotplug_iface
new file mode 100644 (file)
index 0000000..f787424
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# should restart shorewall when an interface comes up
+
+case "$ACTION" in
+    ifup)
+        /etc/init.d/shorewall restart
+        ;;
+    ifdown)
+        # might need to restore some routing
+        /etc/init.d/shorewall restart
+        ;;
+esac
diff --git a/net/shorewall/files/shorewall.init b/net/shorewall/files/shorewall.init
new file mode 100644 (file)
index 0000000..ef2f00a
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=50
+
+load_params () {
+    . /usr/share/shorewall/shorewallrc
+}
+
+start_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall $OPTIONS start $STARTOPTIONS
+}
+
+stop_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall $OPTIONS stop $STOPOPTIONS
+}
+
+restart_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall $OPTIONS restart $RESTARTOPTIONS
+}
+
+reload_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall $OPTIONS reload $RESTARTOPTIONS
+}
diff --git a/net/shorewall/files/vardir b/net/shorewall/files/vardir
new file mode 100644 (file)
index 0000000..f9a55a8
--- /dev/null
@@ -0,0 +1,2 @@
+VARDIR=/tmp/state
+
diff --git a/net/shorewall/patches/120-logfile.patch b/net/shorewall/patches/120-logfile.patch
new file mode 100644 (file)
index 0000000..e36019d
--- /dev/null
@@ -0,0 +1,22 @@
+Index: shorewall-5.1.4.1/configfiles/shorewall.conf
+===================================================================
+--- shorewall-5.1.4.1.orig/configfiles/shorewall.conf  2017-10-05 11:18:41.586275516 +0200
++++ shorewall-5.1.4.1/configfiles/shorewall.conf       2017-10-05 11:26:11.825609382 +0200
+@@ -33,7 +33,7 @@
+ #                            L O G G I N G
+ ###############################################################################
+-LOG_LEVEL="info"
++LOG_LEVEL="warn"
+ BLACKLIST_LOG_LEVEL=
+@@ -101,7 +101,7 @@
+ SHOREWALL_SHELL=/bin/sh
+-SUBSYSLOCK=/var/lock/subsys/shorewall
++SUBSYSLOCK=/var/lock/shorewall
+ TC=
index 048b53aa7c99b2363554d00deb97fd2a15927d65..a3667a8d8eb3b4b76219825be002e73bb2f51ccf 100644 (file)
@@ -9,14 +9,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall6-lite
-PKG_VERSION:=5.1.4.1
-PKG_DIRECTORY:=5.1
-PKG_MAINVERSION:=5.1.4
-PKG_RELEASE:=2
+PKG_MAJOR_MINOR_VERSION:=5.1
+PKG_BUGFIX_MAJOR_VERSION:=9
+PKG_BUGFIX_MINOR_VERSION:=
+PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
+PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
+PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_DIRECTORY)/shorewall-$(PKG_MAINVERSION)/ 
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://slovakia.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=29a2f2be295b4f995b38e663b771660ccdc6321134bcfbd0f9378f9bb1237e3c
+PKG_HASH:=ccb2bdb749ad487cf26f5d236068b5fb736011387fae226e703e504adf6ec86d
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
@@ -47,8 +53,7 @@ define Package/shorewall6-lite/description
 endef
 
 define Package/shorewall6-lite/conffiles
-/etc/shorewall6-lite/shorewall6-lite.conf
-/etc/shorewall6-lite/vardir
+/etc/shorewall6-lite/
 endef
 
 CONFIGURE_ARGS += \
@@ -59,19 +64,19 @@ define Build/Compile
 endef
 
 define Package/shorewall6-lite/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DIR) $(1)/etc/shorewall6-lite/state
-       $(INSTALL_DIR) $(1)/usr/share
+       $(INSTALL_DIR) $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/init.d/
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface/
+       $(INSTALL_DIR) $(1)/etc/shorewall6-lite/state/
+       $(INSTALL_DIR) $(1)/usr/share/shorewall6-lite/
        $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6-lite
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6-lite $(1)/usr/share
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall6-lite $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall6-lite/shorecap $(1)/usr/share/shorewall6-lite
-       $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall6-lite
-       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite $(1)/etc
-       $(CP) $(PKG_INSTALL_DIR)/etc/init.d $(1)/etc
-       $(CP) ./files/vardir $(1)/etc/shorewall6-lite
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6-lite/ $(1)/usr/share/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall6-lite $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall6-lite/shorecap $(1)/usr/share/shorewall6-lite/
+       $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall6-lite/
+       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite/ $(1)/etc/
+       $(INSTALL_BIN) ./files/shorewall6-lite.init $(1)/etc/init.d/shorewall6-lite
+       $(CP) ./files/vardir $(1)/etc/shorewall6-lite/
 endef
 
 $(eval $(call BuildPackage,shorewall6-lite))
index 42e164371125c92e29571a84fc4621d4ba323dca..db08bac8c345b465d3d356c442b9264bfec3b5f0 100644 (file)
@@ -1,2 +1,2 @@
 #!/bin/sh
-cat /proc/sys/kernel/hostname
+uci get system.@system[0].hostname
index 40b8a0d594924546d0b64051681e5d64bd32e394..bb8973b7bfb0b8c48b6c36f7b90634793d2582d0 100644 (file)
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-# should restart shorewall6-lite when an interface comes up
+# should restart shorewall when an interface comes up
 
-[ ifup = "$ACTION" ] && {
+case "$ACTION" in
+    ifup)
         /etc/init.d/shorewall6-lite restart
-}
-
-[ ifdown = "$ACTION" ] && {
+        ;;
+    ifdown)
         # might need to restore some routing
         /etc/init.d/shorewall6-lite restart
-}
+        ;;
+esac
\ No newline at end of file
diff --git a/net/shorewall6-lite/files/shorewall6-lite.init b/net/shorewall6-lite/files/shorewall6-lite.init
new file mode 100644 (file)
index 0000000..c2ab8ce
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=50
+
+load_params () {
+    . /usr/share/shorewall/shorewallrc
+}
+
+start_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6l $OPTIONS start $STARTOPTIONS
+}
+
+stop_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6l $OPTIONS stop $STOPOPTIONS
+}
+
+restart_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6l $OPTIONS restart $RESTARTOPTIONS
+}
+
+reload_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6l $OPTIONS reload $RESTARTOPTIONS
+}
index 44f63e3050d16a2de474f3ef62b8b7fae063bae2..2be37014becf2e2d2f7973356ef93a590e71f6f2 100644 (file)
@@ -1,10 +1,10 @@
-Index: shorewall6-lite-5.0.15.2/install.sh
+Index: shorewall6-lite-5.1.7.2/install.sh
 ===================================================================
---- shorewall6-lite-5.0.15.2.orig/install.sh   2016-12-20 18:41:05.000000000 +0100
-+++ shorewall6-lite-5.0.15.2/install.sh        2017-01-04 12:01:31.018724737 +0100
-@@ -549,7 +549,7 @@
-       chmod 755 ${DESTDIR}${SYSCONFDIR}
-     fi
+--- shorewall6-lite-5.1.7.2.orig/install.sh    2017-10-11 15:34:43.612217209 +0200
++++ shorewall6-lite-5.1.7.2/install.sh 2017-10-11 15:34:43.608217428 +0200
+@@ -492,7 +492,7 @@
+ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
+     [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755
  
 -    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT} 0640
 +    install_file ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/${PRODUCT}/${SYSCONFFILE} 0640
diff --git a/net/shorewall6-lite/patches/120-LOGFILE.patch b/net/shorewall6-lite/patches/120-LOGFILE.patch
deleted file mode 100644 (file)
index 554f7ce..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shorewall6-lite.conf 2012-08-08 16:29:23.000000000 +0200
-+++ b/shorewall6-lite.conf 2012-08-13 11:11:11.687938395 +0200
-@@ -28,7 +28,7 @@
- #                              L O G G I N G
- ###############################################################################
--LOGFILE=
-+LOGFILE=/dev/null
- ###############################################################################
- #       L O C A T I O N   O F   F I L E S   A N D   D I R E C T O R I E S
\ No newline at end of file
diff --git a/net/shorewall6-lite/patches/120-logfile.patch b/net/shorewall6-lite/patches/120-logfile.patch
new file mode 100644 (file)
index 0000000..143d583
--- /dev/null
@@ -0,0 +1,13 @@
+Index: shorewall6-lite-5.1.7.2/shorewall6-lite.conf
+===================================================================
+--- shorewall6-lite-5.1.7.2.orig/shorewall6-lite.conf  2017-10-11 15:36:41.037818015 +0200
++++ shorewall6-lite-5.1.7.2/shorewall6-lite.conf       2017-10-11 15:36:41.033818232 +0200
+@@ -28,7 +28,7 @@
+ #                            L O G G I N G
+ ###############################################################################
+-LOGFILE=
++LOGFILE=/dev/null
+ ###############################################################################
+ #     L O C A T I O N   O F   F I L E S   A N D   D I R E C T O R I E S
diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile
new file mode 100644 (file)
index 0000000..387f640
--- /dev/null
@@ -0,0 +1,81 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+# Copyright (C) 2017 Willem van den Akker <wvdakker@wilsoft.nl>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shorewall6
+PKG_MAJOR_MINOR_VERSION:=5.1
+PKG_BUGFIX_MAJOR_VERSION:=9
+PKG_BUGFIX_MINOR_VERSION:=
+PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
+PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://slovakia.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
+       http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_HASH:=bb07e55944800b4cc541b9ba51274110387e3e25694a24965aada7d91a4510a6
+
+PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shorewall6
+    SECTION:=net
+    CATEGORY:=Network
+    DEPENDS:=+ip +ip6tables +kmod-ipt-hashlimit +kmod-ipt-raw6 +iptables-mod-hashlimit +shorewall-core \
+               +perl +perlbase-autoloader +perlbase-autouse +perlbase-dynaloader +perlbase-digest \
+               +perlbase-findbin +perlbase-getopt +perlbase-hash
+    TITLE:=Shorewall6 Central Administration System
+    URL:=http://www.shorewall.net/
+    SUBMENU:=Firewall
+endef
+
+define Package/shorewall6/description
+       The Shoreline Firewall, is high-level tool for configuring Netfilter.
+
+       Shorewall allows for central administration of multiple IPv6 firewalls.
+       This is the full Shorewall product which will compile Shorewall scripts
+       It is not recommended to run it on a low memory system.
+
+       Note: This is the IPv6 implementation of Shorewall.
+             This full Shorewal packages also installs Perl which can make the image big (about +2M).
+endef
+
+CONFIGURE_ARGS += \
+       vendor=openwrt
+
+define Package/shorewall6/conffiles
+/etc/shorewall6/
+endef
+
+define Build/Compile
+       DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+endef
+
+define Package/shorewall6/install
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_DIR) $(1)/etc/init.d/
+       $(INSTALL_DIR) $(1)/etc/shorewall6/
+       $(INSTALL_DIR) $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/share/shorewall6/
+       $(INSTALL_BIN) ./files/hostname $(1)/etc/shorewall6/
+       $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6
+       $(INSTALL_BIN) ./files/shorewall6.init $(1)/etc/init.d/shorewall6
+       $(INSTALL_BIN) ./files/vardir $(1)/etc/shorewall6/
+       $(CP) $(PKG_INSTALL_DIR)/etc/shorewall6/. $(1)/etc/shorewall6/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall6 $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6/. $(1)/usr/share/shorewall6/
+endef
+
+$(eval $(call BuildPackage,shorewall6))
diff --git a/net/shorewall6/files/hostname b/net/shorewall6/files/hostname
new file mode 100644 (file)
index 0000000..29c736e
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+uci get system.@system[0].hostname
+
diff --git a/net/shorewall6/files/hotplug_iface b/net/shorewall6/files/hotplug_iface
new file mode 100644 (file)
index 0000000..aaa03e8
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# should restart shorewall when an interface comes up
+
+case "$ACTION" in
+    ifup)
+        /etc/init.d/shorewall6 restart
+        ;;
+    ifdown)
+        # might need to restore some routing
+        /etc/init.d/shorewall6 restart
+        ;;
+esac
diff --git a/net/shorewall6/files/shorewall6.init b/net/shorewall6/files/shorewall6.init
new file mode 100644 (file)
index 0000000..5f74de3
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=50
+
+load_params () {
+    . /usr/share/shorewall/shorewallrc
+}
+
+start_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6 $OPTIONS start $STARTOPTIONS
+}
+
+stop_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6 $OPTIONS stop $STOPOPTIONS
+}
+
+restart_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6 $OPTIONS restart $RESTARTOPTIONS
+}
+
+reload_service() {
+    load_params
+    
+    ${SBINDIR}/shorewall -6 $OPTIONS reload $RESTARTOPTIONS
+}
diff --git a/net/shorewall6/files/vardir b/net/shorewall6/files/vardir
new file mode 100644 (file)
index 0000000..f9a55a8
--- /dev/null
@@ -0,0 +1,2 @@
+VARDIR=/tmp/state
+
diff --git a/net/shorewall6/patches/120-logfile.patch b/net/shorewall6/patches/120-logfile.patch
new file mode 100644 (file)
index 0000000..3f7d41f
--- /dev/null
@@ -0,0 +1,22 @@
+Index: shorewall6-5.1.4.1/configfiles/shorewall6.conf
+===================================================================
+--- shorewall6-5.1.4.1.orig/configfiles/shorewall6.conf        2017-10-05 11:28:34.893849703 +0200
++++ shorewall6-5.1.4.1/configfiles/shorewall6.conf     2017-10-05 11:29:13.047785350 +0200
+@@ -34,7 +34,7 @@
+ #                            L O G G I N G
+ ###############################################################################
+-LOG_LEVEL="info"
++LOG_LEVEL="warn"
+ BLACKLIST_LOG_LEVEL=
+@@ -98,7 +98,7 @@
+ SHOREWALL_SHELL=/bin/sh
+-SUBSYSLOCK=/var/lock/subsys/shorewall6
++SUBSYSLOCK=/var/lock/shorewall6
+ TC=
index fa2e6ae8f8062da50b177c8222d11247628f8c76..5fcad35097ccc816834e39122f498d20f8c7c13b 100644 (file)
@@ -8,11 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunnel
-PKG_VERSION:=5.41
-PKG_RELEASE:=1
+PKG_VERSION:=5.44
+PKG_RELEASE:=3
 
 PKG_LICENSE:=GPL-2.0+
-PKG_MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net>
+PKG_MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net> \
+               Florian Eckert <fe@dev.tdt.de>
 PKG_LICENSE_FILES:=COPYING COPYRIGHT.GPL
 
 PKG_SOURCE_URL:= \
@@ -20,9 +21,10 @@ PKG_SOURCE_URL:= \
        http://www.usenix.org.uk/mirrors/stunnel/ \
        https://www.stunnel.org/downloads/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=f05c6321ee1f6ddebacc234ccf20825971941e831b5beea6d0ce0b8e1668148f
+PKG_HASH:=990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299
 
 PKG_FIXUP:=autoreconf
+PKG_FIXUP:=patch-libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -45,6 +47,7 @@ endef
 
 define Package/stunnel/conffiles
 /etc/stunnel/stunnel.conf
+/etc/config/stunnel
 endef
 
 
@@ -53,7 +56,8 @@ CONFIGURE_ARGS+= \
        --with-threads=pthread \
        --with-ssl=$(STAGING_DIR)/usr \
        --disable-libwrap \
-       --disable-systemd
+       --disable-systemd \
+       --disable-fips
 
 ifeq ($(CONFIG_IPV6),n)
 CONFIGURE_ARGS+= \
@@ -75,6 +79,8 @@ define Package/stunnel/install
        $(INSTALL_CONF) ./files/stunnel.conf $(1)/etc/stunnel/stunnel.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/stunnel.init $(1)/etc/init.d/stunnel
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_CONF) ./files/stunnel.uci $(1)/etc/config/stunnel
 endef
 
 $(eval $(call BuildPackage,stunnel))
index e622205b8361e756570450da7af256138303f850..2c7d0effd16e54ec700ec2eed3d736cdd8bbe767 100644 (file)
@@ -4,9 +4,176 @@
 START=90
 USE_PROCD=1
 
+PID_FILE="/var/run/stunnel.pid"
+CONF_FILE="/tmp/stunnel.conf"
+BIN="/usr/bin/stunnel"
+
+global_defs() {
+       local debug compression
+
+       config_get alt_config_file 'globals' alt_config_file
+       [ -z "$alt_config_file" ] || return 0
+
+       # Set default settings
+       printf "foreground = yes\n" >> "$CONF_FILE"
+       printf "pid = %s\n" "$PID_FILE" >> "$CONF_FILE"
+       printf "syslog = yes\n" >> "$CONF_FILE"
+
+       config_get debug 'globals' debug '5'
+       printf "debug = %s\n" "$debug" >> "$CONF_FILE"
+
+       config_get compression 'globals' compression
+       [ -z "$compression" ] || printf "compression = %s\n" "$compression" >> "$CONF_FILE"
+}
+
+print_options() {
+       local config=$1
+       shift
+       for opt in "$@"; do
+               local $opt
+               local value
+               local is_boolean=0
+
+               if [ "${opt:0:5}" == "bool_" ]; then
+                       opt="${opt:5}"
+                       is_boolean=1
+               fi
+
+               config_get "value" "$config" "$opt"
+               [ -z "$value" ] || {
+                       if [ "$value" = '1' ] && [ "$is_boolean" -eq "1" ]; then
+                               value="yes"
+                       elif [ "$value" = '0' ] && [ "$is_boolean" -eq "1" ] ; then
+                               value="no"
+                       fi
+                       printf "%s = %s\n" "$opt" "$value" >> "$CONF_FILE"
+               }
+       done
+}
+
+print_list() {
+       local config=$1
+       shift
+       for opt in "$@"; do
+               local $opt
+               local elements
+               config_get "elements" "$config" "$opt"
+               for element in $elements; do
+                       printf "%s = %s\n" "$opt" "$element" >> "$CONF_FILE"
+               done
+       done
+}
+
+print_list_colon() {
+       local config=$1
+       local value
+       shift
+       for opt in "$@"; do
+               local $opt
+               local elements
+               config_get "elements" "$config" "$opt"
+               for element in $elements; do
+                       value="${value}:${element}"
+               done
+               printf "%s = %s\n" "$opt" "${value#*:}" >> "$CONF_FILE"
+       done
+}
+
+service_section() {
+       local cfg="$1"
+       local accept_host accept_port enabled
+
+       config_get_bool enabled "$cfg" 'enabled' '1'
+       [ ${enabled} -gt 0 ] || return 0
+
+       printf "\n" >> "$CONF_FILE"
+       printf "[%s]\n" "$cfg" >> "$CONF_FILE"
+
+       config_get accept_host "$cfg" accept_host 'localhost'
+       config_get accept_port "$cfg" accept_port
+       printf "accept = %s:%s\n" "$accept_host" "$accept_port" >> "$CONF_FILE"
+
+       print_options "$cfg" CApath \
+               CAfile \
+               cert \
+               CRLpath \
+               CRLfile \
+               curve \
+               logId \
+               debug \
+               engineId \
+               engineNum \
+               failover \
+               ident \
+               key \
+               local \
+               PSKidentity \
+               PSKsecrets \
+               sslVersion \
+               TIMEOUTbusy \
+               TIMEOUTclose \
+               TIMEOUTconnect \
+               TIMEOUTidle \
+               bool_delay \
+               bool_libwrap \
+               bool_reset \
+               bool_requireCert \
+               bool_verifyChain \
+               bool_verifyPeer \
+               bool_client
+
+       print_list "$cfg" checkEmail \
+               checkHost \
+               checkIP \
+               connect \
+               options
+
+       print_list_colon "$cfg" ciphers
+}
+
+process_config() {
+       local alt_config_file
+
+       rm -f "$CONF_FILE"
+
+       # First line
+       printf "; STunnel configuration file generated by uci\n" > "$CONF_FILE"
+       printf "; Written %s\n\n" "$(date +'%c')" >> "$CONF_FILE"
+
+       [ -f /etc/config/stunnel ] || return 0
+
+       config_load stunnel
+       global_defs
+
+       # If "alt_config_file" specified, use that instead
+       [ -n "$alt_config_file" ] && [ -f "$alt_config_file" ] && {
+               rm -f "$CONF_FILE"
+               # Symlink "alt_config_file" since it's a bit easier and safer
+               ln -s "$alt_config_file" "$CONF_FILE"
+               return 0
+       }
+
+       config_foreach service_section service
+}
+
+reload_service() {
+       process_config
+       # SIGHUP is used by stunnel to do init.d reload
+       procd_send_signal stunnel
+}
+
+service_triggers() {
+       procd_add_reload_trigger "stunnel"
+}
+
 start_service() {
        procd_open_instance
-       procd_set_param command /usr/bin/stunnel /etc/stunnel/stunnel.conf
-       procd_set_param respawn # respawn automatically if something died
+       procd_set_param command "$BIN"
+       procd_append_param command "$CONF_FILE"
+
+       process_config
+
+       # set auto respawn behavior
+       procd_set_param respawn
        procd_close_instance
 }
diff --git a/net/stunnel/files/stunnel.uci b/net/stunnel/files/stunnel.uci
new file mode 100644 (file)
index 0000000..6fad1c6
--- /dev/null
@@ -0,0 +1,10 @@
+config globals 'globals'
+       option alt_config_file '/etc/stunnel/stunnel.conf'
+       option debug '5'
+
+config service 'dummy'
+       option client '1'
+       option accept_host 'localhost'
+       option accept_port '6000'
+       list connect 'localhost:6001'
+
index 82d11030ffe2bc9457faa2340e8a2d6acbdebf18..43f98243bb011fc8d7253f03a251dc18d1430bc8 100644 (file)
@@ -7,8 +7,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tgt
-PKG_VERSION:=1.0.65
-PKG_REV:=c8f86393d2ea3f37b64963f66af240f17d88b43d
+PKG_VERSION:=1.0.72
+PKG_REV:=8f94634a7bd0a0e15a5a0f7a398341ff0f896752
+PKG_MIRROR_HASH:=3cc0fc63c45cf87b97c28a29f946b9ec54486ad761b5cadb36ce6e07928f5045
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
index 9283d9ed974f5efc953dde3deddaa4801e234809..9bfc247c8414c9677467fc76b6e5ebbac7582e6a 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tor
-PKG_VERSION:=0.3.1.8
+PKG_VERSION:=0.3.1.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://dist.torproject.org/ \
        https://archive.torproject.org/tor-package-archive
-PKG_HASH:=7df6298860a59f410ff8829cf7905a50c8b3a9094d51a8553603b401e4b5b1a1
+PKG_HASH:=6e1b04f7890e782fd56014a0de5075e4ab29b52a35d8bca1f6b80c93f58f3d26
 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 PKG_LICENSE_FILES:=LICENSE
 
index ea506987007d262d6b9e0deb04fe3089d6be22a3..35867bbd5bf128e83eb414a1e4dd7e123532d91a 100644 (file)
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=travelmate
-PKG_VERSION:=0.9.3
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
@@ -17,7 +17,7 @@ define Package/travelmate
        SECTION:=net
        CATEGORY:=Network
        TITLE:=A wlan connection manager for travel router
-       DEPENDS:=+iwinfo
+       DEPENDS:=+iwinfo +jshn +jsonfilter
        PKGARCH:=all
 endef
 
index c739b492f252470de0e4c3081bc7da74386210ad..486145b8cfc75d53cd0c63f398cf6d6ad0d3db9d 100644 (file)
@@ -10,7 +10,8 @@ To avoid these kind of deadlocks, travelmate set all station interfaces in an "a
 * easy setup within normal OpenWrt/LEDE environment
 * strong LuCI-Support with builtin interface wizard and a wireless station manager
 * fast uplink connections
-* manual / automatic mode support, the latter one checks the existing uplink connection regardless of ifdown event trigger actions every n seconds
+* support all kinds of uplinks, incl. hidden and enterprise uplinks
+* trigger- or automatic-mode support, the latter one is the default and checks the existing uplink connection regardless of ifdown event trigger actions every n seconds
 * support of devices with multiple radios
 * procd init and hotplug support
 * runtime information available via LuCI & via 'status' init command
@@ -49,15 +50,14 @@ To avoid these kind of deadlocks, travelmate set all station interfaces in an "a
 
 **receive travelmate runtime information:**
 <pre><code>
-root@adb2go:~# /etc/init.d/travelmate status
 ::: travelmate runtime information
- travelmate_version : 0.9.1
+ travelmate_version : 1.0.0
  station_connection : true
- station_ssid       : blackhole.nl
+ station_id         : blackhole/04:F0:21:2F:B7:64
  station_interface  : trm_wwan
  station_radio      : radio1
- last_rundate       : 29.07.2017 18:02:01
- system             : LEDE Reboot SNAPSHOT r4639-eb43a817f7
+ last_rundate       : 15.12.2017 13:51:30
+ system             : TP-LINK RE450, OpenWrt SNAPSHOT r5422+84-9fe59abef8
 </code></pre>
 
 ## Manual Setup
@@ -117,8 +117,8 @@ edit /etc/config/travelmate and set 'trm_enabled' to '1'
 </code></pre>
 
 ## FAQ
-**Q:** What's about 'manual' and 'automatic' mode?  
-**A:** In "manual" mode travelmate will be triggered solely by procd interface down events, whenever an uplink disappears travelmate tries n times (default 3) to find a new uplink or reconnect to the old one. The 'automatic' mode keeps travelmate in an active state and checks every n seconds the connection status / the uplink availability regardless of procd event trigger.  
+**Q:** What's about 'trigger' and 'automatic' mode?  
+**A:** In "trigger" mode travelmate will be triggered solely by procd interface down events, whenever an uplink disappears travelmate tries n times (default 3) to find a new uplink or reconnect to the old one. The 'automatic' mode keeps travelmate in an active state and checks every n seconds the connection status / the uplink availability regardless of procd event trigger.  
 
 **Q:** What happen with misconfigured uplinks, e.g. due to outdated wlan passwords?  
 **A:** Travelmate tries n times (default 3) to connect, then the respective uplink SSID will be marked / renamed to '_SSID_\_err'. In this case use the builtin wireless station manager to update your wireless credentials. To disable this functionality at all set the Connection Limit ('trm\_maxretry') to '0', which means unlimited retries.  
index 40f57f24f1e227621c53759732920fc24008bd39..831ab8dc749402f3864b1e318c0afb4c9f3cb42e 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=90
+START=25
 USE_PROCD=1
 
 EXTRA_COMMANDS="status"
@@ -43,16 +43,15 @@ status()
 
 service_triggers()
 {
-    local auto="$(uci -q get travelmate.global.trm_automatic)"
+    local auto="$(uci_get travelmate.global.trm_automatic)"
 
     if [ "${auto}" = "0" ]
     then
-        local iface="$(uci -q get travelmate.global.trm_iface)"
-        local delay="$(uci -q get travelmate.global.trm_triggerdelay)"
+        local trigger="$(uci_get travelmate.global.trm_iface)"
+        local delay="$(uci_get travelmate.global.trm_triggerdelay)"
 
-        PROCD_RELOAD_DELAY=$((${delay:=2} * 1000))
-        procd_add_interface_trigger "interface.*.down" "${iface}" "${trm_init}" start
+        PROCD_RELOAD_DELAY=$((${delay:-2} * 1000))
+        procd_add_interface_trigger "interface.*.down" "${trigger}" "${trm_init}" start
     fi
-    PROCD_RELOAD_DELAY=1000
-    procd_add_config_trigger "config.change" "travelmate" "${trm_init}" start
+    procd_add_reload_trigger "travelmate"
 }
index e0d4d258eca5ab6b3181ffb6ee6a29b1c32854b6..1ad5959edc96056bfe84ebaf036b1cf8f56095f4 100755 (executable)
@@ -10,8 +10,8 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-trm_ver="0.9.3"
-trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
+trm_ver="1.0.0"
+trm_sysver="unknown"
 trm_enabled=0
 trm_debug=0
 trm_automatic=1
@@ -21,11 +21,29 @@ trm_timeout=60
 trm_iwinfo="$(command -v iwinfo)"
 trm_radio=""
 trm_rtfile="/tmp/trm_runtime.json"
+trm_wpa="$(command -v wpa_supplicant)"
 
 # f_envload: load travelmate environment
 #
 f_envload()
 {
+    local sys_call sys_desc sys_model sys_ver
+
+    # get system information
+    #
+    sys_call="$(ubus -S call system board 2>/dev/null)"
+    if [ -n "${sys_call}" ]
+    then
+        sys_desc="$(printf '%s' "${sys_call}" | jsonfilter -e '@.release.description')"
+        sys_model="$(printf '%s' "${sys_call}" | jsonfilter -e '@.model')"
+        sys_ver="$(cat /etc/turris-version 2>/dev/null)"
+        if [ -n "${sys_ver}" ]
+        then
+            sys_desc="${sys_desc}/${sys_ver}"
+        fi
+        trm_sysver="${sys_model}, ${sys_desc}"
+    fi
+
     # initialize lists
     #
     trm_devlist=""
@@ -47,6 +65,10 @@ f_envload()
         f_log "info " "travelmate is currently disabled, please set 'trm_enabled' to '1' to use this service"
         exit 0
     fi
+
+    # check eap capabilities
+    #
+    trm_eap="$("${trm_wpa}" -veap >/dev/null 2>&1; printf "%u" ${?})"
 }
 
 # f_prepare: gather radio information & bring down all STA interfaces
@@ -55,23 +77,28 @@ f_prepare()
 {
     local config="${1}"
     local mode="$(uci -q get wireless."${config}".mode)"
+    local network="$(uci -q get wireless."${config}".network)"
     local radio="$(uci -q get wireless."${config}".device)"
     local disabled="$(uci -q get wireless."${config}".disabled)"
+    local eaptype="$(uci -q get wireless."${config}".eap_type)"
 
     if ([ -z "${trm_radio}" ] || [ "${trm_radio}" = "${radio}" ]) && \
         [ -z "$(printf "%s" "${trm_radiolist}" | grep -Fo " ${radio}")" ]
     then
         trm_radiolist="${trm_radiolist} ${radio}"
     fi
-    if [ "${mode}" = "sta" ]
+    if [ "${mode}" = "sta" ] && [ "${network}" = "${trm_iface}" ]
     then
-        trm_stalist="${trm_stalist} ${config}_${radio}"
         if [ -z "${disabled}" ] || [ "${disabled}" = "0" ]
         then
             uci -q set wireless."${config}".disabled=1
         fi
+        if [ -z "${eaptype}" ] || [ ${trm_eap} -eq 0 ]
+        then
+            trm_stalist="${trm_stalist} ${config}_${radio}"
+        fi
     fi
-    f_log "debug" "prepare: ${mode}, radio: ${radio}, config: ${config}, disabled: ${disabled}"
+    f_log "debug" "prepare: ${config}, mode: ${mode}, network: ${network}, radio: ${radio}, eap: ${trm_eap}, disabled: ${disabled}"
 }
 
 # f_check: check interface status
@@ -123,13 +150,13 @@ f_check()
 #
 f_jsnupdate()
 {
-    local iface="${1}" radio="${2}" ssid="${3}"
+    local iface="${1}" radio="${2}" essid="${3:-"-"}" bssid="${4:-"-"}"
 
     json_init
     json_add_object "data"
     json_add_string "travelmate_version" "${trm_ver}"
     json_add_string "station_connection" "${trm_ifstatus}"
-    json_add_string "station_ssid" "${ssid}"
+    json_add_string "station_id" "${essid}/${bssid}"
     json_add_string "station_interface" "${iface}"
     json_add_string "station_radio" "${radio}"
     json_add_string "last_rundate" "$(/bin/date "+%d.%m.%Y %H:%M:%S")"
@@ -180,7 +207,7 @@ f_log()
 #
 f_main()
 {
-    local dev config ssid_list sta_ssid sta_radio sta_iface cnt=1
+    local dev config raw_scan essid_list bssid_list sta_essid sta_bssid sta_radio sta_iface cnt=1
 
     f_check "initial"
     if [ "${trm_ifstatus}" != "true" ]
@@ -203,33 +230,48 @@ f_main()
             fi
             while [ ${trm_maxretry} -eq 0 ] || [ ${cnt} -le ${trm_maxretry} ]
             do
-                ssid_list="$(${trm_iwinfo} "${dev}" scan | awk '/ESSID: "/{ORS=" ";if (!seen[$0]++) for(i=2; i<=NF; i++) print $i}')"
-                f_log "debug" "main: ${trm_iwinfo}, dev: ${dev}, ssids: ${ssid_list}"
-                if [ -n "${ssid_list}" ]
+                raw_scan="$(${trm_iwinfo} "${dev}" scan)"
+                essid_list="$(printf "%s" "${raw_scan}" | awk '/ESSID: "/{ORS=" ";if (!seen[$0]++) for(i=2; i<=NF; i++) print $i}')"
+                bssid_list="$(printf "%s" "${raw_scan}" | awk '/Address: /{ORS=" ";if (!seen[$5]++) print $5}')"
+                f_log "debug" "main: ${trm_iwinfo}, dev: ${dev}"
+                f_log "debug" "main: ${essid_list}"
+                f_log "debug" "main: ${bssid_list}"
+                if [ -n "${essid_list}" ] || [ -n "${bssid_list}" ]
                 then
                     for sta in ${trm_stalist}
                     do
                         config="${sta%%_*}"
                         sta_radio="${sta##*_}"
-                        sta_ssid="$(uci -q get wireless."${config}".ssid)"
+                        sta_essid="$(uci -q get wireless."${config}".ssid)"
+                        sta_bssid="$(uci -q get wireless."${config}".bssid)"
                         sta_iface="$(uci -q get wireless."${config}".network)"
-                        if [ -n "$(printf "%s" "${ssid_list}" | grep -Fo "\"${sta_ssid}\"")" ] && [ "${dev}" = "${sta_radio}" ]
+                        if (([ -n "$(printf "%s" "${essid_list}" | grep -Fo "\"${sta_essid}\"")" ] && [ -z "${sta_bssid}" ]) || \
+                            ([ -n "$(printf "%s" "${bssid_list}" | grep -Fo "${sta_bssid}")" ] && [ -z "$(printf "%s" "${essid_list}" | grep -Fo "\"${sta_essid}\"")" ]) || \
+                            ([ -n "$(printf "%s" "${essid_list}" | grep -Fo "\"${sta_essid}\"")" ] && [ -n "$(printf "%s" "${bssid_list}" | grep -Fo "${sta_bssid}")" ])) && \
+                             [ "${dev}" = "${sta_radio}" ]
                         then
                             uci -q set wireless."${config}".disabled=0
                             f_check "sta"
                             if [ "${trm_ifstatus}" = "true" ]
                             then
                                 uci -q commit wireless
-                                f_log "info " "interface '${sta_iface}' on '${sta_radio}' connected to uplink '${sta_ssid}' (${trm_sysver})"
-                                f_jsnupdate "${sta_iface}" "${sta_radio}" "${sta_ssid}"
+                                f_log "info " "interface '${sta_iface}' on '${sta_radio}' connected to uplink '${sta_essid:-"-"}/${sta_bssid:-"-"}' (${trm_sysver})"
+                                f_jsnupdate "${sta_iface}" "${sta_radio}" "${sta_essid}" "${sta_bssid}"
                                 return 0
                             elif [ ${trm_maxretry} -ne 0 ] && [ ${cnt} -eq ${trm_maxretry} ]
                             then
                                 uci -q set wireless."${config}".disabled=1
-                                uci -q set wireless."${config}".ssid="${sta_ssid}_err"
+                                if [ -n "${sta_essid}" ]
+                                then
+                                    uci -q set wireless."${config}".ssid="${sta_essid}_err"
+                                fi
+                                if [ -n "${sta_bssid}" ]
+                                then
+                                    uci -q set wireless."${config}".bssid="${sta_bssid}_err"
+                                fi
                                 uci -q commit wireless
                                 f_check "dev"
-                                f_log "info " "can't connect to uplink '${sta_ssid}' (${cnt}/${trm_maxretry}), uplink disabled (${trm_sysver})"
+                                f_log "info " "can't connect to uplink '${sta_essid:-"-"}/${sta_bssid:-"-"}' (${cnt}/${trm_maxretry}), uplink disabled (${trm_sysver})"
                             else
                                 if [ ${trm_maxretry} -eq 0 ]
                                 then
@@ -237,9 +279,9 @@ f_main()
                                 fi
                                 uci -q revert wireless
                                 f_check "dev"
-                                f_log "info " "can't connect to uplink '${sta_ssid}' (${cnt}/${trm_maxretry}) (${trm_sysver})"
+                                f_log "info " "can't connect to uplink '${sta_essid:-"-"}/${sta_bssid:-"-"}' (${cnt}/${trm_maxretry}) (${trm_sysver})"
                             fi
-                            f_jsnupdate "${sta_iface}" "${sta_radio}" "${sta_ssid}"
+                            f_jsnupdate "${sta_iface}" "${sta_radio}" "${sta_essid}" "${sta_bssid}"
                         fi
                     done
                 fi
@@ -250,16 +292,17 @@ f_main()
         if [ ! -s "${trm_rtfile}" ]
         then
             trm_ifstatus="false"
-            f_jsnupdate "n/a" "n/a" "n/a"
+            f_jsnupdate "n/a" "n/a"
         fi
     else
         if [ ! -s "${trm_rtfile}" ]
         then
             config="$(ubus -S call network.wireless status | jsonfilter -l1 -e '@.*.interfaces[@.config.mode="sta"].section')"
             sta_radio="$(uci -q get wireless."${config}".device)"
-            sta_ssid="$(uci -q get wireless."${config}".ssid)"
+            sta_essid="$(uci -q get wireless."${config}".ssid)"
+            sta_bssid="$(uci -q get wireless."${config}".bssid)"
             sta_iface="$(uci -q get wireless."${config}".network)"
-            f_jsnupdate "${sta_iface}" "${sta_radio}" "${sta_ssid}"
+            f_jsnupdate "${sta_iface}" "${sta_radio}" "${sta_essid}" "${sta_bssid}"
         fi
     fi
 }
index 4610d5d6d1349fd58a0ce2757711d5acc2edff8b..1a32ed254ca84704d3d4f7536fa3efe8ed70b291 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wavemon
 PKG_VERSION:=0.8.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_MIRROR_HASH:=e00710049c34bf45735085ad59eedf54190e78d1c5f6b43d28ae9bc93d07681e
@@ -44,7 +44,8 @@ define Package/wavemon/description
 endef
 
 CONFIGURE_VARS += \
-       ac_cv_lib_cap_cap_get_flag=no
+       ac_cv_lib_cap_cap_get_flag=no \
+       BUILD_DATE=$(SOURCE_DATE_EPOCH)
 
 TARGET_CFLAGS += -pthread -I$(STAGING_DIR)/usr/include/libnl3
 
index 9d1f381f9203fddf91c964e1d80b2ef5f8b4d262..924178c2e190b02be245e1a0c1f272a97eda0ddc 100644 (file)
@@ -1,6 +1,4 @@
 #
-# Copyright (C) 2017 Daniel Engberg <daniel.engberg.lists@pyret.net>
-#
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
@@ -8,18 +6,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fdk-aac
-PKG_VERSION:=0.1.5-20171030
+PKG_VERSION:=0.1.5-20171120
 PKG_RELEASE:=1
-PKG_MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net>
+PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=Fraunhofer-FDK-AAC-for-Android
 PKG_LICENSE_FILES:=NOTICE
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/mstorsjo/fdk-aac/
 PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=1e3515e03e2dbdbd48dacc31ef75d25c201a4c51
+PKG_SOURCE_VERSION:=56c717e223a161b11f523de97dae51c5cccd6b52
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=80ac4644e07d5101f8e17e73df3dba4c69e143f5f9054ac3a201fb44a5fec8d0
+PKG_MIRROR_HASH:=c0c035df410697bb753fc06f03bacc0079b4c456a571718b3fabb568c05c41ce
 
 PKG_FIXUP:=autoreconf
 
index 61c727eed65824b3d0e10bb204bab89b3e3682cd..d10d291a97b7a358cff859d5b7379672764c92de 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acl
-PKG_REV:=ea3c6bb711e76d91759f8bf5475e1900362a3142
-PKG_VERSION:=20160519
+PKG_REV:=fa5f6835e00c4927cae051328642b2a5a0d8b1c1
+PKG_VERSION:=20170420
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=7b5045c3c1a306e3bfc3c50f2a769eca67f20206af3bd56eaa0da1e04df93fcc
-PKG_SOURCE_URL:=git://git.sv.gnu.org/acl.git
+PKG_MIRROR_HASH:=4ef33a249eb8715746e7ea914dfab06b5920f0b73635fad60290fe6e532bf535
+PKG_SOURCE_URL:=https://git.savannah.gnu.org/git/acl.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
index 70f8aae664234bbe18c40f39877dca441f0d5cdc..ad35355565149be302fb0b43aac2a469bf19407f 100644 (file)
@@ -8,16 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=attr
-PKG_REV:=315af30d0c1a198dc662a90e6e6ae2456abf2489
-PKG_VERSION:=20160302
+PKG_REV:=cfd8e6ef491a7a5ff900ba2ba3deff7d0bebb0a6
+PKG_VERSION:=20170915
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://git.savannah.gnu.org/r/attr.git
+PKG_SOURCE_URL:=https://git.savannah.gnu.org/git/attr.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_MIRROR_HASH:=9ee01f36a81ccab5f003fc62afdcebfaa422c4f110d0a501e47617eb1c697768
+PKG_MIRROR_HASH:=3c4f9331fd73192801a30071a379f07b48699adffe0d560133a740ade029a04c
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 
 PKG_LICENSE:=LGPL-2.1 GPL-2.0
index f1d89d61c9c327716007a0460168419a263dbe40..9c32cb49d3325b5f716f014535587da610907aae 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gawk
 PKG_VERSION:=4.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gawk
@@ -25,14 +25,14 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gawk
   SECTION:=utils
   CATEGORY:=Utilities
-  URL:=http://tukaani.org/xz
+  URL:=https://www.gnu.org/software/gawk/
   TITLE:=GNU awk
   DEPENDS:=+libncursesw +libreadline
 endef
 
 define Package/gawk/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/{gawk,igawk} $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gawk $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/lib/gawk
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/gawk/* $(1)/usr/lib/gawk/
        $(INSTALL_DIR) $(1)/usr/lib/awk
index ff7d6aaf779878201c92bc4b48a7141ff9fdf22f..0260cf4a4999dcb988b95cada098d55bb6729bd7 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lcdproc
 PKG_VERSION:=0.5.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/lcdproc/lcdproc/releases/download/v$(PKG_VERSION)/
diff --git a/utils/lcdproc/patches/100-remove-build-timestamp.patch b/utils/lcdproc/patches/100-remove-build-timestamp.patch
new file mode 100644 (file)
index 0000000..33f2c57
--- /dev/null
@@ -0,0 +1,35 @@
+Index: lcdproc-0.5.9/clients/lcdproc/main.c
+===================================================================
+--- lcdproc-0.5.9.orig/clients/lcdproc/main.c  2017-04-21 12:43:48.000000000 +0200
++++ lcdproc-0.5.9/clients/lcdproc/main.c       2017-12-06 23:36:54.674753530 +0100
+@@ -58,7 +58,6 @@
+ int sock = -1;
+ char *version = VERSION;
+-char *build_date = __DATE__;
+ int lcd_wid = 0;
+ int lcd_hgt = 0;
+Index: lcdproc-0.5.9/server/main.c
+===================================================================
+--- lcdproc-0.5.9.orig/server/main.c   2017-04-24 22:17:15.000000000 +0200
++++ lcdproc-0.5.9/server/main.c        2017-12-06 23:36:47.550605856 +0100
+@@ -104,7 +104,6 @@
+ char *version = VERSION;
+ char *protocol_version = PROTOCOL_VERSION;
+ char *api_version = API_VERSION;
+-char *build_date = __DATE__;
+ /**** Configuration variables ****/
+@@ -197,8 +196,8 @@
+       /* Report that server is starting (report will be delayed) */
+       report(RPT_NOTICE, "LCDd version %s starting", version);
+-      report(RPT_INFO, "Built on %s, protocol version %s, API version %s",
+-              build_date, protocol_version, api_version);
++      report(RPT_INFO, "Protocol version %s, API version %s",
++              protocol_version, api_version);
+       clear_settings();
index d8d5d2762b6d9951b0ef1cf6d86f78099a7bc17a..65df6f3ddb62c93abdf1d5b2e4101320054113e4 100644 (file)
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=lsof
 PKG_VERSION:=4.89
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof
@@ -57,6 +57,10 @@ define Build/Configure
 endef
 
 define Build/Compile   
+       LSOF_HOST="none" \
+       LSOF_LOGNAME="none" \
+       LSOF_SYSINFO="none" \
+       LSOF_USER="none" \
        $(MAKE) -C $(PKG_BUILD_DIR)
 endef
 
diff --git a/utils/lsof/patches/005-reproducable-build.patch b/utils/lsof/patches/005-reproducable-build.patch
new file mode 100644 (file)
index 0000000..1e4ab15
--- /dev/null
@@ -0,0 +1,24 @@
+diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
+index 2bea108..ed8382e 100644
+--- a/dialects/linux/Makefile
++++ b/dialects/linux/Makefile
+@@ -78,8 +78,8 @@ version.h:   FRC
+       @echo '#define  LSOF_BLDCMT     "${LSOF_BLDCMT}"' > version.h;
+       @echo '#define  LSOF_CC         "${CC}"' >> version.h
+       @echo '#define  LSOF_CCV        "${CCV}"' >> version.h
+-      @echo '#define  LSOF_CCDATE     "'`date`'"' >> version.h
+-      @echo '#define  LSOF_CCFLAGS    "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
++      @echo '#define  LSOF_CCDATE     "'`date -d @${SOURCE_DATE_EPOCH}`'"' >> version.h
++      @echo '#define  LSOF_CCFLAGS    ""' >> version.h
+       @echo '#define  LSOF_CINFO      "${CINFO}"' >> version.h
+       @if [ "X${LSOF_HOST}" = "X" ]; then \
+         echo '#define LSOF_HOST       "'`uname -n`'"' >> version.h; \
+@@ -90,7 +90,7 @@ version.h:   FRC
+           echo '#define       LSOF_HOST       "${LSOF_HOST}"' >> version.h; \
+         fi \
+       fi
+-      @echo '#define  LSOF_LDFLAGS    "${CFGL}"' >> version.h
++      @echo '#define  LSOF_LDFLAGS    ""' >> version.h
+       @if [ "X${LSOF_LOGNAME}" = "X" ]; then \
+         echo '#define LSOF_LOGNAME    "${LOGNAME}"' >> version.h; \
+       else \
index 4600e9c9ee74d9cef437cf2604e27307bf46ea4f..288d5039cfa9250dadf0cb2572289d1027650924 100644 (file)
@@ -70,6 +70,22 @@ define Package/lxc-auto/conffiles
 /etc/config/lxc-auto
 endef
 
+define Package/lxc-unprivileged
+  $(call Package/lxc/Default)
+  TITLE:=Helper script for unprivileged containers support
+  DEPENDS:=+shadow-utils +shadow-newuidmap +shadow-newgidmap
+endef
+
+define Package/lxc-unprivileged/description
+ Support for unprivileged containers requires newuidmap and newguidmap.
+ This package makes sure they are available & have correct permissions.
+endef
+
+define Package/lxc-unprivileged/install
+       $(INSTALL_DIR) $(1)/etc/uci-defaults
+       $(INSTALL_DATA) ./files/lxc-unprivileged.defaults $(1)/etc/uci-defaults/lxc-unprivileged
+endef
+
 define Package/lxc/config
   source "$(SOURCE)/Config.in"
 endef
@@ -272,6 +288,7 @@ $(eval $(call BuildPackage,liblxc))
 $(eval $(call BuildPackage,lxc-lua))
 $(eval $(call BuildPackage,lxc-init))
 $(eval $(call BuildPackage,lxc-auto))
+$(eval $(call BuildPackage,lxc-unprivileged))
 $(foreach u,$(LXC_APPLETS_BIN),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/bin")))
 $(foreach u,$(LXC_APPLETS_LIB),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/lib/lxc")))
 $(foreach u,$(LXC_SCRIPTS),$(eval $(call GenPlugin,$(u),,"/usr/bin")))
diff --git a/utils/lxc/files/lxc-unprivileged.defaults b/utils/lxc/files/lxc-unprivileged.defaults
new file mode 100644 (file)
index 0000000..45c9839
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+chmod u+s /usr/bin/newuidmap && \
+chmod u+s /usr/bin/newgidmap
index 2123502c09be01f27932709ad514266fc5102133..092025ec9167e7aeb4a989f726c094f1e1d5bb95 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=open-plc-utils
-PKG_VERSION:=2017-01-15
+PKG_VERSION:=2017-12-03
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://github.com/qca/open-plc-utils.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=18b7e2a9a17f043fe8ac8b457680aafb1c249c55
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=fd898954f3a7f4f1f1b02a61b748546d648e323642c004353aeb4b337dbaa5dc
+PKG_MIRROR_HASH:=8ccbee8a6eb9a9be97bab74e02033cdb57456ae5f78fd3b19a3661352b89e259
 
 PKG_MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
diff --git a/utils/open-plc-utils/patches/100-remove-build-timestamp.patch b/utils/open-plc-utils/patches/100-remove-build-timestamp.patch
new file mode 100644 (file)
index 0000000..57d5eee
--- /dev/null
@@ -0,0 +1,37 @@
+Index: open-plc-utils-2017-01-15/docbook/version.h.html
+===================================================================
+--- open-plc-utils-2017-01-15.orig/docbook/version.h.html      2017-01-13 19:44:27.000000000 +0100
++++ open-plc-utils-2017-01-15/docbook/version.h.html   2017-12-03 03:46:31.119387280 +0100
+@@ -40,7 +40,6 @@
+ #define PROJECT &quot;open-plc-utils&quot;
+ #define VERSION &quot;0.0.6&quot;
+ #define RELEASE &quot;OSRQCA-929&quot;
+-#define COMPILE __TIME__ &quot; &quot; __DATE__
+ #define CONTACT &quot;cmaier@qca.qualcomm.com&quot;
+ #define LICENSE &quot;Clear BSD&quot;
+Index: open-plc-utils-2017-01-15/tools/version.c
+===================================================================
+--- open-plc-utils-2017-01-15.orig/tools/version.c     2017-01-13 19:44:27.000000000 +0100
++++ open-plc-utils-2017-01-15/tools/version.c  2017-12-03 03:45:57.358690651 +0100
+@@ -30,7 +30,6 @@
+       printf (RELEASE " ");
+       printf ("ISO C ");
+-      printf (COMPANY " ");
++      printf (COMPANY "\n");
+-      printf (COMPILE "\n");
+       return;
+ }
+Index: open-plc-utils-2017-01-15/tools/version.h
+===================================================================
+--- open-plc-utils-2017-01-15.orig/tools/version.h     2017-01-13 19:44:27.000000000 +0100
++++ open-plc-utils-2017-01-15/tools/version.h  2017-12-03 03:46:08.902929217 +0100
+@@ -20,7 +20,6 @@
+ #define PROJECT "open-plc-utils"
+ #define VERSION "0.0.6"
+ #define RELEASE "OSRQCA-929"
+-#define COMPILE __TIME__ " " __DATE__
+ #define CONTACT "https://github.com/qca/open-plc-utils"
+ #define LICENSE "Clear BSD"
diff --git a/utils/setserial/Makefile b/utils/setserial/Makefile
new file mode 100644 (file)
index 0000000..0a7be5a
--- /dev/null
@@ -0,0 +1,34 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=setserial
+PKG_VERSION:=2.17
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/setserial
+PKG_HASH:=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
+PKG_LICENSE:=GPL-2.0
+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/setserial
+  SECTION:=utils
+  CATEGORY:=Utilities
+  URL:=http://setserial.sourceforge.net/
+  TITLE:=Serial port attribute utility
+endef
+
+define Package/setserial/install
+       $(INSTALL_DIR) $(1)/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/setserial $(1)/bin/
+endef
+
+define Package/setserial/description
+ Setserial is a program which allows you to look at and change various
+ attributes of a serial device, including its port, its IRQ, and other
+ serial port options.
+endef
+
+$(eval $(call BuildPackage,setserial))
index 56c2b4832770a80ed340068bad4d5d75541c7e18..fc0c1008c1061b8cbd31fbe8cc336f261f679160 100644 (file)
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/uclibc++.mk
 
 PKG_NAME:=smartmontools
-PKG_VERSION:=6.5
+PKG_VERSION:=6.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/smartmontools
-PKG_HASH:=89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc
+PKG_HASH:=51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
diff --git a/utils/smartmontools/patches/001-musl-compat-realpath.patch b/utils/smartmontools/patches/001-musl-compat-realpath.patch
new file mode 100644 (file)
index 0000000..cc11023
--- /dev/null
@@ -0,0 +1,19 @@
+commit 2473c5e01ea14fae96c157d8bce3a3ec1da124f3
+Author: Maxim Storchak <m.storchak@gmail.com>
+Date:   Sat Dec 9 15:21:51 2017 +0200
+
+    Replace canonicalize_file_name with realpath equivalent
+
+diff --git a/os_linux.cpp b/os_linux.cpp
+index 134d5bc..0575a13 100644
+--- a/os_linux.cpp
++++ b/os_linux.cpp
+@@ -3176,7 +3176,7 @@ static bool is_hpsa(const char * name)
+ {
+   char path[128];
+   snprintf(path, sizeof(path), "/sys/block/%s/device", name);
+-  char * syshostpath = canonicalize_file_name(path);
++  char * syshostpath = realpath(path, NULL);
+   if (!syshostpath)
+     return false;
index 31ba4a57b258b0df60c21908079ac94fd464e70b..9d8f25eafe2370110db6206e401ec40fbfc7b47c 100644 (file)
@@ -1,6 +1,4 @@
 #
-# Copyright (C) 2006-2016 OpenWrt.org
-#
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
@@ -8,13 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unrar
-PKG_VERSION:=5.4.5
+PKG_VERSION:=5.5.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.rarlab.com/rar
-PKG_HASH:=e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c
-PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
+PKG_HASH:=9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>, \
+               Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=UnRAR
 PKG_LICENSE_FILES:=license.txt
index ae4c62386e6624abbe7cfd294ceb58960ef21be4..82205ea269a052319624cb93607f43f38a912c05 100644 (file)
@@ -1,6 +1,6 @@
 --- a/makefile
 +++ b/makefile
-@@ -2,12 +2,12 @@
+@@ -2,13 +2,13 @@
  # Makefile for UNIX - unrar
  
  # Linux using GCC
  LIBFLAGS=-fPIC
  DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
  STRIP=strip
+ AR=ar
 -LDFLAGS=-pthread
 +LDFLAGS=-lpthread
  DESTDIR=/usr
  
  # Linux using LCC
-@@ -142,7 +142,7 @@ uninstall-unrar:
+@@ -166,7 +166,7 @@ uninstall-unrar:
                        rm -f $(DESTDIR)/bin/unrar
  
  install-lib:
 -              install libunrar.so $(DESTDIR)/lib
 +              install -D libunrar.so $(DESTDIR)/lib/libunrar.so
+               install libunrar.a $(DESTDIR)/lib
  
  uninstall-lib:
-               rm -f $(DESTDIR)/lib/libunrar.so