The Samba-Bugzilla – Attachment 3454 Details for
Bug 5670
[PATCH] Packaging script fix for Solaris 10
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
samba-3.2.0-solaris-pkg.patch (text/plain), 3.31 KB, created by
Michal Ludvig
on 2008-08-05 07:23:33 UTC
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Michal Ludvig
Created:
2008-08-05 07:23:33 UTC
Size:
3.31 KB
patch
obsolete
>diff -u samba-3.2.0/packaging/Solaris/README samba-3.2.0/packaging/Solaris/README >--- samba-3.2.0/packaging/Solaris/README Wed Jul 2 00:33:07 2008 >+++ samba-3.2.0/packaging/Solaris/README Tue Aug 5 17:11:18 2008 >@@ -1,15 +1,13 @@ > > INSTRUCTIONS: Preparing Samba packages for Solaris > >+Make sure that your $PATH contains directories /usr/sfw/bin and /usr/ccs/bin >+ > To produce a package: > >-* Type sh makepkg.sh >+* Type sh makepkg.sh build > > The package will be created in the /tmp directory. > >-By default, the package will be built to install samba in /usr/local >+By default, the package will be built to install samba in /opt/samba > To change the default, modify the INSTALL_BASE variable in makepkg.sh >-This is after you have configured samba with a --prefix option of the >-alternate samba location and then created the binaries. >- >- >diff -u samba-3.2.0/packaging/Solaris/makepkg.sh samba-3.2.0/packaging/Solaris/makepkg.sh >--- samba-3.2.0/packaging/Solaris/makepkg.sh Wed Jul 2 00:33:07 2008 >+++ samba-3.2.0/packaging/Solaris/makepkg.sh Tue Aug 5 23:17:12 2008 >@@ -1,4 +1,4 @@ >-#!/bin/sh >+#!/bin/sh -e > # > # Copyright (C) Shirish A Kalele 2000 > # Copyright (C) Gerald Carter 2004 >@@ -50,13 +50,13 @@ > > echo "#\n# libsmbclient\n#" > echo f none lib/libsmbclient.so 0755 root other >- echo f none lib/libsmbclient.a 0755 root other >+ #echo f none lib/libsmbclient.a 0755 root other > echo f none include/libsmbclient.h 0644 root other > > echo "#\n# libmsrpc\n#" >- echo f none lib/libmsrpc.so 0755 root other >- echo f none lib/libmsrpc.a 0755 root other >- echo f none include/libmsrpc.h 0644 root other >+ #echo f none lib/libmsrpc.so 0755 root other >+ #echo f none lib/libmsrpc.a 0755 root other >+ #echo f none include/libmsrpc.h 0644 root other > > if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then > echo "#\n# smbwrapper\n#" >@@ -76,17 +76,19 @@ > echo "#\n# man pages \n#" > > # Create directories for man page sections if nonexistent >- cd man >+ cd share/man > for i in 1 2 3 4 5 6 7 8 9; do >+ set +e > manpages=`ls man$i 2>/dev/null` >+ set -e > if [ $? -eq 0 ]; then >- echo d none man/man${i} ? ? ? >+ echo d none share/man/man${i} ? ? ? > for manpage in $manpages; do >- echo f none man/man${i}/${manpage} 0644 root other >+ echo f none share/man/man${i}/${manpage} 0644 root other > done > fi > done >- cd .. >+ cd ../.. > > echo "#\n# SWAT \n#" > list=`find swat -type d | grep -v "/.svn$"` >@@ -128,7 +130,7 @@ > > cd $DISTR_BASE/source > >-if test "x$1" = "xbuild" ]; then >+if test "x$1" = "xbuild" -o ! -f bin/smbd ]; then > ./configure --prefix=$INSTALL_BASE \ > --localstatedir=/var/lib/samba \ > --with-piddir=/var/run \ >@@ -136,6 +138,7 @@ > --with-privatedir=/etc/samba/private \ > --with-configdir=/etc/samba \ > --with-lockdir=/var/lib/samba \ >+ --with-mandir=/usr/share/man \ > --with-pam --with-acl-support \ > --with-quotas --with-included-popt \ > && make >@@ -146,7 +149,8 @@ > fi > fi > >-mkdir $TMPINSTALLDIR >+rm -rf $TMPINSTALLDIR >+mkdir -p $TMPINSTALLDIR > make DESTDIR=$TMPINSTALLDIR install > > ## clear out *.old >@@ -155,6 +159,8 @@ > ## > ## Now get the install locations > ## >+LD_LIBRARY_PATH=$DISTR_BASE/source/bin >+export LD_LIBRARY_PATH > SBINDIR=`bin/smbd -b | grep SBINDIR | awk '{print $2}'` > BINDIR=`bin/smbd -b | grep BINDIR | grep -v SBINDIR | awk '{print $2}'` > SWATDIR=`bin/smbd -b | grep SWATDIR | awk '{print $2}'`
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
kseeger
:
review?
(
ira
)
Actions:
View
Attachments on
bug 5670
: 3454