Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dump for openSUSE:Factory checked in at 2021-07-21 19:06:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dump (Old) and /work/SRC/openSUSE:Factory/.dump.new.2632 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dump" Wed Jul 21 19:06:16 2021 rev:25 rq:907096 version:0.4b47 Changes: -------- --- /work/SRC/openSUSE:Factory/dump/dump.changes 2020-04-04 12:18:39.479584602 +0200 +++ /work/SRC/openSUSE:Factory/.dump.new.2632/dump.changes 2021-07-21 19:07:16.691385133 +0200 @@ -1,0 +2,19 @@ +Fri Jul 16 15:28:17 UTC 2021 - Danilo Spinella <[email protected]> + +- Update to 0.4b47: + * Fix missing lzo return (Alexey Svistunov). + * Fix building with OpenSSL 1.1 (Daniel Molkentin). + * Fix bashisms in examples (Oleksandr Chumachenko). + * Use xattrs funcs from the C library (Vaclav Dolezal). + * Fix date mangling in man pages (Mike Frysinger). + * Force -fcommon when building (Mike Frysinger). + * Add error checking to SSL init transformation (Mike Frysinger). + * Fix restore -C calls with ftruncate (Alexander Zangerl). + * Restore symlink timestamps (Alexander Zangerl). +- Remove upstreamed patches: + * dump-0.4b43-fix-bashisms.patch + * dump-0.4b46-lzo-no-return.patch + * dump-0.4b46-openssl-1.1.patch +- Run spec-cleaner + +------------------------------------------------------------------- Old: ---- dump-0.4b43-fix-bashisms.patch dump-0.4b46-lzo-no-return.patch dump-0.4b46-openssl-1.1.patch dump-0.4b46.tar.gz New: ---- dump-0.4b47.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dump.spec ++++++ --- /var/tmp/diff_new_pack.f9GqiZ/_old 2021-07-21 19:07:17.287386169 +0200 +++ /var/tmp/diff_new_pack.f9GqiZ/_new 2021-07-21 19:07:17.291386176 +0200 @@ -1,7 +1,7 @@ # # spec file for package dump # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dump -Version: 0.4b46 +Version: 0.4b47 Release: 0 Summary: Programs for backing up and restoring ext2/3/4 filesystems License: BSD-3-Clause @@ -32,12 +32,6 @@ # ermt build, change its locations to _bindir Patch1: %{name}-0.4b46-rmt-ermt.patch Patch3: %{name}-0.4b43-include.patch -Patch4: %{name}-0.4b43-fix-bashisms.patch -# PATCH-FIX-UPSTREAM dump-0.4b46-lzo-no-return.patch [email protected] -- fixing rpmlint -# no-return-in-nonvoid-function error in dump -Patch5: %{name}-0.4b46-lzo-no-return.patch -# PATCH-FIX-SUSE dump-0.4b46-pathnames.patch [email protected] -- openssl 1.1 support -Patch6: %{name}-0.4b46-openssl-1.1.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: e2fsprogs-devel @@ -63,7 +57,7 @@ Summary: Provides certain programs with access to remote tape devices Group: Productivity/Archiving/Backup Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: rmt %description rmt @@ -77,9 +71,6 @@ %patch0 -p1 %patch1 -p1 %patch3 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build autoreconf -fiv @@ -90,7 +81,7 @@ --enable-ermt \ --enable-rmt=no \ --with-rmtpath=%{_bindir} -make %{?_smp_mflags} +%make_build %install %make_install @@ -111,20 +102,19 @@ fi %files -%defattr(-, root, root) %{_sbindir}/dump %{_sbindir}/restore -%{_mandir}/man8/dump.8%{ext_man} -%{_mandir}/man8/restore.8%{ext_man} -%doc NEWS COPYING KNOWNBUGS MAINTAINERS README REPORTING-BUGS +%{_mandir}/man8/dump.8%{?ext_man} +%{_mandir}/man8/restore.8%{?ext_man} +%license COPYING +%doc NEWS KNOWNBUGS MAINTAINERS README REPORTING-BUGS %doc AUTHORS TODO dump.lsm examples %files rmt -%defattr(-,root,root) %ghost %{_bindir}/rmt %{_bindir}/ermt %ghost %{_mandir}/man1/rmt.1%{ext_man} -%{_mandir}/man1/ermt.1%{ext_man} +%{_mandir}/man1/ermt.1%{?ext_man} %ghost %{_sysconfdir}/alternatives/rmt %ghost %{_sysconfdir}/alternatives/rmt.1%{ext_man} %doc encrypted_rmt/README ++++++ dump-0.4b46.tar.gz -> dump-0.4b47.tar.gz ++++++ ++++ 9209 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/AUTHORS new/dump-0.4b47/AUTHORS --- old/dump-0.4b46/AUTHORS 2016-09-05 21:18:25.000000000 +0200 +++ new/dump-0.4b47/AUTHORS 2021-01-01 17:28:57.000000000 +0100 @@ -104,7 +104,7 @@ Bernhard Sadlowski [email protected] Peter Samuel [email protected] Jan Sanislo [email protected] -J?rg Schilling [email protected] +J??rg Schilling [email protected] Patrik Schindler [email protected] Gunther Schlegel [email protected] Chris Siebenmann [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/COPYING new/dump-0.4b47/COPYING --- old/dump-0.4b46/COPYING 2016-05-06 04:55:40.000000000 +0200 +++ new/dump-0.4b47/COPYING 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/MAINTAINERS new/dump-0.4b47/MAINTAINERS --- old/dump-0.4b46/MAINTAINERS 2016-05-06 04:55:40.000000000 +0200 +++ new/dump-0.4b47/MAINTAINERS 2021-01-01 17:28:57.000000000 +0100 @@ -1,11 +1,11 @@ The dump and restore backup suit was ported to Linux's Second -Extended File System by R?my Card <[email protected]> +Extended File System by R??my Card <[email protected]> He was the maintainer of the initial versions of dump (up and -including 0.4b4, released in january 1997). +including 0.4b4, released in January 1997). -I decided to continue the developpement and release a new version. -R?my didn't respond to any mail I sent to him, so I have +I decided to continue the development and release a new version. +R??my didn't respond to any mail I sent to him, so I have promoted myself as the new maintainer :) So, starting with 0.4b5, the new maintainer is me, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/NEWS new/dump-0.4b47/NEWS --- old/dump-0.4b46/NEWS 2016-09-05 21:25:05.000000000 +0200 +++ new/dump-0.4b47/NEWS 2021-01-01 17:44:07.000000000 +0100 @@ -1,3 +1,24 @@ +Changes between versions 0.4b46 and 0.4b47 (released Jan 01, 2021) +=================================================================== + +1. Fix missing lzo return (Alexey Svistunov). + +2. Fix building with OpenSSL 1.1 (Daniel Molkentin). + +3. Fix bashisms in examples (Oleksandr Chumachenko). + +4. Use xattrs funcs from the C library (Vaclav Dolezal). + +5. Fix date mangling in man pages (Mike Frysinger). + +6. Force -fcommon when building (Mike Frysinger). + +7. Add error checking to SSL init transformation (Mike Frysinger). + +8. Fix restore -C calls with ftruncate (Alexander Zangerl). + +9. Restore symlink timestamps (Alexander Zangerl). + Changes between versions 0.4b45 and 0.4b46 (released Sep 05, 2016) =================================================================== @@ -36,7 +57,7 @@ =================================================================== 1. Recognize ext4 partitions in dump -w commands (Sourceforge - bug #3125587, RedHat bug #658890). Thanks to Jan G?rig + bug #3125587, RedHat bug #658890). Thanks to Jan G??rig <[email protected]> for reporting the bug and submitting the patch. @@ -91,7 +112,7 @@ Thanks to Igor Zhbanov <[email protected]> for the bug report. 5. Don't attempt to set extended attributes on files that were not - extracted in 'restore -N' mode. Thanks to Jan G?rig + extracted in 'restore -N' mode. Thanks to Jan G??rig <[email protected]> for the patch. 6. Make the dump man page explicit about ext4 support. @@ -104,8 +125,8 @@ 8. Fix some issues when restoring a dump which was generated using exclusion patterns (either via -e or via the nodump attribute) - (see the Debian bug #574667 for details. Thanks to Fr?d?ric - Bri?re <[email protected]> for the bug report and the associated + (see the Debian bug #574667 for details. Thanks to Fr??d??ric + Bri??re <[email protected]> for the bug report and the associated patch. 9. Fix progress/estimated blocks display in dump when doing really @@ -142,8 +163,7 @@ 3. Enable restore to handle restoring onto a different SELinux policy from the dump. Thanks to Tony Nelson <[email protected]> for the patch. - (see http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=189845 - for details) + (see http://bugzilla.redhat.com/189845 for details) 4. Fix EA set failures when restoring immutable files. Thanks to Andrew Kroeger for the patch. @@ -679,7 +699,7 @@ non Linux clients were misinterpreted. The description of the problem (incompatible numbering in Linux mtio opcodes) is documented at ftp://ftp.fokus.gmd.de/pub/unix/star/README.mtio . Thanks to - J?rg Schilling <[email protected]> for reporting this bug and + J??rg Schilling <[email protected]> for reporting this bug and providing an excellent, cross-platform replacement for rmt in his star package. @@ -692,7 +712,7 @@ that have the nodump flag set (or being excluded with -e/-E) were sometimes incorrectly dumped (instead of being excluded). The original fix is from David C Lawrence <[email protected]> in the FreeBSD version - of dump: http://www.FreeBSD.org/cgi/query-pr.cgi?pr=32414 + of dump: https://bugs.freebsd.org/32414 Thanks to Ted Grzesik <[email protected]> for reporting the bug and help testing the patch. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/REPORTING-BUGS new/dump-0.4b47/REPORTING-BUGS --- old/dump-0.4b46/REPORTING-BUGS 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/REPORTING-BUGS 2021-01-01 17:41:00.000000000 +0100 @@ -51,7 +51,7 @@ Ok, here are the pointers you may want to access: -Dump latest release: http://sourceforge.net/project/filelist.php?group_id=1306 -Dump mailing lists: http://sourceforge.net/mail/?group_id=1306 -Dump bug system: http://sourceforge.net/bugs/?group_id=1306 +Dump latest release: https://sourceforge.net/projects/dump/files/ +Dump mailing lists: https://sourceforge.net/p/dump/mailman/ +Dump bug system: https://sourceforge.net/p/dump/bugs/ My email: [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/common/dumprmt.c new/dump-0.4b47/common/dumprmt.c --- old/dump-0.4b46/common/dumprmt.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/common/dumprmt.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/common/transformation_lzo.c new/dump-0.4b47/common/transformation_lzo.c --- old/dump-0.4b46/common/transformation_lzo.c 2016-06-07 20:09:11.000000000 +0200 +++ new/dump-0.4b47/common/transformation_lzo.c 2021-01-01 16:05:15.000000000 +0100 @@ -13,6 +13,7 @@ static int lzo_initialize(Transformation *xform, int enc) { + return 0; } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/common/transformation_ssl.c new/dump-0.4b47/common/transformation_ssl.c --- old/dump-0.4b46/common/transformation_ssl.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/common/transformation_ssl.c 2021-01-01 16:14:05.000000000 +0100 @@ -1,3 +1,4 @@ +#include <err.h> #include <stdio.h> #include <config.h> #include <sys/mman.h> @@ -215,7 +216,10 @@ /* to be exposed to any attacker anyway. */ *saltlen = 16; if (xform->enc == 1) { - RAND_pseudo_bytes(salt, *saltlen); + if (!RAND_bytes(salt, *saltlen) != 1) { + /* PRNG not sufficiently seeded */ + return -1; + } } memcpy(ivbuffer, salt, 16); @@ -274,7 +278,7 @@ digestlen = sizeof(digest); /* generate salt, put it in header */ - generateIV(xform, salt, &saltlen, iv, &ivlen); + generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */ memcpy(tpbin->buf, salt, saltlen); /* compress the buffer first - increase the entropy */ @@ -351,7 +355,7 @@ // how to know salt length? memcpy(salt, src, saltlen); - generateIV(xform, salt, &saltlen, iv, &ivlen); + generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */ EVP_DecryptInit_ex(xform->state.ssl.dataCtx, xform->state.ssl.cipher, xform->state.ssl.engine, NULL, NULL); //EVP_CIPHER_CTX_set_key_length(&ctx, 8); @@ -467,8 +471,6 @@ /* * Factory. The cipher and digestnames should be read from a localized * policy file. - * - * TODO: indicate error if unknown cipher or digest. */ Transformation *transformation_ssl_factory(int enc, int complvl, const char *ciphername, const char *digestname) @@ -490,6 +492,11 @@ t->state.ssl.cipher = EVP_get_cipherbyname(ciphername); t->state.ssl.digest = EVP_get_digestbyname(digestname); t->state.ssl.engine = NULL; + + if (!t->state.ssl.cipher) + errx(1, "unknown cipher: '%s'", ciphername); + if (!t->state.ssl.digest) + errx(1, "unknown digest: '%s'", digestname); #endif t->name = "ssl"; @@ -515,7 +522,8 @@ //EVP_CIPHER_CTX_rand_key(ctx, t->state.ssl.key); //EVP_CIPHER_CTX_cleanup(ctx); //EVP_CIPHER_CTX_free(ctx); - RAND_bytes(t->state.ssl.key, t->state.ssl.cipher->key_len); + if (RAND_bytes(t->state.ssl.key, EVP_CIPHER_key_length(t->state.ssl.cipher)) != 1) + err(1, "unable to get random bytes"); } else { // how do we get keys? } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/bsdcompat.h new/dump-0.4b47/compat/include/bsdcompat.h --- old/dump-0.4b46/compat/include/bsdcompat.h 2016-06-07 20:08:53.000000000 +0200 +++ new/dump-0.4b47/compat/include/bsdcompat.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ #include <config.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/bylabel.h new/dump-0.4b47/compat/include/bylabel.h --- old/dump-0.4b46/compat/include/bylabel.h 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/compat/include/bylabel.h 2021-01-01 17:28:57.000000000 +0100 @@ -1,7 +1,7 @@ /* * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit - * 1999-02-22 Arkadiusz Mi?kiewicz <[email protected]> + * 1999-02-22 Arkadiusz Mi??kiewicz <[email protected]> * - added Native Language Support * 2000-01-20 James Antill <[email protected]> * - Added error message if /proc/partitions cannot be opened @@ -9,7 +9,7 @@ * - Added cache for UUID and disk labels * Wed Aug 16 2000 Erik Troan <[email protected]> * - Ported to dump/restore - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ #ifndef _BYLABEL_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/compaterr.h new/dump-0.4b47/compat/include/compaterr.h --- old/dump-0.4b46/compat/include/compaterr.h 2016-06-07 20:08:53.000000000 +0200 +++ new/dump-0.4b47/compat/include/compaterr.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/compatglob.h new/dump-0.4b47/compat/include/compatglob.h --- old/dump-0.4b46/compat/include/compatglob.h 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/compat/include/compatglob.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/pathnames.h new/dump-0.4b47/compat/include/pathnames.h --- old/dump-0.4b46/compat/include/pathnames.h 2016-06-07 20:08:53.000000000 +0200 +++ new/dump-0.4b47/compat/include/pathnames.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/protocols/dumprestore.h new/dump-0.4b47/compat/include/protocols/dumprestore.h --- old/dump-0.4b46/compat/include/protocols/dumprestore.h 2016-05-06 04:55:40.000000000 +0200 +++ new/dump-0.4b47/compat/include/protocols/dumprestore.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/rmtflags.h new/dump-0.4b47/compat/include/rmtflags.h --- old/dump-0.4b46/compat/include/rmtflags.h 2016-06-07 20:08:53.000000000 +0200 +++ new/dump-0.4b47/compat/include/rmtflags.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/include/system.h new/dump-0.4b47/compat/include/system.h --- old/dump-0.4b46/compat/include/system.h 2016-06-07 20:08:53.000000000 +0200 +++ new/dump-0.4b47/compat/include/system.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/lib/bylabel.c new/dump-0.4b47/compat/lib/bylabel.c --- old/dump-0.4b46/compat/lib/bylabel.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/compat/lib/bylabel.c 2021-01-01 17:28:57.000000000 +0100 @@ -1,7 +1,7 @@ /* * mount_by_label.c - aeb * - * 1999-02-22 Arkadiusz Mi?kiewicz <[email protected]> + * 1999-02-22 Arkadiusz Mi??kiewicz <[email protected]> * - added Native Language Support * 2000-01-20 James Antill <[email protected]> * - Added error message if /proc/partitions cannot be opened diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/lib/compaterr.c new/dump-0.4b47/compat/lib/compaterr.c --- old/dump-0.4b46/compat/lib/compaterr.c 2016-06-07 20:08:53.000000000 +0200 +++ new/dump-0.4b47/compat/lib/compaterr.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/lib/compatglob.c new/dump-0.4b47/compat/lib/compatglob.c --- old/dump-0.4b46/compat/lib/compatglob.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/compat/lib/compatglob.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/lib/rmtflags.c new/dump-0.4b47/compat/lib/rmtflags.c --- old/dump-0.4b46/compat/lib/rmtflags.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/compat/lib/rmtflags.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* @@ -101,7 +101,7 @@ { NULL, 0 } }; -/* Parts of this stolen again from J?rg Schilling's star package... */ +/* Parts of this stolen again from J??rg Schilling's star package... */ int rmtflags_toint(char *filemode) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compat/lib/system.c new/dump-0.4b47/compat/lib/system.c --- old/dump-0.4b46/compat/lib/system.c 2016-06-07 20:08:53.000000000 +0200 +++ new/dump-0.4b47/compat/lib/system.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/compile new/dump-0.4b47/compile --- old/dump-0.4b46/compile 2016-09-05 21:18:54.000000000 +0200 +++ new/dump-0.4b47/compile 2021-01-01 16:46:04.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/config.h.in new/dump-0.4b47/config.h.in --- old/dump-0.4b46/config.h.in 2016-09-05 21:25:32.000000000 +0200 +++ new/dump-0.4b47/config.h.in 2021-01-01 17:44:50.000000000 +0100 @@ -96,6 +96,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the `utimensat' function. */ +#undef HAVE_UTIMENSAT + /* Define this if you have the uuid library. */ #undef HAVE_UUID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/configure.ac new/dump-0.4b47/configure.ac --- old/dump-0.4b46/configure.ac 2016-09-05 21:25:05.000000000 +0200 +++ new/dump-0.4b47/configure.ac 2021-01-01 17:44:21.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([dump], [0.4b46], [http://dump.sourceforge.net]) +AC_INIT([dump], [0.4b47], [https://dump.sourceforge.io]) AC_PREREQ(2.57) AM_INIT_AUTOMAKE AM_SILENT_RULES([yes]) @@ -23,8 +23,15 @@ AC_CHECK_HEADERS([sys/types.h]) +dnl Used when generating the man pages. Should refresh for each release. +AC_SUBST([DATE], ["1 Jan 2021"]) + CPPFLAGS="${CPPFLAGS} -D_USE_BSD_SIGNAL "'-D_PATH_DUMPDATES=\"$(DUMPDATESPATH)\" -D_DUMP_VERSION=\"$(VERSION)\"' +dnl This codebase is a mess with its storage. It should get fixed someday. +dnl https://sourceforge.net/p/dump/bugs/171/ +CFLAGS="${CFLAGS} -fcommon" + AC_DEFINE([LINUX_FORK_BUG], 1, [Workaround bad fork behavior on Linux]) dnl Should these be options? @@ -421,7 +428,7 @@ dnl dnl Check for library functions dnl -AC_CHECK_FUNCS(err errx verr verrx vwarn vwarnx warn warnx realpath lchown) +AC_CHECK_FUNCS(err errx verr verrx vwarn vwarnx warn warnx realpath lchown utimensat) AC_CHECK_FUNC(glob) dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/dump.8.in new/dump-0.4b47/dump/dump.8.in --- old/dump-0.4b46/dump/dump.8.in 2016-05-06 04:55:40.000000000 +0200 +++ new/dump-0.4b47/dump/dump.8.in 2021-01-01 17:42:50.000000000 +0100 @@ -536,7 +536,7 @@ Another backup strategy is the Tower of Hanoi sequence, which reuses older tapes in a way that for newer dates the available restore points are more frequent, then for older dates (see -http://en.wikipedia.org/wiki/Backup_rotation_scheme for additional +https://en.wikipedia.org/wiki/Backup_rotation_scheme for additional information). .PP (The 4.3BSD option syntax is implemented for backward compatibility but is not @@ -663,7 +663,7 @@ .SH AVAILABILITY The .B dump/restore -backup suite is available from <http://dump.sourceforge.net> +backup suite is available from <https://dump.sourceforge.io> .SH HISTORY A .B dump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/dump.h new/dump-0.4b47/dump/dump.h --- old/dump-0.4b46/dump/dump.h 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/dump/dump.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/itime.c new/dump-0.4b47/dump/itime.c --- old/dump-0.4b46/dump/itime.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/dump/itime.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/main.c new/dump-0.4b47/dump/main.c --- old/dump-0.4b46/dump/main.c 2016-09-05 20:37:56.000000000 +0200 +++ new/dump-0.4b47/dump/main.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/optr.c new/dump-0.4b47/dump/optr.c --- old/dump-0.4b46/dump/optr.c 2016-09-05 21:00:49.000000000 +0200 +++ new/dump-0.4b47/dump/optr.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/tape.c new/dump-0.4b47/dump/tape.c --- old/dump-0.4b46/dump/tape.c 2016-06-08 16:51:51.000000000 +0200 +++ new/dump-0.4b47/dump/tape.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/traverse.c new/dump-0.4b47/dump/traverse.c --- old/dump-0.4b46/dump/traverse.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/dump/traverse.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump/unctime.c new/dump-0.4b47/dump/unctime.c --- old/dump-0.4b46/dump/unctime.c 2016-06-07 20:09:11.000000000 +0200 +++ new/dump-0.4b47/dump/unctime.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump.lsm new/dump-0.4b47/dump.lsm --- old/dump-0.4b46/dump.lsm 2016-09-05 21:25:32.000000000 +0200 +++ new/dump-0.4b47/dump.lsm 2021-01-01 17:44:49.000000000 +0100 @@ -1,13 +1,13 @@ Begin3 Title: dump and restore for Ext2fs -Version: 0.4b46 +Version: 0.4b47 Entered-date: 09MAY16 Description: Port of the 4.4BSD dump and restore backup suite Keywords: backup, filesystem, Ext2fs Author: University of California, Berkeley Maintained-by: [email protected] (Stelian Pop) -Primary-site: http://dump.sourceforge.net/ - 0kB dump-0.4b46.tar.gz +Primary-site: https://dump.sourceforge.io/ + 0kB dump-0.4b47.tar.gz 0 dump.lsm Original-site: ftp.freebsd.org /pub/bsd-sources/4.4BSD-Lite2/sbin dump/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/dump.lsm.in new/dump-0.4b47/dump.lsm.in --- old/dump-0.4b46/dump.lsm.in 2016-09-05 21:18:25.000000000 +0200 +++ new/dump-0.4b47/dump.lsm.in 2021-01-01 17:39:25.000000000 +0100 @@ -6,7 +6,7 @@ Keywords: backup, filesystem, Ext2fs Author: University of California, Berkeley Maintained-by: [email protected] (Stelian Pop) -Primary-site: http://dump.sourceforge.net/ +Primary-site: https://dump.sourceforge.io/ 0kB dump-@[email protected] 0 dump.lsm Original-site: ftp.freebsd.org /pub/bsd-sources/4.4BSD-Lite2/sbin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/examples/dump_on_cd_3/dump_disk new/dump-0.4b47/examples/dump_on_cd_3/dump_disk --- old/dump-0.4b46/examples/dump_on_cd_3/dump_disk 2016-05-06 04:55:40.000000000 +0200 +++ new/dump-0.4b47/examples/dump_on_cd_3/dump_disk 2021-01-01 16:05:15.000000000 +0100 @@ -55,14 +55,14 @@ while [ "$ANSWER" != "y" ] ; do echo -n "Is the disk ready? (y/n) " read </dev/tty ANSWER - if [ "$ANSWER" == "y" ] ; then + if [ "$ANSWER" = "y" ] ; then (${RECORD_BIN}${1}) & return 0 - elif [ "$ANSWER" == "n" ] ; then + elif [ "$ANSWER" = "n" ] ; then EXIT="" echo -n "Do you really want to exit? (y/n) " read </dev/tty EXIT - if [ "$EXIT" == "y" ] ; then + if [ "$EXIT" = "y" ] ; then return 1 fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/examples/remote_backup_ssh/backitup new/dump-0.4b47/examples/remote_backup_ssh/backitup --- old/dump-0.4b46/examples/remote_backup_ssh/backitup 2016-05-06 04:55:40.000000000 +0200 +++ new/dump-0.4b47/examples/remote_backup_ssh/backitup 2021-01-01 16:05:15.000000000 +0100 @@ -41,7 +41,7 @@ # backup FILESYSTEMS to the TAPEDEV on TAPEHOST with DUMP as OPERATOR using RSH export RMT RSH -mkdir -p $LOGDIR &> /dev/null +mkdir -p $LOGDIR > /dev/null 2>&1 ssh-add ~/.ssh/id_dsa echo "Rewinding tape..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/m4/libtool.m4 new/dump-0.4b47/m4/libtool.m4 --- old/dump-0.4b46/m4/libtool.m4 2016-09-05 21:18:47.000000000 +0200 +++ new/dump-0.4b47/m4/libtool.m4 2021-01-01 16:45:59.000000000 +0100 @@ -1417,10 +1417,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) + powerpcle-*linux*|powerpc64le-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*linux*) + powerpc-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1708,6 +1708,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -2636,11 +2641,11 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext' soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/missing new/dump-0.4b47/missing --- old/dump-0.4b46/missing 2016-09-05 21:18:54.000000000 +0200 +++ new/dump-0.4b47/missing 2021-01-01 16:46:04.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/dirs.c new/dump-0.4b47/restore/dirs.c --- old/dump-0.4b46/restore/dirs.c 2016-06-07 20:09:12.000000000 +0200 +++ new/dump-0.4b47/restore/dirs.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/extern.h new/dump-0.4b47/restore/extern.h --- old/dump-0.4b46/restore/extern.h 2016-06-07 20:09:12.000000000 +0200 +++ new/dump-0.4b47/restore/extern.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/interactive.c new/dump-0.4b47/restore/interactive.c --- old/dump-0.4b46/restore/interactive.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/restore/interactive.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/main.c new/dump-0.4b47/restore/main.c --- old/dump-0.4b46/restore/main.c 2016-07-04 04:53:53.000000000 +0200 +++ new/dump-0.4b47/restore/main.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/restore.8.in new/dump-0.4b47/restore/restore.8.in --- old/dump-0.4b46/restore/restore.8.in 2016-06-08 07:37:32.000000000 +0200 +++ new/dump-0.4b47/restore/restore.8.in 2021-01-01 17:39:25.000000000 +0100 @@ -755,7 +755,7 @@ .SH AVAILABILITY The .B dump/restore -backup suite is available from <http://dump.sourceforge.net> +backup suite is available from <https://dump.sourceforge.io> .SH HISTORY The .B restore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/restore.c new/dump-0.4b47/restore/restore.c --- old/dump-0.4b46/restore/restore.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/restore/restore.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/restore.h new/dump-0.4b47/restore/restore.h --- old/dump-0.4b46/restore/restore.h 2016-07-04 04:53:53.000000000 +0200 +++ new/dump-0.4b47/restore/restore.h 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/symtab.c new/dump-0.4b47/restore/symtab.c --- old/dump-0.4b46/restore/symtab.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/restore/symtab.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/tape.c new/dump-0.4b47/restore/tape.c --- old/dump-0.4b46/restore/tape.c 2016-09-05 21:24:52.000000000 +0200 +++ new/dump-0.4b47/restore/tape.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* @@ -900,6 +900,15 @@ uid_t luid = curfile.dip->di_uid; gid_t lgid = curfile.dip->di_gid; #endif +#ifdef HAVE_UTIMENSAT + struct timespec times[2]; + + times[0].tv_sec = timep[0].tv_sec; + times[0].tv_nsec = timep[0].tv_usec * 1000; + times[1].tv_sec = timep[1].tv_sec; + times[1].tv_nsec = timep[1].tv_usec * 1000; +#endif + if (! (spcl.c_flags & DR_METAONLY)) { lnkbuf[0] = '\0'; pathlen = 0; @@ -919,6 +928,10 @@ if (lchown(name, luid, lgid) < 0) warn("%s: lchown", name); #endif +#ifdef HAVE_UTIMENSAT + if (utimensat(AT_FDCWD, name, times, AT_SYMLINK_NOFOLLOW) < 0) + warn("%s: file timestamp update failed", name); +#endif extractattr(name); return (GOOD); } @@ -1409,7 +1422,11 @@ last_write_was_hole = 1; } if (last_write_was_hole) { - if (ftruncate(ofile, origsize) < 0) + /* + * Do not attempt a truncate if running an on-the-fly compare, as there + * IS no file to truncate in that case! + */ + if (ofile >= 0 && ftruncate(ofile, origsize) < 0) warn("%s: ftruncate", curfile.name); } if (!readingmaps) @@ -1889,6 +1906,11 @@ } else { cmperror = 0; + /* + * tell getfile to not truncate as there is no open file: + * xtrcmpfile works off mem buffer. + */ + ofile = -1; getfile(xtrcmpfile, xtrcmpskip); if (!cmperror) { char c; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/utilities.c new/dump-0.4b47/restore/utilities.c --- old/dump-0.4b46/restore/utilities.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/restore/utilities.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/restore/xattr.c new/dump-0.4b47/restore/xattr.c --- old/dump-0.4b46/restore/xattr.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/restore/xattr.c 2021-01-01 16:05:15.000000000 +0100 @@ -30,6 +30,7 @@ #include <config.h> #include <compaterr.h> #include <sys/types.h> +#include <sys/xattr.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -118,82 +119,6 @@ (entry)->e_value_offs + sizeof(struct ext3_xattr_ibody_header) : \ (entry)->e_value_offs)) -/* - * xattr syscalls do not exist yet in libc, get our own copy here, - * taken from libattr. - */ -#if defined (__i386__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 227 -# define __NR_lgetxattr 230 -# define __NR_llistxattr 233 -#elif defined (__sparc__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 170 -# define __NR_lgetxattr 173 -# define __NR_llistxattr 179 -#elif defined (__ia64__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 1218 -# define __NR_lgetxattr 1221 -# define __NR_llistxattr 1224 -#elif defined (__powerpc__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 210 -# define __NR_lgetxattr 213 -# define __NR_llistxattr 216 -#elif defined (__x86_64__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 189 -# define __NR_lgetxattr 192 -# define __NR_llistxattr 195 -#elif defined (__s390__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 225 -# define __NR_lgetxattr 228 -# define __NR_llistxattr 231 -#elif defined (__arm__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_SYSCALL_BASE 0x900000 -# define __NR_lsetxattr (__NR_SYSCALL_BASE+227) -# define __NR_lgetxattr (__NR_SYSCALL_BASE+230) -# define __NR_llistxattr (__NR_SYSCALL_BASE+233) -#elif defined (__mips64__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_Linux 5000 -# define __NR_lsetxattr (__NR_Linux + 218) -# define __NR_lgetxattr (__NR_Linux + 221) -# define __NR_llistxattr (__NR_Linux + 224) -#elif defined (__mips__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_Linux 4000 -# define __NR_lsetxattr (__NR_Linux + 225) -# define __NR_lgetxattr (__NR_Linux + 228) -# define __NR_llistxattr (__NR_Linux + 231) -#elif defined (__alpha__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 383 -# define __NR_lgetxattr 386 -# define __NR_llistxattr 389 -#elif defined (__mc68000__) -# define HAVE_XATTR_SYSCALLS 1 -# define __NR_lsetxattr 224 -# define __NR_lgetxattr 227 -# define __NR_llistxattr 230 -#else -# warning "Extended attribute syscalls undefined for this architecture" -# define HAVE_XATTR_SYSCALLS 0 -#endif - -#if HAVE_XATTR_SYSCALLS -# define SYSCALL(args...) syscall(args) -#else -# define SYSCALL(args...) ( errno = ENOSYS, -1 ) -#endif - -static int lsetxattr (const char *, const char *, void *, size_t, int); -static ssize_t lgetxattr (const char *, const char *, void *, size_t); -static ssize_t llistxattr (const char *, char *, size_t); static int xattr_cb_list (char *, char *, int, int, void *); static int xattr_cb_set (char *, char *, int, int, void *); static int xattr_cb_compare (char *, char *, int, int, void *); @@ -201,24 +126,6 @@ static int xattr_count (char *, int *); static int xattr_walk (char *, int (*)(char *, char *, int, int, void *), void *); -static int -lsetxattr(const char *path, const char *name, void *value, size_t size, int flags) -{ - return SYSCALL(__NR_lsetxattr, path, name, value, size, flags); -} - -static ssize_t -lgetxattr(const char *path, const char *name, void *value, size_t size) -{ - return SYSCALL(__NR_lgetxattr, path, name, value, size); -} - -static ssize_t -llistxattr(const char *path, char *list, size_t size) -{ - return SYSCALL(__NR_llistxattr, path, list, size); -} - #define POSIX_ACL_XATTR_VERSION 0x0002 #define ACL_UNDEFINED_ID (-1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/rmt/cipher.c new/dump-0.4b47/rmt/cipher.c --- old/dump-0.4b46/rmt/cipher.c 2016-06-07 20:09:12.000000000 +0200 +++ new/dump-0.4b47/rmt/cipher.c 2021-01-01 16:05:15.000000000 +0100 @@ -23,7 +23,7 @@ char * cipher(char *buf, int buflen, int do_encrypt) { - static EVP_CIPHER_CTX ctx; + EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); static char *out = NULL; /* return value, grown as necessary */ static int outlen = 0; static int init = 0, which, blocksize; @@ -71,13 +71,13 @@ } EVP_BytesToKey(cipher, EVP_md5(), NULL, buf, strlen(buf), 1, key, iv); - EVP_CIPHER_CTX_init(&ctx); - EVP_CipherInit_ex(&ctx, cipher, NULL, key, iv, do_encrypt); - EVP_CIPHER_CTX_set_padding(&ctx, 0); // -nopad + EVP_CIPHER_CTX_init(ctx); + EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, do_encrypt); + EVP_CIPHER_CTX_set_padding(ctx, 0); // -nopad OPENSSL_cleanse(buf, sizeof buf); OPENSSL_cleanse(key, sizeof key); OPENSSL_cleanse(iv, sizeof iv); - blocksize = EVP_CIPHER_CTX_block_size(&ctx); + blocksize = EVP_CIPHER_CTX_block_size(ctx); which = do_encrypt; init = 1; } @@ -95,7 +95,7 @@ outlen = (buflen+blocksize) * 2; out = realloc(out, outlen); } - if (!EVP_CipherUpdate(&ctx, out, &n, buf, buflen)) { + if (!EVP_CipherUpdate(ctx, out, &n, buf, buflen)) { syslog(LOG_ERR, "EVP_CipherUpdate failed"); errno = EINVAL; return NULL; @@ -106,6 +106,7 @@ return NULL; } // assert(ctx->buf_len == 0); + EVP_CIPHER_CTX_free(ctx); return out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/rmt/rmt.8.in new/dump-0.4b47/rmt/rmt.8.in --- old/dump-0.4b46/rmt/rmt.8.in 2016-05-06 04:55:40.000000000 +0200 +++ new/dump-0.4b47/rmt/rmt.8.in 2021-01-01 17:39:25.000000000 +0100 @@ -356,7 +356,7 @@ .SH AVAILABILITY The .B dump/restore -backup suit is available from <http://dump.sourceforge.net> +backup suit is available from <https://dump.sourceforge.io> .SH HISTORY The .B rmt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dump-0.4b46/rmt/rmt.c new/dump-0.4b47/rmt/rmt.c --- old/dump-0.4b46/rmt/rmt.c 2016-06-08 07:01:45.000000000 +0200 +++ new/dump-0.4b47/rmt/rmt.c 2021-01-01 17:28:57.000000000 +0100 @@ -3,7 +3,7 @@ * dump and restore backup suit * Remy Card <[email protected]>, 1994-1997 * Stelian Pop <[email protected]>, 1999-2000 - * Stelian Pop <[email protected]> - Alc?ve <www.alcove.com>, 2000-2002 + * Stelian Pop <[email protected]> - Alc??ve <www.alcove.com>, 2000-2002 */ /* @@ -71,7 +71,7 @@ /* * Support for Sun's extended RMT protocol - * code originally written by J?rg Schilling <[email protected]> + * code originally written by J??rg Schilling <[email protected]> * and relicensed by his permission from GPL to BSD for use in dump. * * rmt_version is 0 for regular clients (Linux included)
