JHT ===> Prepared now for release of Samba-1.9.16p10 RedHat RPMS

4 files changed, 63 insertions, 33 deletions

diff --git a/examples/redhat/samba-1.9.16p10.spec b/examples/redhat/samba-1.9.16p10.spec
index a0bcc3aa4e7..b65e4481687 100644
--- a/examples/redhat/samba-1.9.16p10.spec
+++ b/examples/redhat/samba-1.9.16p10.spec
@@ -6,6 +6,7 @@ Copyright: GPL
 Group: Networking
 Source: ftp://samba.anu.edu.au/pub/samba/samba-1.9.16p10.tar.gz
 Patch: samba-make.patch
+Patch2: samba-axp.patch
 Packager: John H Terpstra [Samba-Team] <jht@aquasoft.com.au>
 Requires: pamconfig
 
diff --git a/examples/redhat/samba-axp.patch b/examples/redhat/samba-axp.patch
new file mode 100644
index 00000000000..b5b466a2024
--- /dev/null
+++ b/examples/redhat/samba-axp.patch
@@ -0,0 +1,21 @@
+*** samba-1.9.16p10/source/Makefile.RPM	Sat Feb  1 01:25:30 1997
+--- samba-1.9.16p10/source/Makefile	Sat Feb  1 01:25:53 1997
+***************
+*** 179,186 ****
+  # Use this for Linux without shadow passwords
+  # contributed by Andrew.Tridgell@anu.edu.au
+  # AXPROC defines DEC Alpha Processor
+! # FLAGSM = -DLINUX -DAXPROC
+! FLAGSM = -DLINUX
+  LIBSM = 
+  
+  # Use this for Linux with shadow passwords and quota
+--- 179,186 ----
+  # Use this for Linux without shadow passwords
+  # contributed by Andrew.Tridgell@anu.edu.au
+  # AXPROC defines DEC Alpha Processor
+! FLAGSM = -DLINUX -DAXPROC
+! # FLAGSM = -DLINUX
+  LIBSM = 
+  
+  # Use this for Linux with shadow passwords and quota
diff --git a/examples/redhat/samba-make.patch b/examples/redhat/samba-make.patch
index 0c290867e0d..9cb39e171c8 100644
--- a/examples/redhat/samba-make.patch
+++ b/examples/redhat/samba-make.patch
@@ -1,5 +1,5 @@
-*** samba-1.9.16p10/source/Makefile.orig
---- samba-1.9.16p10/source/Makefile
+*** samba-1.9.16p10/source/Makefile.orig	Sat Feb  1 01:15:46 1997
+--- samba-1.9.16p10/source/Makefile	Sat Feb  1 01:19:40 1997
 ***************
 *** 5,20 ****
   
@@ -11,7 +11,7 @@
   # architectures or share the samba binaries across NFS then
   # you will probably want to change this layout.
 ! BASEDIR = /usr/local/samba
-! BINDIR = $(BASEDIR)/bin
+  BINDIR = $(BASEDIR)/bin
 ! SBINDIR = $(BASEDIR)/bin
 ! LIBDIR = $(BASEDIR)/lib
 ! VARDIR = $(BASEDIR)/var
@@ -27,9 +27,9 @@
   # The directories to put things in. If you use multiple
   # architectures or share the samba binaries across NFS then
   # you will probably want to change this layout.
-! BASEDIR = /
-! BINDIR = $(BASEDIR)usr/bin
-! SBINDIR = $(BASEDIR)usr/sbin
+! BASEDIR = /usr
+  BINDIR = $(BASEDIR)/bin
+! SBINDIR = $(BASEDIR)/sbin
 ! LIBDIR = /etc
 ! VARDIR = /var
   
@@ -41,7 +41,7 @@
   # RPM_OPT_FLAGS is needed when building an RPM distribution package
   # for RedHat Linux.
 ! # FLAGS1 = $(RPM_OPT_FLAGS)
-  FLAGS1 = -O
+! FLAGS1 = -O
   LIBS1 = 
   
   # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
@@ -55,7 +55,7 @@
   # RPM_OPT_FLAGS is needed when building an RPM distribution package
   # for RedHat Linux.
 ! FLAGS1 = $(RPM_OPT_FLAGS)
-  FLAGS1 = -O
+! #FLAGS1 = -O
   LIBS1 = 
   
   # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
@@ -113,21 +113,19 @@
   # 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.
 ***************
-*** 178,185 ****
-  
-  # Use this for Linux without shadow passwords
+*** 180,187 ****
   # contributed by Andrew.Tridgell@anu.edu.au
