updated to 902

7 files changed, 153 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57874eabade4..428afdb92611 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 # Generated by mksrcinfo v8
-# Fri Mar  4 15:06:28 UTC 2016
+# Sat Aug  6 19:26:39 UTC 2016
 pkgbase = citadel
 	pkgdesc = Citadel/UX is a collaboration suite (messaging and groupware) that is descended from the Citadel family of programs which became popular in the 1980s and 1990s as a bulletin board system platform.
-	pkgver = v9.01.r0.ga845b4f
-	pkgrel = 2
+	pkgver = 902
+	pkgrel = 1
 	url = http://www.citadel.org/
-	install = citadel.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = libcitadel
 	makedepends = libev
 	makedepends = c-ares
 	makedepends = curl
@@ -18,10 +16,27 @@ pkgbase = citadel
 	makedepends = libical
 	makedepends = libsieve
 	makedepends = perl-berkeleydb
+	makedepends = glibc
+	makedepends = zlib
 	makedepends = libtool
 	makedepends = autoconf
 	makedepends = make
 	makedepends = gcc
+	source = citadel::git://git.citadel.org/appl/gitroot/citadel.git#tag=Release_902
+	source = citadel.service
+	source = webcit.service
+	source = webcits.service
+	source = 001-libical2_support_citadel.patch
+	source = 001-libical2_support_webcit.patch
+	md5sums = SKIP
+	md5sums = 1dad4ebec773f08de372d794ed16d214
+	md5sums = 3904b1795a552fd2f2bc8f9741f6dc58
+	md5sums = cae0cfa8f42e1f0e96fbf0e4aff0ba56
+	md5sums = ce32349cd9f646d41bb444c6cb47a033
+	md5sums = 916e66109a16d94a712ab8372ac98719
+
+pkgname = citadel
+	install = citadel.install
 	depends = libcitadel
 	depends = libev
 	depends = c-ares
@@ -32,12 +47,15 @@ pkgbase = citadel
 	depends = perl-berkeleydb
 	optdepends = openssl: SSL support
 	optdepends = shared-mime-info: filetype identification
-	source = citadel::git://git.citadel.org/appl/gitroot/citadel.git#tag=v9.01
-	source = citadel.service
-	source = 001-libical2_support.patch
-	md5sums = SKIP
-	md5sums = 1dad4ebec773f08de372d794ed16d214
-	md5sums = ce32349cd9f646d41bb444c6cb47a033
 
-pkgname = citadel
+pkgname = libcitadel
+	depends = glibc
+	depends = zlib
+	optdepends = 
+
+pkgname = webcit
+	install = webcit.install
+	depends = citadel
+	optdepends = openssl: SSL support
+	optdepends = shared-mime-info: filetype identification
 
diff --git a/001-libical2_support.patch b/001-libical2_support_citadel.patch
index 7e6ce55c93c0..7e6ce55c93c0 100644
--- a/001-libical2_support.patch
+++ b/001-libical2_support_citadel.patch
diff --git a/001-libical2_support_webcit.patch b/001-libical2_support_webcit.patch
new file mode 100644
index 000000000000..36f4407b49df
--- /dev/null
+++ b/001-libical2_support_webcit.patch
@@ -0,0 +1,13 @@
+diff --git a/webcit/webserver.c b/webcit/webserver.c
+index 116c647..ba7e341 100644
+--- a/webcit/webserver.c
++++ b/webcit/webserver.c
+@@ -274,7 +274,7 @@ int main(int argc, char **argv)
+ 	}
+ 
+ 	/* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
+-	icalerror_errors_are_fatal = 0;
++	icalerror_set_errors_are_fatal(0);
+ 
+ 	/* Use our own prefix on tzid's generated from system tzdata */
+ 	icaltimezone_set_tzid_prefix("/citadel.org/");
diff --git a/PKGBUILD b/PKGBUILD
index 7fa0f8befe96..bdde755f326a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,88 @@
 # Maintainer: nnnn20430 <nnnn20430@mindcraft.si.eu.org>
 # Contributor: Jason PLum <jplum@archlinuxarm.org>
 
-pkgname=citadel
+pkgbase=citadel
+pkgname=('citadel' 'libcitadel' 'webcit')
 _gitname=citadel
-pkgver=v9.01.r0.ga845b4f
-_gittag=v9.01
-pkgrel=2
+pkgver=902
+_gittag=Release_902
+pkgrel=1
 pkgdesc="Citadel/UX is a collaboration suite (messaging and groupware) that is descended from the Citadel family of programs which became popular in the 1980s and 1990s as a bulletin board system platform."
 arch=('i686' 'x86_64')
 url="http://www.citadel.org/"
+makedepends=('git' 'libev' 'c-ares' 'curl' 'expat' 'libical' 'libsieve' 'perl-berkeleydb' 'glibc' 'zlib' 'libtool' 'autoconf' 'make' 'gcc')
 license=('GPL')
-depends=('libcitadel' 'libev' 'c-ares' 'curl' 'expat' 'libical' 'libsieve' 'perl-berkeleydb')
-makedepends=('git' 'libcitadel' 'libev' 'c-ares' 'curl' 'expat' 'libical' 'libsieve' 'perl-berkeleydb' 'libtool' 'autoconf' 'make' 'gcc')
-optdepends=('openssl: SSL support' 'shared-mime-info: filetype identification')
 conflicts=()
 changelog=""
 source=("$_gitname::git://git.citadel.org/appl/gitroot/citadel.git#tag=$_gittag"
         'citadel.service'
-        '001-libical2_support.patch')
-install="$pkgname.install"
+        'webcit.service'
+        'webcits.service'
+        '001-libical2_support_citadel.patch'
+        '001-libical2_support_webcit.patch')
 md5sums=('SKIP'
          '1dad4ebec773f08de372d794ed16d214'
-         'ce32349cd9f646d41bb444c6cb47a033')
-
-pkgver() {
-  cd "$srcdir/$_gitname"
-  git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
-}
+         '3904b1795a552fd2f2bc8f9741f6dc58'
+         'cae0cfa8f42e1f0e96fbf0e4aff0ba56'
+         'ce32349cd9f646d41bb444c6cb47a033'
+         '916e66109a16d94a712ab8372ac98719')
 
 prepare() {
   cd "$srcdir/$_gitname"
-  git apply "$srcdir/001-libical2_support.patch"
+  git apply "$srcdir/001-libical2_support_citadel.patch"
+  git apply "$srcdir/001-libical2_support_webcit.patch"
 }
 
 build() {
-  cd "$srcdir/$_gitname/citadel"
+  cd "$srcdir/$_gitname/libcitadel"
   ./bootstrap
-  ./configure --prefix=/usr/citadel
+  ./configure --prefix=/usr
   make
+  
+  (
+    cd "$srcdir/$_gitname/citadel"
+    export CFLAGS="${CFLAGS} -I ../libcitadel/lib"
+    export LDFLAGS="${LDFLAGS} -L../libcitadel/.libs"
+    ./bootstrap
+    ./configure --prefix=/usr/citadel
+    make
+  )
+  
+  (
+    cd "$srcdir/$_gitname/webcit"
+    export CFLAGS="${CFLAGS} -I ../libcitadel/lib"
+    export LDFLAGS="${LDFLAGS} -L../libcitadel/.libs"
+    ./bootstrap
+    ./configure --prefix=/usr/citadel/webcit
+    make
+  )
 }
 
-package() {
+package_citadel() {
+  depends=('libcitadel' 'libev' 'c-ares' 'curl' 'expat' 'libical' 'libsieve' 'perl-berkeleydb')
+  optdepends=('openssl: SSL support' 'shared-mime-info: filetype identification')
+  install="citadel.install"
+
   cd "$srcdir/$_gitname/citadel"
   make DESTDIR="$pkgdir" install
   install -Dm644 "$srcdir/citadel.service" "$pkgdir/usr/lib/systemd/system/citadel.service"	
 }
+
+package_libcitadel() {
+  depends=('glibc' 'zlib')
+  optdepends=()
+
+  cd "$srcdir/$_gitname/libcitadel"
+  make DESTDIR="$pkgdir" install
+}
+
+package_webcit() {
+  depends=('citadel')
+  optdepends=('openssl: SSL support' 'shared-mime-info: filetype identification')
+  install="webcit.install"
+
+  cd "$srcdir/$_gitname/webcit"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir/webcit.service" "$pkgdir/usr/lib/systemd/system/webcit.service"
+  install -Dm644 "$srcdir/webcits.service" "$pkgdir/usr/lib/systemd/system/webcits.service"
+}
diff --git a/webcit.install b/webcit.install
new file mode 100644
index 000000000000..870e8e367689
--- /dev/null
+++ b/webcit.install
@@ -0,0 +1,32 @@
+## arg 1:  the new package version
+pre_install() {
+	:;
+}
+
+## arg 1:  the new package version
+post_install() {
+	echo "run 'systemctl start webcit' and connect to webcit using port 2000 (http://127.0.0.1:2000)"
+	echo "or for ssl run 'systemctl start webcits' and connect to webcit using port 2443 (https://127.0.0.1:2443)"
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+pre_upgrade() {
+	:;
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+	:;
+}
+
+## arg 1:  the old package version
+pre_remove() {
+	:;
+}
+
+## arg 1:  the old package version
+post_remove() {
+	:;
+}
diff --git a/webcit.service b/webcit.service
new file mode 100644
index 000000000000..73f62c14078f
--- /dev/null
+++ b/webcit.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Citadel/UX Groupware web interface
+
+[Service]
+ExecStart=/usr/citadel/webcit/webcit -d -p2000
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/webcits.service b/webcits.service
new file mode 100644
index 000000000000..8c3462d96368
--- /dev/null
+++ b/webcits.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Citadel/UX Groupware web interface over ssl
+
+[Service]
+ExecStart=/usr/citadel/webcit/webcit -d -s -p2443
+Type=forking
+
+[Install]
+WantedBy=multi-user.target