From m.seaman@infracaninophile.co.uk  Tue Dec  9 19:41:55 2008
Return-Path: <m.seaman@infracaninophile.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 154FC106570F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  9 Dec 2008 19:41:55 +0000 (UTC)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from smtp.infracaninophile.co.uk (gate6.infracaninophile.co.uk [IPv6:2001:8b0:151:1::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 793C68FC1C;
	Tue,  9 Dec 2008 19:41:54 +0000 (UTC)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from happy-idiot-talk.infracaninophile.co.uk (localhost [IPv6:::1])
	by smtp.infracaninophile.co.uk (8.14.3/8.14.3) with ESMTP id mB9JfmFG054821;
	Tue, 9 Dec 2008 19:41:48 GMT
	(envelope-from matthew@happy-idiot-talk.infracaninophile.co.uk)
Received: (from matthew@localhost)
	by happy-idiot-talk.infracaninophile.co.uk (8.14.3/8.14.3/Submit) id mB9JfmFV054820;
	Tue, 9 Dec 2008 19:41:48 GMT
	(envelope-from matthew)
Message-Id: <200812091941.mB9JfmFV054820@happy-idiot-talk.infracaninophile.co.uk>
Date: Tue, 9 Dec 2008 19:41:48 GMT
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Reply-To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sec-team@freebsd.org
Subject: [maintainer] databases/phpmyadmin security update to 3.1.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         129533
>Category:       ports
>Synopsis:       [maintainer] databases/phpmyadmin security update to 3.1.1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 09 19:50:01 UTC 2008
>Closed-Date:    Thu Dec 11 19:48:06 UTC 2008
>Last-Modified:  Thu Dec 11 19:50:05 UTC 2008
>Originator:     Matthew Seaman
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #49: Sat Nov 29 14:18:14 GMT 2008 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

The Announcement:

   "Welcome to this normal bugfix release of 3.1.1 (which contains
    also a security fix). Version 2.11.9.4 was also published with
    this security fix.

    Security announcement:
    http://www.phpmyadmin.net/home_page/security/PMASA-2008-10.php

    http://phpmyadmin.net will be updated with the download links;
    meanwhile you can visit
    https://sourceforge.net/projects/phpmyadmin/ in the Download area.

    Marc Delisle, for the team"

ChangeLog is at:

    http://sourceforge.net/project/shownotes.php?release_id=646035

Also:

    No more RUN_DEPENDS on devel/php5-pcre as it has been subsumed
    into lang/php5

>How-To-Repeat:
	
>Fix:

	

--- phpmyadmin.diff begins here ---
diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile
--- /usr/ports/databases/phpmyadmin/Makefile	2008-12-02 06:26:15.000000000 +0000
+++ phpmyadmin/Makefile	2008-12-09 18:54:10.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpMyAdmin
-DISTVERSION=	3.1.0
+DISTVERSION=	3.1.1
 CATEGORIES=	databases www
 MASTER_SITES=	SF/phpmyadmin
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
@@ -20,7 +20,7 @@
 USE_BZIP2=	yes
 NO_BUILD=	yes
 .if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	ctype mysql pcre session spl
+USE_PHP=	ctype mysql session spl
 .endif
 
 # Unfortunately can't make WITH_SUPHP part of the OPTIONS selection,
diff -Nur /usr/ports/databases/phpmyadmin/distinfo phpmyadmin/distinfo
--- /usr/ports/databases/phpmyadmin/distinfo	2008-12-02 06:26:15.000000000 +0000
+++ phpmyadmin/distinfo	2008-12-09 18:32:44.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (phpMyAdmin-3.1.0-all-languages.tar.bz2) = 380cd0ee36cafcfd9fd3079a06d20d1e
-SHA256 (phpMyAdmin-3.1.0-all-languages.tar.bz2) = cfea14182499be7e00319de6dd5fe22bec1065a88f8c37fa67870edd3159aa53
-SIZE (phpMyAdmin-3.1.0-all-languages.tar.bz2) = 2634660
+MD5 (phpMyAdmin-3.1.1-all-languages.tar.bz2) = ddfaae7496828983fca2f849ddf3d869
+SHA256 (phpMyAdmin-3.1.1-all-languages.tar.bz2) = 6d5f7f85446a892d02cd89831bf4bd4e642b425686b1d36427d7b38c458218ad
+SIZE (phpMyAdmin-3.1.1-all-languages.tar.bz2) = 2643658
--- phpmyadmin.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue Dec 9 19:54:15 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129533 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Dec 11 19:48:06 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129533 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/129533: commit references a PR
Date: Thu, 11 Dec 2008 19:48:06 +0000 (UTC)

 miwi        2008-12-11 19:47:57 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/phpmyadmin Makefile distinfo 
   Log:
   - Update to 3.1.1
   
   PR:             129533
   Submitted by:   Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)
   Security:       http://www.vuxml.org/freebsd/54f72962-c7ba-11dd-a721-0030843d3802.html
   
   Revision  Changes    Path
   1.100     +2 -2      ports/databases/phpmyadmin/Makefile
   1.81      +3 -3      ports/databases/phpmyadmin/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
