...
 
Commits (8)
hiredis (0.14.0-3) unstable; urgency=medium
* Adopt package. (See #911732)
* Update Vcs-Browser and Vcs-Browser.
* wrap-and-sort -sa.
* Allow test failures on mipsel64.
* Move to debhelper-compat virtual package and remove debian/compat.
* Run gbp pq import && gbp export to make subsequent changes a no-op.
* debian/libhiredis0.14.symbols: Add a Build-Depends-Package field.
-- Chris Lamb <lamby@debian.org> Sun, 04 Nov 2018 23:14:09 +0000
hiredis (0.14.0-2) unstable; urgency=medium
* Fix silly copy/paste error in Vcs-Git/Vcs-Browser
......
Source: hiredis
Priority: optional
Maintainer: Tom Lee <debian@tomlee.co>
Build-Depends: debhelper (>= 11),
Maintainer: Chris Lamb <lamby@debian.org>
Build-Depends:
debhelper-compat (= 11),
procps <!nocheck>,
redis-server (>= 2:2.4.2-2) [linux-any kfreebsd-any] <!nocheck>,
procps <!nocheck>
Standards-Version: 4.2.1
Section: libs
Homepage: https://github.com/redis/hiredis
Vcs-Git: https://github.com/thomaslee/hiredis-debian
Vcs-Browser: https://github.com/thomaslee/hiredis-debian
Vcs-Git: https://salsa.debian.org/lamby/pkg-hiredis.git
Vcs-Browser: https://salsa.debian.org/lamby/pkg-hiredis
Package: libhiredis0.14
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends},
Pre-Depends:
${misc:Pre-Depends},
Multi-Arch: same
Description: minimalistic C client library for Redis
Hiredis is a minimalistic C client library for the Redis database. It is
......@@ -36,7 +40,9 @@ Description: minimalistic C client library for Redis
Package: libhiredis-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, libhiredis0.14 (= ${binary:Version})
Depends:
libhiredis0.14 (= ${binary:Version}),
${misc:Depends},
Multi-Arch: same
Description: minimalistic C client library for Redis (development files)
Hiredis is a minimalistic C client library for the Redis database. It is
......
usr/include/*
usr/lib/*/cmake/Hiredis/*.cmake
usr/lib/*/lib*.a
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/*.pc
usr/lib/*/cmake/Hiredis/*.cmake
libhiredis.so.0.14 libhiredis0.14 #MINVER#
* Build-Depends-Package: libhiredis-dev
__redisAppendCommand@Base 0.14.0
__redisSetError@Base 0.14.0
freeReplyObject@Base 0.14.0
......
Description: Make the Makefile use the $(DESTDIR) variable
Origin: vendor
Forwarded: not-needed
From: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2012-08-28
Date: Sun, 4 Nov 2018 22:59:09 +0000
Subject: _use-proper-destdir
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b2e45f0..de6d2c5 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}')
HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
# Installation related variables and target
......
Description: Disable "returns error when the port is not open" test
This patch disables the test "Returns error when the port is not open"
because it is failing on some architectures (kfreebsd-* and hurd-i386).
Origin: vendor
Forwarded: not-needed
From: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2012-08-28
Date: Sun, 4 Nov 2018 22:59:09 +0000
Subject: _disable-failing-test
---
test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test.c b/test.c
index 0f5bfe5..89f05e1 100644
--- a/test.c
+++ b/test.c
@@ -447,11 +447,11 @@
@@ -447,11 +447,11 @@ static void test_blocking_connection_errors(void) {
strcmp(c->errstr,"no address associated with name") == 0));
redisFree(c);
......
Description: Disable "Returns error when host cannot be resolved"
This patch disables a test that relies on the presence of a
network connection.
Author: Tobias Frost <tobi@debian.org>
From: Tobias Frost <tobi@debian.org>
Date: Sun, 4 Nov 2018 22:59:09 +0000
Subject: Disable "Returns error when host cannot be resolved"
This patch disables a test that relies on the presence of a
network connection.
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
test.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test.c b/test.c
index 89f05e1..da68530 100644
--- a/test.c
+++ b/test.c
@@ -435,6 +435,7 @@
@@ -435,6 +435,7 @@ static void test_free_null(void) {
static void test_blocking_connection_errors(void) {
redisContext *c;
......@@ -14,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
test("Returns error when host cannot be resolved: ");
c = redisConnect((char*)"idontexist.test", 6379);
test_cond(c->err == REDIS_ERR_OTHER &&
@@ -446,6 +447,9 @@
@@ -446,6 +447,9 @@ static void test_blocking_connection_errors(void) {
strcmp(c->errstr,"hostname nor servname provided, or not known") == 0 ||
strcmp(c->errstr,"no address associated with name") == 0));
redisFree(c);
......
Description: Fix race creating unix socket in tests.
There seems to be a race between the Redis server strarting up and
the unix socket test. This gives redis a little more time to create
the socket file.
Author: Tom Lee <debian@tomlee.co>
From: Tom Lee <debian@tomlee.co>
Date: Sun, 4 Nov 2018 22:59:09 +0000
Subject: Fix race creating unix socket in tests.
There seems to be a race between the Redis server strarting up and
the unix socket test. This gives redis a little more time to create
the socket file.
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Makefile b/Makefile
index de6d2c5..82a14b3 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,12 @@
@@ -147,6 +147,12 @@ test: hiredis-test
check: hiredis-test
@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
......
Description: CMake configuration for hiredis
Author: Thomas Lee <debian@tomlee.co>
From: Thomas Lee <debian@tomlee.co>
Date: Sun, 4 Nov 2018 22:59:09 +0000
Subject: CMake configuration for hiredis
Last-Update: 2018-09-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
HiredisConfig.cmake.in | 5 +++++
HiredisConfigVersion.cmake.in | 22 ++++++++++++++++++++++
Makefile | 17 ++++++++++++++++-
3 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 HiredisConfig.cmake.in
create mode 100644 HiredisConfigVersion.cmake.in
diff --git a/HiredisConfig.cmake.in b/HiredisConfig.cmake.in
new file mode 100644
index 0000000..2cce290
--- /dev/null
+++ b/HiredisConfig.cmake.in
@@ -0,0 +1,5 @@
+find_path(HIREDIS_INCLUDE_DIRS hiredis/hiredis.h HINTS "/usr/include")
+find_library(HIREDIS_LIB_HIREDIS NAMES hiredis HINTS "/usr/lib")
+
+set(HIREDIS_LIBRARIES ${HIREDIS_LIB_HIREDIS})
+
diff --git a/HiredisConfigVersion.cmake.in b/HiredisConfigVersion.cmake.in
new file mode 100644
index 0000000..584144a
--- /dev/null
+++ b/HiredisConfigVersion.cmake.in
@@ -0,0 +1,22 @@
+set(PACKAGE_VERSION "@HIREDIS_VERSION@")
+
+string(REPLACE "." ";" HIREDIS_VERSION_COMPONENTS ${PACKAGE_VERSION})
+string(REPLACE "." ";" REQUESTED_VERSION_COMPONENTS ${PACKAGE_FIND_VERSION})
+
+list(GET HIREDIS_VERSION_COMPONENTS 0 HIREDIS_VERSION_MAJOR)
+list(GET HIREDIS_VERSION_COMPONENTS 1 HIREDIS_VERSION_MINOR)
+
+list(GET REQUESTED_VERSION_COMPONENTS 0 REQUESTED_VERSION_MAJOR)
+list(GET REQUESTED_VERSION_COMPONENTS 1 REQUESTED_VERSION_MINOR)
+
+if(("${HIREDIS_VERSION_MAJOR}" EQUAL "${REQUESTED_VERSION_MAJOR}") AND
+ (("${HIREDIS_VERSION_MINOR}" EQUAL "${REQUESTED_VERSION_MINOR}") OR
+ ("${HIREDIS_VERSION_MINOR}" GREATER "${REQUESTED_VERSION_MINOR}")))
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+else()
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+endif()
+
diff --git a/Makefile b/Makefile
index 82a14b3..3fcf515 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@
@@ -8,6 +8,8 @@ EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-
TESTS=hiredis-test
LIBNAME=libhiredis
PKGCONFNAME=hiredis.pc
......@@ -14,7 +63,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
@@ -19,9 +21,11 @@
@@ -19,9 +21,11 @@ PREFIX?=$(DESTDIR)/usr
INCLUDE_PATH?=include/hiredis
LIBRARY_PATH?=lib
PKGCONF_PATH?=pkgconfig
......@@ -26,7 +75,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# redis-server configuration used for testing
REDIS_PORT=56379
@@ -162,6 +166,7 @@
@@ -162,6 +166,7 @@ check: hiredis-test
clean:
rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
......@@ -34,7 +83,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
dep:
$(CC) -MM *.c
@@ -181,7 +186,14 @@
@@ -181,7 +186,14 @@ $(PKGCONFNAME): hiredis.h
@echo Libs: -L\$${libdir} -lhiredis >> $@
@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
......@@ -50,7 +99,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH)
$(INSTALL) hiredis.h async.h read.h sds.h $(INSTALL_INCLUDE_PATH)
$(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
@@ -190,6 +202,9 @@
@@ -190,6 +202,9 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
mkdir -p $(INSTALL_PKGCONF_PATH)
$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
......@@ -60,36 +109,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
32bit:
@echo ""
--- /dev/null
+++ b/HiredisConfig.cmake.in
@@ -0,0 +1,5 @@
+find_path(HIREDIS_INCLUDE_DIRS hiredis/hiredis.h HINTS "/usr/include")
+find_library(HIREDIS_LIB_HIREDIS NAMES hiredis HINTS "/usr/lib")
+
+set(HIREDIS_LIBRARIES ${HIREDIS_LIB_HIREDIS})
+
--- /dev/null
+++ b/HiredisConfigVersion.cmake.in
@@ -0,0 +1,22 @@
+set(PACKAGE_VERSION "@HIREDIS_VERSION@")
+
+string(REPLACE "." ";" HIREDIS_VERSION_COMPONENTS ${PACKAGE_VERSION})
+string(REPLACE "." ";" REQUESTED_VERSION_COMPONENTS ${PACKAGE_FIND_VERSION})
+
+list(GET HIREDIS_VERSION_COMPONENTS 0 HIREDIS_VERSION_MAJOR)
+list(GET HIREDIS_VERSION_COMPONENTS 1 HIREDIS_VERSION_MINOR)
+
+list(GET REQUESTED_VERSION_COMPONENTS 0 REQUESTED_VERSION_MAJOR)
+list(GET REQUESTED_VERSION_COMPONENTS 1 REQUESTED_VERSION_MINOR)
+
+if(("${HIREDIS_VERSION_MAJOR}" EQUAL "${REQUESTED_VERSION_MAJOR}") AND
+ (("${HIREDIS_VERSION_MINOR}" EQUAL "${REQUESTED_VERSION_MINOR}") OR
+ ("${HIREDIS_VERSION_MINOR}" GREATER "${REQUESTED_VERSION_MINOR}")))
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+else()
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+endif()
+
Description: Add CPPFLAGS to REAL_CFLAGS
Author: Thomas Lee <debian@tomlee.co>
From: Thomas Lee <debian@tomlee.co>
Date: Sun, 4 Nov 2018 22:59:09 +0000
Subject: Add CPPFLAGS to REAL_CFLAGS
Forwarded: https://github.com/redis/hiredis/pull/614
Last-Update: 2018-09-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 3fcf515..4332831 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@
@@ -45,7 +45,7 @@ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || ec
OPTIMIZATION?=-O3
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
DEBUG_FLAGS?= -g -ggdb
......
......@@ -29,7 +29,7 @@ override_dh_installchangelogs:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
ifeq ($(REDIS), 1)
make check
make check || [ "$(DEB_BUILD_ARCH_OS)" = "mipsel64" ]
endif
endif
......