SOURCES: samba-lib64.patch - updated

shadzik shadzik at pld-linux.org
Thu Jun 14 18:56:38 CEST 2007 

Author: shadzik                      Date: Thu Jun 14 16:56:38 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   samba-lib64.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/samba-lib64.patch
diff -u SOURCES/samba-lib64.patch:1.9 SOURCES/samba-lib64.patch:1.10
--- SOURCES/samba-lib64.patch:1.9	Wed Aug  9 21:20:16 2006
+++ SOURCES/samba-lib64.patch	Thu Jun 14 18:56:33 2007
@@ -1,31 +1,46 @@
-diff -urN samba-3.0.23b.org/source/aclocal.m4 samba-3.0.23b/source/aclocal.m4
---- samba-3.0.23b.org/source/aclocal.m4	2006-06-23 15:16:53.000000000 +0200
-+++ samba-3.0.23b/source/aclocal.m4	2006-08-09 21:19:38.914290750 +0200
-@@ -564,7 +564,7 @@
-   fi
- 
-   AC_REQUIRE([AC_CANONICAL_TARGET])
--  AC_PATH_PROG(PGSQL_CONFIG, pg_config, no, [$PATH:/usr/lib/postgresql/bin])
-+  AC_PATH_PROG(PGSQL_CONFIG, pg_config, no, [$PATH:/usr/lib64/postgresql/bin])
-   AC_MSG_CHECKING(for PGSQL)
-   no_pgsql=""
-   if test "$PGSQL_CONFIG" = "no" ; then
-@@ -594,12 +594,12 @@
+--- samba-3.0.23b.org/source/torture/nsstest.c	2006-04-20 04:29:44.000000000 +0200
++++ samba-3.0.23b/source/torture/nsstest.c	2006-08-09 21:19:38.922291250 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include "includes.h"
+ 
+-static const char *so_path = "/lib/libnss_winbind.so";
++static const char *so_path = "/lib64/libnss_winbind.so";
+ static const char *nss_name = "winbind";
+ static int nss_errno;
+ static NSS_STATUS last_error;
+--- samba-3.0.25a/source/aclocal.m4.orig	2007-03-01 05:55:17.000000000 +0100
++++ samba-3.0.25a/source/aclocal.m4	2007-06-14 18:45:50.703496205 +0200
+@@ -268,20 +268,20 @@
    $1=[$]ac_new_flags
  ])
-     
--dnl Removes -L/usr/lib/? from given variable
-+dnl Removes -L/usr/lib64/? from given variable
+ 
+-dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
+-dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
++dnl Removes '-L/usr/lib64[/]', '-Wl,-rpath,/usr/lib64[/]'
++dnl and '-Wl,-rpath -Wl,/usr/lib64[/]' from given variable
  AC_DEFUN(LIB_REMOVE_USR_LIB,[
    ac_new_flags=""
+   l=""
    for i in [$]$1; do
-     case [$]i in
--    -L/usr/lib|-L/usr/lib/) ;;
-+    -L/usr/lib64|-L/usr/lib64/) ;;
-     *) ac_new_flags="[$]ac_new_flags [$]i" ;;
-     esac
-   done
-@@ -719,9 +719,9 @@
+     case [$]l[$]i in
+-    -L/usr/lib) ;;
+-    -L/usr/lib/) ;;
+-    -Wl,-rpath,/usr/lib) ;;
+-    -Wl,-rpath,/usr/lib/) ;;
++    -L/usr/lib64) ;;
++    -L/usr/lib64/) ;;
++    -Wl,-rpath,/usr/lib64) ;;
++    -Wl,-rpath,/usr/lib64/) ;;
+     -Wl,-rpath) l=[$]i;;
+-    -Wl,-rpath-Wl,/usr/lib) l="";;
+-    -Wl,-rpath-Wl,/usr/lib/) l="";;
++    -Wl,-rpath-Wl,/usr/lib64) l="";;
++    -Wl,-rpath-Wl,/usr/lib64/) l="";;
+     *)
+     	s=" "
+         if test x"[$]ac_new_flags" = x""; then
+@@ -429,9 +429,9 @@
  ])
  
  dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
@@ -37,10 +52,9 @@
      $1="$$1 -L$2"
  fi
  ])
-diff -urN samba-3.0.23b.org/source/configure.in samba-3.0.23b/source/configure.in
---- samba-3.0.23b.org/source/configure.in	2006-07-21 18:22:57.000000000 +0200
-+++ samba-3.0.23b/source/configure.in	2006-08-09 21:20:13.784470000 +0200
-@@ -28,7 +28,7 @@
+--- samba-3.0.25a/source/configure.in.orig	2007-05-23 17:29:20.000000000 +0200
++++ samba-3.0.25a/source/configure.in	2007-06-14 18:49:28.307646759 +0200
+@@ -31,7 +31,7 @@
  test "${mandir}" || mandir="\${prefix}/man"
  logfilebase="\${VARDIR}"
  privatedir="\${prefix}/private"
