From 995ecccd91635adfa8e55e3a4b2494a911dc12e0 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Sun, 2 Feb 2025 02:06:28 +0800
Subject: [PATCH] really use system flags & enable ssl library

---
 ...dis-1.2.0-fix-linkage-of-ssl-library.patch | 13 ++++++
 hiredis.spec                                  | 46 ++++++++++---------
 hiredis.yaml                                  |  8 ++--
 3 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 hiredis-1.2.0-fix-linkage-of-ssl-library.patch

diff --git a/hiredis-1.2.0-fix-linkage-of-ssl-library.patch b/hiredis-1.2.0-fix-linkage-of-ssl-library.patch
new file mode 100644
index 0000000..a381e3f
--- /dev/null
+++ b/hiredis-1.2.0-fix-linkage-of-ssl-library.patch
@@ -0,0 +1,13 @@
+--- hiredis-1.2.0/Makefile.orig	2025-02-02 01:54:25.017710500 +0800
++++ hiredis-1.2.0/Makefile	2025-02-02 02:00:50.480034800 +0800
+@@ -168,8 +168,8 @@
+ 	$(STLIB_MAKE_CMD) $(STLIBNAME) $(OBJ)
+ 
+ #################### SSL building rules start ####################
+-$(SSL_DYLIBNAME): $(SSL_OBJ)
+-	$(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
++$(SSL_DYLIBNAME): $(SSL_OBJ) $(DYLIBNAME)
++	$(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS) $(DYLIBNAME)
+ 
+ $(SSL_STLIBNAME): $(SSL_OBJ)
+ 	$(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
diff --git a/hiredis.spec b/hiredis.spec
index 4e450e2..403fb85 100644
--- a/hiredis.spec
+++ b/hiredis.spec
@@ -1,20 +1,19 @@
 Name:           hiredis
 Version:        1.2.0
-Release:        2
+Release:        3
 Summary:        A minimalistic C client library for the Redis database
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/redis/hiredis
 Source0:        https://github.com/redis/hiredis/archive/refs/tags/v%{version}.tar.gz#/hiredis-1.2.0.tar.gz
 BuildRequires:  gcc redis
+BuildRequires:  openssl-devel
 
-
+Patch0001:      hiredis-1.2.0-fix-linkage-of-ssl-library.patch
 Patch0002:      fix-memory-uninitialized-in-fuzz-testcase.patch
 Patch0003:      Retry-poll-2-if-we-are-intterupted.patch
 Patch0004:      Document-poll-2-logic-changes.patch
 Patch0005:      Fix-memory-leak.patch
 
-
-
 %description
 Hiredis is a minimalistic C client library for the Redis database.
 It is minimalistic because it just adds minimal support for the protocol,
@@ -28,44 +27,49 @@ for instance be used in higher level language bindings for efficient reply parsi
 %package        devel
 Summary:        Development files for hiredis
 Requires:       hiredis = %{version}-%{release}
+Requires:       openssl-devel
 
 %description    devel
 The hiredis-devel package contains development files to build applications for hiredis.
 
 %prep
-%autosetup  -p1
+%autosetup -p1
 
 %build
-%make_build PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}"  DEBUG="%{optflags}" LDFLAGS="%{?__global_ldflags}"
+%make_build \
+  PREFIX="%{_prefix}" \
+  LIBRARY_PATH="%{_lib}" \
+  OPTIMIZATION="" \
+  CFLAGS="%{?build_cflags}" \
+  LDFLAGS="%{?build_ldflags}" \
+  PLATFORM_FLAGS="%{?build_cflags} %{?build_ldflags}" \
+  USE_SSL=1
 
 %install
-%make_install PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}"
-
-find $RPM_BUILD_ROOT -type f -name "*.a" -delete
-
-cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libhiredis.so.0.13 libhiredis.so.0
+%make_install PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}" USE_SSL=1
+%delete_la_and_a
 
 %check
-make check || true
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+make check
 
 %files
-%doc COPYING
+%license COPYING
 %{_libdir}/libhiredis.so.*
+%{_libdir}/libhiredis_ssl.so.*
 
 %files devel
 %doc CHANGELOG.md README.md
 %{_includedir}/hiredis/
 %{_libdir}/libhiredis.so
+%{_libdir}/libhiredis_ssl.so
 %{_libdir}/pkgconfig/hiredis.pc
+%{_libdir}/pkgconfig/hiredis_ssl.pc
 
 %changelog
+* Sun Feb 02 2025 Funda Wang <fundawang@yeah.net> - 1.2.0-3
+- Really use pan system build flags
+- build ssl library
+
 * Wed Aug 7 2024 zhangxingrong <zhangxingrong@uniontech.cn> - 1.2.0-2
 - Retry poll(2) if we are intterupted
 - Document poll(2) logic changes
diff --git a/hiredis.yaml b/hiredis.yaml
index d8282cd..b4f7079 100644
--- a/hiredis.yaml
+++ b/hiredis.yaml
@@ -1,4 +1,4 @@
-version_control: github
-src_repo:  redis/hiredis
-tag_prefix: ^v
-seperator: .
\ No newline at end of file
+version_control: github
+src_repo: redis/hiredis
+tag_prefix: ^v
+separator: .
-- 
Gitee