From ada1407ac834e561b28431b7adc9ca144cdf3d1f Mon Sep 17 00:00:00 2001 From: Ben Schermel Date: Sun, 31 May 2020 11:50:06 -0400 Subject: [PATCH] enable source build from dh9 where applicable Former-commit-id: 9e8ea41f73674fb836f89e5d53474b271abf10d8 --- pkg/deb/deb-buildsource.sh | 6 +- .../bin/generate-systemd-service-files | 9 ++- pkg/deb/debian_dh9/control | 27 ++++--- pkg/deb/debian_dh9/copyright | 79 +------------------ pkg/deb/debian_dh9/files | 2 +- pkg/deb/debian_dh9/keydb-benchmark.1 | 2 +- pkg/deb/debian_dh9/keydb-pro-sentinel.1 | 23 ++++++ pkg/deb/debian_dh9/keydb-pro-sentinel.install | 2 + .../debian_dh9/keydb-pro-sentinel.logrotate | 7 ++ .../debian_dh9/keydb-pro-sentinel.maintscript | 4 + .../debian_dh9/keydb-pro-sentinel.manpages | 1 + .../debian_dh9/keydb-pro-sentinel.postinst | 26 ++++++ pkg/deb/debian_dh9/keydb-pro-sentinel.postrm | 16 ++++ pkg/deb/debian_dh9/keydb-pro-server.1 | 23 ++++++ pkg/deb/debian_dh9/keydb-pro-server.docs | 1 + pkg/deb/debian_dh9/keydb-pro-server.install | 2 + pkg/deb/debian_dh9/keydb-pro-server.logrotate | 7 ++ .../debian_dh9/keydb-pro-server.maintscript | 4 + pkg/deb/debian_dh9/keydb-pro-server.manpages | 1 + pkg/deb/debian_dh9/keydb-pro-server.postinst | 26 ++++++ pkg/deb/debian_dh9/keydb-pro-server.postrm | 16 ++++ pkg/deb/debian_dh9/keydb-pro-tools.examples | 2 + pkg/deb/debian_dh9/keydb-pro-tools.install | 6 ++ pkg/deb/debian_dh9/keydb-pro-tools.manpages | 4 + pkg/deb/debian_dh9/keydb-pro-tools.postinst | 47 +++++++++++ pkg/deb/debian_dh9/keydb-pro-tools.postrm | 13 +++ pkg/deb/debian_dh9/source/include-binaries | 5 +- pkg/deb/debian_dh9/source/lintian-overrides | 2 +- pkg/deb/debian_dh9/source/options | 1 + pkg/deb/debian_dh9/watch | 4 +- pkg/deb/master_changelog | 13 ++- 31 files changed, 274 insertions(+), 107 deletions(-) create mode 100644 pkg/deb/debian_dh9/keydb-pro-sentinel.1 create mode 100644 pkg/deb/debian_dh9/keydb-pro-sentinel.install create mode 100644 pkg/deb/debian_dh9/keydb-pro-sentinel.logrotate create mode 100644 pkg/deb/debian_dh9/keydb-pro-sentinel.maintscript create mode 100644 pkg/deb/debian_dh9/keydb-pro-sentinel.manpages create mode 100644 pkg/deb/debian_dh9/keydb-pro-sentinel.postinst create mode 100644 pkg/deb/debian_dh9/keydb-pro-sentinel.postrm create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.1 create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.docs create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.install create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.logrotate create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.maintscript create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.manpages create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.postinst create mode 100644 pkg/deb/debian_dh9/keydb-pro-server.postrm create mode 100644 pkg/deb/debian_dh9/keydb-pro-tools.examples create mode 100644 pkg/deb/debian_dh9/keydb-pro-tools.install create mode 100644 pkg/deb/debian_dh9/keydb-pro-tools.manpages create mode 100644 pkg/deb/debian_dh9/keydb-pro-tools.postinst create mode 100644 pkg/deb/debian_dh9/keydb-pro-tools.postrm diff --git a/pkg/deb/deb-buildsource.sh b/pkg/deb/deb-buildsource.sh index 6ac9dccaf..ceba06040 100755 --- a/pkg/deb/deb-buildsource.sh +++ b/pkg/deb/deb-buildsource.sh @@ -26,7 +26,11 @@ cd ../../../ tar -czvf keydb-pro_$version.orig.tar.gz --force-local KeyDB-Pro cd KeyDB-Pro/pkg/deb/ mkdir -p $pkg_name/tmp -cp -r debian $pkg_name/tmp +if [ "$codename" == "xenial" ]; then + cp -r debian_dh9 $pkg_name/tmp/debian +else + cp -r debian $pkg_name/tmp +fi cp master_changelog $pkg_name/tmp/debian/changelog mv ../../../keydb-pro_$version.orig.tar.gz ./$pkg_name cd $pkg_name/tmp diff --git a/pkg/deb/debian_dh9/bin/generate-systemd-service-files b/pkg/deb/debian_dh9/bin/generate-systemd-service-files index 59031d99f..738e2f542 100755 --- a/pkg/deb/debian_dh9/bin/generate-systemd-service-files +++ b/pkg/deb/debian_dh9/bin/generate-systemd-service-files @@ -9,7 +9,6 @@ else SYSTEMD_EXTRA=$(cat < Mon, 09 Oct 2017 22:17:24 +0100 EOF fi @@ -91,7 +92,7 @@ Documentation=https://docs.keydb.dev, man:${BINARY}(1) [Service] Type=forking -ExecStart=/usr/bin/${BINARY} /etc/keydb/${NAMESPACED}.conf +ExecStart=/usr/bin/${BINARY_NAME} /etc/keydb/${NAMESPACED}.conf ExecStop=/bin/kill -s TERM \$MAINPID PIDFile=/var/run/${NAMESPACED}/${BINARY}.pid TimeoutStopSec=0 diff --git a/pkg/deb/debian_dh9/control b/pkg/deb/debian_dh9/control index 077d493bc..b02f1be4e 100644 --- a/pkg/deb/debian_dh9/control +++ b/pkg/deb/debian_dh9/control @@ -1,4 +1,4 @@ -Source: keydb +Source: keydb-pro Section: database Priority: optional Maintainer: Ben Schermel @@ -6,6 +6,11 @@ Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.5), systemd, +# libhiredis-dev (>= 0.14.0), +# libjemalloc-dev [linux-any], +# liblua5.1-dev, +# lua-bitop-dev, +# lua-cjson-dev, procps , build-essential , tcl , @@ -19,14 +24,14 @@ Build-Depends: libssl-dev Standards-Version: 4.2.1 Homepage: https://docs.keydb.dev/ -Vcs-Git: https://github.com/JohnSully/KeyDB.git -Vcs-Browser: https://github.com/JohnSully/KeyDB +Vcs-Git: https://github.com/JohnSully/KeyDB-Pro.git +Vcs-Browser: https://github.com/JohnSully/KeyDB-Pro -Package: keydb +Package: keydb-pro Architecture: all Depends: - keydb-server (<< ${binary:Version}.1~), - keydb-server (>= ${binary:Version}), + keydb-pro-server (<< ${binary:Version}.1~), + keydb-pro-server (>= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface (metapackage) keydb is a key-value database in a similar vein to memcache but the dataset @@ -37,11 +42,11 @@ Description: Persistent key-value database with network interface (metapackage) . This package depends on the keydb-server package. -Package: keydb-sentinel +Package: keydb-pro-sentinel Architecture: any Depends: lsb-base (>= 3.2-14), - keydb-tools (= ${binary:Version}), + keydb-pro-tools (= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface (monitoring) keydb is a key-value database in a similar vein to memcache but the dataset @@ -50,11 +55,11 @@ Description: Persistent key-value database with network interface (monitoring) . This package contains the keydb Sentinel monitoring software. -Package: keydb-server +Package: keydb-pro-server Architecture: any Depends: lsb-base (>= 3.2-14), - keydb-tools (= ${binary:Version}), + keydb-pro-tools (= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface keydb is a key-value database in a similar vein to memcache but the dataset @@ -63,7 +68,7 @@ Description: Persistent key-value database with network interface . The dataset is stored entirely in memory and periodically flushed to disk. -Package: keydb-tools +Package: keydb-pro-tools Architecture: any Depends: adduser, diff --git a/pkg/deb/debian_dh9/copyright b/pkg/deb/debian_dh9/copyright index 59975672f..c7e2428e7 100644 --- a/pkg/deb/debian_dh9/copyright +++ b/pkg/deb/debian_dh9/copyright @@ -1,86 +1,13 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: John Sully -Upstream-Name: keydb -Source: https://github.com/JohnSully/KeyDB +Upstream-Name: keydb-pro +Source: https://github.com/JohnSully/KeyDB-Pro Files: * Copyright: © 2006-2014 Salvatore Sanfilippo Copyright © 2019, John Sully -License: BSD-3-clause +License: Proprietary -Files: - src/rio.* - src/t_zset.c - src/ziplist.h - src/intset.* - src/redis-check-aof.c - deps/hiredis/* - deps/linenoise/* -Copyright: - © 2009-2012 Pieter Noordhuis - © 2009-2012 Salvatore Sanfilippo -License: BSD-3-clause - -Files: - src/lzf.h - src/lzfP.h - src/lzf_d.c - src/lzf_c.c -Copyright: - © 2000-2007 Marc Alexander Lehmann - © 2009-2012 Salvatore Sanfilippo -License: BSD-2-clause - -Files: src/setproctitle.c -Copyright: - © 2010 William Ahern - © 2013 Salvatore Sanfilippo - © 2013 Stam He -License: BSD-3-clause - -Files: src/ae_evport.c -Copyright: © 2012 Joyent, Inc. -License: BSD-3-clause - -Files: src/ae_kqueue.c -Copyright: © 2009 Harish Mallipeddi -License: BSD-3-clause - -Files: utils/install_server.sh -Copyright: © 2011 Dvir Volk -License: BSD-3-clause - -Files: deps/jemalloc/* -Copyright: - © 2002-2012 Jason Evans - © 2007-2012 Mozilla Foundation - © 2009-2012 Facebook, Inc. -License: BSD-3-clause - -Files: src/pqsort.* -Copyright: © 1992-1993 The Regents of the University of California -License: BSD-3-clause - -Files: deps/lua/* -Copyright: © 1994-2012 Lua.org, PUC-Ri -License: MIT - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. Files: debian/* Copyright: © 2009 Chris Lamb diff --git a/pkg/deb/debian_dh9/files b/pkg/deb/debian_dh9/files index 0c2ad5610..4fa490963 100644 --- a/pkg/deb/debian_dh9/files +++ b/pkg/deb/debian_dh9/files @@ -1 +1 @@ -keydb_5.3.3-1~bionic1_source.buildinfo database optional +keydb-pro_5.3.3-1~bionic1_source.buildinfo database optional diff --git a/pkg/deb/debian_dh9/keydb-benchmark.1 b/pkg/deb/debian_dh9/keydb-benchmark.1 index ce9f119b4..07a659177 100644 --- a/pkg/deb/debian_dh9/keydb-benchmark.1 +++ b/pkg/deb/debian_dh9/keydb-benchmark.1 @@ -1,6 +1,6 @@ .TH KEYDB-BENCHMARK 1 "August 17, 2019" .SH NAME -keydb-benchmark \- Benechmark a KeyDB instance +keydb-benchmark \- Benchmark a KeyDB instance .SH SYNOPSIS .B redis-benchmark [\-h ] [\-p ] [\-c ] [\-n [\-k ] diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.1 b/pkg/deb/debian_dh9/keydb-pro-sentinel.1 new file mode 100644 index 000000000..782a40ff4 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-sentinel.1 @@ -0,0 +1,23 @@ +.TH KEYDB-SENTINEL 1 "August 17, 2019" +.SH NAME +keydb-sentinel \- Persistent key-value database (cluster mode) +.SH SYNOPSIS +.B keydb-sentinel +.RI configfile +.SH DESCRIPTION +KeyDB is a key-value database. It is similar to memcached but the dataset is +not volatile and other datatypes (such as lists and sets) are natively +supported. +.PP +.SH OPTIONS +.IP "configfile" +Read options from specified configuration file. +.SH NOTES +On Debian GNU/Linux systems, \fBkeydb-sentinel\fP is typically started via the +\fB/etc/init.d/keydb-sentinel\fP initscript, not manually. This defaults to using +\fB/etc/keydb/sentinel.conf\fP as a configuration file. +.SH AUTHOR +\fBkeydb-sentinel\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo. +.PP +This manual page was written by Chris Lamb for the Debian +project (but may be used by others). Modified by Ben Schermel diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.install b/pkg/deb/debian_dh9/keydb-pro-sentinel.install new file mode 100644 index 000000000..524d7867b --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-sentinel.install @@ -0,0 +1,2 @@ +debian/keydb-sentinel.service /lib/systemd/system/ +pkg/deb/conf/sentinel.conf /etc/keydb diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.logrotate b/pkg/deb/debian_dh9/keydb-pro-sentinel.logrotate new file mode 100644 index 000000000..185010396 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-sentinel.logrotate @@ -0,0 +1,7 @@ +/var/log/keydb/keydb-sentinel*.log { + weekly + missingok + rotate 12 + compress + notifempty +} diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.maintscript b/pkg/deb/debian_dh9/keydb-pro-sentinel.maintscript new file mode 100644 index 000000000..87e4f024c --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-sentinel.maintscript @@ -0,0 +1,4 @@ +rm_conffile /etc/keydb/keydb-sentinel.post-down.d/00_example 4:4.0.2-3~ +rm_conffile /etc/keydb/keydb-sentinel.post-up.d/00_example 4:4.0.2-3~ +rm_conffile /etc/keydb/keydb-sentinel.pre-down.d/00_example 4:4.0.2-3~ +rm_conffile /etc/keydb/keydb-sentinel.pre-up.d/00_example 4:4.0.2-3~ diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.manpages b/pkg/deb/debian_dh9/keydb-pro-sentinel.manpages new file mode 100644 index 000000000..08ce51ff5 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-sentinel.manpages @@ -0,0 +1 @@ +debian/keydb-pro-sentinel.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.postinst b/pkg/deb/debian_dh9/keydb-pro-sentinel.postinst new file mode 100644 index 000000000..f69ed97e1 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-sentinel.postinst @@ -0,0 +1,26 @@ +#!/bin/sh + +set -eu + +USER="keydb" +GROUP="$USER" +CONFFILE="/etc/keydb/sentinel.conf" + +if [ "$1" = "configure" ] +then + if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1 + then + dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE} + fi +fi + +#DEBHELPER# + +if [ "$1" = "configure" ] +then + find /etc/keydb -maxdepth 1 -type d -name 'keydb-sentinel.*.d' -empty -delete +fi + +sytemctl daemon-reload + +exit 0 diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.postrm b/pkg/deb/debian_dh9/keydb-pro-sentinel.postrm new file mode 100644 index 000000000..53397103d --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-sentinel.postrm @@ -0,0 +1,16 @@ +#!/bin/sh + +set -eu + +CONFFILE="/etc/keydb/sentinel.conf" + +if [ "$1" = "purge" ] +then + dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2 +fi + +#DEBHELPER# + +sytemctl daemon-reload + +exit 0 diff --git a/pkg/deb/debian_dh9/keydb-pro-server.1 b/pkg/deb/debian_dh9/keydb-pro-server.1 new file mode 100644 index 000000000..2bac395f8 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.1 @@ -0,0 +1,23 @@ +.TH KEYDB-SERVER 1 "August 17, 2019" +.SH NAME +keydb-server \- Persistent key-value database +.SH SYNOPSIS +.B keydb-server +.RI configfile +.SH DESCRIPTION +KeyDB is a key-value database. It is similar to memcached but the dataset is +not volatile and other datatypes (such as lists and sets) are natively +supported. +.PP +.SH OPTIONS +.IP "configfile" +Read options from specified configuration file. +.SH NOTES +On Debian GNU/Linux systems, \fBkeydb-server\fP is typically started via the +\fB/etc/init.d/keydb-server\fP initscript, not manually. This defaults to using +\fB/etc/keydb/keydb.conf\fP as a configuration file. +.SH AUTHOR +\fBkeydb-server\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo. +.PP +This manual page was written by Chris Lamb for the Debian +project (but may be used by others). Modified by Ben Schermel diff --git a/pkg/deb/debian_dh9/keydb-pro-server.docs b/pkg/deb/debian_dh9/keydb-pro-server.docs new file mode 100644 index 000000000..b43bf86b5 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.docs @@ -0,0 +1 @@ +README.md diff --git a/pkg/deb/debian_dh9/keydb-pro-server.install b/pkg/deb/debian_dh9/keydb-pro-server.install new file mode 100644 index 000000000..8a82461af --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.install @@ -0,0 +1,2 @@ +debian/keydb-server.service /lib/systemd/system/ +pkg/deb/conf/keydb.conf /etc/keydb diff --git a/pkg/deb/debian_dh9/keydb-pro-server.logrotate b/pkg/deb/debian_dh9/keydb-pro-server.logrotate new file mode 100644 index 000000000..78d0a53ea --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.logrotate @@ -0,0 +1,7 @@ +/var/log/keydb/keydb-server*.log { + weekly + missingok + rotate 12 + compress + notifempty +} diff --git a/pkg/deb/debian_dh9/keydb-pro-server.maintscript b/pkg/deb/debian_dh9/keydb-pro-server.maintscript new file mode 100644 index 000000000..d6ccfe60c --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.maintscript @@ -0,0 +1,4 @@ +rm_conffile /etc/keydb/keydb-server.post-down.d/00_example 4:4.0.2-3~ +rm_conffile /etc/keydb/keydb-server.post-up.d/00_example 4:4.0.2-3~ +rm_conffile /etc/keydb/keydb-server.pre-down.d/00_example 4:4.0.2-3~ +rm_conffile /etc/keydb/keydb-server.pre-up.d/00_example 4:4.0.2-3~ diff --git a/pkg/deb/debian_dh9/keydb-pro-server.manpages b/pkg/deb/debian_dh9/keydb-pro-server.manpages new file mode 100644 index 000000000..06ff67ee3 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.manpages @@ -0,0 +1 @@ +debian/keydb-pro-server.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-server.postinst b/pkg/deb/debian_dh9/keydb-pro-server.postinst new file mode 100644 index 000000000..9d48ee638 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.postinst @@ -0,0 +1,26 @@ +#!/bin/sh + +set -eu + +USER="keydb" +GROUP="$USER" +CONFFILE="/etc/keydb/keydb.conf" + +if [ "$1" = "configure" ] +then + if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1 + then + dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE} + fi +fi + +#DEBHELPER# + +if [ "$1" = "configure" ] +then + find /etc/keydb -maxdepth 1 -type d -name 'keydb-server.*.d' -empty -delete +fi + +systemctl daemon-reload + +exit 0 diff --git a/pkg/deb/debian_dh9/keydb-pro-server.postrm b/pkg/deb/debian_dh9/keydb-pro-server.postrm new file mode 100644 index 000000000..448989f66 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-server.postrm @@ -0,0 +1,16 @@ +#!/bin/sh + +set -eu + +CONFFILE="/etc/keydb/keydb.conf" + +if [ "${1}" = "purge" ] +then + dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2 +fi + +#DEBHELPER# + +sytemctl daemon-reload + +exit 0 diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.examples b/pkg/deb/debian_dh9/keydb-pro-tools.examples new file mode 100644 index 000000000..7f796a1b4 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-tools.examples @@ -0,0 +1,2 @@ +src/redis-trib.rb +utils/lru diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.install b/pkg/deb/debian_dh9/keydb-pro-tools.install new file mode 100644 index 000000000..6978cc7cd --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-tools.install @@ -0,0 +1,6 @@ +debian/bash_completion.d/* /usr/share/bash-completion/completions +src/keydb-benchmark /usr/bin +src/keydb-check-aof /usr/bin +src/keydb-check-rdb /usr/bin +src/keydb-cli /usr/bin +src/keydb-pro-server /usr/bin diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.manpages b/pkg/deb/debian_dh9/keydb-pro-tools.manpages new file mode 100644 index 000000000..bfe26d2d6 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-tools.manpages @@ -0,0 +1,4 @@ +debian/keydb-benchmark.1 +debian/keydb-check-aof.1 +debian/keydb-check-rdb.1 +debian/keydb-cli.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.postinst b/pkg/deb/debian_dh9/keydb-pro-tools.postinst new file mode 100644 index 000000000..0007d887f --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-tools.postinst @@ -0,0 +1,47 @@ +#!/bin/sh + +set -eu + +USER="keydb" + +Setup_dir () { + DIR="${1}" + MODE="${2}" + GROUP="${3}" + + mkdir -p ${DIR} + + case "${DIR}" in + /var/log/keydb) + MODE="02750" + GROUP="adm" + ;; + *) + MODE="750" + GROUP="${USER}" + ;; + esac + + if ! dpkg-statoverride --list ${DIR} >/dev/null 2>&1 + then + chown ${USER}:${GROUP} ${DIR} + chmod ${MODE} ${DIR} + fi +} + +if [ "$1" = "configure" ] +then + adduser \ + --system \ + --home /var/lib/keydb \ + --quiet \ + --group \ + ${USER} || true + + Setup_dir /var/log/keydb ${USER}:adm 2750 + Setup_dir /var/lib/keydb ${USER}:${USER} 750 +fi + +#DEBHELPER# + +exit 0 diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.postrm b/pkg/deb/debian_dh9/keydb-pro-tools.postrm new file mode 100644 index 000000000..60c932435 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-pro-tools.postrm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -eu + +if [ "${1}" = "purge" ] +then + userdel keydb || true + rm -rf /var/lib/keydb /var/log/keydb +fi + +#DEBHELPER# + +exit 0 diff --git a/pkg/deb/debian_dh9/source/include-binaries b/pkg/deb/debian_dh9/source/include-binaries index ddd5cd4c9..55422f4bb 100644 --- a/pkg/deb/debian_dh9/source/include-binaries +++ b/pkg/deb/debian_dh9/source/include-binaries @@ -1,2 +1,3 @@ -keydb_5.0.6.orig.tar.gz -keydb_5.0.6-1chl1~bionic1.debian.tar.xz +keydb-pro_5.0.6.orig.tar.gz +keydb-pro_5.0.6-1~bionic1.debian.tar.xz + diff --git a/pkg/deb/debian_dh9/source/lintian-overrides b/pkg/deb/debian_dh9/source/lintian-overrides index ca7456a67..44dec9b63 100644 --- a/pkg/deb/debian_dh9/source/lintian-overrides +++ b/pkg/deb/debian_dh9/source/lintian-overrides @@ -1,2 +1,2 @@ # Upstream do not provide signed tarballs. -keydb source: debian-watch-does-not-check-gpg-signature +keydb-pro source: debian-watch-does-not-check-gpg-signature diff --git a/pkg/deb/debian_dh9/source/options b/pkg/deb/debian_dh9/source/options index aa96de89f..3e1f0633c 100644 --- a/pkg/deb/debian_dh9/source/options +++ b/pkg/deb/debian_dh9/source/options @@ -1 +1,2 @@ extend-diff-ignore = "^\.travis\.yml$" + diff --git a/pkg/deb/debian_dh9/watch b/pkg/deb/debian_dh9/watch index bc7d05321..acca0f199 100644 --- a/pkg/deb/debian_dh9/watch +++ b/pkg/deb/debian_dh9/watch @@ -1,3 +1,3 @@ -version=4 +version=6 opts=uversionmangle=s/-?(alpha|beta|rc)/~$1/ \ - https://github.com/JohnSully/KeyDB/releases .*/archive/(.*).tar.gz + https://github.com/JohnSully/KeyDB-Pro/releases .*/archive/(.*).tar.gz diff --git a/pkg/deb/master_changelog b/pkg/deb/master_changelog index 0df2429cb..a55b7153b 100644 --- a/pkg/deb/master_changelog +++ b/pkg/deb/master_changelog @@ -1,14 +1,11 @@ keydb (6.0.8-1distribution_placeholder) codename_placeholder; urgency=medium - * 6.0.8 Updating builds from deb source package - * Naming conventions are now updated - * Builds now genrated accross different distributions/architectures automatically. - * Same changelog used for all distribitions/architectures and will be updated on each release - * init.d has been phased out and scripts updated to use systemd only - * keydb-pro=server binary is no longer inluded in the open source package - * see github pkg directory for debian code and build scripts used in distributions + * 6.0.8 + * Updating deb package builds to build from source and phasing out init.d. dh_installsystemd from deb helper 11 used where applicable + * Naming conventions are now updated [ keydbpackage_version-build~distribution_architecture] and master changelog included and maintained + * keydb-pro-server binary is no longer inluded in the open source package - -- Ben Schermel Wed, 06 May 2020 8:00:37 +0000 + -- Ben Schermel Sun, 31 May 2020 8:00:37 +0000 keydb (5:5.1.12-1chl1distribution_placeholder) codename_placeholder; urgency=medium