From a25f6694d230fe384c212350dacf17bfae3ab79d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 1 Jun 2001 12:33:16 +0000 Subject: [PATCH] final sync with SAMBA_2_2 --- packaging/Caldera/OpenLinux/makerpms.sh.tmpl | 33 ++++++--- packaging/Caldera/OpenLinux/samba.pam | 8 ++- packaging/Caldera/OpenLinux/smb.conf.sample | 61 ++++++++-------- packaging/PHT/TurboLinux/makefile-path.patch | 12 ---- packaging/PHT/TurboLinux/samba.pamd | 13 +++- packaging/PHT/TurboLinux/samba2.spec.tmpl | 102 ++++++++++++--------------- packaging/README | 2 +- packaging/SGI/findsmb | 2 +- packaging/SGI/idb.pl | 1 + packaging/SGI/mkrelease.sh | 2 +- packaging/SGI/smb.conf | 14 ++-- packaging/SGI/smbprint | 2 +- packaging/Solaris/makepkg.sh | 33 ++++++++- packaging/Solaris/prototype.master | 46 ++---------- 14 files changed, 169 insertions(+), 162 deletions(-) delete mode 100644 packaging/PHT/TurboLinux/makefile-path.patch rewrite packaging/PHT/TurboLinux/samba.pamd (100%) diff --git a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl index fda8545df78..e7ba1d96230 100644 --- a/packaging/Caldera/OpenLinux/makerpms.sh.tmpl +++ b/packaging/Caldera/OpenLinux/makerpms.sh.tmpl @@ -5,21 +5,38 @@ SPECDIR=${SPECDIR:-/usr/src/OpenLinux/SPECS} SRCDIR=${SRCDIR:-/usr/src/OpenLinux/SOURCES} USERID=`id -u` GRPID=`id -g` +devel=0; +old=0; -if ( z$1 == "zdevel" ) then - ( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba; mv samba samba-PVERSION ) - ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERIONS; mv samba-PVERSION samba ) +# Do some argument parsing... +if [ z$1 = z"devel" ]; then + devel=1; + shift +fi +if [ z$1 = z"old" ]; then + old=1; + shift +fi + +# Start preparing the packages... +if [ $devel -ne 0 ]; then + ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba; mv samba samba-PVERSION ) + ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION; mv samba-PVERSION samba ) else - ( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-PVERSION ) + ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba-PVERSION ) ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION ) -done +fi -cp -a *.spec *.spec-lsb $SPECDIR +cp -af *.spec *.spec-lsb $SPECDIR for src in *.patch; do trg=`echo $src | sed 's;xxxxxx;PVERSION;'` cp -a $src $SRCDIR/$trg done + +# Start building the package cd $SPECDIR -mv samba2.spec samba2.spec-nonlsb -ln samba2.spec-lsb samba2.spec +if [ $old -eq 0 ]; then +mv -f samba2.spec samba2.spec-nonlsb +ln -f samba2.spec-lsb samba2.spec +fi rpm -ba -v samba2.spec diff --git a/packaging/Caldera/OpenLinux/samba.pam b/packaging/Caldera/OpenLinux/samba.pam index 4588db1735e..225ab724ec9 100644 --- a/packaging/Caldera/OpenLinux/samba.pam +++ b/packaging/Caldera/OpenLinux/samba.pam @@ -3,5 +3,9 @@ # # The PAM configuration file for the `samba' service # -auth required /lib/security/pam_pwdb.so shadow nullok -account required /lib/security/pam_pwdb.so +auth required /lib/security/pam_pwdb.so nullok nodelay # shadow audit +# auth required /lib/security/pam_smbpass.so nodelay +account required /lib/security/pam_pwdb.so audit nodelay +session required /lib/security/pam_pwdb.so nodelay +password required /lib/security/pam_pwdb.so # shadow md5 +#password required /lib/security/pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf diff --git a/packaging/Caldera/OpenLinux/smb.conf.sample b/packaging/Caldera/OpenLinux/smb.conf.sample index a00803ca18e..cec5a8a8b22 100644 --- a/packaging/Caldera/OpenLinux/smb.conf.sample +++ b/packaging/Caldera/OpenLinux/smb.conf.sample @@ -15,7 +15,7 @@ [global] # workgroup = NT-Domain-Name or Workgroup-Name - workgroup = WORKGROUP + workgroup = MYGROUP # server string is the equivalent of the NT Description field server string = Samba Server on Caldera OpenLinux @@ -37,7 +37,7 @@ # It should not be necessary to specify the print system type unless # it is non-standard. Currently supported print systems include: # bsd, sysv, plp, lprng, aix, hpux, qnx - printing = lprng + printing = cups # Uncomment this if you want a guest account, you must add this to /etc/passwd # otherwise the user "nobody" is used @@ -45,10 +45,10 @@ # this tells Samba to use a separate log file for each machine # that connects -; log file = /var/log/samba.d/smb.%m + log file = /var/log/samba.d/smb.%m # Put a capping on the size of the log files (in Kb). - max log size = 50 + max log size = 200 # Security mode. Most people will want user level security. See # security_level.txt for details. @@ -58,14 +58,14 @@ # Password Level allows matching of _n_ characters of the password for # all combinations of upper and lower case. -; password level = 8 -; username level = 8 + password level = 8 + username level = 8 # You may wish to use password encryption. Please read # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation. # Do not enable this option unless you have read those documents -; encrypt passwords = yes -; smb passwd file = /etc/samba.d/smbpasswd + encrypt passwords = yes + smb passwd file = /etc/samba.d/smbpasswd # The following are needed to allow password changing from Windows to # update the Linux sytsem password also. @@ -78,7 +78,7 @@ ; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully* # Unix users can map to different SMB User names -; username map = /etc/samba.d/smbusers + username map = /etc/samba.d/smbusers # Using the following line enables you to customise your configuration # on a per machine basis. The %m gets replaced with the netbios name @@ -87,7 +87,7 @@ # Most people will find that this option gives better performance. # See speed.txt and the manual pages for details - socket options = TCP_NODELAY + socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 # Configure Samba to use multiple interfaces # If you have multiple network interfaces then you must list them @@ -108,7 +108,7 @@ # OS Level determines the precedence of this server in master browser # elections. The default value should be reasonable -; os level = 33 + os level = 20 # Domain Master specifies Samba to be the Domain Master Browser. This # allows Samba to collate browse lists between subnets. Don't use this @@ -137,7 +137,7 @@ # Where to store roving profiles (only for Win95 and WinNT) # %L substitutes for this servers netbios name, %U is username # You must uncomment the [Profiles] share below -; logon path = \\%L\Profiles\%U + logon path = \\%L\Profiles\%U # All NetBIOS names must be resolved to IP Addresses # 'Name Resolve Order' allows the named resolution mechanism to be specified @@ -186,28 +186,30 @@ ; (it is named 'public' as it is intended to be used by other sharing ; technologies (like NetWare, appletalk) too and may get disclosed due ; to weak protocols! -- hmm, are there less secure protocols than NFS? :) - path = %H/Public + path = %H/Samba valid users = %S + users = %S only user = yes browseable = no writable = yes create mask = 0750 # Un-comment the following and create the netlogon directory for Domain Logons -; [netlogon] -; comment = Samba Network Logon Service -; path = /home/samba/netlogon -; guest ok = yes -; writable = no -; share modes = no +[netlogon] + comment = Samba Network Logon Service + path = @samba_home@/netlogon + guest ok = yes + writable = no + share modes = no # Un-comment the following to provide a specific roving profile share # the default is to use the user's home directory -;[Profiles] -; path = /home/samba/profiles -; browseable = no -; guest ok = yes +[profiles] + path = @samba_home@/profiles + writeable = yes + browseable = no + guest ok = yes # NOTE: If you have a BSD-style print system there is no need to @@ -224,13 +226,14 @@ # A publicly accessible directory, but read only, except for people in # the "users" group -;[public] -; comment = Public Stuff -; path = /home/public -; browseable = yes -; public = yes +[public] + comment = Public Stuff + path = @samba_home@/public + browseable = yes + read only = yes + public = no + printable = no ; writable = yes -; printable = no # access may be controlled by these options ; read list = user1, user2, @group ; valid users = user1, user3 diff --git a/packaging/PHT/TurboLinux/makefile-path.patch b/packaging/PHT/TurboLinux/makefile-path.patch deleted file mode 100644 index 88d5222e09a..00000000000 --- a/packaging/PHT/TurboLinux/makefile-path.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- samba-2.0.1/source/Makefile.in.orig Tue Dec 1 22:32:20 1998 -+++ samba-2.0.1/source/Makefile.in Wed Dec 2 17:11:33 1998 -@@ -25,9 +25,9 @@ - BINDIR = @bindir@ - # we don't use sbindir because we want full compatibility with - # the previous releases of Samba --SBINDIR = @bindir@ -+SBINDIR = @sbindir@ - LIBDIR = @libdir@ --VARDIR = @localstatedir@ -+VARDIR = /var/log/samba - MANDIR = @mandir@ diff --git a/packaging/PHT/TurboLinux/samba.pamd b/packaging/PHT/TurboLinux/samba.pamd dissimilarity index 100% index f38e70184af..225ab724ec9 100644 --- a/packaging/PHT/TurboLinux/samba.pamd +++ b/packaging/PHT/TurboLinux/samba.pamd @@ -1,2 +1,11 @@ -auth required /lib/security/pam_pwdb.so nullok shadow -account required /lib/security/pam_pwdb.so +#%PAM-1.0 +#[For version 1.0 syntax, the above header is optional] +# +# The PAM configuration file for the `samba' service +# +auth required /lib/security/pam_pwdb.so nullok nodelay # shadow audit +# auth required /lib/security/pam_smbpass.so nodelay +account required /lib/security/pam_pwdb.so audit nodelay +session required /lib/security/pam_pwdb.so nodelay +password required /lib/security/pam_pwdb.so # shadow md5 +#password required /lib/security/pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl index 668dddb0f6f..0633f62a7e7 100644 --- a/packaging/PHT/TurboLinux/samba2.spec.tmpl +++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl @@ -5,8 +5,7 @@ Release: PRELEASE Copyright: GNU GPL version 2 Group: Networking Source: ftp://samba.org/pub/samba/samba-PVERSION.tar.gz -Patch: makefile-path.patch -Patch1: smbw.patch +Patch: smbw.patch Requires: pam >= 0.64 kernel >= 2.2.1 glibc >= 2.1.2 Prereq: chkconfig fileutils BuildRoot: /var/tmp/samba @@ -69,12 +68,10 @@ http://samba.org/samba for this interesting program suite and lots of more information on SMB and NetBIOS over TCP/IP. There you also find explanation for conceps like NetBIOS name or share. -%description debugtools -This package contains programs that can be used to crash test any SMB -server. Please use it with care. If you do not need it then do NOT -install. - %changelog +* Tue Mar 27 2001 John H Terpstra +- Fixes to make 2.2 compile + * Sat Nov 04 2000 John H Terpstra - Put Symlink for libnss_wins.so back into main install section @@ -183,7 +180,6 @@ install. %prep %setup %patch -p1 -%patch1 -p1 %build @@ -191,38 +187,36 @@ cd source %ifarch ia64 libtoolize --copy --force # get it to recognize IA-64 -autoconf -autoheader -EXTRA="-D_LARGEFILE64_SOURCE" %endif +autoconf +autoheader NUMCPU=`grep processor /proc/cpuinfo | wc -l` CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \ --prefix=%{prefix} \ - --libdir=/etc \ + --libdir=/etc/samba \ --with-lockdir=/var/lock/samba \ --with-privatedir=/etc \ --with-swatdir=%{prefix}/share/swat \ --with-quotas \ --with-smbmount \ --with-pam \ + --with-pam_smbpass \ --with-profile \ --with-syslog \ --with-utmp \ - --with-vfs \ - --with-msdfs \ --with-netatalk \ --with-sambabook=%{prefix}/share/swat/using_samba + make -j${NUMCPU} all smbfilter nsswitch/libnss_wins.so -make -j${NUMCPU} smbtorture debug2html locktest2 -make -j${NUMCPU} masktest bin/smbspool -#make -j${NUMCPU} rpctorture locktest smbwrapper bin/wbinfo +make -j${NUMCPU} debug2html %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/etc/codepages/src +mkdir -p $RPM_BUILD_ROOT%{prefix}/share/samba/codepages/src +mkdir -p $RPM_BUILD_ROOT/etc/samba mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d} mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/lib @@ -238,19 +232,16 @@ mkdir -p $RPM_BUILD_ROOT/var/spool/samba # Install standard binary files for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \ make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool -# smbsh smbwrapper.so do install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin done -for i in addtosmbpass mksmbpasswd.sh smbtar +for i in mksmbpasswd.sh smbtar do install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin done # Install secure binary files -for i in smbd nmbd swat smbmount smbumount smbmnt debug2html \ - smbtorture smbfilter locktest2 masktest -# wbinfo +for i in smbd nmbd swat smbmount smbumount smbmnt debug2html smbfilter do install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/sbin done @@ -265,11 +256,11 @@ done # Install codepage source files for i in 437 737 775 850 852 861 866 932 936 949 950 1251 do -install -m644 source/codepages/codepage_def.$i $RPM_BUILD_ROOT/etc/codepages/src +install -m644 source/codepages/codepage_def.$i $RPM_BUILD_ROOT%{prefix}/samba/codepages/src done for i in 437 737 850 852 861 866 932 936 949 950 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI8-R do -install -m644 source/codepages/CP$i.TXT $RPM_BUILD_ROOT/etc/codepages/src +install -m644 source/codepages/CP$i.TXT $RPM_BUILD_ROO%{prefix}/samba/codepages/src done # Install the nsswitch library extension file @@ -277,6 +268,9 @@ install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib # Make link for wins resolver ( cd $RPM_BUILD_ROOT/lib; ln -s libnss_wins.so libnss_wins.so.2; ) +# Install PAM pam_smbpass.so +install -m644 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security + # Install SWAT helper files for i in swat/help/*.html docs/htmldocs/*.html do @@ -318,11 +312,10 @@ install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/smbmount.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/smbmnt.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 install -m644 docs/manpages/smbumount.8 $RPM_BUILD_ROOT%{prefix}/share/man/man8 -install -m644 packaging/PHT/TurboLinux/smb.conf $RPM_BUILD_ROOT/etc/smb.conf -install -m644 packaging/PHT/TurboLinux/smbusers $RPM_BUILD_ROOT/etc/smbusers +install -m644 packaging/PHT/TurboLinux/smb.conf $RPM_BUILD_ROOT/etc/samba/smb.conf +install -m644 packaging/PHT/TurboLinux/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers install -m755 packaging/PHT/TurboLinux/smbprint $RPM_BUILD_ROOT%{prefix}/bin install -m755 packaging/PHT/TurboLinux/findsmb $RPM_BUILD_ROOT%{prefix}/bin -install -m755 packaging/PHT/TurboLinux/smbadduser $RPM_BUILD_ROOT%{prefix}/bin install -m755 packaging/PHT/TurboLinux/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb install -m755 packaging/PHT/TurboLinux/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba install -m644 packaging/PHT/TurboLinux/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba @@ -341,14 +334,14 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig smb off # Build codepage load files -cd /etc +cd %{prefix}/share/samba for i in 437 737 775 850 852 861 866 932 936 949 950 1251 do -%{prefix}/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i +%{prefix}/bin/make_smbcodepage c $i %{prefix}/share/samba/codepages/src/codepage_def.$i %{prefix}/share/samba/codepages/codepage.$i done for i in 437 737 850 852 861 866 932 936 949 950 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI8-R do -%{prefix}/bin/make_unicodemap $i /etc/codepages/src/CP$i.TXT /etc/codepages/unicode_map.$i +%{prefix}/bin/make_unicodemap $i %{prefix}/share/samba/codepages/src/CP$i.TXT %{prefix}/share/samba/codepages/unicode_map.$i done # Add swat entry to /etc/services if not already there @@ -373,8 +366,8 @@ fi if [ $1 = 0 ] ; then /sbin/chkconfig --del smb - for n in /etc/codepages/*; do - if [ $n != /etc/codepages/src ]; then + for n in %{prefix}/share/samba/codepages/*; do + if [ $n != %{prefix}/share/samba/codepages/src ]; then rm -rf $n fi done @@ -396,8 +389,18 @@ 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 + +# Note: We MUST keep: +# winbindd_*, sshare_info*, printing*, ntdrivers* + + if [ -x /var/lock/samba ]; then + rm -f /var/lock/samba/browse.dat + rm -f /var/lock/samba/{brlock,connections,locking,messages}.tdb + if [ -e /var/lock/samba.d/namelist.debug ]; then + rm -f /var/lock/samba.d/namelist.debug + fi + rm -f /var/lock/samba/unexpected.tdb + rm -f /var/lock/samba/{smbd,nmbd}.pid fi # Remove swat entries from /etc/inetd.conf and /etc/services @@ -431,9 +434,8 @@ fi %attr(-,root,root) %{prefix}/sbin/smbd %attr(-,root,root) %{prefix}/sbin/nmbd %attr(-,root,root) %{prefix}/sbin/swat +%attr(-,root,root) %{prefix}/sbin/debug2html %attr(0750,root,root) %{prefix}/sbin/samba -%attr(-,root,root) %{prefix}/bin/addtosmbpass -%attr(-,root,root) %{prefix}/bin/mksmbpasswd.sh %attr(-,root,root) %{prefix}/bin/smbclient %attr(-,root,root) %{prefix}/bin/rpcclient %attr(-,root,root) %{prefix}/bin/testparm @@ -449,22 +451,21 @@ fi %attr(-,root,root) %{prefix}/bin/smbprint %attr(-,root,root) %{prefix}/bin/smbspool %attr(-,root,root) %{prefix}/bin/smbadduser -# %attr(0755,root,root) %{prefix}/bin/smbsh -# %attr(0755,root,root) %{prefix}/bin/smbwrapper.so %attr(755,root,root) /lib/libnss_wins.s* +%attr(755,root,root) /lib/security/pam_smbpass.so %attr(-,root,root) %{prefix}/share/swat/help/* %attr(-,root,root) %{prefix}/share/swat/images/* %attr(-,root,root) %{prefix}/share/swat/include/header.html %attr(-,root,root) %{prefix}/share/swat/include/footer.html %attr(-,root,root) %{prefix}/share/swat/using_samba/* -%attr(-,root,root) %config(noreplace) /etc/lmhosts -%attr(-,root,root) %config(noreplace) /etc/smb.conf -%attr(-,root,root) %config(noreplace) /etc/smbusers +%attr(-,root,root) %config(noreplace) /etc/samba/lmhosts +%attr(-,root,root) %config(noreplace) /etc/samba/smb.conf +%attr(-,root,root) %config(noreplace) /etc/samba/smbusers %attr(-,root,root) /etc/rc.d/init.d/smb %attr(-,root,root) /etc/logrotate.d/samba %attr(-,root,root) /etc/pam.d/samba -%attr(-,root,root) /etc/codepages/src/codepage_def.* -%attr(-,root,root) /etc/codepages/src/CP* +%attr(-,root,root) %{prefix}/share/samba/codepages/src/codepage_def.* +%attr(-,root,root) %{prefix}/share/samba/codepages/src/CP* # %attr(-,root,root) %{prefix}/share/man/man1/smbsh.1 %attr(-,root,root) %{prefix}/share/man/man1/make_smbcodepage.1 %attr(-,root,root) %{prefix}/share/man/man1/make_unicodemap.1 @@ -484,8 +485,8 @@ fi %attr(-,root,root) %{prefix}/share/man/man8/smbpasswd.8 %attr(-,root,root) %{prefix}/share/man/man8/swat.8 %attr(-,root,nobody) %dir /home/samba -%attr(-,root,root) %dir /etc/codepages -%attr(-,root,root) %dir /etc/codepages/src +%attr(-,root,root) %dir %{prefix}/share/samba/codepages +%attr(-,root,root) %dir %{prefix}/share/samba/codepages/src %attr(-,root,root) %dir /var/lock/samba %attr(-,root,root) %dir /var/log/samba %attr(1777,root,root) %dir /var/spool/samba @@ -499,12 +500,3 @@ fi %attr(-,root,root) %{prefix}/share/man/man8/smbmnt.8 %attr(-,root,root) %{prefix}/share/man/man8/smbmount.8 %attr(-,root,root) %{prefix}/share/man/man8/smbumount.8 - -%files debugtools -%attr(-,root,root) %{prefix}/sbin/smbtorture -#%attr(-,root,root) %{prefix}/sbin/rpctorture -%attr(-,root,root) %{prefix}/sbin/smbfilter -%attr(-,root,root) %{prefix}/sbin/debug2html -%attr(-,root,root) %{prefix}/sbin/locktest2 -#%attr(-,root,root) %{prefix}/sbin/wbinfo -%attr(-,root,root) %{prefix}/sbin/masktest diff --git a/packaging/README b/packaging/README index 8175ef9fd41..ce651377907 100644 --- a/packaging/README +++ b/packaging/README @@ -19,7 +19,7 @@ wants to just install Samba from the pristine source files contained under the ~/source directory. All contributions / modifications / additions / etc. to the packaging files -should be sent to samba-bugs@samba.org with the subject marked: +should be sent to samba-patches@samba.org with the subject marked: PACKAGING: [add|mod|contrib] Your subject. Should you, or anyone you know of, have package build instructions and/or files diff --git a/packaging/SGI/findsmb b/packaging/SGI/findsmb index c10efbf22a7..a48ec592e80 100755 --- a/packaging/SGI/findsmb +++ b/packaging/SGI/findsmb @@ -63,7 +63,7 @@ foreach $ip (@ipaddrs) # loop through each IP address found # get the first <00> name - @name = grep(/<00>/,@nmblookup); + @name = grep(/<00> - /,@nmblookup); $_ = @name[0]; if ($_) { # we have a netbios name if (/GROUP/) { # is it a group name diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl index cdbddcb590e..ba051495091 100755 --- a/packaging/SGI/idb.pl +++ b/packaging/SGI/idb.pl @@ -101,6 +101,7 @@ chdir $curdir; # the "*.doc" files from the source tree @docs = sort byfilename grep (!/^docs\/$/ & (/^source\/.*\.doc$/ | /^docs\//),@allfiles); @docs = grep(!/htmldocs\/using_samba/, @docs); +@docs = grep(!/docbook/, @docs); @swatfiles = sort grep(/^packaging\/SGI\/swat/, @allfiles); @catman = sort grep(/^packaging\/SGI\/catman/ & !/\/$/, @allfiles); diff --git a/packaging/SGI/mkrelease.sh b/packaging/SGI/mkrelease.sh index 19aa642aadd..6eab242de84 100755 --- a/packaging/SGI/mkrelease.sh +++ b/packaging/SGI/mkrelease.sh @@ -67,7 +67,7 @@ fi cd ../../source if [ "$doclean" = "clean" ]; then echo Create SGI specific Makefile - ./configure --prefix=/usr/samba --mandir=/usr/share/catman --with-smbwrapper + ./configure --prefix=/usr/samba --mandir=/usr/share/catman --with-acl-support --with-smbwrapper errstat=$? if [ $errstat -ne 0 ]; then echo "Error $errstat creating Makefile\n"; diff --git a/packaging/SGI/smb.conf b/packaging/SGI/smb.conf index 5172949cfcd..58d5e6e5428 100644 --- a/packaging/SGI/smb.conf +++ b/packaging/SGI/smb.conf @@ -96,18 +96,16 @@ browseable = no writeable = yes -; To allow Win95 clients to automatically load printer drivers, uncomment -; the following section (and the lines in the printers section below). -; Run the make_printerdef command to create the /usr/samba/lib/printers.def -; file (see the PRINTER_DRIVER.txt file in the docs directory for info). -; Copy all the required files to the /usr/samba/printer directory +; Use the new NT style printer download setup. +; See the file PRINTER_DRIVER2.txt in the docs directory for info. ; -;[printer$] +;[print$] ; comment = printer driver directory ; path = /usr/samba/printer ; guest ok = yes -; writeable = no -; browseable = no +; browseable = yes +; read only = yes +; write list = ntadmin [printers] comment = All Printers diff --git a/packaging/SGI/smbprint b/packaging/SGI/smbprint index 0db8b6f7e3a..07923a42b1e 100644 --- a/packaging/SGI/smbprint +++ b/packaging/SGI/smbprint @@ -49,6 +49,6 @@ password="" echo translate echo "print -" cat $* -) | /usr/samba/bin/smbclient "\\\\$server\\$service" $password -N -P > /dev/null +) | /usr/samba/bin/smbclient "//$server/$service" $password -N > /dev/null exit $? diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh index ea15eafbc34..b57e182e4a3 100755 --- a/packaging/Solaris/makepkg.sh +++ b/packaging/Solaris/makepkg.sh @@ -52,6 +52,38 @@ add_dynamic_entries() echo f none samba/bin/$binfile=source/bin/$binfile 0755 root other fi done + + # Add the scripts to bin/ + echo "#\n# Scripts \n#" + cd $DISTR_BASE/source/script + for shfile in * + do + if [ -f $shfile ]; then + echo f none samba/bin/$shfile=source/script/$shfile 0755 root other + fi + done + + # Add the manpages + echo "#\n# man pages \n#" + echo d none /usr ? ? ? + echo d none /usr/share ? ? ? + echo d none /usr/share/man ? ? ? + + # Create directories for man page sections if nonexistent + cd $DISTR_BASE/docs/manpages + for i in 1 2 3 4 5 6 7 8 9 + do + manpages=`ls *.$i 2>/dev/null` + if [ $? -eq 0 ] + then + echo d none /usr/share/man/man$i ? ? ? + for manpage in $manpages + do + echo f none /usr/share/man/man${i}/${manpage}=docs/manpages/$manpage 0644 root other + done + fi + done + echo "#\n# HTML documentation \n#" cd $DISTR_BASE list=`find docs/htmldocs -type d | grep -v "/CVS$"` @@ -151,4 +183,3 @@ then pkgtrans /tmp samba.pkg samba fi echo The samba package is in /tmp -rm -f prototype diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master index 8f98104cdde..bfcb3e00492 100644 --- a/packaging/Solaris/prototype.master +++ b/packaging/Solaris/prototype.master @@ -8,6 +8,7 @@ i pkginfo=./pkginfo i copyright=./copyright i request=./request +i checkinstall i preremove=./preremove i postinstall=./postinstall i i.swat=./i.swat @@ -15,7 +16,7 @@ i r.swat=./r.swat # # Stuff that goes into the system areas of the filesystem. # -d initscript /etc ? ? ? +d none /etc ? ? ? d initscript /etc/init.d ? ? ? f initscript /etc/init.d/samba.server=packaging/Solaris/samba.server 0744 root sys d initscript /etc/rc3.d ? ? ? @@ -23,8 +24,9 @@ s initscript /etc/rc3.d/S99samba.server=../init.d/samba.server # # Stuff to set up SWAT # -e swat /etc/services=packaging/Solaris/services ? ? ? -e swat /etc/inetd.conf=packaging/Solaris/inetd.conf ? ? ? +d swat /etc/inet ? ? ? +e swat /etc/inet/services=packaging/Solaris/services ? ? ? +e swat /etc/inet/inetd.conf=packaging/Solaris/inetd.conf ? ? ? # # Create the samba subtree. (Usually /usr/local/samba ) # @@ -34,44 +36,6 @@ d none samba/bin 0755 root other d none samba/lib 0755 root other d none samba/docs 0755 root other # -# Scripts -# -f none samba/bin/smbtar=source/script/smbtar 0755 root other -f none samba/bin/addtosmbpass=source/script/addtosmbpass 0755 root other -f none samba/bin/convert_smbpasswd=source/script/convert_smbpasswd 0755 root other -f none samba/bin/mksmbpasswd.sh=source/script/mksmbpasswd.sh 0755 root other -# -# man pages -# -d none /usr ? ? ? -d none /usr/share ? ? ? -d none /usr/share/man ? ? ? -d none /usr/share/man/man1 ? ? ? -d none /usr/share/man/man5 ? ? ? -d none /usr/share/man/man7 ? ? ? -d none /usr/share/man/man8 ? ? ? -f none /usr/share/man/man1/make_smbcodepage.1=docs/manpages/make_smbcodepage.1 0644 root other -f none /usr/share/man/man1/nmblookup.1=docs/manpages/nmblookup.1 0644 root other -f none /usr/share/man/man1/smbclient.1=docs/manpages/smbclient.1 0644 root other -f none /usr/share/man/man1/smbrun.1=docs/manpages/smbrun.1 0644 root other -f none /usr/share/man/man1/smbsh.1=docs/manpages/smbsh.1 0644 root other -f none /usr/share/man/man1/smbstatus.1=docs/manpages/smbstatus.1 0644 root other -f none /usr/share/man/man1/smbtar.1=docs/manpages/smbtar.1 0644 root other -f none /usr/share/man/man1/testparm.1=docs/manpages/testparm.1 0644 root other -f none /usr/share/man/man1/testprns.1=docs/manpages/testprns.1 0644 root other -f none /usr/share/man/man5/lmhosts.5=docs/manpages/lmhosts.5 0644 root other -f none /usr/share/man/man5/smb.conf.5=docs/manpages/smb.conf.5 0644 root other -f none /usr/share/man/man5/smbpasswd.5=docs/manpages/smbpasswd.5 0644 root other -f none /usr/share/man/man7/samba.7=docs/manpages/samba.7 0644 root other -f none /usr/share/man/man8/nmbd.8=docs/manpages/nmbd.8 0644 root other -f none /usr/share/man/man8/smbd.8=docs/manpages/smbd.8 0644 root other -f none /usr/share/man/man8/smbmnt.8=docs/manpages/smbmnt.8 0644 root other -f none /usr/share/man/man8/smbmount.8=docs/manpages/smbmount.8 0644 root other -f none /usr/share/man/man8/smbpasswd.8=docs/manpages/smbpasswd.8 0644 root other -f none /usr/share/man/man8/smbumount.8=docs/manpages/smbumount.8 0644 root other -f none /usr/share/man/man8/swat.8=docs/manpages/swat.8 0644 root other -f none /usr/share/man/man8/smbspool.8=docs/manpages/smbspool.8 0644 root other -# # Stuff that goes into lib # f none samba/lib/smb.conf.example=examples/smb.conf.default 0644 root other -- 2.11.4.GIT