[arch-commits] Commit in drupal/repos/community-any (4 files)

[Sergej Pupykin]

    Date: Thursday, February 26, 2015 @ 18:05:57
  Author: spupykin
Revision: 128293

archrelease: copy trunk to community-any

Added:
  drupal/repos/community-any/PKGBUILD
    (from rev 128292, drupal/trunk/PKGBUILD)
  drupal/repos/community-any/drupal.install
    (from rev 128292, drupal/trunk/drupal.install)
Deleted:
  drupal/repos/community-any/PKGBUILD
  drupal/repos/community-any/drupal.install

----------------+
 PKGBUILD       |   97 +++++++++++++++++++++++++++++--------------------------
 drupal.install |   30 ++++++++---------
 2 files changed, 67 insertions(+), 60 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-26 17:05:42 UTC (rev 128292)
+++ PKGBUILD	2015-02-26 17:05:57 UTC (rev 128293)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Corrado Primier <cp663137 at stud.polimi.it>
-
-pkgname=drupal
-pkgver=7.34
-pkgrel=1
-pkgdesc="A PHP-based content management platform"
-arch=('any')
-url="http://www.drupal.org/"
-license=('GPL')
-depends=('php')
-install='drupal.install'
-options=(!strip)
-source=(http://www.drupal.org/files/projects/$pkgname-$pkgver.tar.gz)
-md5sums=('bb4d212e1eb1d7375e41613fbefa04f2')
-
-package() {
-  _instdir=$pkgdir/usr/share/webapps/drupal
-  mkdir -p ${_instdir}
-  cd ${_instdir}
-  cp -r $srcdir/$pkgname-$pkgver/{*,.htaccess} ${_instdir}
-
-  # move .htaccess
-  mkdir -p $pkgdir/etc/webapps/drupal
-  sed -i '1,1iRequire all denied' ${_instdir}/.htaccess
-  mv ${_instdir}/.htaccess $pkgdir/etc/webapps/drupal/.htaccess
-  ln -s /etc/webapps/drupal/.htaccess ${_instdir}/.htaccess
-
-  # move sites/
-  mkdir -p $pkgdir/var/lib/drupal/
-  mv ${_instdir}/sites $pkgdir/var/lib/drupal/sites
-  ln -s /var/lib/drupal/sites ${_instdir}/sites
-
-  # apache config example
-  cat >$pkgdir/etc/webapps/drupal/apache.example.conf <<EOF
-	Alias /drupal "/usr/share/webapps/drupal"
-	<Directory "/usr/share/webapps/drupal">
-		AllowOverride All
-		Options FollowSymlinks
-		Require all granted
-		php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/:/var/lib/drupal"
-	</Directory>
-EOF
-}

Copied: drupal/repos/community-any/PKGBUILD (from rev 128292, drupal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-02-26 17:05:57 UTC (rev 128293)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Corrado Primier <cp663137 at stud.polimi.it>
+
+pkgname=drupal
+pkgver=7.34
+pkgrel=2
+pkgdesc="A PHP-based content management platform"
+arch=('any')
+url="http://www.drupal.org/"
+license=('GPL')
+depends=('php')
+install='drupal.install'
+options=(!strip)
+source=(http://www.drupal.org/files/projects/$pkgname-$pkgver.tar.gz
+	https://www.drupal.org/files/issues/1599774-htaccess-apache-2.4-53-D7-backport.patch)
+md5sums=('bb4d212e1eb1d7375e41613fbefa04f2'
+         'a892343516f50041173d36d1d74d4b04')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/1599774-htaccess-apache-2.4-53-D7-backport.patch
+}
+
+package() {
+  _instdir=$pkgdir/usr/share/webapps/drupal
+  mkdir -p ${_instdir}
+  cd ${_instdir}
+  cp -r $srcdir/$pkgname-$pkgver/{*,.htaccess} ${_instdir}
+
+  # move .htaccess
+  mkdir -p $pkgdir/etc/webapps/drupal
+  sed -i '1,1iRequire all denied' ${_instdir}/.htaccess
+  mv ${_instdir}/.htaccess $pkgdir/etc/webapps/drupal/.htaccess
+  ln -s /etc/webapps/drupal/.htaccess ${_instdir}/.htaccess
+
+  # move sites/
+  mkdir -p $pkgdir/var/lib/drupal/
+  mv ${_instdir}/sites $pkgdir/var/lib/drupal/sites
+  ln -s /var/lib/drupal/sites ${_instdir}/sites
+
+  # apache config example
+  cat >$pkgdir/etc/webapps/drupal/apache.example.conf <<EOF
+	Alias /drupal "/usr/share/webapps/drupal"
+	<Directory "/usr/share/webapps/drupal">
+		AllowOverride All
+		Options FollowSymlinks
+		Require all granted
+		php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/:/var/lib/drupal"
+	</Directory>
+EOF
+}

Deleted: drupal.install
===================================================================
--- drupal.install	2015-02-26 17:05:42 UTC (rev 128292)
+++ drupal.install	2015-02-26 17:05:57 UTC (rev 128293)
@@ -1,15 +0,0 @@
-post_install() {
-  echo "Remember that you need to install either mysql or postgresql for this package"
-  echo "to work. Also make sure to read either INSTALL.mysql.txt (for MySQL) or"
-  echo "INSTALL.pgsql.txt (for PostgreSQL) in /usr/share/webapps/drupal/."
-  if [[ ! `grep "^extension=mysql.so" /etc/php/php.ini` ]]
-	then echo "If you use mysql you should enable its module by adding the line:"
-	echo "   extension=mysql.so"
-	echo "to your /etc/php/php.ini, otherwise drupal won't work."
-  fi
-  chown -R http:http var/lib/drupal
-}
-
-post_upgrade() {
-  chown -R http:http var/lib/drupal
-}

Copied: drupal/repos/community-any/drupal.install (from rev 128292, drupal/trunk/drupal.install)
===================================================================
--- drupal.install	                        (rev 0)
+++ drupal.install	2015-02-26 17:05:57 UTC (rev 128293)
@@ -0,0 +1,15 @@
+post_install() {
+  echo "Remember that you need to install either mysql or postgresql for this package"
+  echo "to work. Also make sure to read either INSTALL.mysql.txt (for MySQL) or"
+  echo "INSTALL.pgsql.txt (for PostgreSQL) in /usr/share/webapps/drupal/."
+  if [[ ! `grep "^extension=mysql.so" /etc/php/php.ini` ]]
+	then echo "If you use mysql you should enable its module by adding the line:"
+	echo "   extension=mysql.so"
+	echo "to your /etc/php/php.ini, otherwise drupal won't work."
+  fi
+  chown -R http:http var/lib/drupal
+}
+
+post_upgrade() {
+  chown -R http:http var/lib/drupal
+}