Attachment #53942 for bug #81623

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




 	    if (natfd < 0) {
 		my_xlog(OOPS_LOG_HTTP|OOPS_LOG_DBG|OOPS_LOG_SEVERE, "transparent/redir(): NAT open failed: %m\n");
 		goto notdone;
@@ -270,7 +270,7 @@
 	natLookup.nl_outip = rq->client_sa.sin_addr;
 	natLookup.nl_flags = IPN_TCP;
 	if (natfd < 0) {
-	    natfd = open(IPL_NAT, O_RDONLY, 0);
+	    natfd = open(IPNAT_NAME, O_RDONLY, 0);
 	    if (natfd < 0) {
 		my_xlog(OOPS_LOG_HTTP|OOPS_LOG_DBG|OOPS_LOG_SEVERE, "transparent/redir(): NAT open failed: %m\n");
 		goto notdone;




#!/bin/sh
#

if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
	exit
fi

tempfile=`mktemp -t checklist`
if [ "${BATCH}" = "yes" ]; then
	set \"GigaBase\"
else
	/usr/bin/dialog --title "OOPS configuration options" --clear \
		--checklist "\n\
Please select desired options:\n\
(please select ONLY ONE DB storages)" -1 -1 16 \
GigaBase		"GigaBase storage" OFF \
DB4			"Berkeley DB v4 storage" OFF \
MySQL			"MySQL auth support" OFF \
PgSQL			"PostgreSQL auth support" OFF \
PCRE			"PCRE support" OFF \
2> $tempfile

	retval=$?

	if [ -s $tempfile ]; then
		set `cat $tempfile`
	fi
	rm -f $tempfile

	case $retval in
		0)	if [ -z "$*" ]; then
				echo "Nothing selected"
			fi
			;;
		1)	echo "Cancel pressed."
			exit 1;
			;;
	esac
fi

${MKDIR} ${WRKDIRPREFIX}${CURDIR}
exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc

echo "PREFIX=   ${PREFIX}"

while [ "$1" ]; do
	case $1 in
		\"GigaBase\")
			echo "LIB_DEPENDS+=	gigabase_r.2:\${PORTSDIR}/databases/gigabase"
			echo "CONFIGURE_ARGS+=	--without-DB"
			;;
		\"DB4\")
			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
			echo "CONFIGURE_ARGS+=	--without-GB"
			;;
		\"MySQL\")
			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
			echo "CONFIGURE_ARGS+=	--with-MYSQL=\${PREFIX}"
			;;
		\"PgSQL\")
			echo "POSTGRESQL_PORT?=	databases/postgresql7"
			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
			echo "CONFIGURE_ARGS+=	--with-PGSQL=\${PREFIX}/pgsql"
			;;
		\"PCRE\")
			echo "LIB_DEPENDS+=	pcre.0:\${PORTSDIR}/devel/pcre"
			echo "CONFIGURE_ARGS+=	--with-regexp=pcre"
			;;
		*)
			echo "Invalid option(s): $*" > /dev/stderr
			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
			exit 1
			;;
	esac
	shift
done





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

OOPSVAR=	/var/run/oops
OOPSLOG=	/var/log/oops

SCRIPTS_ENV+=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
		TOUCH="${TOUCH}" \
		MKDIR="${MKDIR}"

USE_RC_SUBR=	YES
PKGMESSAGE=	${WRKDIR}/pkg-message
SUB_FILES=	pkg-message

OPTIONS=	GIGABASE	"GigaBase storage" on \
		DB4		"Berkeley DB v4 storage" off \
		MYSQL		"MySQL auth support" off \
		PGSQL		"PostgreSQL auth support" off \
		PCRE		"PCRE support" off

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_GIGABASE)
.if defined (WITH_DB4)
BROKEN=	"Only one DB storage can be used (First)"
.endif
LIB_DEPENDS+=	gigabase_r.2:${PORTSDIR}/databases/gigabase
CONFIGURE_ARGS+=	--without-DB
.endif

.if defined(WITH_DB4)
.if defined(WITHOUT_GIGABASE)
LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
CONFIGURE_ARGS+=	--without-GB
.else
BROKEN=	"Only one DB storage can be used"
.endif
.endif

