Author: jerry Date: 2005-10-18 02:35:20 +0000 (Tue, 18 Oct 2005) New Revision: 11132
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11132 Log: updating package files from 3.0 Modified: trunk/packaging/Fedora/samba.spec.tmpl trunk/packaging/Fedora/smb.init trunk/packaging/RedHat/samba.spec.tmpl trunk/packaging/Solaris/makepkg.sh Changeset: Modified: trunk/packaging/Fedora/samba.spec.tmpl =================================================================== --- trunk/packaging/Fedora/samba.spec.tmpl 2005-10-18 02:33:07 UTC (rev 11131) +++ trunk/packaging/Fedora/samba.spec.tmpl 2005-10-18 02:35:20 UTC (rev 11132) @@ -196,6 +196,14 @@ install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir} rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.* +# make install puts libmsrpc.so in the wrong place on x86_64 +rm -f $RPM_BUILD_ROOT/usr/lib || true +mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir} +install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so +install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a +install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir} +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.* + mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat @@ -370,6 +378,7 @@ # %{_bindir}/editreg %{_bindir}/ntlm_auth %{_bindir}/pdbedit +%{_bindir}/eventlogadm %{_bindir}/profiles %{_bindir}/smbcquotas #%{_bindir}/vfstest Modified: trunk/packaging/Fedora/smb.init =================================================================== --- trunk/packaging/Fedora/smb.init 2005-10-18 02:33:07 UTC (rev 11131) +++ trunk/packaging/Fedora/smb.init 2005-10-18 02:35:20 UTC (rev 11132) @@ -37,40 +37,56 @@ # Check that we can write to it... so non-root users stop here [ -w /etc/samba/smb.conf ] || exit 0 +# Check whether "netbios disabled" is true +ISNETBIOSDISABLED=$(testparm -s 2>/dev/null | \ + sed -n '/\[global\]/,/^$/p' | \ + grep "disable netbios = Yes" | \ + awk 'BEGIN{FS=" = "}{print $2}') + RETVAL=0 start() { - KIND="SMB" + KIND="SMB" echo -n $"Starting $KIND services: " daemon smbd $SMBDOPTIONS RETVAL=$? echo - KIND="NMB" - echo -n $"Starting $KIND services: " - daemon nmbd $NMBDOPTIONS - RETVAL2=$? - echo - [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \ - RETVAL=1 + KIND="NMB" + if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then + echo -n $"Starting $KIND services: " + daemon nmbd $NMBDOPTIONS + RETVAL2=$? + echo + [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \ + RETVAL=1 + else + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/smb || \ + RETVAL=1 + fi return $RETVAL } stop() { - KIND="SMB" + KIND="SMB" echo -n $"Shutting down $KIND services: " killproc smbd -TERM RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid echo KIND="NMB" - echo -n $"Shutting down $KIND services: " - killproc nmbd -TERM - RETVAL2=$? - [ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid - [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb - echo "" + if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then + echo -n $"Shutting down $KIND services: " + killproc nmbd -TERM + RETVAL2=$? + [ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid + [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb + echo "" + else + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/smb + echo "" + fi return $RETVAL } Modified: trunk/packaging/RedHat/samba.spec.tmpl =================================================================== --- trunk/packaging/RedHat/samba.spec.tmpl 2005-10-18 02:33:07 UTC (rev 11131) +++ trunk/packaging/RedHat/samba.spec.tmpl 2005-10-18 02:35:20 UTC (rev 11132) @@ -127,7 +127,7 @@ # Install standard binary files for i in nmblookup smbclient smbpasswd smbstatus testparm \ rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net \ - smbcacls pdbedit tdbbackup smbtree ntlm_auth smbcquotas + smbcacls pdbedit eventlogadm tdbbackup smbtree ntlm_auth smbcquotas do install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin done @@ -187,6 +187,11 @@ install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{prefix}/lib/ install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/ +# libmsrpc +install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{prefix}/lib/ +install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{prefix}/lib/ +install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{prefix}/include/ + # Install the miscellany install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb @@ -426,6 +431,7 @@ %{prefix}/bin/smbcquotas %{prefix}/bin/smbcacls %{prefix}/bin/pdbedit +%{prefix}/bin/eventlogadm %{prefix}/bin/tdbbackup %{prefix}/bin/smbtree %attr(755,root,root) /lib/libnss_wins.s* Modified: trunk/packaging/Solaris/makepkg.sh =================================================================== --- trunk/packaging/Solaris/makepkg.sh 2005-10-18 02:33:07 UTC (rev 11131) +++ trunk/packaging/Solaris/makepkg.sh 2005-10-18 02:35:20 UTC (rev 11132) @@ -9,7 +9,7 @@ INSTALL_BASE=/opt/samba SBINPROGS="smbd nmbd winbindd swat" -BINPROGS="findsmb nmblookup pdbedit rpcclient smbclient smbcquotas smbspool smbtar tdbbackup testparm wbinfo net ntlm_auth profiles smbcacls smbcontrol smbpasswd smbstatus smbtree tdbdump" +BINPROGS="findsmb nmblookup eventlogadm pdbedit rpcclient smbclient smbcquotas smbspool smbtar tdbbackup testparm wbinfo net ntlm_auth profiles smbcacls smbcontrol smbpasswd smbstatus smbtree tdbdump" MSGFILES="de.msg en.msg fr.msg it.msg ja.msg nl.msg pl.msg tr.msg" VFSLIBS="audit.so default_quota.so extd_audit.so full_audit.so readonly.so shadow_copy.so cap.so expand_msdfs.so fake_perms.so netatalk.so recycle.so" DATFILES="lowcase.dat upcase.dat valid.dat" @@ -46,8 +46,14 @@ 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 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 + if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then echo "#\n# smbwrapper\n#" echo f none lib/smbwrapper.so 0755 root other
