X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=samba-lib64.patch;h=2f839193fd78f127988a4cb1256499e6d97e098d;hb=d1d9e9b89c5279709e3297bf8d070227702f4725;hp=de39e5e97b3cef2af9282faed580d407876877c3;hpb=12585bdcf9de7be4b9acfe3788c90bded142ebf5;p=packages%2Fsamba.git

diff --git a/samba-lib64.patch b/samba-lib64.patch
index de39e5e..2f83919 100644
--- a/samba-lib64.patch
+++ b/samba-lib64.patch
@@ -1,6 +1,15 @@
-diff -urN samba-3.0.4.org/source/aclocal.m4 samba-3.0.4/source/aclocal.m4
---- samba-3.0.4.org/source/aclocal.m4	2004-05-13 02:29:15.224209664 +0200
-+++ samba-3.0.4/source/aclocal.m4	2004-05-13 02:29:22.478106904 +0200
+diff -Nur samba-3.0.7.orig/source/aclocal.m4 samba-3.0.7/source/aclocal.m4
+--- samba-3.0.7.orig/source/aclocal.m4	2004-04-04 09:37:42.000000000 +0200
++++ samba-3.0.7/source/aclocal.m4	2004-09-14 10:59:27.493878552 +0200
+@@ -511,7 +511,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
 @@ -541,12 +541,12 @@
    $1=[$]ac_new_flags
  ])
@@ -28,10 +37,10 @@ diff -urN samba-3.0.4.org/source/aclocal.m4 samba-3.0.4/source/aclocal.m4
      $1="$$1 -L$2"
  fi
  ])
-diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
---- samba-3.0.4.org/source/configure.in	2004-05-13 02:29:15.234208144 +0200
-+++ samba-3.0.4/source/configure.in	2004-05-13 02:32:02.287812136 +0200
-@@ -19,7 +19,7 @@
+diff -Nur samba-3.0.7.orig/source/configure.in samba-3.0.7/source/configure.in
+--- samba-3.0.7.orig/source/configure.in	2004-09-12 05:47:18.000000000 +0200
++++ samba-3.0.7/source/configure.in	2004-09-14 10:59:27.501877336 +0200
+@@ -27,7 +27,7 @@
  mandir="\${prefix}/man"
  logfilebase="\${VARDIR}"
  privatedir="\${prefix}/private"
@@ -40,13 +49,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
  configdir="\${LIBDIR}"
  swatdir="\${prefix}/swat"
  
-@@ -27,12 +27,12 @@
- [  --with-fhs              Use FHS-compliant paths (default=no)],
- [ case "$withval" in
-   yes)
--    lockdir="\${VARDIR}/lib/samba"
-+    lockdir="\${VARDIR}/lib64/samba"
-     piddir="\${VARDIR}/run"
+@@ -40,7 +40,7 @@
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
      privatedir="\${CONFIGDIR}/private"
@@ -55,7 +58,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
      configdir="${sysconfdir}/samba"
      swatdir="\${DATADIR}/samba/swat"
      ;;
-@@ -587,7 +587,7 @@
+@@ -595,7 +595,7 @@
  # Note: iconv does that explicitly below, but other packages
  # don't.
  	CPPFLAGS="$CPPFLAGS -I/sw/include"
@@ -64,7 +67,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
  
  # If we have dlsym_prepend_underscore (from Fink's dlcompat),
  # use that instead of plain dlsym.
-@@ -868,7 +868,7 @@
+@@ -878,7 +878,7 @@
      _cppflags=${CPPFLAGS}
  
      # Add additional search path
@@ -73,7 +76,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  
      AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
-@@ -879,7 +879,7 @@
+@@ -889,7 +889,7 @@
         AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
        done
        AC_CHECK_LIB(readline, rl_callback_handler_install,
@@ -82,7 +85,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
         TERMCPPFLAGS="-I$with_readline/include"
         CPPFLAGS="-I$with_readline/include $CPPFLAGS"
         TERMLIBS="-lreadline $TERMLIBS"
-@@ -1658,7 +1658,7 @@
+@@ -1683,7 +1683,7 @@
  ICONV_LOCATION=standard
  LOOK_DIRS="/usr /usr/local /sw /opt"
  AC_ARG_WITH(libiconv,
@@ -91,16 +94,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
  [
    if test "$withval" = "no" ; then
      AC_MSG_ERROR([argument to --with-libiconv must be a directory])
-@@ -1708,7 +1708,7 @@
-         # check for iconv in libc
-         ic_save_LIBS="$LIBS"
-         if test x"$ICONV_PATH_SPEC" = "xyes" ; then
--           LIBS="$LIBS -L$ICONV_LOCATION/lib"
-+           LIBS="$LIBS -L$ICONV_LOCATION/lib64"
-         fi
-         if test x"$jm_cv_lib_iconv" != x; then
-            LIBS="$LIBS -l$jm_cv_lib_iconv"
-@@ -2568,7 +2568,7 @@
+@@ -2630,7 +2630,7 @@
          AC_MSG_RESULT($withval)
          KRB5_CFLAGS="-I$withval/include"
          KRB5_CPPFLAGS="-I$withval/include"
@@ -109,7 +103,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
          FOUND_KRB5=yes
          ;;
        esac ],
-@@ -2581,10 +2581,10 @@
+@@ -2643,10 +2643,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
@@ -122,7 +116,7 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
            AC_MSG_RESULT(yes)
        else
            KRB5_CFLAGS="-I/usr/include/heimdal"
-@@ -4372,7 +4372,7 @@
+@@ -4491,7 +4491,7 @@
  builddir=`pwd`
  AC_SUBST(builddir)
  
@@ -131,25 +125,9 @@ diff -urN samba-3.0.4.org/source/configure.in samba-3.0.4/source/configure.in
  LIB_REMOVE_USR_LIB(LDFLAGS)
  LIB_REMOVE_USR_LIB(LIBS)
  
-diff -urN samba-3.0.4.org/source/Makefile.in samba-3.0.4/source/Makefile.in
---- samba-3.0.4.org/source/Makefile.in	2004-05-13 02:29:15.223209816 +0200
-+++ samba-3.0.4/source/Makefile.in	2004-05-13 02:29:22.474107512 +0200
-@@ -1278,9 +1278,9 @@
- 	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
- 
- installclientlib: installdirs libsmbclient
--	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
--	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
--	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib64
-+	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib64
-+	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib64
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
- 	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
- 
-diff -urN samba-3.0.4.org/source/torture/nsstest.c samba-3.0.4/source/torture/nsstest.c
---- samba-3.0.4.org/source/torture/nsstest.c	2004-05-13 02:29:15.062234288 +0200
-+++ samba-3.0.4/source/torture/nsstest.c	2004-05-13 02:29:22.503103104 +0200
+diff -Nur samba-3.0.7.orig/source/torture/nsstest.c samba-3.0.7/source/torture/nsstest.c
+--- samba-3.0.7.orig/source/torture/nsstest.c	2004-04-04 09:37:39.000000000 +0200
++++ samba-3.0.7/source/torture/nsstest.c	2004-09-14 10:59:27.503877032 +0200
 @@ -21,7 +21,7 @@
  
  #include "includes.h"