Attachment #50650 for bug #77112

View | Details | Raw Unified | Return to bug 77112
Collapse All | Expand All





PORTNAME=	oops
PORTVERSION=	${OOPSVERSION}
PORTREVISION=	3
CATEGORIES=	www
MASTER_SITES=	http://oops-cache.org/
DISTNAME=	${PORTNAME}-${OOPSVERSION}


BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk

OOPSVERSION=	1.5.24

USE_SUBMAKE=	yes
USE_AUTOCONF_VER=	259
CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
		--sysconfdir=${PREFIX}/etc/oops \
		--localstatedir=${OOPSVAR} \


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


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


	@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8
.endif
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
	@${MKDIR} -m 750 ${OOPSVAR}
	@ ${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}
	@${CHOWN} oops ${OOPSVAR}
	@${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

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (oops-1.5.23.tar.gz) = bfa19752af517bb5a6cd746acf61064c	1	MD5 (oops-1.5.24.tar.gz) = 45a95a1f5903750e919c37ccc334e93d
2	SIZE (oops-1.5.23.tar.gz) = 473290	2	SIZE (oops-1.5.24.tar.gz) = 479299

Lines 38-44 Link Here

(-)pkg-install (-1 / +1 lines)
38	else	38	else
39	echo "You need a user \"${user}\"."	39	echo "You need a user \"${user}\"."
40	doadduser=1	40	doadduser=1
41	if [ "$BATCH" = "yes" ]; then	41	if [ "X${BATCH}" != "X" ]; then
42	doadduser=0	42	doadduser=0
43	else	43	else
44	yesno "Would you like me to create it" y && doadduser=0	44	yesno "Would you like me to create it" y && doadduser=0

Added Link Here

(-)pkg-message (+11 lines)
1	===> CONFIGURATION NOTE:
2	To setup oops, you should check %%PREFIX%%/etc/oops/oops.cfg
3	(a copy of %%PREFIX%%/etc/oops/oops.cfg.sample) as well as
4	other files in %%PREFIX%%/etc/oops before running oops.
5
6	If you use storages, do not forget to format them before
7	the first use (oops -z -c %%PREFIX%%/etc/oops/oops.cfg).
8	===> BE CAREFULL HOW TO BOOT on 1.5.24 and above:
9	To run oops server from startup, add oops_enable="YES"
10	in your /etc/rc.conf.
11

Lines 1-16 Link Here

(-)pkg-plist (-3 / +28 lines)
		1	@unexec if cmp -s %D/etc/oops/accel_maps %D/etc/oops/accel_maps.sample; then rm -f %D/etc/oops/accel_maps; fi
1	etc/oops/accel_maps.sample	2	etc/oops/accel_maps.sample
		3	@exec [ -f %B/accel_maps ] \|\| cp %B/%f %B/accel_maps
		4	@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
2	etc/oops/acl_local_networks.sample	5	etc/oops/acl_local_networks.sample
		6	@exec [ -f %B/etc/oops/acl_local_networks ] \|\| cp %B/%f %B/acl_local_networks
		7	@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
3	etc/oops/auth_template.html.sample	8	etc/oops/auth_template.html.sample
		9	@exec [ -f %B/etc/oops/auth_template.html ] \|\| cp %B/%f %B/auth_template.html
		10	@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
4	etc/oops/err_template.html.sample	11	etc/oops/err_template.html.sample
		12	@exec [ -f %B/etc/oops/err_template.html ] \|\| cp %B/%f %B/err_template.html
		13	@unexec if cmp -s %D/etc/oops/oops.cfg %D/etc/oops/oops.cfg.sample; then rm -f %D/etc/oops/oops.cfg; fi
5	etc/oops/oops.cfg.sample	14	etc/oops/oops.cfg.sample
		15	@exec [ -f %B/etc/oops/oops.cfg ] \|\| cp %B/%f %B/oops.cfg
		16	@unexec if cmp -s %D/etc/oops/passwd %D/etc/oops/passwd.sample; then rm -f %D/etc/oops/passwd; fi
6	etc/oops/passwd.sample	17	etc/oops/passwd.sample
		18	@exec [ -f %B/etc/oops/passwd ] \|\| cp %B/%f %B/passwd
		19	@unexec if cmp -s %D/etc/oops/redir_rules %D/etc/oops/redir_rules.sample; then rm -f %D/etc/oops/redir_rules; fi
7	etc/oops/redir_rules.sample	20	etc/oops/redir_rules.sample
		21	@exec [ -f %B/etc/oops/redir_rules ] \|\| cp %B/%f %B/redir_rules
		22	@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
8	etc/oops/redir_template.html.sample	23	etc/oops/redir_template.html.sample
		24	@exec [ -f %B/etc/oops/redir_template.html ] \|\| cp %B/%f %B/redir_template.html
		25	@unexec if cmp -s %D/etc/oops/select.sql %D/etc/oops/select.sql.sample; then rm -f %D/etc/oops/select.sql; fi
9	etc/oops/select.sql.sample	26	etc/oops/select.sql.sample
		27	@exec [ -f %B/etc/oops/select.sql ] \|\| cp %B/%f %B/select.sql
10	etc/oops/tables/koi-alt.tab	28	etc/oops/tables/koi-alt.tab
11	etc/oops/tables/koi-iso.tab	29	etc/oops/tables/koi-iso.tab
12	etc/oops/tables/koi-win.tab	30	etc/oops/tables/koi-win.tab
13	etc/rc.d/oops.sh.sample	31	etc/rc.d/oops.sh
14	libexec/oops/accel.so	32	libexec/oops/accel.so
15	libexec/oops/berkeley_db_api.so	33	libexec/oops/berkeley_db_api.so
16	libexec/oops/custom_log.so	34	libexec/oops/custom_log.so
Lines 23-40 Link Here
23	libexec/oops/oopsctl_mod.so	41	libexec/oops/oopsctl_mod.so
24	libexec/oops/pam.so	42	libexec/oops/pam.so
25	libexec/oops/passwd_file.so	43	libexec/oops/passwd_file.so
		44	libexec/oops/passwd_ldap.so
26	libexec/oops/passwd_mysql.so	45	libexec/oops/passwd_mysql.so
27	libexec/oops/passwd_pgsql.so	46	libexec/oops/passwd_pgsql.so
28	libexec/oops/redir.so	47	libexec/oops/redir.so
29	libexec/oops/transparent.so	48	libexec/oops/transparent.so
30	libexec/oops/vary_header.so	49	libexec/oops/vary_header.so
31	libexec/oops/wccp2.so	50	libexec/oops/wccp2.so
32	sbin/oopsctl	51	libexec/oops/win_http.so
33	sbin/oops	52	sbin/oops
		53	sbin/oopsctl
34	@dirrm libexec/oops	54	@dirrm libexec/oops
35	@dirrm etc/oops/tables	55	@dirrm etc/oops/tables
36	@dirrm etc/oops	56	@unexec rmdir %D/etc/oops 2>/dev/null \|\| true
37	@unexec rmdir %D/oops/DB 2>/dev/null \|\| true	57	@unexec rmdir %D/oops/DB 2>/dev/null \|\| true
38	@unexec rmdir %D/oops/logs 2>/dev/null \|\| true	58	@unexec rmdir %D/oops/logs 2>/dev/null \|\| true
39	@unexec rmdir %D/oops/storages 2>/dev/null \|\| true	59	@unexec rmdir %D/oops/storages 2>/dev/null \|\| true
40	@unexec rmdir %D/oops 2>/dev/null \|\| true	60	@unexec rmdir %D/oops 2>/dev/null \|\| true
		61	@unexec rmdir /var/log/oops 2>/dev/null \|\| true
		62	@unexec rm -f /var/run/oops/oopsctl 2>/dev/null \|\| true
		63	@unexec rm -f /var/run/oops/oops_statfile 2>/dev/null \|\| true
		64	@unexec rm -f /var/run/oops/oops.pid 2>/dev/null \|\| true
		65	@unexec rmdir /var/run/oops 2>/dev/null \|\| true




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: oops
# REQUIRE: DAEMON
# KEYWORD: FreeBSD
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

. "%%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"





$FreeBSD$

--- configure.in.orig
+++ configure.in
@@ -328,14 +328,20 @@
-	  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 @@
           rel=`uname -r`
           case "$rel" in
             4*)
