Bugfix update to 4.2.2

add a fix for bug #3893, token mismatch error when a new user is created

www/phpmyadmin/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.103 2014/05/30 13:20:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.104 2014/06/13 17:01:36 giovanni Exp $
 
 COMMENT=	tool to handle the administration of MySQL over the web
 
-V=		4.2.1
+V=		4.2.2
 
 PKGNAME=	phpMyAdmin-$V
 DISTNAME=	phpMyAdmin-$V-all-languages
@@ -35,6 +35,7 @@ post-extract:
 	    ${WRKSRC}/examples/phpMyAdmin-httpd.conf
 
 do-install:
+	@find ${WRKSRC} -type f -name "*.orig" -exec rm -f {} \;
 	${INSTALL_DATA_DIR} ${INSTDIR}/
 	cd ${WRKSRC}; pax -rw ./ ${INSTDIR}/
 

www/phpmyadmin/distinfo

@@ -1,2 +1,2 @@
-SHA256 (phpMyAdmin-4.2.1-all-languages.tar.gz) = TbiN4+z7Ph1z1tb2yaUlby+TzOVhg/ACQvkBSsCO5m8=
-SIZE (phpMyAdmin-4.2.1-all-languages.tar.gz) = 8577786
+SHA256 (phpMyAdmin-4.2.2-all-languages.tar.gz) = sn5nEptYo3HLIrCX/aYzT9JaWS0QKfxbPkD92FNaSEU=
+SIZE (phpMyAdmin-4.2.2-all-languages.tar.gz) = 8589833

www/phpmyadmin/patches/patch-js_error_report_js

@@ -0,0 +1,15 @@
+$OpenBSD: patch-js_error_report_js,v 1.1 2014/06/13 17:01:36 giovanni Exp $
+Error "token mismatch" when a new user is created on a remote
+database.
+http://sourceforge.net/p/phpmyadmin/bugs/3893/
+
+--- js/error_report.js.orig	Fri Jun 13 17:45:51 2014
++++ js/error_report.js	Fri Jun 13 17:47:18 2014
+@@ -21,6 +21,7 @@ var ErrorReport = {
+         ErrorReport._last_exception = exception;
+         $.get("error_report.php", {
+             ajax_request: true,
++            server: PMA_commonParams.get('server'),
+             token: PMA_commonParams.get('token'),
+             get_settings: true
+         }, function (data) {

www/phpmyadmin/patches/patch-js_server_privileges_js

@@ -0,0 +1,15 @@
+$OpenBSD: patch-js_server_privileges_js,v 1.1 2014/06/13 17:01:36 giovanni Exp $
+Error "token mismatch" when a new user is created on a remote
+database.
+http://sourceforge.net/p/phpmyadmin/bugs/3893/
+
+--- js/server_privileges.js.orig	Fri Jun 13 17:45:36 2014
++++ js/server_privileges.js	Fri Jun 13 17:46:48 2014
+@@ -192,6 +192,7 @@ AJAX.registerOnload('server_privileges.js', function (
+             var href = $("form[name='usersForm']").attr('action');
+             var params = {
+                 'ajax_request' : true,
++                'server' : PMA_commonParams.get('server'),
+                 'token' : PMA_commonParams.get('token'),
+                 'validate_username' : true,
+                 'username' : username