Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Dec 2000 20:57:41 +0300 (MSK)
From:      osa@FreeBSD.org.ru
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/23529: update www/oops from 1.4.16 to 1.5.1 (by maintainer)
Message-ID:  <20001213175741.01251147@freebsd.org.ru>
Resent-Message-ID: <200012131800.eBDI05M95495@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         23529
>Category:       ports
>Synopsis:       update www/oops from 1.4.16 to 1.5.1 (by maintainer)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 13 10:00:05 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Sergey A. Osokin
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
Russian FreeBSD Team
>Environment:

	FreeBSD 4.2-STABLE i386

>Description:

	update www/oops from 1.4.16 to 1.5.1 (by maintainer)

>How-To-Repeat:

	

>Fix:

diff -ruN oops.old/Makefile oops/Makefile
--- oops.old/Makefile	Wed Dec 13 20:53:22 2000
+++ oops/Makefile	Wed Dec 13 20:55:10 2000
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	oops
-PORTVERSION=	1.4.16
+PORTVERSION=	1.5.1
 CATEGORIES=	www
 MASTER_SITES=	http://zipper.paco.net/~igor/oops/
 
-FORBIDDEN=	"Remotely exploitable"
-
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
+LIB_DEPENDS=	gigabase_r.2:${PORTSDIR}/databases/gigabase
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/sbin \
diff -ruN oops.old/distinfo oops/distinfo
--- oops.old/distinfo	Wed Dec 13 20:53:22 2000
+++ oops/distinfo	Wed Dec 13 16:53:29 2000
@@ -1 +1 @@
-MD5 (oops-1.4.16.tar.gz) = b3fb854c0ee5d7c23bca737377ea507e
+MD5 (oops-1.5.1.tar.gz) = c4c0e8e000fcabd013fdb6143ca246b0
diff -ruN oops.old/files/patch-aa oops/files/patch-aa
--- oops.old/files/patch-aa	Wed Dec 13 20:53:22 2000
+++ oops/files/patch-aa	Wed Dec 13 20:33:13 2000
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Thu Sep 14 13:19:39 2000
-+++ src/Makefile.in	Thu Sep 14 13:25:53 2000
-@@ -43,7 +43,7 @@
+--- src/Makefile.in.orig	Mon Nov 13 13:24:03 2000
++++ src/Makefile.in	Wed Dec 13 20:31:44 2000
+@@ -44,7 +44,7 @@
  			 ${OOPSPATH}/DB \
  			 ${OOPSPATH}/storages \
  			 ${OOPS_SYSCONFDIR}/tables \
@@ -9,7 +9,7 @@
  
  	if [ "X@OOPS_USER@" != "X" ]; then\
  		${CHOWN} @OOPS_USER@ ${OOPSPATH};\
-@@ -51,51 +51,19 @@
+@@ -52,56 +52,21 @@
  		${CHOWN} @OOPS_USER@ ${OOPSPATH}/DB;\
  		${CHOWN} @OOPS_USER@ ${OOPSPATH}/storages;\
  		${CHOWN} @OOPS_USER@ ${OOPS_SYSCONFDIR}/tables;\
@@ -18,7 +18,7 @@
  	fi
  
  install: all mkinstalldirs
--	$(INSTALL) oops ${OOPSPATH}
+ 	$(INSTALL) oops ${OOPS_SBINDIR}
 -	if [ -f ${OOPS_SYSCONFDIR}/oops.cfg ]; then\
 -		$(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample ;\
 -	   else\
@@ -54,20 +54,26 @@
 -	   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) oops ${OOPS_SBINDIR}
 +	$(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) 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) 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) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.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} ; \
