diff --git a/SOURCES/0001-Fix-build.patch b/SOURCES/0001-Fix-build.patch index 77bdc10..30df95a 100644 --- a/SOURCES/0001-Fix-build.patch +++ b/SOURCES/0001-Fix-build.patch @@ -1,7 +1,7 @@ -From 32eabf7c2198ca33eb7837214e2833b5b6cd95dc Mon Sep 17 00:00:00 2001 +From f47878e6e6fda804eb4d616c6f14fed32adbacb6 Mon Sep 17 00:00:00 2001 From: tigro -Date: Fri, 23 Aug 2024 15:31:30 +0300 -Subject: [PATCH 1/2] Fix build +Date: Fri, 23 Aug 2024 17:10:03 +0300 +Subject: [PATCH 1/3] Fix build --- Makefile | 54 +++++++++++++++++++++++++++++------------------------- diff --git a/SOURCES/0003-Add-progress-bar-for-sdel.patch b/SOURCES/0002-Add-progress-bar-for-sdel.patch similarity index 96% rename from SOURCES/0003-Add-progress-bar-for-sdel.patch rename to SOURCES/0002-Add-progress-bar-for-sdel.patch index 75fdd4f..e75e926 100644 --- a/SOURCES/0003-Add-progress-bar-for-sdel.patch +++ b/SOURCES/0002-Add-progress-bar-for-sdel.patch @@ -1,7 +1,7 @@ -From fbdf9bc440a129e3db2fe9cafdbcaa3b5a7ffdb1 Mon Sep 17 00:00:00 2001 +From 82e2b68bb43a650e66931dd319ef04624911c430 Mon Sep 17 00:00:00 2001 From: tigro -Date: Fri, 23 Aug 2024 15:49:35 +0300 -Subject: [PATCH 3/3] Add progress bar for sdel +Date: Fri, 23 Aug 2024 17:10:33 +0300 +Subject: [PATCH 2/3] Add progress bar for sdel --- sdel-lib.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- diff --git a/SOURCES/0002-Disable-strip.patch b/SOURCES/0002-Disable-strip.patch deleted file mode 100644 index 156f979..0000000 --- a/SOURCES/0002-Disable-strip.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2a8361768b2750436b3010c3b2e4fd63b49ec2a2 Mon Sep 17 00:00:00 2001 -From: tigro -Date: Fri, 23 Aug 2024 15:31:57 +0300 -Subject: [PATCH 2/2] Disable strip - ---- - Makefile | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 7d14ee3..1961f1b 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,16 +28,12 @@ sdel-lib.o: sdel-lib.c - - srm: srm.c sdel-lib.o - $(CC) $(OPT) -o srm srm.c sdel-lib.o -- -strip srm - sfill: sfill.c sdel-lib.o - $(CC) $(OPT) -o sfill sfill.c sdel-lib.o -- -strip sfill - sswap: sswap.c sdel-lib.o - $(CC) $(OPT) -o sswap sswap.c sdel-lib.o -- -strip sswap - smem: smem.c sdel-lib.o - $(CC) $(OPT) -o smem smem.c sdel-lib.o -- -strip smem - - clean: - rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~ --- -2.46.0 - diff --git a/SOURCES/0004-Use-gcc-flags.patch b/SOURCES/0003-Use-gcc-flags.patch similarity index 62% rename from SOURCES/0004-Use-gcc-flags.patch rename to SOURCES/0003-Use-gcc-flags.patch index 6171792..e393728 100644 --- a/SOURCES/0004-Use-gcc-flags.patch +++ b/SOURCES/0003-Use-gcc-flags.patch @@ -1,14 +1,14 @@ -From 8311a1abd4335450b6a83da448b3cd9cd1680aed Mon Sep 17 00:00:00 2001 +From 20e1f36e590cfe6a8ad325e3b4ca281353e78465 Mon Sep 17 00:00:00 2001 From: tigro -Date: Fri, 23 Aug 2024 15:52:31 +0300 -Subject: [PATCH 4/4] Use gcc flags +Date: Fri, 23 Aug 2024 17:11:44 +0300 +Subject: [PATCH 3/3] Use gcc flags --- - Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + Makefile | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 1961f1b..7bc3a12 100644 +index 7d14ee3..8cb2475 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ @@ -18,24 +18,31 @@ index 1961f1b..7bc3a12 100644 OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2 #LD_MOD=-r prefix = /usr -@@ -27,13 +27,13 @@ sdel-lib.o: sdel-lib.c - $(CC) $(OPT) -c sdel-lib.c +@@ -24,19 +24,19 @@ sdel-mod.o: sdel-mod.c + $(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c + + sdel-lib.o: sdel-lib.c +- $(CC) $(OPT) -c sdel-lib.c ++ $(CC) $(OPT) -c sdel-lib.c -lm srm: srm.c sdel-lib.o - $(CC) $(OPT) -o srm srm.c sdel-lib.o + $(CC) $(OPT) -o srm srm.c sdel-lib.o -lm + -strip srm sfill: sfill.c sdel-lib.o - $(CC) $(OPT) -o sfill sfill.c sdel-lib.o + $(CC) $(OPT) -o sfill sfill.c sdel-lib.o -lm + -strip sfill sswap: sswap.c sdel-lib.o - $(CC) $(OPT) -o sswap sswap.c sdel-lib.o + $(CC) $(OPT) -o sswap sswap.c sdel-lib.o -lm + -strip sswap smem: smem.c sdel-lib.o - $(CC) $(OPT) -o smem smem.c sdel-lib.o + $(CC) $(OPT) -o smem smem.c sdel-lib.o -lm + -strip smem clean: - rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~ -- 2.46.0 diff --git a/SPECS/secure-delete.spec b/SPECS/secure-delete.spec index e233cc3..19d6697 100644 --- a/SPECS/secure-delete.spec +++ b/SPECS/secure-delete.spec @@ -1,4 +1,5 @@ %global pkgname secure_delete +%global debug_package %{nil} Summary: Secure Delete Name: secure-delete @@ -9,9 +10,8 @@ License: GPLv2+ URL: https://www.thc.org/ Source0: https://www.thc.org/download.php?t=r&f=%{pkgname}-%{version}.tar.gz Patch0: 0001-Fix-build.patch -Patch1: 0002-Disable-strip.patch -Patch2: 0003-Add-progress-bar-for-sdel.patch -Patch3: 0004-Use-gcc-flags.patch +Patch1: 0002-Add-progress-bar-for-sdel.patch +Patch2: 0003-Use-gcc-flags.patch BuildRequires: automake autoconf libtool BuildRequires: gcc