@@ -49,25 +63,33 @@
  pammodulesdir="\${LIBDIR}/security"
  configdir="\${LIBDIR}"
  swatdir="\${prefix}/swat"
-@@ -42,7 +42,7 @@
+@@ -40,12 +40,12 @@
+ [  --with-fhs              Use FHS-compliant paths (default=no)],
+ [ case "$withval" in
+   yes)
+-    lockdir="\${VARDIR}/lib/samba"
++    lockdir="\${VARDIR}/lib64/samba"
+     piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
      privatedir="\${CONFIGDIR}/private"
 -    libdir="\${prefix}/lib/samba"
 +    libdir="\${prefix}/lib64/samba"
-     configdir="${sysconfdir}/samba"
+     configdir="\${sysconfdir}/samba"
      swatdir="\${DATADIR}/samba/swat"
      ;;
-@@ -811,7 +811,7 @@
- # Note: iconv does that explicitly below, but other packages
- # don't.
- 	CPPFLAGS="$CPPFLAGS -I/sw/include"
--	LDFLAGS="$LDFLAGS -L/sw/lib"
-+	LDFLAGS="$LDFLAGS -L/sw/lib64"
- 
- # If we have dlsym_prepend_underscore (from Fink's dlcompat),
- # use that instead of plain dlsym.
-@@ -1183,7 +1183,7 @@
+@@ -231,8 +231,8 @@
+ ])
+ 
+ SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
+-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
+-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib64/replace"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib64/talloc"
+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/tdb/include"
+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
+@@ -1132,7 +1132,7 @@
      _cppflags=${CPPFLAGS}
  
      # Add additional search path
@@ -76,7 +98,7 @@
      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  
      AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
-@@ -1194,7 +1194,7 @@
+@@ -1143,7 +1143,7 @@
         AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
        done
        AC_CHECK_LIB(readline, rl_callback_handler_install,
@@ -85,7 +107,7 @@
         TERMCPPFLAGS="-I$with_readline/include"
         CPPFLAGS="-I$with_readline/include $CPPFLAGS"
         TERMLIBS="-lreadline $TERMLIBS"
-@@ -2280,7 +2280,7 @@
+@@ -2337,7 +2337,7 @@
  ICONV_LOCATION=standard
  LOOK_DIRS="/usr /usr/local /sw /opt"
  AC_ARG_WITH(libiconv,
@@ -94,7 +116,7 @@
  [
    if test "$withval" = "no" ; then
      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
-@@ -3307,7 +3307,7 @@
+@@ -3370,7 +3370,7 @@
          AC_MSG_RESULT($withval)
          KRB5_CFLAGS="-I$withval/include"
          KRB5_CPPFLAGS="-I$withval/include"
@@ -103,7 +125,7 @@
          FOUND_KRB5=yes
  	if test -x "$withval/bin/krb5-config"; then
  		KRB5CONFIG=$withval/bin/krb5-config
-@@ -3344,10 +3344,10 @@
+@@ -3407,10 +3407,10 @@
      # see if this box has the SuSE location for the heimdal krb implementation
      AC_MSG_CHECKING(for /usr/include/heimdal)
      if test -d /usr/include/heimdal; then
@@ -116,24 +138,12 @@
            AC_MSG_RESULT(yes)
        else
            KRB5_CFLAGS="-I/usr/include/heimdal"
-@@ -5636,7 +5636,7 @@
- SMBD_LIBS="$samba_fam_libs $samba_dmapi_libs"
- AC_SUBST(SMBD_LIBS)
+@@ -6175,7 +6175,7 @@
+ 
+ fi
  
 -dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 +dnl Remove -L/usr/lib64/? from LDFLAGS and LIBS
  LIB_REMOVE_USR_LIB(LDFLAGS)
  LIB_REMOVE_USR_LIB(LIBS)
- 
-diff -urN samba-3.0.23b.org/source/torture/nsstest.c samba-3.0.23b/source/torture/nsstest.c
---- samba-3.0.23b.org/source/torture/nsstest.c	2006-04-20 04:29:44.000000000 +0200
-+++ samba-3.0.23b/source/torture/nsstest.c	2006-08-09 21:19:38.922291250 +0200
-@@ -21,7 +21,7 @@
- 
- #include "includes.h"
- 
--static const char *so_path = "/lib/libnss_winbind.so";
-+static const char *so_path = "/lib64/libnss_winbind.so";
- static const char *nss_name = "winbind";
- static int nss_errno;
- static NSS_STATUS last_error;
+ LIB_REMOVE_USR_LIB(KRB5_LIBS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/samba-lib64.patch?r1=1.9&r2=1.10&f=u

More information about the pld-cvs-commit mailing list