-              CFLAGS="$CFLAGS -pthread"
-              ;;
-            5*)
+	    5.[012]*)
+	      LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
+	      ;;
             5*)
-              LIBS="-lc_r $LEXLIB $LIBS"
+              CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
               ;;
-            *)
+	      CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
+	      ;;
             *)
-              CFLAGS="$CFLAGS -pthread"
-              LIBS="-lc_r $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 +436,10 @@
 esac
 
 if test "X$MYSQL_PATH" != "X" ; then





$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@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@SOFLAGS@" != "X"; then \
 	for m in modules/*so ; do \
 		$(INSTALL) $$m ${OOPS_LIBDIR} ; \





$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 */
     }





$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.

Return to bug 77112

Lines 7-13 Link Here

(-)Makefile (-12 / +17 lines)
7		7
8	PORTNAME= oops	8	PORTNAME= oops
9	PORTVERSION= ${OOPSVERSION}	9	PORTVERSION= ${OOPSVERSION}
10	PORTREVISION= 3
11	CATEGORIES= www	10	CATEGORIES= www
12	MASTER_SITES= http://oops-cache.org/	11	MASTER_SITES= http://oops-cache.org/
13	DISTNAME= ${PORTNAME}-${OOPSVERSION}	12	DISTNAME= ${PORTNAME}-${OOPSVERSION}
Lines 17-26 Link Here
17		16
18	BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk	17	BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
19		18
20	OOPSVERSION= 1.5.23	19	OOPSVERSION= 1.5.24
21		20
22	USE_SUBMAKE= yes	21	USE_SUBMAKE= yes
23	USE_AUTOCONF_VER= 213	22	USE_AUTOCONF_VER= 259
24	CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \	23	CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
25	--sysconfdir=${PREFIX}/etc/oops \	24	--sysconfdir=${PREFIX}/etc/oops \
26	--localstatedir=${OOPSVAR} \	25	--localstatedir=${OOPSVAR} \
Lines 34-44 Link Here
34		33
35	MAN8= oops.8 oopsctl.8	34	MAN8= oops.8 oopsctl.8
36	OOPSVAR= /var/run/oops	35	OOPSVAR= /var/run/oops
		36	OOPSLOG= /var/log/oops
