[Pkg-samba-maint] r2575 - in trunk/samba/debian: . patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sat Feb 14 18:06:17 UTC 2009
Author: vorlon
Date: 2009-02-14 18:06:17 +0000 (Sat, 14 Feb 2009)
New Revision: 2575
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/patches/README_nosmbldap-tools.patch
trunk/samba/debian/patches/VERSION.patch
trunk/samba/debian/patches/adapt_machine_creation_script.patch
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/documentation.patch
trunk/samba/debian/patches/fhs-assignpaths.patch
trunk/samba/debian/patches/fhs-filespaths-debatable.patch
trunk/samba/debian/patches/fhs-filespaths.patch
trunk/samba/debian/patches/installswat.sh.patch
trunk/samba/debian/patches/no-unnecessary-cups.patch
trunk/samba/debian/patches/non-linux-ports.patch
trunk/samba/debian/patches/pam-examples.patch
trunk/samba/debian/patches/proper-static-lib-linking.patch
trunk/samba/debian/patches/shrink-dead-code.patch
trunk/samba/debian/patches/smbclient-pager.patch
trunk/samba/debian/patches/smbpasswd-syslog.patch
trunk/samba/debian/patches/smbtar-bashism.patch
trunk/samba/debian/patches/swat-de.patch
trunk/samba/debian/patches/undefined-symbols.patch
trunk/samba/debian/patches/usershare.patch
trunk/samba/debian/rules
trunk/samba/debian/samba-doc.docs
trunk/samba/debian/winbind.files
Log:
merge revisions 2217:2223 from experimental
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/changelog 2009-02-14 18:06:17 UTC (rev 2575)
@@ -47,6 +47,19 @@
-- Christian Perrier <bubulle at debian.org> Thu, 27 Nov 2008 11:36:35 +0100
+samba (2:3.3.0~rc1-2) experimental; urgency=low
+
+ * Provide idmap_adex and idmap_hash in winbind.
+ Thanks to Jelmer Jaarsma for reporting and providing a patch
+
+ -- Christian Perrier <bubulle at debian.org> Thu, 04 Dec 2008 19:59:23 +0100
+
+samba (2:3.3.0~rc1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Christian Perrier <bubulle at debian.org> Fri, 28 Nov 2008 10:51:32 +0100
+
samba (2:3.3.0~pre2-1) experimental; urgency=low
* New upstream release.
Modified: trunk/samba/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/samba/debian/patches/README_nosmbldap-tools.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/README_nosmbldap-tools.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.2.0rc1/examples/LDAP/README
+Index: samba-3.3.0rc1/examples/LDAP/README
===================================================================
---- samba-3.2.0rc1.orig/examples/LDAP/README
-+++ samba-3.2.0rc1/examples/LDAP/README
+--- samba-3.3.0rc1.orig/examples/LDAP/README
++++ samba-3.3.0rc1/examples/LDAP/README
@@ -69,6 +69,9 @@
The smbldap-tools package can be downloaded individually from
https://gna.org/projects/smbldap-tools/
Modified: trunk/samba/debian/patches/VERSION.patch
===================================================================
--- trunk/samba/debian/patches/VERSION.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/VERSION.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -6,14 +6,16 @@
Note: Should be kept
-Index: samba-3.2.0rc1/source/VERSION
+Index: samba-3.3.0rc1/source/VERSION
===================================================================
---- samba-3.2.0rc1.orig/source/VERSION
-+++ samba-3.2.0rc1/source/VERSION
-@@ -95,5 +95,5 @@
- # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
- # -> "CVS 3.0.0rc2-VendorVersion" #
+--- samba-3.3.0rc1.orig/source/VERSION
++++ samba-3.3.0rc1/source/VERSION
+@@ -84,7 +84,7 @@
+ # SAMBA_VERSION_VENDOR_FUNCTION #
+ # #
########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="Debian"
SAMBA_VERSION_VENDOR_PATCH=
+
+ ########################################################
Modified: trunk/samba/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/samba/debian/patches/adapt_machine_creation_script.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/adapt_machine_creation_script.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.2.0rc1/docs/manpages/smb.conf.5
+Index: samba-3.3.0rc1/docs/manpages/smb.conf.5
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/smb.conf.5
-+++ samba-3.2.0rc1/docs/manpages/smb.conf.5
+--- samba-3.3.0rc1.orig/docs/manpages/smb.conf.5
++++ samba-3.3.0rc1/docs/manpages/smb.conf.5
@@ -750,8 +750,8 @@
Default:
\fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/autoconf.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -25,10 +25,10 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba-3.3.0pre2/source/configure
+Index: samba-3.3.0rc1/source/configure
===================================================================
---- samba-3.3.0pre2.orig/source/configure
-+++ samba-3.3.0pre2/source/configure
+--- samba-3.3.0rc1.orig/source/configure
++++ samba-3.3.0rc1/source/configure
@@ -791,6 +791,7 @@
LIBTALLOC_SHARED
LIBTALLOC_STATIC
@@ -77,7 +77,7 @@
INSTALL_LIBADDNS
UNINSTALL_LIBADDNS
LIBADDNS_SOVER
-@@ -2241,9 +2247,9 @@
+@@ -2243,9 +2249,9 @@
pammodulesdir="${libdir}/security"
configdir="${libdir}"
swatdir="\${prefix}/swat"
@@ -87,10 +87,10 @@
+codepagedir="\${prefix}/share/samba"
+statedir="\${VARDIR}/lib/samba"
+cachedir="\${VARDIR}/cache/samba"
+ localedir="\${prefix}/share/locale"
- # Check whether --with-fhs was given.
-@@ -2258,10 +2264,10 @@
+@@ -2261,10 +2267,10 @@
test "${libdir}" || libdir="\${prefix}/lib"
modulesdir="${libdir}/samba"
configdir="\${sysconfdir}/samba"
@@ -103,7 +103,7 @@
cat >>confdefs.h <<\_ACEOF
#define FHS_COMPATIBLE 1
-@@ -13085,6 +13091,27 @@
+@@ -13110,6 +13116,27 @@
fi
;;
@@ -131,7 +131,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -40961,7 +40988,7 @@
+@@ -41166,7 +41193,7 @@
#
#
case "$host_os" in
@@ -140,7 +140,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -46197,11 +46224,14 @@
+@@ -46402,11 +46429,14 @@
# and these are for particular systems
case "$host_os" in
@@ -157,7 +157,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -67364,7 +67394,8 @@
+@@ -67596,7 +67626,8 @@
LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
LIBTALLOC_SHARED=
LIBTALLOC_STATIC=
@@ -167,7 +167,7 @@
INSTALL_LIBTALLOC=
UNINSTALL_LIBTALLOC=
-@@ -67379,6 +67410,7 @@
+@@ -67611,6 +67642,7 @@
@@ -175,7 +175,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
echo $ECHO_N "checking whether to build the libtalloc shared library... $ECHO_C" >&6; }
-@@ -67413,15 +67445,17 @@
+@@ -67645,15 +67677,17 @@
UNINSTALL_LIBTALLOC=uninstalllibtalloc
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
@@ -195,7 +195,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67448,7 +67482,8 @@
+@@ -67680,7 +67714,8 @@
LIBTDB_STATIC_TARGET=bin/libtdb.a
LIBTDB_SHARED=
LIBTDB_STATIC=
@@ -205,7 +205,7 @@
INSTALL_LIBTDB=
UNINSTALL_LIBTDB=
-@@ -67463,6 +67498,7 @@
+@@ -67695,6 +67730,7 @@
@@ -213,7 +213,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
echo $ECHO_N "checking whether to build the libtdb shared library... $ECHO_C" >&6; }
-@@ -67497,15 +67533,17 @@
+@@ -67729,15 +67765,17 @@
UNINSTALL_LIBTDB=uninstalllibtdb
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
@@ -233,7 +233,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67532,7 +67570,8 @@
+@@ -67764,7 +67802,8 @@
LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
LIBNETAPI_SHARED=
LIBNETAPI_STATIC=
@@ -243,7 +243,7 @@
INSTALL_LIBNETAPI=
UNINSTALL_LIBNETAPI=
-@@ -67547,6 +67586,7 @@
+@@ -67779,6 +67818,7 @@
@@ -251,7 +251,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
echo $ECHO_N "checking whether to build the libnetapi shared library... $ECHO_C" >&6; }
-@@ -67581,15 +67621,17 @@
+@@ -67813,15 +67853,17 @@
UNINSTALL_LIBNETAPI=uninstalllibnetapi
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
@@ -271,7 +271,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67616,7 +67658,8 @@
+@@ -67848,7 +67890,8 @@
LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
LIBSMBCLIENT_SHARED=
LIBSMBCLIENT_STATIC=
@@ -281,7 +281,7 @@
INSTALL_LIBSMBCLIENT=
UNINSTALL_LIBSMBCLIENT=
-@@ -67631,6 +67674,7 @@
+@@ -67863,6 +67906,7 @@
@@ -289,7 +289,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
echo $ECHO_N "checking whether to build the libsmbclient shared library... $ECHO_C" >&6; }
-@@ -67665,15 +67709,17 @@
+@@ -67897,15 +67941,17 @@
UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
@@ -309,7 +309,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67700,7 +67746,8 @@
+@@ -67932,7 +67978,8 @@
LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
LIBSMBSHAREMODES_SHARED=
LIBSMBSHAREMODES_STATIC=
@@ -319,7 +319,7 @@
INSTALL_LIBSMBSHAREMODES=
UNINSTALL_LIBSMBSHAREMODES=
-@@ -67715,6 +67762,7 @@
+@@ -67947,6 +67994,7 @@
@@ -327,7 +327,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
echo $ECHO_N "checking whether to build the libsmbsharemodes shared library... $ECHO_C" >&6; }
-@@ -67749,15 +67797,17 @@
+@@ -67981,15 +68029,17 @@
UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -347,7 +347,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67784,7 +67834,8 @@
+@@ -68016,7 +68066,8 @@
LIBADDNS_STATIC_TARGET=bin/libaddns.a
LIBADDNS_SHARED=
LIBADDNS_STATIC=
@@ -357,7 +357,7 @@
INSTALL_LIBADDNS=
UNINSTALL_LIBADDNS=
-@@ -67799,6 +67850,7 @@
+@@ -68031,6 +68082,7 @@
@@ -365,7 +365,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
echo $ECHO_N "checking whether to build the libaddns shared library... $ECHO_C" >&6; }
-@@ -67835,15 +67887,17 @@
+@@ -68067,15 +68119,17 @@
UNINSTALL_LIBADDNS=uninstalllibaddns
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
@@ -385,7 +385,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -69916,7 +69970,7 @@
+@@ -70148,7 +70202,7 @@
echo "${ECHO_T}yes" >&6; };
case "$host_os" in
@@ -394,7 +394,7 @@
{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -71124,11 +71178,11 @@
+@@ -71356,11 +71410,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
@@ -408,7 +408,7 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-@@ -77275,6 +77329,7 @@
+@@ -77544,6 +77598,7 @@
LIBTALLOC_SHARED!$LIBTALLOC_SHARED$ac_delim
LIBTALLOC_STATIC!$LIBTALLOC_STATIC$ac_delim
LIBTALLOC_LIBS!$LIBTALLOC_LIBS$ac_delim
@@ -416,7 +416,7 @@
INSTALL_LIBTALLOC!$INSTALL_LIBTALLOC$ac_delim
UNINSTALL_LIBTALLOC!$UNINSTALL_LIBTALLOC$ac_delim
LIBTALLOC_SOVER!$LIBTALLOC_SOVER$ac_delim
-@@ -77283,6 +77338,7 @@
+@@ -77552,6 +77607,7 @@
LIBTDB_SHARED!$LIBTDB_SHARED$ac_delim
LIBTDB_STATIC!$LIBTDB_STATIC$ac_delim
LIBTDB_LIBS!$LIBTDB_LIBS$ac_delim
@@ -424,7 +424,7 @@
INSTALL_LIBTDB!$INSTALL_LIBTDB$ac_delim
UNINSTALL_LIBTDB!$UNINSTALL_LIBTDB$ac_delim
LIBTDB_SOVER!$LIBTDB_SOVER$ac_delim
-@@ -77291,9 +77347,7 @@
+@@ -77560,9 +77616,7 @@
LIBNETAPI_SHARED!$LIBNETAPI_SHARED$ac_delim
LIBNETAPI_STATIC!$LIBNETAPI_STATIC$ac_delim
LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
@@ -435,7 +435,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -77335,11 +77389,15 @@
+@@ -77604,11 +77658,15 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -451,7 +451,7 @@
INSTALL_LIBSMBCLIENT!$INSTALL_LIBSMBCLIENT$ac_delim
UNINSTALL_LIBSMBCLIENT!$UNINSTALL_LIBSMBCLIENT$ac_delim
LIBSMBCLIENT_SOVER!$LIBSMBCLIENT_SOVER$ac_delim
-@@ -77348,6 +77406,7 @@
+@@ -77617,6 +77675,7 @@
LIBSMBSHAREMODES_SHARED!$LIBSMBSHAREMODES_SHARED$ac_delim
LIBSMBSHAREMODES_STATIC!$LIBSMBSHAREMODES_STATIC$ac_delim
LIBSMBSHAREMODES_LIBS!$LIBSMBSHAREMODES_LIBS$ac_delim
@@ -459,7 +459,7 @@
INSTALL_LIBSMBSHAREMODES!$INSTALL_LIBSMBSHAREMODES$ac_delim
UNINSTALL_LIBSMBSHAREMODES!$UNINSTALL_LIBSMBSHAREMODES$ac_delim
LIBSMBSHAREMODES_SOVER!$LIBSMBSHAREMODES_SOVER$ac_delim
-@@ -77356,6 +77415,7 @@
+@@ -77625,6 +77684,7 @@
LIBADDNS_SHARED!$LIBADDNS_SHARED$ac_delim
LIBADDNS_STATIC!$LIBADDNS_STATIC$ac_delim
LIBADDNS_LIBS!$LIBADDNS_LIBS$ac_delim
@@ -467,7 +467,7 @@
INSTALL_LIBADDNS!$INSTALL_LIBADDNS$ac_delim
UNINSTALL_LIBADDNS!$UNINSTALL_LIBADDNS$ac_delim
LIBADDNS_SOVER!$LIBADDNS_SOVER$ac_delim
-@@ -77395,7 +77455,7 @@
+@@ -77664,7 +77724,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -476,10 +476,10 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.3.0pre2/source/include/config.h.in
+Index: samba-3.3.0rc1/source/include/config.h.in
===================================================================
---- samba-3.3.0pre2.orig/source/include/config.h.in
-+++ samba-3.3.0pre2/source/include/config.h.in
+--- samba-3.3.0rc1.orig/source/include/config.h.in
++++ samba-3.3.0rc1/source/include/config.h.in
@@ -66,6 +66,9 @@
/* Whether to use fully FHS-compatible paths */
#undef FHS_COMPATIBLE
Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/documentation.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -6,10 +6,10 @@
Note: Some part should maybe go in the FHS patch
-Index: samba-3.2.0rc1/docs/manpages/swat.8
+Index: samba-3.3.0rc1/docs/manpages/swat.8
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/swat.8
-+++ samba-3.2.0rc1/docs/manpages/swat.8
+--- samba-3.3.0rc1.orig/docs/manpages/swat.8
++++ samba-3.3.0rc1/docs/manpages/swat.8
@@ -103,85 +103,6 @@
.RS 4
Print a summary of command line options\.
@@ -113,10 +113,10 @@
.RE
.SH "WARNINGS"
.PP
-Index: samba-3.2.0rc1/docs/manpages/nmbd.8
+Index: samba-3.3.0rc1/docs/manpages/nmbd.8
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/nmbd.8
-+++ samba-3.2.0rc1/docs/manpages/nmbd.8
+--- samba-3.3.0rc1.orig/docs/manpages/nmbd.8
++++ samba-3.3.0rc1/docs/manpages/nmbd.8
@@ -107,11 +107,9 @@
to answer any name queries\. Adding a line to this file affects name NetBIOS resolution from this host
\fIONLY\fR\.
@@ -162,10 +162,10 @@
nmbd
to dump out its server database in the
\fIlog\.nmb\fR
-Index: samba-3.2.0rc1/docs/manpages/smbd.8
+Index: samba-3.3.0rc1/docs/manpages/smbd.8
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/smbd.8
-+++ samba-3.2.0rc1/docs/manpages/smbd.8
+--- samba-3.3.0rc1.orig/docs/manpages/smbd.8
++++ samba-3.3.0rc1/docs/manpages/smbd.8
@@ -161,14 +161,11 @@
inetd, this file must contain a mapping of service name (e\.g\., netbios\-ssn) to service port (e\.g\., 139) and protocol type (e\.g\., tcp)\.
.RE
@@ -183,10 +183,10 @@
.sp
This file describes all the services the server is to make available to clients\. See
\fBsmb.conf\fR(5)
-Index: samba-3.2.0rc1/docs/manpages/lmhosts.5
+Index: samba-3.3.0rc1/docs/manpages/lmhosts.5
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/lmhosts.5
-+++ samba-3.2.0rc1/docs/manpages/lmhosts.5
+--- samba-3.3.0rc1.orig/docs/manpages/lmhosts.5
++++ samba-3.3.0rc1/docs/manpages/lmhosts.5
@@ -83,10 +83,8 @@
file\.
.SH "FILES"
@@ -200,10 +200,10 @@
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\.
-Index: samba-3.2.0rc1/docs/manpages/ntlm_auth.1
+Index: samba-3.3.0rc1/docs/manpages/ntlm_auth.1
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.2.0rc1/docs/manpages/ntlm_auth.1
+--- samba-3.3.0rc1.orig/docs/manpages/ntlm_auth.1
++++ samba-3.3.0rc1/docs/manpages/ntlm_auth.1
@@ -35,7 +35,7 @@
Some of these commands also require access to the directory
\fIwinbindd_privileged\fR
@@ -231,10 +231,10 @@
.RE
.PP
gss\-spnego\-client
-Index: samba-3.2.0rc1/docs/manpages/tdbbackup.8
+Index: samba-3.3.0rc1/docs/manpages/tdbbackup.8
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/tdbbackup.8
-+++ samba-3.2.0rc1/docs/manpages/tdbbackup.8
+--- samba-3.3.0rc1.orig/docs/manpages/tdbbackup.8
++++ samba-3.3.0rc1/docs/manpages/tdbbackup.8
@@ -69,7 +69,7 @@
.\}
@@ -262,11 +262,11 @@
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\.
-Index: samba-3.2.0rc1/docs/manpages/winbindd.8
+Index: samba-3.3.0rc1/docs/manpages/winbindd.8
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/winbindd.8
-+++ samba-3.2.0rc1/docs/manpages/winbindd.8
-@@ -521,16 +521,16 @@
+--- samba-3.3.0rc1.orig/docs/manpages/winbindd.8
++++ samba-3.3.0rc1/docs/manpages/winbindd.8
+@@ -513,16 +513,16 @@
file are owned by root\.
.RE
.PP
@@ -287,7 +287,7 @@
file are owned by root\.
.RE
.PP
-@@ -539,15 +539,12 @@
+@@ -531,15 +531,12 @@
Implementation of name service switch library\.
.RE
.PP
Modified: trunk/samba/debian/patches/fhs-assignpaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-assignpaths.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/fhs-assignpaths.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -7,10 +7,10 @@
Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
change their default behaviour
-Index: samba-3.3.0pre2/source/param/loadparm.c
+Index: samba-3.3.0rc1/source/param/loadparm.c
===================================================================
---- samba-3.3.0pre2.orig/source/param/loadparm.c
-+++ samba-3.3.0pre2/source/param/loadparm.c
+--- samba-3.3.0rc1.orig/source/param/loadparm.c
++++ samba-3.3.0rc1/source/param/loadparm.c
@@ -120,6 +120,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -56,10 +56,10 @@
{
.label = "pid directory",
.type = P_STRING,
-Index: samba-3.3.0pre2/source/m4/check_path.m4
+Index: samba-3.3.0rc1/source/m4/check_path.m4
===================================================================
---- samba-3.3.0pre2.orig/source/m4/check_path.m4
-+++ samba-3.3.0pre2/source/m4/check_path.m4
+--- samba-3.3.0rc1.orig/source/m4/check_path.m4
++++ samba-3.3.0rc1/source/m4/check_path.m4
@@ -26,9 +26,9 @@
pammodulesdir="${libdir}/security"
configdir="${libdir}"
@@ -70,10 +70,10 @@
+codepagedir="\${prefix}/share/samba"
+statedir="\${VARDIR}/lib/samba"
+cachedir="\${VARDIR}/cache/samba"
+ localedir="\${prefix}/share/locale"
AC_ARG_WITH(fhs,
- [AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
-@@ -42,10 +42,10 @@
+@@ -43,10 +43,10 @@
test "${libdir}" || libdir="\${prefix}/lib"
modulesdir="${libdir}/samba"
configdir="\${sysconfdir}/samba"
@@ -87,20 +87,20 @@
AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
;;
esac])
-Index: samba-3.3.0pre2/source/configure
+Index: samba-3.3.0rc1/source/configure
===================================================================
---- samba-3.3.0pre2.orig/source/configure
-+++ samba-3.3.0pre2/source/configure
-@@ -2243,7 +2243,7 @@
+--- samba-3.3.0rc1.orig/source/configure
++++ samba-3.3.0rc1/source/configure
+@@ -2245,7 +2245,7 @@
swatdir="\${prefix}/swat"
codepagedir="\${MODULESDIR}"
statedir="\${LOCKDIR}"
-cachedir="\${LOCKDIR}"
+cachedir="\${prefix}/cache/samba"
+ localedir="\${prefix}/share/locale"
- # Check whether --with-fhs was given.
-@@ -2259,7 +2259,7 @@
+@@ -2262,7 +2262,7 @@
modulesdir="${libdir}/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
Modified: trunk/samba/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths-debatable.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/fhs-filespaths-debatable.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -46,10 +46,10 @@
grep -r lp_lockdir source/ | grep -vE \
'%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-Index: samba-3.3.0pre2/source/lib/util.c
+Index: samba-3.3.0rc1/source/lib/util.c
===================================================================
---- samba-3.3.0pre2.orig/source/lib/util.c
-+++ samba-3.3.0pre2/source/lib/util.c
+--- samba-3.3.0rc1.orig/source/lib/util.c
++++ samba-3.3.0rc1/source/lib/util.c
@@ -2637,6 +2637,15 @@
return xx_path(name, get_dyn_STATEDIR());
}
@@ -66,10 +66,10 @@
/**
* @brief Returns the platform specific shared library extension.
*
-Index: samba-3.3.0pre2/source/libsmb/samlogon_cache.c
+Index: samba-3.3.0rc1/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.3.0pre2.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.3.0pre2/source/libsmb/samlogon_cache.c
+--- samba-3.3.0rc1.orig/source/libsmb/samlogon_cache.c
++++ samba-3.3.0rc1/source/libsmb/samlogon_cache.c
@@ -34,7 +34,7 @@
bool netsamlogon_cache_init(void)
{
@@ -79,10 +79,10 @@
TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
}
-Index: samba-3.3.0pre2/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.3.0rc1/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.3.0pre2.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.3.0pre2/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.3.0rc1.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.3.0rc1/source/nmbd/nmbd_serverlistdb.c
@@ -326,7 +326,7 @@
updatecount++;
@@ -92,10 +92,10 @@
if (!fname) {
return;
}
-Index: samba-3.3.0pre2/source/passdb/login_cache.c
+Index: samba-3.3.0rc1/source/passdb/login_cache.c
===================================================================
---- samba-3.3.0pre2.orig/source/passdb/login_cache.c
-+++ samba-3.3.0pre2/source/passdb/login_cache.c
+--- samba-3.3.0rc1.orig/source/passdb/login_cache.c
++++ samba-3.3.0rc1/source/passdb/login_cache.c
@@ -35,7 +35,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -105,10 +105,10 @@
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.3.0pre2/source/printing/printing.c
+Index: samba-3.3.0rc1/source/printing/printing.c
===================================================================
---- samba-3.3.0pre2.orig/source/printing/printing.c
-+++ samba-3.3.0pre2/source/printing/printing.c
+--- samba-3.3.0rc1.orig/source/printing/printing.c
++++ samba-3.3.0rc1/source/printing/printing.c
@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -120,10 +120,10 @@
/* handle a Samba upgrade */
-Index: samba-3.3.0pre2/source/printing/printing_db.c
+Index: samba-3.3.0rc1/source/printing/printing_db.c
===================================================================
---- samba-3.3.0pre2.orig/source/printing/printing_db.c
-+++ samba-3.3.0pre2/source/printing/printing_db.c
+--- samba-3.3.0rc1.orig/source/printing/printing_db.c
++++ samba-3.3.0rc1/source/printing/printing_db.c
@@ -91,7 +91,7 @@
}
@@ -133,10 +133,10 @@
printername) < 0) {
DLIST_REMOVE(print_db_head, p);
SAFE_FREE(p);
-Index: samba-3.3.0pre2/source/smbd/lanman.c
+Index: samba-3.3.0rc1/source/smbd/lanman.c
===================================================================
---- samba-3.3.0pre2.orig/source/smbd/lanman.c
-+++ samba-3.3.0pre2/source/smbd/lanman.c
+--- samba-3.3.0rc1.orig/source/smbd/lanman.c
++++ samba-3.3.0rc1/source/smbd/lanman.c
@@ -1154,9 +1154,9 @@
bool local_list_only;
int i;
@@ -149,10 +149,10 @@
return 0;
}
-Index: samba-3.3.0pre2/source/utils/smbcontrol.c
+Index: samba-3.3.0rc1/source/utils/smbcontrol.c
===================================================================
---- samba-3.3.0pre2.orig/source/utils/smbcontrol.c
-+++ samba-3.3.0pre2/source/utils/smbcontrol.c
+--- samba-3.3.0rc1.orig/source/utils/smbcontrol.c
++++ samba-3.3.0rc1/source/utils/smbcontrol.c
@@ -868,10 +868,10 @@
/* Remove the entry in the winbindd_cache tdb to tell a later
starting winbindd that we're online. */
@@ -182,10 +182,10 @@
return False;
}
-Index: samba-3.3.0pre2/source/libgpo/gpo_fetch.c
+Index: samba-3.3.0rc1/source/libgpo/gpo_fetch.c
===================================================================
---- samba-3.3.0pre2.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.3.0pre2/source/libgpo/gpo_fetch.c
+--- samba-3.3.0rc1.orig/source/libgpo/gpo_fetch.c
++++ samba-3.3.0rc1/source/libgpo/gpo_fetch.c
@@ -59,7 +59,7 @@
if ((path = talloc_asprintf(mem_ctx,
@@ -204,10 +204,10 @@
char *current_dir;
char *tok;
-Index: samba-3.3.0pre2/source/winbindd/winbindd_cache.c
+Index: samba-3.3.0rc1/source/winbindd/winbindd_cache.c
===================================================================
---- samba-3.3.0pre2.orig/source/winbindd/winbindd_cache.c
-+++ samba-3.3.0pre2/source/winbindd/winbindd_cache.c
+--- samba-3.3.0rc1.orig/source/winbindd/winbindd_cache.c
++++ samba-3.3.0rc1/source/winbindd/winbindd_cache.c
@@ -2532,7 +2532,7 @@
return true;
@@ -256,10 +256,10 @@
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
smb_panic_fn = validate_panic;
-Index: samba-3.3.0pre2/source/printing/nt_printing.c
+Index: samba-3.3.0rc1/source/printing/nt_printing.c
===================================================================
---- samba-3.3.0pre2.orig/source/printing/nt_printing.c
-+++ samba-3.3.0pre2/source/printing/nt_printing.c
+--- samba-3.3.0rc1.orig/source/printing/nt_printing.c
++++ samba-3.3.0rc1/source/printing/nt_printing.c
@@ -2552,7 +2552,7 @@
if (geteuid() == 0) {
Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/fhs-filespaths.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -50,11 +50,11 @@
grep -r lp_lockdir source/ | grep -vE \
'%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm|smbd/oplock_irix)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-Index: b/source/passdb/pdb_tdb.c
+Index: samba-3.3.0rc1/source/passdb/pdb_tdb.c
===================================================================
---- a/source/passdb/pdb_tdb.c
-+++ b/source/passdb/pdb_tdb.c
-@@ -1612,7 +1612,7 @@
+--- samba-3.3.0rc1.orig/source/passdb/pdb_tdb.c
++++ samba-3.3.0rc1/source/passdb/pdb_tdb.c
+@@ -1613,7 +1613,7 @@
/* save the path for later */
if (!location) {
@@ -63,10 +63,10 @@
PASSDB_FILE_NAME) < 0) {
return NT_STATUS_NO_MEMORY;
}
-Index: b/source/modules/vfs_xattr_tdb.c
+Index: samba-3.3.0rc1/source/modules/vfs_xattr_tdb.c
===================================================================
---- a/source/modules/vfs_xattr_tdb.c
-+++ b/source/modules/vfs_xattr_tdb.c
+--- samba-3.3.0rc1.orig/source/modules/vfs_xattr_tdb.c
++++ samba-3.3.0rc1/source/modules/vfs_xattr_tdb.c
@@ -576,7 +576,7 @@
const char *dbname;
@@ -76,10 +76,10 @@
if (dbname == NULL) {
errno = ENOSYS;
-Index: b/source/passdb/secrets.c
+Index: samba-3.3.0rc1/source/passdb/secrets.c
===================================================================
---- a/source/passdb/secrets.c
-+++ b/source/passdb/secrets.c
+--- samba-3.3.0rc1.orig/source/passdb/secrets.c
++++ samba-3.3.0rc1/source/passdb/secrets.c
@@ -59,7 +59,7 @@
return True;
@@ -89,7 +89,7 @@
if (fname == NULL) {
return false;
}
-@@ -1112,7 +1112,7 @@
+@@ -1113,7 +1113,7 @@
TDB_DATA vers;
uint32 ver;
TDB_CONTEXT *tdb_sc = NULL;
Modified: trunk/samba/debian/patches/installswat.sh.patch
===================================================================
--- trunk/samba/debian/patches/installswat.sh.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/installswat.sh.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.2.0rc1/source/script/installswat.sh
+Index: samba-3.3.0rc1/source/script/installswat.sh
===================================================================
---- samba-3.2.0rc1.orig/source/script/installswat.sh
-+++ samba-3.2.0rc1/source/script/installswat.sh
+--- samba-3.3.0rc1.orig/source/script/installswat.sh
++++ samba-3.3.0rc1/source/script/installswat.sh
@@ -198,7 +198,11 @@
# Install/ remove Using Samba book (but only if it is there)
Modified: trunk/samba/debian/patches/no-unnecessary-cups.patch
===================================================================
--- trunk/samba/debian/patches/no-unnecessary-cups.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/no-unnecessary-cups.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -5,11 +5,11 @@
Upstream status: submitted as bugzilla bug #5525
-Index: samba-3.0.30/source/smbd/server.c
+Index: samba-3.3.0rc1/source/smbd/server.c
===================================================================
---- samba-3.0.30/source/smbd/server.c (revision 1918)
-+++ samba-3.0.30/source/smbd/server.c (working copy)
-@@ -624,6 +624,10 @@
+--- samba-3.3.0rc1.orig/source/smbd/server.c
++++ samba-3.3.0rc1/source/smbd/server.c
+@@ -807,6 +807,10 @@
int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
Modified: trunk/samba/debian/patches/non-linux-ports.patch
===================================================================
--- trunk/samba/debian/patches/non-linux-ports.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/non-linux-ports.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -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.2.0rc1/source/configure.in
+Index: samba-3.3.0rc1/source/configure.in
===================================================================
---- samba-3.2.0rc1.orig/source/configure.in
-+++ samba-3.2.0rc1/source/configure.in
-@@ -560,6 +560,15 @@
+--- samba-3.3.0rc1.orig/source/configure.in
++++ samba-3.3.0rc1/source/configure.in
+@@ -553,6 +553,15 @@
fi
;;
@@ -27,7 +27,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -1182,7 +1191,7 @@
+@@ -1208,7 +1217,7 @@
#
#
case "$host_os" in
@@ -36,7 +36,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
AC_TRY_RUN([
#include <unistd.h>
-@@ -1526,7 +1535,10 @@
+@@ -1642,7 +1651,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"
-@@ -5292,7 +5304,7 @@
+@@ -5361,7 +5373,7 @@
AC_MSG_RESULT(yes);
case "$host_os" in
@@ -57,7 +57,7 @@
AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
AC_TRY_LINK([#include <sys/sendfile.h>],
[\
-@@ -5618,11 +5630,11 @@
+@@ -5687,11 +5699,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
Modified: trunk/samba/debian/patches/pam-examples.patch
===================================================================
--- trunk/samba/debian/patches/pam-examples.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/pam-examples.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -6,10 +6,10 @@
Note:
-Index: samba-3.2.0rc1/source/pam_smbpass/README
+Index: samba-3.3.0rc1/source/pam_smbpass/README
===================================================================
---- samba-3.2.0rc1.orig/source/pam_smbpass/README
-+++ samba-3.2.0rc1/source/pam_smbpass/README
+--- samba-3.3.0rc1.orig/source/pam_smbpass/README
++++ samba-3.3.0rc1/source/pam_smbpass/README
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
Modified: trunk/samba/debian/patches/proper-static-lib-linking.patch
===================================================================
--- trunk/samba/debian/patches/proper-static-lib-linking.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/proper-static-lib-linking.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -7,11 +7,11 @@
Note:
=== modified file 'source/Makefile.in'
-Index: samba-3.3.0pre2/source/Makefile.in
+Index: samba-3.3.0rc1/source/Makefile.in
===================================================================
---- samba-3.3.0pre2.orig/source/Makefile.in
-+++ samba-3.3.0pre2/source/Makefile.in
-@@ -233,7 +233,7 @@
+--- samba-3.3.0rc1.orig/source/Makefile.in
++++ samba-3.3.0rc1/source/Makefile.in
+@@ -239,7 +239,7 @@
TDB_OBJ = lib/util_tdb.o \
lib/dbwrap.o lib/dbwrap_tdb.o \
lib/dbwrap_ctdb.o \
@@ -20,7 +20,7 @@
SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
-@@ -307,8 +307,7 @@
+@@ -314,8 +314,7 @@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
@@ -30,7 +30,7 @@
$(SOCKET_WRAPPER_OBJ) \
$(NSS_WRAPPER_OBJ)
-@@ -358,7 +357,7 @@
+@@ -365,7 +364,7 @@
LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
libaddns/dnsgss.o libaddns/dnsmarshall.o
@@ -39,7 +39,7 @@
GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
-@@ -1082,15 +1081,15 @@
+@@ -1092,15 +1091,15 @@
iniparser_build/strlib.o
TDBBACKUP_OBJ = @tdbdir@/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
@@ -59,7 +59,7 @@
$(SOCKET_WRAPPER_OBJ)
-@@ -1302,7 +1301,7 @@
+@@ -1320,7 +1319,7 @@
dir=bin $(MAKEDIR); fi
@: >> $@ || : > $@ # what a fancy emoticon!
@@ -68,7 +68,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-@@ -1310,45 +1309,45 @@
+@@ -1328,45 +1327,45 @@
$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
$(WINBIND_LIBS)
@@ -121,7 +121,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-@@ -1361,135 +1360,135 @@
+@@ -1379,135 +1378,135 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
@@ -280,7 +280,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-@@ -1497,64 +1496,64 @@
+@@ -1515,64 +1514,64 @@
@SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
$(WINBIND_LIBS)
@@ -356,7 +356,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
-@@ -1718,7 +1717,7 @@
+@@ -1737,7 +1736,7 @@
nsswitch/libwbclient/wbc_pam.o
LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
$(WBCOMMON_OBJ) \
@@ -365,7 +365,7 @@
LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
-@@ -2000,7 +1999,7 @@
+@@ -2019,7 +2018,7 @@
LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
@@ -374,7 +374,7 @@
LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@
LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
-@@ -2067,7 +2066,7 @@
+@@ -2086,7 +2085,7 @@
#-------------------------------------------------------------------
# This is probably wrong for anything other than the GNU linker.
@@ -383,7 +383,7 @@
@echo Linking shared library $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
$(LIBS) $(LIBTALLOC_LIBS) \
-@@ -2148,13 +2147,13 @@
+@@ -2167,13 +2166,13 @@
@echo "Linking $@"
@$(SHLD_MODULE) $(RPC_ECHO_OBJ)
@@ -399,7 +399,7 @@
@echo "Linking $@"
@$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
-@@ -2167,7 +2166,7 @@
+@@ -2186,7 +2185,7 @@
$(WINBIND_NSS_EXTRA_LIBS) $(WINBIND_NSS_PTHREAD) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
@@ -408,7 +408,7 @@
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-@@ -2432,55 +2431,55 @@
+@@ -2455,55 +2454,55 @@
## None here right now
#########################################################
@@ -474,10 +474,10 @@
$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
torture/t_strappend.o -L ./bin -lbigballofmud
-Index: samba-3.3.0pre2/source/m4/aclocal.m4
+Index: samba-3.3.0rc1/source/m4/aclocal.m4
===================================================================
---- samba-3.3.0pre2.orig/source/m4/aclocal.m4
-+++ samba-3.3.0pre2/source/m4/aclocal.m4
+--- samba-3.3.0rc1.orig/source/m4/aclocal.m4
++++ samba-3.3.0rc1/source/m4/aclocal.m4
@@ -68,7 +68,8 @@
LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
LIBUC[_SHARED]=
Modified: trunk/samba/debian/patches/shrink-dead-code.patch
===================================================================
--- trunk/samba/debian/patches/shrink-dead-code.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/shrink-dead-code.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -1,8 +1,8 @@
-Index: samba.deb/source/Makefile.in
+Index: samba-3.3.0rc1/source/Makefile.in
===================================================================
---- samba.deb.orig/source/Makefile.in
-+++ samba.deb/source/Makefile.in
-@@ -1261,37 +1261,47 @@
+--- samba-3.3.0rc1.orig/source/Makefile.in
++++ samba-3.3.0rc1/source/Makefile.in
+@@ -1321,37 +1321,47 @@
bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
@echo Linking $@
@@ -55,7 +55,7 @@
bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
@echo Linking $@
-@@ -1302,220 +1312,295 @@
+@@ -1362,220 +1372,295 @@
bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo Linking $@
@@ -390,7 +390,7 @@
#####################################################################
-@@ -2096,16 +2181,20 @@
+@@ -2168,16 +2253,20 @@
bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
@echo "Linking $@"
@@ -413,7 +413,7 @@
@WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
@echo "Linking $@"
-@@ -2352,9 +2441,11 @@
+@@ -2456,9 +2545,11 @@
bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@@ -426,7 +426,7 @@
bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
-@@ -2372,23 +2463,31 @@
+@@ -2476,23 +2567,31 @@
bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo Linking $@
Modified: trunk/samba/debian/patches/smbclient-pager.patch
===================================================================
--- trunk/samba/debian/patches/smbclient-pager.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/smbclient-pager.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -8,10 +8,10 @@
Note:
-Index: samba-3.2.0rc1/source/include/local.h
+Index: samba-3.3.0rc1/source/include/local.h
===================================================================
---- samba-3.2.0rc1.orig/source/include/local.h
-+++ samba-3.2.0rc1/source/include/local.h
+--- samba-3.3.0rc1.orig/source/include/local.h
++++ samba-3.3.0rc1/source/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: trunk/samba/debian/patches/smbpasswd-syslog.patch
===================================================================
--- trunk/samba/debian/patches/smbpasswd-syslog.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/smbpasswd-syslog.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -4,10 +4,10 @@
Upstream status: submitted as bugzilla bug #4831
-Index: samba.deb/source/pam_smbpass/support.c
+Index: samba-3.3.0rc1/source/pam_smbpass/support.c
===================================================================
---- samba.deb.orig/source/pam_smbpass/support.c
-+++ samba.deb/source/pam_smbpass/support.c
+--- samba-3.3.0rc1.orig/source/pam_smbpass/support.c
++++ samba-3.3.0rc1/source/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.deb/source/pam_smbpass/pam_smb_auth.c
+Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_auth.c
===================================================================
---- samba.deb.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba.deb/source/pam_smbpass/pam_smb_auth.c
+--- samba-3.3.0rc1.orig/source/pam_smbpass/pam_smb_auth.c
++++ samba-3.3.0rc1/source/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.deb/source/pam_smbpass/pam_smb_acct.c
+Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_acct.c
===================================================================
---- samba.deb.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba.deb/source/pam_smbpass/pam_smb_acct.c
+--- samba-3.3.0rc1.orig/source/pam_smbpass/pam_smb_acct.c
++++ samba-3.3.0rc1/source/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.deb/source/pam_smbpass/pam_smb_passwd.c
+Index: samba-3.3.0rc1/source/pam_smbpass/pam_smb_passwd.c
===================================================================
---- samba.deb.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba.deb/source/pam_smbpass/pam_smb_passwd.c
+--- samba-3.3.0rc1.orig/source/pam_smbpass/pam_smb_passwd.c
++++ samba-3.3.0rc1/source/pam_smbpass/pam_smb_passwd.c
@@ -106,10 +106,9 @@
/* Samba initialization. */
@@ -563,10 +563,10 @@
retval = PAM_ABORT;
}
-Index: samba.deb/source/pam_smbpass/support.h
+Index: samba-3.3.0rc1/source/pam_smbpass/support.h
===================================================================
---- samba.deb.orig/source/pam_smbpass/support.h
-+++ samba.deb/source/pam_smbpass/support.h
+--- samba-3.3.0rc1.orig/source/pam_smbpass/support.h
++++ samba-3.3.0rc1/source/pam_smbpass/support.h
@@ -1,8 +1,8 @@
/* syslogging function for errors and other information */
-extern void _log_err(int, const char *, ...);
Modified: trunk/samba/debian/patches/smbtar-bashism.patch
===================================================================
--- trunk/samba/debian/patches/smbtar-bashism.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/smbtar-bashism.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -8,10 +8,10 @@
Note:
-Index: samba/source/script/smbtar
+Index: samba-3.3.0rc1/source/script/smbtar
===================================================================
---- samba/source/script/smbtar (Revision 1955)
-+++ samba/source/script/smbtar (Arbeitskopie)
+--- samba-3.3.0rc1.orig/source/script/smbtar
++++ samba-3.3.0rc1/source/script/smbtar
@@ -151,7 +151,7 @@
if [ -z "$verbose" ]; then
echo "server is $server"
Modified: trunk/samba/debian/patches/swat-de.patch
===================================================================
--- trunk/samba/debian/patches/swat-de.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/swat-de.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -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.0.30/source/po/de.msg
+Index: samba-3.3.0rc1/source/po/de.msg
===================================================================
---- samba-3.0.30.orig/source/po/de.msg
-+++ samba-3.0.30/source/po/de.msg
+--- samba-3.3.0rc1.orig/source/po/de.msg
++++ samba-3.3.0rc1/source/po/de.msg
@@ -1,5 +1,6 @@
# German messages for international release of SWAT.
# Copyright (C) 2001 Andreas Moroder
@@ -16,7 +16,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-@@ -17,577 +18,600 @@
+@@ -16,577 +17,600 @@
#
msgid ""
msgstr ""
Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/undefined-symbols.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -9,16 +9,16 @@
Note:
-Index: samba-3.2.1/source/Makefile.in
+Index: samba-3.3.0rc1/source/Makefile.in
===================================================================
---- samba-3.2.1.orig/source/Makefile.in
-+++ samba-3.2.1/source/Makefile.in
-@@ -1661,7 +1661,7 @@
+--- samba-3.3.0rc1.orig/source/Makefile.in
++++ samba-3.3.0rc1/source/Makefile.in
+@@ -1962,7 +1962,7 @@
- bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+ $(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) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- @SONAMEFLAG@`basename $@`.$(SONAME_VER)
+ @SONAMEFLAG@`basename $@`
Modified: trunk/samba/debian/patches/usershare.patch
===================================================================
--- trunk/samba/debian/patches/usershare.patch 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/patches/usershare.patch 2009-02-14 18:06:17 UTC (rev 2575)
@@ -8,10 +8,10 @@
Status wrt upstream: Debian-specific
-Index: samba-3.2.0rc1/docs/manpages/smb.conf.5
+Index: samba-3.3.0rc1/docs/manpages/smb.conf.5
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/smb.conf.5
-+++ samba-3.2.0rc1/docs/manpages/smb.conf.5
+--- samba-3.3.0rc1.orig/docs/manpages/smb.conf.5
++++ samba-3.3.0rc1/docs/manpages/smb.conf.5
@@ -269,7 +269,7 @@
.PP
usershare path
@@ -54,7 +54,7 @@
.PP
net usershare add sharename path [comment] [acl] [guest_ok=[y|n]]
.RS 4
-@@ -8804,25 +8780,25 @@
+@@ -8839,25 +8815,25 @@
usershare path (G)
.PP
.RS 4
@@ -86,11 +86,11 @@
.RE
usershare prefix allow list (G)
-Index: samba-3.2.0rc1/docs/manpages/net.8
+Index: samba-3.3.0rc1/docs/manpages/net.8
===================================================================
---- samba-3.2.0rc1.orig/docs/manpages/net.8
-+++ samba-3.2.0rc1/docs/manpages/net.8
-@@ -660,9 +660,9 @@
+--- samba-3.3.0rc1.orig/docs/manpages/net.8
++++ samba-3.3.0rc1/docs/manpages/net.8
+@@ -666,9 +666,9 @@
Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\. In this case the secret is used as the password for the user DN used to bind to the ldap server\.
.SS "USERSHARE"
.PP
@@ -102,11 +102,11 @@
.PP
The usershare commands are:
.IP "" 4
-Index: samba-3.2.0rc1/source/param/loadparm.c
+Index: samba-3.3.0rc1/source/param/loadparm.c
===================================================================
---- samba-3.2.0rc1.orig/source/param/loadparm.c
-+++ samba-3.2.0rc1/source/param/loadparm.c
-@@ -4879,7 +4879,7 @@
+--- samba-3.3.0rc1.orig/source/param/loadparm.c
++++ samba-3.3.0rc1/source/param/loadparm.c
+@@ -4913,7 +4913,7 @@
string_set(&Globals.szUsersharePath, s);
SAFE_FREE(s);
string_set(&Globals.szUsershareTemplateShare, "");
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/rules 2009-02-14 18:06:17 UTC (rev 2575)
@@ -48,7 +48,7 @@
--with-pam_smbpass \
--with-libsmbclient \
--with-winbind \
- --with-shared-modules=idmap_rid,idmap_ad \
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash \
--with-automount \
--with-ldap \
--with-ads \
Modified: trunk/samba/debian/samba-doc.docs
===================================================================
--- trunk/samba/debian/samba-doc.docs 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/samba-doc.docs 2009-02-14 18:06:17 UTC (rev 2575)
@@ -1,5 +1,5 @@
README
-docs/THANKS
-docs/history
+#docs/THANKS
+#docs/history
docs/htmldocs/
-docs/registry/
+#docs/registry/
Modified: trunk/samba/debian/winbind.files
===================================================================
--- trunk/samba/debian/winbind.files 2009-02-14 17:55:37 UTC (rev 2574)
+++ trunk/samba/debian/winbind.files 2009-02-14 18:06:17 UTC (rev 2575)
@@ -3,6 +3,8 @@
usr/bin/ntlm_auth
usr/lib/samba/idmap/rid.so
usr/lib/samba/idmap/ad.so
+usr/lib/samba/idmap/adex.so
+usr/lib/samba/idmap/hash.so
usr/share/man/man1/wbinfo.1
usr/share/man/man1/ntlm_auth.1
usr/share/man/man7/pam_winbind.7
@@ -12,6 +14,8 @@
usr/share/man/man8/idmap_nss.8
usr/share/man/man8/idmap_rid.8
usr/share/man/man8/idmap_tdb.8
+usr/share/man/man8/idmap_adex.8
+usr/share/man/man8/idmap_hash.8
lib/security/pam_winbind.so
lib/libnss_winbind.so.2
lib/libnss_wins.so.2
More information about the Pkg-samba-maint
mailing list