Changeset 740 for vendor/current/source4/heimdal_build

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/heimdal_build

Files:

• asn1_deps.pl (modified) (2 diffs)
• config.h (modified) (2 diffs)
• config.m4 (deleted)
• et_compile_wrapper.sh (modified) (2 diffs)
• external.m4 (deleted)
• hdb-glue.c (modified) (1 diff)
• internal.m4 (deleted)
• internal.mk (deleted)
• kpasswdd-glue.h (deleted)
• krb5-glue.c (modified) (1 diff)
• krb5-types.h (modified) (1 diff)
• lexyacc.sh (added)
• replace.c (modified) (1 diff)
• roken.h (modified) (4 diffs)
• version.c (added)
• wscript_build (added)
• wscript_configure (added)

vendor/current/source4/heimdal_build/asn1_deps.pl

@@ -24 +24 @@
 my $header = "$dirname/$prefix.h";
 my $headerx = "$dirname/$prefix.hx";
+my $headerpriv = "$dirname/$prefix-priv.h";
+my $headerprivx = "$dirname/$prefix-priv.hx";
 my $o_file = "$dirname/asn1_$prefix.o";
 my $c_file = "$dirname/asn1_$prefix.c";
@@ -36 +38 @@
 print "$header: $headerx\n";
 print "\t\@cp $headerx $header\n";
-print "$x_file: $header\n";
+print "$headerpriv: $headerprivx\n";
+print "\t\@cp $headerprivx $headerpriv\n";
+print "$x_file: $header $headerpriv\n";
 print "$c_file: $x_file\n";
 print "\t\@echo \"#include \\\"config.h\\\"\" > $c_file && cat $x_file >> $c_file\n\n";

vendor/current/source4/heimdal_build/config.h

@@ -9 +9 @@
 #include "include/config.h"
 #include "../replace/replace.h"
+#include "../lib/util/attr.h"
+#define HEIMDAL_NORETURN_ATTRIBUTE _NORETURN_
+#define HEIMDAL_PRINTF_ATTRIBUTE(x) FORMAT_ATTRIBUTE(x)
+#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4"}
 
-#if !defined(HAVE_DIRFD) && !defined(HAVE_DIRFD_DECL) && !defined(dirfd)
-#define dirfd(d) (-1)
-#endif
+#define VERSION "Samba"
+
+#define PACKAGE VERSION
+#define PACKAGE_BUGREPORT "https://bugzilla.samba.org/"
+#define PACKAGE_VERSION VERSION
 
 #define RCSID(msg) struct __rcsid { int __rcsdi; }
@@ -28 +34 @@
 #undef HAVE_KRB5_ENCRYPT_BLOCK
 
-#if defined(UID_WRAPPER)
-#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
-#define UID_WRAPPER_REPLACE
-#include "../uid_wrapper/uid_wrapper.h"
-#endif
-#else
-#define uwrap_enabled() 0
+/* Because it can't be defined in roken.h */
+#ifndef USE_HCRYPTO_IMATH
+#define USE_HCRYPTO_IMATH
 #endif
 
+/*Workaround for heimdal define vs samba define*/
+#ifdef HAVE_LIBINTL_H
+#define LIBINTL
 #endif
+
+/* heimdal now wants some atomic ops - ask for the non-atomic ones for Samba */
+#define HEIM_BASE_NON_ATOMIC 1
+
+#endif

vendor/current/source4/heimdal_build/et_compile_wrapper.sh

@@ -2 +2 @@
 #
 
-SELF=$0
-SELFDIR=`dirname ${SELF}`
+SELF="$0"
+SELFDIR=`dirname "${SELF}"`
 
-BUILDDIR=$1
-DESTDIR=$2
-
-CMD=$3
-FILE=$4
-SOURCE=$5
-shift 5
-
-test -z "${BUILDDIR}" && {
-        echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2;
-        exit 1;
-}
+DESTDIR="$1"
+CMD="$2"
+FILE="$3"
+SOURCE="$4"
+shift 4
 
 test -z "${DESTDIR}" && {
@@ -38 +31 @@
 }
 
-CURDIR=`pwd`
+CURDIR="`pwd`"
 