37		37
38	SCRIPTS_ENV+= WRKDIRPREFIX="${WRKDIRPREFIX}" \	38	SCRIPTS_ENV+= WRKDIRPREFIX="${WRKDIRPREFIX}" \
39	TOUCH="${TOUCH}" \	39	TOUCH="${TOUCH}" \
40	MKDIR="${MKDIR}"	40	MKDIR="${MKDIR}"
41		41
		42	USE_RC_SUBR= YES
		43	PKGMESSAGE= ${WRKDIR}/pkg-message
		44
42	pre-fetch:	45	pre-fetch:
43	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.oops	46	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.oops
44		47
Lines 49-54 Link Here
49	pre-configure:	52	pre-configure:
50	@cd ${WRKSRC} && ${AUTOHEADER}	53	@cd ${WRKSRC} && ${AUTOHEADER}
51		54
		55	post-build:
		56	@${SED} -e 's=%%PREFIX%%=${PREFIX}=g' \
		57	${.CURDIR}/pkg-message > ${PKGMESSAGE}
		58	@${SED} -e 's=%%RC_SUBR%%=${RC_SUBR}=g;s=%%PREFIX%%=${PREFIX}=g' \
		59	${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
		60
52	pre-install:	61	pre-install:
53	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	62	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
54		63
Lines 60-75 Link Here
60	@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8	69	@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8
61	.endif	70	.endif
62	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	71	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
63	@ ${ECHO} "------------------------------------------------------------"	72	@${MKDIR} -m 750 ${OOPSVAR}
64	@ ${ECHO} "Sample of configuration file placed at ${PREFIX}/etc/oops !"
65	@ ${ECHO} "Copy oops.cfg.sample to oops.cfg, then run server..."
66	@ ${ECHO} "------------------------------------------------------------"
67	@${MKDIR} ${OOPSVAR}
68	@${CHMOD} 750 ${OOPSVAR}
69	@${CHOWN} oops ${OOPSVAR}	73	@${CHOWN} oops ${OOPSVAR}
70		74	@${MKDIR} -m 750 ${OOPSLOG}
71	${ECHO} "Installing ${PREFIX}/etc/rc.d/oops.sh.sample startup file."	75	@${CHOWN} oops ${OOPSLOG}
72	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/oops.sh ${PREFIX}/etc/rc.d/oops.sh.sample	76	${INSTALL_SCRIPT} ${WRKDIR}/oops.sh ${PREFIX}/etc/rc.d
		77	@${CAT} ${PKGMESSAGE}
73		78
74	post-clean:	79	post-clean:
75	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc	80	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc

Lines 1-24 Link Here

(-)files/oops.sh (-21 / +45 lines)
1	#!/bin/sh	1	#!/bin/sh
		2	#
		3	# $FreeBSD$
		4	#
2		5
3	if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then	6	# PROVIDE: oops
4	echo "$0: Cannot determine the PREFIX" >&2	7	# REQUIRE: DAEMON
5	exit 1	8	# KEYWORD: FreeBSD
6	fi
7
8	case "$1" in
9	start)
10	if [ -x ${PREFIX}/sbin/oopsctl ]; then
11	${PREFIX}/sbin/oopsctl $1 2>&1 > /dev/null; echo -n ' oops'
12	fi
13	;;
14	stop)
15	if [ -x ${PREFIX}/sbin/oopsctl ]; then
16	${PREFIX}/sbin/oopsctl $1
17	fi
18	;;
19	*)
20	echo "Usage: `basename $0` {start\|stop}" >&2
21	;;
22	esac
23		9
24	exit 0	10	. "%%RC_SUBR%%"
		11
		12	name="oops"
		13	rcvar=`set_rcvar`
		14
		15	command="%%PREFIX%%/sbin/oopsctl"
		16	procname="%%PREFIX%%/sbin/oops"
		17	pidfile="/var/run/oops/oops.pid"
		18
		19	required_files="%%PREFIX%%/etc/oops/oops.cfg"
		20	required_dirs="/var/run/oops"
		21
		22	extra_commands="reconfig rotate"
		23
		24	start_cmd="start_cmd"
		25	stop_cmd="stop_cmd"
		26	reconfig_cmd="reconfig_cmd"
		27	rotate_cmd="rotate_cmd"
		28
		29	start_cmd() {
		30	${command} start 2>&1 > /dev/null
		31	}
		32
		33	stop_cmd() {
		34	${command} stop
		35	}
		36
		37	reconfig_cmd() {
		38	${command} reconfigure
		39	}
		40
		41	rotate_cmd() {
		42	${command} rotate
		43	}
		44
		45	load_rc_config "oops"
		46	: ${oops_enable="NO"}
		47
		48	run_rc_command "$1"

