--- atsar_linux-1.7/include/atsar.h.orig	2004-07-08 16:56:18 +0400
+++ atsar_linux-1.7/include/atsar.h	2006-09-13 17:40:41 +0400
@@ -19,7 +19,7 @@
 #define	ATMAGIC		0xfeedbabe
 
 #define	ATOUTF		"/var/log/atsar/atsa%02d"
-#define	ATEXEC		"/usr/local/bin/atsadc"
+#define	ATEXEC		"/usr/bin/atsadc"
 #define	MAXNET		32	/* must be power of 2 !! */
 
 /*
--- atsar_linux-1.7/scripts/atsa1.orig	2004-07-08 16:56:18 +0400
+++ atsar_linux-1.7/scripts/atsa1	2006-09-13 17:41:22 +0400
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-COMDIR=/usr/local/bin
+COMDIR=/usr/bin
 LOGDIR=/var/log/atsar
 CURDAY=`date +%d`
 
--- atsar_linux-1.7/Makefile.orig	2004-07-08 16:56:18 +0400
+++ atsar_linux-1.7/Makefile	2006-09-13 17:34:47 +0400
@@ -19,18 +19,18 @@
 
 install:
 	if [ ! -d /var/log/atsar ]; then mkdir /var/log/atsar; fi
-	if [ ! -d /usr/local/man/man1  ]; then mkdir -p /usr/local/man/man1; fi
-	cp man/*             /usr/local/man/man1
-	cp atsar/atsar       /usr/local/bin
-	chmod 755            /usr/local/bin/atsar
-	cp atsadc/atsadc     /usr/local/bin
-	chmod 755            /usr/local/bin/atsadc
-	cp scripts/atsa1     /usr/local/bin
-	chmod 755            /usr/local/bin/atsa1
-	cp scripts/atsaftp   /usr/local/bin
-	chmod 755            /usr/local/bin/atsaftp
-	cp scripts/atsahttp  /usr/local/bin
-	chmod 755            /usr/local/bin/atsahttp
+	if [ ! -d /usr/man/man1  ]; then mkdir -p /usr/man/man1; fi
+	cp man/*             /usr/man/man1
+	cp atsar/atsar       /usr/bin
+	chmod 755            /usr/bin/atsar
+	cp atsadc/atsadc     /usr/bin
+	chmod 755            /usr/bin/atsadc
+	cp scripts/atsa1     /usr/bin
+	chmod 755            /usr/bin/atsa1
+	cp scripts/atsaftp   /usr/bin
+	chmod 755            /usr/bin/atsaftp
+	cp scripts/atsahttp  /usr/bin
+	chmod 755            /usr/bin/atsahttp
 	cp atsar_linux.init  /etc/rc.d/init.d/atsar
 	chmod 755            /etc/rc.d/init.d/atsar
 	cp atsar_linux.cron  /etc/cron.d/atsar
@@ -38,4 +38,4 @@
 	if [ -f /var/log/atsar/ftpstat ];  then rm /var/log/atsar/ftpstat; fi
 	if [ -f /var/log/atsar/httpstat ]; then rm /var/log/atsar/httpstat; fi
 	if [ -f /var/log/atsar/atsa`date +%d` ]; then rm /var/log/atsar/atsa`date +%d`; fi
-	/usr/local/bin/atsa1
+	/usr/bin/atsa1
--- atsar_linux-1.7/atsar_linux.conf.orig	2004-07-08 16:56:18 +0400
+++ atsar_linux-1.7/atsar_linux.conf	2006-09-13 17:42:02 +0400
@@ -19,4 +19,4 @@
 FTP     /var/log/xferlog                        generic_log
 
 HTTP    /var/log/httpd/access_log               generic_access
-HTTP    /usr/local/apache/logs/access_log       generic_access
+HTTP    /var/log/httpd/logs/access_log       generic_access
--- atsar_linux-1.7/atsar_linux.cron.orig	2004-07-08 16:56:18 +0400
+++ atsar_linux-1.7/atsar_linux.cron	2006-09-13 17:42:09 +0400
@@ -1,2 +1,2 @@
-0     *    * * 0-6 root [ -f /var/lock/subsys/atsar ] && /usr/local/bin/atsa1
-20,40 8-17 * * 1-5 root [ -f /var/lock/subsys/atsar ] && /usr/local/bin/atsa1
+0     *    * * 0-6 root [ -f /var/lock/subsys/atsar ] && /usr/bin/atsa1
+20,40 8-17 * * 1-5 root [ -f /var/lock/subsys/atsar ] && /usr/bin/atsa1
--- atsar_linux-1.7/atsar_linux.init.orig	2004-07-08 16:56:18 +0400
+++ atsar_linux-1.7/atsar_linux.init	2006-09-13 17:43:13 +0400
@@ -7,41 +7,42 @@
 # description:	Atsar is a system activity report logging system.
 #
 
-# Source function library.
-if [ -f /etc/rc.d/init.d/functions ]
-then
-	. /etc/rc.d/init.d/functions
-else
-	alias daemon=nice
-fi
+WITHOUT_RC_COMPAT=1
 
-# Check binaries and configuration files.
-[ -f /usr/local/bin/atsadc ] || exit 0
+. /etc/init.d/functions
+
+DAEMON=/usr/bin/atsadc
+PIDFILE=/var/run/atsadc.pid
+LOCKFILE=/var/lock/subsys/atsar
+RETVAL=0
 
 RETVAL=0
 
-# See how we were called.
 case "$1" in
   start)
-	# Run atsadc.
-	echo -n "Initializing atsar logging: "
-	daemon /usr/local/bin/atsadc /var/log/atsar/atsa`date +%d`
+#	echo -n "Initializing atsar logging: "
+	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- atsadc /var/log/atsar/atsa`date +%d`
 	RETVAL=$?
         rm -f /var/log/atsar/ftpstat  2> /dev/null
         rm -f /var/log/atsar/httpstat 2> /dev/null
 
 	if [ -f /etc/atsar.conf ]
 	then
-		/usr/local/bin/atsaftp
-		/usr/local/bin/atsahttp
+		/usr/bin/atsaftp
+		/usr/bin/atsahttp
 	fi
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/atsar
+#	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/atsar
 	;;
   stop)
-	rm -f /var/lock/subsys/atsar
+	stop_daemon --lockfile "$LOCKFILE" -- atsadc
+	RETVAL=$?
+	rm -f $PIDFILE
+#	rm -f /var/lock/subsys/atsar
 	;;
   status)
+	status -- atsadc
+	RETVAL=$?
 	;;
   reload)
 	$0 stop