This is an autogenerated patch header for a single-debian-patch file. The
delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.

--- fwanalog-0.6.9.orig/fwanalog.analog.conf
+++ fwanalog-0.6.9/fwanalog.analog.conf
@@ -11,7 +11,7 @@ APACHEDEFAULTLOGFORMAT (%h %l %u %t \"%r
 
 # Include the port number to name assignments.
 # If you prefer "21" instead of "ftp", simply comment it out. 
-CONFIGFILE ./services.conf
+CONFIGFILE /usr/share/fwanalog/services.conf
 
 # No logos and images, please.
 LOGO none
@@ -45,8 +45,8 @@ REQUEST OFF		# the directory report is b
 PROCTIME OFF	# Processing time, not very interesting
 
 # Get the (slightly modified) language strings from this file
-LANGFILE ./fwanalog.lng
-DOMAINSFILE ./fwanalog-dom.tab
+LANGFILE /usr/share/fwanalog/fwanalog.lng
+DOMAINSFILE /usr/share/fwanalog/fwanalog-dom.tab
 
 DNS WRITE
 # Resolve IP addresses to names and write them into the domains file
--- fwanalog-0.6.9.orig/fwanalog.opts.linux24
+++ fwanalog-0.6.9/fwanalog.opts.linux24
@@ -7,7 +7,7 @@
 #	$Id: fwanalog.opts.linux24,v 1.18 2005/02/24 15:59:34 bb Exp $
 #
 ###########################################################################
-outdir="/root/fwanalog.out"
+outdir="/var/log/fwanalog"
 # The directory where the output goes to, without / at the end. You need write
 # permissions, of course, and should secure this directory with permissions,
 # minefields, guard dogs etc. It will be created if you don`t have it yet.
@@ -39,7 +39,7 @@ logformat="iptables"
 
 inputfiles_mask="messages*"	# The name of your logfiles, with a wildcard if you want
 inputfiles_dir="/var/log"	# The directory where your logfiles are in,
-							# 	e.g. /var/log
+				# 	e.g. /var/log
 inputfiles_mtime="31"		# How old the logfiles can be
 # You can change this to your log rotate interval + 1 day (so you never miss a logfile entry)
 inputfiles=`find $inputfiles_dir -maxdepth 1 -name "$inputfiles_mask" -mtime -$inputfiles_mtime | sort -r`
--- fwanalog-0.6.9.orig/fwanalog.sh
+++ fwanalog-0.6.9/fwanalog.sh
@@ -154,7 +154,7 @@ main ()
 		cd `dirname $0`
 	
 		# Load the user-settable options from the config file
-		. ./`basename $0 | $sed 's/sh$/opts/'`
+		. /etc/fwanalog/fwanalog.opts
 	fi
 
 	if [ -z "$inputfiles" ]; then
@@ -265,11 +265,12 @@ main ()
 	echo "DNSFILE $outdir/analog-domains.tab" > "$genconffile"
 	echo "DNSLOCKFILE $outdir/analog-domains.lck" >> "$genconffile" 
 	echo "LOGFILE $outdir/fwanalog.all.log*" >> "$genconffile"
-	echo "CONFIGFILE ./fwanalog.analog.conf.local" >> "$genconffile"
+	#echo "CONFIGFILE ./fwanalog.analog.conf.local" >> "$genconffile"
+	echo "CONFIGFILE /etc/fwanalog/fwanalog.analog.conf.local" >> "$genconffile"
 
 	# Call analog for today with ascii output, suitable for an e-mailed daily report
 	$yesterday_only || $analog \
-			-G +g./fwanalog.analog.conf $analogopts \
+			-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 			-C"OUTFILE $outdir/today.txt" -C"OUTPUT ASCII" -d -W -m -4 -o -z -f -v \
 			-C"GOTOS OFF" -C"RUNTIME OFF" -C"LASTSEVEN OFF" \
 			+F$TODAY $noemptyreportwarning \
@@ -278,7 +279,7 @@ main ()
 
 	# Call analog for yesterday with ascii output, suitable for an e-mailed daily report
 	$yesterday_only && $analog \
-			-G +g./fwanalog.analog.conf $analogopts \
+			-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 			-C"OUTFILE $outdir/yesterday.txt" -C"OUTPUT ASCII" -d -W -m -4 -o -z -f -v \
 			-C"GOTOS OFF" -C"RUNTIME OFF" -C"LASTSEVEN OFF" \
 			+F-00-00-01:0000 +T-00-00-01:2359 $noemptyreportwarning \
@@ -300,7 +301,7 @@ main ()
 	
 	# Call analog with all data
 	$datelimit || $analog \
-			-G +g./fwanalog.analog.conf $analogopts \
+			-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 			-C"OUTFILE $outdir/alldates.html" \
 			+g"$genconffile" \
 			2>> $outdir/analog.err
@@ -308,7 +309,7 @@ main ()
 	if [ X"$reportmagic" = "Xtrue" ]; then
 		# Call analog with all data for ReportMagic
 		$datelimit || $analog \
-				-G +g./fwanalog.analog.conf $analogopts \
+				-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 				-C"OUTFILE $outdir/alldates.dat" -C"OUTPUT COMPUTER" \
 				+g"$genconffile" \
 				2>> $outdir/analog.err
@@ -326,7 +327,7 @@ main ()
 	
 	# Call analog for today, with the additional quarter-hour-report
 	$yesterday_only || $analog \
-			-G +g./fwanalog.analog.conf $analogopts \
+			-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 			-C"OUTFILE $outdir/today.html" -d -W -m \+4 \
 			+F$TODAY $noemptyreportwarning \
 			+g"$genconffile" \
@@ -334,7 +335,7 @@ main ()
 
 	# Call analog for yesterday if -y was specified, with html output
 	$yesterday_only && $analog \
-			-G +g./fwanalog.analog.conf $analogopts \
+			-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 			-C"OUTFILE $outdir/yesterday.html" -d -W -m \+4 \
 			-C"LASTSEVEN OFF" \
 			+F-00-00-01:0000 +T-00-00-01:2359 $noemptyreportwarning \
@@ -351,7 +352,7 @@ main ()
 	
 	# Call analog for the last 7 days, with the additional hourly report
 	$datelimit || $analog \
-			-G +g./fwanalog.analog.conf $analogopts \
+			-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 			-C"OUTFILE $outdir/lastweek.html" +H \
 			+F-00-00-06 \
 			+g"$genconffile" \
@@ -431,7 +432,7 @@ main ()
 	
 			# Call analog with all data
 			$analog \
-					-G +g./fwanalog.analog.conf $analogopts \
+					-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 					-C"OUTFILE $outdir/hosts/$hostname.html" \
 					-C"ORGANISATION OFF" -C"DOMAIN OFF" \
 					-C"HOSTINCLUDE $hostname" \
@@ -490,7 +491,7 @@ main ()
 	
 			# Call analog with all data
 			$analog \
-					-G +g./fwanalog.analog.conf $analogopts \
+					-G +g/usr/share/fwanalog/fwanalog.analog.conf $analogopts \
 					-C"OUTFILE $outdir/packets/$fsform.html" \
 					-C"FILEINCLUDE /$packet/*" \
 					-C"FILEINCLUDE $analogmatch" \
@@ -630,7 +631,7 @@ main ()
 }
 
 iptables () 
-{
+{	
 	# Parse iptables logfiles into an analog-compatible "URL log"
 
 	$zegrep -h "IN.+OUT.+SRC.+DST.+LEN.+TTL.+PROTO.+" $inputfiles \
@@ -1590,7 +1591,9 @@ rotate_cache ()
 	cd `dirname $0`
 	
 	# Load the user-settable options from the config file
-	. `basename $0 | $sed 's/sh$/opts/'`
+	#. `basename $0 | $sed 's/sh$/opts/'`
+	. /etc/fwanalog/fwanalog.opts
+
 	
 	# Month and year as they appear in the web server log
 	grepdate=`$date +/%b/%Y:`
@@ -1694,7 +1697,8 @@ helptext ()
 	#	No arguments
 	#####
 	
-	local tab=$(echo -en "\t\t")
+	local tab
+	tab=$(printf "\t\t")
 		
 	cat <<- -EOF-
 