Lines 1-41 Link Here

(-)files/patch-configure.in (-27 / +23 lines)
1	--- configure.in.orig Tue Oct 14 03:49:36 2003	1
2	+++ configure.in Mon Sep 27 14:52:41 2004	2	$FreeBSD$
3	@@ -315,8 +315,7 @@	3
4		4	--- configure.in.orig
5	;;	5	+++ configure.in
6	freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."	6	@@ -328,14 +328,20 @@
7	- CXX=g++
8	- CXXSOFLAGS="-shared -Xlinker -Bstatic"
9	+ CXXSOFLAGS="-shared"
10	LIBS="$LEXLIB $LIBS"
11	if test "$large_files" = "yes" ; then
12	## FreeBSD need no any special flags for 64bit files
13	@@ -328,14 +327,20 @@
14	rel=`uname -r`	7	rel=`uname -r`
15	case "$rel" in	8	case "$rel" in
16	4*)	9	4*)
17	- CFLAGS="$CFLAGS -pthread"	10	- CFLAGS="$CFLAGS -pthread"
18	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"	11	- ;;
19	;;	12	- 5*)
20	+ 5.[012]*)
21	+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
22	+ ;;
23	5*)
24	- LIBS="-lc_r $LEXLIB $LIBS"	13	- LIBS="-lc_r $LEXLIB $LIBS"
25	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"	14	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
26	;;	15	;;
27	+ 6*)	16	- *)
28	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
29	+ ;;
30	*)
31	- CFLAGS="$CFLAGS -pthread"	17	- CFLAGS="$CFLAGS -pthread"
32	- LIBS="-lc_r $LEXLIB $LIBS"	18	- LIBS="-lc_r $LEXLIB $LIBS"
33	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"	19	+ 5.[012]*)
34	+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"	20	+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
		21	+ ;;
		22	+ 5*)
		23	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
		24	+ ;;
		25	+ 6*)
		26	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
		27	+ ;;
		28	+ *)
		29	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
		30	+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
