summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael-grunder <michael.grunder@gmail.com>2021-10-07 13:25:50 -0700
committermichael-grunder <michael.grunder@gmail.com>2021-10-07 13:25:50 -0700
commit632bf07183a9008fd0c9d315a517738c37c7a973 (patch)
treede16b2f9e107d6448ee575c5b8dcdfd91ef99fdc
parenta39824a5dfc844ba04a64bf3c90d9d49f64ae3f7 (diff)
parentb731283245f3183af527237166261ad0768ba7d4 (diff)
Merge branch 'release/v1.0.2'
-rw-r--r--CHANGELOG.md9
-rw-r--r--README.md6
-rw-r--r--hiredis.h4
3 files changed, 15 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18000ba..2a2bc31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
+## [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2) - (2021-10-07)
+
+Announcing Hiredis v1.0.2, which fixes CVE-2021-32765 but returns the SONAME to the correct value of `1.0.0`.
+
+- [Revert SONAME bump](https://github.com/redis/hiredis/commit/d4e6f109a064690cde64765c654e679fea1d3548)
+ ([Michael Grunder](https://github.com/michael-grunder))
+
## [1.0.1](https://github.com/redis/hiredis/tree/v1.0.1) - (2021-10-04)
+<span style="color:red">This release erroneously bumped the SONAME, please use [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2)</span>
+
Announcing Hiredis v1.0.1, a security release fixing CVE-2021-32765
- Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2)
diff --git a/README.md b/README.md
index ba27389..b073f8e 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,11 @@ Redis version >= 1.2.0.
The library comes with multiple APIs. There is the
*synchronous API*, the *asynchronous API* and the *reply parsing API*.
-## Upgrading to `1.0.1`
+## Upgrading to `1.0.2`
-Version 1.0.1 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2). They are otherwise identical.
+<span style="color:red">NOTE: v1.0.1 erroneously bumped SONAME, which is why it is skipped here.</span>
+
+Version 1.0.2 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2). They are otherwise identical.
## Upgrading to `1.0.0`
diff --git a/hiredis.h b/hiredis.h
index 981393e..a093abe 100644
--- a/hiredis.h
+++ b/hiredis.h
@@ -47,8 +47,8 @@ typedef long long ssize_t;
#define HIREDIS_MAJOR 1
#define HIREDIS_MINOR 0
-#define HIREDIS_PATCH 2
-#define HIREDIS_SONAME 1.0.2-dev
+#define HIREDIS_PATCH 3
+#define HIREDIS_SONAME 1.0.3-dev
/* Connection type can be blocking or non-blocking and is set in the
* least significant bit of the flags field in redisContext. */