From 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Dec 1999 13:27:58 +0000 Subject: first pass at updating head branch to be to be the same as the SAMBA_2_0 branch (This used to be commit 453a822a76780063dff23526c35408866d0c0154) --- packaging/SGI/idb.pl | 15 +++++++++++++-- packaging/SGI/inst.msg | 2 +- packaging/SGI/mkman | 5 ++++- packaging/SGI/mkrelease.sh | 10 ++++------ packaging/SGI/sambalp | 11 +++++++++-- packaging/SGI/smb.conf | 10 ++++++++++ 6 files changed, 41 insertions(+), 12 deletions(-) (limited to 'packaging/SGI') diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl index cc44627273..a7f3c574a7 100755 --- a/packaging/SGI/idb.pl +++ b/packaging/SGI/idb.pl @@ -8,6 +8,15 @@ $curdir = $ENV{"PWD"}; # We don't want the files listed in .cvsignore in the source tree open(IGNORES,"../../source/.cvsignore") || die "Unable to open .cvsignore file\n"; +while () { + chop; + next if /cvs\.log/; + $ignores{$_}++; +} +close IGNORES; + +# We don't want the files listed in .cvsignore in the source/include tree +open(IGNORES,"../../source/include/.cvsignore") || die "Unable to open include/.cvsignore file\n"; while () { chop; $ignores{$_}++; @@ -32,6 +41,7 @@ if (@sprogs) { } if (@progs) { @progs[0] =~ s/^.*\=//; + @progs[0] =~ s/\$\(\S+\)\s//g; @progs = split(' ',@progs[0]); } if (@mprogs) { @@ -48,6 +58,7 @@ if (@progs2) { } if (@scripts) { @scripts[0] =~ s/^.*\=//; + @scripts[0] =~ s/\$\(srcdir\)\///g; @scripts = split(' ',@scripts[0]); } if (@codepage) { @@ -177,7 +188,7 @@ while (@sorted) { print IDB "d 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n"; } else { - if (grep((/\.sh$/ | /\.pl$/ | /mkman$/),$nextfile)) { + if (grep((/\.sh$/ | /configure$/ | /configure\.developer/ | /config\.guess/ | /config\.sub/ | /\.pl$/ | /mkman$/),$nextfile)) { print IDB "f 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n"; } else { @@ -210,7 +221,7 @@ while (@catman) { $nextfile = shift @catman; ($file = $nextfile) =~ s/^packaging\/SGI\/catman\///; ($dirnum = $file) =~ s/^[\D]*//; - $dirnum =~ s/\.Z//; + $dirnum =~ s/\.z//; if ($dirnum ne $olddirnum) { print IDB "d 0755 root sys usr/share/catman/u_man/cat$dirnum packaging/SGI samba.man.manpages\n"; $olddirnum = $dirnum; diff --git a/packaging/SGI/inst.msg b/packaging/SGI/inst.msg index c613a09d01..248e990c4a 100755 --- a/packaging/SGI/inst.msg +++ b/packaging/SGI/inst.msg @@ -2,7 +2,7 @@ echo echo -echo Samba for IRIX has been installed on your system. +echo Samba has been installed on your system. echo echo Your /etc/services and /etc/inetd.conf files have echo been modified to automatically start the diff --git a/packaging/SGI/mkman b/packaging/SGI/mkman index 4de437d0ad..a39ed9fdd0 100755 --- a/packaging/SGI/mkman +++ b/packaging/SGI/mkman @@ -9,7 +9,10 @@ FILES="*.?" cd ../../docs/manpages for FILE in $FILES ; do + if [ "$FILE" = "smbmnt.8" ]; then continue; fi; + if [ "$FILE" = "smbmount.8" -o "$FILE" = "smbumount.8" ]; then continue; fi; + if [ "$FILE" = "smbrun.1" ]; then continue; fi; neqn $FILE | tbl | nroff -man > ../../packaging/SGI/catman/`basename $FILE` - compress -f ../../packaging/SGI/catman/`basename $FILE` + pack -f ../../packaging/SGI/catman/`basename $FILE` done cd ../../packaging/SGI diff --git a/packaging/SGI/mkrelease.sh b/packaging/SGI/mkrelease.sh index cfe9c1f6b8..19aa642aad 100755 --- a/packaging/SGI/mkrelease.sh +++ b/packaging/SGI/mkrelease.sh @@ -14,6 +14,7 @@ doclean="" SGI_ABI=-n32 +ISA=-mips3 CC=cc if [ ! -f ../../source/Makefile ]; then @@ -25,6 +26,7 @@ if [ "$1" = "clean" ]; then shift elif [ "$1" = "5" ]; then SGI_ABI=-32 + ISA="" shift fi @@ -35,10 +37,11 @@ if [ "$1" = "clean" ]; then shift elif [ "$1" = "5" ]; then SGI_ABI=-32 + ISA="" shift fi -export SGI_ABI CC +export SGI_ABI ISA CC if [ "$doclean" = "clean" ]; then cd ../../source @@ -64,11 +67,6 @@ fi cd ../../source if [ "$doclean" = "clean" ]; then echo Create SGI specific Makefile - chmod +x configure - chmod +x configure.developer - chmod +x config.guess - chmod +x config.status - chmod +x config.sub ./configure --prefix=/usr/samba --mandir=/usr/share/catman --with-smbwrapper errstat=$? if [ $errstat -ne 0 ]; then diff --git a/packaging/SGI/sambalp b/packaging/SGI/sambalp index fd0cef8f93..61e62215c9 100644 --- a/packaging/SGI/sambalp +++ b/packaging/SGI/sambalp @@ -146,5 +146,12 @@ if ($PSFIX) { # are we running a "psfix"? system("$lpcommand $file"); } -# Remove the file only if it lives in /usr/tmp, /tmp, or /var/tmp. -unlink($file) if $file =~ m=^(/(usr|var))?/tmp=; +if ($file =~ m(^/)) { + # $file is a fully specified path + # Remove the file only if it lives in a directory ending in /tmp. + unlink($file) if ($file =~ m(/tmp/[^/]+$)); +} else { + # $file is NOT a fully specified path + # Remove the file only if current directory ends in /tmp. + unlink($file) if (`pwd` =~ m(/tmp$)); +} diff --git a/packaging/SGI/smb.conf b/packaging/SGI/smb.conf index 9a154f8f9b..68187ee288 100644 --- a/packaging/SGI/smb.conf +++ b/packaging/SGI/smb.conf @@ -76,6 +76,16 @@ preserve case = yes short preserve case = yes +; These are the settings required for IRIX password sync + passwd program = /usr/bin/passwd %u + passwd chat = *ew*password:* %n\n *e-enter*new*password:* %n\n + +; Uncomment the following if you wish to use encrypted passwords. +; encrypt passwords = yes + +; Uncomment the following if you wish to sync unix and smbpasswd +; unix password sync = yes + [homes] comment = Home Directories browseable = no -- cgit