[Pkg-samba-maint] r1987 - branches/samba/experimental/debian/patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Fri Jul 4 19:58:56 UTC 2008
Author: vorlon
Date: 2008-07-04 19:58:56 +0000 (Fri, 04 Jul 2008)
New Revision: 1987
Modified:
branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
branches/samba/experimental/debian/patches/autoconf.patch
branches/samba/experimental/debian/patches/documentation.patch
branches/samba/experimental/debian/patches/fhs-assignpaths.patch
branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
branches/samba/experimental/debian/patches/non-linux-ports.patch
branches/samba/experimental/debian/patches/undefined-symbols.patch
branches/samba/experimental/debian/patches/usershare.patch
Log:
refresh all patches for 3.2.0
Modified: branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -12,7 +12,7 @@
+++ samba-3.2.0rc1/examples/LDAP/README
@@ -69,6 +69,9 @@
The smbldap-tools package can be downloaded individually from
- http://samba.idealx.org/dist/
+ https://gna.org/projects/smbldap-tools/
+On Debian systems, the smbldap-tools exists as a separate package
+and is not included in LDAP examples.
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -29,7 +29,7 @@
===================================================================
--- samba-3.2.0rc1.orig/source/configure
+++ samba-3.2.0rc1/source/configure
-@@ -2225,7 +2225,7 @@
+@@ -2220,7 +2220,7 @@
if test "${with_fhs+set}" = set; then
withval=$with_fhs; case "$withval" in
yes)
@@ -38,7 +38,7 @@
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -2233,9 +2233,9 @@
+@@ -2228,9 +2228,9 @@
test "${libdir}" || libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
@@ -50,7 +50,7 @@
cat >>confdefs.h <<\_ACEOF
#define FHS_COMPATIBLE 1
-@@ -12885,6 +12885,27 @@
+@@ -13048,6 +13048,27 @@
fi
;;
@@ -78,7 +78,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -40329,7 +40350,7 @@
+@@ -40492,7 +40513,7 @@
#
#
case "$host_os" in
@@ -87,7 +87,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
-@@ -45351,11 +45372,14 @@
+@@ -45494,11 +45515,14 @@
# and these are for particular systems
case "$host_os" in
@@ -104,7 +104,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -68611,7 +68635,7 @@
+@@ -68756,7 +68780,7 @@
echo "${ECHO_T}yes" >&6; };
case "$host_os" in
@@ -113,7 +113,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
-@@ -69692,11 +69716,11 @@
+@@ -69964,11 +69988,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/documentation.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -266,7 +266,7 @@
===================================================================
--- samba-3.2.0rc1.orig/docs/manpages/winbindd.8
+++ samba-3.2.0rc1/docs/manpages/winbindd.8
-@@ -518,16 +518,16 @@
+@@ -521,16 +521,16 @@
file are owned by root\.
.RE
.PP
@@ -287,7 +287,7 @@
file are owned by root\.
.RE
.PP
-@@ -536,15 +536,12 @@
+@@ -539,15 +539,12 @@
Implementation of name service switch library\.
.RE
.PP
Modified: branches/samba/experimental/debian/patches/fhs-assignpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-assignpaths.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/fhs-assignpaths.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -21,7 +21,7 @@
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -3667,6 +3670,26 @@
+@@ -3677,6 +3680,26 @@
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
@@ -48,7 +48,7 @@
{
.label = "lock directory",
.type = P_STRING,
-@@ -3685,6 +3708,7 @@
+@@ -3695,6 +3718,7 @@
.enum_list = NULL,
.flags = FLAG_HIDE,
},
Modified: branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -230,7 +230,7 @@
===================================================================
--- samba-3.2.0rc1.orig/source/winbindd/winbindd_cache.c
+++ samba-3.2.0rc1/source/winbindd/winbindd_cache.c
-@@ -2304,7 +2304,7 @@
+@@ -2310,7 +2310,7 @@
return true;
/* when working offline we must not clear the cache on restart */
@@ -239,7 +239,7 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-@@ -2347,9 +2347,9 @@
+@@ -2353,9 +2353,9 @@
tdb_close(wcache->tdb);
wcache->tdb = NULL;
@@ -251,7 +251,7 @@
strerror(errno) ));
return false;
}
-@@ -2631,7 +2631,7 @@
+@@ -2637,7 +2637,7 @@
return;
/* when working offline we must not clear the cache on restart */
@@ -260,7 +260,7 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-@@ -3416,7 +3416,7 @@
+@@ -3422,7 +3422,7 @@
int winbindd_validate_cache(void)
{
int ret = -1;
@@ -269,7 +269,7 @@
TDB_CONTEXT *tdb = NULL;
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
-@@ -3458,7 +3458,7 @@
+@@ -3464,7 +3464,7 @@
int winbindd_validate_cache_nobackup(void)
{
int ret = -1;
Modified: branches/samba/experimental/debian/patches/non-linux-ports.patch
===================================================================
--- branches/samba/experimental/debian/patches/non-linux-ports.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/non-linux-ports.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -36,7 +36,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
AC_TRY_RUN([
#include <unistd.h>
-@@ -1543,7 +1552,10 @@
+@@ -1526,7 +1535,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"
-@@ -5307,7 +5319,7 @@
+@@ -5292,7 +5304,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>],
[\
-@@ -5613,11 +5625,11 @@
+@@ -5618,11 +5630,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
Modified: branches/samba/experimental/debian/patches/undefined-symbols.patch
===================================================================
--- branches/samba/experimental/debian/patches/undefined-symbols.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/undefined-symbols.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -13,7 +13,7 @@
===================================================================
--- samba-3.2.0rc1.orig/source/Makefile.in
+++ samba-3.2.0rc1/source/Makefile.in
-@@ -1653,7 +1653,7 @@
+@@ -1645,7 +1645,7 @@
bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking shared library $@
Modified: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch 2008-07-04 19:38:52 UTC (rev 1986)
+++ branches/samba/experimental/debian/patches/usershare.patch 2008-07-04 19:58:56 UTC (rev 1987)
@@ -54,7 +54,7 @@
.PP
net usershare add sharename path [comment] [acl] [guest_ok=[y|n]]
.RS 4
-@@ -8737,25 +8713,25 @@
+@@ -8804,25 +8780,25 @@
usershare path (G)
.PP
.RS 4
@@ -106,7 +106,7 @@
===================================================================
--- samba-3.2.0rc1.orig/source/param/loadparm.c
+++ samba-3.2.0rc1/source/param/loadparm.c
-@@ -4868,7 +4868,7 @@
+@@ -4879,7 +4879,7 @@
string_set(&Globals.szUsersharePath, s);
SAFE_FREE(s);
string_set(&Globals.szUsershareTemplateShare, "");
More information about the Pkg-samba-maint
mailing list