.if defined(WITH_MYSQL)
USE_MYSQL=	YES
CONFIGURE_ARGS+=	--with-MYSQL=${PREFIX}
.endif

.if defined(WITH_PGSQL)
USE_PGSQL=	YES
CONFIGURE_ARGS+=	--with-PGSQL=${PREFIX}/pgsql
.endif

.if defined(WITH_PCRE)
LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=	--with-regexp=pcre
.endif

pre-configure:

pre-install:
	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

.include <bsd.port.pre.mk>

post-install:
.if !defined(NOPORTDOCS)
	@${INSTALL_MAN} ${WRKSRC}/doc/oops.8 ${PREFIX}/man/man8

Return to bug 81623

Lines 7-13 Link Here

(-)Makefile (-12 / +34 lines)
7		7
8	PORTNAME= oops	8	PORTNAME= oops
9	PORTVERSION= ${OOPSVERSION}	9	PORTVERSION= ${OOPSVERSION}
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= www	11	CATEGORIES= www
12	MASTER_SITES= http://oops-cache.org/	12	MASTER_SITES= http://oops-cache.org/
13	DISTNAME= ${PORTNAME}-${OOPSVERSION}	13	DISTNAME= ${PORTNAME}-${OOPSVERSION}
Lines 36-59 Link Here
36	OOPSVAR= /var/run/oops	36	OOPSVAR= /var/run/oops
37	OOPSLOG= /var/log/oops	37	OOPSLOG= /var/log/oops
38		38
39	SCRIPTS_ENV+= WRKDIRPREFIX="${WRKDIRPREFIX}" \
40	TOUCH="${TOUCH}" \
41	MKDIR="${MKDIR}"
42
43	USE_RC_SUBR= YES	39	USE_RC_SUBR= YES
44	PKGMESSAGE= ${WRKDIR}/pkg-message	40	PKGMESSAGE= ${WRKDIR}/pkg-message
45	SUB_FILES= pkg-message	41	SUB_FILES= pkg-message
46		42
47	.if defined(BATCH)	43	OPTIONS= GIGABASE "GigaBase storage" on \
		44	DB4 "Berkeley DB v4 storage" off \
		45	MYSQL "MySQL auth support" off \
		46	PGSQL "PostgreSQL auth support" off \
		47	PCRE "PCRE support" off
		48
		49	.include <bsd.port.pre.mk>
		50
		51	.if !defined(WITHOUT_GIGABASE)
		52	.if defined (WITH_DB4)
		53	BROKEN= "Only one DB storage can be used (First)"
		54	.endif
48	LIB_DEPENDS+= gigabase_r.2:${PORTSDIR}/databases/gigabase	55	LIB_DEPENDS+= gigabase_r.2:${PORTSDIR}/databases/gigabase
49	CONFIGURE_ARGS+= --without-DB	56	CONFIGURE_ARGS+= --without-DB
50	.endif	57	.endif
51		58
52	pre-fetch:	59	.if defined(WITH_DB4)
53	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.oops	60	.if defined(WITHOUT_GIGABASE)
		61	LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
		62	CONFIGURE_ARGS+= --without-GB
		63	.else
		64	BROKEN= "Only one DB storage can be used"
		65	.endif
		66	.endif
54		67
55	.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)	68	.if defined(WITH_MYSQL)
56	.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"	69	USE_MYSQL= YES
		70	CONFIGURE_ARGS+= --with-MYSQL=${PREFIX}
		71	.endif
		72
		73	.if defined(WITH_PGSQL)
		74	USE_PGSQL= YES
		75	CONFIGURE_ARGS+= --with-PGSQL=${PREFIX}/pgsql
		76	.endif
		77
		78	.if defined(WITH_PCRE)
		79	LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
		80	CONFIGURE_ARGS+= --with-regexp=pcre
