Updated to latest upstream release, added a pkgver() that uses drush to find the latest release, changed all file permissions to include group write access, and updated the included core by merging in the latest Drupal core.

2 files changed, 25 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2efb76317ef4..08821da487a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = aegir-hostmaster
 	pkgdesc = mass Drupal hosting system - frontend
-	pkgver = 7.x_3.6
-	pkgrel = 2
+	pkgver = 7.x_3.7
+	pkgrel = 1
 	url = http://aegirproject.org
 	arch = any
 	license = GPL
 	depends = drush>=7
-	source = https://ftp.drupal.org/files/projects/hostmaster-7.x-3.6-core.tar.gz
+	source = https://ftp.drupal.org/files/projects/hostmaster-7.x-3.7-core.tar.gz
 	source = https://ftp.drupal.org/files/projects/devel_debug_log-7.x-1.2.tar.gz
 	source = https://ftp.drupal.org/files/projects/devel-7.x-1.5.tar.gz
-	md5sums = 642925101fa0a842601b5d6e35741d02
+	md5sums = 3e3340a3a09c8e533b6bac242f882bfb
 	md5sums = 19561aa1a0f2e549acf5c44a8cad8e14
 	md5sums = f06c912eb4edbd48fbcc2867516726a3
 
diff --git a/PKGBUILD b/PKGBUILD
index 966b7274ebdf..d72f93e3534f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=aegir-hostmaster
 _pkgname=${pkgname##*-}
-pkgver=7.x_3.6
+pkgver=7.x_3.7
 pkgrel=2
 pkgdesc="mass Drupal hosting system - frontend"
 arch=('any')
@@ -10,24 +10,35 @@ url='http://aegirproject.org'
 license=('GPL')
 depends=('drush>=7')
 source=("https://ftp.drupal.org/files/projects/$_pkgname-${pkgver//_/-}-core.tar.gz"
-        "https://ftp.drupal.org/files/projects/devel_debug_log-7.x-1.2.tar.gz"
-        "https://ftp.drupal.org/files/projects/devel-7.x-1.5.tar.gz")
-md5sums=('642925101fa0a842601b5d6e35741d02'
+        "https://ftp.drupal.org/files/projects/devel-${pkgver%_*}-1.5.tar.gz"
+        "https://ftp.drupal.org/files/projects/devel_debug_log-${pkgver%_*}-1.2.tar.gz"
+        "https://ftp.drupal.org/files/projects/drupal-7.50.tar.gz")
+md5sums=('3e3340a3a09c8e533b6bac242f882bfb'
+         'f06c912eb4edbd48fbcc2867516726a3'
          '19561aa1a0f2e549acf5c44a8cad8e14'
-         'f06c912eb4edbd48fbcc2867516726a3')
+         'f23905b0248d76f0fc8316692cd64753')
+
+prepare() {
+  drush pm-releases --default-major=7 --no-dev --no-field-labels --pipe $_pkgname | \
+    egrep --invert-match ',7\.x-[0-9]+\.x-dev,' | \
+    sort --field-separator=, --key=2V | \
+    cut --fields=2 --delimiter=, | tr '-' '_'
+}
 
 package() {
   install -dm755 "$pkgdir/usr/share/webapps/$_pkgname"
   install -dm755 "$pkgdir/var/lib/$_pkgname"
 
-  cp -a $_pkgname-${pkgver//_/-}/* "$pkgdir/usr/share/webapps/$_pkgname"
+  cp --archive --no-target-directory drupal-7.50 "$pkgdir/usr/share/webapps/$_pkgname"
+  rsync --archive --ignore-existing "$_pkgname-${pkgver//_/-}/" "$pkgdir/usr/share/webapps/$_pkgname"
   mv "$pkgdir/usr/share/webapps/$_pkgname/sites" "$pkgdir/var/lib/$_pkgname"
   ln -s "/var/lib/$_pkgname/sites" "$pkgdir/usr/share/webapps/$_pkgname"
   cp -a devel devel_debug_log "$pkgdir/var/lib/$_pkgname/sites/all/modules"
 
-  install -Dm644 <( ) "$pkgdir/var/lib/$_pkgname/sites/all/drush/drushrc.php"
-  install -Dm644 <( ) "$pkgdir/var/lib/$_pkgname/sites/sites.php"
+  install -Dm664 <( ) "$pkgdir/var/lib/$_pkgname/sites/all/drush/drushrc.php"
+  install -Dm664 <( ) "$pkgdir/var/lib/$_pkgname/sites/sites.php"
 
-  find "$pkgdir/var/lib/$_pkgname" -perm /u+w -exec chmod g+w {} +
-  chown -R http:http "$pkgdir/var/lib/$_pkgname"
+  chown -R http:http "$pkgdir/var/lib/$_pkgname" "$pkgdir/usr/share/webapps/$_pkgname"
+  find "$pkgdir/var/lib/$_pkgname" "$pkgdir/usr/share/webapps/$_pkgname" -type d -exec chmod 775 {} +
+  find "$pkgdir/var/lib/$_pkgname" "$pkgdir/usr/share/webapps/$_pkgname" -type f -exec chmod 664 {} +
 }