[Pkg-samba-maint] r1590 - trunk/samba/debian/patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Wed Nov 21 18:33:26 UTC 2007
Author: vorlon
Date: 2007-11-21 18:33:26 +0000 (Wed, 21 Nov 2007)
New Revision: 1590
Modified:
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/fhs-assignpaths.patch
trunk/samba/debian/patches/fhs-filespaths.patch
trunk/samba/debian/patches/fhs-newpaths.patch
trunk/samba/debian/patches/non-linux-ports.patch
Log:
refresh patches to apply cleanly against current upstream
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2007-11-21 18:33:00 UTC (rev 1589)
+++ trunk/samba/debian/patches/autoconf.patch 2007-11-21 18:33:26 UTC (rev 1590)
@@ -25,10 +25,10 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba-3.0.25c/source/configure
+Index: samba-3.0.27a/source/configure
===================================================================
---- samba-3.0.25c.orig/source/configure 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/source/configure 2007-08-26 13:09:05.419555107 +0200
+--- samba-3.0.27a.orig/source/configure
++++ samba-3.0.27a/source/configure
@@ -671,6 +671,9 @@
logfilebase
privatedir
@@ -39,7 +39,7 @@
rootsbindir
pammodulesdir
SAMBA_CPPFLAGS
-@@ -2139,7 +2142,7 @@
+@@ -2150,7 +2153,7 @@
if test "${with_fhs+set}" = set; then
withval=$with_fhs; case "$withval" in
yes)
@@ -48,7 +48,7 @@
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -2147,6 +2150,14 @@
+@@ -2158,6 +2161,14 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
@@ -63,7 +63,7 @@
;;
esac
fi
-@@ -2450,6 +2461,9 @@
+@@ -2461,6 +2472,9 @@
@@ -73,7 +73,7 @@
## check for --enable-debug first before checking CFLAGS before
## so that we don't mix -O and -g
# Check whether --enable-debug was given.
-@@ -11604,6 +11618,27 @@
+@@ -11615,6 +11629,27 @@
fi
;;
@@ -101,7 +101,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -34332,7 +34367,7 @@
+@@ -34343,7 +34378,7 @@
#
#
case "$host_os" in
@@ -110,7 +110,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
-@@ -39240,11 +39275,14 @@
+@@ -39251,11 +39286,14 @@
# and these are for particular systems
case "$host_os" in
@@ -127,7 +127,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -61780,7 +61818,7 @@
+@@ -61791,7 +61829,7 @@
echo "${ECHO_T}yes" >&6; };
case "$host_os" in
@@ -136,7 +136,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
-@@ -62802,11 +62840,11 @@
+@@ -62813,11 +62851,11 @@
SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
case "$host_os" in
@@ -150,7 +150,7 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-@@ -67324,6 +67362,9 @@
+@@ -67335,6 +67373,9 @@
logfilebase!$logfilebase$ac_delim
privatedir!$privatedir$ac_delim
swatdir!$swatdir$ac_delim
@@ -160,7 +160,7 @@
rootsbindir!$rootsbindir$ac_delim
pammodulesdir!$pammodulesdir$ac_delim
SAMBA_CPPFLAGS!$SAMBA_CPPFLAGS$ac_delim
-@@ -67361,9 +67402,6 @@
+@@ -67372,9 +67413,6 @@
PASSDB_LIBS!$PASSDB_LIBS$ac_delim
IDMAP_LIBS!$IDMAP_LIBS$ac_delim
KRB5_LIBS!$KRB5_LIBS$ac_delim
@@ -170,7 +170,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67405,6 +67443,9 @@
+@@ -67416,6 +67454,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -180,7 +180,7 @@
INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -67488,7 +67529,7 @@
+@@ -67499,7 +67540,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -189,10 +189,10 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.0.25c/source/include/config.h.in
+Index: samba-3.0.27a/source/include/config.h.in
===================================================================
---- samba-3.0.25c.orig/source/include/config.h.in 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/source/include/config.h.in 2007-08-26 13:09:05.919530711 +0200
+--- samba-3.0.27a.orig/source/include/config.h.in
++++ samba-3.0.27a/source/include/config.h.in
@@ -57,6 +57,9 @@
/* Define to turn on dmalloc debugging */
#undef ENABLE_DMALLOC
Modified: trunk/samba/debian/patches/fhs-assignpaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-assignpaths.patch 2007-11-21 18:33:00 UTC (rev 1589)
+++ trunk/samba/debian/patches/fhs-assignpaths.patch 2007-11-21 18:33:26 UTC (rev 1590)
@@ -7,11 +7,11 @@
Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
change their default behaviour
-Index: samba-3.0.26a/source/configure.in
+Index: samba-3.0.27a/source/configure.in
===================================================================
---- samba-3.0.26a.orig/source/configure.in
-+++ samba-3.0.26a/source/configure.in
-@@ -40,7 +40,7 @@
+--- samba-3.0.27a.orig/source/configure.in
++++ samba-3.0.27a/source/configure.in
+@@ -51,7 +51,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
yes)
@@ -20,7 +20,7 @@
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -48,9 +48,9 @@
+@@ -59,9 +59,9 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch 2007-11-21 18:33:00 UTC (rev 1589)
+++ trunk/samba/debian/patches/fhs-filespaths.patch 2007-11-21 18:33:26 UTC (rev 1590)
@@ -45,10 +45,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.0.26a/source/intl/lang_tdb.c
+Index: samba-3.0.27a/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.26a.orig/source/intl/lang_tdb.c
-+++ samba-3.0.26a/source/intl/lang_tdb.c
+--- samba-3.0.27a.orig/source/intl/lang_tdb.c
++++ samba-3.0.27a/source/intl/lang_tdb.c
@@ -131,7 +131,7 @@
if (!lang)
return True;
@@ -58,10 +58,10 @@
if (stat(msg_path, &st) != 0) {
/* the msg file isn't available */
DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
-Index: samba-3.0.26a/source/lib/util_unistr.c
+Index: samba-3.0.27a/source/lib/util_unistr.c
===================================================================
---- samba-3.0.26a.orig/source/lib/util_unistr.c
-+++ samba-3.0.26a/source/lib/util_unistr.c
+--- samba-3.0.27a.orig/source/lib/util_unistr.c
++++ samba-3.0.27a/source/lib/util_unistr.c
@@ -88,11 +88,11 @@
}
initialised = 1;
@@ -85,10 +85,10 @@
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-Index: samba-3.0.26a/source/libsmb/samlogon_cache.c
+Index: samba-3.0.27a/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.26a.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.0.26a/source/libsmb/samlogon_cache.c
+--- samba-3.0.27a.orig/source/libsmb/samlogon_cache.c
++++ samba-3.0.27a/source/libsmb/samlogon_cache.c
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -107,10 +107,10 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
-Index: samba-3.0.26a/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.27a/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.26a.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.0.26a/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0.27a.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.0.27a/source/nmbd/nmbd_serverlistdb.c
@@ -325,7 +325,7 @@
updatecount++;
@@ -120,10 +120,10 @@
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.26a/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.27a/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.26a.orig/source/nmbd/nmbd_winsserver.c
-+++ samba-3.0.26a/source/nmbd/nmbd_winsserver.c
+--- samba-3.0.27a.orig/source/nmbd/nmbd_winsserver.c
++++ samba-3.0.27a/source/nmbd/nmbd_winsserver.c
@@ -585,7 +585,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -142,10 +142,10 @@
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-Index: samba-3.0.26a/source/passdb/login_cache.c
+Index: samba-3.0.27a/source/passdb/login_cache.c
===================================================================
---- samba-3.0.26a.orig/source/passdb/login_cache.c
-+++ samba-3.0.26a/source/passdb/login_cache.c
+--- samba-3.0.27a.orig/source/passdb/login_cache.c
++++ samba-3.0.27a/source/passdb/login_cache.c
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -155,10 +155,10 @@
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.0.26a/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.27a/source/nsswitch/winbindd_cache.c
===================================================================
---- samba-3.0.26a.orig/source/nsswitch/winbindd_cache.c
-+++ samba-3.0.26a/source/nsswitch/winbindd_cache.c
+--- samba-3.0.27a.orig/source/nsswitch/winbindd_cache.c
++++ samba-3.0.27a/source/nsswitch/winbindd_cache.c
@@ -2181,7 +2181,7 @@
return True;
@@ -189,10 +189,10 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.26a/source/param/loadparm.c
+Index: samba-3.0.27a/source/param/loadparm.c
===================================================================
---- samba-3.0.26a.orig/source/param/loadparm.c
-+++ samba-3.0.26a/source/param/loadparm.c
+--- samba-3.0.27a.orig/source/param/loadparm.c
++++ samba-3.0.27a/source/param/loadparm.c
@@ -108,6 +108,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -226,10 +226,10 @@
pstrcat(s, "/usershares");
string_set(&Globals.szUsersharePath, s);
string_set(&Globals.szUsershareTemplateShare, "");
-Index: samba-3.0.26a/source/passdb/secrets.c
+Index: samba-3.0.27a/source/passdb/secrets.c
===================================================================
---- samba-3.0.26a.orig/source/passdb/secrets.c
-+++ samba-3.0.26a/source/passdb/secrets.c
+--- samba-3.0.27a.orig/source/passdb/secrets.c
++++ samba-3.0.27a/source/passdb/secrets.c
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -240,10 +240,10 @@
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.26a/source/printing/nt_printing.c
+Index: samba-3.0.27a/source/printing/nt_printing.c
===================================================================
---- samba-3.0.26a.orig/source/printing/nt_printing.c
-+++ samba-3.0.26a/source/printing/nt_printing.c
+--- samba-3.0.27a.orig/source/printing/nt_printing.c
++++ samba-3.0.27a/source/printing/nt_printing.c
@@ -551,28 +551,28 @@
if (tdb_drivers)
@@ -288,10 +288,10 @@
pstrcat(printdb_path, sharename);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.26a/source/printing/printing.c
+Index: samba-3.0.27a/source/printing/printing.c
===================================================================
---- samba-3.0.26a.orig/source/printing/printing.c
-+++ samba-3.0.26a/source/printing/printing.c
+--- samba-3.0.27a.orig/source/printing/printing.c
++++ samba-3.0.27a/source/printing/printing.c
@@ -185,8 +185,8 @@
int services = lp_numservices();
int snum;
@@ -303,10 +303,10 @@
mkdir(printing_path,0755);
/* handle a Samba upgrade */
-Index: samba-3.0.26a/source/printing/printing_db.c
+Index: samba-3.0.27a/source/printing/printing_db.c
===================================================================
---- samba-3.0.26a.orig/source/printing/printing_db.c
-+++ samba-3.0.26a/source/printing/printing_db.c
+--- samba-3.0.27a.orig/source/printing/printing_db.c
++++ samba-3.0.27a/source/printing/printing_db.c
@@ -91,7 +91,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -316,11 +316,11 @@
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.26a/source/smbd/lanman.c
+Index: samba-3.0.27a/source/smbd/lanman.c
===================================================================
---- samba-3.0.26a.orig/source/smbd/lanman.c
-+++ samba-3.0.26a/source/smbd/lanman.c
-@@ -1088,9 +1088,9 @@
+--- samba-3.0.27a.orig/source/smbd/lanman.c
++++ samba-3.0.27a/source/smbd/lanman.c
+@@ -1094,9 +1094,9 @@
BOOL local_list_only;
int i;
@@ -332,10 +332,10 @@
return 0;
}
-Index: samba-3.0.26a/source/registry/reg_db.c
+Index: samba-3.0.27a/source/registry/reg_db.c
===================================================================
---- samba-3.0.26a.orig/source/registry/reg_db.c
-+++ samba-3.0.26a/source/registry/reg_db.c
+--- samba-3.0.27a.orig/source/registry/reg_db.c
++++ samba-3.0.27a/source/registry/reg_db.c
@@ -234,12 +234,12 @@
if ( tdb_reg )
return True;
@@ -366,10 +366,10 @@
}
unbecome_root();
-Index: samba-3.0.26a/source/lib/account_pol.c
+Index: samba-3.0.27a/source/lib/account_pol.c
===================================================================
---- samba-3.0.26a.orig/source/lib/account_pol.c
-+++ samba-3.0.26a/source/lib/account_pol.c
+--- samba-3.0.27a.orig/source/lib/account_pol.c
++++ samba-3.0.27a/source/lib/account_pol.c
@@ -213,9 +213,9 @@
return True;
}
@@ -382,10 +382,10 @@
if (!tdb) {
DEBUG(0,("Failed to open account policy database\n"));
return False;
-Index: samba-3.0.26a/source/registry/reg_perfcount.c
+Index: samba-3.0.27a/source/registry/reg_perfcount.c
===================================================================
---- samba-3.0.26a.orig/source/registry/reg_perfcount.c
-+++ samba-3.0.26a/source/registry/reg_perfcount.c
+--- samba-3.0.27a.orig/source/registry/reg_perfcount.c
++++ samba-3.0.27a/source/registry/reg_perfcount.c
@@ -46,7 +46,7 @@
fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -404,10 +404,10 @@
/* no registry keys; just create the perfmon directory */
-Index: samba-3.0.26a/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.27a/source/rpc_server/srv_eventlog_lib.c
===================================================================
---- samba-3.0.26a.orig/source/rpc_server/srv_eventlog_lib.c
-+++ samba-3.0.26a/source/rpc_server/srv_eventlog_lib.c
+--- samba-3.0.27a.orig/source/rpc_server/srv_eventlog_lib.c
++++ samba-3.0.27a/source/rpc_server/srv_eventlog_lib.c
@@ -67,7 +67,7 @@
{
fstring path;
@@ -426,10 +426,10 @@
if ( !directory_exist( eventlogdir, NULL ) )
mkdir( eventlogdir, 0755 );
-Index: samba-3.0.26a/source/passdb/pdb_tdb.c
+Index: samba-3.0.27a/source/passdb/pdb_tdb.c
===================================================================
---- samba-3.0.26a.orig/source/passdb/pdb_tdb.c
-+++ samba-3.0.26a/source/passdb/pdb_tdb.c
+--- samba-3.0.27a.orig/source/passdb/pdb_tdb.c
++++ samba-3.0.27a/source/passdb/pdb_tdb.c
@@ -1559,7 +1559,7 @@
uint32 rid;
BOOL ret = False;
@@ -448,10 +448,10 @@
pfile = tdbfile;
}
pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.26a/source/groupdb/mapping_tdb.c
+Index: samba-3.0.27a/source/groupdb/mapping_tdb.c
===================================================================
---- samba-3.0.26a.orig/source/groupdb/mapping_tdb.c
-+++ samba-3.0.26a/source/groupdb/mapping_tdb.c
+--- samba-3.0.27a.orig/source/groupdb/mapping_tdb.c
++++ samba-3.0.27a/source/groupdb/mapping_tdb.c
@@ -39,7 +39,7 @@
if (tdb)
return True;
@@ -461,10 +461,10 @@
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-Index: samba-3.0.26a/source/nsswitch/idmap_tdb.c
+Index: samba-3.0.27a/source/nsswitch/idmap_tdb.c
===================================================================
---- samba-3.0.26a.orig/source/nsswitch/idmap_tdb.c
-+++ samba-3.0.26a/source/nsswitch/idmap_tdb.c
+--- samba-3.0.27a.orig/source/nsswitch/idmap_tdb.c
++++ samba-3.0.27a/source/nsswitch/idmap_tdb.c
@@ -247,7 +247,7 @@
}
@@ -474,10 +474,10 @@
if (!tdbfile) {
DEBUG(0, ("Out of memory!\n"));
ret = NT_STATUS_NO_MEMORY;
-Index: samba-3.0.26a/source/utils/smbcontrol.c
+Index: samba-3.0.27a/source/utils/smbcontrol.c
===================================================================
---- samba-3.0.26a.orig/source/utils/smbcontrol.c
-+++ samba-3.0.26a/source/utils/smbcontrol.c
+--- samba-3.0.27a.orig/source/utils/smbcontrol.c
++++ samba-3.0.27a/source/utils/smbcontrol.c
@@ -832,10 +832,10 @@
/* Remove the entry in the winbindd_cache tdb to tell a later
starting winbindd that we're online. */
@@ -507,10 +507,10 @@
return False;
}
-Index: samba-3.0.26a/source/lib/sharesec.c
+Index: samba-3.0.27a/source/lib/sharesec.c
===================================================================
---- samba-3.0.26a.orig/source/lib/sharesec.c
-+++ samba-3.0.26a/source/lib/sharesec.c
+--- samba-3.0.27a.orig/source/lib/sharesec.c
++++ samba-3.0.27a/source/lib/sharesec.c
@@ -47,10 +47,10 @@
return True;
}
@@ -524,10 +524,10 @@
return False;
}
-Index: samba-3.0.26a/source/libgpo/gpo_fetch.c
+Index: samba-3.0.27a/source/libgpo/gpo_fetch.c
===================================================================
---- samba-3.0.26a.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.0.26a/source/libgpo/gpo_fetch.c
+--- samba-3.0.27a.orig/source/libgpo/gpo_fetch.c
++++ samba-3.0.27a/source/libgpo/gpo_fetch.c
@@ -60,7 +60,7 @@
return NT_STATUS_NO_MEMORY;
}
@@ -546,10 +546,10 @@
char *current_dir;
fstring tok;
-Index: samba-3.0.26a/source/nsswitch/idmap_cache.c
+Index: samba-3.0.27a/source/nsswitch/idmap_cache.c
===================================================================
---- samba-3.0.26a.orig/source/nsswitch/idmap_cache.c
-+++ samba-3.0.26a/source/nsswitch/idmap_cache.c
+--- samba-3.0.27a.orig/source/nsswitch/idmap_cache.c
++++ samba-3.0.27a/source/nsswitch/idmap_cache.c
@@ -55,7 +55,7 @@
return NULL;
}
Modified: trunk/samba/debian/patches/fhs-newpaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-newpaths.patch 2007-11-21 18:33:00 UTC (rev 1589)
+++ trunk/samba/debian/patches/fhs-newpaths.patch 2007-11-21 18:33:26 UTC (rev 1590)
@@ -10,10 +10,10 @@
Note: See fhs-filespaths for rationale about the meaning of the new
path variables
-Index: samba-3.0.25c/source/Makefile.in
+Index: samba-3.0.27a/source/Makefile.in
===================================================================
---- samba-3.0.25c.orig/source/Makefile.in 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/Makefile.in 2007-08-26 13:08:59.419847863 +0200
+--- samba-3.0.27a.orig/source/Makefile.in
++++ samba-3.0.27a/source/Makefile.in
@@ -106,6 +106,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -50,11 +50,11 @@
installswat: installdirs installmsg
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.25c/source/configure.in
+Index: samba-3.0.27a/source/configure.in
===================================================================
---- samba-3.0.25c.orig/source/configure.in 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/configure.in 2007-08-26 13:08:59.419847863 +0200
-@@ -48,6 +48,10 @@
+--- samba-3.0.27a.orig/source/configure.in
++++ samba-3.0.27a/source/configure.in
+@@ -59,6 +59,10 @@
libdir="\${prefix}/lib/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
@@ -65,7 +65,7 @@
;;
esac])
-@@ -252,6 +256,9 @@
+@@ -263,6 +267,9 @@
AC_SUBST(swatdir)
AC_SUBST(bindir)
AC_SUBST(sbindir)
@@ -75,10 +75,10 @@
AC_SUBST(rootsbindir)
AC_SUBST(pammodulesdir)
-Index: samba-3.0.25c/source/dynconfig.c
+Index: samba-3.0.27a/source/dynconfig.c
===================================================================
---- samba-3.0.25c.orig/source/dynconfig.c 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/dynconfig.c 2007-08-26 13:08:59.419847863 +0200
+--- samba-3.0.27a.orig/source/dynconfig.c
++++ samba-3.0.27a/source/dynconfig.c
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -121,10 +121,10 @@
+ return lp_lockdir();
+#endif
+}
-Index: samba-3.0.25c/source/include/dynconfig.h
+Index: samba-3.0.27a/source/include/dynconfig.h
===================================================================
---- samba-3.0.25c.orig/source/include/dynconfig.h 2007-08-26 13:07:02.925532676 +0200
-+++ samba-3.0.25c/source/include/dynconfig.h 2007-08-26 13:08:59.419847863 +0200
+--- samba-3.0.27a.orig/source/include/dynconfig.h
++++ samba-3.0.27a/source/include/dynconfig.h
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -138,11 +138,11 @@
+
+char *dyn_STATEDIR(void);
+char *dyn_CACHEDIR(void);
-Index: samba-3.0.26a/source/lib/util.c
+Index: samba-3.0.27a/source/lib/util.c
===================================================================
---- samba-3.0.26a.orig/source/lib/util.c
-+++ samba-3.0.26a/source/lib/util.c
-@@ -2632,6 +2632,61 @@
+--- samba-3.0.27a.orig/source/lib/util.c
++++ samba-3.0.27a/source/lib/util.c
+@@ -2633,6 +2633,61 @@
}
/**
Modified: trunk/samba/debian/patches/non-linux-ports.patch
===================================================================
--- trunk/samba/debian/patches/non-linux-ports.patch 2007-11-21 18:33:00 UTC (rev 1589)
+++ trunk/samba/debian/patches/non-linux-ports.patch 2007-11-21 18:33:26 UTC (rev 1590)
@@ -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.0.25c/source/configure.in
+Index: samba-3.0.27a/source/configure.in
===================================================================
---- samba-3.0.25c.orig/source/configure.in 2007-08-26 13:08:59.419847863 +0200
-+++ samba-3.0.25c/source/configure.in 2007-08-26 13:09:01.919725881 +0200
-@@ -758,6 +758,15 @@
+--- samba-3.0.27a.orig/source/configure.in
++++ samba-3.0.27a/source/configure.in
+@@ -769,6 +769,15 @@
fi
;;
@@ -27,7 +27,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -1380,7 +1389,7 @@
+@@ -1391,7 +1400,7 @@
#
#
case "$host_os" in
@@ -36,7 +36,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
AC_TRY_RUN([
#include <unistd.h>
-@@ -1689,7 +1698,10 @@
+@@ -1700,7 +1709,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"
-@@ -5417,7 +5429,7 @@
+@@ -5428,7 +5440,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>],
[\
-@@ -5722,11 +5734,11 @@
+@@ -5733,11 +5745,11 @@
SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
case "$host_os" in
More information about the Pkg-samba-maint
mailing list