Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2d46f67cd5e3060d494abca314fe5f62963540a3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2d46f67cd5e3060d494abca314fe5f62963540a3)
  • Date: Sun, 29 Jul 2012 07:01:29 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/samba/DETAILS | 3 ++-
net/samba/HISTORY | 5 +++++
net/samba/init.d/samba | 21 ++++++++++-----------
3 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 2d46f67cd5e3060d494abca314fe5f62963540a3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: fixed longer starting/stopping (don't resolve numeric IPs and
ports)

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 739d208..ffe76e4 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,5 +1,7 @@
SPELL=samba
VERSION=3.6.6
+ SECURITY_PATCH=18
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
@@ -12,7 +14,6 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2

SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=18
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 6c879d8..e11d37b 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,8 @@
+2012-07-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * init.d/samba: fixed bug about start/stop for a long time when
running
+ plenty of services; added 445 default tcp port; cleaned up restart()
+
2012-07-15 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: libcap becomes optional; added missing optional deps

diff --git a/net/samba/init.d/samba b/net/samba/init.d/samba
index 1db8804..b521886 100644
--- a/net/samba/init.d/samba
+++ b/net/samba/init.d/samba
@@ -14,12 +14,12 @@ start()
if [ ! -e /var/run/samba ]; then
mkdir /var/run/samba
fi &&
- if ! netstat -l --udp | grep -q netbios-ns ; then
+ if ! netstat -nl --udp | grep -q ":137" ; then
echo "Starting NetBIOS nameserver ..."
loadproc /usr/sbin/nmbd ${ARGS}
evaluate_retval
fi &&
- if ! netstat -l --tcp | grep -q netbios-ssn ; then
+ if ! netstat -nl --tcp | grep -q ":139\|:445" ; then
echo "Starting NetBIOS sessions ..."
loadproc /usr/sbin/smbd ${ARGS}
evaluate_retval
@@ -28,14 +28,14 @@ start()
#
stop()
{
- if netstat -l --udp | grep -q netbios-ns ; then
+ if netstat -nl --udp | grep -q ":137" ; then
if ps -C nmbd | grep -q nmbd ; then
echo "Stopping NetBIOS nameserver ..."
killproc /usr/sbin/nmbd
evaluate_retval
fi
fi &&
- if netstat -l --tcp | grep -q netbios-ssn ; then
+ if netstat -nl --tcp | grep -q ":139\|:445" ; then
if ps -C smbd | grep -q smbd; then
echo "Stopping NetBIOS sessions ..."
killproc /usr/sbin/smbd
@@ -46,7 +46,7 @@ stop()
#
status()
{
- if netstat -l --udp | grep -q netbios-ns ; then
+ if netstat -nl --udp | grep -q ":137" ; then
if ! ps -C nmbd | grep -q nmbd; then
echo "NetBIOS nameserver : xinetd"
evaluate_retval
@@ -56,7 +56,7 @@ status()
evaluate_retval
fi
fi &&
- if netstat -l --tcp | grep -q netbios-ssn ; then
+ if netstat -nl --tcp | grep -q ":139\|:445" ; then
if ! ps -C smbd | grep -q smbd ; then
echo "NetBIOS sessions : xinetd"
evaluate_retval
@@ -68,9 +68,8 @@ status()
fi
}

-restart(){
-
- stop &&
-
- start
+restart() {
+ stop &&
+ sleep 1 &&
+ start
}



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2d46f67cd5e3060d494abca314fe5f62963540a3), Vlad Glagolev, 07/29/2012

Archive powered by MHonArc 2.6.24.

Top of Page