diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 42 | ||||
| -rw-r--r-- | sogo.install | 10 | ||||
| -rw-r--r-- | sogo.service | 1 | ||||
| -rw-r--r-- | sogo_configure.patch | 14 |
5 files changed, 38 insertions, 53 deletions
@@ -1,6 +1,6 @@ pkgbase = sogo pkgdesc = groupware server built around OpenGroupware.org (OGo) and the SOPE application server - pkgver = 4.0.6 + pkgver = 5.10.0 pkgrel = 1 url = http://www.sogo.nu/ install = sogo.install @@ -8,11 +8,18 @@ pkgbase = sogo license = GPL makedepends = gcc-objc makedepends = gnustep-make - depends = sope>=4.0.6 + depends = sope>=5.10.0 depends = gnustep-base depends = libmemcached depends = memcached - depends = libwbxml + depends = libwbxml>=0.11.7-2 + depends = mariadb-libs + depends = postgresql-libs + depends = inetutils + depends = libsodium + depends = libytnef + depends = libzip + depends = oath-toolkit optdepends = postgresql: run database server for sogo locally optdepends = mariadb: run database server for sogo locally optdepends = openldap: run directory server for sogo locally @@ -27,14 +34,11 @@ pkgbase = sogo backup = etc/sogo/sogo.conf backup = etc/httpd/conf/extra/SOGo.conf backup = etc/conf.d/sogo - source = http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-4.0.6.tar.gz + source = https://packages.sogo.nu/sources/SOGo-5.10.0.tar.gz source = sogo.service source = sogo.confd - source = sogo_configure.patch - sha256sums = e7e268b3bc5c0215bb7ab8bc859cb905aa6fec0aa6093a42b434c32df232d10c - sha256sums = 0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c - sha256sums = 8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7 - sha256sums = e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1 + sha512sums = 45b1892da41ccd119120da4ee958f6794d5d08677ea9cf20c2bdd3dc85619c338667670953373d85063152e1cd27ff31cf063d7fda9fbbf1995d53038132d07e + sha512sums = 73de6719ba3c17fb03dba4c7390f1e99ac4adff4c3413b6031ebb807fcef8a3f5eb0b8e3767a9560c2106b2f3470447b52803f5bd2f562b382e99c6382be2879 + sha512sums = 51803a53f5ae32017281e3c891ae21c126a6adc10529669bd659cc4bffaeaae46a59db34c0c97bbc83e9e3be5e619e4ced170e18b31c1267d3c14ce20b54ccf4 pkgname = sogo - @@ -4,7 +4,7 @@ # Contributor: Andre Wayand <aur-sogo@awayand.sleepmail.com> pkgname=sogo pkgdesc="groupware server built around OpenGroupware.org (OGo) and the SOPE application server" -pkgver=4.0.6 +pkgver=5.10.0 pkgrel=1 arch=('x86_64') url="http://www.sogo.nu/" @@ -14,11 +14,18 @@ replaces=('sogo2') install=sogo.install makedepends=('gcc-objc' 'gnustep-make') -depends=("sope>=${pkgver}" +depends=("sope>=${pkgver}" 'gnustep-base' 'libmemcached' 'memcached' - 'libwbxml') + 'libwbxml>=0.11.7-2' + 'mariadb-libs' + 'postgresql-libs' + 'inetutils' + 'libsodium' + 'libytnef' + 'libzip' + 'oath-toolkit') optdepends=('postgresql: run database server for sogo locally' 'mariadb: run database server for sogo locally' 'openldap: run directory server for sogo locally' @@ -31,28 +38,21 @@ optdepends=('postgresql: run database server for sogo locally' backup=('etc/sogo/sogo.conf' 'etc/httpd/conf/extra/SOGo.conf' 'etc/conf.d/sogo') -source=("http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-${pkgver}.tar.gz" +source=("https://packages.sogo.nu/sources/SOGo-${pkgver}.tar.gz" "sogo.service" - "sogo.confd" - "sogo_configure.patch") -sha256sums=('e7e268b3bc5c0215bb7ab8bc859cb905aa6fec0aa6093a42b434c32df232d10c' - '0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c' - '8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7' - 'e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1') - -prepare() { - cd "$srcdir/SOGo-${pkgver}" - patch configure ../sogo_configure.patch -} + "sogo.confd") +sha512sums=('45b1892da41ccd119120da4ee958f6794d5d08677ea9cf20c2bdd3dc85619c338667670953373d85063152e1cd27ff31cf063d7fda9fbbf1995d53038132d07e' + '73de6719ba3c17fb03dba4c7390f1e99ac4adff4c3413b6031ebb807fcef8a3f5eb0b8e3767a9560c2106b2f3470447b52803f5bd2f562b382e99c6382be2879' + '51803a53f5ae32017281e3c891ae21c126a6adc10529669bd659cc4bffaeaae46a59db34c0c97bbc83e9e3be5e619e4ced170e18b31c1267d3c14ce20b54ccf4') build() { - cd "$srcdir/SOGo-${pkgver}" - ./configure --prefix=$(gnustep-config --variable=GNUSTEP_SYSTEM_ROOT) --disable-debug + cd "SOGo-${pkgver}" + ./configure --prefix=$(gnustep-config --variable=GNUSTEP_SYSTEM_ROOT) --disable-debug --enable-mfa make } package() { - cd "${srcdir}/SOGo-${pkgver}" + cd "SOGo-${pkgver}" make install DESTDIR="${pkgdir}" install -D -m 0644 "${srcdir}"/sogo.service \ "${pkgdir}"/usr/lib/systemd/system/sogo.service @@ -63,11 +63,7 @@ package() { 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 -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-update-3.0.0-to-combined{,-mysql}.sh \ - "${pkgdir}"/usr/lib/sogo/scripts/ - install -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-update-3.2.10_to_4.0.0{,-mysql}.sh \ + install -m 0755 "${srcdir}"/SOGo-${pkgver}/Scripts/sql-*.sh \ "${pkgdir}"/usr/lib/sogo/scripts/ install -D -m 0644 "${srcdir}"/sogo.confd \ "${pkgdir}"/etc/conf.d/sogo diff --git a/sogo.install b/sogo.install index 154630ae2a83..00da42e21efb 100644 --- a/sogo.install +++ b/sogo.install @@ -5,8 +5,7 @@ post_install() { /usr/sbin/systemctl daemon-reload echo "NOTE: If migrating from a version of SOGo prior to 2.3.0, you must run the SQL" echo "update script(s) for your SQL server, located in /usr/lib/sogo/scripts." - echo "WARNING: Do not run the 3.0.0-to-combined scripts unless you intend to move" - echo "to the new table format. Please consult the documentation before doing so." + echo "Please consult the documentation before doing so." } @@ -17,8 +16,7 @@ pre_remove() { post_upgrade() { /usr/sbin/systemctl daemon-reload - echo "NOTE: If upgrading from a version of SOGo prior to 2.3.0, you must run the SQL" - echo "update script(s) for your SQL server, located in /usr/lib/sogo/scripts." - echo "WARNING: Do not run the 3.0.0-to-combined script unless you intend to move" - echo "to the new table format. Please consult the documentation before doing so." + echo "NOTE: If upgrading SOGo, you must run the SQL update script(s)" + echo "applicable to your upgrade, located in /usr/lib/sogo/scripts." + echo "Please consult the documentation before doing so." } diff --git a/sogo.service b/sogo.service index e2b79db0f9de..6218736880c0 100644 --- a/sogo.service +++ b/sogo.service @@ -3,6 +3,7 @@ Description=Sogo Daemon After=network.target slapd.service memcached.service postfix.service dovecot.service postgresql.service [Service] +Environment="LD_PRELOAD=/usr/lib/libytnef.so" User=sogo RuntimeDirectory=sogo EnvironmentFile=-/etc/conf.d/sogo diff --git a/sogo_configure.patch b/sogo_configure.patch deleted file mode 100644 index 6bf5414db30d..000000000000 --- a/sogo_configure.patch +++ /dev/null @@ -1,14 +0,0 @@ -251,261c251 -< UNAME=`uname` -< if [ "X${UNAME}" = "XLinux" ];then -< UNAME=`uname -m` -< if [ ${UNAME} = x86_64 -o ${UNAME} = sparc64 -o ${UNAME} = ppc64 ];then -< cfgwrite "CGS_LIBDIR_NAME:=lib64" -< else -< cfgwrite "CGS_LIBDIR_NAME:=lib" -< fi -< else -< cfgwrite "CGS_LIBDIR_NAME:=lib" -< fi ---- -> cfgwrite "CGS_LIBDIR_NAME:=lib" |