diff -ruN oops.old/files/patch-ab oops/files/patch-ab
--- oops.old/files/patch-ab	Wed Dec 13 20:53:22 2000
+++ oops/files/patch-ab	Wed Dec 13 20:12:44 2000
@@ -1,6 +1,6 @@
---- src/oops.cfg.in.orig	Thu Sep 14 15:35:50 2000
-+++ src/oops.cfg.in	Thu Sep 14 15:38:56 2000
-@@ -452,7 +452,7 @@
+--- src/oops.cfg.in.orig	Wed Dec 13 20:10:58 2000
++++ src/oops.cfg.in	Wed Dec 13 20:11:24 2000
+@@ -519,7 +519,7 @@
  
  module oopsctl {
  	# path to oopsctl unix socket
diff -ruN oops.old/files/patch-ac oops/files/patch-ac
--- oops.old/files/patch-ac	Thu Jan  1 03:00:00 1970
+++ oops/files/patch-ac	Wed Dec 13 17:35:12 2000
@@ -0,0 +1,11 @@
+--- src/environment.h.orig	Wed Dec 13 17:33:19 2000
++++ src/environment.h	Wed Dec 13 17:33:40 2000
+@@ -55,7 +55,7 @@
+ #include	<thread.h>
+ #endif
+ #include	<pthread.h>
+-#if	!defined(HAVE_PTHREAD_RWLOCK_INIT)
++#if	!defined(HAVE_PTHREAD_RWLOCK_INIT) && !defined(FREEBSD)
+ #include	"rwlock.h"
+ #endif
+ 
diff -ruN oops.old/files/patch-ad oops/files/patch-ad
--- oops.old/files/patch-ad	Thu Jan  1 03:00:00 1970
+++ oops/files/patch-ad	Wed Dec 13 20:03:48 2000
@@ -0,0 +1,53 @@
+--- configure.orig	Wed Dec 13 20:02:46 2000
++++ configure	Wed Dec 13 20:03:33 2000
+@@ -1476,49 +1476,11 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-
+ pwd=`pwd`
+ LIBDB_NAME=-ldb
+ echo $ac_n "checking for libdb.a""... $ac_c" 1>&6
+ echo "configure:1484: checking for libdb.a" >&5
+-if test "X$LIBDB_PATH" != "X" ; then
+-    LIBDB_PATH=$LIBDB_PATH
+-elif test -r "/usr/local/BerkeleyDB/lib/libdb.a"; then
+-    LIBDB_PATH="/usr/local/BerkeleyDB"
+-elif test -r "/usr/local/BerkeleyDB.3.1/lib/libdb.a"; then
+-    LIBDB_PATH="/usr/local/BerkeleyDB.3.1"
+-elif test -r "/usr/local/BerkeleyDB.3.0/lib/libdb.lib"; then
+-    LIBDB_PATH="/usr/local/BerkeleyDB.3.0"
+-elif test -r "$pwd/libdb.a"; then
+-    LIBDB_PATH="$pwd"
+-elif test -r "/usr/local/lib/libdb.a"; then
+-    LIBDB_PATH="/usr/local"
+-elif test -r "/usr/lib/libdb2.a"; then                                         
+-    LIBDB_PATH="/usr"                                                          
+-    LIBDB_NAME=-ldb2                                                           
+-elif test -r "/usr/lib/libdb.a"; then
+-    LIBDB_PATH="/usr"
+-elif test -r "/usr/local/lib/libdb2.a"; then
+-    LIBDB_PATH="/usr/local"
+-    LIBDB_NAME=-ldb2
+-elif test -r "/usr/local/BerkeleyDB/lib/libdb.lib"; then
+-    LIBDB_PATH="/usr/local/BerkeleyDB"
+-    LIBDB_NAME=-llibdb
+-elif test -r "$pwd/libdb.lib"; then
+-    LIBDB_PATH="$pwd"
+-    LIBDB_NAME=-llibdb
+-elif test -r "/usr/local/lib/libdb.lib"; then
+-    LIBDB_PATH="/usr/local"
+-    LIBDB_NAME=-llibdb
+-elif test -r "/usr/lib/libdb.lib"; then
+-    LIBDB_PATH="/usr"
+-    LIBDB_NAME=-llibdb
+-elif test -r "/usr/local/lib/libdb2.lib"; then
+-    LIBDB_PATH="/usr/local"
+-    LIBDB_NAME=-llibdb2
+-else
+-    LIBDB_PATH="no"
+-fi
++LIBDB_PATH="no"
+ 
+ echo "$ac_t""$LIBDB_PATH" 1>&6
+ 
diff -ruN oops.old/pkg-plist oops/pkg-plist
--- oops.old/pkg-plist	Wed Dec 13 20:53:22 2000
+++ oops/pkg-plist	Wed Dec 13 20:51:51 2000
@@ -8,6 +8,7 @@
 etc/oops/redir_template.html.sample
 etc/oops/accel_maps.sample
 etc/oops/acl_local_networks.sample
+etc/oops/select.sql.sample
 etc/oops/tables/koi-alt.tab
 etc/oops/tables/koi-iso.tab
 etc/oops/tables/koi-win.tab
@@ -22,9 +23,10 @@
 libexec/oops/log_dummy.so
 libexec/oops/oopsctl_mod.so
 libexec/oops/passwd_file.so
+libexec/oops/passwd_mysql.so
+libexec/oops/passwd_pgsql.so
 libexec/oops/redir.so
 libexec/oops/transparent.so
 libexec/oops/vary_header.so
 @dirrm libexec/oops
 @dirrm etc/oops/tables
-@dirrm etc/oops

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001213175741.01251147>