Merge devel/bugzilla and german/bugzilla security updates to RELENG_9_1

svn merge --dry-run -c307425,307429,307430 ^/head

after the merge also the german/bugzilla*/files/patch-... files
are in the local dir but not displayed in the diff.



Index: .
===================================================================
--- .	(revision 307431)
+++ .	(working copy)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head:r307425*,307429-307430*
Index: devel
===================================================================
--- devel	(revision 307431)
+++ devel	(working copy)

Property changes on: devel
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/devel:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425*,307429-307430*
Index: devel/bugzilla
===================================================================
--- devel/bugzilla	(revision 307431)
+++ devel/bugzilla	(working copy)

Property changes on: devel/bugzilla
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/devel/bugzilla:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425,307429-307430
Index: devel/bugzilla/Makefile
===================================================================
--- devel/bugzilla/Makefile	(revision 307431)
+++ devel/bugzilla/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.0.8
+PORTVERSION=	4.0.9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
Index: devel/bugzilla/distinfo
===================================================================
--- devel/bugzilla/distinfo	(revision 307431)
+++ devel/bugzilla/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-4.0.8.tar.gz) = 0d44ab29863ffe6ef7637f078c31e52805f1b2ff0ff4f5c39a0d7daebe326b0c
-SIZE (bugzilla/bugzilla-4.0.8.tar.gz) = 2801982
+SHA256 (bugzilla/bugzilla-4.0.9.tar.gz) = af79b2f2b39f428e19122707d1334db5e447742ca6098f74803c35277117e394
+SIZE (bugzilla/bugzilla-4.0.9.tar.gz) = 2803607
Index: devel/bugzilla3
===================================================================
--- devel/bugzilla3	(revision 307431)
+++ devel/bugzilla3	(working copy)

Property changes on: devel/bugzilla3
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/devel/bugzilla3:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425,307429-307430
Index: devel/bugzilla3/Makefile
===================================================================
--- devel/bugzilla3/Makefile	(revision 307431)
+++ devel/bugzilla3/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	3.6.11
+PORTVERSION=	3.6.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -28,6 +28,9 @@
 
 BINMODE=	700
 
+DEPRECATED=	Note that when Bugzilla 4.4 is released, the Bugzilla 3.6.x \
+		series will reach end of life
+
 SUB_FILES=	pkg-message
 
 DATA_DIRS_LIST=	images js skins
Index: devel/bugzilla3/distinfo
===================================================================
--- devel/bugzilla3/distinfo	(revision 307431)
+++ devel/bugzilla3/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-3.6.11.tar.gz) = 01b99ec5b1e6efc9d0a0352ebe2ea6e8b8c7471a3f4dd80c3b99b5be575c4585
-SIZE (bugzilla/bugzilla-3.6.11.tar.gz) = 2509551
+SHA256 (bugzilla/bugzilla-3.6.12.tar.gz) = 1b3ebd08545b0093cd64a6f2e6c1310c7e85e691c83bd79c10960329f1bdca77
+SIZE (bugzilla/bugzilla-3.6.12.tar.gz) = 2509580
Index: devel/bugzilla42
===================================================================
--- devel/bugzilla42	(revision 307431)
+++ devel/bugzilla42	(working copy)

Property changes on: devel/bugzilla42
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/devel/bugzilla42:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307425,307429-307430
Index: devel/bugzilla42/Makefile
===================================================================
--- devel/bugzilla42/Makefile	(revision 307431)
+++ devel/bugzilla42/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.2.3
+PORTVERSION=	4.2.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -60,7 +60,7 @@
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
-RUN_DEPENDS+=	p5-DBD-Pg>=1.45:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=2.19.3:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
Index: devel/bugzilla42/distinfo
===================================================================
--- devel/bugzilla42/distinfo	(revision 307431)
+++ devel/bugzilla42/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-4.2.3.tar.gz) = 712d645c5b2b081e42b2a364c26edf8a8a0048f463a426ac38cc482d31b11fb3
-SIZE (bugzilla/bugzilla-4.2.3.tar.gz) = 2977764
+SHA256 (bugzilla/bugzilla-4.2.4.tar.gz) = bede0cf893ad8ac99715614af0cf4624bc0e8552852f51290f546006105ce695
+SIZE (bugzilla/bugzilla-4.2.4.tar.gz) = 2976363
Index: german
===================================================================
--- german	(revision 307431)
+++ german	(working copy)

Property changes on: german
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/german:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307430*
Index: german/bugzilla
===================================================================
--- german/bugzilla	(revision 307431)
+++ german/bugzilla	(working copy)

Property changes on: german/bugzilla
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/german/bugzilla:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307430
Index: german/bugzilla/Makefile
===================================================================
--- german/bugzilla/Makefile	(revision 307431)
+++ german/bugzilla/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	4.0.8
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,9 +21,10 @@
 
 LANGDIR=	${WWWDIR}/template/de
 
-#post-patch:
-#	${REINPLACE_CMD} -i '' -e 's/4.0.7/4.0.8/' \
-#		${WRKDIR}/de/default/global/gzversion.html.tmpl
+post-patch:
+	@${REINPLACE_CMD} -i '' -e 's/4.0.8/4.0.9/' \
+		${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
Index: german/bugzilla3
===================================================================
--- german/bugzilla3	(revision 307431)
+++ german/bugzilla3	(working copy)

Property changes on: german/bugzilla3
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/german/bugzilla3:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307430
Index: german/bugzilla3/Makefile
===================================================================
--- german/bugzilla3/Makefile	(revision 307431)
+++ german/bugzilla3/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	3.6.11
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,9 +21,10 @@
 
 LANGDIR=	${WWWDIR}/template/de
 
-#post-patch:
-#	${REINPLACE_CMD} -i '' -e 's/3.6.10/3.6.11/' \
-#		${WRKDIR}/de/default/global/gzversion.html.tmpl
+post-patch:
+	@${REINPLACE_CMD} -i '' -e 's/3.6.11/3.6.12/' \
+		${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
Index: german/bugzilla42
===================================================================
--- german/bugzilla42	(revision 307431)
+++ german/bugzilla42	(working copy)

Property changes on: german/bugzilla42
___________________________________________________________________
Added: svn:mergeinfo
   Merged /head/german/bugzilla42:r307153,307155-307157,307159,307161,307163,307167,307169-307170,307177-307178,307190,307194,307197-307198,307203-307204,307206,307208,307210,307217-307221,307247-307248,307256,307259-307261,307263,307275-307276,307279,307282,307286,307334-307335,307348-307351,307374-307375,307387,307430
Index: german/bugzilla42/Makefile
===================================================================
--- german/bugzilla42/Makefile	(revision 307431)
+++ german/bugzilla42/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	4.2.3
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,10 +21,10 @@
 
 LANGDIR=	${WWWDIR}/template/de
 
-#post-patch:
-#	@${REINPLACE_CMD} -i '' -e 's/4.2.2/4.2.3/' \
-#		${WRKDIR}/de/default/global/gzversion.html.tmpl
-#	@${FIND} ${WRKDIR} -type f -name \*.orig -delete
+post-patch:
+	@${REINPLACE_CMD} -i '' -e 's/4.2.3/4.2.4/' \
+		${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}