rpms/nas/devel nasd_250453.patch, NONE, 1.1 nas.spec, 1.14, 1.15 nasd.init, 1.1, 1.2

[Frank Büttner (frankb)]

Author: frankb

Update of /cvs/extras/rpms/nas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30058

Modified Files:
	nas.spec nasd.init 
Added Files:
	nasd_250453.patch 
Log Message:
- fix for #250453 and first try for #250453


nasd_250453.patch:

--- NEW FILE nasd_250453.patch ---
diff -Naur nas-1.9.org/lib/audio/Aproto.h nas-1.9/lib/audio/Aproto.h
--- nas-1.9.org/lib/audio/Aproto.h	2006-08-13 20:33:08.000000000 +0200
+++ nas-1.9/lib/audio/Aproto.h	2007-08-11 17:58:47.000000000 +0200
@@ -99,7 +99,7 @@
 
 #define AU_DEFAULT_TCP_PORT		8000
 #define AU_DEFAULT_DECNET_TASK		"AUDIO$"
-#define AU_DEFAULT_UNIX_PATH		"/tmp/.sockets/audio"
+#define AU_DEFAULT_UNIX_PATH		"/var/run/nasd/audio"
 
 #define auFalse				0
 #define auTrue				1
diff -Naur nas-1.9.org/server/os/connection.c nas-1.9/server/os/connection.c
--- nas-1.9.org/server/os/connection.c	2007-03-18 07:55:09.000000000 +0100
+++ nas-1.9/server/os/connection.c	2007-08-11 19:05:02.000000000 +0200
@@ -203,10 +203,10 @@
 #ifdef hpux
 #define X_UNIX_DIR      "/usr/spool/sockets/audio"
 #define X_UNIX_PATH     "/usr/spool/sockets/audio/"
-#define OLD_UNIX_DIR    "/tmp/.sockets"
+#define OLD_UNIX_DIR    "/var/run/nasd"
 #else
-#define X_UNIX_DIR      "/tmp/.sockets"
-#define X_UNIX_PATH     "/tmp/.sockets/audio"
+#define X_UNIX_DIR      "/var/run/nasd"
+#define X_UNIX_PATH     "/var/run/nasd/audio"
 #endif
 #endif
 


Index: nas.spec
===================================================================
RCS file: /cvs/extras/rpms/nas/devel/nas.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nas.spec	4 May 2007 19:15:31 -0000	1.14
+++ nas.spec	11 Aug 2007 17:34:45 -0000	1.15
@@ -1,7 +1,7 @@
 Name:		nas	
 Summary:	The Network Audio System (NAS)
 Version:	1.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 BuildRequires:	bison flex
 %if "%{?fedora}" > "4" || "%{?rhel}" > "4"
 BuildRequires:	imake libXaw-devel libXpm-devel libXp-devel libXext-devel libXt-devel
@@ -19,6 +19,7 @@
 Source0: 	http://nas.codebrilliance.com/nas/nas-%{version}.src.tar.gz
 Source1:	http://apt.kde-redhat.org/apt/kde-redhat/SOURCES/nas/nasd.init
 Source2:	http://apt.kde-redhat.org/apt/kde-redhat/SOURCES/nas/nasd.sysconfig
+Patch0:		nasd_250453.patch
 Buildroot: 	%{_tmppath}/NAS-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(preun): chkconfig /sbin/service
 Requires(post):  chkconfig
@@ -50,9 +51,8 @@
 
 
 %prep
-
 %setup -q -n nas-%{version}
-
+%patch0 -p1
 
 %build
 xmkmf
@@ -114,6 +114,9 @@
 
 
 %changelog 
+* Sat Aug 11  2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9-3
+ - fix for bug #250453
+
 * Fri May 04 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.9-2%{?dist}
 - rebuild for the new ppc64 arch
 


Index: nasd.init
===================================================================
RCS file: /cvs/extras/rpms/nas/devel/nasd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nasd.init	13 Jul 2006 09:59:53 -0000	1.1
+++ nasd.init	11 Aug 2007 17:34:45 -0000	1.2
@@ -28,6 +28,11 @@
 #not for now	chmod g+rw /dev/sound/*
 
 #not for now daemon --user=$SERVICE $SERVICE $NASD_OPTIONS
+	#if running return 0
+	if [ -n "`/sbin/pidof $SERVICE`" ]; then
+		RETVAL=0
+		return $RETVAL
+	fi
 	daemon $SERVICE $NASD_OPTIONS
 	RETVAL=$?
 	echo
@@ -35,6 +40,11 @@
 	return $RETVAL
 }	
 stop() {
+	#if not running return 0
+	if [ -z "`/sbin/pidof $SERVICE`" ]; then
+		RETVAL=0
+		return $RETVAL
+	fi
 	killproc $SERVICE
 	RETVAL=$?
 	echo