57	.endif	81	.endif
58		82
59	pre-configure:	83	pre-configure:
Lines 66-73 Link Here
66	pre-install:	90	pre-install:
67	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	91	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
68		92
69	.include <bsd.port.pre.mk>
70
71	post-install:	93	post-install:
72	.if !defined(NOPORTDOCS)	94	.if !defined(NOPORTDOCS)
73	@${INSTALL_MAN} ${WRKSRC}/doc/oops.8 ${PREFIX}/man/man8	95	@${INSTALL_MAN} ${WRKSRC}/doc/oops.8 ${PREFIX}/man/man8

Lines 12-14 Link Here

(-)files/patch-src_modules_transparent.c (+9 lines)
12	if (natfd < 0) {	12	if (natfd < 0) {
13	my_xlog(OOPS_LOG_HTTP\|OOPS_LOG_DBG\|OOPS_LOG_SEVERE, "transparent/redir(): NAT open failed: %m\n");	13	my_xlog(OOPS_LOG_HTTP\|OOPS_LOG_DBG\|OOPS_LOG_SEVERE, "transparent/redir(): NAT open failed: %m\n");
14	goto notdone;	14	goto notdone;
		15	@@ -270,7 +270,7 @@
		16	natLookup.nl_outip = rq->client_sa.sin_addr;
		17	natLookup.nl_flags = IPN_TCP;
		18	if (natfd < 0) {
		19	- natfd = open(IPL_NAT, O_RDONLY, 0);
		20	+ natfd = open(IPNAT_NAME, O_RDONLY, 0);
		21	if (natfd < 0) {
		22	my_xlog(OOPS_LOG_HTTP\|OOPS_LOG_DBG\|OOPS_LOG_SEVERE, "transparent/redir(): NAT open failed: %m\n");
		23	goto notdone;

Removed Link Here

(-)scripts/configure.oops (-76 lines)
1	#!/bin/sh
2	#
3
4	if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
5	exit
6	fi
7
8	tempfile=`mktemp -t checklist`
9	if [ "${BATCH}" = "yes" ]; then
10	set \"GigaBase\"
11	else
12	/usr/bin/dialog --title "OOPS configuration options" --clear \
13	--checklist "\n\
14	Please select desired options:\n\
15	(please select ONLY ONE DB storages)" -1 -1 16 \
16	GigaBase "GigaBase storage" OFF \
17	DB4 "Berkeley DB v4 storage" OFF \
18	MySQL "MySQL auth support" OFF \
19	PgSQL "PostgreSQL auth support" OFF \
20	PCRE "PCRE support" OFF \
21	2> $tempfile
22
23	retval=$?
24
25	if [ -s $tempfile ]; then
26	set `cat $tempfile`
27	fi
28	rm -f $tempfile
29
30	case $retval in
31	0) if [ -z "$*" ]; then
32	echo "Nothing selected"
33	fi
34	;;
35	1) echo "Cancel pressed."
36	exit 1;
37	;;
38	esac
39	fi
40
41	${MKDIR} ${WRKDIRPREFIX}${CURDIR}
42	exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
43
44	echo "PREFIX= ${PREFIX}"
45
46	while [ "$1" ]; do
47	case $1 in
48	\"GigaBase\")
49	echo "LIB_DEPENDS+= gigabase_r.2:\${PORTSDIR}/databases/gigabase"
50	echo "CONFIGURE_ARGS+= --without-DB"
51	;;
52	\"DB4\")
53	echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4"
54	echo "CONFIGURE_ARGS+= --without-GB"
55	;;
56	\"MySQL\")
57	echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
58	echo "CONFIGURE_ARGS+= --with-MYSQL=\${PREFIX}"
59	;;
60	\"PgSQL\")
61	echo "POSTGRESQL_PORT?= databases/postgresql7"
62	echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
63	echo "CONFIGURE_ARGS+= --with-PGSQL=\${PREFIX}/pgsql"
64	;;
65	\"PCRE\")
66	echo "LIB_DEPENDS+= pcre.0:\${PORTSDIR}/devel/pcre"
67	echo "CONFIGURE_ARGS+= --with-regexp=pcre"
68	;;
69	*)
70	echo "Invalid option(s): $*" > /dev/stderr
71	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
72	exit 1
73	;;
74	esac
75	shift
76	done