[packages/dmalloc] - updated to 5.6.5
qboosh
qboosh at pld-linux.org
Thu Jun 4 21:30:16 CEST 2026
commit 02e493328fc26b06c45dd086c50d93d995db487b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jun 4 21:30:19 2026 +0200
- updated to 5.6.5
dmalloc-cxx.patch | 11 +++++++++++
dmalloc-info.patch | 8 ++++----
dmalloc-pic.patch | 40 ++++++++++++++++++--------------------
dmalloc.spec | 56 ++++++++++++++++++++++++++++++++----------------------
4 files changed, 67 insertions(+), 48 deletions(-)
---
diff --git a/dmalloc.spec b/dmalloc.spec
index 9b849a5..cdc43e3 100644
--- a/dmalloc.spec
+++ b/dmalloc.spec
@@ -1,23 +1,26 @@
Summary: A library for controlling and tracing dynamic memory allocations
Summary(pl.UTF-8): Biblioteka do kontroli i śledzenia dynamicznej alokacji pamięci
Name: dmalloc
-Version: 5.5.2
+Version: 5.6.5
Release: 1
-License: LGPL
+License: ISC
Group: Development/Debuggers
-Source0: http://dmalloc.com/releases/%{name}-%{version}.tgz
-# Source0-md5: f92e5606c23a8092f3d5694e8d1c932e
+Source0: https://dmalloc.com/releases/%{name}-%{version}.tgz
+# Source0-md5: 2b86f0fe9aa364efba4438681a32be95
Source1: %{name}.1
Patch0: %{name}-info.patch
Patch1: %{name}-pic.patch
Patch2: %{name}-4.8.2-pld_man.patch
-URL: http://dmalloc.com/
+Patch3: %{name}-cxx.patch
+URL: https://dmalloc.com/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: texinfo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define filterout -Wp,-D_FORTIFY_SOURCE=[0-9] -fstack-protector-strong
+
%description
The debug memory allocation or "dmalloc" library has been designed as
a drop in replacement for the system's `malloc', `realloc', `calloc',
@@ -49,35 +52,36 @@ Biblioteki statyczne dmalloc.
%prep
%setup -q
-install %{SOURCE1} .
-cd docs
+cp -p %{SOURCE1} .
%patch -P0 -p1
-cd ..
%patch -P1 -p1
%patch -P2 -p0
+%patch -P3 -p1
%build
%{__aclocal}
%{__autoconf}
%configure \
--enable-cxx \
- --enable-threads \
- --enable-shlib
+ --enable-shlib \
+ --enable-threads
%{__make}
-%{__make} docs/%{name}.info
+
+%{__make} %{name}.info
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man1}
-%{makeinstall} \
- installsl installcxx installth \
+%{__make} install \
+ bindir=$RPM_BUILD_ROOT%{_bindir} \
+ includedir=$RPM_BUILD_ROOT%{_includedir} \
+ libdir=$RPM_BUILD_ROOT%{_libdir} \
shlibdir=$RPM_BUILD_ROOT%{_libdir} \
- incdir=$RPM_BUILD_ROOT%{_includedir}
-install docs/*.info $RPM_BUILD_ROOT%{_infodir}
-install dmalloc.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p dmalloc.info $RPM_BUILD_ROOT%{_infodir}
+cp -p dmalloc.1 $RPM_BUILD_ROOT%{_mandir}/man1
%post
/sbin/ldconfig
@@ -92,13 +96,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README NEWS ChangeLog*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/*
-%{_mandir}/man1/*
-%{_infodir}/*.info*
+%doc ChangeLog.txt LICENSE.txt README.md TODO
+%attr(755,root,root) %{_bindir}/dmalloc
+%{_libdir}/libdmalloc.so
+%{_libdir}/libdmallocth.so
+%{_libdir}/libdmallocthcxx.so
+%{_libdir}/libdmallocxx.so
+%{_includedir}/dmalloc.h
+%{_mandir}/man1/dmalloc.1*
+%{_infodir}/dmalloc.info*
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libdmalloc.a
+%{_libdir}/libdmallocth.a
+%{_libdir}/libdmallocthcxx.a
+%{_libdir}/libdmallocxx.a
diff --git a/dmalloc-cxx.patch b/dmalloc-cxx.patch
new file mode 100644
index 0000000..82b14c1
--- /dev/null
+++ b/dmalloc-cxx.patch
@@ -0,0 +1,11 @@
+--- dmalloc-5.6.5/configure.ac.orig 2026-06-04 21:12:53.370722896 +0200
++++ dmalloc-5.6.5/configure.ac 2026-06-04 21:13:08.020643531 +0200
+@@ -63,7 +63,7 @@ AC_PROG_CC
+ AC_PROG_CXX
+
+ # see if we actually have a CXX program
+-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then
++if test "$CXX" = "" ; then
+ AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX)
+ enable_cxx=no
+ fi
diff --git a/dmalloc-info.patch b/dmalloc-info.patch
index 385d115..9c94c7d 100644
--- a/dmalloc-info.patch
+++ b/dmalloc-info.patch
@@ -1,6 +1,6 @@
---- dmalloc-4.8.2/dmalloc.texi~ Wed Apr 10 21:28:35 2002
-+++ dmalloc-4.8.2/dmalloc.texi Wed Apr 10 21:28:35 2002
-@@ -6,9 +6,9 @@
+--- dmalloc-5.6.5/dmalloc.texi.orig 2020-12-28 21:55:00.000000000 +0100
++++ dmalloc-5.6.5/dmalloc.texi 2026-06-04 21:00:56.477939971 +0200
+@@ -5,9 +5,9 @@
@headings double
@c %**end of header
@@ -11,4 +11,4 @@
+* Dmalloc: (dmalloc). Malloc debug library
@end direntry
- @c ================================================================
+ @c ----------------------------------------------------------------
diff --git a/dmalloc-pic.patch b/dmalloc-pic.patch
index c46e983..eb44763 100644
--- a/dmalloc-pic.patch
+++ b/dmalloc-pic.patch
@@ -1,27 +1,25 @@
---- dmalloc-4.8.1/Makefile.in.foo Mon Dec 11 17:55:43 2000
-+++ dmalloc-4.8.1/Makefile.in Mon Dec 11 17:55:20 2000
-@@ -312,17 +312,17 @@
+--- dmalloc-5.6.5/Makefile.in.orig 2020-12-28 21:55:00.000000000 +0100
++++ dmalloc-5.6.5/Makefile.in 2026-06-04 21:06:15.739543716 +0200
+@@ -359,15 +359,15 @@ $(UTIL) : $(UTIL).o dmalloc_argv.o compa
# special _th versions of objects with the LOCK_THREADS variable defined to 1
chunk_th.o : $(srcdir)/chunk.c
rm -f $@
-- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
-+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
- -c $(srcdir)/chunk.c -o ./$@
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 -c $(srcdir)/chunk.c -o ./$@
++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 -c $(srcdir)/chunk.c -o ./$@
error_th.o : $(srcdir)/error.c
rm -f $@
-- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
-+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
- -c $(srcdir)/error.c -o ./$@
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 -c $(srcdir)/error.c -o ./$@
++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 -c $(srcdir)/error.c -o ./$@
- malloc_th.o : $(srcdir)/malloc.c
+ user_malloc_th.o : $(srcdir)/user_malloc.c
rm -f $@
-- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
-+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \
- -c $(srcdir)/malloc.c -o ./$@
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 -c $(srcdir)/user_malloc.c -o ./$@
++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 -c $(srcdir)/user_malloc.c -o ./$@
- tests : $(TEST)
-@@ -348,7 +348,7 @@
+ tests : $(TEST) $(TEST_FC)
+
+@@ -402,7 +402,7 @@ heavy : $(TEST) light
.c.o :
rm -f $@
@@ -29,13 +27,13 @@
+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
#
- # .cc.o auto-target doesn't work on some systems.
-@@ -356,7 +356,7 @@
+ # .cc.o auto-target doesn't work on some systems.
+@@ -410,7 +410,7 @@ heavy : $(TEST) light
#
dmallocc.o : $(srcdir)/dmallocc.cc
rm -f $@
-- $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
-+ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
- -o ./$@
+- $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc -o ./$@
++ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc -o ./$@
- .texi.info :
+ depend :
+ rm -f Makefile.t
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dmalloc.git/commitdiff/02e493328fc26b06c45dd086c50d93d995db487b
More information about the pld-cvs-commit
mailing list