summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--config.patch39
-rw-r--r--jackal.install1
4 files changed, 41 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 238ec19ac9b..107675375cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = jackal
pkgdesc = An XMPP/Jabber server
- pkgver = 0.8.2
+ pkgver = 0.10.1
pkgrel = 1
url = https://github.com/ortuman/jackal
install = jackal.install
@@ -13,16 +13,16 @@ pkgbase = jackal
optdepends = mariadb: MariaDB support
conflicts = jackal-git
backup = etc/jackal/jackal.yml
- source = jackal-0.8.2.tar.gz::https://github.com/ortuman/jackal/archive/v0.8.2.tar.gz
+ source = jackal-0.10.1.tar.gz::https://github.com/ortuman/jackal/archive/v0.10.1.tar.gz
source = jackal.service
source = jackal.sysusers
source = jackal.tmpfiles
source = config.patch
- sha256sums = 52b5c72d633909e25ab11d3ca5f82d414b5627d7226cb7ec50cdab08b6847bb7
+ sha256sums = 0de245fadcbff0e1848d9abe58e5c693154b6df98745c3b0ae0287292bfd237d
sha256sums = 0a9a9065957e5b0576e5443b29bf0cae81281194664376569a91c51f85e7d7ff
sha256sums = 5fec4f4053ac15cd597bb32ba03c35d85f52438204fd801edf333403ec2c4bf3
sha256sums = 20b7e5a5fee727e72fdbac54182b594a838340c0625036ca9d117e2a9d710045
- sha256sums = b89cf730cf119e6800aa4b9dac3b7ad1f0b901829f035933d5ea998c561b55f4
+ sha256sums = ee1ee8fbe9f410f24e09404f491886adbc1c5553ead9ddd7fe61b725ee83a7d2
pkgname = jackal
diff --git a/PKGBUILD b/PKGBUILD
index 79598087e97..53c167b83e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Sam Whited <sam@samwhited.com>
pkgname=jackal
-pkgver=0.8.2
+pkgver=0.10.1
pkgrel=1
pkgdesc='An XMPP/Jabber server'
arch=('x86_64' 'i686')
@@ -18,11 +18,11 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ortuman/jackal/archive/
jackal.sysusers
jackal.tmpfiles
config.patch)
-sha256sums=('52b5c72d633909e25ab11d3ca5f82d414b5627d7226cb7ec50cdab08b6847bb7'
+sha256sums=('0de245fadcbff0e1848d9abe58e5c693154b6df98745c3b0ae0287292bfd237d'
'0a9a9065957e5b0576e5443b29bf0cae81281194664376569a91c51f85e7d7ff'
'5fec4f4053ac15cd597bb32ba03c35d85f52438204fd801edf333403ec2c4bf3'
'20b7e5a5fee727e72fdbac54182b594a838340c0625036ca9d117e2a9d710045'
- 'b89cf730cf119e6800aa4b9dac3b7ad1f0b901829f035933d5ea998c561b55f4')
+ 'ee1ee8fbe9f410f24e09404f491886adbc1c5553ead9ddd7fe61b725ee83a7d2')
install=jackal.install
prepare() {
diff --git a/config.patch b/config.patch
index 6ec23e16a72..a3167008b59 100644
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
---- a/example.jackal.yml
-+++ b/example.jackal.yml
-@@ -1,18 +1,18 @@
+--- a/example.jackal.yml 2020-03-23 13:24:49.000000000 -0400
++++ b/example.jackal.yml 2020-03-24 11:13:12.283234139 -0400
+@@ -1,32 +1,23 @@
# jackal default configuration file
-pid_path: jackal.pid
@@ -25,7 +25,36 @@
user: jackal
password: password
database: jackal
-@@ -67,19 +67,18 @@
+ pool_size: 16
+
+-#storage:
+-# type: pgsql
+-# pgsql:
+-# host: 127.0.0.1:5432
+-# user: jackal
+-# password: password
+-# database: jackal
+-# pool_size: 16
+-
+ hosts:
+ - name: localhost
+ tls:
+@@ -55,10 +46,10 @@
+ # type: http
+ # pass: http://127.0.0.1:6666
+
+- mod_registration:
+- allow_registration: yes
+- allow_change: yes
+- allow_cancel: yes
++ # mod_registration:
++ # allow_registration: yes
++ # allow_change: yes
++ # allow_cancel: yes
+
+ mod_version:
+ show_os: true
+@@ -76,18 +67,17 @@
max_stanza_size: 65536
resource_conflict: replace # [override, replace, reject]
@@ -33,13 +62,11 @@
- type: socket # websocket
- bind_addr: 0.0.0.0
- port: 5222
-- keep_alive: 120
- # url_path: /xmpp/ws
+ # transport:
+ # type: socket # websocket
+ # bind_addr: 0.0.0.0
+ # port: 5222
-+ # keep_alive: 120
+ # # url_path: /xmpp/ws
- compression:
diff --git a/jackal.install b/jackal.install
index 2c96c7a4cd8..51982cdd101 100644
--- a/jackal.install
+++ b/jackal.install
@@ -11,4 +11,5 @@ EOF
post_install() {
install -dm 750 /var/lib/jackal/
+ sed -i "s/dialback_secret: .*/dialback_secret: $(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c64)/g" /etc/jackal/jackal.yml
}