ports/77112: [maintainer] update www/oops to 1.3.24
Dmitry Morozovsky
marck at FreeBSD.org
Sat Feb 5 00:00:44 UTC 2005
>Number: 77112
>Category: ports
>Synopsis: [maintainer] update www/oops to 1.3.24
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 05 00:00:42 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Morozovsky
>Release: FreeBSD 4-STABLE i386
>Organization:
Cronyx Plus LLC (RiNet ISP)
>Environment:
System: FreeBSD 4-STABLE
>Description:
Here is an update for www/oops port:
- update to long awaited 1.3.24
- rc_subr compatibility + pkg-message [1]
- small fixes to be backported to Author's CVS
[1]: from PR 74616 (skv@)
>How-To-Repeat:
N/A
>Fix:
NOTE: file patch/src_modules_redir.c should be deleted as obsoleted.
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/oops/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile 15 Oct 2004 12:13:38 -0000 1.33
+++ Makefile 4 Feb 2005 23:41:41 -0000
@@ -7,7 +7,6 @@
PORTNAME= oops
PORTVERSION= ${OOPSVERSION}
-PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://oops-cache.org/
DISTNAME= ${PORTNAME}-${OOPSVERSION}
@@ -17,10 +16,10 @@
BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
-OOPSVERSION= 1.5.23
+OOPSVERSION= 1.5.24
USE_SUBMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOCONF_VER= 259
CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
--sysconfdir=${PREFIX}/etc/oops \
--localstatedir=${OOPSVAR} \
@@ -34,11 +33,15 @@
MAN8= oops.8 oopsctl.8
OOPSVAR= /var/run/oops
+OOPSLOG= /var/log/oops
SCRIPTS_ENV+= WRKDIRPREFIX="${WRKDIRPREFIX}" \
TOUCH="${TOUCH}" \
MKDIR="${MKDIR}"
+USE_RC_SUBR= YES
+PKGMESSAGE= ${WRKDIR}/pkg-message
+
pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.oops
@@ -49,6 +52,12 @@
pre-configure:
@cd ${WRKSRC} && ${AUTOHEADER}
+post-build:
+ @${SED} -e 's=%%PREFIX%%=${PREFIX}=g' \
+ ${.CURDIR}/pkg-message > ${PKGMESSAGE}
+ @${SED} -e 's=%%RC_SUBR%%=${RC_SUBR}=g;s=%%PREFIX%%=${PREFIX}=g' \
+ ${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
+
pre-install:
@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -60,16 +69,12 @@
@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8
.endif
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @ ${ECHO} "------------------------------------------------------------"
- @ ${ECHO} "Sample of configuration file placed at ${PREFIX}/etc/oops !"
- @ ${ECHO} "Copy oops.cfg.sample to oops.cfg, then run server..."
- @ ${ECHO} "------------------------------------------------------------"
- @${MKDIR} ${OOPSVAR}
- @${CHMOD} 750 ${OOPSVAR}
+ @${MKDIR} -m 750 ${OOPSVAR}
@${CHOWN} oops ${OOPSVAR}
-
- ${ECHO} "Installing ${PREFIX}/etc/rc.d/oops.sh.sample startup file."
- ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/oops.sh ${PREFIX}/etc/rc.d/oops.sh.sample
+ @${MKDIR} -m 750 ${OOPSLOG}
+ @${CHOWN} oops ${OOPSLOG}
+ ${INSTALL_SCRIPT} ${WRKDIR}/oops.sh ${PREFIX}/etc/rc.d
+ @${CAT} ${PKGMESSAGE}
post-clean:
@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/oops/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo 4 Feb 2004 12:55:41 -0000 1.16
+++ distinfo 4 Feb 2005 23:41:41 -0000
@@ -1,2 +1,2 @@
-MD5 (oops-1.5.23.tar.gz) = bfa19752af517bb5a6cd746acf61064c
-SIZE (oops-1.5.23.tar.gz) = 473290
+MD5 (oops-1.5.24.tar.gz) = 45a95a1f5903750e919c37ccc334e93d
+SIZE (oops-1.5.24.tar.gz) = 479299
Index: pkg-install
===================================================================
RCS file: /home/pcvs/ports/www/oops/pkg-install,v
retrieving revision 1.3
diff -u -r1.3 pkg-install
--- pkg-install 13 Dec 2002 23:09:44 -0000 1.3
+++ pkg-install 4 Feb 2005 23:41:41 -0000
@@ -38,7 +38,7 @@
else
echo "You need a user \"${user}\"."
doadduser=1
- if [ "$BATCH" = "yes" ]; then
+ if [ "X${BATCH}" != "X" ]; then
doadduser=0
else
yesno "Would you like me to create it" y && doadduser=0
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg-message 4 Feb 2005 23:41:41 -0000
@@ -0,0 +1,11 @@
+===> CONFIGURATION NOTE:
+ To setup oops, you should check %%PREFIX%%/etc/oops/oops.cfg
+ (a copy of %%PREFIX%%/etc/oops/oops.cfg.sample) as well as
+ other files in %%PREFIX%%/etc/oops before running oops.
+
+ If you use storages, do not forget to format them before
+ the first use (oops -z -c %%PREFIX%%/etc/oops/oops.cfg).
+===> BE CAREFULL HOW TO BOOT on 1.5.24 and above:
+ To run oops server from startup, add oops_enable="YES"
+ in your /etc/rc.conf.
+
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/oops/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist 20 Nov 2003 10:35:27 -0000 1.7
+++ pkg-plist 4 Feb 2005 23:41:41 -0000
@@ -1,16 +1,34 @@
+ at unexec if cmp -s %D/etc/oops/accel_maps %D/etc/oops/accel_maps.sample; then rm -f %D/etc/oops/accel_maps; fi
etc/oops/accel_maps.sample
+ at exec [ -f %B/accel_maps ] || cp %B/%f %B/accel_maps
+ at unexec if cmp -s %D/etc/oops/acl_local_networks %D/etc/oops/acl_local_networks.sample; then rm -f %D/etc/oops/acl_local_networks; fi
etc/oops/acl_local_networks.sample
+ at exec [ -f %B/etc/oops/acl_local_networks ] || cp %B/%f %B/acl_local_networks
+ at unexec if cmp -s %D/etc/oops/auth_template.html %D/etc/oops/auth_template.html.sample; then rm -f %D/etc/oops/auth_template.html; fi
etc/oops/auth_template.html.sample
+ at exec [ -f %B/etc/oops/auth_template.html ] || cp %B/%f %B/auth_template.html
+ at unexec if cmp -s %D/etc/oops/err_template.html %D/etc/oops/err_template.html.sample; then rm -f %D/etc/oops/err_template.html; fi
etc/oops/err_template.html.sample
+ at exec [ -f %B/etc/oops/err_template.html ] || cp %B/%f %B/err_template.html
+ at unexec if cmp -s %D/etc/oops/oops.cfg %D/etc/oops/oops.cfg.sample; then rm -f %D/etc/oops/oops.cfg; fi
etc/oops/oops.cfg.sample
+ at exec [ -f %B/etc/oops/oops.cfg ] || cp %B/%f %B/oops.cfg
+ at unexec if cmp -s %D/etc/oops/passwd %D/etc/oops/passwd.sample; then rm -f %D/etc/oops/passwd; fi
etc/oops/passwd.sample
+ at exec [ -f %B/etc/oops/passwd ] || cp %B/%f %B/passwd
+ at unexec if cmp -s %D/etc/oops/redir_rules %D/etc/oops/redir_rules.sample; then rm -f %D/etc/oops/redir_rules; fi
etc/oops/redir_rules.sample
+ at exec [ -f %B/etc/oops/redir_rules ] || cp %B/%f %B/redir_rules
+ at unexec if cmp -s %D/etc/oops/redir_template.html %D/etc/oops/redir_template.html.sample; then rm -f %D/etc/oops/redir_template.html; fi
etc/oops/redir_template.html.sample
+ at exec [ -f %B/etc/oops/redir_template.html ] || cp %B/%f %B/redir_template.html
+ at unexec if cmp -s %D/etc/oops/select.sql %D/etc/oops/select.sql.sample; then rm -f %D/etc/oops/select.sql; fi
etc/oops/select.sql.sample
+ at exec [ -f %B/etc/oops/select.sql ] || cp %B/%f %B/select.sql
etc/oops/tables/koi-alt.tab
etc/oops/tables/koi-iso.tab
etc/oops/tables/koi-win.tab
-etc/rc.d/oops.sh.sample
+etc/rc.d/oops.sh
libexec/oops/accel.so
libexec/oops/berkeley_db_api.so
libexec/oops/custom_log.so
@@ -23,18 +41,25 @@
libexec/oops/oopsctl_mod.so
libexec/oops/pam.so
libexec/oops/passwd_file.so
+libexec/oops/passwd_ldap.so
libexec/oops/passwd_mysql.so
libexec/oops/passwd_pgsql.so
libexec/oops/redir.so
libexec/oops/transparent.so
libexec/oops/vary_header.so
libexec/oops/wccp2.so
-sbin/oopsctl
+libexec/oops/win_http.so
sbin/oops
+sbin/oopsctl
@dirrm libexec/oops
@dirrm etc/oops/tables
- at dirrm etc/oops
+ at unexec rmdir %D/etc/oops 2>/dev/null || true
@unexec rmdir %D/oops/DB 2>/dev/null || true
@unexec rmdir %D/oops/logs 2>/dev/null || true
@unexec rmdir %D/oops/storages 2>/dev/null || true
@unexec rmdir %D/oops 2>/dev/null || true
+ at unexec rmdir /var/log/oops 2>/dev/null || true
+ at unexec rm -f /var/run/oops/oopsctl 2>/dev/null || true
+ at unexec rm -f /var/run/oops/oops_statfile 2>/dev/null || true
+ at unexec rm -f /var/run/oops/oops.pid 2>/dev/null || true
+ at unexec rmdir /var/run/oops 2>/dev/null || true
Index: files/oops.sh
===================================================================
RCS file: /home/pcvs/ports/www/oops/files/oops.sh,v
retrieving revision 1.2
diff -u -r1.2 oops.sh
--- files/oops.sh 14 Feb 2002 14:04:58 -0000 1.2
+++ files/oops.sh 4 Feb 2005 23:41:41 -0000
@@ -1,24 +1,48 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
-start)
- if [ -x ${PREFIX}/sbin/oopsctl ]; then
- ${PREFIX}/sbin/oopsctl $1 2>&1 > /dev/null; echo -n ' oops'
- fi
- ;;
-stop)
- if [ -x ${PREFIX}/sbin/oopsctl ]; then
- ${PREFIX}/sbin/oopsctl $1
- fi
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
+# PROVIDE: oops
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
-exit 0
+. "%%RC_SUBR%%"
+
+name="oops"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/oopsctl"
+procname="%%PREFIX%%/sbin/oops"
+pidfile="/var/run/oops/oops.pid"
+
+required_files="%%PREFIX%%/etc/oops/oops.cfg"
+required_dirs="/var/run/oops"
+
+extra_commands="reconfig rotate"
+
+start_cmd="start_cmd"
+stop_cmd="stop_cmd"
+reconfig_cmd="reconfig_cmd"
+rotate_cmd="rotate_cmd"
+
+start_cmd() {
+ ${command} start 2>&1 > /dev/null
+}
+
+stop_cmd() {
+ ${command} stop
+}
+
+reconfig_cmd() {
+ ${command} reconfigure
+}
+
+rotate_cmd() {
+ ${command} rotate
+}
+
+load_rc_config "oops"
+: ${oops_enable="NO"}
+
+run_rc_command "$1"
Index: files/patch-configure.in
===================================================================
RCS file: /home/pcvs/ports/www/oops/files/patch-configure.in,v
retrieving revision 1.9
diff -u -r1.9 patch-configure.in
--- files/patch-configure.in 7 Oct 2004 16:00:44 -0000 1.9
+++ files/patch-configure.in 4 Feb 2005 23:41:41 -0000
@@ -1,41 +1,37 @@
---- configure.in.orig Tue Oct 14 03:49:36 2003
-+++ configure.in Mon Sep 27 14:52:41 2004
-@@ -315,8 +315,7 @@
-
- ;;
- freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
-- CXX=g++
-- CXXSOFLAGS="-shared -Xlinker -Bstatic"
-+ CXXSOFLAGS="-shared"
- LIBS="$LEXLIB $LIBS"
- if test "$large_files" = "yes" ; then
- ## FreeBSD need no any special flags for 64bit files
-@@ -328,14 +327,20 @@
+
+$FreeBSD$
+
+--- configure.in.orig
++++ configure.in
+@@ -328,14 +328,20 @@
rel=`uname -r`
case "$rel" in
4*)
- CFLAGS="$CFLAGS -pthread"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
- ;;
-+ 5.[012]*)
-+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
-+ ;;
- 5*)
+- ;;
+- 5*)
- LIBS="-lc_r $LEXLIB $LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
;;
-+ 6*)
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
-+ ;;
- *)
+- *)
- CFLAGS="$CFLAGS -pthread"
- LIBS="-lc_r $LEXLIB $LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
++ 5.[012]*)
++ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
++ ;;
++ 5*)
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
++ ;;
++ 6*)
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
++ ;;
++ *)
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
;;
esac
RPATH_OPTION="-rpath"
-@@ -430,10 +435,10 @@
+@@ -430,10 +436,10 @@
esac
if test "X$MYSQL_PATH" != "X" ; then
Index: files/patch-src::Makefile.in
===================================================================
RCS file: /home/pcvs/ports/www/oops/files/patch-src::Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 patch-src::Makefile.in
--- files/patch-src::Makefile.in 30 Jan 2004 10:19:16 -0000 1.5
+++ files/patch-src::Makefile.in 4 Feb 2005 23:41:41 -0000
@@ -1,66 +1,20 @@
---- src/Makefile.in.orig Fri Oct 24 10:05:04 2003
-+++ src/Makefile.in Fri Jan 30 13:11:28 2004
-@@ -61,53 +61,17 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -49,14 +49,12 @@
+
+ mkinstalldirs:
+ ../mkinstalldirs ${OOPSPATH} \
+- ${OOPSPATH}/logs \
+ ${OOPSPATH}/DB \
+ ${OOPSPATH}/storages \
+ ${OOPS_SYSCONFDIR}/tables \
+ ${OOPS_LIBDIR}
+
+ if [ "X at OOPS_USER@" != "X" ]; then\
+- ${CHOWN} @OOPS_USER@ ${OOPSPATH}/logs;\
+ ${CHOWN} @OOPS_USER@ ${OOPSPATH}/DB;\
fi
- install: all mkinstalldirs
-- $(INSTALL) -d ${OOPS_SBINDIR}
-+# $(INSTALL) -d ${OOPS_SBINDIR}
- $(INSTALL) oops ${OOPS_SBINDIR}
-- if [ -f ${OOPS_SYSCONFDIR}/oops.cfg ]; then\
-- $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample ;\
-- else\
-- $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg ;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/err_template.html ]; then\
-- $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample ;\
-- else\
-- $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html ;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/auth_template.html ]; then\
-- $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample ;\
-- else\
-- $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/passwd ]; then\
-- $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample ;\
-- else\
-- $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd ;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/redir_rules ]; then\
-- $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample ;\
-- else\
-- $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules ;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/redir_template.html ]; then\
-- $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample ;\
-- else\
-- $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html ;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/accel_maps ]; then\
-- $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample ;\
-- else\
-- $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps ;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/select.sql ]; then\
-- $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample ;\
-- else\
-- $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql ;\
-- fi
-- if [ -f ${OOPS_SYSCONFDIR}/acl_local_networks ]; then\
-- $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample ;\
-- else\
-- $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks ;\
-- fi
-+ $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample
-+ $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample
-+ $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample
-+ $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample
-+ $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample
-+ $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample
-+ $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample
-+ $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample
-+ $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample
- if test "X at SOFLAGS@" != "X"; then \
- for m in modules/*so ; do \
- $(INSTALL) $$m ${OOPS_LIBDIR} ; \
Index: files/patch-src_modules_redir.c
===================================================================
RCS file: /home/pcvs/ports/www/oops/files/patch-src_modules_redir.c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_modules_redir.c
--- files/patch-src_modules_redir.c 15 Oct 2004 12:13:38 -0000 1.1
+++ files/patch-src_modules_redir.c 4 Feb 2005 23:41:41 -0000
@@ -1,19 +0,0 @@
-
-$FreeBSD: ports/www/oops/files/patch-src_modules_redir.c,v 1.1 2004/10/15 12:13:38 pav Exp $
-
---- src/modules/redir.c.orig Thu Oct 16 18:21:59 2003
-+++ src/modules/redir.c Sun Oct 3 17:23:08 2004
-@@ -349,11 +349,9 @@
-
- /* if this is not on my port */
- while( n ) {
-- if ( mp->port == port
-- && ( (mp->in_addr.s_addr == INADDR_ANY)
-- ||(mp->in_addr.s_addr == rq->my_sa.sin_addr.s_addr) ) )
-- break;
-+ if ( mp->so == rq->accepted_so )
-+ break;
- n--;mp++;
- }
- if ( !n ) return(MOD_CODE_OK); /* not my */
- }
Index: files/patch-src_oops.cfg.in
===================================================================
RCS file: files/patch-src_oops.cfg.in
diff -N files/patch-src_oops.cfg.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-src_oops.cfg.in 4 Feb 2005 23:41:41 -0000
@@ -0,0 +1,114 @@
+
+$FreeBSD$
+
+--- src/oops.cfg.in.orig
++++ src/oops.cfg.in
+@@ -8,8 +8,7 @@
+ # nameservers. Use your own, not our.
+ ##
+
+-nameserver 195.114.128.50
+-nameserver 193.219.193.130
++nameserver 127.0.0.1
+
+ ##
+ # Ports and address to use for HTTP and ICP
+@@ -38,14 +37,14 @@
+ # When used in form 'filename [{N S}] [[un]buffered]'
+ # will be rotated automatically (up to N files up to S bytes in size)
+ ##
+-logfile /dev/tty
+-#logfile @OOPS_HOME@/logs/oops.log { 3 1m } unbuffered
++#logfile /dev/tty
++logfile /var/log/oops/oops.log { 3 1m } unbuffered
+
+ ##
+ # Accesslog - the same as for squid. Re rotating - see note for logfile
+ ##
+-accesslog /dev/tty
+-#accesslog @OOPS_HOME@/logs/access.log
++#accesslog /dev/tty
++accesslog /var/log/oops/access.log { 3 1m } unbuffered
+
+ ##
+ # Pidfile. for kill -1 `cat oops.pid` and for locking.
+@@ -325,16 +324,15 @@
+ ##
+ # Never use "parent" when connecting to server in these domains
+ ##
+-local-domain odessa.ua od.ua
+-local-domain odessa.net paco.net netsy.net netsy.com te.net.ua
++#local-domain myowndomain.tld
+
+-local-networks 195.114.128/19 10/8 192.168/16
++local-networks 10/8 192.168/16
+
+ #
+ # Groups
+ #
+
+-group paco {
++group mynet {
+ ##
+ # You can describe group ip adresses here, or using src_ip acl's
+ # with networks_acl directive.
+@@ -344,7 +342,7 @@
+ # networks are ordered by masklen - longest masks(most specific networks)
+ # are checked first.
+ ##
+- networks 195.114.128/19 127/8 195.5.40.93/32 ;
++ networks 192.168/16 127/8 ;
+ # networks_acl LOCAL_NETWORKS !BAD_NETWORKS ;
+ badports [0:79],110,138,139,513,[6000:6010] ;
+ miss allow;
+@@ -697,15 +695,15 @@
+ # format "%h->%A %l %u [%t] \"%r\" %s %b \"%{User-Agent}i\""
+ #}
+
+-module berkeley_db {
++#module berkeley_db {
+ ##
+ # dbhome - directory where all DB indexes reside. Use full path
+ # this directory must exist.
+ # dbname - filename for index file. Use just filename (no full path)
+ ##
+
+- dbhome @OOPS_HOME@/DB
+- dbname dburl
++ #dbhome @OOPS_HOME@/DB
++ #dbname dburl
+
+ ##
+ # This parameter specifies internal cache size of BerkeleyDB.
+@@ -719,9 +717,9 @@
+ ##
+ #db_cache_mem 4m
+
+-}
++#}
+
+-#module gigabase_db {
++module gigabase_db {
+ # This module enable GigaBASE as database engine.
+ # You can use berkeley_db or gigabase_db, not both.
+ # Also, important notice - indexes created with different modules
+@@ -732,8 +730,8 @@
+ # # dbname - filename for index file. Use just filename (no full path)
+ # ##
+ #
+-# dbhome @OOPS_HOME@/DB
+-# dbname gdburl
++ dbhome @OOPS_HOME@/DB
++ dbname gdburl
+ #
+ # ##
+ # # This parameter specifies internal cache size of BerkeleyDB.
+@@ -747,7 +745,7 @@
+ # ##
+ # #db_cache_mem 4m
+ #
+-#}
++}
+
+ #module wccp2 {
+ # Cache identity.
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list