From f34ff8d03e48f3fa52bc1eb01023cab0b15e9160 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 5 Mar 2009 20:39:20 +0000 Subject: [PATCH 01/50] Initial cvs-import of dc3dd package. --- .cvsignore | 1 + dc3dd.spec | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 78 insertions(+) create mode 100644 dc3dd.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..ff17428 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +dc3dd-6.12.2.tar.gz diff --git a/dc3dd.spec b/dc3dd.spec new file mode 100644 index 0000000..d456ba0 --- /dev/null +++ b/dc3dd.spec @@ -0,0 +1,75 @@ +Name: dc3dd +Version: 6.12.2 +Release: 3%{?dist} +Summary: Patched version of GNU dd for use in computer forensics + +Group: Applications/Editors +License: GPLv2+ and GPLv3+ +URL: http://dc3dd.sourceforge.net/ +Source0: http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +BuildRequires: gettext + +%description +dc3dd is a patched version of GNU dd to include a number of features useful +for computer forensics. Many of these features were inspired by dcfldd, but +were rewritten for dc3dd. + + * Pattern writes. The program can write a single hexadecimal value or a + text string to the output device for wiping purposes. + * Piecewise and overall hashing with multiple algorithms and variable + size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be + computed before or after conversions are made. + * Progress meter with automatic input/output file size probing + * Combined log for hashes and errors + * Error grouping. Produces one error message for identical sequential + errors + * Verify mode. Able to repeat any transformations done to the input + file and compare it to an output. + * Ability to split the output into chunks with numerical or alphabetic + extensions + + +%prep +%setup -q + +for file in README Sample_Commands.txt Options_Reference.txt; +do + sed 's|\r||' $file > $file.tmp + touch -r $file $file.tmp + mv -f $file.tmp $file +done + +rm po/*.gmo + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.* + +%changelog +* Thu Mar 05 2009 Adam Miller - 6.12.2-3 +- Cleaned up the .spec by looping through files needing EOF encoding fix + +* Mon Mar 02 2009 Adam Miller - 6.12.2-2 +- Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding +- fixed licencing listing + +* Mon Feb 23 2009 Adam Miller - 6.12.2-1 +- First build of dc3dd for fedora diff --git a/import.log b/import.log new file mode 100644 index 0000000..395d4f3 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +dc3dd-6_12_2-3:HEAD:dc3dd-6.12.2-3.src.rpm:1236285513 diff --git a/sources b/sources index e69de29..5f30c7e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +97cc4421e18156890d53803cacf9180c dc3dd-6.12.2.tar.gz From 4fbb34b439818354c28d9b8c47a48439edcc4fb9 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 19 Mar 2009 21:23:02 +0000 Subject: [PATCH 02/50] New dc3dd release --- .cvsignore | 2 +- dc3dd.spec | 7 +++++-- import.log | 1 + sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index ff17428..a2b0bbf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dc3dd-6.12.2.tar.gz +dc3dd-6.12.3.tar.gz diff --git a/dc3dd.spec b/dc3dd.spec index d456ba0..0c33698 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd -Version: 6.12.2 -Release: 3%{?dist} +Version: 6.12.3 +Release: 1%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Thu Mar 19 2009 Adam Miller - 6.12.3-1 +- New release of dc3dd + * Thu Mar 05 2009 Adam Miller - 6.12.2-3 - Cleaned up the .spec by looping through files needing EOF encoding fix diff --git a/import.log b/import.log index 395d4f3..9c33fd9 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ dc3dd-6_12_2-3:HEAD:dc3dd-6.12.2-3.src.rpm:1236285513 +dc3dd-6_12_3-1:HEAD:dc3dd-6.12.3-1.src.rpm:1237497766 diff --git a/sources b/sources index 5f30c7e..a34bb33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97cc4421e18156890d53803cacf9180c dc3dd-6.12.2.tar.gz +b01dd06bbfea7cb49cf4a677715a1524 dc3dd-6.12.3.tar.gz From 89a1642d6d6589dded854a3b5fe32ad7d64abc53 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 20:04:26 +0000 Subject: [PATCH 03/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 0c33698..4aaf3f4 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 6.12.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 6.12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Mar 19 2009 Adam Miller - 6.12.3-1 - New release of dc3dd From ca7b2a55ba521418d985aa6359386fd8b6d91744 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 10 Aug 2009 16:28:16 +0000 Subject: [PATCH 04/50] Fixed Source0 as reported: https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591. html --- dc3dd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dc3dd.spec b/dc3dd.spec index 4aaf3f4..f669661 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,12 +1,12 @@ Name: dc3dd Version: 6.12.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ -Source0: http://master.dl.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Mon Aug 10 2009 Adam Miller - 6.12.3-3 +- Fixed Source0 listing as reported https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html + * Fri Jul 24 2009 Fedora Release Engineering - 6.12.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 9eec38923f7c33944c442983a6b454fbc6c7787e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:11:59 +0000 Subject: [PATCH 05/50] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6fe63d9..d7264dd 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: dc3dd -# $Id$ +# $Id: Makefile,v 1.1 2009/03/05 20:24:27 kevin Exp $ NAME := dc3dd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 499cd028d77ea31abcd64dd6e1e92f66c2445908 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:43:57 +0000 Subject: [PATCH 06/50] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d7264dd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: dc3dd -# $Id: Makefile,v 1.1 2009/03/05 20:24:27 kevin Exp $ -NAME := dc3dd -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 9c33fd9..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -dc3dd-6_12_2-3:HEAD:dc3dd-6.12.2-3.src.rpm:1236285513 -dc3dd-6_12_3-1:HEAD:dc3dd-6.12.3-1.src.rpm:1237497766 From a9a49b418614d7ceebdaa8a4aa174cc2bf388a56 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 07:12:15 -0600 Subject: [PATCH 07/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index f669661..2d6d4dd 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 6.12.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 6.12.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Aug 10 2009 Adam Miller - 6.12.3-3 - Fixed Source0 listing as reported https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html From edf978f751a0a269f6ffec4b25c2e9b61991b52a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 18:22:41 -0600 Subject: [PATCH 08/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 2d6d4dd..6d45671 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 6.12.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 6.12.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 6.12.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 527a416690ef0a079e48c3c75178f99e7bffe1a8 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Sat, 14 Jan 2012 13:18:21 -0600 Subject: [PATCH 09/50] Update to latest upstream release --- .gitignore | 1 + dc3dd.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a2b0bbf..3962ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ dc3dd-6.12.3.tar.gz +/dc3dd-7.1.614.tar.gz diff --git a/dc3dd.spec b/dc3dd.spec index 6d45671..7fbe491 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd -Version: 6.12.3 -Release: 5%{?dist} +Version: 7.1.614 +Release: 1%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -34,14 +34,15 @@ were rewritten for dc3dd. %prep %setup -q -for file in README Sample_Commands.txt Options_Reference.txt; -do - sed 's|\r||' $file > $file.tmp - touch -r $file $file.tmp - mv -f $file.tmp $file -done - -rm po/*.gmo +### Release dc3dd-7.1.614.tar.gz removed the need for this +# +#for file in README Sample_Commands.txt Options_Reference.txt; +#do +# sed 's|\r||' $file > $file.tmp +# touch -r $file $file.tmp +# mv -f $file.tmp $file +#done +#rm po/*.gmo %build %configure @@ -64,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sat Jan 14 2012 Adam Miller - 7.1.614-1 +- Update to upstream release + * Fri Jan 13 2012 Fedora Release Engineering - 6.12.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index a34bb33..f03e965 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b01dd06bbfea7cb49cf4a677715a1524 dc3dd-6.12.3.tar.gz +b6c4ec16e7f539b17224d7f334f8396e dc3dd-7.1.614.tar.gz From 6f0e8ec4bc271f48ffdbbe0b502db550e3d95355 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 15:24:15 -0500 Subject: [PATCH 10/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 7fbe491..75deb09 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 7.1.614-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Adam Miller - 7.1.614-1 - Update to upstream release From 12a990894ee7905e2c75ded69e7e7f7ec9b3b998 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 13:30:44 -0600 Subject: [PATCH 11/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 75deb09..e0ca6ba 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 7.1.614-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 7.1.614-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 12a8c477550f2fe62062ca72b3ed3bb171239601 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Sat, 27 Apr 2013 03:42:42 -0500 Subject: [PATCH 12/50] Fix BZ 925238 - rerun autoconf to add support for aarch64 --- dc3dd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index e0ca6ba..76c36a6 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -45,6 +45,7 @@ were rewritten for dc3dd. #rm po/*.gmo %build +autoreconf -vif #BZ925238 - support aarch64 %configure make %{?_smp_mflags} @@ -65,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sat Apr 27 2013 Adam Miller - 7.1.614-4 +- Fix BZ 925238 - rerun autoconf to add support for aarch64 + * Wed Feb 13 2013 Fedora Release Engineering - 7.1.614-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 267c4181ca1ebc500c5c5924819a7a050cb2d654 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Sat, 27 Apr 2013 04:02:21 -0500 Subject: [PATCH 13/50] might need autoconf to run it during build --- dc3dd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dc3dd.spec b/dc3dd.spec index 76c36a6..59c9b50 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext +BuildRequires: autoconf %description dc3dd is a patched version of GNU dd to include a number of features useful From 567b4e6f5f0c9ed5ca7f0d3a8b2b602a4d419def Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 29 Apr 2013 09:50:07 -0500 Subject: [PATCH 14/50] add gettext-devel since we run autoconf --- dc3dd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dc3dd.spec b/dc3dd.spec index 59c9b50..b8e5628 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: autoconf %description From 0e3fcebc0e59f45df7c14e58bc9197256feab308 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 29 Apr 2013 10:16:26 -0500 Subject: [PATCH 15/50] add automake since we run autoconf --- dc3dd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dc3dd.spec b/dc3dd.spec index b8e5628..bb464f2 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: autoconf +BuildRequires: automake %description dc3dd is a patched version of GNU dd to include a number of features useful From 7b13fd411980c4b7ef09e25f16a63a0cd9c542de Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 2 May 2013 17:39:24 -0500 Subject: [PATCH 16/50] added build deps --- dc3dd.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dc3dd.spec b/dc3dd.spec index bb464f2..7120620 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -11,8 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext BuildRequires: gettext-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: m4, readline-devel, autoconf, automake %description dc3dd is a patched version of GNU dd to include a number of features useful From 32dd7194efe74e01c591bda6f544ce3a4a44f1aa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 01:48:43 -0500 Subject: [PATCH 17/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 7120620..3577d33 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 7.1.614-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Apr 27 2013 Adam Miller - 7.1.614-4 - Fix BZ 925238 - rerun autoconf to add support for aarch64 From facc0d31188fc9dc0e2329c7714f5fcd4f7c894a Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Mon, 13 Jan 2014 17:50:32 +0100 Subject: [PATCH 18/50] Fixing build issues related to automake updates. --- dc3dd-automake.patch | 18 ++++++++++++++++++ dc3dd.spec | 10 +++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 dc3dd-automake.patch diff --git a/dc3dd-automake.patch b/dc3dd-automake.patch new file mode 100644 index 0000000..6082c47 --- /dev/null +++ b/dc3dd-automake.patch @@ -0,0 +1,18 @@ +diff -ru dc3dd-7.1.614/m4/jm-macros.m4 dc3dd-7.1.614.new/m4/jm-macros.m4 +--- dc3dd-7.1.614/m4/jm-macros.m4 2008-06-05 19:47:58.000000000 +0200 ++++ dc3dd-7.1.614.new/m4/jm-macros.m4 2013-12-22 01:15:24.044931510 +0100 +@@ -128,10 +128,10 @@ + dnl whether functions and headers are available, whether they work, etc. + AC_REQUIRE([AC_SYS_LARGEFILE]) + +- dnl This test must precede tests of compiler characteristics like +- dnl that for the inline keyword, since it may change the degree to +- dnl which the compiler supports such features. +- AC_REQUIRE([AM_C_PROTOTYPES]) ++# dnl This test must precede tests of compiler characteristics like ++# dnl that for the inline keyword, since it may change the degree to ++# dnl which the compiler supports such features. ++# AC_REQUIRE([AM_C_PROTOTYPES]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_REQUIRE([AC_C_BIGENDIAN]) diff --git a/dc3dd.spec b/dc3dd.spec index 3577d33..30b6954 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,12 +1,16 @@ Name: dc3dd Version: 7.1.614 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz + +#Fixing build error: automatic de-ANSI-fication support has been removed +#Removing the check for AM_C_PROTOTYPES +Patch0: dc3dd-automake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext @@ -35,6 +39,7 @@ were rewritten for dc3dd. %prep %setup -q +%patch0 -p 1 -b .automake ### Release dc3dd-7.1.614.tar.gz removed the need for this # @@ -68,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sun Dec 22 2013 Michal Ambroz - 7.1.614-6 +- Fix the build issue with new automake + * Sat Aug 03 2013 Fedora Release Engineering - 7.1.614-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8aec19f0926926d0f995eb65d256030be3075374 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 01:56:34 -0500 Subject: [PATCH 19/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 30b6954..901d53d 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 7.1.614-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Dec 22 2013 Michal Ambroz - 7.1.614-6 - Fix the build issue with new automake From bfde068e21e192750ec015e778ff1f4277229646 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 02:23:12 +0000 Subject: [PATCH 20/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 901d53d..a8670fe 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 7.1.614-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 7.1.614-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From ef07db7d35eb25e1ba8fff2c321a46e1f75ed0d8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 03:47:17 +0000 Subject: [PATCH 21/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index a8670fe..64ac0d8 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 7.1.614-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Aug 16 2014 Fedora Release Engineering - 7.1.614-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From e04568aa70049b94c7b92d9734b65e3ce3e983cd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:30:51 +0000 Subject: [PATCH 22/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 64ac0d8..84e9738 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.1.614 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 7.1.614-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 7.1.614-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 4f080622157204bb9547f528750bff56cac9f1d8 Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Thu, 6 Oct 2016 16:14:29 +0200 Subject: [PATCH 23/50] bump to 7.2.641 --- .gitignore | 3 ++- dc3dd.spec | 10 +++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3962ad1..a89d98e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -dc3dd-6.12.3.tar.gz +/dc3dd-6.12.3.tar.gz /dc3dd-7.1.614.tar.gz +/dc3dd-7.2.641.tar.xz diff --git a/dc3dd.spec b/dc3dd.spec index 84e9738..a230c75 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,12 +1,12 @@ Name: dc3dd -Version: 7.1.614 -Release: 10%{?dist} +Version: 7.2.641 +Release: 1%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://dc3dd.sourceforge.net/ -Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.xz #Fixing build error: automatic de-ANSI-fication support has been removed #Removing the check for AM_C_PROTOTYPES @@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext BuildRequires: gettext-devel +BuildRequires: xz BuildRequires: m4, readline-devel, autoconf, automake %description @@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sun Oct 02 2016 Michal Ambroz - 7.2.641-1 +- bump to 7.2.641 + * Wed Feb 03 2016 Fedora Release Engineering - 7.1.614-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index f03e965..2dce350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6c4ec16e7f539b17224d7f334f8396e dc3dd-7.1.614.tar.gz +63987a467310d7b8a5102cb33e1945f4 dc3dd-7.2.641.tar.xz From 709282954bb8ac20990b9e991ff66c6b177c9715 Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Thu, 6 Oct 2016 17:26:02 +0200 Subject: [PATCH 24/50] add BR for Locale::gettext --- dc3dd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dc3dd.spec b/dc3dd.spec index a230c75..bfd600b 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext BuildRequires: gettext-devel +BuildRequires: perl(Locale::gettext) BuildRequires: xz BuildRequires: m4, readline-devel, autoconf, automake @@ -76,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Oct 02 2016 Michal Ambroz - 7.2.641-1 - bump to 7.2.641 +- add BR for Locale::gettext * Wed Feb 03 2016 Fedora Release Engineering - 7.1.614-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 414eadd1c880f4aaf21ec7d18913fa41297b9d6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:13:03 +0000 Subject: [PATCH 25/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index bfd600b..7c4411a 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.641 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 7.2.641-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Oct 02 2016 Michal Ambroz - 7.2.641-1 - bump to 7.2.641 - add BR for Locale::gettext From 3f2a140e15e92f962888520716b5661026d1ed84 Mon Sep 17 00:00:00 2001 From: xambroz Date: Sat, 29 Apr 2017 04:19:20 +0200 Subject: [PATCH 26/50] bump to 7.2.646 --- .gitignore | 1 + dc3dd.spec | 25 +++++++++++-------------- sources | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index a89d98e..4ec50c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dc3dd-6.12.3.tar.gz /dc3dd-7.1.614.tar.gz /dc3dd-7.2.641.tar.xz +/dc3dd-7.2.646.7z diff --git a/dc3dd.spec b/dc3dd.spec index 7c4411a..059e3c7 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,12 +1,12 @@ Name: dc3dd -Version: 7.2.641 -Release: 2%{?dist} +Version: 7.2.646 +Release: 1%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors License: GPLv2+ and GPLv3+ -URL: http://dc3dd.sourceforge.net/ -Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.tar.xz +URL: http://sourceforge.net/projects/dc3dd/ +Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z #Fixing build error: automatic de-ANSI-fication support has been removed #Removing the check for AM_C_PROTOTYPES @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: perl(Locale::gettext) -BuildRequires: xz +BuildRequires: p7zip BuildRequires: m4, readline-devel, autoconf, automake %description @@ -43,15 +43,9 @@ were rewritten for dc3dd. %setup -q %patch0 -p 1 -b .automake -### Release dc3dd-7.1.614.tar.gz removed the need for this -# -#for file in README Sample_Commands.txt Options_Reference.txt; -#do -# sed 's|\r||' $file > $file.tmp -# touch -r $file $file.tmp -# mv -f $file.tmp $file -#done -#rm po/*.gmo +#Missing x flag in version 7.2.646 makes the build fail +chmod +x build-aux/git-version-gen configure + %build autoreconf -vif #BZ925238 - support aarch64 @@ -75,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sat Apr 29 2017 Michal Ambroz - 7.2.646-1 +- bump to 7.2.646 + * Fri Feb 10 2017 Fedora Release Engineering - 7.2.641-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 2dce350..15c5fee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63987a467310d7b8a5102cb33e1945f4 dc3dd-7.2.641.tar.xz +SHA512 (dc3dd-7.2.646.7z) = b27f33520b51aff352a3e8b10e126fb80459a18255f0cdd64c0c36762df7168e1df93c93e828ba06aec13e2f0ca30e5742b10b94f74fbee3733d13ed943dbc97 From cf629eb93ccf0eb3f868913142826a1ba4917e0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:00:48 +0000 Subject: [PATCH 27/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 059e3c7..1a7881e 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 7.2.646-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Apr 29 2017 Michal Ambroz - 7.2.646-1 - bump to 7.2.646 From 9db007385f938fb7211474bb661747071b1990da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:29:42 +0000 Subject: [PATCH 28/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 1a7881e..4322c32 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 7.2.646-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 7.2.646-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 742683514430d27ae60e6246f26a2b618daa6b2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 06:26:22 +0000 Subject: [PATCH 29/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 4322c32..fe2bbcb 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 7.2.646-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 7.2.646-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From b7fc081caa9c3d98e0c0b51d8117371f80d0cf20 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:12:31 +0100 Subject: [PATCH 30/50] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- dc3dd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index fe2bbcb..7b73354 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -11,7 +11,6 @@ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z #Fixing build error: automatic de-ANSI-fication support has been removed #Removing the check for AM_C_PROTOTYPES Patch0: dc3dd-automake.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gettext BuildRequires: gettext-devel From a5b6a5fa11b40430da3ff19f463336b5687bd65a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:57:24 +0100 Subject: [PATCH 31/50] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- dc3dd.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/dc3dd.spec b/dc3dd.spec index 7b73354..904c71a 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -57,9 +57,6 @@ make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) From ce9b92edd29515a27ef26d316aa7fd8bd93563a6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:43 +0200 Subject: [PATCH 32/50] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- dc3dd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dc3dd.spec b/dc3dd.spec index 904c71a..5079738 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -12,6 +12,7 @@ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z #Removing the check for AM_C_PROTOTYPES Patch0: dc3dd-automake.patch +BuildRequires: gcc BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: perl(Locale::gettext) From 77dc68ad9b8ce8c5573c6fd826d54834d243f415 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:36:44 -0500 Subject: [PATCH 33/50] Remove needless use of %defattr --- dc3dd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 5079738..f0a9a8a 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -60,7 +60,6 @@ make install DESTDIR=$RPM_BUILD_ROOT %files -f %{name}.lang -%defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.* From f658abacff80f7ddb56fba48de1aa42843cd5362 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:38:08 +0000 Subject: [PATCH 34/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index f0a9a8a..6a9ae49 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -65,6 +65,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 7.2.646-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 7.2.646-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9a8efbdf089a89e9fbc7e1f03035ff7ccc63393b Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Tue, 28 Aug 2018 16:07:18 +0000 Subject: [PATCH 35/50] update the embedded gnulib library files --- dc3dd.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dc3dd.spec b/dc3dd.spec index 6a9ae49..f2d9fdf 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Patched version of GNU dd for use in computer forensics Group: Applications/Editors @@ -15,6 +15,7 @@ Patch0: dc3dd-automake.patch BuildRequires: gcc BuildRequires: gettext BuildRequires: gettext-devel +BuildRequires: gnulib-devel BuildRequires: perl(Locale::gettext) BuildRequires: p7zip BuildRequires: m4, readline-devel, autoconf, automake @@ -40,8 +41,10 @@ were rewritten for dc3dd. %prep -%setup -q -%patch0 -p 1 -b .automake +%autosetup -S git + +# Update the embedded gnulib library files +gnulib-tool --update #Missing x flag in version 7.2.646 makes the build fail chmod +x build-aux/git-version-gen configure @@ -65,6 +68,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Tue Aug 28 2018 Michal Ambroz - 7.2.646-6 +- fix FTBS, update gnulib embedded library files + * Thu Jul 12 2018 Fedora Release Engineering - 7.2.646-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0e9ae4acb003a9cba09ac6ab06730f82ec8a3007 Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Tue, 28 Aug 2018 16:13:21 +0000 Subject: [PATCH 36/50] add git dependency --- dc3dd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dc3dd.spec b/dc3dd.spec index f2d9fdf..32df3d3 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -13,6 +13,7 @@ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z Patch0: dc3dd-automake.patch BuildRequires: gcc +BuildRequires: git BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: gnulib-devel From 1bf94dacf0692f860c7a29223f610e410373088f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:41 +0100 Subject: [PATCH 37/50] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- dc3dd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 32df3d3..351efe7 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -3,7 +3,6 @@ Version: 7.2.646 Release: 6%{?dist} Summary: Patched version of GNU dd for use in computer forensics -Group: Applications/Editors License: GPLv2+ and GPLv3+ URL: http://sourceforge.net/projects/dc3dd/ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z From fd9bba1e47faade2462de6ea8f7efc24aaaeb37c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:52:15 +0000 Subject: [PATCH 38/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 351efe7..e61b7e7 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Patched version of GNU dd for use in computer forensics License: GPLv2+ and GPLv3+ @@ -68,6 +68,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 7.2.646-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Aug 28 2018 Michal Ambroz - 7.2.646-6 - fix FTBS, update gnulib embedded library files From 399a8929382c4608858ea0e29a8d43ddc0712263 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:37:15 +0000 Subject: [PATCH 39/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index e61b7e7..0acaebb 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Patched version of GNU dd for use in computer forensics License: GPLv2+ and GPLv3+ @@ -68,6 +68,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 7.2.646-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 7.2.646-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 584d3e4a8db6752cc44564becddc87359a32c3a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 13:38:23 +0000 Subject: [PATCH 40/50] dc3dd fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674793 --- .gitignore | 4 -- dc3dd-automake.patch | 18 ----- dc3dd.spec | 155 ------------------------------------------- dead.package | 1 + sources | 1 - 5 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 .gitignore delete mode 100644 dc3dd-automake.patch delete mode 100644 dc3dd.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4ec50c7..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/dc3dd-6.12.3.tar.gz -/dc3dd-7.1.614.tar.gz -/dc3dd-7.2.641.tar.xz -/dc3dd-7.2.646.7z diff --git a/dc3dd-automake.patch b/dc3dd-automake.patch deleted file mode 100644 index 6082c47..0000000 --- a/dc3dd-automake.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru dc3dd-7.1.614/m4/jm-macros.m4 dc3dd-7.1.614.new/m4/jm-macros.m4 ---- dc3dd-7.1.614/m4/jm-macros.m4 2008-06-05 19:47:58.000000000 +0200 -+++ dc3dd-7.1.614.new/m4/jm-macros.m4 2013-12-22 01:15:24.044931510 +0100 -@@ -128,10 +128,10 @@ - dnl whether functions and headers are available, whether they work, etc. - AC_REQUIRE([AC_SYS_LARGEFILE]) - -- dnl This test must precede tests of compiler characteristics like -- dnl that for the inline keyword, since it may change the degree to -- dnl which the compiler supports such features. -- AC_REQUIRE([AM_C_PROTOTYPES]) -+# dnl This test must precede tests of compiler characteristics like -+# dnl that for the inline keyword, since it may change the degree to -+# dnl which the compiler supports such features. -+# AC_REQUIRE([AM_C_PROTOTYPES]) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_REQUIRE([AC_C_BIGENDIAN]) diff --git a/dc3dd.spec b/dc3dd.spec deleted file mode 100644 index 0acaebb..0000000 --- a/dc3dd.spec +++ /dev/null @@ -1,155 +0,0 @@ -Name: dc3dd -Version: 7.2.646 -Release: 8%{?dist} -Summary: Patched version of GNU dd for use in computer forensics - -License: GPLv2+ and GPLv3+ -URL: http://sourceforge.net/projects/dc3dd/ -Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z - -#Fixing build error: automatic de-ANSI-fication support has been removed -#Removing the check for AM_C_PROTOTYPES -Patch0: dc3dd-automake.patch - -BuildRequires: gcc -BuildRequires: git -BuildRequires: gettext -BuildRequires: gettext-devel -BuildRequires: gnulib-devel -BuildRequires: perl(Locale::gettext) -BuildRequires: p7zip -BuildRequires: m4, readline-devel, autoconf, automake - -%description -dc3dd is a patched version of GNU dd to include a number of features useful -for computer forensics. Many of these features were inspired by dcfldd, but -were rewritten for dc3dd. - - * Pattern writes. The program can write a single hexadecimal value or a - text string to the output device for wiping purposes. - * Piecewise and overall hashing with multiple algorithms and variable - size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be - computed before or after conversions are made. - * Progress meter with automatic input/output file size probing - * Combined log for hashes and errors - * Error grouping. Produces one error message for identical sequential - errors - * Verify mode. Able to repeat any transformations done to the input - file and compare it to an output. - * Ability to split the output into chunks with numerical or alphabetic - extensions - - -%prep -%autosetup -S git - -# Update the embedded gnulib library files -gnulib-tool --update - -#Missing x flag in version 7.2.646 makes the build fail -chmod +x build-aux/git-version-gen configure - - -%build -autoreconf -vif #BZ925238 - support aarch64 -%configure -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%find_lang %{name} - - -%files -f %{name}.lang -%doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.* - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 7.2.646-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 7.2.646-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Aug 28 2018 Michal Ambroz - 7.2.646-6 -- fix FTBS, update gnulib embedded library files - -* Thu Jul 12 2018 Fedora Release Engineering - 7.2.646-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 7.2.646-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 7.2.646-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 7.2.646-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Apr 29 2017 Michal Ambroz - 7.2.646-1 -- bump to 7.2.646 - -* Fri Feb 10 2017 Fedora Release Engineering - 7.2.641-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Oct 02 2016 Michal Ambroz - 7.2.641-1 -- bump to 7.2.641 -- add BR for Locale::gettext - -* Wed Feb 03 2016 Fedora Release Engineering - 7.1.614-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 7.1.614-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 7.1.614-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 7.1.614-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Dec 22 2013 Michal Ambroz - 7.1.614-6 -- Fix the build issue with new automake - -* Sat Aug 03 2013 Fedora Release Engineering - 7.1.614-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Apr 27 2013 Adam Miller - 7.1.614-4 -- Fix BZ 925238 - rerun autoconf to add support for aarch64 - -* Wed Feb 13 2013 Fedora Release Engineering - 7.1.614-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 7.1.614-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Adam Miller - 7.1.614-1 -- Update to upstream release - -* Fri Jan 13 2012 Fedora Release Engineering - 6.12.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 6.12.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Aug 10 2009 Adam Miller - 6.12.3-3 -- Fixed Source0 listing as reported https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html - -* Fri Jul 24 2009 Fedora Release Engineering - 6.12.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Mar 19 2009 Adam Miller - 6.12.3-1 -- New release of dc3dd - -* Thu Mar 05 2009 Adam Miller - 6.12.2-3 -- Cleaned up the .spec by looping through files needing EOF encoding fix - -* Mon Mar 02 2009 Adam Miller - 6.12.2-2 -- Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding -- fixed licencing listing - -* Mon Feb 23 2009 Adam Miller - 6.12.2-1 -- First build of dc3dd for fedora diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3a65f70 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +dc3dd fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674793 diff --git a/sources b/sources deleted file mode 100644 index 15c5fee..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (dc3dd-7.2.646.7z) = b27f33520b51aff352a3e8b10e126fb80459a18255f0cdd64c0c36762df7168e1df93c93e828ba06aec13e2f0ca30e5742b10b94f74fbee3733d13ed943dbc97 From 33db1cf833aab5c118ad9b31dc3bd95ff3f1c3dc Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 30 Oct 2019 11:51:21 +0100 Subject: [PATCH 41/50] Revert "dc3dd fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674793" This reverts commit 584d3e4a8db6752cc44564becddc87359a32c3a1. Unretirement request: https://pagure.io/releng/issue/8951 --- .gitignore | 4 ++ dc3dd-automake.patch | 18 +++++ dc3dd.spec | 155 +++++++++++++++++++++++++++++++++++++++++++ dead.package | 1 - sources | 1 + 5 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 dc3dd-automake.patch create mode 100644 dc3dd.spec delete mode 100644 dead.package create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ec50c7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/dc3dd-6.12.3.tar.gz +/dc3dd-7.1.614.tar.gz +/dc3dd-7.2.641.tar.xz +/dc3dd-7.2.646.7z diff --git a/dc3dd-automake.patch b/dc3dd-automake.patch new file mode 100644 index 0000000..6082c47 --- /dev/null +++ b/dc3dd-automake.patch @@ -0,0 +1,18 @@ +diff -ru dc3dd-7.1.614/m4/jm-macros.m4 dc3dd-7.1.614.new/m4/jm-macros.m4 +--- dc3dd-7.1.614/m4/jm-macros.m4 2008-06-05 19:47:58.000000000 +0200 ++++ dc3dd-7.1.614.new/m4/jm-macros.m4 2013-12-22 01:15:24.044931510 +0100 +@@ -128,10 +128,10 @@ + dnl whether functions and headers are available, whether they work, etc. + AC_REQUIRE([AC_SYS_LARGEFILE]) + +- dnl This test must precede tests of compiler characteristics like +- dnl that for the inline keyword, since it may change the degree to +- dnl which the compiler supports such features. +- AC_REQUIRE([AM_C_PROTOTYPES]) ++# dnl This test must precede tests of compiler characteristics like ++# dnl that for the inline keyword, since it may change the degree to ++# dnl which the compiler supports such features. ++# AC_REQUIRE([AM_C_PROTOTYPES]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_REQUIRE([AC_C_BIGENDIAN]) diff --git a/dc3dd.spec b/dc3dd.spec new file mode 100644 index 0000000..0acaebb --- /dev/null +++ b/dc3dd.spec @@ -0,0 +1,155 @@ +Name: dc3dd +Version: 7.2.646 +Release: 8%{?dist} +Summary: Patched version of GNU dd for use in computer forensics + +License: GPLv2+ and GPLv3+ +URL: http://sourceforge.net/projects/dc3dd/ +Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z + +#Fixing build error: automatic de-ANSI-fication support has been removed +#Removing the check for AM_C_PROTOTYPES +Patch0: dc3dd-automake.patch + +BuildRequires: gcc +BuildRequires: git +BuildRequires: gettext +BuildRequires: gettext-devel +BuildRequires: gnulib-devel +BuildRequires: perl(Locale::gettext) +BuildRequires: p7zip +BuildRequires: m4, readline-devel, autoconf, automake + +%description +dc3dd is a patched version of GNU dd to include a number of features useful +for computer forensics. Many of these features were inspired by dcfldd, but +were rewritten for dc3dd. + + * Pattern writes. The program can write a single hexadecimal value or a + text string to the output device for wiping purposes. + * Piecewise and overall hashing with multiple algorithms and variable + size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be + computed before or after conversions are made. + * Progress meter with automatic input/output file size probing + * Combined log for hashes and errors + * Error grouping. Produces one error message for identical sequential + errors + * Verify mode. Able to repeat any transformations done to the input + file and compare it to an output. + * Ability to split the output into chunks with numerical or alphabetic + extensions + + +%prep +%autosetup -S git + +# Update the embedded gnulib library files +gnulib-tool --update + +#Missing x flag in version 7.2.646 makes the build fail +chmod +x build-aux/git-version-gen configure + + +%build +autoreconf -vif #BZ925238 - support aarch64 +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%find_lang %{name} + + +%files -f %{name}.lang +%doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.* + +%changelog +* Wed Jul 24 2019 Fedora Release Engineering - 7.2.646-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 7.2.646-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 28 2018 Michal Ambroz - 7.2.646-6 +- fix FTBS, update gnulib embedded library files + +* Thu Jul 12 2018 Fedora Release Engineering - 7.2.646-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 7.2.646-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 7.2.646-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 7.2.646-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Apr 29 2017 Michal Ambroz - 7.2.646-1 +- bump to 7.2.646 + +* Fri Feb 10 2017 Fedora Release Engineering - 7.2.641-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Oct 02 2016 Michal Ambroz - 7.2.641-1 +- bump to 7.2.641 +- add BR for Locale::gettext + +* Wed Feb 03 2016 Fedora Release Engineering - 7.1.614-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 7.1.614-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 7.1.614-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 7.1.614-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Dec 22 2013 Michal Ambroz - 7.1.614-6 +- Fix the build issue with new automake + +* Sat Aug 03 2013 Fedora Release Engineering - 7.1.614-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Apr 27 2013 Adam Miller - 7.1.614-4 +- Fix BZ 925238 - rerun autoconf to add support for aarch64 + +* Wed Feb 13 2013 Fedora Release Engineering - 7.1.614-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 7.1.614-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Adam Miller - 7.1.614-1 +- Update to upstream release + +* Fri Jan 13 2012 Fedora Release Engineering - 6.12.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 6.12.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Aug 10 2009 Adam Miller - 6.12.3-3 +- Fixed Source0 listing as reported https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html + +* Fri Jul 24 2009 Fedora Release Engineering - 6.12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Mar 19 2009 Adam Miller - 6.12.3-1 +- New release of dc3dd + +* Thu Mar 05 2009 Adam Miller - 6.12.2-3 +- Cleaned up the .spec by looping through files needing EOF encoding fix + +* Mon Mar 02 2009 Adam Miller - 6.12.2-2 +- Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding +- fixed licencing listing + +* Mon Feb 23 2009 Adam Miller - 6.12.2-1 +- First build of dc3dd for fedora diff --git a/dead.package b/dead.package deleted file mode 100644 index 3a65f70..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -dc3dd fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674793 diff --git a/sources b/sources new file mode 100644 index 0000000..15c5fee --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (dc3dd-7.2.646.7z) = b27f33520b51aff352a3e8b10e126fb80459a18255f0cdd64c0c36762df7168e1df93c93e828ba06aec13e2f0ca30e5742b10b94f74fbee3733d13ed943dbc97 From f47b88445597b0fb9ede8791d0f9f322877ccfbd Mon Sep 17 00:00:00 2001 From: rpmbuild Date: Thu, 31 Oct 2019 05:21:14 +0000 Subject: [PATCH 42/50] unretire the package in rawhide --- ...-automake.patch => dc3dd-01_automake.patch | 0 dc3dd-02_fix-FTBFS-with-glibc-2.28.patch | 100 ++++++++++++++++++ dc3dd.spec | 46 ++++---- 3 files changed, 128 insertions(+), 18 deletions(-) rename dc3dd-automake.patch => dc3dd-01_automake.patch (100%) create mode 100644 dc3dd-02_fix-FTBFS-with-glibc-2.28.patch diff --git a/dc3dd-automake.patch b/dc3dd-01_automake.patch similarity index 100% rename from dc3dd-automake.patch rename to dc3dd-01_automake.patch diff --git a/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch b/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch new file mode 100644 index 0000000..95eb1d5 --- /dev/null +++ b/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch @@ -0,0 +1,100 @@ +Description: fix a FTBFS with glibc 2.28 +Author: mschlenker +Origin: https://aur.archlinux.org/packages/dc3dd/ +Bug-Debian: https://bugs.debian.org/915431 +Forwarded: https://sourceforge.net/p/dc3dd/bugs/19/ +Reviewed-By: Joao Eriberto Mota Filho +Last-Update: 2018-10-17 +--- dc3dd-7.2.646.orig/lib/fpurge.c ++++ dc3dd-7.2.646/lib/fpurge.c +@@ -61,7 +61,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +--- dc3dd-7.2.646.orig/lib/freadahead.c ++++ dc3dd-7.2.646/lib/freadahead.c +@@ -24,7 +24,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +--- dc3dd-7.2.646.orig/lib/freading.c ++++ dc3dd-7.2.646/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +--- dc3dd-7.2.646.orig/lib/freadptr.c ++++ dc3dd-7.2.646/lib/freadptr.c +@@ -29,7 +29,7 @@ freadptr (FILE *fp, size_t *sizep) + size_t size; + + /* Keep this code in sync with freadahead! */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return NULL; + size = fp->_IO_read_end - fp->_IO_read_ptr; +--- dc3dd-7.2.646.orig/lib/freadseek.c ++++ dc3dd-7.2.646/lib/freadseek.c +@@ -34,7 +34,7 @@ static inline void + freadptrinc (FILE *fp, size_t increment) + { + /* Keep this code in sync with freadptr! */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_IO_read_ptr += increment; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_p += increment; +--- dc3dd-7.2.646.orig/lib/fseeko.c ++++ dc3dd-7.2.646/lib/fseeko.c +@@ -44,7 +44,7 @@ rpl_fseeko (FILE *fp, off_t offset, int + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +--- dc3dd-7.2.646.orig/lib/fseterr.c ++++ dc3dd-7.2.646/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_flags |= __SERR; +--- dc3dd-7.2.646.orig/lib/stdio-impl.h ++++ dc3dd-7.2.646/lib/stdio-impl.h +@@ -18,6 +18,13 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/dc3dd.spec b/dc3dd.spec index 0acaebb..dc5aca8 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,15 +1,20 @@ Name: dc3dd Version: 7.2.646 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Patched version of GNU dd for use in computer forensics -License: GPLv2+ and GPLv3+ +License: GPLv3+ URL: http://sourceforge.net/projects/dc3dd/ Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z #Fixing build error: automatic de-ANSI-fication support has been removed #Removing the check for AM_C_PROTOTYPES -Patch0: dc3dd-automake.patch +Patch1: dc3dd-01_automake.patch + +# Original Archlinux patch to fix build with recent libtools version +# Author: mschlenker +Patch2: dc3dd-02_fix-FTBFS-with-glibc-2.28.patch + BuildRequires: gcc BuildRequires: git @@ -25,34 +30,35 @@ dc3dd is a patched version of GNU dd to include a number of features useful for computer forensics. Many of these features were inspired by dcfldd, but were rewritten for dc3dd. - * Pattern writes. The program can write a single hexadecimal value or a +* Pattern writes. The program can write a single hexadecimal value or a text string to the output device for wiping purposes. - * Piecewise and overall hashing with multiple algorithms and variable +* Piecewise and overall hashing with multiple algorithms and variable size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be computed before or after conversions are made. - * Progress meter with automatic input/output file size probing - * Combined log for hashes and errors - * Error grouping. Produces one error message for identical sequential +* Progress meter with automatic input/output file size probing +* Combined log for hashes and errors +* Error grouping. Produces one error message for identical sequential errors - * Verify mode. Able to repeat any transformations done to the input +* Verify mode. Able to repeat any transformations done to the input file and compare it to an output. - * Ability to split the output into chunks with numerical or alphabetic +* Ability to split the output into chunks with numerical or alphabetic extensions %prep %autosetup -S git -# Update the embedded gnulib library files -gnulib-tool --update - #Missing x flag in version 7.2.646 makes the build fail chmod +x build-aux/git-version-gen configure +# ChangeLog having wrong ends of lines +sed -i -e 's|\r||g' ChangeLog + %build autoreconf -vif #BZ925238 - support aarch64 -%configure +# TODO check the --enable-hdparm option +%configure make %{?_smp_mflags} %install @@ -63,19 +69,23 @@ make install DESTDIR=$RPM_BUILD_ROOT %files -f %{name}.lang -%doc ABOUT-NLS AUTHORS COPYING ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt +%license COPYING +%doc ABOUT-NLS AUTHORS ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %changelog -* Wed Jul 24 2019 Fedora Release Engineering - 7.2.646-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Mon Oct 28 2019 Michal Ambroz - 7.2.646-9 +- License change to GPLv3+ (the lib/getdate.c is no longer gplv2+) + +* Sun Oct 20 2019 Michal Ambroz - 7.2.646-8 +- use Archlinux patch to fix FTBFS, do not update gnulib embedded library files * Thu Jan 31 2019 Fedora Release Engineering - 7.2.646-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Tue Aug 28 2018 Michal Ambroz - 7.2.646-6 -- fix FTBS, update gnulib embedded library files +- fix FTBFS, update gnulib embedded library files * Thu Jul 12 2018 Fedora Release Engineering - 7.2.646-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 23c0bbc681bbde5a292f2f5d14c98b9a012bde2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:26:33 +0000 Subject: [PATCH 43/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index dc5aca8..93d7c53 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Patched version of GNU dd for use in computer forensics License: GPLv3+ @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 7.2.646-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Oct 28 2019 Michal Ambroz - 7.2.646-9 - License change to GPLv3+ (the lib/getdate.c is no longer gplv2+) From 7fed5266024c2a56ee8ffd87f4aa2799f26e5c62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 15:04:57 +0000 Subject: [PATCH 44/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dc3dd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 93d7c53..339f925 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Patched version of GNU dd for use in computer forensics License: GPLv3+ @@ -75,6 +75,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 7.2.646-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 7.2.646-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d66927c7f60c7828fd21aacacddd649fe8a2a263 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:33:47 +0000 Subject: [PATCH 45/50] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dc3dd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dc3dd.spec b/dc3dd.spec index 339f925..a60d2f3 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Patched version of GNU dd for use in computer forensics License: GPLv3+ @@ -75,6 +75,10 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 7.2.646-12 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 7.2.646-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 47a6859fbfcd36c131b6e2d8d4a4fa571bdbd3c4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 04:18:04 +0000 Subject: [PATCH 46/50] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- dc3dd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dc3dd.spec b/dc3dd.spec index a60d2f3..c807251 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -24,6 +24,7 @@ BuildRequires: gnulib-devel BuildRequires: perl(Locale::gettext) BuildRequires: p7zip BuildRequires: m4, readline-devel, autoconf, automake +BuildRequires: make %description dc3dd is a patched version of GNU dd to include a number of features useful From 38fe17f7e7324bd39cb71d3d7981f9260e06b0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 4 Jan 2021 10:23:47 +0100 Subject: [PATCH 47/50] Orphaned for 6+ weeks --- .gitignore | 4 - dc3dd-01_automake.patch | 18 --- dc3dd-02_fix-FTBFS-with-glibc-2.28.patch | 100 ------------- dc3dd.spec | 176 ----------------------- dead.package | 1 + sources | 1 - 6 files changed, 1 insertion(+), 299 deletions(-) delete mode 100644 .gitignore delete mode 100644 dc3dd-01_automake.patch delete mode 100644 dc3dd-02_fix-FTBFS-with-glibc-2.28.patch delete mode 100644 dc3dd.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4ec50c7..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/dc3dd-6.12.3.tar.gz -/dc3dd-7.1.614.tar.gz -/dc3dd-7.2.641.tar.xz -/dc3dd-7.2.646.7z diff --git a/dc3dd-01_automake.patch b/dc3dd-01_automake.patch deleted file mode 100644 index 6082c47..0000000 --- a/dc3dd-01_automake.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru dc3dd-7.1.614/m4/jm-macros.m4 dc3dd-7.1.614.new/m4/jm-macros.m4 ---- dc3dd-7.1.614/m4/jm-macros.m4 2008-06-05 19:47:58.000000000 +0200 -+++ dc3dd-7.1.614.new/m4/jm-macros.m4 2013-12-22 01:15:24.044931510 +0100 -@@ -128,10 +128,10 @@ - dnl whether functions and headers are available, whether they work, etc. - AC_REQUIRE([AC_SYS_LARGEFILE]) - -- dnl This test must precede tests of compiler characteristics like -- dnl that for the inline keyword, since it may change the degree to -- dnl which the compiler supports such features. -- AC_REQUIRE([AM_C_PROTOTYPES]) -+# dnl This test must precede tests of compiler characteristics like -+# dnl that for the inline keyword, since it may change the degree to -+# dnl which the compiler supports such features. -+# AC_REQUIRE([AM_C_PROTOTYPES]) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_REQUIRE([AC_C_BIGENDIAN]) diff --git a/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch b/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch deleted file mode 100644 index 95eb1d5..0000000 --- a/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch +++ /dev/null @@ -1,100 +0,0 @@ -Description: fix a FTBFS with glibc 2.28 -Author: mschlenker -Origin: https://aur.archlinux.org/packages/dc3dd/ -Bug-Debian: https://bugs.debian.org/915431 -Forwarded: https://sourceforge.net/p/dc3dd/bugs/19/ -Reviewed-By: Joao Eriberto Mota Filho -Last-Update: 2018-10-17 ---- dc3dd-7.2.646.orig/lib/fpurge.c -+++ dc3dd-7.2.646/lib/fpurge.c -@@ -61,7 +61,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ ---- dc3dd-7.2.646.orig/lib/freadahead.c -+++ dc3dd-7.2.646/lib/freadahead.c -@@ -24,7 +24,7 @@ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) ---- dc3dd-7.2.646.orig/lib/freading.c -+++ dc3dd-7.2.646/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); ---- dc3dd-7.2.646.orig/lib/freadptr.c -+++ dc3dd-7.2.646/lib/freadptr.c -@@ -29,7 +29,7 @@ freadptr (FILE *fp, size_t *sizep) - size_t size; - - /* Keep this code in sync with freadahead! */ --#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return NULL; - size = fp->_IO_read_end - fp->_IO_read_ptr; ---- dc3dd-7.2.646.orig/lib/freadseek.c -+++ dc3dd-7.2.646/lib/freadseek.c -@@ -34,7 +34,7 @@ static inline void - freadptrinc (FILE *fp, size_t increment) - { - /* Keep this code in sync with freadptr! */ --#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ - fp->_IO_read_ptr += increment; - #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ - fp_->_p += increment; ---- dc3dd-7.2.646.orig/lib/fseeko.c -+++ dc3dd-7.2.646/lib/fseeko.c -@@ -44,7 +44,7 @@ rpl_fseeko (FILE *fp, off_t offset, int - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) ---- dc3dd-7.2.646.orig/lib/fseterr.c -+++ dc3dd-7.2.646/lib/fseterr.c -@@ -29,7 +29,7 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ - fp_->_flags |= __SERR; ---- dc3dd-7.2.646.orig/lib/stdio-impl.h -+++ dc3dd-7.2.646/lib/stdio-impl.h -@@ -18,6 +18,13 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - diff --git a/dc3dd.spec b/dc3dd.spec deleted file mode 100644 index c807251..0000000 --- a/dc3dd.spec +++ /dev/null @@ -1,176 +0,0 @@ -Name: dc3dd -Version: 7.2.646 -Release: 12%{?dist} -Summary: Patched version of GNU dd for use in computer forensics - -License: GPLv3+ -URL: http://sourceforge.net/projects/dc3dd/ -Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z - -#Fixing build error: automatic de-ANSI-fication support has been removed -#Removing the check for AM_C_PROTOTYPES -Patch1: dc3dd-01_automake.patch - -# Original Archlinux patch to fix build with recent libtools version -# Author: mschlenker -Patch2: dc3dd-02_fix-FTBFS-with-glibc-2.28.patch - - -BuildRequires: gcc -BuildRequires: git -BuildRequires: gettext -BuildRequires: gettext-devel -BuildRequires: gnulib-devel -BuildRequires: perl(Locale::gettext) -BuildRequires: p7zip -BuildRequires: m4, readline-devel, autoconf, automake -BuildRequires: make - -%description -dc3dd is a patched version of GNU dd to include a number of features useful -for computer forensics. Many of these features were inspired by dcfldd, but -were rewritten for dc3dd. - -* Pattern writes. The program can write a single hexadecimal value or a - text string to the output device for wiping purposes. -* Piecewise and overall hashing with multiple algorithms and variable - size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be - computed before or after conversions are made. -* Progress meter with automatic input/output file size probing -* Combined log for hashes and errors -* Error grouping. Produces one error message for identical sequential - errors -* Verify mode. Able to repeat any transformations done to the input - file and compare it to an output. -* Ability to split the output into chunks with numerical or alphabetic - extensions - - -%prep -%autosetup -S git - -#Missing x flag in version 7.2.646 makes the build fail -chmod +x build-aux/git-version-gen configure - -# ChangeLog having wrong ends of lines -sed -i -e 's|\r||g' ChangeLog - - -%build -autoreconf -vif #BZ925238 - support aarch64 -# TODO check the --enable-hdparm option -%configure -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%find_lang %{name} - - -%files -f %{name}.lang -%license COPYING -%doc ABOUT-NLS AUTHORS ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.* - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering - 7.2.646-12 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 7.2.646-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 7.2.646-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Oct 28 2019 Michal Ambroz - 7.2.646-9 -- License change to GPLv3+ (the lib/getdate.c is no longer gplv2+) - -* Sun Oct 20 2019 Michal Ambroz - 7.2.646-8 -- use Archlinux patch to fix FTBFS, do not update gnulib embedded library files - -* Thu Jan 31 2019 Fedora Release Engineering - 7.2.646-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Aug 28 2018 Michal Ambroz - 7.2.646-6 -- fix FTBFS, update gnulib embedded library files - -* Thu Jul 12 2018 Fedora Release Engineering - 7.2.646-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 7.2.646-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 7.2.646-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 7.2.646-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Apr 29 2017 Michal Ambroz - 7.2.646-1 -- bump to 7.2.646 - -* Fri Feb 10 2017 Fedora Release Engineering - 7.2.641-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Oct 02 2016 Michal Ambroz - 7.2.641-1 -- bump to 7.2.641 -- add BR for Locale::gettext - -* Wed Feb 03 2016 Fedora Release Engineering - 7.1.614-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 7.1.614-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 7.1.614-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 7.1.614-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Dec 22 2013 Michal Ambroz - 7.1.614-6 -- Fix the build issue with new automake - -* Sat Aug 03 2013 Fedora Release Engineering - 7.1.614-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Apr 27 2013 Adam Miller - 7.1.614-4 -- Fix BZ 925238 - rerun autoconf to add support for aarch64 - -* Wed Feb 13 2013 Fedora Release Engineering - 7.1.614-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 7.1.614-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Adam Miller - 7.1.614-1 -- Update to upstream release - -* Fri Jan 13 2012 Fedora Release Engineering - 6.12.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 6.12.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Aug 10 2009 Adam Miller - 6.12.3-3 -- Fixed Source0 listing as reported https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html - -* Fri Jul 24 2009 Fedora Release Engineering - 6.12.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Mar 19 2009 Adam Miller - 6.12.3-1 -- New release of dc3dd - -* Thu Mar 05 2009 Adam Miller - 6.12.2-3 -- Cleaned up the .spec by looping through files needing EOF encoding fix - -* Mon Mar 02 2009 Adam Miller - 6.12.2-2 -- Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding -- fixed licencing listing - -* Mon Feb 23 2009 Adam Miller - 6.12.2-1 -- First build of dc3dd for fedora diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 15c5fee..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (dc3dd-7.2.646.7z) = b27f33520b51aff352a3e8b10e126fb80459a18255f0cdd64c0c36762df7168e1df93c93e828ba06aec13e2f0ca30e5742b10b94f74fbee3733d13ed943dbc97 From 3627dba152caca049443fc7055792b4e57c000da Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 17 Feb 2021 16:17:24 +0100 Subject: [PATCH 48/50] Revert "Orphaned for 6+ weeks" This reverts commit 38fe17f7e7324bd39cb71d3d7981f9260e06b0df. Unretirement request: https://pagure.io/releng/issue/10022 Signed-off-by: Tomas Hrcka --- .gitignore | 4 + dc3dd-01_automake.patch | 18 +++ dc3dd-02_fix-FTBFS-with-glibc-2.28.patch | 100 +++++++++++++ dc3dd.spec | 176 +++++++++++++++++++++++ dead.package | 1 - sources | 1 + 6 files changed, 299 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 dc3dd-01_automake.patch create mode 100644 dc3dd-02_fix-FTBFS-with-glibc-2.28.patch create mode 100644 dc3dd.spec delete mode 100644 dead.package create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ec50c7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/dc3dd-6.12.3.tar.gz +/dc3dd-7.1.614.tar.gz +/dc3dd-7.2.641.tar.xz +/dc3dd-7.2.646.7z diff --git a/dc3dd-01_automake.patch b/dc3dd-01_automake.patch new file mode 100644 index 0000000..6082c47 --- /dev/null +++ b/dc3dd-01_automake.patch @@ -0,0 +1,18 @@ +diff -ru dc3dd-7.1.614/m4/jm-macros.m4 dc3dd-7.1.614.new/m4/jm-macros.m4 +--- dc3dd-7.1.614/m4/jm-macros.m4 2008-06-05 19:47:58.000000000 +0200 ++++ dc3dd-7.1.614.new/m4/jm-macros.m4 2013-12-22 01:15:24.044931510 +0100 +@@ -128,10 +128,10 @@ + dnl whether functions and headers are available, whether they work, etc. + AC_REQUIRE([AC_SYS_LARGEFILE]) + +- dnl This test must precede tests of compiler characteristics like +- dnl that for the inline keyword, since it may change the degree to +- dnl which the compiler supports such features. +- AC_REQUIRE([AM_C_PROTOTYPES]) ++# dnl This test must precede tests of compiler characteristics like ++# dnl that for the inline keyword, since it may change the degree to ++# dnl which the compiler supports such features. ++# AC_REQUIRE([AM_C_PROTOTYPES]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_REQUIRE([AC_C_BIGENDIAN]) diff --git a/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch b/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch new file mode 100644 index 0000000..95eb1d5 --- /dev/null +++ b/dc3dd-02_fix-FTBFS-with-glibc-2.28.patch @@ -0,0 +1,100 @@ +Description: fix a FTBFS with glibc 2.28 +Author: mschlenker +Origin: https://aur.archlinux.org/packages/dc3dd/ +Bug-Debian: https://bugs.debian.org/915431 +Forwarded: https://sourceforge.net/p/dc3dd/bugs/19/ +Reviewed-By: Joao Eriberto Mota Filho +Last-Update: 2018-10-17 +--- dc3dd-7.2.646.orig/lib/fpurge.c ++++ dc3dd-7.2.646/lib/fpurge.c +@@ -61,7 +61,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +--- dc3dd-7.2.646.orig/lib/freadahead.c ++++ dc3dd-7.2.646/lib/freadahead.c +@@ -24,7 +24,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +--- dc3dd-7.2.646.orig/lib/freading.c ++++ dc3dd-7.2.646/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +--- dc3dd-7.2.646.orig/lib/freadptr.c ++++ dc3dd-7.2.646/lib/freadptr.c +@@ -29,7 +29,7 @@ freadptr (FILE *fp, size_t *sizep) + size_t size; + + /* Keep this code in sync with freadahead! */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return NULL; + size = fp->_IO_read_end - fp->_IO_read_ptr; +--- dc3dd-7.2.646.orig/lib/freadseek.c ++++ dc3dd-7.2.646/lib/freadseek.c +@@ -34,7 +34,7 @@ static inline void + freadptrinc (FILE *fp, size_t increment) + { + /* Keep this code in sync with freadptr! */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_IO_read_ptr += increment; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_p += increment; +--- dc3dd-7.2.646.orig/lib/fseeko.c ++++ dc3dd-7.2.646/lib/fseeko.c +@@ -44,7 +44,7 @@ rpl_fseeko (FILE *fp, off_t offset, int + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +--- dc3dd-7.2.646.orig/lib/fseterr.c ++++ dc3dd-7.2.646/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_flags |= __SERR; +--- dc3dd-7.2.646.orig/lib/stdio-impl.h ++++ dc3dd-7.2.646/lib/stdio-impl.h +@@ -18,6 +18,13 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/dc3dd.spec b/dc3dd.spec new file mode 100644 index 0000000..c807251 --- /dev/null +++ b/dc3dd.spec @@ -0,0 +1,176 @@ +Name: dc3dd +Version: 7.2.646 +Release: 12%{?dist} +Summary: Patched version of GNU dd for use in computer forensics + +License: GPLv3+ +URL: http://sourceforge.net/projects/dc3dd/ +Source0: http://downloads.sourceforge.net/dc3dd/%{name}-%{version}.7z + +#Fixing build error: automatic de-ANSI-fication support has been removed +#Removing the check for AM_C_PROTOTYPES +Patch1: dc3dd-01_automake.patch + +# Original Archlinux patch to fix build with recent libtools version +# Author: mschlenker +Patch2: dc3dd-02_fix-FTBFS-with-glibc-2.28.patch + + +BuildRequires: gcc +BuildRequires: git +BuildRequires: gettext +BuildRequires: gettext-devel +BuildRequires: gnulib-devel +BuildRequires: perl(Locale::gettext) +BuildRequires: p7zip +BuildRequires: m4, readline-devel, autoconf, automake +BuildRequires: make + +%description +dc3dd is a patched version of GNU dd to include a number of features useful +for computer forensics. Many of these features were inspired by dcfldd, but +were rewritten for dc3dd. + +* Pattern writes. The program can write a single hexadecimal value or a + text string to the output device for wiping purposes. +* Piecewise and overall hashing with multiple algorithms and variable + size windows. Supports MD5, SHA-1, SHA-256, and SHA-512. Hashes can be + computed before or after conversions are made. +* Progress meter with automatic input/output file size probing +* Combined log for hashes and errors +* Error grouping. Produces one error message for identical sequential + errors +* Verify mode. Able to repeat any transformations done to the input + file and compare it to an output. +* Ability to split the output into chunks with numerical or alphabetic + extensions + + +%prep +%autosetup -S git + +#Missing x flag in version 7.2.646 makes the build fail +chmod +x build-aux/git-version-gen configure + +# ChangeLog having wrong ends of lines +sed -i -e 's|\r||g' ChangeLog + + +%build +autoreconf -vif #BZ925238 - support aarch64 +# TODO check the --enable-hdparm option +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%find_lang %{name} + + +%files -f %{name}.lang +%license COPYING +%doc ABOUT-NLS AUTHORS ChangeLog README README.coreutils THANKS THANKS-to-translators TODO Sample_Commands.txt NEWS Options_Reference.txt +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.* + +%changelog +* Sat Aug 01 2020 Fedora Release Engineering - 7.2.646-12 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 7.2.646-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 7.2.646-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Oct 28 2019 Michal Ambroz - 7.2.646-9 +- License change to GPLv3+ (the lib/getdate.c is no longer gplv2+) + +* Sun Oct 20 2019 Michal Ambroz - 7.2.646-8 +- use Archlinux patch to fix FTBFS, do not update gnulib embedded library files + +* Thu Jan 31 2019 Fedora Release Engineering - 7.2.646-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 28 2018 Michal Ambroz - 7.2.646-6 +- fix FTBFS, update gnulib embedded library files + +* Thu Jul 12 2018 Fedora Release Engineering - 7.2.646-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 7.2.646-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 7.2.646-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 7.2.646-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Apr 29 2017 Michal Ambroz - 7.2.646-1 +- bump to 7.2.646 + +* Fri Feb 10 2017 Fedora Release Engineering - 7.2.641-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Oct 02 2016 Michal Ambroz - 7.2.641-1 +- bump to 7.2.641 +- add BR for Locale::gettext + +* Wed Feb 03 2016 Fedora Release Engineering - 7.1.614-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 7.1.614-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 7.1.614-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 7.1.614-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Dec 22 2013 Michal Ambroz - 7.1.614-6 +- Fix the build issue with new automake + +* Sat Aug 03 2013 Fedora Release Engineering - 7.1.614-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Apr 27 2013 Adam Miller - 7.1.614-4 +- Fix BZ 925238 - rerun autoconf to add support for aarch64 + +* Wed Feb 13 2013 Fedora Release Engineering - 7.1.614-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 7.1.614-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Adam Miller - 7.1.614-1 +- Update to upstream release + +* Fri Jan 13 2012 Fedora Release Engineering - 6.12.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 6.12.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Aug 10 2009 Adam Miller - 6.12.3-3 +- Fixed Source0 listing as reported https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00591.html + +* Fri Jul 24 2009 Fedora Release Engineering - 6.12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Mar 19 2009 Adam Miller - 6.12.3-1 +- New release of dc3dd + +* Thu Mar 05 2009 Adam Miller - 6.12.2-3 +- Cleaned up the .spec by looping through files needing EOF encoding fix + +* Mon Mar 02 2009 Adam Miller - 6.12.2-2 +- Removed .gmo binaries, fixed source0, added doc items, fixed EOF encoding +- fixed licencing listing + +* Mon Feb 23 2009 Adam Miller - 6.12.2-1 +- First build of dc3dd for fedora diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..15c5fee --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (dc3dd-7.2.646.7z) = b27f33520b51aff352a3e8b10e126fb80459a18255f0cdd64c0c36762df7168e1df93c93e828ba06aec13e2f0ca30e5742b10b94f74fbee3733d13ed943dbc97 From 4015f037eb7c88363a79ebf51d900db62c457d59 Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Thu, 18 Feb 2021 23:41:19 +0000 Subject: [PATCH 49/50] add dependency to perl(I18N::Langinfo) to fix the FTBFS --- dc3dd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dc3dd.spec b/dc3dd.spec index c807251..2520fdf 100644 --- a/dc3dd.spec +++ b/dc3dd.spec @@ -1,6 +1,6 @@ Name: dc3dd Version: 7.2.646 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Patched version of GNU dd for use in computer forensics License: GPLv3+ @@ -22,9 +22,10 @@ BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: gnulib-devel BuildRequires: perl(Locale::gettext) +BuildRequires: perl(I18N::Langinfo) BuildRequires: p7zip BuildRequires: m4, readline-devel, autoconf, automake -BuildRequires: make +BuildRequires: make %description dc3dd is a patched version of GNU dd to include a number of features useful @@ -76,6 +77,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/%{name}.* %changelog +* Fri Feb 19 2021 Michal Ambroz - 7.2.646-13 +- add dependency to perl(I18N::Langinfo) to fix FTBFS + * Sat Aug 01 2020 Fedora Release Engineering - 7.2.646-12 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 10d29cbf1ca465c4f3b67ae8a466d152bab0ae69 Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Tue, 23 Mar 2021 22:07:01 +0100 Subject: [PATCH 50/50] adding the Makefile as proposed by releng --- Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..6fe63d9 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: dc3dd +# $Id$ +NAME := dc3dd +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON)