From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 23 22:58:26 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 20E6CE1C;
 Mon, 23 Dec 2013 22:58:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E6AEE16B3;
 Mon, 23 Dec 2013 22:58:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNMwPg6085041;
 Mon, 23 Dec 2013 22:58:25 GMT (envelope-from matthew@svn.freebsd.org)
Received: (from matthew@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNMwPru085038;
 Mon, 23 Dec 2013 22:58:25 GMT (envelope-from matthew@svn.freebsd.org)
Message-Id: <201312232258.rBNMwPru085038@svn.freebsd.org>
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Mon, 23 Dec 2013 22:58:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337306 - in head/databases/phpmyadmin: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Dec 2013 22:58:26 -0000

Author: matthew
Date: Mon Dec 23 22:58:24 2013
New Revision: 337306
URL: http://svnweb.freebsd.org/changeset/ports/337306

Log:
  Update to 4.1.2
  
    - Add instructions for more recent verions of Apache to
      pkg-message (1)
  
  Release Notes:	http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.1.2/phpMyAdmin-4.1.2-notes.html/view
  Submitted by:	poinsot.julien@gmail.com (1)

Modified:
  head/databases/phpmyadmin/Makefile
  head/databases/phpmyadmin/distinfo
  head/databases/phpmyadmin/files/pkg-message.in   (contents, props changed)

Modified: head/databases/phpmyadmin/Makefile
==============================================================================
--- head/databases/phpmyadmin/Makefile	Mon Dec 23 22:42:48 2013	(r337305)
+++ head/databases/phpmyadmin/Makefile	Mon Dec 23 22:58:24 2013	(r337306)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phpMyAdmin
-DISTVERSION=	4.1.1
+DISTVERSION=	4.1.2
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages

Modified: head/databases/phpmyadmin/distinfo
==============================================================================
--- head/databases/phpmyadmin/distinfo	Mon Dec 23 22:42:48 2013	(r337305)
+++ head/databases/phpmyadmin/distinfo	Mon Dec 23 22:58:24 2013	(r337306)
@@ -1,2 +1,2 @@
-SHA256 (phpMyAdmin-4.1.1-all-languages.tar.xz) = dd337ee974876f8a7fbcebbd97cf9d2d403c386d42f7e8bcea82b0263726ece6
-SIZE (phpMyAdmin-4.1.1-all-languages.tar.xz) = 4828156
+SHA256 (phpMyAdmin-4.1.2-all-languages.tar.xz) = 045f7813f920d740259c2dc38f90b13ed918530199c6f40f4fac5f061f36a1e8
+SIZE (phpMyAdmin-4.1.2-all-languages.tar.xz) = 4892628

Modified: head/databases/phpmyadmin/files/pkg-message.in
==============================================================================
--- head/databases/phpmyadmin/files/pkg-message.in	Mon Dec 23 22:42:48 2013	(r337305)
+++ head/databases/phpmyadmin/files/pkg-message.in	Mon Dec 23 22:58:24 2013	(r337306)
@@ -8,6 +8,8 @@ Please edit config.inc.php to suit your 
 To make phpMyAdmin available through your web site, I suggest
 that you add something like the following to httpd.conf:
 
+For Apache versions earlier than 2.4:
+
     Alias /phpmyadmin/ "%%WWWDIR%%/"
 
     <Directory "%%WWWDIR%%/">
@@ -19,6 +21,18 @@ that you add something like the followin
 	Allow from 127.0.0.1 .example.com
     </Directory>
 
+For Apache version 2.4.x or above:
+
+    Alias /phpmyadmin/ "%%WWWDIR%%/"
+
+    <Directory "%%WWWDIR%%/">
+	Options -All
+	AllowOverride Limit
+
+	Require local
+    	Require host .example.com
+    </Directory>
+
 SECURITY NOTE: phpMyAdmin is an administrative tool that has had several
 remote vulnerabilities discovered in the past, some allowing remote
 attackers to execute arbitrary code with the web server's user credential.