35	;;	31	;;
36	esac	32	esac
37	RPATH_OPTION="-rpath"	33	RPATH_OPTION="-rpath"
38	@@ -430,10 +435,10 @@	34	@@ -430,10 +436,10 @@
39	esac	35	esac
40		36
41	if test "X$MYSQL_PATH" != "X" ; then	37	if test "X$MYSQL_PATH" != "X" ; then

Lines 1-66 Link Here

(-)files/patch-src::Makefile.in (-64 / +18 lines)
1	--- src/Makefile.in.orig Fri Oct 24 10:05:04 2003	1
2	+++ src/Makefile.in Fri Jan 30 13:11:28 2004	2	$FreeBSD$
3	@@ -61,53 +61,17 @@	3
		4	--- src/Makefile.in.orig
		5	+++ src/Makefile.in
		6	@@ -49,14 +49,12 @@
		7
		8	mkinstalldirs:
		9	../mkinstalldirs ${OOPSPATH} \
		10	- ${OOPSPATH}/logs \
		11	${OOPSPATH}/DB \
		12	${OOPSPATH}/storages \
		13	${OOPS_SYSCONFDIR}/tables \
		14	${OOPS_LIBDIR}
		15
		16	if [ "X@OOPS_USER@" != "X" ]; then\
		17	- ${CHOWN} @OOPS_USER@ ${OOPSPATH}/logs;\
		18	${CHOWN} @OOPS_USER@ ${OOPSPATH}/DB;\
4	fi	19	fi
5		20
6	install: all mkinstalldirs
7	- $(INSTALL) -d ${OOPS_SBINDIR}
8	+# $(INSTALL) -d ${OOPS_SBINDIR}
9	$(INSTALL) oops ${OOPS_SBINDIR}
10	- if [ -f ${OOPS_SYSCONFDIR}/oops.cfg ]; then\
11	- $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample ;\
12	- else\
13	- $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg ;\
14	- fi
15	- if [ -f ${OOPS_SYSCONFDIR}/err_template.html ]; then\
16	- $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample ;\
17	- else\
18	- $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html ;\
19	- fi
20	- if [ -f ${OOPS_SYSCONFDIR}/auth_template.html ]; then\
21	- $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample ;\
22	- else\
23	- $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html;\
24	- fi
25	- if [ -f ${OOPS_SYSCONFDIR}/passwd ]; then\
26	- $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample ;\
27	- else\
28	- $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd ;\
29	- fi
30	- if [ -f ${OOPS_SYSCONFDIR}/redir_rules ]; then\
31	- $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample ;\
32	- else\
33	- $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules ;\
34	- fi
35	- if [ -f ${OOPS_SYSCONFDIR}/redir_template.html ]; then\
36	- $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample ;\
37	- else\
38	- $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html ;\
39	- fi
40	- if [ -f ${OOPS_SYSCONFDIR}/accel_maps ]; then\
41	- $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample ;\
42	- else\
43	- $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps ;\
44	- fi
45	- if [ -f ${OOPS_SYSCONFDIR}/select.sql ]; then\
46	- $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample ;\
47	- else\
48	- $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql ;\
49	- fi
50	- if [ -f ${OOPS_SYSCONFDIR}/acl_local_networks ]; then\
51	- $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample ;\
52	- else\
53	- $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks ;\
54	- fi
55	+ $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample
56	+ $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample
57	+ $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample
58	+ $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample
59	+ $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample
60	+ $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample
61	+ $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample
62	+ $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample
63	+ $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample
64	if test "X@SOFLAGS@" != "X"; then \
65	for m in modules/*so ; do \
66	$(INSTALL) $$m ${OOPS_LIBDIR} ; \

Lines 1-19 Link Here

(-)files/patch-src_modules_redir.c (-19 lines)
1
2	$FreeBSD: ports/www/oops/files/patch-src_modules_redir.c,v 1.1 2004/10/15 12:13:38 pav Exp $
3
4	--- src/modules/redir.c.orig Thu Oct 16 18:21:59 2003
5	+++ src/modules/redir.c Sun Oct 3 17:23:08 2004
6	@@ -349,11 +349,9 @@
7
8	/* if this is not on my port */
9	while( n ) {
10	- if ( mp->port == port
11	- && ( (mp->in_addr.s_addr == INADDR_ANY)
12	- \|\|(mp->in_addr.s_addr == rq->my_sa.sin_addr.s_addr) ) )
13	- break;
14	+ if ( mp->so == rq->accepted_so )
15	+ break;
16	n--;mp++;
17	}
18	if ( !n ) return(MOD_CODE_OK); /* not my */
19	}

