- Update port to 1.5.2

- Remove FORBIDDEN

PR:		23541
Submitted by:	Maintainer

5 files changed, 25 insertions, 19 deletions

diff --git a/www/oops/Makefile b/www/oops/Makefile
index ca0b849a5c95..f6146571870b 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	oops
-PORTVERSION=	1.4.16
+PORTVERSION=	1.5.2
 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 --git a/www/oops/distinfo b/www/oops/distinfo
index 2b214c0e2ea7..9ecd95cec4d8 100644
--- a/www/oops/distinfo
+++ b/www/oops/distinfo
@@ -1 +1 @@
-MD5 (oops-1.4.16.tar.gz) = b3fb854c0ee5d7c23bca737377ea507e
+MD5 (oops-1.5.2.tar.gz) = dee63a9433387f9911f969fbe86f2b10
diff --git a/www/oops/files/patch-aa b/www/oops/files/patch-aa
index 2c325128e526..33eb92201f71 100644
--- a/www/oops/files/patch-aa
+++ b/www/oops/files/patch-aa
@@ -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 --git a/www/oops/files/patch-ab b/www/oops/files/patch-ab
index 1f72a17d1117..382e2c593ea1 100644
--- a/www/oops/files/patch-ab
+++ b/www/oops/files/patch-ab
@@ -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 --git a/www/oops/pkg-plist b/www/oops/pkg-plist
index c494691c2055..d00eb4413168 100644
--- a/www/oops/pkg-plist
+++ b/www/oops/pkg-plist
@@ -8,6 +8,7 @@ etc/oops/redir_rules.sample
 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/lang.so
 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