-cd ${BUILDDIR} && {
-        ABS_BUILDDIR=`pwd`
-        cd ${CURDIR}
-} || {
-        echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2;
-        exit 1;
-}
-
-cd ${DESTDIR} && {
-        ${ABS_BUILDDIR}/${CMD} ${FILE} >&2 || exit 1;
-        cd ${CURDIR}
+cd "${DESTDIR}" && {
+        # Remove older copies beforehand - MIT's compile_et uses odd permissions for these
+        # files, which makes Heimdal's compile_et fail mysteriously when writing to them.
+        rm -f `basename "${FILE}" .et`.c
+        rm -f `basename "${FILE}" .et`.h
+        "${CMD}" "${FILE}" >&2 || exit 1;
+        cd "${CURDIR}"
         TMP="${SOURCE}.$$"
-        mv ${SOURCE} ${TMP} && {
-                echo "#include \"config.h\"" > ${SOURCE} && {
-                        cat ${TMP} >> ${SOURCE}
+        mv "${SOURCE}" "${TMP}" && {
+                echo "#include \"config.h\"" > "${SOURCE}" && {
+                        cat "${TMP}" >> "${SOURCE}"
                 }
         }
-        rm ${TMP}
+        rm -f "${TMP}"
 } || {
-        echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2;
+        echo "${SELF}:cannot cd into '${DESTDIR}'" >&2;
         exit 1;
 }

vendor/current/source4/heimdal_build/hdb-glue.c

@@ -20 +20 @@
 */
 
-#include "includes.h"
-#include "system/network.h"
-#include "system/kerberos.h"
-#include "lib/socket/netif.h"
-#include "param/param.h"
-
 #include "heimdal/lib/hdb/hdb_locl.h"
 

vendor/current/source4/heimdal_build/krb5-glue.c

@@ -20 +20 @@
 */
 
-#include "includes.h"
-#include "system/network.h"
-#include "system/kerberos.h"
-#include "lib/socket/netif.h"
-#include "param/param.h"
-
 #include "heimdal/lib/krb5/krb5_locl.h"
 

vendor/current/source4/heimdal_build/krb5-types.h

@@ -9 +9 @@
 
 typedef socklen_t krb5_socklen_t;
+typedef int krb5_socket_t;
 typedef ssize_t krb5_ssize_t;
 

vendor/current/source4/heimdal_build/replace.c

@@ -84 +84 @@
 }
 #endif
-
-const char *heimdal_version = "samba-internal-heimdal";
-const char *heimdal_long_version = "samba-interal-heimdal";
-

vendor/current/source4/heimdal_build/roken.h

@@ -5 +5 @@
 #define _ROKEN_H_
 
+#include "config.h"
+
+/* Support 'weak' keys for now, it can't be worse than NTLM and we don't want to hard-code the behaviour at this point */
+#define HEIM_WEAK_CRYPTO 1
+
 /* path to sysconf - should we force this to samba LIBDIR ? */
 #define SYSCONFDIR "/etc"
 
-/* HDB module dir - set to Samba LIBDIR/hdb ? */
-#define HDBDIR "/usr/heimdal/lib"
-#define LIBDIR "/usr/heimdal/lib"
+#define rk_PATH_DELIM '/'
+
 #define HEIMDAL_LOCALEDIR "/usr/heimdal/locale"
 
@@ -20 +24 @@
 #define PKINIT 1
 
-#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.8pre"}
-
-#define VERSION "Samba"
-
 #define ROKEN_LIB_FUNCTION
-
+#define ROKEN_LIB_CALL
+#define ROKEN_LIB_VARIABLE
 #define GETHOSTBYADDR_PROTO_COMPATIBLE
 #define GETSERVBYNAME_PROTO_COMPATIBLE
@@ -103 +104 @@
 #endif
 
+#ifndef HAVE_INET_NTOP
+#define HAVE_INET_NTOP
+#endif
+
+#ifndef HAVE_INET_PTON
+#define HAVE_INET_PTON
+#endif
+
+#ifndef HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY
+#endif
+
+#ifndef HAVE_SETEGID
+#define HAVE_SETEGID
+#endif
+
+#ifndef HAVE_SETEUID
+#define HAVE_SETEUID
+#endif
+
+/* force the use of the libreplace strerror_r */
+#ifndef HAVE_STRERROR_R
+#define HAVE_STRERROR_R
+#endif
+#ifndef STRERROR_R_PROTO_COMPATIBLE
+#define STRERROR_R_PROTO_COMPATIBLE
+#endif
+
+#ifndef HAVE_DIRFD
+#ifdef HAVE_DIR_DD_FD
+#define dirfd(x) ((x)->dd_fd)
+#else
+#define dirfd(d) (-1)
+#endif
+#define HAVE_DIRFD 1
+#endif
+
+
 /* we lie about having pidfile() so that NetBSD5 can compile. Nothing
    in the parts of heimdal we use actually uses pidfile(), and we
@@ -128 +167 @@
 extern const char *heimdal_long_version;
 
+/* we do not want any __APPLE__ magic */
+#ifdef __APPLE__
+#undef __APPLE__
 #endif
+
+#endif