updates

2 files changed, 69 insertions, 13 deletions

diff --git a/net-www/oops/files/oops.cfg b/net-www/oops/files/oops.cfg
index a72b9697c50f..03dc19dc83c5 100644
--- a/net-www/oops/files/oops.cfg
+++ b/net-www/oops/files/oops.cfg
@@ -44,12 +44,12 @@ accesslog	/var/log/oops/oops.access
 ##
 #  Pidfile. for kill -1 `cat oops.pid` and for locking.
 ##
-pidfile		/var/run/oops.pid
+pidfile		/var/run/oops/oops.pid
 
 ##
 # Statistics file - once per minute flush some statistics to this file
 ##
-statistics	/var/run/oops_statfile
+statistics	/var/log/oops/oops_statfile
 
 ##
 #  icons - where to find link.gif, dir.gif, binary.gif and so on (for 
@@ -292,7 +292,7 @@ local-networks	195.114.128/19 10/8 192.168/16
 # Groups
 #
 
-group	paco	{
+group	main	{
 ##
 #	You can describe group ip adresses here, or using src_ip acl's
 #	with networks_acl directive.
@@ -302,7 +302,12 @@ group	paco	{
 #       networks are ordered by masklen - longest masks(most specific networks)
 #	are checked first.
 ##
+
+#Next line enables redirection features and transparent proxying
+	redir_mods	fastredir transparent;
+#Change this next line to list the IP's of everyone in this group	
 	networks	195.114.128/19 127/8 195.5.40.93/32 ;
+	
 #	networks_acl	LOCAL_NETWORKS !BAD_NETWORKS ;
 	badports	[0:79],110,138,139,513,[6000:6010] ;
 	miss		allow;
@@ -391,7 +396,7 @@ group	world	{
 ##
 
 storage {
-	path /usr/lib/oops/storage/oops_storage ;
+	path /var/lib/oops/storage/oops_storage ;
 #	Size of the storage. Can be in bytes or 'auto'. Auto is
 #	usefull for pre-created storages or disk slices.
 #	NOTE: 'size auto' won't work for Linux on disk slices.
@@ -432,7 +437,7 @@ module err {
 	template /etc/oops/err_template.html
 
 	# Language to use when generate Error messages
-	lang ru
+	lang eng 
 }
 
 module passwd_file {
@@ -520,7 +525,7 @@ module redir {
 
 module oopsctl {
 	# path to oopsctl unix socket
-	socket_path	/var/run/oopsctl
+	socket_path	/var/run/oops/oopsctl
 	# time to auto-refresh page (seconds)
         html_refresh    300
 }
diff --git a/net-www/oops/oops-1.5.6.ebuild b/net-www/oops/oops-1.5.6.ebuild
index 5abf9c5c1ba3..bdbdbebb60d4 100644
--- a/net-www/oops/oops-1.5.6.ebuild
+++ b/net-www/oops/oops-1.5.6.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/net-www/oops/oops-1.5.6.ebuild,v 1.2 2001/04/24 19:30:54 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/oops/oops-1.5.6.ebuild,v 1.3 2001/04/25 00:15:35 drobbins Exp $
 
 S=${WORKDIR}/${P}
 SRC_URI="http://zipper.paco.net/~igor/oops/oops-1.5.6.tar.gz"
 HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/"
 DESCRIPTION="An advanced multithreaded caching web proxy"
 
-DEPEND="virtual/glibc dev-libs/db
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="virtual/glibc >=sys-libs/db-3.2.3h dev-libs/libpcre ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 src_unpack() {
 	unpack ${A}
@@ -21,7 +19,7 @@ src_unpack() {
 }
 
 src_compile() {
-    try ./configure --prefix=/usr --libdir=/usr/lib/oops --enable-oops-user=squid --sysconfdir=/etc/oops --sbindir=/usr/sbin --with-regexp=pcre --localstatedir=/var/run
+    try ./configure --prefix=/usr --libdir=/usr/lib/oops --enable-oops-user=squid --sysconfdir=/etc/oops --sbindir=/usr/sbin --with-regexp=pcre --localstatedir=/var/run/oops
 	cd src
 	cp config.h.in config.h.in.orig
 	sed -e '/STRERROR_R/d' config.h.in.orig > config.h.in
@@ -29,14 +27,67 @@ src_compile() {
 	sed -e 's:${OOPS:${DESTDIR}/${OOPS:g' Makefile.orig > Makefile
 	cd ..
 	try make
-
 }
 
 src_install() {
-    try make DESTDIR=${D} install
+    dodir /usr/sbin
+	chown squid.squid ${D}
+	try make DESTDIR=${D} install
+	chmod -R g+srw ${D}/etc/oops
+	chmod -R g+rw ${D}/etc/oops/*	
 	dodir /var/log/oops
+	
+	chmod o-rwx ${D}/var/log/oops
+	
 	dodir /var/lib/oops/storage
 	dodir /var/lib/oops/db
+	chmod o-rwx ${D}/var/lib/oops
+	
+	dodir /var/run/oops
+	chmod o-rwx ${D}/var/run/oops
+	chown -R squid.squid ${D}/var/run/oops
+	
 	insinto /etc/oops
 	doins ${FILESDIR}/oops.cfg
+	cd ${D}
+	
+	#cleanups
+	rm -rf ${D}/usr/oops
+	rm -rf ${D}/usr/lib/oops/modules
+
+	#config files
+
+	cd ${D}/etc/oops
+	local x
+	local y
+	for y in . tables
+	do
+		for x in ${y}/*
+		do
+			if [ -f $x ]
+			then
+				mv $x $x.eg	
+			fi
+		done
+	done
 }
+
+pkg_postinst() {
+	cd ${ROOT}/etc/oops
+	local x
+	local y
+	local mylen
+	local newf
+	for y in . tables
+	do
+		for x in ${y}/*.eg
+		do
+			realf=`echo $x | sed -e 's/.eg$//'`
+			if [ ! -e ${realf} ]
+			then
+				cp ${x} ${realf}
+			fi
+		done
+	done
+}
+