[Pkg-xmpp-commits] [jabberd2] 01/02: Merge tag 'debian/2.4.0-1' into jessie-backports
Simon Josefsson
jas at moszumanska.debian.org
Mon Jul 18 13:10:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
jas pushed a commit to branch jessie-backports
in repository jabberd2.
commit 59714a0ec740bbaea4057a62c7f2790b56f07237
Merge: f9e839d ced871e
Author: Simon Josefsson <simon at josefsson.org>
Date: Mon Jul 18 14:41:25 2016 +0200
Merge tag 'debian/2.4.0-1' into jessie-backports
jabberd2 Debian release 2.4.0-1
Conflicts:
debian/changelog
.gitignore | 2 +
.travis.yml | 24 ++
Makefile.am | 7 +-
NEWS | 75 ++++
README | 213 +---------
README.md | 167 +++++++-
c2s/Makefile.am | 3 +
c2s/authreg.c | 68 +--
c2s/c2s.c | 73 +---
c2s/c2s.h | 26 +-
c2s/main.c | 123 ++++--
configure.ac | 48 ++-
debian/changelog | 31 ++
debian/control | 10 +-
debian/patches/etc_dbpath.diff | 16 +-
debian/patches/m4-ax_check_compile_flag.diff | 103 +++++
debian/patches/pkgname.diff | 4 +-
debian/patches/series | 1 +
debian/patches/usr_etc.diff | 11 +-
debian/rules | 1 +
etc/c2s.xml.dist.in | 37 +-
etc/router-filter.xml.dist.in | 6 +
etc/s2s.xml.dist.in | 5 +
etc/sm.xml.dist.in | 32 +-
jabberd2.pro | 41 ++
mio/mio_impl.h | 49 ++-
router/filter.c | 43 +-
router/main.c | 4 +-
router/router.c | 42 +-
router/router.h | 2 +
router/user.c | 18 +-
s2s/in.c | 20 +-
s2s/main.c | 79 ++--
s2s/out.c | 38 +-
s2s/s2s.h | 7 +
sm/Makefile.am | 10 +-
sm/dispatch.c | 24 +-
sm/main.c | 3 +-
sm/mm.c | 5 +-
sm/mod_announce.c | 105 ++---
sm/mod_deliver.c | 6 +-
sm/mod_disco.c | 88 ++--
sm/mod_iq_version.c | 38 +-
sm/mod_privacy.c | 29 +-
sm/mod_roster_publish.c | 7 +-
sm/mod_status.c | 26 +-
sm/mod_template_roster.c | 16 +-
sm/mod_verify.c | 291 +++++++++++++
sm/pres.c | 21 +-
sm/sm.h | 1 +
storage/Makefile.am | 2 +-
storage/authreg_anon.c | 7 -
storage/authreg_db.c | 15 +-
storage/authreg_ldap.c | 13 +-
storage/authreg_ldapfull.c | 9 +-
storage/authreg_mysql.c | 49 ++-
storage/authreg_pgsql.c | 244 +++++++----
storage/authreg_sqlite.c | 146 +++----
storage/storage.c | 1 +
storage/storage.h | 7 +-
storage/storage_db.c | 39 +-
storage/storage_mysql.c | 43 +-
storage/storage_pgsql.c | 15 +-
storage/storage_sqlite.c | 84 +---
sx/Makefile.am | 4 +
sx/ack.c | 12 +-
sx/callback.c | 3 +-
sx/client.c | 6 +-
sx/compress.c | 21 +-
sx/error.c | 36 +-
sx/io.c | 54 ++-
sx/plugins.h | 34 +-
sx/sasl.c | 49 ++-
sx/server.c | 36 +-
sx/ssl.c | 441 ++++++++++----------
sx/sx.c | 14 +-
sx/sx.h | 21 +-
sx/websocket.c | 602 +++++++++++++++++++++++++++
tests/Makefile.am | 2 +-
tests/check_config.c | 25 +-
tools/db-setup.sqlite | 19 +
tools/git | 13 +-
util/access.c | 7 +-
util/base64.c | 101 ++++-
util/config.c | 19 +-
util/crypt_blowfish.c | 18 +-
util/jid.c | 13 +-
util/nad.c | 110 +++--
util/nad.h | 24 +-
util/sha1.c | 20 +-
util/uri.h | 1 +
util/xdata.c | 3 +-
92 files changed, 3116 insertions(+), 1365 deletions(-)
diff --cc debian/changelog
index e2bc29e,bbd58a3..308eec0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,40 @@@
++jabberd2 (2.4.0-1~bpo8+1) jessie-backports; urgency=medium
++
++ * Rebuild for jessie-backports.
++
++ -- Simon Josefsson <simon at josefsson.org> Mon, 18 Jul 2016 14:40:38 +0200
++
+ jabberd2 (2.4.0-1) unstable; urgency=low
+
+ * New upstream version.
+ - Adapt etc_dbpath.diff and pkgname.diff.
+ - Add m4-ax_check_compile_flag.diff.
+ * Use https URLs in Vcs-Browser and Vcs-Git.
+ * Update Standards-Version from 3.9.6 to 3.9.8.
+
+ -- Simon Josefsson <simon at josefsson.org> Mon, 18 Jul 2016 12:39:08 +0200
+
+ jabberd2 (2.3.4-1) unstable; urgency=low
+
+ * New upstream version.
+ * Depend on libhttp-parser-dev to enable new websocket support.
+
+ -- Simon Josefsson <simon at josefsson.org> Sun, 01 Nov 2015 00:38:57 +0100
+
+ jabberd2 (2.3.3-3) unstable; urgency=low
+
+ * Replace libmysqlclient15-dev with libmysqlclient-dev. Closes: #790452.
+ * Put systemd service files in /lib/systemd/system (lintian
+ systemd-service-file-outside-lib).
+
+ -- Simon Josefsson <simon at josefsson.org> Fri, 31 Jul 2015 17:45:16 +0200
+
+jabberd2 (2.3.3-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Simon Josefsson <simon at josefsson.org> Mon, 11 May 2015 12:23:46 +0200
+
jabberd2 (2.3.3-2) unstable; urgency=low
[ Simon Josefsson ]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabberd2.git
More information about the Pkg-xmpp-commits
mailing list