summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Lucas2015-07-28 23:55:44 -0500
committerDJ Lucas2015-07-28 23:55:44 -0500
commitc65967e42fbcc7246dee1eb67512d09379162bfd (patch)
tree3cfccd7383bb1e179bf27c06118a989682ee97c5
parentd682efb33d1a4fb0938d6d4072e2a270800c9548 (diff)
downloadaur-c65967e42fbcc7246dee1eb67512d09379162bfd.tar.gz
Update to 2.3.1
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD40
-rw-r--r--sogo.confd4
-rw-r--r--sogo.install7
-rw-r--r--sogo.service3
5 files changed, 50 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e3b02a2ccb4..a20c59e22fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sogo
- pkgver = 2.3.0
- pkgrel = 2
+ pkgver = 2.3.1
+ pkgrel = 1
url = http://www.sogo.nu/
arch = i686
arch = x86_64
@@ -11,19 +11,21 @@ pkgbase = sogo
makedepends = libmemcached
makedepends = sope>=2.3.0
options = !strip
- source = http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-2.3.0.tar.gz
+ source = http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-2.3.1.tar.gz
source = sogo_configure.patch
source = UI_MailPartViewers_GNUmakefile.patch
source = sogo.service
- sha256sums = 26134eee48b6a42b047fea61a093b7774bf5066778debf02bcff6f6682803e0a
+ source = sogo.confd
+ sha256sums = 9b70c595e92a086d6033a76f49e5651a42dbffcf3c40874ce6a0b77595f060ce
sha256sums = e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1
sha256sums = ef6ab2829d35c2abb5529ee8ea9a4cc541913b0a82bc91f4c9fa21c65d44a4aa
- sha256sums = 62a22aa4231059fd85315795ea735638da4bc71cde4c7da21a71f2559647a4b1
+ sha256sums = 0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c
+ sha256sums = 8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7
pkgname = sogo
pkgdesc = groupware server built around OpenGroupware.org (OGo) and the SOPE application server
install = sogo.install
- depends = sope>=2.3.0
+ depends = sope>=2.3.1
depends = gnustep-base
depends = libmemcached
depends = memcached
@@ -39,14 +41,15 @@ pkgname = sogo
optdepends = funambol: sync mobile devices with sogo contacts, events, tasks via SyncML
backup = etc/sogo/sogo.conf
backup = etc/httpd/conf/extra/SOGo.conf
+ backup = etc/conf.d/sogo
pkgname = sogo-openchange
pkgdesc = OpenChange module for SOGo
- depends = sogo=2.3.0
+ depends = sogo=2.3.1
depends = openchange
pkgname = sogo-activesync
pkgdesc = ActiveSync module for SOGo
- depends = sogo=2.3.0
+ depends = sogo=2.3.1
depends = libwbxml
diff --git a/PKGBUILD b/PKGBUILD
index 9367a513062..c267b199f1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,11 @@
-# Maintainer: DJ Lucas <dj@linuxfromscratch.org>
# Maintainer: Steven Hiscocks <steven [at] hiscocks [dot] me [dot] uk>
# Contributor: Andre Wayand <aur-sogo@awayand.sleepmail.com>
pkgbase=sogo
pkgname=('sogo'
'sogo-openchange'
'sogo-activesync')
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.sogo.nu/"
license=('GPL')
@@ -14,13 +13,14 @@ makedepends=('gcc-objc'
'gnustep-base'
'libwbxml'
'libmemcached'
- 'sope>=2.3.0')
+ 'sope>=2.3.1')
options=('!strip')
source=(
http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-${pkgver}.tar.gz
sogo_configure.patch
UI_MailPartViewers_GNUmakefile.patch
sogo.service
+ sogo.confd
)
prepare() {
@@ -37,7 +37,7 @@ build() {
package_sogo() {
pkgdesc="groupware server built around OpenGroupware.org (OGo) and the SOPE application server"
-depends=('sope>=2.3.0' 'gnustep-base' 'libmemcached' 'memcached')
+depends=('sope>=2.3.1' 'gnustep-base' 'libmemcached' 'memcached')
optdepends=(
'postgresql: run database server for sogo locally'
'mariadb: run database server for sogo locally'
@@ -49,20 +49,31 @@ optdepends=(
'apache: webserver to provide web interface locally'
'lighttpd: webserver to provide web interface locally'
'funambol: sync mobile devices with sogo contacts, events, tasks via SyncML')
-backup=(etc/sogo/sogo.conf etc/httpd/conf/extra/SOGo.conf)
+backup=('etc/sogo/sogo.conf'
+ 'etc/httpd/conf/extra/SOGo.conf'
+ 'etc/conf.d/sogo')
install=sogo.install
cd "${srcdir}/SOGo-${pkgver}"
make install DESTDIR="${pkgdir}" GNUSTEP_SYSTEM_ADMIN_TOOLS="/usr/bin"
- install -D -m 0644 "${srcdir}"/sogo.service "${pkgdir}"/usr/lib/systemd/system/sogo.service
- install -D -m 0600 "${srcdir}"/SOGo-${pkgver}/Scripts/sogo.conf "${pkgdir}"/etc/sogo/sogo.conf
- install -D -m 0644 "${srcdir}"/SOGo-${pkgver}/Apache/SOGo.conf "${pkgdir}"/etc/httpd/conf/extra/SOGo.conf
- install -D -m 0644 "${srcdir}"/SOGo-${pkgver}/Scripts/logrotate "${pkgdir}"/etc/logrotate.d/sogo
+ install -D -m 0644 "${srcdir}"/sogo.service \
+ "${pkgdir}"/usr/lib/systemd/system/sogo.service
+ install -D -m 0600 "${srcdir}"/SOGo-${pkgver}/Scripts/sogo.conf \
+ "${pkgdir}"/etc/sogo/sogo.conf
+ install -D -m 0644 "${srcdir}"/SOGo-${pkgver}/Apache/SOGo.conf \
+ "${pkgdir}"/etc/httpd/conf/extra/SOGo.conf
+ install -D -m 0644 "${srcdir}"/SOGo-${pkgver}/Scripts/logrotate \
+ "${pkgdir}"/etc/logrotate.d/sogo
+ install -d -m 0755 "${pkgdir}"/usr/lib/sogo/scripts
+ install -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-update-2.2.17_to_2.3.0{,-mysql}.sh \
+ "${pkgdir}"/usr/lib/sogo/scripts/
+ install -D -m 0644 "${srcdir}"/sogo.confd \
+ "${pkgdir}"/etc/conf.d/sogo
}
package_sogo-openchange() {
pkgdesc="OpenChange module for SOGo"
-depends=('sogo=2.3.0' 'openchange')
+depends=('sogo=2.3.1' 'openchange')
cd "${srcdir}/SOGo-${pkgver}/OpenChange"
sed 's@-Wall@-Wall -fobjc-exceptions@' -i GNUmakefile
@@ -71,14 +82,15 @@ depends=('sogo=2.3.0' 'openchange')
package_sogo-activesync() {
pkgdesc="ActiveSync module for SOGo"
-depends=('sogo=2.3.0' 'libwbxml')
+depends=('sogo=2.3.1' 'libwbxml')
cd "${srcdir}/SOGo-${pkgver}/ActiveSync"
make PYTHON=/usr/bin/python2 install DESTDIR="${pkgdir}" GNU_SYSTEM_ADMIN_TOOLS="/usr/bin"
}
-sha256sums=('26134eee48b6a42b047fea61a093b7774bf5066778debf02bcff6f6682803e0a'
+sha256sums=('9b70c595e92a086d6033a76f49e5651a42dbffcf3c40874ce6a0b77595f060ce'
'e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1'
'ef6ab2829d35c2abb5529ee8ea9a4cc541913b0a82bc91f4c9fa21c65d44a4aa'
- '62a22aa4231059fd85315795ea735638da4bc71cde4c7da21a71f2559647a4b1')
+ '0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c'
+ '8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7')
diff --git a/sogo.confd b/sogo.confd
new file mode 100644
index 00000000000..1385af02992
--- /dev/null
+++ b/sogo.confd
@@ -0,0 +1,4 @@
+# Logging options
+# Log to stdout by default (systemd journal)
+# Comment the following line to log based on GNUStep or sogo.conf parameters
+SOGOLOGOPTS="-WOLogFile '-'"
diff --git a/sogo.install b/sogo.install
index 78e2b5876ae..925ddd6c011 100644
--- a/sogo.install
+++ b/sogo.install
@@ -2,9 +2,16 @@ post_install() {
useradd -r -d /etc/sogo sogo &>/dev/null
mkdir -p /var/log/sogo
chown -R sogo:sogo /etc/sogo /var/log/sogo
+ echo "NOTE: If upgrading from a 2.1.x version of sogo, you must run the SQL update"
+ echo "script for your installed SQL server, located in /usr/lib/sogo/scripts."
}
pre_remove() {
userdel sogo
groupdel sogo
}
+
+post_upgrade() {
+ echo "NOTE: If upgrading from a 2.1.x version of sogo, you must run the SQL update"
+ echo "script for your installed SQL server, located in /usr/lib/sogo/scripts."
+}
diff --git a/sogo.service b/sogo.service
index a97536d8536..e2b79db0f9d 100644
--- a/sogo.service
+++ b/sogo.service
@@ -5,7 +5,8 @@ After=network.target slapd.service memcached.service postfix.service dovecot.ser
[Service]
User=sogo
RuntimeDirectory=sogo
-ExecStart=/usr/bin/sogod -WOPidFile /var/run/sogo/sogo.pid -WONoDetach YES
+EnvironmentFile=-/etc/conf.d/sogo
+ExecStart=/usr/bin/sogod -WOPidFile /var/run/sogo/sogo.pid -WONoDetach YES $SOGOLOGOPTS
[Install]
WantedBy=multi-user.target