[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-123-g6654bd9

Michael Adam obnox at samba.org
Wed Feb 11 21:44:01 GMT 2009


The branch, v3-2-ctdb has been updated
       via  6654bd91b08a181ebef5acf89c6fb5cf96a48703 (commit)
       via  9cb2dfb1acc958c73f195ddc2480f267262e7d74 (commit)
       via  3884700f8b9d442352f301b306a9a0efc04f6153 (commit)
       via  c49b6775dd37eaa9f0cb6957d62a7578f5e3af54 (commit)
       via  808a9347faebd8349babe3704c2b83dd9b191140 (commit)
      from  982924ac829a493a9b0e325ac2a6ca7212d7f1a3 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit 6654bd91b08a181ebef5acf89c6fb5cf96a48703
Merge: 982924ac829a493a9b0e325ac2a6ca7212d7f1a3 9cb2dfb1acc958c73f195ddc2480f267262e7d74
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 22:42:26 2009 +0100

    Merge commit 'origin/v3-2-test' into v3-2-ctdb

commit 9cb2dfb1acc958c73f195ddc2480f267262e7d74
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 22:27:48 2009 +0100

    s3:packaging: fix parsing of include.h in fill-templates
    
    The content has changed slightly in master for the merged build,
    and we must be more exact when parsing the lines.
    
    Michael

commit 3884700f8b9d442352f301b306a9a0efc04f6153
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 22:25:41 2009 +0100

    s3:packaging: fix path to calling update-pkginfo after pushd in fill-templates
    
    Michael

commit c49b6775dd37eaa9f0cb6957d62a7578f5e3af54
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 22:24:52 2009 +0100

    s3:packaging: paths cosmetics in fill-templates
    
    Michael

commit 808a9347faebd8349babe3704c2b83dd9b191140
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Feb 11 16:34:02 2009 +0100

    enable IPv6 support for NetBSD, FreeBSD
    
    most systems include netinet/in.h via netdb.h but *BSD don't.

-----------------------------------------------------------------------

Summary of changes:
 packaging/bin/fill-templates             |   10 +++++-----
 source/lib/replace/libreplace_network.m4 |    1 +
 2 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/bin/fill-templates b/packaging/bin/fill-templates
index 4e1be39..20e32b2 100755
--- a/packaging/bin/fill-templates
+++ b/packaging/bin/fill-templates
@@ -13,7 +13,7 @@
 # License: GPL
 
 DIRNAME=$(dirname $0)
-TOPDIR=${DIRNAME}/../../
+TOPDIR=${DIRNAME}/../..
 SRCDIR=${TOPDIR}/source
 VERSION_H=${SRCDIR}/include/version.h
 
@@ -26,14 +26,14 @@ if [ ! -f ${VERSION_H} ] ; then
 	exit 1
 fi
 
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
+VERSION=`grep "define SAMBA_VERSION_OFFICIAL_STRING" ${VERSION_H} | awk '{print $3}'`
 
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep "define SAMBA_VERSION_VENDOR_SUFFIX" ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_version}" != "x" ; then
 	VERSION="${VERSION}-${vendor_version}"
 fi
 
-vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_patch}" != "x" ; then
 	VERSION="${VERSION}-${vendor_patch}"
 fi
@@ -43,5 +43,5 @@ VERSION=`echo ${VERSION} | sed 's/\"//g'`
 echo "VERSION: ${VERSION}"
 
 pushd ${TOPDIR}/packaging > /dev/null 2>&1
-${TOPDIR}/packaging/bin/update-pkginfo "${VERSION}" 1 ""
+./bin/update-pkginfo "${VERSION}" 1 ""
 popd > /dev/null 2>&1
diff --git a/source/lib/replace/libreplace_network.m4 b/source/lib/replace/libreplace_network.m4
index 5d16459..9b921a0 100644
--- a/source/lib/replace/libreplace_network.m4
+++ b/source/lib/replace/libreplace_network.m4
@@ -353,6 +353,7 @@ AC_CACHE_CHECK([for ipv6 support],libreplace_cv_HAVE_IPV6,[
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <netdb.h>
+#include <netinet/in.h>
 		],
 		[
 struct sockaddr_storage sa_store;


-- 
SAMBA-CTDB repository


More information about the samba-cvs mailing list