From 81d925775816a68a5f52cb2d667ab62759ccb2a4 Mon Sep 17 00:00:00 2001 From: benschermel Date: Sat, 13 Nov 2021 17:50:42 +0000 Subject: [PATCH] update release packaging Former-commit-id: 639179471ec155ce3ec4443095c44b66cfe66cfe --- pkg/deb/debian/control | 1 + pkg/deb/debian/copyright | 92 +++++++++++++++++++++++++++++++++--- pkg/deb/debian/rules | 1 + pkg/deb/debian_dh9/control | 1 + pkg/deb/debian_dh9/copyright | 17 ++++--- pkg/deb/debian_dh9/rules | 1 + 6 files changed, 100 insertions(+), 13 deletions(-) diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control index 077d493bc..f1946d3d0 100644 --- a/pkg/deb/debian/control +++ b/pkg/deb/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.5), systemd, + libsystemd-dev , procps , build-essential , tcl , diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright index c7e2428e7..3fa28347c 100644 --- a/pkg/deb/debian/copyright +++ b/pkg/deb/debian/copyright @@ -1,16 +1,94 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: John Sully -Upstream-Name: keydb-pro -Source: https://github.com/JohnSully/KeyDB-Pro +Upstream-Name: KeyDB +Source: https://github.com/EQ-Alpha/KeyDB Files: * -Copyright: © 2006-2014 Salvatore Sanfilippo -Copyright © 2019, John Sully -License: Proprietary +Copyright: + © 2006-2014 Salvatore Sanfilippo + © 2019-2021 John Sully + © 2019-2021 EQ Alpha Technology Ltd. +License: BSD-3-clause -Files: debian/* -Copyright: © 2009 Chris Lamb +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: pkg/deb/debian/* +Copyright: + © 2009 Chris Lamb + © 2020-2021 EQ Alpha Technology Ltd. License: BSD-3-clause License: BSD-2-clause diff --git a/pkg/deb/debian/rules b/pkg/deb/debian/rules index a039b220f..957e05f9a 100755 --- a/pkg/deb/debian/rules +++ b/pkg/deb/debian/rules @@ -3,6 +3,7 @@ include /usr/share/dpkg/buildflags.mk export BUILD_TLS=yes +export USE_SYSTEMD=yes export CFLAGS CPPFLAGS LDFLAGS export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -ldl -latomic $(LUA_LDFLAGS) diff --git a/pkg/deb/debian_dh9/control b/pkg/deb/debian_dh9/control index 077d493bc..f1946d3d0 100644 --- a/pkg/deb/debian_dh9/control +++ b/pkg/deb/debian_dh9/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.5), systemd, + libsystemd-dev , procps , build-essential , tcl , diff --git a/pkg/deb/debian_dh9/copyright b/pkg/deb/debian_dh9/copyright index 59975672f..24000363f 100644 --- a/pkg/deb/debian_dh9/copyright +++ b/pkg/deb/debian_dh9/copyright @@ -1,11 +1,14 @@ 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 +Source: https://github.com/EQ-Alpha/KeyDB Files: * -Copyright: © 2006-2014 Salvatore Sanfilippo -Copyright © 2019, John Sully +Copyright: + © 2006-2014 Salvatore Sanfilippo + © 2019-2021 John Sully + © 2019-2021 EQ Alpha Technology Ltd. + License: BSD-3-clause Files: @@ -82,8 +85,10 @@ License: MIT OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: debian/* -Copyright: © 2009 Chris Lamb +Files: pkg/deb/debian_dh9/* +Copyright: + © 2009 Chris Lamb + © 2020-2021 EQ Alpha Technology Ltd. License: BSD-3-clause License: BSD-2-clause diff --git a/pkg/deb/debian_dh9/rules b/pkg/deb/debian_dh9/rules index 0a8f0f1c6..a568ae470 100755 --- a/pkg/deb/debian_dh9/rules +++ b/pkg/deb/debian_dh9/rules @@ -9,6 +9,7 @@ include /usr/share/dpkg/buildflags.mk #LUA_LDFLAGS = $(addprefix -llua5.1-,$(LUA_LIBS_DEBIAN)) $(addprefix ../deps/lua/src/,$(LUA_OBJECTS)) export BUILD_TLS=yes +export USE_SYSTEMD=yes export CFLAGS CPPFLAGS LDFLAGS export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -ldl -latomic $(LUA_LDFLAGS)