From: unspecd <unspecd@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] hiredis: update to 1.0.2.
Date: Sun, 18 Dec 2022 16:56:14 +0100 [thread overview]
Message-ID: <20221218155614.cfiehhkwdFUhT2iy12eWFjl0kqF_6_UZrvgihqLGupM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40371@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1505 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/hiredis
https://github.com/void-linux/void-packages/pull/40371
hiredis: update to 1.0.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- ppc64le-musl
---
[Upgrade urgency](https://github.com/redis/hiredis/releases/tag/v1.0.2): SECURITY, contains fixes to security issues.
- Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2) which is integer overflow to buffer overflow bug.
A patch file from https://github.com/void-linux/void-packages/pull/40371.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/hiredis-40371.patch --]
[-- Type: text/x-diff, Size: 4590 bytes --]
From 408756c4c1f7612df55dcbb6036a7d5e49f87e5d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 6 Nov 2022 19:07:41 +1100
Subject: [PATCH] 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 <gottox@voidlinux.org>"
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
next prev parent reply other threads:[~2022-12-18 15:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 4:38 [PR PATCH] " unspecd
2022-11-07 4:56 ` unspecd
2022-12-18 15:56 ` unspecd [this message]
2022-12-18 16:01 ` [PR PATCH] [Updated] " unspecd
2023-01-24 5:59 ` [PR PATCH] [Merged]: hiredis: update to 1.1.0 Vaelatern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221218155614.cfiehhkwdFUhT2iy12eWFjl0kqF_6_UZrvgihqLGupM@z \
--to=unspecd@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).