New version of dump is available (0.4b46) (#1376411)
This commit is contained in:
Josef Ridky
parent
90f778bcb3
commit
995a64c990
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
dump-0.4b43.tar.gz
|
||||
/dump-0.4b44.tar.gz
|
||||
/dump-0.4b45.tar.gz
|
||||
/dump-0.4b46.tar.gz
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
diff -urNp orig-dump-0.4b45/dump/optr.c new-dump-0.4b45/dump/optr.c
|
||||
--- orig-dump-0.4b45/dump/optr.c 2016-05-09 07:38:01.000000000 +0200
|
||||
+++ new-dump-0.4b45/dump/optr.c 2016-07-29 09:15:03.139871167 +0200
|
||||
@@ -431,6 +431,21 @@ allocfsent(struct mntent *fs)
|
||||
struct stat buf, tabbuf;
|
||||
struct pfstab *tabpf;
|
||||
struct mntent *tabfs;
|
||||
+ char **type;
|
||||
+ int handle, len;
|
||||
+
|
||||
+ /* Discard fstypes we don't handle */
|
||||
+ if (fs->mnt_type == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ len = strlen(fs->mnt_type);
|
||||
+
|
||||
+ for (type = fstypes, handle = 0; *type != NULL && handle == 0; type++){
|
||||
+ handle = (strncmp(fs->mnt_type, *type, len) == 0);
|
||||
+ }
|
||||
+
|
||||
+ if (!handle)
|
||||
+ return NULL;
|
||||
|
||||
new = (struct mntent *)malloc(sizeof (*fs));
|
||||
if (new == NULL)
|
||||
@@ -701,9 +716,15 @@ lastdump(char arg) /* w ==> just what to
|
||||
for (pf = table; pf != NULL; pf = pf->pf_next) {
|
||||
struct mntent *dt = pf->pf_mntent;
|
||||
char **type;
|
||||
+ int len;
|
||||
+
|
||||
+ if (dt->mnt_type == NULL)
|
||||
+ continue;
|
||||
+
|
||||
+ len = strlen(dt->mnt_type);
|
||||
|
||||
for (type = fstypes; *type != NULL; type++) {
|
||||
- if (strcmp(dt->mnt_type, *type) == 0) {
|
||||
+ if (strncmp(dt->mnt_type, *type, len) == 0) {
|
||||
const char *disk = get_device_name(dt->mnt_fsname);
|
||||
print_wmsg(arg, dt->mnt_freq > 0,
|
||||
disk ? disk : dt->mnt_fsname,
|
||||
Binární soubory orig-dump-0.4b45/dump/.optr.c.swp a new-dump-0.4b45/dump/.optr.c.swp jsou rozdílné
|
||||
@ -1,11 +0,0 @@
|
||||
diff -urNp origin-dump-0.4b45/common/legacy_indexer.c new-dump-0.4b45/common/legacy_indexer.c
|
||||
--- origin-dump-0.4b45/common/legacy_indexer.c 2016-05-09 07:49:56.000000000 +0200
|
||||
+++ new-dump-0.4b45/common/legacy_indexer.c 2016-08-11 10:49:00.476005501 +0200
|
||||
@@ -356,6 +356,7 @@ Indexer indexer_legacy = {
|
||||
&legacy_addDirEntry,
|
||||
&legacy_openQfa,
|
||||
&legacy_closeQfa,
|
||||
+ &legacy_openQfaState,
|
||||
&legacy_updateQfa,
|
||||
&legacy_updateQfaState
|
||||
};
|
||||
@ -1,34 +0,0 @@
|
||||
diff -urNp origin-dump-0.4b45/common/legacy_indexer.c new-dump-0.4b45/common/legacy_indexer.c
|
||||
--- origin-dump-0.4b45/common/legacy_indexer.c 2016-05-09 07:49:56.000000000 +0200
|
||||
+++ new-dump-0.4b45/common/legacy_indexer.c 2016-08-11 10:33:33.818048593 +0200
|
||||
@@ -57,8 +57,8 @@ int magtapeout; /* is output a magnetic
|
||||
//extern int magtapeout; /* is output a magnetic tape? */
|
||||
|
||||
static int gtperr = 0;
|
||||
-static int gTapeposfd;
|
||||
-static char *gTapeposfile;
|
||||
+static int gTapeposfd = -1; /* code below assumes fd >= 0 means do print */
|
||||
+const char *gTapeposfile;
|
||||
static char gTps[255];
|
||||
static int32_t gThisDumpDate;
|
||||
#endif /* USE_QFA */
|
||||
diff -urNp origin-dump-0.4b45/dump/main.c new-dump-0.4b45/dump/main.c
|
||||
--- origin-dump-0.4b45/dump/main.c 2016-05-09 07:46:35.000000000 +0200
|
||||
+++ new-dump-0.4b45/dump/main.c 2016-08-11 10:31:59.651565976 +0200
|
||||
@@ -159,6 +159,7 @@ int ntrec = NTREC; /* # blocks in each t
|
||||
int cartridge = 0; /* Assume non-cartridge tape */
|
||||
#ifdef USE_QFA
|
||||
int tapepos = 0; /* assume no QFA tapeposition needed by user */
|
||||
+extern const char *gTapeposfile;
|
||||
#endif /* USE_QFA */
|
||||
int dokerberos = 0; /* Use Kerberos authentication */
|
||||
long dev_bsize = 1; /* recalculated below */
|
||||
@@ -401,7 +402,7 @@ main(int argc, char *argv[])
|
||||
|
||||
#ifdef USE_QFA
|
||||
case 'Q': /* create tapeposfile */
|
||||
- //gTapeposfile = optarg; // FIXME - communicate filename to indexer.
|
||||
+ gTapeposfile = optarg;
|
||||
tapepos = 1;
|
||||
break;
|
||||
#endif /* USE_QFA */
|
||||
13
dump.spec
13
dump.spec
@ -1,11 +1,11 @@
|
||||
%define PREVER b45
|
||||
%define PREVER b46
|
||||
%define VERSION 0.4%{PREVER}
|
||||
|
||||
Summary: Programs for backing up and restoring ext2/ext3/ext4 filesystems
|
||||
Name: dump
|
||||
Epoch: 1
|
||||
Version: 0.4
|
||||
Release: 0.29.%{PREVER}%{?dist}
|
||||
Release: 0.30.%{PREVER}%{?dist}
|
||||
License: BSD
|
||||
Group: Applications/Archiving
|
||||
URL: http://dump.sourceforge.net/
|
||||
@ -25,9 +25,6 @@ Provides: dump-static
|
||||
|
||||
Patch0: dump-buildfix.patch
|
||||
Patch1: dump-remove-lzo.patch
|
||||
Patch2: dump-baduuid.patch
|
||||
Patch3: dump-q-option.patch
|
||||
Patch4: dump-openqfastate.patch
|
||||
|
||||
%description
|
||||
The dump package contains both dump and restore. Dump examines files
|
||||
@ -46,9 +43,6 @@ restoring filesystems after backups.
|
||||
|
||||
%patch0 -p1 -b .buildfix
|
||||
%patch1 -p1 -b .remove-lzo
|
||||
%patch2 -p1 -b .baduuid
|
||||
%patch3 -p1 -b .qoption
|
||||
%patch4 -p1 -b .openqfastate
|
||||
|
||||
for i in MAINTAINERS COPYING ChangeLog; do
|
||||
iconv -f iso-8859-1 -t utf-8 $i -o $i.new
|
||||
@ -115,6 +109,9 @@ rm -rf %{buildroot}
|
||||
%{_mandir}/man8/rrestore.8*
|
||||
|
||||
%changelog
|
||||
* Thu Sep 15 2016 Josef Ridky <jridky@redhat.com> - 1:0.4-0.30.b46
|
||||
- New upstream release 0.4b46 (#1376411)
|
||||
|
||||
* Thu Aug 11 2016 Josef Ridky <jridky@redhat.com> - 1:0.4-0.29.b45
|
||||
- Fix issue with ignoring -Q flag (#1366133)
|
||||
- Fix issue with SIGSEGV alert (#1365124)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user