[Pkg-samba-maint] r2769 - in trunk/samba/debian: . patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sat May 16 22:53:34 UTC 2009
Author: vorlon
Date: 2009-05-16 22:53:34 +0000 (Sat, 16 May 2009)
New Revision: 2769
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/undefined-symbols.patch
Log:
debian/patches/undefined-symbols.patch: fix up patch so that it's
suitable for submission upstream.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2009-05-16 18:23:04 UTC (rev 2768)
+++ trunk/samba/debian/changelog 2009-05-16 22:53:34 UTC (rev 2769)
@@ -1,3 +1,10 @@
+samba (2:3.3.4-3) UNRELEASED; urgency=low
+
+ * debian/patches/undefined-symbols.patch: fix up patch so that it's
+ suitable for submission upstream.
+
+ -- Steve Langasek <vorlon at debian.org> Sat, 16 May 2009 15:44:12 -0700
+
samba (2:3.3.4-2) unstable; urgency=low
[ Christian Perrier ]
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2009-05-16 18:23:04 UTC (rev 2768)
+++ trunk/samba/debian/patches/autoconf.patch 2009-05-16 22:53:34 UTC (rev 2769)
@@ -25,10 +25,10 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba/source/configure
+Index: samba-deb/source/configure
===================================================================
---- samba.orig/source/configure
-+++ samba/source/configure
+--- samba-deb.orig/source/configure
++++ samba-deb/source/configure
@@ -678,6 +678,7 @@
LIBADDNS_SOVER
UNINSTALL_LIBADDNS
@@ -77,7 +77,15 @@
LIBTALLOC_LIBS
LIBTALLOC_STATIC
LIBTALLOC_SHARED
-@@ -2412,9 +2418,9 @@
+@@ -801,6 +807,7 @@
+ MODULE_EXPORTS
+ SHLD
+ SONAMEFLAG
++LDDSOFLAGS
+ LDSHFLAGS
+ SAMBA_CPPFLAGS
+ TDB_OBJS
+@@ -2412,9 +2419,9 @@
pammodulesdir="${libdir}/security"
configdir="${libdir}"
swatdir="\${prefix}/swat"
@@ -90,7 +98,7 @@
localedir="\${prefix}/share/locale"
-@@ -2430,10 +2436,10 @@
+@@ -2430,10 +2437,10 @@
test "${libdir}" || libdir="\${prefix}/lib"
modulesdir="${libdir}/samba"
configdir="\${sysconfdir}/samba"
@@ -103,7 +111,15 @@
cat >>confdefs.h <<\_ACEOF
#define FHS_COMPATIBLE 1
-@@ -13719,6 +13725,27 @@
+@@ -11953,6 +11960,7 @@
+
+
+
++
+ # compile with optimization and without debugging by default, but
+ # allow people to set their own preference.
+ # do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
+@@ -13719,6 +13727,27 @@
fi
;;
@@ -131,7 +147,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -44065,7 +44092,7 @@
+@@ -44065,7 +44094,7 @@
#
#
case "$host_os" in
@@ -140,7 +156,15 @@
# glibc <= 2.3.2 has a broken getgrouplist
if test "$cross_compiling" = yes; then
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-@@ -49880,11 +49907,14 @@
+@@ -49864,6 +49893,7 @@
+ # these are the defaults, good for lots of systems
+ HOST_OS="$host_os"
+ LDSHFLAGS="-shared"
++LDDSOFLAGS="-shared"
+ MODULE_EXPORTS=""
+ SONAMEFLAG="#"
+ SHLD="\${CC} \${CFLAGS}"
+@@ -49880,16 +49910,21 @@
# and these are for particular systems
case "$host_os" in
@@ -156,8 +180,129 @@
+ esac
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
- LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -71932,7 +71962,8 @@
+- LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+- else
++ LDDSOFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+ LDSHFLAGS="-shared -Wl,-Bsymbolic"
++ else
++ LDDSOFLAGS="-shared -Wl,-Bsymbolic"
++ LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,-z,defs"
+ fi
+ DYNEXP="-Wl,--export-dynamic"
+ PICFLAG="-fPIC"
+@@ -49906,6 +49941,7 @@
+
+ BLDSHARED="true"
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-h "
+ if test "${GCC}" = "yes"; then
+ PICFLAG="-fPIC"
+@@ -49918,6 +49954,7 @@
+ ## ${CFLAGS} added for building 64-bit shared
+ ## libs using Sun's Compiler
+ LDSHFLAGS="-G \${CFLAGS}"
++ LDDSOFLAGS="$LDSHFLAGS"
+ fi
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -49937,6 +49974,7 @@
+
+ BLDSHARED="true"
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-Wl,-h,"
+ PICFLAG="-KPIC" # Is this correct for SunOS
+ cat >>confdefs.h <<\_ACEOF
+@@ -49951,7 +49989,6 @@
+ ;;
+ *netbsd* | *freebsd* | *dragonfly* )
+ BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ DYNEXP="-Wl,--export-dynamic"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-fPIC -DPIC"
+@@ -49967,7 +50004,6 @@
+
+ ;;
+ *openbsd*) BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ DYNEXP="-Wl,-Bdynamic"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-fPIC"
+@@ -49997,6 +50033,7 @@
+ esac
+ BLDSHARED="true"
+ LDSHFLAGS="-set_version sgi1.0 -shared"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-soname "
+ SHLD="\${LD}"
+ if test "${GCC}" = "yes"; then
+@@ -50019,6 +50056,7 @@
+ # use expfull to export underscored symbols
+ # add rtl to remove /lib/crt0.o warning
+ LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc,-brtl"
++ LDDSOFLAGS="$LDSHFLAGS"
+ DYNEXP="-Wl,-brtl,-bexpfull,-bbigtoc"
+ PICFLAG="-O2"
+ # as AIX code is always position independent...
+@@ -50053,6 +50091,7 @@
+ BLDSHARED="true"
+ SHLD="cc"
+ LDSHFLAGS="-b -Wl,-B,symbolic,-b,-z"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-Wl,+h "
+ PICFLAG="+z"
+ if test "${GCC}" = "yes"; then
+@@ -50095,7 +50134,6 @@
+ _ACEOF
+
+ BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-fPIC"
+ cat >>confdefs.h <<\_ACEOF
+@@ -50124,7 +50162,6 @@
+ _ACEOF
+
+ BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-KPIC"
+ cat >>confdefs.h <<\_ACEOF
+@@ -50198,6 +50235,7 @@
+
+ fi
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ DYNEXP="-Bexport"
+ ;;
+ *mips-sni-sysv4*)
+@@ -50225,6 +50263,7 @@
+
+ fi
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ cat >>confdefs.h <<\_ACEOF
+ #define STAT_ST_BLOCKSIZE 512
+ _ACEOF
+@@ -50236,6 +50275,7 @@
+
+ BLDSHARED="false"
+ LDSHFLAGS=""
++ LDDSOFLAGS="$LDSHFLAGS"
+ ;;
+
+ *darwin*)
+@@ -50245,6 +50285,7 @@
+
+ BLDSHARED="true"
+ LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
++ LDDSOFLAGS="$LDSHFLAGS"
+ CFLAGS="$CFLAGS -fno-common"
+ SHLD="\${CC}"
+ SHLIBEXT="dylib"
+@@ -71932,7 +71973,8 @@
LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
LIBTALLOC_SHARED=
LIBTALLOC_STATIC=
@@ -167,7 +312,7 @@
INSTALL_LIBTALLOC=
UNINSTALL_LIBTALLOC=
-@@ -71947,6 +71978,7 @@
+@@ -71947,6 +71989,7 @@
@@ -175,7 +320,7 @@
{ $as_echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
$as_echo_n "checking whether to build the libtalloc shared library... " >&6; }
-@@ -71981,15 +72013,17 @@
+@@ -71981,15 +72024,17 @@
UNINSTALL_LIBTALLOC=uninstalllibtalloc
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
@@ -195,7 +340,7 @@
{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
$as_echo "no shared library support -- will supply static library" >&6; }
fi
-@@ -72016,7 +72050,8 @@
+@@ -72016,7 +72061,8 @@
LIBTDB_STATIC_TARGET=bin/libtdb.a
LIBTDB_SHARED=
LIBTDB_STATIC=
@@ -205,7 +350,7 @@
INSTALL_LIBTDB=
UNINSTALL_LIBTDB=
-@@ -72031,6 +72066,7 @@
+@@ -72031,6 +72077,7 @@
@@ -213,7 +358,7 @@
{ $as_echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
$as_echo_n "checking whether to build the libtdb shared library... " >&6; }
-@@ -72065,15 +72101,17 @@
+@@ -72065,15 +72112,17 @@
UNINSTALL_LIBTDB=uninstalllibtdb
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
@@ -233,7 +378,7 @@
{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
$as_echo "no shared library support -- will supply static library" >&6; }
fi
-@@ -72100,7 +72138,8 @@
+@@ -72100,7 +72149,8 @@
LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
LIBNETAPI_SHARED=
LIBNETAPI_STATIC=
@@ -243,7 +388,7 @@
INSTALL_LIBNETAPI=
UNINSTALL_LIBNETAPI=
-@@ -72115,6 +72154,7 @@
+@@ -72115,6 +72165,7 @@
@@ -251,7 +396,7 @@
{ $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
$as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
-@@ -72149,15 +72189,17 @@
+@@ -72149,15 +72200,17 @@
UNINSTALL_LIBNETAPI=uninstalllibnetapi
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
@@ -271,7 +416,7 @@
{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
$as_echo "no shared library support -- will supply static library" >&6; }
fi
-@@ -72184,7 +72226,8 @@
+@@ -72184,7 +72237,8 @@
LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
LIBSMBCLIENT_SHARED=
LIBSMBCLIENT_STATIC=
@@ -281,7 +426,7 @@
INSTALL_LIBSMBCLIENT=
UNINSTALL_LIBSMBCLIENT=
-@@ -72199,6 +72242,7 @@
+@@ -72199,6 +72253,7 @@
@@ -289,7 +434,7 @@
{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
$as_echo_n "checking whether to build the libsmbclient shared library... " >&6; }
-@@ -72233,15 +72277,17 @@
+@@ -72233,15 +72288,17 @@
UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
@@ -309,7 +454,7 @@
{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
$as_echo "no shared library support -- will supply static library" >&6; }
fi
-@@ -72268,7 +72314,8 @@
+@@ -72268,7 +72325,8 @@
LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
LIBSMBSHAREMODES_SHARED=
LIBSMBSHAREMODES_STATIC=
@@ -319,7 +464,7 @@
INSTALL_LIBSMBSHAREMODES=
UNINSTALL_LIBSMBSHAREMODES=
-@@ -72283,6 +72330,7 @@
+@@ -72283,6 +72341,7 @@
@@ -327,7 +472,7 @@
{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
$as_echo_n "checking whether to build the libsmbsharemodes shared library... " >&6; }
-@@ -72317,15 +72365,17 @@
+@@ -72317,15 +72376,17 @@
UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -347,7 +492,7 @@
{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
$as_echo "no shared library support -- will supply static library" >&6; }
fi
-@@ -72352,7 +72402,8 @@
+@@ -72352,7 +72413,8 @@
LIBADDNS_STATIC_TARGET=bin/libaddns.a
LIBADDNS_SHARED=
LIBADDNS_STATIC=
@@ -357,7 +502,7 @@
INSTALL_LIBADDNS=
UNINSTALL_LIBADDNS=
-@@ -72367,6 +72418,7 @@
+@@ -72367,6 +72429,7 @@
@@ -365,7 +510,7 @@
{ $as_echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
$as_echo_n "checking whether to build the libaddns shared library... " >&6; }
-@@ -72403,15 +72455,17 @@
+@@ -72403,15 +72466,17 @@
UNINSTALL_LIBADDNS=uninstalllibaddns
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
@@ -385,7 +530,7 @@
{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
$as_echo "no shared library support -- will supply static library" >&6; }
fi
-@@ -75300,7 +75354,7 @@
+@@ -75300,7 +75365,7 @@
$as_echo "yes" >&6; };
case "$host_os" in
@@ -394,7 +539,7 @@
{ $as_echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
$as_echo_n "checking for linux sendfile64 support... " >&6; }
if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -76562,11 +76616,11 @@
+@@ -76562,11 +76627,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
@@ -408,10 +553,10 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-Index: samba/source/include/config.h.in
+Index: samba-deb/source/include/config.h.in
===================================================================
---- samba.orig/source/include/config.h.in
-+++ samba/source/include/config.h.in
+--- samba-deb.orig/source/include/config.h.in
++++ samba-deb/source/include/config.h.in
@@ -69,6 +69,9 @@
/* Whether to use fully FHS-compatible paths */
#undef FHS_COMPATIBLE
Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch 2009-05-16 18:23:04 UTC (rev 2768)
+++ trunk/samba/debian/patches/undefined-symbols.patch 2009-05-16 22:53:34 UTC (rev 2769)
@@ -1,24 +1,283 @@
-Goal: Fix missing symbols in libsmbclient (and libnss_wins), and add
- -Wl,-z,defs to the libsmbclient link options to prevent future
- instances of undefined symbols
+Goal: Add -Wl,-z,defs to the link options for shared libraries, to prevent
+ future instances of undefined symbols
Fixes: #281181
-Status wrt upstream: Not forwarded. Should be once there is a configure test
-for it.
+Status wrt upstream: forwarded in <20090516224019.GA7314 at dario.dodds.net>
Note:
-Index: samba-3.3.0rc2/source/Makefile.in
+Index: samba-deb/source/Makefile.in
===================================================================
---- samba-3.3.0rc2.orig/source/Makefile.in
-+++ samba-3.3.0rc2/source/Makefile.in
-@@ -1962,7 +1962,7 @@
+--- samba-deb.orig/source/Makefile.in
++++ samba-deb/source/Makefile.in
+@@ -27,7 +27,7 @@
+ ## Dynamic shared libraries build settings
+ DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
+ DSO_EXPORTS=@DSO_EXPORTS@
+-SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
++SHLD_LIBS = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
+ # The MODULE_EXPORTS variable contains the platform-specific linker flags
+ # needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules.
+@@ -43,6 +43,7 @@
+ EXEEXT=@EXEEXT@
+ AR=@AR@
+ LDSHFLAGS=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
++LDDSOFLAGS=@LDDSOFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
+ LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
+
+ WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
+@@ -1230,6 +1231,7 @@
+ @echo " LDFLAGS = $(LDFLAGS)"
+ @echo " DYNEXP = $(DYNEXP)"
+ @echo " LDSHFLAGS = $(LDSHFLAGS)"
++ @echo " LDDSOFLAGS = $(LDDSOFLAGS)"
+ @echo " SHLIBEXT = @SHLIBEXT@"
+ @echo " SONAMEFLAG = @SONAMEFLAG@"
+
+@@ -1625,7 +1627,7 @@
+
+ $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
+ @echo Linking shared library $@
+- @$(SHLD_DSO) $(LIBTALLOC_OBJ) @SONAMEFLAG@`basename $@`
++ @$(SHLD_LIBS) $(LIBTALLOC_OBJ) @SONAMEFLAG@`basename $@`
+
+ $(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
+ @rm -f $@
+@@ -1690,7 +1692,7 @@
+
+ $(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
+ @echo Linking shared library $@
+- @$(SHLD_DSO) $(LIBTDB_OBJ) \
++ @$(SHLD_LIBS) $(LIBTDB_OBJ) \
+ @SONAMEFLAG@`basename $@`
+
+ $(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
+@@ -1765,7 +1767,7 @@
+
+ $(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@
+ @echo Linking shared library $@
+- @$(SHLD_DSO) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
++ @$(SHLD_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
+ @SONAMEFLAG@`basename $@`
+
+ $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
+@@ -1825,7 +1827,7 @@
+
+ $(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@
+ @echo Linking shared library $@
+- @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
++ @$(SHLD_LIBS) $(LIBADDNS_OBJ) $(LIBS) \
+ $(KRB5LIBS) $(UUID_LIBS) $(LIBTALLOC_LIBS) \
+ @SONAMEFLAG@`basename $@`
+
+@@ -1910,7 +1912,7 @@
+
+ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+ @echo Linking shared library $@
+- @$(SHLD_DSO) $(LIBNETAPI_OBJ) \
++ @$(SHLD_LIBS) $(LIBNETAPI_OBJ) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
+ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
+ @SONAMEFLAG@`basename $@`
+@@ -1975,7 +1977,7 @@
+
$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
-+ @$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
++ @$(SHLD_LIBS) $(LIBSMBCLIENT_OBJ) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
@SONAMEFLAG@`basename $@`
+@@ -2047,7 +2049,7 @@
+
+ $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) $(LIBSMBSHAREMODES_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
+ @echo Linking shared library $@
+- @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
++ @$(SHLD_LIBS) $(LIBSMBSHAREMODES_OBJ) \
+ $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ $(KRB5LIBS) $(LDAP_LIBS) \
+ @SONAMEFLAG@`basename $@`
+@@ -2121,7 +2123,7 @@
+ #####################################################################
+
+ # Linker command to link a RPC, VFS, AUTH, CHARSET or PASSDB module.
+-SHLD_MODULE = $(SHLD) $(LDSHFLAGS) $(MODULE_EXPORTS) \
++SHLD_MODULE = $(SHLD) $(LDDSOFLAGS) $(MODULE_EXPORTS) \
+ -o $@ @SONAMEFLAG@`basename $@`
+
+ bin/librpc_lsarpc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_LSA_OBJ)
+@@ -2201,18 +2203,18 @@
+
+ @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
+ @echo "Linking $@"
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
++ @$(SHLD) $(LDDSOFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
+ $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
+
+ bin/winbind_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_SHARED@
+ @echo "Linking $@"
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(WINBIND_LIBS) \
++ @$(SHLD) $(LDDSOFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(WINBIND_LIBS) \
+ @SONAMEFLAG@`basename $@`
+
+ bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@
+ @echo "Linking shared library $@"
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
++ @$(SHLD) $(LDDSOFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
+ $(PAM_WINBIND_EXTRA_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) @SONAMEFLAG@`basename $@`
+
+ bin/builtin. at SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
+@@ -2492,7 +2494,7 @@
+
+ bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@ @LIBTDB_SHARED@
+ @echo "Linking shared library $@"
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
++ @$(SHLD) $(LDDSOFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
+ $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
+
+Index: samba-deb/source/configure.in
+===================================================================
+--- samba-deb.orig/source/configure.in
++++ samba-deb/source/configure.in
+@@ -65,6 +65,7 @@
+ AC_SUBST(SAMBA_CPPFLAGS)
+ AC_SUBST(SHELL)
+ AC_SUBST(LDSHFLAGS)
++AC_SUBST(LDDSOFLAGS)
+ AC_SUBST(SONAMEFLAG)
+ AC_SUBST(SHLD)
+ AC_SUBST(MODULE_EXPORTS)
+@@ -1768,6 +1769,7 @@
+ # these are the defaults, good for lots of systems
+ HOST_OS="$host_os"
+ LDSHFLAGS="-shared"
++LDDSOFLAGS="-shared"
+ MODULE_EXPORTS=""
+ SONAMEFLAG="#"
+ SHLD="\${CC} \${CFLAGS}"
+@@ -1789,9 +1791,11 @@
+ esac
+ BLDSHARED="true"
+ if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
+- LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+- else
++ LDDSOFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+ LDSHFLAGS="-shared -Wl,-Bsymbolic"
++ else
++ LDDSOFLAGS="-shared -Wl,-Bsymbolic"
++ LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,-z,defs"
+ fi
+ DYNEXP="-Wl,--export-dynamic"
+ PICFLAG="-fPIC"
+@@ -1801,6 +1805,7 @@
+ *solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
+ BLDSHARED="true"
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-h "
+ if test "${GCC}" = "yes"; then
+ PICFLAG="-fPIC"
+@@ -1813,6 +1818,7 @@
+ ## ${CFLAGS} added for building 64-bit shared
+ ## libs using Sun's Compiler
+ LDSHFLAGS="-G \${CFLAGS}"
++ LDDSOFLAGS="$LDSHFLAGS"
+ fi
+ AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
+ AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
+@@ -1820,6 +1826,7 @@
+ *sunos*) AC_DEFINE(SUNOS4,1,[Whether the host os is sunos4])
+ BLDSHARED="true"
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-Wl,-h,"
+ PICFLAG="-KPIC" # Is this correct for SunOS
+ AC_DEFINE(STAT_ST_BLOCKSIZE,512)
+@@ -1827,7 +1834,6 @@
+ ;;
+ *netbsd* | *freebsd* | *dragonfly* )
+ BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ DYNEXP="-Wl,--export-dynamic"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-fPIC -DPIC"
+@@ -1835,7 +1841,6 @@
+ AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
+ ;;
+ *openbsd*) BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ DYNEXP="-Wl,-Bdynamic"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-fPIC"
+@@ -1849,6 +1854,7 @@
+ esac
+ BLDSHARED="true"
+ LDSHFLAGS="-set_version sgi1.0 -shared"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-soname "
+ SHLD="\${LD}"
+ if test "${GCC}" = "yes"; then
+@@ -1863,6 +1869,7 @@
+ # use expfull to export underscored symbols
+ # add rtl to remove /lib/crt0.o warning
+ LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc,-brtl"
++ LDDSOFLAGS="$LDSHFLAGS"
+ DYNEXP="-Wl,-brtl,-bexpfull,-bbigtoc"
+ PICFLAG="-O2"
+ # as AIX code is always position independent...
+@@ -1881,6 +1888,7 @@
+ BLDSHARED="true"
+ SHLD="cc"
+ LDSHFLAGS="-b -Wl,-B,symbolic,-b,-z"
++ LDDSOFLAGS="$LDSHFLAGS"
+ SONAMEFLAG="-Wl,+h "
+ PICFLAG="+z"
+ if test "${GCC}" = "yes"; then
+@@ -1904,7 +1912,6 @@
+ ;;
+ *osf*) AC_DEFINE(OSF1,1,[Whether the host os is osf1])
+ BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-fPIC"
+ AC_DEFINE(STAT_ST_BLOCKSIZE,512)
+@@ -1915,7 +1922,6 @@
+ ;;
+ *unixware*) AC_DEFINE(UNIXWARE,1,[Whether the host os is unixware])
+ BLDSHARED="true"
+- LDSHFLAGS="-shared"
+ SONAMEFLAG="-Wl,-soname,"
+ PICFLAG="-KPIC"
+ AC_DEFINE(STAT_ST_BLOCKSIZE,512)
+@@ -1932,6 +1938,7 @@
+ AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available])
+ fi
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ DYNEXP="-Bexport"
+ ;;
+ *mips-sni-sysv4*) AC_DEFINE(RELIANTUNIX,1,[Whether the host os is reliantunix]);;
+@@ -1944,16 +1951,19 @@
+ AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available])
+ fi
+ LDSHFLAGS="-G"
++ LDDSOFLAGS="$LDSHFLAGS"
+ AC_DEFINE(STAT_ST_BLOCKSIZE,512)
+ ;;
+ *vos*) AC_DEFINE(STAT_ST_BLOCKSIZE,4096)
+ BLDSHARED="false"
+ LDSHFLAGS=""
++ LDDSOFLAGS="$LDSHFLAGS"
+ ;;
+
+ *darwin*) AC_DEFINE(DARWINOS,1,[Whether the host os is Darwin/MacOSX])
+ BLDSHARED="true"
+ LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
++ LDDSOFLAGS="$LDSHFLAGS"
+ CFLAGS="$CFLAGS -fno-common"
+ SHLD="\${CC}"
+ SHLIBEXT="dylib"
More information about the Pkg-samba-maint
mailing list