Update to 4.2.3

2 files changed, 19 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 494172fd7a78..33cf0f9f12a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = adminer-git
-	pkgdesc = a full-featured MySQL management tool written in PHP. Formerly phpMinAdmin.
-	pkgver = 4.2.2.r0.g596f8df
+	pkgdesc = a web based SQL management tool supporting MySQL, PostgreSQL, SQLite, MS SQL, Oracle, Firebird, SimpleDB, Elasticsearch and MongoDB. Formerly phpMinAdmin.
+	pkgver = 4.2.3.r0.gf83e3f4
 	pkgrel = 1
-	url = http://www.adminer.org
+	url = https://www.adminer.org
 	install = adminer.install
 	arch = any
-	license = Apache License, Version 2.0
+	license = Apache
 	makedepends = git
 	depends = php
 	optdepends = mariadb
@@ -14,7 +14,7 @@ pkgbase = adminer-git
 	optdepends = postgresql
 	optdepends = sqlite: for sqlite3
 	optdepends = sqlite2
-	provides = adminer=4.2.2
+	provides = adminer=4.2.3
 	conflicts = adminer
 	source = adminer-git::git://adminer.git.sourceforge.net/gitroot/adminer/adminer
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index dbc5b291f328..c8d7ec66de1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,22 @@
 # Maintainer: Chris Severance aur.severach aATt spamgourmet dott com
-# Contributor: Sabart Otto - Seberm <seberm[at]gmail[dot].com
+# Contributor: Sabart Otto - Seberm <seberm[at]gmail[dot]com>
 # Contributor: Uzsolt
 
+# TODO: Tighten up open_basedir to adminer folder only
+
 [ ! -s 'PKGBUILD.local' ] && cat > 'PKGBUILD.local' << EOF
 # adminer or another name for your link
 _opt_WWWName='adminer' # default: adminer
 #_opt_WWWName=''
 
-# Supply a long hext code generated at https://www.grc.com/passwords.htm
+# Supply a long hex code generated at https://www.grc.com/passwords.htm
 # Your server will be at http://localhost/adminer-LONGHEXCODE/
 # This will make it hard to find on a public facing server.
-# Save your server as a link.
+# Bookmark the address.
 _opt_HexCode='' # default: blank
 #opt_HexCode=''
+
+# A change to either of these and you must restart httpd
 EOF
 . 'PKGBUILD.local'
 
@@ -21,21 +25,19 @@ test ! -z "${_opt_HexCode}" && _opt_HexCode="-${_opt_HexCode}"
 
 _pkgname='adminer'
 pkgname="${_pkgname}-git"
-pkgver=4.2.2.r0.g596f8df
+pkgver=4.2.3.r0.gf83e3f4
 pkgrel=1
-pkgdesc='a full-featured MySQL management tool written in PHP. Formerly phpMinAdmin.'
+pkgdesc='a web based SQL management tool supporting MySQL, PostgreSQL, SQLite, MS SQL, Oracle, Firebird, SimpleDB, Elasticsearch and MongoDB. Formerly phpMinAdmin.'
 arch=('any')
-url='http://www.adminer.org'
-license=('Apache License, Version 2.0')
+url='https://www.adminer.org'
+license=('Apache')
 depends=('php')
 optdepends=('mariadb' 'apache' 'adminer-skins: various CSS skins for adminer' 'postgresql' 'sqlite: for sqlite3' 'sqlite2')
 makedepends=('git')
 provides=("${_pkgname}=${pkgver%%.r*}")
 conflicts=("${_pkgname}")
 install="${_pkgname}.install"
-_verurl="${url}"
-_versed='http://downloads.sourceforge.net/adminer/adminer-\([0-9\.]\+\).php'
-_veropt='l'
+_verwatch=("${url}" '/static/download/[0-9\.]\+/adminer-\([0-9\.]\+\).php' 'l')
 source=("${pkgname}::git://adminer.git.sourceforge.net/gitroot/adminer/adminer")
 sha256sums=('SKIP')
 
@@ -56,7 +58,7 @@ package() {
   # .. is unreachable with our php_admin_value open_basedir limits.
   sed -i -e 's:../adminer/::g' $(grep -lr '../adminer/' "${pkgdir}/usr/share/webapps/")
 
-  # Its similar to phpMyAdmin
+  # Its similar to phpMyAdmin. I don't like opening up the entire /srv folder.
   install -Dpm644 <(cat << EOF
 # Installed by ${pkgname}-${pkgver} PKGBUILD from Arch Linux AUR
 # http://aur.archlinux.org/
@@ -65,13 +67,12 @@ Alias /${_opt_WWWName}${_opt_HexCode} "/usr/share/webapps/${_pkgname}"
   AllowOverride All
   Options FollowSymlinks
     Require all granted
-    php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/"
+    php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/${_pkgname}/:/etc/webapps:/usr/share/pear/"
 </Directory>
 EOF
   ) "${pkgdir}/etc/webapps/${_pkgname}/apache.example.conf"
 
   install -Dpm644 "${pkgdir}/etc/webapps/${_pkgname}/apache.example.conf" "${pkgdir}/etc/httpd/conf/extra/httpd-${_pkgname}.conf"
-  #echo "Include conf/extra/httpd-${pkgname}.conf" >> ${pkgdir}/etc/httpd/conf/httpd.conf
   set +u
 }
 set +u