diff options
| author | John Terpstra <jht@samba.org> | 2001-05-18 23:24:31 +0000 |
|---|---|---|
| committer | John Terpstra <jht@samba.org> | 2001-05-18 23:24:31 +0000 |
| commit | 28cca03c2bbd793a3e8f57f77698b470098a2b7a (patch) | |
| tree | b9495790123c4be2c0aa625760204867ad1be5e5 /packaging/Caldera | |
| parent | 6a8547f03d885ad9314c1084d17eff72817a6da2 (diff) | |
| download | samba-28cca03c2bbd793a3e8f57f77698b470098a2b7a.tar.gz samba-28cca03c2bbd793a3e8f57f77698b470098a2b7a.tar.xz samba-28cca03c2bbd793a3e8f57f77698b470098a2b7a.zip | |
Adding Ron Record's patches.
Diffstat (limited to 'packaging/Caldera')
| -rwxr-xr-x | packaging/Caldera/OpenServer/Install | 2 | ||||
| -rw-r--r-- | packaging/Caldera/OpenServer/pkg/input/Samba.pkg | 6 | ||||
| -rwxr-xr-x | packaging/Caldera/UnixWare/Install | 7 | ||||
| -rw-r--r-- | packaging/Caldera/UnixWare/pkg/prototype | 3 |
4 files changed, 7 insertions, 11 deletions
diff --git a/packaging/Caldera/OpenServer/Install b/packaging/Caldera/OpenServer/Install index 1065fcdec32..ab27b6f67fa 100755 --- a/packaging/Caldera/OpenServer/Install +++ b/packaging/Caldera/OpenServer/Install @@ -54,7 +54,7 @@ for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \ do $V install -m755 -s source/bin/$i ${BLDFIX}/bin done -for i in addtosmbpass mksmbpasswd.sh smbtar +for i in mksmbpasswd.sh smbtar do $V install -m755 source/script/$i ${BLDFIX}/bin done diff --git a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg index 986eb11218a..ea76e74a610 100644 --- a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg +++ b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg @@ -146,12 +146,6 @@ owner = root group = sys flags = -FILE:Samba:SHARED:usr/local/samba/bin/addtosmbpass: -mode = 0755 -owner = root -group = sys -flags = - FILE:Samba:SHARED:usr/local/samba/bin/mksmbpasswd.sh: mode = 0755 owner = root diff --git a/packaging/Caldera/UnixWare/Install b/packaging/Caldera/UnixWare/Install index a379d08400d..3fffc37d25a 100755 --- a/packaging/Caldera/UnixWare/Install +++ b/packaging/Caldera/UnixWare/Install @@ -30,7 +30,10 @@ $V mkdir -p ${BLDFIX}/var/locks $V mkdir -p ${BLDFIX}/lib/codepages/src # Copy into the dist tree the pkg data files -$V cp pkg/* ${BUILD_ROOT} +for i in pkg/* +do + [ -f $i ] && $V cp $i ${BUILD_ROOT} +done cd ../../.. @@ -41,7 +44,7 @@ for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \ do $V install -m755 -s source/bin/$i ${BLDFIX}/bin done -for i in addtosmbpass mksmbpasswd.sh smbtar +for i in mksmbpasswd.sh smbtar do $V install -m755 source/script/$i ${BLDFIX}/bin done diff --git a/packaging/Caldera/UnixWare/pkg/prototype b/packaging/Caldera/UnixWare/pkg/prototype index 273678ab522..13a64b6feb1 100644 --- a/packaging/Caldera/UnixWare/pkg/prototype +++ b/packaging/Caldera/UnixWare/pkg/prototype @@ -24,7 +24,6 @@ f samba usr/local/samba/bin/rpcclient 0755 root sys f samba usr/local/samba/bin/smbspool 0755 root sys f samba usr/local/samba/bin/smbsh 0755 root sys f samba usr/local/samba/bin/smbwrapper.so 0755 root sys -f samba usr/local/samba/bin/addtosmbpass 0755 root sys f samba usr/local/samba/bin/mksmbpasswd.sh 0755 root sys f samba usr/local/samba/bin/smbtar 0755 root sys f samba usr/local/samba/bin/smbprint 0755 root sys @@ -220,7 +219,7 @@ f samba usr/local/samba/swat/help/lmhosts.5.html 0644 root sys f samba usr/local/samba/swat/help/make_smbcodepage.1.html 0644 root sys f samba usr/local/samba/swat/help/nmbd.8.html 0644 root sys f samba usr/local/samba/swat/help/nmblookup.1.html 0644 root sys -f samba usr/local/samba/swat/help/rpcclient.8.html 0644 root sys +f samba usr/local/samba/swat/help/rpcclient.1.html 0644 root sys f samba usr/local/samba/swat/help/samba-pdc-faq.html 0644 root sys f samba usr/local/samba/swat/help/samba-pdc-howto.html 0644 root sys f samba usr/local/samba/swat/help/samba.7.html 0644 root sys |