Added Link Here

(-)files/patch-src_oops.cfg.in (+114 lines)
1
2	$FreeBSD$
3
4	--- src/oops.cfg.in.orig
5	+++ src/oops.cfg.in
6	@@ -8,8 +8,7 @@
7	# nameservers. Use your own, not our.
8	##
9
10	-nameserver 195.114.128.50
11	-nameserver 193.219.193.130
12	+nameserver 127.0.0.1
13
14	##
15	# Ports and address to use for HTTP and ICP
16	@@ -38,14 +37,14 @@
17	# When used in form 'filename [{N S}] [[un]buffered]'
18	# will be rotated automatically (up to N files up to S bytes in size)
19	##
20	-logfile /dev/tty
21	-#logfile @OOPS_HOME@/logs/oops.log { 3 1m } unbuffered
22	+#logfile /dev/tty
23	+logfile /var/log/oops/oops.log { 3 1m } unbuffered
24
25	##
26	# Accesslog - the same as for squid. Re rotating - see note for logfile
27	##
28	-accesslog /dev/tty
29	-#accesslog @OOPS_HOME@/logs/access.log
30	+#accesslog /dev/tty
31	+accesslog /var/log/oops/access.log { 3 1m } unbuffered
32
33	##
34	# Pidfile. for kill -1 `cat oops.pid` and for locking.
35	@@ -325,16 +324,15 @@
36	##
37	# Never use "parent" when connecting to server in these domains
38	##
39	-local-domain odessa.ua od.ua
40	-local-domain odessa.net paco.net netsy.net netsy.com te.net.ua
41	+#local-domain myowndomain.tld
42
43	-local-networks 195.114.128/19 10/8 192.168/16
44	+local-networks 10/8 192.168/16
45
46	#
47	# Groups
48	#
49
50	-group paco {
51	+group mynet {
52	##
53	# You can describe group ip adresses here, or using src_ip acl's
54	# with networks_acl directive.
55	@@ -344,7 +342,7 @@
56	# networks are ordered by masklen - longest masks(most specific networks)
57	# are checked first.
58	##
59	- networks 195.114.128/19 127/8 195.5.40.93/32 ;
60	+ networks 192.168/16 127/8 ;
61	# networks_acl LOCAL_NETWORKS !BAD_NETWORKS ;
62	badports [0:79],110,138,139,513,[6000:6010] ;
63	miss allow;
64	@@ -697,15 +695,15 @@
65	# format "%h->%A %l %u [%t] \"%r\" %s %b \"%{User-Agent}i\""
66	#}
67
68	-module berkeley_db {
69	+#module berkeley_db {
70	##
71	# dbhome - directory where all DB indexes reside. Use full path
72	# this directory must exist.
73	# dbname - filename for index file. Use just filename (no full path)
74	##
75
76	- dbhome @OOPS_HOME@/DB
77	- dbname dburl
78	+ #dbhome @OOPS_HOME@/DB
79	+ #dbname dburl
80
81	##
82	# This parameter specifies internal cache size of BerkeleyDB.
83	@@ -719,9 +717,9 @@
84	##
85	#db_cache_mem 4m
86
87	-}
88	+#}
89
90	-#module gigabase_db {
91	+module gigabase_db {
92	# This module enable GigaBASE as database engine.
93	# You can use berkeley_db or gigabase_db, not both.
94	# Also, important notice - indexes created with different modules
95	@@ -732,8 +730,8 @@
96	# # dbname - filename for index file. Use just filename (no full path)
97	# ##
98	#
99	-# dbhome @OOPS_HOME@/DB
100	-# dbname gdburl
101	+ dbhome @OOPS_HOME@/DB
102	+ dbname gdburl
103	#
104	# ##
105	# # This parameter specifies internal cache size of BerkeleyDB.
106	@@ -747,7 +745,7 @@
107	# ##
108	# #db_cache_mem 4m
109	#
110	-#}
111	+}
112
113	#module wccp2 {
114	# Cache identity.