X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flogwatch;h=755557a0b93e73275e5897e2cd6227a6b1674374;hb=c5fb845c4eb6fdc4ef7d1e10495566a7689bf451;hp=39c6244bd14a82357c740cdcc8bef43d7a8bb774;hpb=c0d19944e2dde7822b2ad4777999febbf8375db1;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/logwatch b/lfs/logwatch
index 39c6244bd..755557a0b 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -73,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh
+	cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch-7.3.6-date_manip6.patch
 	@cd $(DIR_APP) && chmod 755 install_logwatch.sh
 	cd $(DIR_APP) && yes "" | ./install_logwatch.sh
 	
@@ -92,18 +91,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	#  for i in $$UNNEEDED ; do \
 	#    rm -f /etc/log.d/{conf,scripts}/services/$$i{,.conf} /etc/log.d/conf/logfiles/$$i.conf; \
 	#  done
-	#rm -rf /etc/log.d/scripts/logfiles
-	cp -f $(DIR_SRC)/config/logwatch/dialup /etc/log.d/scripts/services/dialup
-	cp -f $(DIR_SRC)/config/logwatch/dialup.conf /etc/log.d/conf/services/dialup.conf
-
-	#sed -i 's/df -h/df -h -x rootfs/' /etc/log.d/scripts/services/zz-disk_space
-	#for i in `find /etc/log.d -type f`; do \
-	#    sed -i 's/perl -w/perl/' $$i; \
-	#done
-	# The httpd log checker script considers any request containing the word
-	# null to be an exploit attempt, reverse this behaviour as we have a
-	# null.gif
-	#sed -i -e "/ 'null',/d" /etc/log.d/scripts/services/http
-	#chmod -R 755 /etc/log.d
+	cp -f $(DIR_SRC)/config/logwatch/dialup /usr/share/logwatch/scripts/services/dialup
+	cp -f $(DIR_SRC)/config/logwatch/dialup.conf /usr/share/logwatch/dist.conf/services/dialup.conf
+	
+	-mkdir -p /var/cache/logwatch
+	chmod -v 777 /var/cache/logwatch
+	-mkdir -p /var/log/logwatch
+	chmod -v 755 /var/log/logwatch
+	-rm -rf /etc/logwatch/conf
+	ln -vsf /usr/share/logwatch/default.config /etc/logwatch/conf
+	
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)