+  # AXPROC defines DEC Alpha Processor
+  # FLAGSM = -DLINUX -DAXPROC
 ! # FLAGSM = -DLINUX
 ! # LIBSM = 
   
   # Use this for Linux with shadow passwords and quota
   # contributed by xeno@mix.hive.no
---- 178,187 ----
-  
-  # Use this for Linux without shadow passwords
+--- 180,187 ----
   # contributed by Andrew.Tridgell@anu.edu.au
-! # AXPROC defines DEC Alpha Processor
-! # FLAGSM = -DLINUX -DAXPROC
+  # AXPROC defines DEC Alpha Processor
+  # FLAGSM = -DLINUX -DAXPROC
 ! FLAGSM = -DLINUX
 ! LIBSM = 
   
diff --git a/examples/redhat/smb.conf b/examples/redhat/smb.conf
index 648ee1d5331..e0d91899721 100644
--- a/examples/redhat/smb.conf
+++ b/examples/redhat/smb.conf
@@ -1,4 +1,3 @@
-
 ; The global setting for a RedHat default install
 ; smbd re-reads this file regularly, but if in doubt stop and restart it:
 ; /etc/rc.d/init.d/smb stop
@@ -28,7 +27,8 @@
 ;   max log size = 50
 
 ; Options for handling file name case sensitivity and / or preservation
-;   case sensitive = yes  ; Case Sensitivity breaks many WfW and Win95 apps
+; Case Sensitivity breaks many WfW and Win95 apps
+;   case sensitive = yes
     short preserve case = yes
     preserve case = yes
 
@@ -41,27 +41,35 @@
 ; Security modes: USER uses Unix username/passwd, SHARE uses WfW type passwords
 ;        SERVER uses a Windows NT Server to provide authentication services
    security = user
-;   password server = <NT-Server-Name> ; Use with security = server only.
+; Use password server option only with security = server
+;   password server = <NT-Server-Name>
 
 ; Configuration Options ***** Watch location in smb.conf for side-effects *****
-;   include = /etc/smb.conf.%m  ; Where %m is any SMBName (machine name)
-                                ; (computer name) for which a custom
-                                ; configuration is desired
+; Where %m is any SMBName (machine name, or computer name) for which a custom
+; configuration is desired
+;   include = /etc/smb.conf.%m
 
 ; Performance Related Options
-   socket options = TCP_NODELAY  ; Read the smb.conf man page!!
-;   socket address = aaa.bbb.ccc.ddd  ; Used to specify which socket Samba
-                                     ; will listen on (good for aliased systems)
-;   keep alive = 60  ; Use only if really needed!!!!
+; Before setting socket options read the smb.conf man page!!
+   socket options = TCP_NODELAY 
+; Socket Address is used to specify which socket Samba
+; will listen on (good for aliased systems)
+;   socket address = aaa.bbb.ccc.ddd
+; Use keep alive only if really needed!!!!
+;   keep alive = 60
 
 ; Domain Control Options
-;   domain master = yes  ; specifies Samba to be the Domain Master Browser
-;   domain controller = <NT-Domain-Controller-SMBName>  ; Use with care
-; only if you have an NT server on your network that has been configured
-; at install time to be a primary domain controller.
+; specifies Samba to be the Domain Master Browser
+;   domain master = yes 
+; Use with care only if you have an NT server on your network that has been
+; configured at install time to be a primary domain controller.
+;   domain controller = <NT-Domain-Controller-SMBName>
+; Domain logon control can be a good thing!
 ;   domain logons = yes
-;   logon script = %m.bat  ; run a specific logon batch file per workstation
-;   logon script = %u.bat  ; run a specific logon batch file per username
+; run a specific logon batch file per workstation (machine)
+;   logon script = %m.bat
+; run a specific logon batch file per username
+;   logon script = %u.bat
 
 ;============================ Share Declarations ==============================
 [homes]
@@ -76,7 +84,8 @@
 ; [netlogon]
 ;   comment = Samba Network Logon Service
 ;   path = /home/netlogon
-;   case sensitive = no  ; Case sensitivity breaks logon script processing!!!
+; Case sensitivity breaks logon script processing!!!
+;   case sensitive = no
 ;   guest ok = yes
 ;   locking = no
 ;   read only = yes
@@ -86,6 +95,7 @@
 ; NOTE: There is NO need to specifically define each printer
 [printers]
    comment = All Printers
+   path = /var/spool/samba
    browseable = no
    printable = yes
    public = no