From ca511e55e22bd3096a6b8031bd614f7305bf815b Mon Sep 17 00:00:00 2001 From: Marcel Waldvogel Date: Mon, 20 Aug 2018 16:35:46 +0200 Subject: [PATCH] First stable release 2.0.0 (+deb) --- CHANGELOG.md | 4 ++-- Makefile | 4 ++++ README.md | 2 +- debian/changelog | 2 +- doc/Installation.md | 2 +- doc/QuickInstallEjabberd.md | 2 +- doc/QuickInstallProsody.md | 2 +- xclib/version.py | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8d4294..3336e7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## 1.2.0- - [Unreleased] +## 2.0.0 - 2018-08-20 ### Added - Added `Makefile`, especially the `make install` target - Added support for `deb` packaging (now the recommended installation type) -- Added support for *inetd*-style servers (acceptor socket as fd 0) +- Added support for *inetd*-style servers (acceptor(!) socket as fd 0) - Added `tools/xcauth.logrotate` (see [tools/README.md](./tools/README.md) - Added quick setup instructions for existing *Prosody* or *ejabberd* setups - Added support for fewer bcrypt() rounds for in-memory databases diff --git a/Makefile b/Makefile index 31afb13..f2c215e 100644 --- a/Makefile +++ b/Makefile @@ -136,6 +136,10 @@ nightly:deb reprepro -b ../dl.jsxc.org includedeb nightly ../xcauth_${VERSION}-0~18.040_all.deb nightly-push: nightly (cd ../dl.jsxc.org && git add pool/*/*/*/* && git commit -a -m "Nightly" && git push) +stable:deb + reprepro -b ../dl.jsxc.org includedeb stable ../xcauth_${VERSION}-0~18.040_all.deb +stable-push: stable + (cd ../dl.jsxc.org && git add pool/*/*/*/* && git commit -a -m "Stable" && git push) tar: tar cfa ../xcauth_${VERSION}.orig.tar.gz \ diff --git a/README.md b/README.md index c503dbd..5cb7d6e 100644 --- a/README.md +++ b/README.md @@ -19,5 +19,5 @@ For installation and configuration instructions, see [doc/Installation.md](doc/I To use our binary `deb` repository, create `/etc/apt/sources.list.d/jsxc.list` with the following contents: ```deb -deb https://dl.jsxc.org nightly main +deb https://dl.jsxc.org stable main ``` diff --git a/debian/changelog b/debian/changelog index 94de4d4..e551450 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xcauth (1.0.0-195-g6dfe722-1) nightly; urgency=medium +xcauth (2.0.0-1) nightly; urgency=medium * Direct packaging diff --git a/doc/Installation.md b/doc/Installation.md index 6e7c5f2..c7844bf 100644 --- a/doc/Installation.md +++ b/doc/Installation.md @@ -10,7 +10,7 @@ Alternative installation instructions: Currently, only nightlies are supported, which you get by ``` sudo -s -echo deb https://dl.jsxc.org nightly main > /etc/apt/sources.list.d/jsxc.list +echo deb https://dl.jsxc.org stable main > /etc/apt/sources.list.d/jsxc.list wget -qO - https://dl.jsxc.org/archive.key | apt-key add - apt update apt install xcauth diff --git a/doc/QuickInstallEjabberd.md b/doc/QuickInstallEjabberd.md index 7508920..4d3c2b0 100644 --- a/doc/QuickInstallEjabberd.md +++ b/doc/QuickInstallEjabberd.md @@ -16,7 +16,7 @@ or run into trouble with this setup, read the Currently, only nightlies are supported, which you get by ``` sudo -s -echo deb https://dl.jsxc.org nightly main > /etc/apt/sources.list.d/jsxc.list +echo deb https://dl.jsxc.org stable main > /etc/apt/sources.list.d/jsxc.list wget -qO - https://dl.jsxc.org/archive.key | apt-key add - apt update apt install xcauth diff --git a/doc/QuickInstallProsody.md b/doc/QuickInstallProsody.md index 4dc61f3..d984242 100644 --- a/doc/QuickInstallProsody.md +++ b/doc/QuickInstallProsody.md @@ -16,7 +16,7 @@ or run into trouble with this setup, read the Currently, only nightlies are supported, which you get by ``` sudo -s -echo deb https://dl.jsxc.org nightly main > /etc/apt/sources.list.d/jsxc.list +echo deb https://dl.jsxc.org stable main > /etc/apt/sources.list.d/jsxc.list wget -qO - https://dl.jsxc.org/archive.key | apt-key add - apt update apt install xcauth diff --git a/xclib/version.py b/xclib/version.py index e73428b..204a96f 100644 --- a/xclib/version.py +++ b/xclib/version.py @@ -1 +1 @@ -VERSION = '1.2.0-' +VERSION = '2.0.0'