From 408756c4c1f7612df55dcbb6036a7d5e49f87e5d Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Sun, 6 Nov 2022 19:07:41 +1100 Subject: [PATCH 1/3] hiredis: update to 1.1.0. --- common/shlibs | 2 +- srcpkgs/hiredis/patches/fix-cflags.patch | 6 +++--- srcpkgs/hiredis/patches/fix-pkgconfig.patch | 16 ++++++++++------ srcpkgs/hiredis/template | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index ba5c89ee3bad..3020ccf9cf03 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2378,7 +2378,7 @@ libtidy.so.58 libtidy5-5.8.0_1 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1 libinjeqt.so.1 injeqt-1.1.0_1 libgadu.so.3 libgadu-1.12.1_1 -libhiredis.so.1.0.0 hiredis-1.0.0_1 +libhiredis.so.1.1.0 hiredis-1.1.0_1 libIL.so.1 devil-1.7.8_1 libILU.so.1 devil-1.7.8_1 libILUT.so.1 devil-1.7.8_1 diff --git a/srcpkgs/hiredis/patches/fix-cflags.patch b/srcpkgs/hiredis/patches/fix-cflags.patch index b7be37a62977..81680562dbca 100644 --- a/srcpkgs/hiredis/patches/fix-cflags.patch +++ b/srcpkgs/hiredis/patches/fix-cflags.patch @@ -2,7 +2,7 @@ Index: Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -44,9 +44,9 @@ export REDIS_TEST_CONFIG +@@ -44,8 +44,8 @@ export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') @@ -11,6 +11,6 @@ Index: Makefile WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers -DEBUG_FLAGS?= -g -ggdb +DEBUG_FLAGS?= - REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) + REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) REAL_LDFLAGS=$(LDFLAGS) - + diff --git a/srcpkgs/hiredis/patches/fix-pkgconfig.patch b/srcpkgs/hiredis/patches/fix-pkgconfig.patch index 94be0a7309e7..9163b6be12df 100644 --- a/srcpkgs/hiredis/patches/fix-pkgconfig.patch +++ b/srcpkgs/hiredis/patches/fix-pkgconfig.patch @@ -2,25 +2,29 @@ Index: Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -234,8 +234,8 @@ $(PKGCONFNAME): hiredis.h +@@ -234,9 +234,9 @@ $(PKGCONFNAME): hiredis.h @echo "Generating $@ for pkgconfig..." @echo prefix=$(PREFIX) > $@ @echo exec_prefix=\$${prefix} >> $@ - @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@ -- @echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ +- @echo includedir=$(PREFIX)/include >> $@ + @echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@ -+ @echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@ ++ @echo includedir=\$${prefix}/include >> $@ +- @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ ++ @echo pkgincludedir=\$${prefix}/$(INCLUDE_PATH) >> $@ @echo >> $@ @echo Name: hiredis >> $@ @echo Description: Minimalistic C client library for Redis. >> $@ -@@ -247,8 +247,8 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h +@@ -247,9 +247,9 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h @echo "Generating $@ for pkgconfig..." @echo prefix=$(PREFIX) > $@ @echo exec_prefix=\$${prefix} >> $@ - @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@ -- @echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ +- @echo includedir=$(PREFIX)/include >> $@ + @echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@ -+ @echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@ ++ @echo includedir=\$${prefix}/include >> $@ +- @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ ++ @echo pkgincludedir=\$${prefix}/$(INCLUDE_PATH) >> $@ @echo >> $@ @echo Name: hiredis_ssl >> $@ @echo Description: SSL Support for hiredis. >> $@ diff --git a/srcpkgs/hiredis/template b/srcpkgs/hiredis/template index db8f3a11ddb6..6ecd80b53dfe 100644 --- a/srcpkgs/hiredis/template +++ b/srcpkgs/hiredis/template @@ -1,7 +1,7 @@ # Template file for 'hiredis' pkgname=hiredis -version=1.0.0 -revision=2 +version=1.1.0 +revision=1 build_style=gnu-makefile checkdepends="redis" short_desc="Minimalistic C client for Redis" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://github.com/redis/hiredis" distfiles="https://github.com/redis/hiredis/archive/v${version}.tar.gz" -checksum=2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f +checksum=fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6 post_install() { vlicense COPYING From 33fe24a8a25ada0e23028af91d7bfb4aeeca0252 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Mon, 19 Dec 2022 03:01:27 +1100 Subject: [PATCH 2/3] coturn: revbump for hiredis 1.1.0 --- srcpkgs/coturn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index f6c0adda8820..bf23a22cf98f 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -1,7 +1,7 @@ # Template file for 'coturn' pkgname=coturn version=4.6.0 -revision=3 +revision=4 build_style=configure configure_args=" --prefix=/usr From d83955aedcf1eab9d124bdfb955542fcbe9bd366 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Mon, 19 Dec 2022 03:01:28 +1100 Subject: [PATCH 3/3] suricata: revbump for hiredis 1.1.0 --- srcpkgs/suricata/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template index 1bcdee25a3f4..3e4f58bae137 100644 --- a/srcpkgs/suricata/template +++ b/srcpkgs/suricata/template @@ -1,7 +1,7 @@ # Template file for 'suricata' pkgname=suricata version=4.1.8 -revision=1 +revision=2 build_style=gnu-configure build_helper="$(vopt_if rust rust)" configure_args="--disable-gccmarch-native $(vopt_enable rust)