From 5499769bcc299ddeae5bd3ef44ae2e8c010fc0c0 Mon Sep 17 00:00:00 2001
From: wenyuzifang <lzx02244079@alibaba-inc.com>
Date: Tue, 28 Oct 2025 18:22:58 +0800
Subject: [PATCH] Update code from upstream

---
 tokyocabinet-fedora.patch | 54 +++++++++++++++++++++++++++++++++++++++
 tokyocabinet.spec         |  8 ++++--
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 tokyocabinet-fedora.patch

diff --git a/tokyocabinet-fedora.patch b/tokyocabinet-fedora.patch
new file mode 100644
index 0000000..211e223
--- /dev/null
+++ b/tokyocabinet-fedora.patch
@@ -0,0 +1,54 @@
+--- configure.in	2009-12-06 21:43:11.000000000 -0500
++++ configure.in.new	2009-12-17 15:13:58.794592478 -0500
+@@ -31,26 +31,15 @@
+ MYPCFILES="tokyocabinet.pc"
+ 
+ # Building flags
+-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
++MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
++MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
+ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
+-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
++MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
+ MYRUNPATH="\$(LIBDIR)"
+ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
+-
+-
+-
+ #================================================================
+ # Options
+ #================================================================
+--- Makefile.in	2009-10-13 08:33:20.000000000 -0400
++++ Makefile.in.new	2009-12-17 15:15:07.257604314 -0500
+@@ -54,8 +54,8 @@
+ LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
+ LIBS = @LIBS@
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
+-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
++LDENV = 
++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
+ POSTCMD = @MYPOSTCMD@
+ 
+ 
+--- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
++++ tokyocabinet.pc.in.new	2009-12-17 15:15:29.626591709 -0500
+@@ -10,5 +10,5 @@
+ Name: Tokyo Cabinet
+ Description: a modern implementation of DBM
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -ltokyocabinet @LIBS@
++Libs: -L${libdir} -ltokyocabinet
+ Cflags: -I${includedir}
diff --git a/tokyocabinet.spec b/tokyocabinet.spec
index b6f195f..afd1b8b 100644
--- a/tokyocabinet.spec
+++ b/tokyocabinet.spec
@@ -1,4 +1,4 @@
-%define anolis_release 13
+%define anolis_release		14
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
 Version:	1.4.48
@@ -6,9 +6,11 @@ Release:	%{anolis_release}%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL:		https://dbmx.net/tokyocabinet/
-Source:		https://dbmx.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
+Patch1:	tokyocabinet-fedora.patch
 
 BuildRequires:	pkgconfig zlib-devel bzip2-devel autoconf gcc chrpath
+BuildRequires: make
 
 %description
 Tokyo Cabinet is a library of routines for managing a database. It is the 
@@ -84,6 +86,8 @@ make check
 %doc ChangeLog README
 
 %changelog
+* Tue Oct 28 2025 wenyuzifang <lzx02244079@alibaba-inc.com> - 1.4.48-14
+- Improve security, portability, and maintainability by removing hardcoded paths and reducing environment pollution
 * Wed Dec 27 2023 Chang Gao <gc-taifu@linux.alibaba.com> - 1.4.48-13
 - Correct the source url
 
-- 
Gitee