-diff -urN samba-2.0.7.org/source/Makefile.in samba-2.0.7/source/Makefile.in
---- samba-2.0.7.org/source/Makefile.in Thu Oct 19 00:01:25 2000
-+++ samba-2.0.7/source/Makefile.in Fri Oct 20 22:58:16 2000
-@@ -21,15 +21,16 @@
- builddir=@builddir@
+diff -urN samba-2.2.0.org/source/Makefile.in samba-2.2.0/source/Makefile.in
+--- samba-2.2.0.org/source/Makefile.in Wed Apr 18 01:27:35 2001
++++ samba-2.2.0/source/Makefile.in Wed Apr 18 01:38:13 2001
+@@ -30,15 +30,15 @@
+ top_builddir=.
SHELL=/bin/sh
-BASEDIR= @prefix@
-BINDIR = @bindir@
+-DATADIR = @datadir@
+BASEDIR= $(DESTDIR)@prefix@
+BINDIR = $(DESTDIR)@bindir@
- # we don't use sbindir because we want full compatibility with
- # the previous releases of Samba
--SBINDIR = @bindir@
++DATADIR = $(DESTDIR)@datadir@
+ # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
+-SBINDIR = @sbindir@
-LIBDIR = @libdir@
-VARDIR = @localstatedir@
+-CONFIGDIR = @configdir@
-MANDIR = @mandir@
--SAMBABOOK = @sambabook@
+SBINDIR = $(DESTDIR)@sbindir@
+LIBDIR = $(DESTDIR)@libdir@
+VARDIR = $(DESTDIR)@localstatedir@
++CONFIGDIR = $(DESTDIR)@configdir@
+MANDIR = $(DESTDIR)@mandir@
-+SYSCONFDIR = $(DESTDIR)@sysconfdir@
-+SAMBABOOK = $(DESTDIR)@sambabook@
# The permissions to give the executables
INSTALLPERMS = 0755
-@@ -49,7 +50,7 @@
- SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
+@@ -58,7 +58,7 @@
+ TDB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd.tdb
# This is where SWAT images and help files go
-SWATDIR = @swatdir@
# the directory where lock files go
LOCKDIR = @lockdir@
-diff -urN samba-2.0.7.org/source/script/installbin.sh samba-2.0.7/source/script/installbin.sh
---- samba-2.0.7.org/source/script/installbin.sh Thu Oct 19 00:01:26 2000
-+++ samba-2.0.7/source/script/installbin.sh Fri Oct 20 23:12:27 2000
+diff -urN samba-2.2.0.org/source/script/installbin.sh samba-2.2.0/source/script/installbin.sh
+--- samba-2.2.0.org/source/script/installbin.sh Wed Apr 18 01:27:39 2001
++++ samba-2.2.0/source/script/installbin.sh Wed Apr 18 01:36:43 2001
@@ -13,7 +13,7 @@
- for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do
+ for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do
if [ ! -d $d ]; then
-mkdir $d
+mkdir -p $d
fi
done
-diff -urN samba-2.0.7.org/source/script/installcp.sh samba-2.0.7/source/script/installcp.sh
---- samba-2.0.7.org/source/script/installcp.sh Thu Oct 19 00:01:26 2000
-+++ samba-2.0.7/source/script/installcp.sh Fri Oct 20 23:07:24 2000
+diff -urN samba-2.2.0.org/source/script/installcp.sh samba-2.2.0/source/script/installcp.sh
+--- samba-2.2.0.org/source/script/installcp.sh Wed Apr 18 01:27:39 2001
++++ samba-2.2.0/source/script/installcp.sh Wed Apr 18 01:36:43 2001
@@ -12,7 +12,7 @@
echo Installing codepage files in $CODEPAGEDIR
for d in $LIBDIR $CODEPAGEDIR; do
fi
done
-diff -urN samba-2.0.7.org/source/script/installman.sh samba-2.0.7/source/script/installman.sh
---- samba-2.0.7.org/source/script/installman.sh Thu Oct 19 00:01:26 2000
-+++ samba-2.0.7/source/script/installman.sh Fri Oct 20 22:57:52 2000
+diff -urN samba-2.2.0.org/source/script/installman.sh samba-2.2.0/source/script/installman.sh
+--- samba-2.2.0.org/source/script/installman.sh Wed Apr 18 01:27:39 2001
++++ samba-2.2.0/source/script/installman.sh Wed Apr 18 01:36:43 2001
@@ -11,7 +11,7 @@
for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do
if [ ! -d $d ]; then
echo Failed to make directory $d, does $USER have privileges?
exit 1
-diff -urN samba-2.0.7.org/source/script/installscripts.sh samba-2.0.7/source/script/installscripts.sh
---- samba-2.0.7.org/source/script/installscripts.sh Thu Oct 19 00:01:26 2000
-+++ samba-2.0.7/source/script/installscripts.sh Fri Oct 20 22:57:52 2000
+diff -urN samba-2.2.0.org/source/script/installscripts.sh samba-2.2.0/source/script/installscripts.sh
+--- samba-2.2.0.org/source/script/installscripts.sh Wed Apr 18 01:27:39 2001
++++ samba-2.2.0/source/script/installscripts.sh Wed Apr 18 01:36:43 2001
@@ -12,7 +12,7 @@
for d in $BINDIR; do
if [ ! -d $d ]; then
echo Failed to make directory $d
echo Have you run installbin first?
-diff -urN samba-2.0.7.org/source/script/installswat.sh samba-2.0.7/source/script/installswat.sh
---- samba-2.0.7.org/source/script/installswat.sh Thu Oct 19 00:01:26 2000
-+++ samba-2.0.7/source/script/installswat.sh Fri Oct 20 23:00:27 2000
+diff -urN samba-2.2.0.org/source/script/installswat.sh samba-2.2.0/source/script/installswat.sh
+--- samba-2.2.0.org/source/script/installswat.sh Wed Apr 18 01:27:39 2001
++++ samba-2.2.0/source/script/installswat.sh Wed Apr 18 01:38:55 2001
@@ -10,7 +10,7 @@
for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
if [ ! -d $d ]; then
-- mkdir $d
-+ mkdir -p $d
- if [ ! -d $d ]; then
- echo Failed to make directory $d, does $USER have privileges?
- exit 1
+- mkdir $d
++ mkdir -p $d
+ if [ ! -d $d ]; then
+ echo Failed to make directory $d, does $USER have privileges?
+ exit 1
@@ -69,7 +69,7 @@
for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
---- samba-2.0.6/source/configure.in.nsl Wed Nov 10 21:35:56 1999
-+++ samba-2.0.6/source/configure.in Thu Mar 16 15:57:05 2000
-@@ -14,6 +14,7 @@
- AC_SUBST(WRAP32)
- AC_SUBST(PICFLAG)
- AC_SUBST(SHLIBEXT)
-+AC_SUBST(CLIENT_LIBS)
+diff -urN samba-2.2.0.org/source/configure.in samba-2.2.0/source/configure.in
+--- samba-2.2.0.org/source/configure.in Wed Apr 18 01:27:35 2001
++++ samba-2.2.0/source/configure.in Wed Apr 18 01:29:23 2001
+@@ -483,7 +483,7 @@
+ AC_CHECK_HEADERS(readline/history.h)
- # compile with optimisation and without debugging by default
- CFLAGS=${CFLAGS-"-O"}
-@@ -298,7 +299,7 @@
- # test for where we get readline() from
- if test "$ac_cv_header_readline_h" = "yes" ||
- test "$ac_cv_header_readline_readline_h" = "yes"; then
-- AC_CHECK_LIB(readline,readline)
-+ AC_CHECK_LIB(readline, readline, [CLIENT_LIBS="$CLIENT_LIBS -lreadline"])
- fi
+ AC_CHECK_HEADERS(readline.h readline/readline.h,[
+- for termlib in ncurses curses termcap terminfo termlib; do
++ for termlib in tinfo ncurses curses termcap terminfo termlib; do
+ AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
+ done
+ AC_CHECK_LIB(readline, rl_callback_handler_install,
+@@ -510,7 +510,7 @@
+ AC_CHECK_HEADERS(readline/history.h)
-
---- samba-2.0.6/source/Makefile.in.nsl Thu Mar 16 17:24:31 2000
-+++ samba-2.0.6/source/Makefile.in Thu Mar 16 15:11:02 2000
-@@ -8,6 +8,7 @@
- mandir=@mandir@
-
- LIBS=@LIBS@
-+CLIENT_LIBS=@CLIENT_LIBS@
- CC=@CC@
- CFLAGS=@CFLAGS@
- CPPFLAGS=@CPPFLAGS@
-@@ -370,7 +371,7 @@
-
- bin/smbclient: $(CLIENT_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS) $(CLIENT_LIBS)
-
- bin/smbspool: $(CUPS_OBJ) bin/.dummy
- @echo Linking $@
+ AC_CHECK_HEADERS(readline.h readline/readline.h,[
+- for termlib in ncurses curses termcap terminfo termlib; do
++ for termlib in tinfo ncurses curses termcap terminfo termlib; do
+ AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
+ done
+ AC_CHECK_LIB(readline, rl_callback_handler_install,
-diff -urN samba-2.0.7.org/source/configure.in samba-2.0.7/source/configure.in
---- samba-2.0.7.org/source/configure.in Thu Oct 19 00:01:24 2000
-+++ samba-2.0.7/source/configure.in Fri Oct 20 21:17:32 2000
-@@ -444,6 +444,11 @@
+diff -urN samba-2.2.0.org/source/Makefile.in samba-2.2.0/source/Makefile.in
+--- samba-2.2.0.org/source/Makefile.in Wed Apr 18 01:27:35 2001
++++ samba-2.2.0/source/Makefile.in Wed Apr 18 01:48:43 2001
+@@ -50,7 +50,7 @@
+ CONFIGFILE = $(CONFIGDIR)/smb.conf
+ LMHOSTSFILE = $(CONFIGDIR)/lmhosts
+ DRIVERFILE = $(CONFIGDIR)/printers.def
+-PASSWD_PROGRAM = /bin/passwd
++PASSWD_PROGRAM = /usr/bin/passwd
+ # This is where smbpasswd et al go
+ PRIVATEDIR = @privatedir@
+
+diff -urN samba-2.2.0.org/source/configure.in samba-2.2.0/source/configure.in
+--- samba-2.2.0.org/source/configure.in Wed Apr 18 01:27:35 2001
++++ samba-2.2.0/source/configure.in Wed Apr 18 01:48:11 2001
+@@ -665,6 +665,11 @@
fi
#
# Check for the functions putprpwnam, set_auth_parameters,
# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
# Needed for OSF1 and HPUX.
-@@ -1292,7 +1297,7 @@
+@@ -1613,7 +1618,7 @@
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_PAM)
;;
*)
AC_MSG_RESULT(no)
-@@ -1368,7 +1374,7 @@
+@@ -1712,7 +1717,7 @@
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_SSL)
if test "${with_sslinc+set}" = set; then
-@@ -1376,12 +1382,11 @@
+@@ -1720,12 +1725,11 @@
case "$withval" in
yes|no)
echo "configure: warning: --with-sslinc called without argument - will use default" 1>&w
LIBS="-lssl -lcrypto $LIBS"
LDFLAGS="-L${withval}/lib $LDFLAGS"
;;
-diff -urN samba-2.0.7.org/source/smbwrapper/smbsh.in samba-2.0.7/source/smbwrapper/smbsh.in
---- samba-2.0.7.org/source/smbwrapper/smbsh.in Thu Oct 19 00:01:27 2000
-+++ samba-2.0.7/source/smbwrapper/smbsh.in Fri Oct 20 21:16:46 2000
+diff -urN samba-2.2.0.org/source/smbwrapper/smbsh.in samba-2.2.0/source/smbwrapper/smbsh.in
+--- samba-2.2.0.org/source/smbwrapper/smbsh.in Wed Apr 18 01:27:40 2001
++++ samba-2.2.0/source/smbwrapper/smbsh.in Wed Apr 18 01:48:11 2001
@@ -1,6 +1,6 @@
#! /bin/sh
-diff -urN samba-2.0.7/packaging/RedHat/smbadduser samba-2.0.7.new/packaging/RedHat/smbadduser
---- samba-2.0.7/packaging/RedHat/smbadduser Fri Aug 21 16:20:38 1998
-+++ samba-2.0.7.new/packaging/RedHat/smbadduser Tue Aug 8 10:23:42 2000
-@@ -2,11 +2,17 @@
- #
+diff -urN samba-2.2.0.org/source/smbadduser samba-2.2.0/source/smbadduser
+--- samba-2.2.0.org/source/smbadduser Wed Apr 18 01:27:35 2001
++++ samba-2.2.0/source/smbadduser Wed Apr 18 01:33:08 2001
+@@ -3,10 +3,10 @@
# smbadduser - Written by Mike Zakharoff
#
-+# * Sun Aug 6 2000 Philipp Knirsch <pknirsch@redhat.com>
-+# - Bugfix to change file location from /etc to /etc/samba and to use
-+# smbpasswd -a to add the user entry to the smbpasswd file in case it didn't
-+# exist before.
-+#
-+
unalias *
- set path = ($path)
+-set path = ($path /usr/local/samba/bin)
++set path = ($path /usr/bin)
--set smbpasswd = /etc/smbpasswd
--set user_map = /etc/smbusers
+-set smbpasswd = /usr/local/samba/private/smbpasswd
+-set user_map = /usr/local/samba/lib/users.map
+set smbpasswd = /etc/samba/smbpasswd
-+set user_map = /etc/samba/smbusers
++set user_map = /etc/samba/users.map
#
# Set to site specific passwd command
#
-@@ -46,19 +52,23 @@
+@@ -46,19 +46,23 @@
echo "ERROR: $unix Not in passwd database SKIPPING..."
continue
endif
endif
set new = ($new $unix)
end
-@@ -69,5 +79,9 @@
+@@ -69,5 +73,9 @@
foreach one ($new)
echo $line
echo "ENTER password for $one"
projects / packages / samba.git / commitdiff