File squidGuard-1.2.1-config.patch of Package squidGuard

Overview Repositories Revisions Requests Users Attributes Meta

File squidGuard-1.2.1-config.patch of Package squidGuard (Revision ee31b76134cb5ab0fed903eac8862fe7)

Currently displaying revision ee31b76134cb5ab0fed903eac8862fe7 , Show latest

--- squidGuard-1.2.1/Makefile.in.orig	2006-12-29 10:03:53.000000000 +0100
+++ squidGuard-1.2.1/Makefile.in	2007-05-10 14:47:14.000000000 +0200
@@ -15,9 +15,9 @@
 RM = rm -f
 MKINSTALLDIRS = mkdir -p
 
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
+prefix = $(DESTDIR)@prefix@
+exec_prefix = $(DESTDIR)@exec_prefix@
+bindir = $(DESTDIR)@bindir@
 infodir = $(prefix)/info
 SQUIDUSER = @squiduser@
 
--- squidGuard-1.2.1/samples/sample.conf.in.orig	2007-03-25 11:36:39.000000000 +0200
+++ squidGuard-1.2.1/samples/sample.conf.in	2007-05-10 14:48:35.000000000 +0200
@@ -2,8 +2,8 @@
 # CONFIG FILE FOR SQUIDGUARD
 #
 
-dbhome @prefix@/squidGuard/db
-logdir @prefix@/squidGuard/log
+dbhome /var/lib/squidGuard/db
+logdir /var/log/squidGuard
 
 #
 # TIME RULES:
--- squidGuard-1.2.1/src/Makefile.in.orig	2007-03-16 16:58:37.000000000 +0100
+++ squidGuard-1.2.1/src/Makefile.in	2007-05-10 14:47:14.000000000 +0200
@@ -31,11 +31,11 @@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
-prefix	= @prefix@
-exec_prefix = @exec_prefix@
-bindir	= $(exec_prefix)/bin
-logdir	= @sg_logdir@
-cfgdir	= @sg_cfgdir@
+prefix	= $(DESTDIR)@prefix@
+exec_prefix = $(DESTDIR)@exec_prefix@
+bindir	= $(DESTDIR)@bindir@
+logdir	= $(DESTDIR)@sg_logdir@
+cfgdir	= $(DESTDIR)@sg_cfgdir@
 infodir	= $(prefix)/info
 
 OBJS	= main.o sgLog.o sgDb.o HTParse.o sgDiv.o sgFree.o y.tab.o lex.yy.o
--- squidGuard-1.2.1/test/test1.conf.in.orig	1999-06-28 17:07:19.000000000 +0200
+++ squidGuard-1.2.1/test/test1.conf.in	2007-05-10 14:47:14.000000000 +0200
@@ -1,5 +1,5 @@
-logdir @TESTDIR@
-dbhome @TESTDIR@
+logdir /var/log/squidGuard
+dbhome /var/lib/squidGuard/db
 
 src grownups {
     ip	   10.0.0.0/24	  # range 10.0.0.0  - 10.0.0.255
--- squidGuard-1.2.1/test/test2.conf.in.orig	1999-06-28 17:07:20.000000000 +0200
+++ squidGuard-1.2.1/test/test2.conf.in	2007-05-10 14:47:14.000000000 +0200
@@ -1,5 +1,5 @@
-logdir @TESTDIR@
-dbhome @TESTDIR@
+logdir /var/log/squidGuard
+dbhome /var/lib/squidGuard/db
 
 src grownups {
     ip	   10.0.0.0/24	  # range 10.0.0.0  - 10.0.0.255
--- squidGuard-1.2.1/src/sg.h.in.orig	2007-04-11 11:20:34.000000000 +0200
+++ squidGuard-1.2.1/src/sg.h.in	2007-05-10 15:21:54.000000000 +0200
@@ -79,7 +79,7 @@
 #define WARNING_LOGFILE "squidGuard.log"
 #define ERROR_LOGFILE   "squidGuard.error"
 
-#define DEFAULT_CONFIGFILE "@prefix@/squidGuard/squidGuard.conf"
+#define DEFAULT_CONFIGFILE "/etc/squidguard.conf"
 #define DEFAULT_LOGDIR "@prefix@/squidGuard/log"
 #define DEFAULT_DBHOME "@prefix@/squidGuard/db"
 #define EXEC_PROGRAM "@prefix@/bin/squidGuard"
--- squidGuard-1.2.1/Makefile.in.orig	2006-12-29 10:03:53.000000000 +0100
+++ squidGuard-1.2.1/Makefile.in	2007-05-10 15:42:25.000000000 +0200
@@ -45,17 +45,15 @@
 install-conf:
 	@echo Installing configuration file 
 	@if [ ! -d $(prefix)/squidGuard ]; then \
-		$(MKINSTALLDIRS) $(prefix)/squidGuard ; \
-		$(MKINSTALLDIRS) $(prefix)/squidGuard/db ; \
-		$(MKINSTALLDIRS) $(prefix)/squidGuard/log ; \
+		$(MKINSTALLDIRS) $(DESTDIR)@sg_cfgdir@ ; \
+		$(MKINSTALLDIRS) $(DESTDIR)@sg_dbhome@ ; \
+		$(MKINSTALLDIRS) $(DESTDIR)@sg_logdir@ ; \
 		echo Created necessary squidGuard directories ; \
-		chown -R $(SQUIDUSER) $(prefix)/squidGuard || exit 1  ; \
-		echo Assigned $(prefix)/squidGuard to user $(SQUIDUSER) ; \
 	fi ; \
 	if test ! -f $(prefix)/squidGuard/squidGuard.conf; then \
-		cp samples/sample.conf $(prefix)/squidGuard/squidGuard.conf || exit 1  ; \
+		cp samples/sample.conf $(DESTDIR)@sg_cfgdir@/squidGuard.conf || exit 1  ; \
 		echo Copied sample squidGuard.conf ; \
-		chmod 644 $(prefix)/squidGuard/squidGuard.conf || exit 1 ; \
+		chmod 644 $(DESTDIR)@sg_cfgdir@/squidGuard.conf || exit 1 ; \
 		echo $(prefix)/squidGuard/squidGuard.conf is now readable ; \
 		echo The initial configuration is complete. ; \
 	else \

Places

File squidGuard-1.2.1-config.patch of Package squidGuard (Revision ee31b76134cb5ab0fed903eac8862fe7)

Places