diff options
author | bubulle <bubulle@alioth.debian.org> | 2008-03-09 09:15:23 +0000 |
---|---|---|
committer | bubulle <bubulle@alioth.debian.org> | 2008-03-09 09:15:23 +0000 |
commit | aa7dd17a46405a247cb200571a01895d6900221b (patch) | |
tree | f0dbc1e2a9816125f4ac23ed8d6a97aa3a69de2a | |
parent | 1ac45258b830893c160cf57d09e9c7eade693761 (diff) | |
download | samba-aa7dd17a46405a247cb200571a01895d6900221b.tar.gz |
Refresh for 3.0.28a following the usual method
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1749 fc4039ab-9d04-0410-8cac-899223bdd6b0
-rw-r--r-- | patches/autoconf.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/patches/autoconf.patch b/patches/autoconf.patch index 795bde2faf..d981837225 100644 --- a/patches/autoconf.patch +++ b/patches/autoconf.patch @@ -25,10 +25,10 @@ Note: This patch will normally have to be updated by hand after every quilt refresh find . -name '*.rej' | xargs rm -Index: samba-3.0.27a/source/configure +Index: samba-3.0.28a/source/configure =================================================================== ---- samba-3.0.27a.orig/source/configure -+++ samba-3.0.27a/source/configure +--- samba-3.0.28a.orig/source/configure ++++ samba-3.0.28a/source/configure @@ -671,6 +671,9 @@ logfilebase privatedir @@ -101,7 +101,7 @@ Index: samba-3.0.27a/source/configure # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support. # *linux*) -@@ -34343,7 +34378,7 @@ +@@ -34668,7 +34703,7 @@ # # case "$host_os" in @@ -110,7 +110,7 @@ Index: samba-3.0.27a/source/configure # 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 -@@ -39251,11 +39286,14 @@ +@@ -39576,11 +39611,14 @@ # and these are for particular systems case "$host_os" in @@ -127,7 +127,7 @@ Index: samba-3.0.27a/source/configure BLDSHARED="true" if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined" -@@ -61791,7 +61829,7 @@ +@@ -62311,7 +62349,7 @@ echo "${ECHO_T}yes" >&6; }; case "$host_os" in @@ -136,7 +136,7 @@ Index: samba-3.0.27a/source/configure { 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 -@@ -62813,11 +62851,11 @@ +@@ -63333,11 +63371,11 @@ SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT" case "$host_os" in @@ -150,7 +150,7 @@ Index: samba-3.0.27a/source/configure # FreeBSD winbind client is implemented as a wrapper around # the Linux version. NSSSONAMEVERSIONSUFFIX=".1" -@@ -67335,6 +67373,9 @@ +@@ -67892,6 +67930,9 @@ logfilebase!$logfilebase$ac_delim privatedir!$privatedir$ac_delim swatdir!$swatdir$ac_delim @@ -160,7 +160,7 @@ Index: samba-3.0.27a/source/configure rootsbindir!$rootsbindir$ac_delim pammodulesdir!$pammodulesdir$ac_delim SAMBA_CPPFLAGS!$SAMBA_CPPFLAGS$ac_delim -@@ -67372,9 +67413,6 @@ +@@ -67929,9 +67970,6 @@ PASSDB_LIBS!$PASSDB_LIBS$ac_delim IDMAP_LIBS!$IDMAP_LIBS$ac_delim KRB5_LIBS!$KRB5_LIBS$ac_delim @@ -170,7 +170,7 @@ Index: samba-3.0.27a/source/configure _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -67416,6 +67454,9 @@ +@@ -67973,6 +68011,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -180,7 +180,7 @@ Index: samba-3.0.27a/source/configure INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim NSS_MODULES!$NSS_MODULES$ac_delim -@@ -67499,7 +67540,7 @@ +@@ -68056,7 +68097,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF @@ -189,10 +189,10 @@ Index: samba-3.0.27a/source/configure break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -Index: samba-3.0.27a/source/include/config.h.in +Index: samba-3.0.28a/source/include/config.h.in =================================================================== ---- samba-3.0.27a.orig/source/include/config.h.in -+++ samba-3.0.27a/source/include/config.h.in +--- samba-3.0.28a.orig/source/include/config.h.in ++++ samba-3.0.28a/source/include/config.h.in @@ -57,6 +57,9 @@ /* Define to turn on dmalloc debugging */ #undef ENABLE_DMALLOC |