Updated to latest upstream beta release, 7.x-3.9-beta1, and added hosting_https module and Let's Encrypt SSL support.

2 files changed, 38 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08821da487a0..e6b003babb9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,23 @@
 pkgbase = aegir-hostmaster
 	pkgdesc = mass Drupal hosting system - frontend
-	pkgver = 7.x_3.7
-	pkgrel = 1
+	pkgver = 7.x_3.9_beta1
+	pkgrel = 4
 	url = http://aegirproject.org
 	arch = any
 	license = GPL
 	depends = drush>=7
-	source = https://ftp.drupal.org/files/projects/hostmaster-7.x-3.7-core.tar.gz
+	source = https://ftp.drupal.org/files/projects/hostmaster-7.x-3.9-beta1-no-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 = 3e3340a3a09c8e533b6bac242f882bfb
+	source = https://ftp.drupal.org/files/projects/drupal-7.51.tar.gz
+	source = https://gitlab.com/aegir/hosting_https/repository/archive.tar.gz?ref=master
+	source = https://github.com/lukas2511/dehydrated/archive/master.tar.gz
+	md5sums = ce4c49a5c3325505b266201e0cdc4a48
 	md5sums = 19561aa1a0f2e549acf5c44a8cad8e14
 	md5sums = f06c912eb4edbd48fbcc2867516726a3
+	md5sums = 49f82c1cac8e4bd4941ca160fcbee93d
+	md5sums = e39904682de04c044d518a6f1f173e26
+	md5sums = 62f0351d36f900884705207922d5c7d5
 
 pkgname = aegir-hostmaster
 
diff --git a/PKGBUILD b/PKGBUILD
index d72f93e3534f..7c9b76d3efc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,46 @@
 # Maintainer: James An <james@jamesan.ca>
 
 pkgname=aegir-hostmaster
-_pkgname=${pkgname##*-}
-pkgver=7.x_3.7
-pkgrel=2
+_pkgname=${pkgname#aegir-}
+pkgver=7.x_3.9_beta1
+pkgrel=4
 pkgdesc="mass Drupal hosting system - frontend"
 arch=('any')
 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-${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'
+source=("https://ftp.drupal.org/files/projects/$_pkgname-${pkgver//_/-}-no-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'
+        'https://ftp.drupal.org/files/projects/drupal-7.51.tar.gz'
+        'https://gitlab.com/aegir/hosting_https/repository/archive.tar.gz?ref=master'
+        'https://github.com/lukas2511/dehydrated/archive/master.tar.gz')
+md5sums=('ce4c49a5c3325505b266201e0cdc4a48'
          '19561aa1a0f2e549acf5c44a8cad8e14'
-         '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 '-' '_'
-}
+         'f06c912eb4edbd48fbcc2867516726a3'
+         '49f82c1cac8e4bd4941ca160fcbee93d'
+         'e39904682de04c044d518a6f1f173e26'
+         '62f0351d36f900884705207922d5c7d5')
 
 package() {
-  install -dm755 "$pkgdir/usr/share/webapps/$_pkgname"
-  install -dm755 "$pkgdir/var/lib/$_pkgname"
+  install -d $pkgdir/{var/lib,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"
+  cp -a drupal-7.51/* "$pkgdir/usr/share/webapps/$_pkgname"
+  cp -a $_pkgname "$pkgdir/usr/share/webapps/$_pkgname/profiles/$_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"
+  cp -aT hosting_https-master-* "$pkgdir/var/lib/$_pkgname/sites/all/modules/hosting_https"
+  cp -aT dehydrated-master "$pkgdir/var/lib/$_pkgname/sites/all/modules/hosting_https/submodules/letsencrypt/drush/bin/letsencrypt"
+
+  install -D <( ) "$pkgdir/var/lib/$_pkgname/sites/all/drush/drushrc.php"
+  install -D <( ) "$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,usr/share/webapps}/$_pkgname -type d -exec chmod 775 {} +
+  find $pkgdir/{var/lib,usr/share/webapps}/$_pkgname -type f -exec chmod 664 {} +
+  chown -R http:http $pkgdir/{var/lib,usr/share/webapps}/$_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 {} +
+  #~ # correct file permissions (disabling file execution)
+  #~ find "$pkgdir/var/lib/aegir     " -type f -exec chmod 0644 {} +
+  #~ find "$pkgdir" -type d -exec chmod 0755 {} +
 }