mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
JHT ===> Getting ready for release of 1.9.17alpha5
Please note that version.h has been updated!!!!!!!!!!
This commit is contained in:
John Terpstra
parent
e723dd3dee
commit
271d12b5dd
@ -8,5 +8,7 @@ SRCDIR=`rpm --showrc | awk '/^sourcedir/ { print $3}'`
|
||||
|
||||
cp -a *.spec $SPECDIR
|
||||
cp -a *.patch smb.* samba.log $SRCDIR
|
||||
cd $SRCDIR
|
||||
tar czvf samba-1.9.17.tar.gz samba-1.9.17
|
||||
cd $SPECDIR
|
||||
rpm --clean -ba samba.spec
|
||||
|
||||
@ -1,132 +1,85 @@
|
||||
*** samba-1.9.17/source/Makefile.orig Sat Jul 12 12:51:39 1997
|
||||
--- samba-1.9.17/source/Makefile Sat Jul 12 12:56:04 1997
|
||||
***************
|
||||
*** 5,15 ****
|
||||
###########################################################################
|
||||
|
||||
# The base directory for all samba files
|
||||
! BASEDIR = /usr/local/samba
|
||||
|
||||
# The base manpages directory to put the man pages in
|
||||
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
|
||||
! MANDIR = /usr/local/man
|
||||
|
||||
# The directories to put things in. If you use multiple
|
||||
# architectures or share the samba binaries across NFS then
|
||||
--- 5,15 ----
|
||||
###########################################################################
|
||||
|
||||
# The base directory for all samba files
|
||||
! BASEDIR = /usr
|
||||
|
||||
# The base manpages directory to put the man pages in
|
||||
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
|
||||
! MANDIR = $(BASEDIR)/man
|
||||
|
||||
# The directories to put things in. If you use multiple
|
||||
# architectures or share the samba binaries across NFS then
|
||||
***************
|
||||
*** 18,26 ****
|
||||
# normally only applies to nmbd and smbd
|
||||
# SBINDIR implies a secure binary directory
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/bin
|
||||
! LIBDIR = $(BASEDIR)/lib
|
||||
! VARDIR = $(BASEDIR)/var
|
||||
|
||||
# The permissions to give the executables
|
||||
INSTALLPERMS = 0755
|
||||
--- 18,26 ----
|
||||
# normally only applies to nmbd and smbd
|
||||
# SBINDIR implies a secure binary directory
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
! SBINDIR = $(BASEDIR)/sbin
|
||||
! LIBDIR = /etc
|
||||
! VARDIR = /var
|
||||
|
||||
# The permissions to give the executables
|
||||
INSTALLPERMS = 0755
|
||||
***************
|
||||
*** 35,41 ****
|
||||
|
||||
# You will need to use a ANSI C compiler. This means under SunOS 4 you can't
|
||||
# use cc, instead you will have to use gcc.
|
||||
! # CC = gcc
|
||||
|
||||
# This may help with some versions of make
|
||||
SHELL = /bin/sh
|
||||
--- 35,41 ----
|
||||
|
||||
# You will need to use a ANSI C compiler. This means under SunOS 4 you can't
|
||||
# use cc, instead you will have to use gcc.
|
||||
! CC = gcc
|
||||
|
||||
# This may help with some versions of make
|
||||
SHELL = /bin/sh
|
||||
***************
|
||||
*** 48,60 ****
|
||||
# set these to where to find various files
|
||||
# These can be overridden by command line switches (see smbd(8))
|
||||
# or in smb.conf (see smb.conf(5))
|
||||
! SMBLOGFILE = $(VARDIR)/log.smb
|
||||
! NMBLOGFILE = $(VARDIR)/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/locks
|
||||
|
||||
# set this to the default group you want your machine to appear in
|
||||
# for browsing. This can also be set in nmbd (see nmbd(8))
|
||||
--- 48,60 ----
|
||||
# set these to where to find various files
|
||||
# These can be overridden by command line switches (see smbd(8))
|
||||
# or in smb.conf (see smb.conf(5))
|
||||
! SMBLOGFILE = $(VARDIR)/log/samba/log.smb
|
||||
! NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
|
||||
# the directory where lock files go
|
||||
! LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# set this to the default group you want your machine to appear in
|
||||
# for browsing. This can also be set in nmbd (see nmbd(8))
|
||||
***************
|
||||
*** 77,84 ****
|
||||
|
||||
# This is for PAM authentication. RedHat Linux uses PAM.
|
||||
# If you use PAM, then uncomment the following lines:
|
||||
! # PAM_FLAGS = -DUSE_PAM
|
||||
! # PAM_LIBS = -ldl -lpam
|
||||
|
||||
# This is for AFS authentication. If you use AFS then set AFS_BASE
|
||||
# according to your system layout, and uncomment the other lines as well.
|
||||
--- 77,84 ----
|
||||
|
||||
# This is for PAM authentication. RedHat Linux uses PAM.
|
||||
# If you use PAM, then uncomment the following lines:
|
||||
! PAM_FLAGS = -DUSE_PAM
|
||||
! PAM_LIBS = -ldl -lpam
|
||||
|
||||
# This is for AFS authentication. If you use AFS then set AFS_BASE
|
||||
# according to your system layout, and uncomment the other lines as well.
|
||||
***************
|
||||
*** 187,194 ****
|
||||
# contributed by Andrew.Tridgell@anu.edu.au
|
||||
# AXPROC defines DEC Alpha Processor
|
||||
# FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
|
||||
! # FLAGSM = -DLINUX -DFAST_SHARE_MODES
|
||||
! # LIBSM =
|
||||
|
||||
# Use this for Linux with shadow passwords and quota
|
||||
# contributed by xeno@mix.hive.no
|
||||
--- 187,194 ----
|
||||
# contributed by Andrew.Tridgell@anu.edu.au
|
||||
# AXPROC defines DEC Alpha Processor
|
||||
# FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
|
||||
! FLAGSM = -DLINUX -DFAST_SHARE_MODES
|
||||
! LIBSM =
|
||||
|
||||
# Use this for Linux with shadow passwords and quota
|
||||
# contributed by xeno@mix.hive.no
|
||||
--- samba-1.9.17/source/Makefile.orig Wed Jul 23 21:06:24 1997
|
||||
+++ samba-1.9.17/source/Makefile Wed Jul 23 21:55:10 1997
|
||||
@@ -5,11 +5,11 @@
|
||||
###########################################################################
|
||||
|
||||
# The base directory for all samba files
|
||||
-BASEDIR = /usr/local/samba
|
||||
+BASEDIR = /
|
||||
|
||||
# The base manpages directory to put the man pages in
|
||||
# Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
|
||||
-MANDIR = /usr/local/man
|
||||
+MANDIR = /usr/man
|
||||
|
||||
# The directories to put things in. If you use multiple
|
||||
# architectures or share the samba binaries across NFS then
|
||||
@@ -18,9 +18,9 @@
|
||||
# normally only applies to nmbd and smbd
|
||||
# SBINDIR implies a secure binary directory
|
||||
BINDIR = $(BASEDIR)/bin
|
||||
-SBINDIR = $(BASEDIR)/bin
|
||||
-LIBDIR = $(BASEDIR)/lib
|
||||
-VARDIR = $(BASEDIR)/var
|
||||
+SBINDIR = $(BASEDIR)/sbin
|
||||
+LIBDIR = $(BASEDIR)etc
|
||||
+VARDIR = $(BASEDIR)var
|
||||
|
||||
# The permissions to give the executables
|
||||
INSTALLPERMS = 0755
|
||||
@@ -29,13 +29,13 @@
|
||||
# add -DSYSLOG for syslog support
|
||||
# RPM_OPT_FLAGS is needed when building an RPM distribution package
|
||||
# for RedHat Linux.
|
||||
-# FLAGS1 = $(RPM_OPT_FLAGS)
|
||||
-FLAGS1 = -O
|
||||
+FLAGS1 = $(RPM_OPT_FLAGS)
|
||||
+# FLAGS1 = -O
|
||||
LIBS1 =
|
||||
|
||||
# You will need to use a ANSI C compiler. This means under SunOS 4 you can't
|
||||
# use cc, instead you will have to use gcc.
|
||||
-# CC = gcc
|
||||
+CC = gcc
|
||||
|
||||
# This may help with some versions of make
|
||||
SHELL = /bin/sh
|
||||
@@ -48,13 +48,13 @@
|
||||
# set these to where to find various files
|
||||
# These can be overridden by command line switches (see smbd(8))
|
||||
# or in smb.conf (see smb.conf(5))
|
||||
-SMBLOGFILE = $(VARDIR)/log.smb
|
||||
-NMBLOGFILE = $(VARDIR)/log.nmb
|
||||
+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
|
||||
+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
|
||||
CONFIGFILE = $(LIBDIR)/smb.conf
|
||||
LMHOSTSFILE = $(LIBDIR)/lmhosts
|
||||
|
||||
# the directory where lock files go
|
||||
-LOCKDIR = $(VARDIR)/locks
|
||||
+LOCKDIR = $(VARDIR)/lock/samba
|
||||
|
||||
# set this to the default group you want your machine to appear in
|
||||
# for browsing. This can also be set in nmbd (see nmbd(8))
|
||||
@@ -84,8 +84,8 @@
|
||||
|
||||
# This is for PAM authentication. RedHat Linux uses PAM.
|
||||
# If you use PAM, then uncomment the following lines:
|
||||
-# PAM_FLAGS = -DUSE_PAM
|
||||
-# PAM_LIBS = -ldl -lpam
|
||||
+PAM_FLAGS = -DUSE_PAM
|
||||
+PAM_LIBS = -ldl -lpam
|
||||
|
||||
# This is for AFS authentication. If you use AFS then set AFS_BASE
|
||||
# according to your system layout, and uncomment the other lines as well.
|
||||
@@ -200,8 +200,8 @@
|
||||
# contributed by Andrew.Tridgell@anu.edu.au
|
||||
# AXPROC defines DEC Alpha Processor
|
||||
# FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
|
||||
-# FLAGSM = -DLINUX -DFAST_SHARE_MODES
|
||||
-# LIBSM =
|
||||
+FLAGSM = -DLINUX -DFAST_SHARE_MODES
|
||||
+LIBSM =
|
||||
|
||||
# Use this for Linux with shadow passwords and quota
|
||||
# contributed by xeno@mix.hive.no
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
auth required /lib/security/pam_unix_auth.so
|
||||
auth required /lib/security/pam_pwd.so nullok shadow
|
||||
account required /lib/security/pam_unix_account.so
|
||||
auth required /lib/security/pam_pwdb.so nullok shadow
|
||||
account required /lib/security/pam_unix_acct.so
|
||||
|
||||
@ -2,7 +2,7 @@ Summary: SMB client and server
|
||||
Name: samba
|
||||
%define version 1.9.17
|
||||
Version: %{version}
|
||||
Release: 4
|
||||
Release: 5
|
||||
Copyright: GPL
|
||||
Group: Networking
|
||||
Source: ftp://samba.anu.edu.au/pub/samba/samba-%{version}.tar.gz
|
||||
@ -88,6 +88,7 @@ install -m644 examples/simple/smb.conf $RPM_BUILD_ROOT/etc/smb.conf.sampl
|
||||
install -m644 examples/redhat/smb.conf $RPM_BUILD_ROOT/etc/smb.conf
|
||||
install -m755 examples/redhat/smbprint $RPM_BUILD_ROOT/usr/bin
|
||||
install -m755 examples/redhat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
|
||||
install -m755 examples/redhat/smb.init $RPM_BUILD_ROOT/usr/sbin/samba
|
||||
install -m644 examples/redhat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
|
||||
install -m644 examples/redhat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
|
||||
|
||||
@ -118,6 +119,9 @@ if [ "$1" = 0 ] ; then
|
||||
if [ -e /var/log/samba ]; then
|
||||
rm -rf /var/log/samba
|
||||
fi
|
||||
if [ -e /var/lock/samba ]; then
|
||||
rm -rf /var/lock/samba
|
||||
fi
|
||||
fi
|
||||
|
||||
%files
|
||||
@ -142,6 +146,7 @@ fi
|
||||
%attr(-,root,root) %config /etc/smb.conf
|
||||
%attr(-,root,root) %config /etc/smb.conf.sampl
|
||||
%attr(-,root,root) %config /etc/rc.d/init.d/smb
|
||||
%attr(755,root,root) %config /usr/sbin/samba
|
||||
%attr(-,root,root) %config /etc/rc.d/rc3.d/S91smb
|
||||
%attr(-,root,root) %config /etc/rc.d/rc5.d/S91smb
|
||||
%attr(-,root,root) %config /etc/rc.d/rc0.d/K35smb
|
||||
|
||||
@ -1 +1 @@
|
||||
#define VERSION "1.9.17alpha4"
|
||||
#define VERSION "1.9.17alpha5"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user