bump version to 5.10.0

6 files changed, 23 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 299f70c9786a..f884b41e57eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openacs
 	pkgdesc = a toolkit for building scalable, community-oriented web applications.
-	pkgver = 5.9.1
+	pkgver = 5.10.0
 	pkgrel = 1
 	url = http://www.openacs.org
 	arch = x86_64
@@ -10,19 +10,16 @@ pkgbase = openacs
 	depends = postgresql>=9.4
 	depends = tdom>=0.8.3
 	depends = nsf>=2.0.0-1
-	depends = naviserver>=4.99.8
-	depends = naviserver-postgres-connector>=4.99.8
+	depends = naviserver>=4.99.22
+	depends = naviserver-postgres-connector>=4.99.22
 	depends = naviserver-tclthread>=2.7.2
 	depends = systemd
-	source = http://openacs.org/projects/openacs/download/download/openacs-5.9.1.tar.gz?revision_id=5373772
+	source = https://openacs.org/projects/openacs/download/download/openacs-full-5.10.0.tar.gz?revision_id=5537440
 	source = openacs.service
-	source = config-oacs-5.9.1.tcl
-	source = postgresql.patch
-	md5sums = bfbb9928c3bbcd0ac44e33faf4521942
-	md5sums = 9b5c6c84b19a4b1cc0ef39e86a6df2e9
+	source = config-oacs-5.10.0.tcl
+	md5sums = 9f87a173ee633ece699fe45bfa9ad457
+	md5sums = 3aed4279d9ed730c8c591f00a6dbca45
 	md5sums = b7d70f60b1b92b5d6714d4d8ccb39e3d
-	md5sums = 178e32238a3511c6efe60dbc59a42581
 
 pkgname = openacs
 	install = openacs.install
-
diff --git a/PKGBUILD b/PKGBUILD
index 30d08d67e431..863de7f63cf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,26 @@
 # Maintainer: Markus Moser<marmoser@wu.ac.at>
 pkgname=openacs
-pkgver=5.9.1
+pkgver=5.10.0
 pkgrel=1
 pkgdesc="a toolkit for building scalable, community-oriented web applications."
 arch=('x86_64')
 url="http://www.openacs.org"
 license=('GPL')
