[arch-commits] Commit in roundcubemail/trunk (PKGBUILD roundcubemail.tmpfiles)

[Sergej Pupykin]

    Date: Thursday, April 19, 2018 @ 13:06:28
  Author: spupykin
Revision: 317038

roundcubemail: fix config sample permissions

Modified:
  roundcubemail/trunk/PKGBUILD
Deleted:
  roundcubemail/trunk/roundcubemail.tmpfiles

------------------------+
 PKGBUILD               |   25 ++++++++-----------------
 roundcubemail.tmpfiles |    2 --
 2 files changed, 8 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-19 13:01:45 UTC (rev 317037)
+++ PKGBUILD	2018-04-19 13:06:28 UTC (rev 317038)
@@ -15,22 +15,18 @@
         'etc/webapps/roundcubemail/apache.conf')
 validpgpkeys=('F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5')
 source=("https://github.com/roundcube/roundcubemail/releases/download/$pkgver/roundcubemail-$pkgver-complete.tar.gz"{,.asc}
-        "apache.conf"
-        "roundcubemail.tmpfiles")
+        "apache.conf")
 sha256sums=('f1b86e97cc8fd69bb1957d4115762af6ea2d6957ea17b33dd3ec2995662670d9'
             'SKIP'
-            'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0'
-            'b0baf067cd6c09938991890ab8c87ba4bad06987781c5accbed86b95e35c2a56')
+            'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0')
 
 prepare() {
-  cd "$srcdir"/roundcubemail-${pkgver/rc/-rc}
+  cd "$srcdir"/roundcubemail-${pkgver}
   sed -i \
     -e "s|RCUBE_INSTALL_PATH . 'temp.*|'/var/cache/roundcubemail';|" \
     -e "s|RCUBE_INSTALL_PATH . 'logs.*|'/var/log/roundcubemail';|" \
     config/defaults.inc.php \
     program/lib/Roundcube/rcube_config.php
-#  mv composer.json-dist composer.json
-#  php -d extension=gd.so ../composer.phar install --no-dev
 }
 
 package() {
@@ -37,7 +33,7 @@
   mkdir -p "$pkgdir"/etc/webapps/roundcubemail
   mkdir -p "$pkgdir"/usr/share/webapps
   cd "$pkgdir"/usr/share/webapps
-  cp -ra "$srcdir"/roundcubemail-${pkgver/rc/-rc} roundcubemail
+  cp -ra "$srcdir"/roundcubemail-${pkgver} roundcubemail
   cd roundcubemail
 
   mv .htaccess "$pkgdir"/etc/webapps/roundcubemail/
@@ -47,15 +43,10 @@
   ln -s /etc/webapps/roundcubemail/config config
 
   install -Dm0644 "$srcdir"/apache.conf "$pkgdir"/etc/webapps/roundcubemail/apache.conf
+  install -dm0750 -o http -g http "$pkgdir"/var/cache/roundcubemail
+  install -dm0750 -o http -g http "$pkgdir"/var/log/roundcubemail
+  chown http:http "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
+  chmod 0640 "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample
 
   rm -rf temp logs
-  find "$pkgdir" -name .git -exec rm -rf {} \; || true
-
-#  sed -i "s|"$srcdir"/roundcubemail-${pkgver/rc/-rc}/vendor/pear-pear.php.net/Console_CommandLine/data|/usr/share/webapps/roundcubemail/vendor/pear-pear.php.net|g" \
-#    vendor/pear-pear.php.net/Console_CommandLine/Console/CommandLine/XmlParser.php
-
-#  sed -i "s|"$srcdir"/roundcubemail-${pkgver/rc/-rc}|/usr/share/webapps/roundcubemail|g" \
-#    vendor/pear-pear.php.net/Crypt_GPG/bin/crypt-gpg-pinentry \
-#    vendor/pear-pear.php.net/Crypt_GPG/Crypt/GPG/Engine.php \
-#    vendor/pear-pear.php.net/Crypt_GPG/Crypt/GPG/PinEntry.php
 }

Deleted: roundcubemail.tmpfiles
===================================================================
--- roundcubemail.tmpfiles	2018-04-19 13:01:45 UTC (rev 317037)
+++ roundcubemail.tmpfiles	2018-04-19 13:06:28 UTC (rev 317038)
@@ -1,2 +0,0 @@
-d /var/cache/roundcubemail 0750 http http - -
-d /var/log/roundcubemail 0750 http http - -