diff --git a/0001-fix-multiple-define-for-gcc10.patch b/0001-fix-multiple-define-for-gcc10.patch deleted file mode 100644 index b2061334e27eb48ec9e7ce795cb93ac76242d13f..0000000000000000000000000000000000000000 --- a/0001-fix-multiple-define-for-gcc10.patch +++ /dev/null @@ -1,120 +0,0 @@ -From dac8b4b851ed8ed83ee5d44e8a42d16f7fe81f8a Mon Sep 17 00:00:00 2001 -From: wguanghao -Date: Fri, 30 Jul 2021 16:45:57 +0800 -Subject: [PATCH] fix multiple define for gcc10 - ---- - common/legacy_indexer.c | 6 ++---- - compat/include/protocols/dumprestore.h | 4 ++-- - dump/itime.c | 5 ----- - dump/main.c | 1 + - restore/main.c | 1 + - restore/restore.c | 1 + - restore/restore.h | 2 +- - 7 files changed, 8 insertions(+), 12 deletions(-) - -diff --git a/common/legacy_indexer.c b/common/legacy_indexer.c -index c60830c..396232f 100644 ---- a/common/legacy_indexer.c -+++ b/common/legacy_indexer.c -@@ -49,11 +49,9 @@ static int GetTapePos (long long *); - static int MkTapeString (struct s_spcl *, long long); - #define FILESQFAPOS 20 - --int tapepos; --int ntrec; /* blocking factor on tape */ - int magtapeout; /* is output a magnetic tape? */ --//extern int tapepos; --//extern int ntrec; /* blocking factor on tape */ -+extern int tapepos; -+extern int ntrec; /* blocking factor on tape */ - //extern int magtapeout; /* is output a magnetic tape? */ - - static int gtperr = 0; -diff --git a/compat/include/protocols/dumprestore.h b/compat/include/protocols/dumprestore.h -index 7fcdab5..01d7750 100644 ---- a/compat/include/protocols/dumprestore.h -+++ b/compat/include/protocols/dumprestore.h -@@ -78,12 +78,12 @@ typedef u_int32_t dump_ino_t; - typedef unsigned int dump_ino_t; - #endif - --union u_data { -+extern union u_data { - char s_addrs[TP_NINDIR]; /* 1 => data; 0 => hole in inode */ - int32_t s_inos[TP_NINOS]; /* table of first inode on each volume */ - } u_data; - --union u_spcl { -+extern union u_spcl { - char dummy[TP_BSIZE]; - struct s_spcl { - int32_t c_type; /* record type (see below) */ -diff --git a/dump/itime.c b/dump/itime.c -index 678f96e..e3cd331 100644 ---- a/dump/itime.c -+++ b/dump/itime.c -@@ -71,11 +71,6 @@ - - #include "dump.h" - --struct dumpdates **ddatev; --int nddates; --int ddates_in; --struct dumptime *dthead; -- - static void dumprecout (FILE *, struct dumpdates *); - static int getrecord (FILE *, struct dumpdates *); - static int makedumpdate (struct dumpdates *, char *); -diff --git a/dump/main.c b/dump/main.c -index 142aa2b..3356107 100644 ---- a/dump/main.c -+++ b/dump/main.c -@@ -171,6 +171,7 @@ long uncomprblks = 0;/* uncompressed blocks written */ - Transformation *transformation = &transformation_null; - - long smtc_errno; -+union u_spcl u_spcl; - - #ifdef __linux__ - char *__progname; -diff --git a/restore/main.c b/restore/main.c -index 4ce7293..4539745 100644 ---- a/restore/main.c -+++ b/restore/main.c -@@ -108,6 +108,7 @@ char *bot_script = NULL; - dump_ino_t volinfo[TP_NINOS]; - int wdfd; - int dirhash_size = 1; -+union u_spcl u_spcl; - - #ifdef USE_QFA - FILE *gTapeposfp; -diff --git a/restore/restore.c b/restore/restore.c -index a775e37..5ea7c79 100644 ---- a/restore/restore.c -+++ b/restore/restore.c -@@ -71,6 +71,7 @@ - #include "restore.h" - #include "extern.h" - -+struct context curfile; - static char *keyval (int); - - /* -diff --git a/restore/restore.h b/restore/restore.h -index 68ec54e..915546f 100644 ---- a/restore/restore.h -+++ b/restore/restore.h -@@ -130,7 +130,7 @@ struct entry { - /* - * The entry describes the next file available on the tape - */ --struct context { -+extern struct context { - char *name; /* name of file */ - dump_ino_t ino; /* inumber of file */ - #if defined(__linux__) || defined(sunos) --- -1.8.3.1 - diff --git a/dump-0.4b47.tar.gz b/dump-0.4b47.tar.gz deleted file mode 100644 index d6c401341b56c66036efd85b8060744236f6ff44..0000000000000000000000000000000000000000 Binary files a/dump-0.4b47.tar.gz and /dev/null differ diff --git a/dump-0.4b49.tar.gz b/dump-0.4b49.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..345fb040389f4fbb2b34cc3ad94b1125fe79d00d Binary files /dev/null and b/dump-0.4b49.tar.gz differ diff --git a/dump.spec b/dump.spec index 01a9f8368225000a1a4218137aeacdc65f9da079..5e3aa0e05be16010cc06d3c03034555426290ba6 100644 --- a/dump.spec +++ b/dump.spec @@ -1,13 +1,11 @@ Name: dump Epoch: 1 Version: 0.4 -Release: 8 +Release: 9 Summary: Programs for backing up and restoring ext2/3/4 filesystems License: BSD URL: https://sourceforge.net/projects/dump/ -Source0: http://downloads.sourceforge.net/dump/dump-%{version}b47.tar.gz - -Patch1: 0001-fix-multiple-define-for-gcc10.patch +Source0: http://downloads.sourceforge.net/dump/dump-%{version}b49.tar.gz BuildRequires: make e2fsprogs-devel readline-devel automake libtool BuildRequires: bzip2-devel libselinux-devel zlib-devel lzo-devel @@ -27,7 +25,7 @@ Single files and directory subtrees may also be restored from full or partial ba %package_help %prep -%autosetup -n %{name}-0.4b47 -p1 +%autosetup -n %{name}-0.4b49 -p1 %build autoreconf -fiv @@ -69,6 +67,9 @@ popd %{_mandir}/*/* %changelog +* Mon Dec 16 2024 lvyy - 1:0.4-9 +- Update to dump-0.4b49 + * Wed Jul 31 2024 wuyifeng - 1:0.4-8 - Update the main URL diff --git a/dump.yaml b/dump.yaml index e56a7e0ef1e27d06cc488eb93b6757e45fbf271a..d19aac5c1c63c555118de3e982b2c3291743f0d5 100644 --- a/dump.yaml +++ b/dump.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://git.code.sf.net/p/dump/code tag_prefix: "^v" -seperator: "." +separator: "."