[Pkg-samba-maint] r2754 - branches/samba/experimental/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat May 9 17:26:04 UTC 2009
Author: bubulle
Date: 2009-05-09 17:26:03 +0000 (Sat, 09 May 2009)
New Revision: 2754
Removed:
branches/samba/experimental/debian/patches/proper-static-lib-linking.patch
Modified:
branches/samba/experimental/debian/patches/VERSION.patch
branches/samba/experimental/debian/patches/autoconf.patch
branches/samba/experimental/debian/patches/fhs-filespaths.patch
branches/samba/experimental/debian/patches/installswat.sh.patch
branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
branches/samba/experimental/debian/patches/non-linux-ports.patch
branches/samba/experimental/debian/patches/pam-examples.patch
branches/samba/experimental/debian/patches/series
branches/samba/experimental/debian/patches/shrink-dead-code.patch
branches/samba/experimental/debian/patches/smbclient-pager.patch
branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
branches/samba/experimental/debian/patches/smbtar-bashism.patch
branches/samba/experimental/debian/patches/swat-de.patch
branches/samba/experimental/debian/patches/undefined-symbols.patch
branches/samba/experimental/debian/patches/usershare.patch
Log:
Adapt patches for 3.4
Modified: branches/samba/experimental/debian/patches/VERSION.patch
===================================================================
--- branches/samba/experimental/debian/patches/VERSION.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/VERSION.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -6,10 +6,10 @@
Note: Should be kept
-Index: samba-3.3.0rc2/source/VERSION
+Index: samba-3.3.0rc2/source3/VERSION
===================================================================
---- samba-3.3.0rc2.orig/source/VERSION
-+++ samba-3.3.0rc2/source/VERSION
+--- samba-3.3.0rc2.orig/source3/VERSION
++++ samba-3.3.0rc2/source3/VERSION
@@ -84,7 +84,7 @@
# SAMBA_VERSION_VENDOR_FUNCTION #
# #
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -18,92 +18,18 @@
export QUILT_PATCHES=debian/patches
quilt push autoconf.patch # to get everything applied up to this point
quilt push -f autoconf.patch # to override the errors when applying
- (cd source && autoconf -I m4 -I lib/replace)
+ (cd source && -Im4 -I../m4 -I../lib/replace -I../source4)
# the -I lib/replace is needed because upstream seems to have done
# something screwy with where their m4 include files are distributed in the
# source tree; so this option may not be necessary in the future
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba/source/configure
+Index: samba-3.4.0pre1/source3/configure
===================================================================
---- samba.orig/source/configure
-+++ samba/source/configure
-@@ -678,6 +678,7 @@
- LIBADDNS_SOVER
- UNINSTALL_LIBADDNS
- INSTALL_LIBADDNS
-+LIBADDNS_TARGET
- LIBADDNS_LIBS
- LIBADDNS_STATIC
- LIBADDNS_SHARED
-@@ -686,6 +687,7 @@
- LIBSMBSHAREMODES_SOVER
- UNINSTALL_LIBSMBSHAREMODES
- INSTALL_LIBSMBSHAREMODES
-+LIBSMBSHAREMODES_TARGET
- LIBSMBSHAREMODES_LIBS
- LIBSMBSHAREMODES_STATIC
- LIBSMBSHAREMODES_SHARED
-@@ -694,6 +696,7 @@
- LIBSMBCLIENT_SOVER
- UNINSTALL_LIBSMBCLIENT
- INSTALL_LIBSMBCLIENT
-+LIBSMBCLIENT_TARGET
- LIBSMBCLIENT_LIBS
- LIBSMBCLIENT_STATIC
- LIBSMBCLIENT_SHARED
-@@ -702,6 +705,7 @@
- LIBNETAPI_SOVER
- UNINSTALL_LIBNETAPI
- INSTALL_LIBNETAPI
-+LIBNETAPI_TARGET
- LIBNETAPI_LIBS
- LIBNETAPI_STATIC
- LIBNETAPI_SHARED
-@@ -710,6 +714,7 @@
- LIBTDB_SOVER
- UNINSTALL_LIBTDB
- INSTALL_LIBTDB
-+LIBTDB_TARGET
- LIBTDB_LIBS
- LIBTDB_STATIC
- LIBTDB_SHARED
-@@ -718,6 +723,7 @@
- LIBTALLOC_SOVER
- UNINSTALL_LIBTALLOC
- INSTALL_LIBTALLOC
-+LIBTALLOC_TARGET
- LIBTALLOC_LIBS
- LIBTALLOC_STATIC
- LIBTALLOC_SHARED
-@@ -2412,9 +2418,9 @@
- pammodulesdir="${libdir}/security"
- configdir="${libdir}"
- swatdir="\${prefix}/swat"
--codepagedir="\${MODULESDIR}"
--statedir="\${LOCKDIR}"
--cachedir="\${prefix}/cache/samba"
-+codepagedir="\${prefix}/share/samba"
-+statedir="\${VARDIR}/lib/samba"
-+cachedir="\${VARDIR}/cache/samba"
- localedir="\${prefix}/share/locale"
-
-
-@@ -2430,10 +2436,10 @@
- test "${libdir}" || libdir="\${prefix}/lib"
- modulesdir="${libdir}/samba"
- configdir="\${sysconfdir}/samba"
-- swatdir="\${DATADIR}/samba/swat"
-+ swatdir="\${prefix}/swat"
- codepagedir="\${prefix}/share/samba"
- statedir="\${VARDIR}/lib/samba"
-- cachedir="\${VARDIR}/lib/samba"
-+ cachedir="\${VARDIR}/cache/samba"
-
- cat >>confdefs.h <<\_ACEOF
- #define FHS_COMPATIBLE 1
-@@ -13719,6 +13725,27 @@
+--- samba-3.4.0pre1.orig/source3/configure
++++ samba-3.4.0pre1/source3/configure
+@@ -14606,6 +14606,27 @@
fi
;;
@@ -131,7 +57,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -44065,7 +44092,7 @@
+@@ -45605,7 +45626,7 @@
#
#
case "$host_os" in
@@ -140,7 +66,7 @@
# 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 @@
+@@ -51598,11 +51619,14 @@
# and these are for particular systems
case "$host_os" in
@@ -157,235 +83,7 @@
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 @@
- LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
- LIBTALLOC_SHARED=
- LIBTALLOC_STATIC=
--LIBTALLOC_LIBS=
-+LIBTALLOC_LIBS=-ltalloc
-+LIBTALLOC_TARGET=
- INSTALL_LIBTALLOC=
- UNINSTALL_LIBTALLOC=
-
-@@ -71947,6 +71978,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 @@
- UNINSTALL_LIBTALLOC=uninstalllibtalloc
- if eval $BLDSHARED = true; then
- LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
-+ LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
- enable_static=yes
-- else
-- LIBTALLOC_LIBS=-ltalloc
-+ LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
-+ LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
- fi
- else
- enable_static=yes
-+ LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
- { $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 @@
- LIBTDB_STATIC_TARGET=bin/libtdb.a
- LIBTDB_SHARED=
- LIBTDB_STATIC=
--LIBTDB_LIBS=
-+LIBTDB_LIBS=-ltdb
-+LIBTDB_TARGET=
- INSTALL_LIBTDB=
- UNINSTALL_LIBTDB=
-
-@@ -72031,6 +72066,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 @@
- UNINSTALL_LIBTDB=uninstalllibtdb
- if eval $BLDSHARED = true; then
- LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
-+ LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
- enable_static=yes
-- else
-- LIBTDB_LIBS=-ltdb
-+ LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
-+ LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
- fi
- else
- enable_static=yes
-+ LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
- { $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 @@
- LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
- LIBNETAPI_SHARED=
- LIBNETAPI_STATIC=
--LIBNETAPI_LIBS=
-+LIBNETAPI_LIBS=-lnetapi
-+LIBNETAPI_TARGET=
- INSTALL_LIBNETAPI=
- UNINSTALL_LIBNETAPI=
-
-@@ -72115,6 +72154,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 @@
- UNINSTALL_LIBNETAPI=uninstalllibnetapi
- if eval $BLDSHARED = true; then
- LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
-+ LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
- enable_static=yes
-- else
-- LIBNETAPI_LIBS=-lnetapi
-+ LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
-+ LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
- fi
- else
- enable_static=yes
-+ LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
- { $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 @@
- LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
- LIBSMBCLIENT_SHARED=
- LIBSMBCLIENT_STATIC=
--LIBSMBCLIENT_LIBS=
-+LIBSMBCLIENT_LIBS=-lsmbclient
-+LIBSMBCLIENT_TARGET=
- INSTALL_LIBSMBCLIENT=
- UNINSTALL_LIBSMBCLIENT=
-
-@@ -72199,6 +72242,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 @@
- UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
- if eval $BLDSHARED = true; then
- LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
-+ LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
- enable_static=yes
-- else
-- LIBSMBCLIENT_LIBS=-lsmbclient
-+ LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
-+ LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
- fi
- else
- enable_static=yes
-+ LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
- { $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 @@
- LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
- LIBSMBSHAREMODES_SHARED=
- LIBSMBSHAREMODES_STATIC=
--LIBSMBSHAREMODES_LIBS=
-+LIBSMBSHAREMODES_LIBS=-lsmbsharemodes
-+LIBSMBSHAREMODES_TARGET=
- INSTALL_LIBSMBSHAREMODES=
- UNINSTALL_LIBSMBSHAREMODES=
-
-@@ -72283,6 +72330,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 @@
- UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
- if eval $BLDSHARED = true; then
- LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
-+ LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
- enable_static=yes
-- else
-- LIBSMBSHAREMODES_LIBS=-lsmbsharemodes
-+ LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
-+ LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
- fi
- else
- enable_static=yes
-+ LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
- { $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 @@
- LIBADDNS_STATIC_TARGET=bin/libaddns.a
- LIBADDNS_SHARED=
- LIBADDNS_STATIC=
--LIBADDNS_LIBS=
-+LIBADDNS_LIBS=-laddns
-+LIBADDNS_TARGET=
- INSTALL_LIBADDNS=
- UNINSTALL_LIBADDNS=
-
-@@ -72367,6 +72418,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 @@
- UNINSTALL_LIBADDNS=uninstalllibaddns
- if eval $BLDSHARED = true; then
- LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
-+ LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
- enable_static=yes
-- else
-- LIBADDNS_LIBS=-laddns
-+ LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
-+ LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
- fi
- else
- enable_static=yes
-+ LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
- { $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 @@
+@@ -77030,7 +77054,7 @@
$as_echo "yes" >&6; };
case "$host_os" in
@@ -394,31 +92,17 @@
{ $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 @@
+@@ -78329,11 +78353,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
- *linux*)
+ linux*-gnu* | gnu* | k*bsd*-gnu)
NSSSONAMEVERSIONSUFFIX=".2"
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
+ WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
;;
- *freebsd[5-9]*)
+ freebsd5*|*freebsd[6-9]*)
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-Index: samba/source/include/config.h.in
-===================================================================
---- samba.orig/source/include/config.h.in
-+++ samba/source/include/config.h.in
-@@ -69,6 +69,9 @@
- /* Whether to use fully FHS-compatible paths */
- #undef FHS_COMPATIBLE
-
-+/* Whether to use fully FHS-compatible paths */
-+#undef FHS_COMPATIBLE
-+
- /* Whether the host os is FreeBSD */
- #undef FREEBSD
-
Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -10,10 +10,10 @@
We need to provide a migraiton path and go back to the "normal"
file layout
-Index: samba-3.3.0rc2/source/passdb/pdb_tdb.c
+Index: samba-3.3.0rc2/source3/passdb/pdb_tdb.c
===================================================================
---- samba-3.3.0rc2.orig/source/passdb/pdb_tdb.c
-+++ samba-3.3.0rc2/source/passdb/pdb_tdb.c
+--- samba-3.3.0rc2.orig/source3/passdb/pdb_tdb.c
++++ samba-3.3.0rc2/source3/passdb/pdb_tdb.c
@@ -1613,7 +1613,7 @@
/* save the path for later */
@@ -23,10 +23,10 @@
PASSDB_FILE_NAME) < 0) {
return NT_STATUS_NO_MEMORY;
}
-Index: samba-3.3.0rc2/source/passdb/secrets.c
+Index: samba-3.3.0rc2/source3/passdb/secrets.c
===================================================================
---- samba-3.3.0rc2.orig/source/passdb/secrets.c
-+++ samba-3.3.0rc2/source/passdb/secrets.c
+--- samba-3.3.0rc2.orig/source3/passdb/secrets.c
++++ samba-3.3.0rc2/source3/passdb/secrets.c
@@ -59,7 +59,7 @@
return True;
Modified: branches/samba/experimental/debian/patches/installswat.sh.patch
===================================================================
--- branches/samba/experimental/debian/patches/installswat.sh.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/installswat.sh.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.3.0rc2/source/script/installswat.sh
+Index: samba-3.3.0rc2/source3/script/installswat.sh
===================================================================
---- samba-3.3.0rc2.orig/source/script/installswat.sh
-+++ samba-3.3.0rc2/source/script/installswat.sh
+--- samba-3.3.0rc2.orig/source3/script/installswat.sh
++++ samba-3.3.0rc2/source3/script/installswat.sh
@@ -198,7 +198,11 @@
# Install/ remove Using Samba book (but only if it is there)
Modified: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -5,10 +5,10 @@
Upstream status: submitted as bugzilla bug #5525
-Index: samba-3.3.0rc2/source/smbd/server.c
+Index: samba-3.3.0rc2/source3/smbd/server.c
===================================================================
---- samba-3.3.0rc2.orig/source/smbd/server.c
-+++ samba-3.3.0rc2/source/smbd/server.c
+--- samba-3.3.0rc2.orig/source3/smbd/server.c
++++ samba-3.3.0rc2/source3/smbd/server.c
@@ -806,6 +806,10 @@
int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
Modified: branches/samba/experimental/debian/patches/non-linux-ports.patch
===================================================================
--- branches/samba/experimental/debian/patches/non-linux-ports.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/non-linux-ports.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -7,11 +7,11 @@
Note: Upstream would probably welcome patches allowing to build on new architectures.
As this patch is the most often broken by new upstream releases, everybody would benefit from it.
-Index: samba-3.3.0rc2/source/configure.in
+Index: samba-3.4.0pre1/source3/configure.in
===================================================================
---- samba-3.3.0rc2.orig/source/configure.in
-+++ samba-3.3.0rc2/source/configure.in
-@@ -553,6 +553,15 @@
+--- samba-3.4.0pre1.orig/source3/configure.in
++++ samba-3.4.0pre1/source3/configure.in
+@@ -579,6 +579,15 @@
fi
;;
@@ -27,7 +27,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -1222,7 +1231,7 @@
+@@ -1241,7 +1250,7 @@
#
#
case "$host_os" in
@@ -36,7 +36,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
AC_TRY_RUN([
#include <unistd.h>
-@@ -1656,7 +1665,10 @@
+@@ -1540,7 +1549,10 @@
# and these are for particular systems
case "$host_os" in
@@ -48,7 +48,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5375,7 +5387,7 @@
+@@ -5387,7 +5399,7 @@
AC_MSG_RESULT(yes);
case "$host_os" in
@@ -57,14 +57,14 @@
AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
AC_TRY_LINK([#include <sys/sendfile.h>],
[\
-@@ -5701,11 +5713,11 @@
+@@ -5748,11 +5760,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
- *linux*)
+ linux*-gnu* | gnu* | k*bsd*-gnu)
NSSSONAMEVERSIONSUFFIX=".2"
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
+ WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
;;
- *freebsd[[5-9]]*)
+ freebsd5*|*freebsd[[6-9]]*)
Modified: branches/samba/experimental/debian/patches/pam-examples.patch
===================================================================
--- branches/samba/experimental/debian/patches/pam-examples.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/pam-examples.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.3.0rc2/source/pam_smbpass/README
+Index: samba-3.3.0rc2/source3/pam_smbpass/README
===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/README
-+++ samba-3.3.0rc2/source/pam_smbpass/README
+--- samba-3.3.0rc2.orig/source3/pam_smbpass/README
++++ samba-3.3.0rc2/source3/pam_smbpass/README
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
Deleted: branches/samba/experimental/debian/patches/proper-static-lib-linking.patch
===================================================================
--- branches/samba/experimental/debian/patches/proper-static-lib-linking.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/proper-static-lib-linking.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -1,519 +0,0 @@
-Goal: Sane library interdependencies with static and dynamic linking
-
-Fixes:
-
-Status wrt upstream: basically gone into master and v3-4-test, with
- a couple of subsequent patches as
- f9eb77477b82740814e6143837d8a70f8090b9a5 in upstream git
-
-Note:
-
-=== modified file 'source/Makefile.in'
-Index: samba-3.3.0rc2/source/Makefile.in
-===================================================================
---- samba-3.3.0rc2.orig/source/Makefile.in
-+++ samba-3.3.0rc2/source/Makefile.in
-@@ -239,7 +239,7 @@
- TDB_OBJ = lib/util_tdb.o \
- lib/dbwrap.o lib/dbwrap_tdb.o \
- lib/dbwrap_ctdb.o \
-- lib/dbwrap_rbt.o @LIBTDB_STATIC@
-+ lib/dbwrap_rbt.o
-
- SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
-
-@@ -314,8 +314,7 @@
- SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
- NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
-
--LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
-- $(LIBREPLACE_OBJ) \
-+LIBSAMBAUTIL_OBJ = $(LIBREPLACE_OBJ) \
- $(SOCKET_WRAPPER_OBJ) \
- $(NSS_WRAPPER_OBJ)
-
-@@ -365,7 +364,7 @@
-
- LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
- libaddns/dnsgss.o libaddns/dnsmarshall.o
--LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) @LIBTALLOC_STATIC@
-+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
-
- GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
-
-@@ -1092,15 +1091,15 @@
- iniparser_build/strlib.o
-
- TDBBACKUP_OBJ = @tdbdir@/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
-- @LIBTDB_STATIC@ $(SOCKET_WRAPPER_OBJ)
-+ $(SOCKET_WRAPPER_OBJ)
-
--TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
-+TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o $(LIBREPLACE_OBJ) \
- $(SOCKET_WRAPPER_OBJ)
-
--TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
-+TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o $(LIBREPLACE_OBJ) \
- $(SOCKET_WRAPPER_OBJ)
-
--TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
-+TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o $(LIBREPLACE_OBJ) \
- $(SOCKET_WRAPPER_OBJ)
-
-
-@@ -1320,7 +1319,7 @@
- dir=bin $(MAKEDIR); fi
- @: >> $@ || : > $@ # what a fancy emoticon!
-
--bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
-+bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
- $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-@@ -1328,45 +1327,45 @@
- $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- $(WINBIND_LIBS)
-
--bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS)
-
--bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
- $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \
- $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
- $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- $(WINBIND_LIBS)
-
--bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
-+bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- $(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
- $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
- @INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBNETAPI_LIBS)
-
--bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-@@ -1379,135 +1378,135 @@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
-
--bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
- -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
- $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
- $(LIBTDB_LIBS) $(NSCD_LIBS)
-
--bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
- $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
- $(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
- $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
- $(LIBTDB_LIBS)
-
--bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
- $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
-+bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
- $(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
-
--bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
- $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
- $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
- $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-@@ -1515,64 +1514,64 @@
- @SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- $(WINBIND_LIBS)
-
--bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
- $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
-+bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(POPT_LIBS) $(LIBS) $(LIBTALLOC_LIBS)
-
--bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
-+bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(LIBS) $(LIBTALLOC_LIBS)
-
--bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
- $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
-@@ -1737,7 +1736,7 @@
- nsswitch/libwbclient/wbc_pam.o
- LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
- $(WBCOMMON_OBJ) \
-- @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ)
-+ $(LIBREPLACE_OBJ)
-
- LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
- LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
-@@ -2019,7 +2018,7 @@
-
- LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
-
--LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) @LIBTDB_STATIC@
-+LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0)
-
- LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@
- LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
-@@ -2086,7 +2085,7 @@
- #-------------------------------------------------------------------
-
- # This is probably wrong for anything other than the GNU linker.
--bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_SHARED@
-+bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
- $(LIBS) $(LIBTALLOC_LIBS) \
-@@ -2167,13 +2166,13 @@
- @echo "Linking $@"
- @$(SHLD_MODULE) $(RPC_ECHO_OBJ)
-
--bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo "Linking $@"
- @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- $(PASSDB_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo "Linking $@"
- @$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
- $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
-@@ -2186,7 +2185,7 @@
- $(WINBIND_NSS_EXTRA_LIBS) $(WINBIND_NSS_PTHREAD) \
- @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-
-- at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+ at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo "Linking $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
- $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-@@ -2455,55 +2454,55 @@
- ## None here right now
- #########################################################
-
--bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
- $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- $(WINBIND_LIBS)
-
- bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
-- $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+ $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
- $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@ @LIBTDB_SHARED@
-+bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_TARGET@ @LIBWBCLIENT_SHARED@ @LIBTDB_TARGET@
- @echo "Linking shared library $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
- $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-
--bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \
- $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
- $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) \
- $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
- $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-
--bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
-+bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
- $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
- torture/t_strcmp.o -L ./bin -lbigballofmud
-
--bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o
-+bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o
- $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
- torture/t_strstr.o -L ./bin -lbigballofmud
-
--bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o
-+bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o
- $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
- torture/t_strappend.o -L ./bin -lbigballofmud
-
-Index: samba-3.3.0rc2/source/m4/aclocal.m4
-===================================================================
---- samba-3.3.0rc2.orig/source/m4/aclocal.m4
-+++ samba-3.3.0rc2/source/m4/aclocal.m4
-@@ -68,7 +68,8 @@
- LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
- LIBUC[_SHARED]=
- LIBUC[_STATIC]=
--LIBUC[_LIBS]=
-+LIBUC[_LIBS]=LIBLIBS
-+LIBUC[_TARGET]=
- [INSTALL_]LIBUC=
- [UNINSTALL_]LIBUC=
-
-@@ -79,6 +80,7 @@
- AC_SUBST(LIBUC[_SHARED])
- AC_SUBST(LIBUC[_STATIC])
- AC_SUBST(LIBUC[_LIBS])
-+AC_SUBST(LIBUC[_TARGET])
- AC_SUBST([INSTALL_]LIBUC)
- AC_SUBST([UNINSTALL_]LIBUC)
- AC_SUBST(LIBUC[_SOVER])
-@@ -137,14 +139,16 @@
- [UNINSTALL_]LIBUC=[uninstall]LIBNAME
- if eval $BLDSHARED = true; then
- LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
-+ LIBUC[_TARGET]=$LIBUC[_SHARED_TARGET]
- AC_MSG_RESULT(yes)
- if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
- enable_static=yes
-- else
-- LIBUC[_LIBS]=LIBLIBS
-+ LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
-+ LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
- fi
- else
- enable_static=yes
-+ LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
- AC_MSG_RESULT(no shared library support -- will supply static library)
- fi
- else
Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/series 2009-05-09 17:26:03 UTC (rev 2754)
@@ -8,12 +8,10 @@
undefined-symbols.patch
VERSION.patch
adapt_machine_creation_script.patch
-proper-static-lib-linking.patch
autoconf.patch
smbpasswd-syslog.patch
usershare.patch
swat-de.patch
smbtar-bashism.patch
no-unnecessary-cups.patch
-shrink-dead-code.patch
fix-manpages-warnings.patch
Modified: branches/samba/experimental/debian/patches/shrink-dead-code.patch
===================================================================
--- branches/samba/experimental/debian/patches/shrink-dead-code.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/shrink-dead-code.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -16,10 +16,10 @@
Michael
-Index: samba-3.3.4/source/Makefile.in
+Index: samba-3.3.4/source3/Makefile.in
===================================================================
---- samba-3.3.4.orig/source/Makefile.in 2009-05-02 14:33:23.654935629 +0200
-+++ samba-3.3.4/source/Makefile.in 2009-05-02 14:34:41.393926942 +0200
+--- samba-3.3.4.orig/source3/Makefile.in 2009-05-02 14:33:23.654935629 +0200
++++ samba-3.3.4/source3/Makefile.in 2009-05-02 14:34:41.393926942 +0200
@@ -1336,182 +1336,243 @@
bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
Modified: branches/samba/experimental/debian/patches/smbclient-pager.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbclient-pager.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/smbclient-pager.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -8,10 +8,10 @@
Note:
-Index: samba-3.3.0rc2/source/include/local.h
+Index: samba-3.3.0rc2/source3/include/local.h
===================================================================
---- samba-3.3.0rc2.orig/source/include/local.h
-+++ samba-3.3.0rc2/source/include/local.h
+--- samba-3.3.0rc2.orig/source3/include/local.h
++++ samba-3.3.0rc2/source3/include/local.h
@@ -109,7 +109,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
Modified: branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbpasswd-syslog.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/smbpasswd-syslog.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -4,10 +4,10 @@
Upstream status: submitted as bugzilla bug #4831
-Index: samba-3.3.0rc2/source/pam_smbpass/support.c
+Index: samba-3.3.0rc2/source3/pam_smbpass/support.c
===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/support.c
-+++ samba-3.3.0rc2/source/pam_smbpass/support.c
+--- samba-3.3.0rc2.orig/source3/pam_smbpass/support.c
++++ samba-3.3.0rc2/source3/pam_smbpass/support.c
@@ -14,6 +14,7 @@
* this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -281,10 +281,10 @@
}
make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
"No password supplied" : "Password unchanged" );
-Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_auth.c
+Index: samba-3.3.0rc2/source3/pam_smbpass/pam_smb_auth.c
===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_auth.c
+--- samba-3.3.0rc2.orig/source3/pam_smbpass/pam_smb_auth.c
++++ samba-3.3.0rc2/source3/pam_smbpass/pam_smb_auth.c
@@ -81,10 +81,9 @@
/* Samba initialization. */
@@ -359,10 +359,10 @@
, "pam_get_item returned error to pam_sm_authenticate" );
return PAM_AUTHTOK_RECOVER_ERR;
} else if (pass == NULL) {
-Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_acct.c
+Index: samba-3.3.0rc2/source3/pam_smbpass/pam_smb_acct.c
===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_acct.c
+--- samba-3.3.0rc2.orig/source3/pam_smbpass/pam_smb_acct.c
++++ samba-3.3.0rc2/source3/pam_smbpass/pam_smb_acct.c
@@ -58,26 +58,25 @@
/* Samba initialization. */
@@ -423,10 +423,10 @@
}
make_remark( pamh, ctrl, PAM_ERROR_MSG
, "Your account has been disabled; "
-Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_passwd.c
+Index: samba-3.3.0rc2/source3/pam_smbpass/pam_smb_passwd.c
===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_passwd.c
+--- samba-3.3.0rc2.orig/source3/pam_smbpass/pam_smb_passwd.c
++++ samba-3.3.0rc2/source3/pam_smbpass/pam_smb_passwd.c
@@ -106,10 +106,9 @@
/* Samba initialization. */
@@ -563,10 +563,10 @@
retval = PAM_ABORT;
}
-Index: samba-3.3.0rc2/source/pam_smbpass/support.h
+Index: samba-3.3.0rc2/source3/pam_smbpass/support.h
===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/support.h
-+++ samba-3.3.0rc2/source/pam_smbpass/support.h
+--- samba-3.3.0rc2.orig/source3/pam_smbpass/support.h
++++ samba-3.3.0rc2/source3/pam_smbpass/support.h
@@ -1,8 +1,8 @@
/* syslogging function for errors and other information */
-extern void _log_err(int, const char *, ...);
Modified: branches/samba/experimental/debian/patches/smbtar-bashism.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbtar-bashism.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/smbtar-bashism.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -8,10 +8,10 @@
Note:
-Index: samba-3.3.0rc2/source/script/smbtar
+Index: samba-3.3.0rc2/source3/script/smbtar
===================================================================
---- samba-3.3.0rc2.orig/source/script/smbtar
-+++ samba-3.3.0rc2/source/script/smbtar
+--- samba-3.3.0rc2.orig/source3/script/smbtar
++++ samba-3.3.0rc2/source3/script/smbtar
@@ -151,7 +151,7 @@
if [ -z "$verbose" ]; then
echo "server is $server"
Modified: branches/samba/experimental/debian/patches/swat-de.patch
===================================================================
--- branches/samba/experimental/debian/patches/swat-de.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/swat-de.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -5,10 +5,10 @@
Upstream status: should be forwarded (however, a translation round
was made a while ago, which is rotting in upstream's BTS)
-Index: samba-3.3.0rc2/source/po/de.msg
+Index: samba-3.3.0rc2/source3/po/de.msg
===================================================================
---- samba-3.3.0rc2.orig/source/po/de.msg
-+++ samba-3.3.0rc2/source/po/de.msg
+--- samba-3.3.0rc2.orig/source3/po/de.msg
++++ samba-3.3.0rc2/source3/po/de.msg
@@ -1,5 +1,6 @@
# German messages for international release of SWAT.
# Copyright (C) 2001 Andreas Moroder
Modified: branches/samba/experimental/debian/patches/undefined-symbols.patch
===================================================================
--- branches/samba/experimental/debian/patches/undefined-symbols.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/undefined-symbols.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -9,16 +9,16 @@
Note:
-Index: samba-3.3.0rc2/source/Makefile.in
+Index: samba-3.4.0pre1/source3/Makefile.in
===================================================================
---- samba-3.3.0rc2.orig/source/Makefile.in
-+++ samba-3.3.0rc2/source/Makefile.in
-@@ -1962,7 +1962,7 @@
+--- samba-3.4.0pre1.orig/source3/Makefile.in
++++ samba-3.4.0pre1/source3/Makefile.in
+@@ -2122,7 +2122,7 @@
- $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
+ @$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
- $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
@SONAMEFLAG@`basename $@`
Modified: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch 2009-05-08 12:03:27 UTC (rev 2753)
+++ branches/samba/experimental/debian/patches/usershare.patch 2009-05-09 17:26:03 UTC (rev 2754)
@@ -24,10 +24,10 @@
.PP
The usershare commands are:
.RS 4
-Index: samba-3.3.0/source/param/loadparm.c
+Index: samba-3.3.0/source3/param/loadparm.c
===================================================================
---- samba-3.3.0.orig/source/param/loadparm.c
-+++ samba-3.3.0/source/param/loadparm.c
+--- samba-3.3.0.orig/source3/param/loadparm.c
++++ samba-3.3.0/source3/param/loadparm.c
@@ -4906,7 +4906,7 @@
string_set(&Globals.szUsersharePath, s);
SAFE_FREE(s);
More information about the Pkg-samba-maint
mailing list