From 64b6600f8b33aa39fce4abf34eaffd933a0bac66 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Mon, 5 Nov 2018 15:31:04 +0100 Subject: [PATCH 1/2] First packaged version --- .SRCINFO | 25 +++++++++++++ PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++++++++ apache.conf | 7 ++++ roundcubemail.tmpfiles | 2 + 4 files changed, 118 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD create mode 100644 apache.conf create mode 100644 roundcubemail.tmpfiles diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..2824e04 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,25 @@ +pkgbase = roundcubemail-git + pkgdesc = A PHP web-based mail client + pkgver = 1.4.beta.r108.g802ed0dc6 + pkgrel = 1 + url = https://roundcube.net/ + arch = any + license = GPL + makedepends = php-composer + makedepends = git + depends = php + depends = php-gd + optdepends = python2 + provides = roundcubemail + conflicts = roundcubemail + backup = etc/webapps/roundcubemail/.htaccess + backup = etc/webapps/roundcubemail/apache.conf + source = git+https://github.com/roundcube/roundcubemail.git + source = apache.conf + source = roundcubemail.tmpfiles + sha256sums = SKIP + sha256sums = c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0 + sha256sums = b0baf067cd6c09938991890ab8c87ba4bad06987781c5accbed86b95e35c2a56 + +pkgname = roundcubemail-git + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..1618036 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,84 @@ +# Maintainer: Cedric Girard +# Contributor: Sergej Pupykin + +pkgname=roundcubemail-git +pkgver=1.4.beta.r108.g802ed0dc6 +pkgrel=1 +pkgdesc="A PHP web-based mail client" +arch=('any') +url="https://roundcube.net/" +license=('GPL') +depends=('php' 'php-gd') +makedepends=('php-composer' 'git') +optdepends=('python2') +provides=('roundcubemail') +conflicts=('roundcubemail') +backup=('etc/webapps/roundcubemail/.htaccess' + 'etc/webapps/roundcubemail/apache.conf') +source=("git+https://github.com/roundcube/roundcubemail.git" + "apache.conf" + "roundcubemail.tmpfiles") +sha256sums=('SKIP' + 'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0' + 'b0baf067cd6c09938991890ab8c87ba4bad06987781c5accbed86b95e35c2a56') + +pkgver() { + cd "roundcubemail" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +prepare() { + cd "$srcdir"/roundcubemail + 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 + + sed -i 's!"dest": "program/js/tinymce"!"dest": "program/js/tinymce/langs"!' jsdeps.json + + mv composer.json-dist composer.json + php -d extension=gd.so /usr/bin/composer install --no-dev + bin/install-jsdeps.sh + bin/jsshrink.sh + + cd skins/elastic + lessc -x styles/styles.less > styles/styles.css + lessc -x styles/print.less > styles/print.css + lessc -x styles/embed.less > styles/embed.css + cd ../.. + + bin/updatecss.sh + bin/cssshrink.sh + #rm transifexpull.sh package2composer.sh importgettext.sh exportgettext.sh README.md INSTALL UPGRADING, LICENSE, CHANGELOG + rm -rf tests/ public_html/ installer/ .tx* + +} + + +package() { + mkdir -p "$pkgdir"/etc/webapps/roundcubemail + mkdir -p "$pkgdir"/usr/share/webapps + cd "$pkgdir"/usr/share/webapps + cp -ra "$srcdir"/roundcubemail roundcubemail + cd roundcubemail + + mv .htaccess "$pkgdir"/etc/webapps/roundcubemail/ + ln -s /etc/webapps/roundcubemail/.htaccess .htaccess + + mv config "$pkgdir"/etc/webapps/roundcubemail/ + ln -s /etc/webapps/roundcubemail/config config + + install -Dm0644 "$srcdir"/apache.conf "$pkgdir"/etc/webapps/roundcubemail/apache.conf + + rm -rf temp logs + find "$pkgdir" -name .git -exec rm -rf {} \; || true + +# sed -i "s|"$srcdir"/roundcubemail/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|/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 +} diff --git a/apache.conf b/apache.conf new file mode 100644 index 0000000..e7e2b35 --- /dev/null +++ b/apache.conf @@ -0,0 +1,7 @@ +Alias /roundcube "/usr/share/webapps/roundcubemail" + + AllowOverride All + Options FollowSymlinks + Require all granted + php_admin_value open_basedir "/tmp/:/var/cache/roundcubemail:/usr/share/webapps/roundcubemail:/etc/webapps/roundcubemail:/usr/share/pear/:/var/log/roundcubemail" + diff --git a/roundcubemail.tmpfiles b/roundcubemail.tmpfiles new file mode 100644 index 0000000..17b6367 --- /dev/null +++ b/roundcubemail.tmpfiles @@ -0,0 +1,2 @@ +d /var/cache/roundcubemail 0750 http http - - +d /var/log/roundcubemail 0750 http http - - From 5bcfe360cddfa1a38808fcea731531d30afba785 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Thu, 8 Nov 2018 10:35:05 +0100 Subject: [PATCH 2/2] add cache and log folders --- .SRCINFO | 4 +--- PKGBUILD | 13 ++++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2824e04..e1969d4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = roundcubemail-git pkgdesc = A PHP web-based mail client - pkgver = 1.4.beta.r108.g802ed0dc6 + pkgver = 1.4.beta.r117.g224dd78ad pkgrel = 1 url = https://roundcube.net/ arch = any @@ -16,10 +16,8 @@ pkgbase = roundcubemail-git backup = etc/webapps/roundcubemail/apache.conf source = git+https://github.com/roundcube/roundcubemail.git source = apache.conf - source = roundcubemail.tmpfiles sha256sums = SKIP sha256sums = c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0 - sha256sums = b0baf067cd6c09938991890ab8c87ba4bad06987781c5accbed86b95e35c2a56 pkgname = roundcubemail-git diff --git a/PKGBUILD b/PKGBUILD index 1618036..e468653 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sergej Pupykin pkgname=roundcubemail-git -pkgver=1.4.beta.r108.g802ed0dc6 +pkgver=1.4.beta.r117.g224dd78ad pkgrel=1 pkgdesc="A PHP web-based mail client" arch=('any') @@ -16,11 +16,9 @@ conflicts=('roundcubemail') backup=('etc/webapps/roundcubemail/.htaccess' 'etc/webapps/roundcubemail/apache.conf') source=("git+https://github.com/roundcube/roundcubemail.git" - "apache.conf" - "roundcubemail.tmpfiles") + "apache.conf") sha256sums=('SKIP' - 'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0' - 'b0baf067cd6c09938991890ab8c87ba4bad06987781c5accbed86b95e35c2a56') + 'c90981405527ebaf153a407af6b8178b41d078bd4472d63b837b3b4cd5ae36b0') pkgver() { cd "roundcubemail" @@ -70,6 +68,11 @@ package() { ln -s /etc/webapps/roundcubemail/config config install -Dm0644 "$srcdir"/apache.conf "$pkgdir"/etc/webapps/roundcubemail/apache.conf + chown http:http "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample + chmod 0640 "$pkgdir"/etc/webapps/roundcubemail/config/config.inc.php.sample + + install -dm0750 -o http -g http "$pkgdir"/var/cache/roundcubemail + install -dm0750 -o http -g http "$pkgdir"/var/log/roundcubemail rm -rf temp logs find "$pkgdir" -name .git -exec rm -rf {} \; || true