Hello community, here is the log from the commit of package dc3dd for openSUSE:Factory checked in at 2019-08-13 13:21:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dc3dd (Old) and /work/SRC/openSUSE:Factory/.dc3dd.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dc3dd" Tue Aug 13 13:21:23 2019 rev:9 rq:722408 version:7.2.646 Changes: -------- --- /work/SRC/openSUSE:Factory/dc3dd/dc3dd.changes 2017-01-18 21:56:29.307978930 +0100 +++ /work/SRC/openSUSE:Factory/.dc3dd.new.9556/dc3dd.changes 2019-08-13 13:22:22.309400900 +0200 @@ -1,0 +2,12 @@ +Fri Aug 9 06:32:43 UTC 2019 - [email protected] + +- Update to version 7.2.646: + * No code change, only bump version. +- Use .7z tarball: + * The only alternative tarball provided by upstream for this + version is a zip but its decompression returns exit code 1. + * Pull p7zip(-full) as build dependency. +- Add dc3dd-7.2.646-fix-FTBFS-with-glibc-2.28.patch: Fix build. +- Clean spec file with spec-cleaner. + +------------------------------------------------------------------- Old: ---- dc3dd-7.2.641.tar.xz New: ---- dc3dd-7.2.646-fix-FTBFS-with-glibc-2.28.patch dc3dd-7.2.646.7z ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dc3dd.spec ++++++ --- /var/tmp/diff_new_pack.f657Un/_old 2019-08-13 13:22:22.789400773 +0200 +++ /var/tmp/diff_new_pack.f657Un/_new 2019-08-13 13:22:22.793400772 +0200 @@ -1,7 +1,7 @@ # # spec file for package dc3dd # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,33 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: dc3dd -Version: 7.2.0 +Version: 7.2.646 Release: 0 -%define pkg_version 7.2.641 Summary: Patched dd with Computer Forensics Features -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Archiving/Backup -Source: http://downloads.sourceforge.net/project/dc3dd/dc3dd/7.2/dc3dd-%{pkg_version}.tar.xz +URL: https://sourceforge.net/projects/dc3dd/ +Source0: https://downloads.sourceforge.net/project/dc3dd/dc3dd/%{version}/%{name}%%20%{version}/%{name}-%{version}.7z # PATCH-FIX-UPSTREAMING -- bmwiedemann -- https://sourceforge.net/p/dc3dd/bugs/16/ Patch0: reproducible.patch -Url: http://dc3dd.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM -- Fix build with glibc 2.28, picked from Debian +Patch1: dc3dd-7.2.646-fix-FTBFS-with-glibc-2.28.patch BuildRequires: gcc BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: glibc-devel BuildRequires: make -BuildRequires: xz BuildRequires: perl(Locale::gettext) +%if 0%{?suse_version} < 1510 +BuildRequires: p7zip +%else +BuildRequires: p7zip-full +%endif %description dc3dd is a patched version of GNU dd to include a number of features useful @@ -57,32 +61,32 @@ %lang_package %prep -%setup -q -n "dc3dd-%{pkg_version}" +%setup -q %patch0 -p1 +%patch1 -p1 # fix end-of-line encoding -%__sed -i 's/\r$//' *.txt -%__sed -i 's/\r$//' ChangeLog -# Remove executable permissions on documentation files -chmod a-x *.txt COPYING ChangeLog NEWS THANKS +sed -i 's/\r$//' *.txt +sed -i 's/\r$//' ChangeLog +# Add executable flag to configure +chmod +x configure %build # hpa and dco detection is recommended for linux builds %configure --enable-hpadco \ gl_cv_func_printf_directive_n=yes \ gl_cv_func_printf_infinite_long_double=yes -%__make %{?jobs:-j%{jobs}} +make %{?_smp_mflags} %install -%makeinstall - +%make_install %find_lang dc3dd %files -%defattr(-,root,root) -%doc ChangeLog COPYING NEWS THANKS +%license COPYING +%doc ChangeLog NEWS THANKS %doc *.txt %{_bindir}/dc3dd -%{_mandir}/man1/dc3dd.1%{ext_man} +%{_mandir}/man1/dc3dd.1%{?ext_man} %files lang -f %{name}.lang ++++++ dc3dd-7.2.646-fix-FTBFS-with-glibc-2.28.patch ++++++ 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 <[email protected]> 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 <stdio.h>, 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 <stdio.h>, 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 <stdio.h>, 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. */