-depends=('tcllib>=1.17' 'tcl>=8.5.18' 'postgresql>=9.4' 'tdom>=0.8.3' 'nsf>=2.0.0-1' 'naviserver>=4.99.8' 'naviserver-postgres-connector>=4.99.8' 'naviserver-tclthread>=2.7.2' 'systemd')
-source=("http://openacs.org/projects/openacs/download/download/${pkgname}-${pkgver}.tar.gz?revision_id=5373772"
+depends=('tcllib>=1.17' 'tcl>=8.5.18' 'postgresql>=9.4' 'tdom>=0.8.3' 'nsf>=2.0.0-1' 'naviserver>=4.99.22' 'naviserver-postgres-connector>=4.99.22' 'naviserver-tclthread>=2.7.2' 'systemd')
+source=("https://openacs.org/projects/openacs/download/download/${pkgname}-full-${pkgver}.tar.gz?revision_id=5537440"
 "openacs.service"
 "config-oacs-${pkgver}.tcl"
-"postgresql.patch" )
-md5sums=("bfbb9928c3bbcd0ac44e33faf4521942"
-"9b5c6c84b19a4b1cc0ef39e86a6df2e9"
+)
+md5sums=("9f87a173ee633ece699fe45bfa9ad457"
+"3aed4279d9ed730c8c591f00a6dbca45"
 "b7d70f60b1b92b5d6714d4d8ccb39e3d"
-"178e32238a3511c6efe60dbc59a42581"
 )
-
-prepare() {
-  cd "${srcdir}/openacs-${pkgver}/packages/acs-kernel/sql/postgresql"
-  patch postgresql.sql --input=${srcdir}/postgresql.patch
-}
   
 package() {
     install="${pkgname}.install"
     #copy the content first
     mkdir -p ${pkgdir}/usr/lib/${pkgname}
-    cp -dr "${srcdir}/${pkgname}-${pkgver}/." "${pkgdir}/usr/lib/${pkgname}/"
+    cp -dr "${srcdir}/${pkgname}-full-${pkgver}/." "${pkgdir}/usr/lib/${pkgname}/"
     #systemd service
     install -m 644 -D "${srcdir}/openacs.service" "${pkgdir}/usr/lib/systemd/system/openacs.service"
     #prepare config file
diff --git a/config-oacs-5.9.1.tcl b/config-oacs-5.10.0.tcl
index 0891feabb4f7..0891feabb4f7 100644
--- a/config-oacs-5.9.1.tcl
+++ b/config-oacs-5.10.0.tcl
diff --git a/openacs.install b/openacs.install
index d3be809c84c5..cd6b63f5d3b9 100644
--- a/openacs.install
+++ b/openacs.install
@@ -1,7 +1,7 @@
 post_install() {
-    oacs_service=oacs-5-9
+    oacs_service=oacs-5-10
     oacs_dir=/usr/lib/openacs
-    db_name=${oacs_service}
+    db_name=oacs-5-9
     ns_install_dir=/usr/lib/naviserver
     #if postgres is not running, start it
     if pgrep "postgres" > /dev/null 
@@ -29,22 +29,22 @@ post_install() {
     chown -R ${oacs_user}:${oacs_group} ${oacs_dir} &> /dev/null
 
     #setup database (we create a user and a db)
-    /usr/bin/createuser -U postgres -a -d ${oacs_user}
-    /usr/bin/createdb -U postgres -E UNICODE ${db_name}
-    /usr/bin/psql -U postgres -d ${db_name} -tAc "create extension hstore"
+    /usr/bin/createuser -U postgres -d ${oacs_user}
+    /usr/bin/createdb -U ${oacs_user} -E UNICODE ${db_name}
+    /usr/bin/psql -U ${oacs_user} -d ${db_name} -tAc "create extension hstore"
 
 echo "
 Congratulations, you have installed OpenACS with NaviServer on your machine.
 You might start the server manually with
 
-    sudo /usr/bin/nsd -t /etc/naviserver/config-oacs-5.9.1.tcl -u ${oacs_user} -g ${oacs_group}"
+    sudo /usr/bin/nsd -t /etc/naviserver/config-oacs-5.10.0.tcl -u ${oacs_user} -g ${oacs_group}"
 
 echo "
 To use OpenACS, point your browser to http://localhost:8000/
-The configuration file is /etc/naviserver/config-oacs-5.9.1.tcl
+The configuration file is /etc/naviserver/config-oacs-5.10.0.tcl
 and might be tailored to your needs. The access.log and error.log of
 this instance are in ${oacs_dir}/log
 
 "
 
-}
\ No newline at end of file
+}
diff --git a/openacs.service b/openacs.service
index 5483518f5a60..4236f6dafec4 100644
--- a/openacs.service
+++ b/openacs.service
@@ -10,7 +10,7 @@ Environment="LANG=en_US.UTF-8"
 ExecStartPre=/bin/rm -f /usr/lib/openacs/log/nsd.pid
 
 # standard startup (non-privileged port, like 8000)
-ExecStart=/usr/bin/nsd -u nsadmin -g nsadmin -t /etc/naviserver/config-oacs-5.9.1.tcl
+ExecStart=/usr/bin/nsd -u nsadmin -g nsadmin -t /etc/naviserver/config-oacs-5.10.0.tcl
 
 Restart=on-abnormal
 KillMode=process
diff --git a/postgresql.patch b/postgresql.patch
deleted file mode 100644
index b660efc2821f..000000000000
--- a/postgresql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql.sql	2020-02-04 19:37:31.648130957 +0100
-+++ postgresql.sql	2020-01-23 11:02:49.180571251 +0100
-@@ -918,7 +918,7 @@
-  return description;
- 
- END;
--$$ LANGUAGE plpgsql with (iscachable);
-+$$ LANGUAGE plpgsql IMMUTABLE;
- 
- 
- -- added