summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin2014-09-06 23:24:26 +0200
committerFlorian Bruhin2014-09-06 23:24:26 +0200
commit69edfe42fabaadaf87474ca563d79d2940ac26d6 (patch)
tree47e3885827dfeab147a6203b6b3813219f0a70cb
parentb8d4aa04ac61640e3dee0312467705744e21128d (diff)
downloadaur-69edfe42fabaadaf87474ca563d79d2940ac26d6.tar.gz
baikal: packaging fixes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--baikal.install7
3 files changed, 11 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5dcf1d9ca77..055c2fb533c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = baikal
pkgdesc = Lightweight CalDAV+CardDAV server
pkgver = 0.2.7
- pkgrel = 4
+ pkgrel = 5
url = http://baikal-server.com/
install = baikal.install
arch = any
@@ -14,7 +14,7 @@ pkgbase = baikal
source = http://baikal-server.com/get/baikal-regular-0.2.7.tgz
source = baikal.install
sha1sums = 01eabcf0229ddffc0542f4e2a349754e778abbea
- sha1sums = 242048f78fde70f1bde1c51dce4a73ad42a21f28
+ sha1sums = a1d2f36b6c4a282d23477dccb957c3ad3995f116
pkgname = baikal
diff --git a/PKGBUILD b/PKGBUILD
index db95e291bad4..9b5cc7cf8fd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=baikal
pkgver=0.2.7
-pkgrel=4
+pkgrel=5
pkgdesc="Lightweight CalDAV+CardDAV server"
url="http://baikal-server.com/"
arch=('any')
@@ -13,7 +13,7 @@ optdepends=('sqlite: Database' 'mariadb: Alternate database' 'php-sqlite: To use
source=("http://baikal-server.com/get/baikal-regular-${pkgver}.tgz"
'baikal.install')
sha1sums=('01eabcf0229ddffc0542f4e2a349754e778abbea'
- '242048f78fde70f1bde1c51dce4a73ad42a21f28')
+ 'a1d2f36b6c4a282d23477dccb957c3ad3995f116')
options=('!strip')
install=baikal.install
@@ -24,8 +24,6 @@ package() {
cp -R Core html vendor "$pkgdir/usr/share/webapps/$pkgname"
install -Dm644 ChangeLog.md INSTALL.md README.md TROUBLESHOOTING.md \
"$pkgdir/usr/share/doc/$pkgname"
- install -Dm644 -o http -g http Specific/ENABLE_INSTALL \
- "$pkgdir/var/lib/$pkgname"
for conf in Specific/virtualhosts/*; do
basename=${conf##*/}
basename=${basename/baikal./}.example.conf
diff --git a/baikal.install b/baikal.install
index 2ea4359beaa2..2e36cb389abf 100644
--- a/baikal.install
+++ b/baikal.install
@@ -10,6 +10,7 @@ post_install() {
/var/lib/baikal/db
chown -R http:http /var/lib/baikal/db
fi
+ # Now create install file
touch /var/lib/baikal/ENABLE_INSTALL
echo "Please add /var/lib/baikal to open_basedir in your /etc/php.ini."
echo
@@ -23,4 +24,10 @@ post_install() {
echo " touch /var/lib/baikal/ENABLE_INSTALL"
}
+post_upgrade() {
+ if [[ $2 < '0.2.7-5' ]]; then
+ echo "Please add /var/lib/baikal to open_basedir in your /etc/php.ini."
+ fi
+}
+
# vim:set ts=2 sw=2 et ft=sh: