Compare commits
10 Commits
fdd8429ee9
...
67cde2e78d
| Author | SHA1 | Date | |
|---|---|---|---|
|
67cde2e78d | ||
|
|
c1e809245e | ||
|
|
ec2f93284e | ||
|
|
e838e609d3 | ||
|
|
31cf4b2762 | ||
|
|
35d124a105 | ||
|
|
cc48ae7a6d | ||
|
|
138977f583 | ||
|
|
d8ad56ba66 | ||
|
|
30d3e3c262 |
120
0001-fix-multiple-define-for-gcc10.patch
Normal file
120
0001-fix-multiple-define-for-gcc10.patch
Normal file
@ -0,0 +1,120 @@
|
||||
From dac8b4b851ed8ed83ee5d44e8a42d16f7fe81f8a Mon Sep 17 00:00:00 2001
|
||||
From: wguanghao <wuguanghao3@huawei.com>
|
||||
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
|
||||
|
||||
Binary file not shown.
BIN
dump-0.4b47.tar.gz
Normal file
BIN
dump-0.4b47.tar.gz
Normal file
Binary file not shown.
@ -1,750 +0,0 @@
|
||||
diff --git a/MCONFIG.in b/MCONFIG.in
|
||||
new file mode 100644
|
||||
index 0000000..f5d1012
|
||||
--- /dev/null
|
||||
+++ b/MCONFIG.in
|
||||
@@ -0,0 +1,99 @@
|
||||
+VERSION= 0.4b44
|
||||
+DATE= June 10, 2011
|
||||
+
|
||||
+AR= @AR@
|
||||
+CC= @CC@
|
||||
+INSTALL= @INSTALL@
|
||||
+LD= @LD@
|
||||
+LN_S= @LN_S@
|
||||
+MV= @MV@
|
||||
+RANLIB= @RANLIB@
|
||||
+RM= @RM@
|
||||
+
|
||||
+BINOWNER= @BINOWNER@
|
||||
+BINGRP= @BINGRP@
|
||||
+BINMODE= @BINMODE@
|
||||
+MANOWNER= @MANOWNER@
|
||||
+MANGRP= @MANGRP@
|
||||
+MANMODE= @MANMODE@
|
||||
+
|
||||
+INSTALLBIN= $(INSTALL) -o $(BINOWNER) -g $(BINGRP) -m $(BINMODE)
|
||||
+INSTALLMAN= $(INSTALL) -o $(MANOWNER) -g $(MANGRP) -m $(MANMODE)
|
||||
+
|
||||
+prefix= @prefix@
|
||||
+exec_prefix= @exec_prefix@
|
||||
+SBINDIR= @sbindir@
|
||||
+MANDIR= @mandir@/man8
|
||||
+
|
||||
+DUMPDATESPATH= @DUMPDATESPATH@
|
||||
+#
|
||||
+# Global include directories
|
||||
+#
|
||||
+GINC= -I$(top_builddir) -I$(top_srcdir)/compat/include
|
||||
+# indicate where the ext2fs library can be found (this is not needed if you
|
||||
+# have run `make install-libs' in the e2fsprogs source directory).
|
||||
+GINC+= @EXT2FS_CFLAGS@
|
||||
+
|
||||
+#
|
||||
+# Global libraries
|
||||
+#
|
||||
+# indicate where the ext2fs library can be found (this is not needed if you
|
||||
+# have run `make install-libs' in the e2fsprogs source directory).
|
||||
+#GLIBDIR= -L/usr/src/e2fsprogs-0.5c/lib
|
||||
+GLIBS= $(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ @COM_ERR_LIBS@
|
||||
+
|
||||
+#
|
||||
+# Definitions (don't change them unless you know what you are doing)
|
||||
+#
|
||||
+DEFS= -DRDUMP -DRRESTORE -DLINUX_FORK_BUG -DHAVE_LZO -D_PATH_DUMPDATES=\"$(DUMPDATESPATH)\" -D_DUMP_VERSION=\"$(VERSION)\" @OPTDEFS@
|
||||
+
|
||||
+all::
|
||||
+
|
||||
+#
|
||||
+# Autoconf magic
|
||||
+#
|
||||
+
|
||||
+$(top_builddir)/config.status: $(top_srcdir)/configure
|
||||
+ (cd $(top_builddir); ./config.status --recheck)
|
||||
+
|
||||
+$(top_builddir)/MCONFIG: $(top_srcdir)/MCONFIG.in \
|
||||
+ $(top_builddir)/config.status
|
||||
+ (cd $(top_builddir); ./config.status)
|
||||
+
|
||||
+$(top_builddir)/config.h: $(top_srcdir)/config.h.in \
|
||||
+ $(top_builddir)/config.status
|
||||
+ (cd $(top_builddir); ./config.status)
|
||||
+
|
||||
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
|
||||
+ $(top_builddir)/config.status
|
||||
+ (cd $(top_builddir); ./config.status)
|
||||
+
|
||||
+$(top_srcdir)/configure: $(top_srcdir)/configure.in
|
||||
+ cd $(top_srcdir) && autoconf
|
||||
+
|
||||
+$(top_srcdir)/config.h.in: $(top_srcdir)/configure.in
|
||||
+ cd $(top_srcdir) && autoheader
|
||||
+
|
||||
+#
|
||||
+# Make depend magic
|
||||
+#
|
||||
+
|
||||
+.depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed
|
||||
+ if test -n "$(SRCS)" ; then \
|
||||
+ $(CC) -M $(CFLAGS) $(SRCS) | \
|
||||
+ sed -f $(top_srcdir)/depfix.sed \
|
||||
+ -e 's; $(srcdir)/; $$(srcdir)/;g' \
|
||||
+ -e 's; $(top_srcdir)/; $$(top_srcdir)/;g' \
|
||||
+ -e 's; $(top_builddir)/; $$(top_builddir)/;g' \
|
||||
+ -e 's; \./; ;g' \
|
||||
+ -e '/^ *\\$$/d' > .depend; \
|
||||
+ else :; fi
|
||||
+
|
||||
+depend:: .depend
|
||||
+ if test -n "$(SRCS)" ; then \
|
||||
+ sed -e '/^# +++ Dependency line eater +++/,$$d' \
|
||||
+ < Makefile | cat - .depend \
|
||||
+ > Makefile.new; \
|
||||
+ $(MV) Makefile Makefile.old; \
|
||||
+ $(MV) Makefile.new Makefile; \
|
||||
+ else :; fi
|
||||
diff --git a/configure.in b/configure.in
|
||||
new file mode 100644
|
||||
index 0000000..e40e01b
|
||||
--- /dev/null
|
||||
+++ b/configure.in
|
||||
@@ -0,0 +1,639 @@
|
||||
+AC_INIT(dump/dump.h)
|
||||
+AC_PREREQ(2.57)
|
||||
+
|
||||
+MCONFIG=./MCONFIG
|
||||
+AC_SUBST_FILE(MCONFIG)
|
||||
+
|
||||
+AC_CONFIG_HEADER(config.h)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for programs
|
||||
+dnl
|
||||
+AC_PROG_MAKE_SET
|
||||
+AC_PROG_LN_S
|
||||
+AC_PATH_PROG(CP, cp, cp)
|
||||
+AC_PATH_PROG(MV, mv, mv)
|
||||
+AC_PATH_PROG(RM, rm, rm)
|
||||
+AC_CHECK_TOOL(AR, ar, ar)
|
||||
+AC_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
+AC_CHECK_TOOL(PATCH, patch, :)
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_INSTALL
|
||||
+
|
||||
+AC_CHECK_HEADERS([sys/types.h])
|
||||
+
|
||||
+CPPFLAGS="-D_BSD_SOURCE -D_USE_BSD_SIGNAL ${CPPFLAGS}"
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-debug
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([debug],
|
||||
+[ --enable-debug include debugging code (default is NO)],
|
||||
+if test "$enableval" = "no"
|
||||
+then
|
||||
+ DUMPDEBUG=""
|
||||
+ RESTOREDEBUG=""
|
||||
+ echo "Not including debugging code"
|
||||
+else
|
||||
+ DUMPDEBUG="-DFDEBUG -DTDEBUG -DWRITEDEBUG -DDIRDEBUG"
|
||||
+ RESTOREDEBUG="-DDIRDEBUG"
|
||||
+ echo "Including debugging code"
|
||||
+fi,
|
||||
+DUMPDEBUG=""
|
||||
+RESTOREDEBUG=""
|
||||
+echo "Not including debugging code by default"
|
||||
+)
|
||||
+AC_SUBST(DUMPDEBUG)
|
||||
+AC_SUBST(RESTOREDEBUG)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-static
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([static],
|
||||
+[ --enable-static link dump and restore statically (default is NO)],
|
||||
+if test "$enableval" = "no"
|
||||
+then
|
||||
+ STATIC=""
|
||||
+ echo "Linking dump and restore dynamically"
|
||||
+else
|
||||
+ STATIC="-static"
|
||||
+ echo "Linking dump and restore statically"
|
||||
+fi
|
||||
+,
|
||||
+STATIC=""
|
||||
+echo "Linking dump and restore dynamically by default"
|
||||
+)
|
||||
+AC_SUBST(STATIC)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-staticz
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([staticz],
|
||||
+[ --enable-staticz link libz and libbz2 statically (default is NO)],
|
||||
+if test "$enableval" = "no"
|
||||
+then
|
||||
+ STATICZ="no"
|
||||
+ echo "Linking libz and libbz2 dynamically"
|
||||
+else
|
||||
+ STATICZ="yes"
|
||||
+ echo "Linking libz and libbz2 statically"
|
||||
+fi
|
||||
+,
|
||||
+STATICZ="no"
|
||||
+echo "Linking libz and libbz2 dynamically by default"
|
||||
+)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-rmt
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([rmt],
|
||||
+[ --enable-rmt compile and install rmt (default is YES)],
|
||||
+if test "$enableval" = "no"
|
||||
+then
|
||||
+ RMTDIR=""
|
||||
+ RMTMAKEFILE=""
|
||||
+ echo "Not compiling rmt"
|
||||
+else
|
||||
+ RMTDIR="rmt"
|
||||
+ RMTMAKEFILE="rmt/Makefile"
|
||||
+ echo "Compiling rmt"
|
||||
+fi
|
||||
+,
|
||||
+RMTDIR="rmt"
|
||||
+RMTMAKEFILE="rmt/Makefile"
|
||||
+echo "Compiling rmt by default"
|
||||
+)
|
||||
+AC_SUBST(RMTDIR)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-ermt
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([ermt],
|
||||
+[ --enable-ermt compile ermt, an encrypting version of rmt (default is NO)],
|
||||
+if test "$enableval" = "no"
|
||||
+then
|
||||
+ ERMT=""
|
||||
+ echo "Not compiling ermt"
|
||||
+else
|
||||
+ if test "$RMTDIR" = ""
|
||||
+ then
|
||||
+ AC_MSG_ERROR(ermt requires --enable-rmt)
|
||||
+ fi
|
||||
+ ERMT="ermt"
|
||||
+ echo "Compiling ermt"
|
||||
+fi
|
||||
+,
|
||||
+ERMT=""
|
||||
+echo "Not compiling ermt by default"
|
||||
+)
|
||||
+AC_SUBST(ERMT)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-kerberos
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([kerberos],
|
||||
+[ --enable-kerberos compile kerberos extensions (default is NO)],
|
||||
+if test "$enableval" = "yes"
|
||||
+then
|
||||
+ OPTDEFS="-DKERBEROS"
|
||||
+ echo "Compiling kerberos extensions"
|
||||
+else
|
||||
+ OPTDEFS=""
|
||||
+ echo "Not compiling kerberos extensions"
|
||||
+fi
|
||||
+,
|
||||
+OPTDEFS=""
|
||||
+echo "Not compiling kerberos extensions by default"
|
||||
+)
|
||||
+AC_SUBST(OPTDEFS)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-readline
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([readline],
|
||||
+[ --enable-readline enable readline support in restore (default is YES)],
|
||||
+if test "$enableval" = "no"
|
||||
+then
|
||||
+ READLINE=""
|
||||
+ echo "Not including readline support"
|
||||
+else
|
||||
+ READLINE="yes"
|
||||
+ AC_DEFINE([HAVE_READLINE],1,[Define if you want to include readline support.])
|
||||
+ echo "Including readline support"
|
||||
+fi
|
||||
+,
|
||||
+READLINE="yes"
|
||||
+AC_DEFINE([HAVE_READLINE],1,[Define if you want to include readline support.])
|
||||
+echo "Including readline support by default"
|
||||
+)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-oldsylefscript
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([oldstylefscript],
|
||||
+[ --enable-oldstylefscript enable old style F script (no arguments) (default is NO)],
|
||||
+if test "$enableval" = "yes"
|
||||
+then
|
||||
+ AC_DEFINE([OLD_STYLE_FSCRIPT],1,[Define this is you want old style F script (no arguments).])
|
||||
+ echo "Using old style F script"
|
||||
+else
|
||||
+ echo "Using new style F script"
|
||||
+fi
|
||||
+,
|
||||
+echo "Using new style F script by default"
|
||||
+)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-largefile
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([largefile],
|
||||
+[ --enable-largefile enable Large File System support (default is YES)],
|
||||
+if test "$enableval" = "yes"
|
||||
+then
|
||||
+ AC_DEFINE([USE_LFS],1,[Define this if you want Large File System support.])
|
||||
+ echo "Enabling Large File System support"
|
||||
+else
|
||||
+ echo "Not enabling Large File System support"
|
||||
+fi
|
||||
+,
|
||||
+AC_DEFINE([USE_LFS],1,[Define this if you want Large File System support.])
|
||||
+echo "Enabling Large File System support by default"
|
||||
+)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-qfa
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([qfa],
|
||||
+[ --enable-qfa enable Quick File Access support (default is YES)],
|
||||
+if test "$enableval" = "yes"
|
||||
+then
|
||||
+ AC_DEFINE([USE_QFA],1,[Define this if you want Quick File Access support.])
|
||||
+ echo "Enabling Quick File Access support"
|
||||
+else
|
||||
+ echo "Not enabling Quick File Access support"
|
||||
+fi
|
||||
+,
|
||||
+AC_DEFINE([USE_QFA],1,[Define this if you want Quick File Access support.])
|
||||
+echo "Enabling Quick File Access support by default"
|
||||
+)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-qfadebug
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([qfadebug],
|
||||
+[ --enable-qfadebug include Quick File Access debugging code (default is NO)],
|
||||
+if test "$enableval" = "yes"
|
||||
+then
|
||||
+ AC_DEFINE([DEBUG_QFA],1,[Define this if you want to include Quick File Access debugging code.])
|
||||
+ echo "Including Quick File Access debugging code"
|
||||
+else
|
||||
+ echo "Not including Quick File Access debugging code"
|
||||
+fi
|
||||
+,
|
||||
+echo "Not including Quick File Access debugging code by default"
|
||||
+)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-macosx
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([macosx],
|
||||
+[ --enable-macosx include Mac OSX restore compatibility (default is NO)],
|
||||
+if test "$enableval" = "yes"
|
||||
+then
|
||||
+ AC_DEFINE([DUMP_MACOSX],1,[Define this if you want to include Mac OSX restore compatibility.])
|
||||
+ echo "Including Mac OSX restore compatibility code"
|
||||
+else
|
||||
+ echo "Not including Mac OSX restore compatibility code"
|
||||
+fi
|
||||
+,
|
||||
+echo "Not including Mac OSX restore compatibility code by default"
|
||||
+)
|
||||
+
|
||||
+dnl
|
||||
+dnl Handle --enable-transselinux
|
||||
+dnl
|
||||
+AC_ARG_ENABLE([transselinux],
|
||||
+[ --enable-transselinux restore can translate SELinux EAs (default is YES)],
|
||||
+if test "$enableval" = "yes"
|
||||
+then
|
||||
+ LTRANSSELINUX="-lselinux"
|
||||
+ CCTRANSSELINUX="-DTRANSSELINUX"
|
||||
+ echo "restore can translate SELinux EAs"
|
||||
+else
|
||||
+ LTRANSSELINUX=""
|
||||
+ CCTRANSSELINUX=""
|
||||
+ echo "restore can not translate SELinux EAs"
|
||||
+fi
|
||||
+,
|
||||
+LTRANSSELINUX="-lselinux"
|
||||
+CCTRANSSELINUX="-DTRANSSELINUX"
|
||||
+echo "restore can translate SELinux EAs by default"
|
||||
+)
|
||||
+AC_SUBST(LTRANSSELINUX)
|
||||
+AC_SUBST(CCTRANSSELINUX)
|
||||
+
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(CC) from --with-cc=value
|
||||
+dnl
|
||||
+AC_ARG_WITH([cc],
|
||||
+[ --with-cc=COMPILER select compiler to use],
|
||||
+AC_MSG_RESULT(CC=$withval)
|
||||
+CC=$withval,
|
||||
+if test -z "$CC" ; then CC=cc; fi
|
||||
+[AC_MSG_RESULT(CC defaults to $CC)])dnl
|
||||
+export CC
|
||||
+AC_SUBST([CC])
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(LD) from --with-linker=value
|
||||
+dnl
|
||||
+AC_ARG_WITH([linker],
|
||||
+[ --with-linker=LINKER select linker to use],
|
||||
+AC_MSG_RESULT(LD=$withval)
|
||||
+LD=$withval,
|
||||
+if test -z "$LD" ; then LD=$CC; fi
|
||||
+[AC_MSG_RESULT(LD defaults to $LD)])dnl
|
||||
+export LD
|
||||
+AC_SUBST([LD])
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(CCOPTS) from --with-ccopts=value
|
||||
+dnl
|
||||
+AC_ARG_WITH([ccopts],
|
||||
+[ --with-ccopts=CCOPTS select compiler command line options],
|
||||
+AC_MSG_RESULT(CCOPTS is $withval)
|
||||
+CCOPTS=$withval
|
||||
+CFLAGS="$CFLAGS $withval",
|
||||
+CCOPTS=)dnl
|
||||
+AC_SUBST(CCOPTS)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(LDFLAGS) from --with-ldopts=value
|
||||
+dnl
|
||||
+AC_ARG_WITH([ldopts],
|
||||
+[ --with-ldopts=LDOPTS select linker command line options],
|
||||
+AC_MSG_RESULT(LDFLAGS is $withval)
|
||||
+LDOPTS=$withval
|
||||
+LDFLAGS="$LDFLAGS $withval",
|
||||
+LDOPTS=)dnl
|
||||
+AC_SUBST(LDOPTS)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(BINOWNER) from --with-binowner
|
||||
+dnl
|
||||
+AC_ARG_WITH([binowner],
|
||||
+[ --with-binowner=USER select owner for binaries],
|
||||
+AC_MSG_RESULT(BINOWNER is $withval)
|
||||
+BINOWNER=$withval,
|
||||
+BINOWNER=root
|
||||
+echo "BINOWNER defaults to $BINOWNER"
|
||||
+)dnl
|
||||
+AC_SUBST(BINOWNER)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(BINGRP) from --with-bingrp
|
||||
+dnl
|
||||
+AC_ARG_WITH([bingrp],
|
||||
+[ --with-bingrp=GROUP select group for binaries],
|
||||
+AC_MSG_RESULT(BINGRP is $withval)
|
||||
+BINGRP=$withval,
|
||||
+BINGRP=tty
|
||||
+echo "BINGRP defaults to $BINGRP"
|
||||
+)dnl
|
||||
+AC_SUBST(BINGRP)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(BINMODE) from --with-binmode
|
||||
+dnl
|
||||
+AC_ARG_WITH([binmode],
|
||||
+[ --with-binmode=MODE select mode for binaries],
|
||||
+AC_MSG_RESULT(BINMODE is $withval)
|
||||
+BINMODE=$withval,
|
||||
+BINMODE=0755
|
||||
+echo "BINMODE defaults to $BINMODE"
|
||||
+)dnl
|
||||
+AC_SUBST(BINMODE)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(MANOWNER) from --with-manowner
|
||||
+dnl
|
||||
+AC_ARG_WITH([manowner],
|
||||
+[ --with-manowner=USER select owner for manual pages],
|
||||
+AC_MSG_RESULT(MANOWNER is $withval)
|
||||
+MANOWNER=$withval,
|
||||
+MANOWNER=man
|
||||
+echo "MANOWNER defaults to $MANOWNER"
|
||||
+)dnl
|
||||
+AC_SUBST(MANOWNER)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(MANGRP) from --with-mangrp
|
||||
+dnl
|
||||
+AC_ARG_WITH([mangrp],
|
||||
+[ --with-mangrp=GROUP select group for manual pages],
|
||||
+AC_MSG_RESULT(MANGRP is $withval)
|
||||
+MANGRP=$withval,
|
||||
+MANGRP=tty
|
||||
+echo "MANGRP defaults to $MANGRP"
|
||||
+)dnl
|
||||
+AC_SUBST(MANGRP)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(MANMODE) from --with-manmode
|
||||
+dnl
|
||||
+AC_ARG_WITH([manmode],
|
||||
+[ --with-manmode=MODE select mode for manual pages],
|
||||
+AC_MSG_RESULT(MANMODE is $withval)
|
||||
+MANMODE=$withval,
|
||||
+MANMODE=0644
|
||||
+echo "MANMODE defaults to $MANMODE"
|
||||
+)dnl
|
||||
+AC_SUBST(MANMODE)
|
||||
+
|
||||
+dnl
|
||||
+dnl set $(DUMPDATESPATH) from --with-dumpdatespath
|
||||
+dnl
|
||||
+AC_ARG_WITH([dumpdatespath],
|
||||
+[ --with-dumpdatespath=PATH select path for dumpdates file],
|
||||
+AC_MSG_RESULT(DUMPDATESPATH is $withval)
|
||||
+DUMPDATESPATH=$withval,
|
||||
+DUMPDATESPATH="${sysconfdir}/dumpdates"
|
||||
+echo "DUMPDATESPATH defaults to $DUMPDATESPATH"
|
||||
+)dnl
|
||||
+AC_SUBST(DUMPDATESPATH)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for Ext2fs headers and libraries
|
||||
+dnl
|
||||
+AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no], [-])
|
||||
+PKG_CHECK_MODULES(EXT2FS, [ext2fs])
|
||||
+if test -n "$STATIC" ; then
|
||||
+ EXT2FS_LIBS=`$PKG_CONFIG --libs --static ext2fs`
|
||||
+fi
|
||||
+if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
|
||||
+ AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
|
||||
+fi
|
||||
+
|
||||
+PKG_CHECK_MODULES(COM_ERR, [com_err])
|
||||
+if test -n "$STATIC" ; then
|
||||
+ COM_ERR_LIBS=`$PKG_CONFIG --libs --static com_err`
|
||||
+fi
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for ext2fs_read_inode_full
|
||||
+dnl
|
||||
+AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [-lcom_err])
|
||||
+if test "$rif" = yes; then
|
||||
+ AC_DEFINE([HAVE_EXT2FS_READ_INODE_FULL],1,[Define this if your ext2fs libs have the ext2fs_read_inode_full function.])
|
||||
+fi
|
||||
+
|
||||
+dnl
|
||||
+dnl Try to use ext2_fs.h header from libext2fs instead of from the kernel
|
||||
+dnl
|
||||
+AC_CHECK_HEADERS(ext2fs/ext2_fs.h, [], [], [-])
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for ext2_ino_t type
|
||||
+dnl
|
||||
+AC_MSG_CHECKING(for ext2_ino_t type in libext2fs headers)
|
||||
+AC_TRY_COMPILE([#include <stdio.h>
|
||||
+#ifdef HAVE_EXT2FS_EXT2_FS_H
|
||||
+#include <ext2fs/ext2_fs.h>
|
||||
+#else
|
||||
+#include <linux/ext2_fs.h>
|
||||
+#endif
|
||||
+#include <ext2fs/ext2fs.h>],
|
||||
+[ext2_ino_t ino = 0;],
|
||||
+[AC_DEFINE([HAVE_EXT2_INO_T],1,[Define if we have the ext2_ino_t type (from e2fsprogs 1.20+).])
|
||||
+ AC_MSG_RESULT(yes)],
|
||||
+AC_MSG_RESULT(no))
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for s_journal_inum field in ext2_super_block struct
|
||||
+dnl
|
||||
+AC_MSG_CHECKING(for s_journal_inum field in ext2_super_block struct)
|
||||
+AC_TRY_COMPILE([#include <stdio.h>
|
||||
+#ifdef HAVE_EXT2FS_EXT2_FS_H
|
||||
+#include <ext2fs/ext2_fs.h>
|
||||
+#else
|
||||
+#include <linux/ext2_fs.h>
|
||||
+#endif
|
||||
+#include <ext2fs/ext2fs.h>],
|
||||
+[struct ext2_super_block es; es.s_journal_inum = 0;],
|
||||
+[AC_DEFINE([HAVE_EXT2_JOURNAL_INUM],1,[Define if we have the s_journal_inum field in struct ext2_super_block.])
|
||||
+ AC_MSG_RESULT(yes)],
|
||||
+AC_MSG_RESULT(no))
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for blkid headers libraries
|
||||
+dnl
|
||||
+AC_CHECK_HEADER(blkid/blkid.h, [blkid_h=yes], [blkid_h=no], [-])
|
||||
+PKG_CHECK_EXISTS([blkid],
|
||||
+ [
|
||||
+ if test -n $STATIC ; then
|
||||
+ BLKID=`$PKG_CONFIG --libs --static blkid`
|
||||
+ else
|
||||
+ BLKID=`$PKG_CONFIG --libs blkid`
|
||||
+ fi
|
||||
+ if test "$blkid_h" = yes ; then
|
||||
+ AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
|
||||
+ fi
|
||||
+ ],[BLKID=""])
|
||||
+AC_SUBST(BLKID)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for ncurses or termcap libraries
|
||||
+dnl
|
||||
+AC_CHECK_LIB(ncurses, tgetent, [ncurses_lib=yes], [ncurses_lib=no])
|
||||
+AC_CHECK_LIB(termcap, tgetent, [termcap_lib=yes], [termcap_lib=no])
|
||||
+AC_CHECK_LIB(tinfo, tgetent, [tinfo_lib=yes], [tinfo_lib=no])
|
||||
+
|
||||
+if test "$ncurses_lib" = no -a "$termcap_lib" = no -a "$tinfo_lib" = no; then
|
||||
+ if test "$READLINE" = "yes"; then
|
||||
+ AC_MSG_ERROR(You need to install the ncurses or termcap library or configure without --enable-readline)
|
||||
+ fi
|
||||
+fi
|
||||
+if test "$tinfo_lib" = yes; then
|
||||
+ rdllib="-ltinfo"
|
||||
+elif test "$ncurses_lib" = yes; then
|
||||
+ rdllib="-lncurses"
|
||||
+elif test "$termcap_lib" = yes; then
|
||||
+ rdllib="-ltermcap"
|
||||
+fi
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for readline headers and libraries
|
||||
+dnl
|
||||
+AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no], [-])
|
||||
+AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], $rdllib)
|
||||
+if test "$readline_h" = no -o "$readline_lib" = no; then
|
||||
+ if test "$READLINE" = "yes"; then
|
||||
+ AC_MSG_ERROR(You need to install the GNU readline library or configure without --enable-readline)
|
||||
+ fi
|
||||
+fi
|
||||
+if test "$READLINE" = yes; then
|
||||
+ READLINE="-lreadline $rdllib"
|
||||
+fi
|
||||
+AC_SUBST(READLINE)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for rl_completion_matches
|
||||
+dnl
|
||||
+AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], "-ltermcap")
|
||||
+if test "$rlcm" = yes; then
|
||||
+ AC_DEFINE([HAVE_READLINE_RLCM],1,[Define this if your readline libs have the rl_completion_matches library.])
|
||||
+fi
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for rl_completion_append_character
|
||||
+dnl
|
||||
+AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], "-ltermcap")
|
||||
+if test "$rcac" = yes; then
|
||||
+ AC_DEFINE([HAVE_READLINE_CAC],1,[Define this if your readline libs have the rl_completion_append_character variable.])
|
||||
+fi
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for zlib headers and libraries
|
||||
+dnl
|
||||
+AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no], [-])
|
||||
+AC_CHECK_LIB(z, zlibVersion, [zlib_lib=yes], [zlib_lib=no])
|
||||
+if test "$zlib_h" = yes -a "$zlib_lib" = yes; then
|
||||
+ if test "$STATICZ" = yes; then
|
||||
+ ZLIB="-Wl,-Bstatic -lz -Wl,-Bdynamic"
|
||||
+ else
|
||||
+ ZLIB="-lz"
|
||||
+ fi
|
||||
+ AC_DEFINE([HAVE_ZLIB],1,[Define this if you have zlib compression library.])
|
||||
+else
|
||||
+ ZLIB=""
|
||||
+fi
|
||||
+AC_SUBST(ZLIB)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for bzlib headers and libraries
|
||||
+dnl
|
||||
+AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no], [-])
|
||||
+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [bzlib_lib=yes], [bzlib_lib=no])
|
||||
+if test "$bzlib_h" = yes -a "$bzlib_lib" = yes; then
|
||||
+ if test "$STATICZ" = yes; then
|
||||
+ BZLIB="-Wl,-Bstatic -lbz2 -Wl,-Bdynamic"
|
||||
+ else
|
||||
+ BZLIB="-lbz2"
|
||||
+ fi
|
||||
+ AC_DEFINE([HAVE_BZLIB],1,[Define this if you have bzlib compression library.])
|
||||
+else
|
||||
+ BZLIB=""
|
||||
+fi
|
||||
+AC_SUBST(BZLIB)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for library functions
|
||||
+dnl
|
||||
+AC_CHECK_FUNCS(err errx verr verrx vwarn vwarnx warn warnx realpath lchown)
|
||||
+AC_CHECK_FUNC(glob)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for GLOB_ALTDIRFUNC
|
||||
+dnl
|
||||
+AC_MSG_CHECKING(for extended glob routines)
|
||||
+if test "$ac_cv_func_glob" = "yes"; then
|
||||
+ AC_EGREP_CPP(yes,
|
||||
+ [
|
||||
+# include <glob.h>
|
||||
+# ifdef GLOB_ALTDIRFUNC
|
||||
+ yes
|
||||
+# endif
|
||||
+ ],
|
||||
+ [
|
||||
+ AC_DEFINE([HAVE_GLOB],1,[Define if you have the glob function.])
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ ],
|
||||
+ [
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ echo "Your system does not support extended glob, will use the internal routines"
|
||||
+ ])
|
||||
+fi
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for OpenSSL, for ermt
|
||||
+dnl
|
||||
+if test "$ERMT" != ""; then
|
||||
+ AC_CHECK_HEADER(openssl/evp.h, [evp_h=yes], [evp_h=no])
|
||||
+ AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_set_padding, [crypto_lib=yes], [crypto_lib=no])
|
||||
+ PKG_CHECK_EXISTS([libcrypto],
|
||||
+ [
|
||||
+ if test -n $STATIC ; then
|
||||
+ CRYPTO=`$PKG_CONFIG --libs --static libcrypto`
|
||||
+ else
|
||||
+ CRYPTO=`$PKG_CONFIG --libs libcrypto`
|
||||
+ fi
|
||||
+ ],[CRYPTO=""])
|
||||
+ if test "$evp_h" = no -o "x$CRYPTO" = "x"; then
|
||||
+ AC_MSG_ERROR(You need to install the OpenSSL library (version 0.9.7a or later), or configure without --enable-ermt)
|
||||
+ fi
|
||||
+fi
|
||||
+AC_SUBST(CRYPTO)
|
||||
+
|
||||
+dnl
|
||||
+dnl Check for types
|
||||
+dnl
|
||||
+AC_CHECK_TYPE(quad_t, int64_t)
|
||||
+AC_CHECK_TYPE(u_quad_t, uint64_t)
|
||||
+
|
||||
+dnl
|
||||
+dnl Compute top_buildir
|
||||
+dnl
|
||||
+top_builddir=`cd .; pwd`
|
||||
+AC_SUBST(top_builddir)
|
||||
+
|
||||
+dnl
|
||||
+dnl Create directories
|
||||
+dnl
|
||||
+test -d compat || mkdir compat
|
||||
+test -d compat/lib || mkdir compat/lib
|
||||
+
|
||||
+dnl
|
||||
+dnl Output files
|
||||
+dnl
|
||||
+AC_OUTPUT(MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE)
|
||||
@ -1,28 +0,0 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index e40e01b..cd8c35b 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -551,6 +551,23 @@ fi
|
||||
AC_SUBST(ZLIB)
|
||||
|
||||
dnl
|
||||
+dnl Check for lzo headers and libraries
|
||||
+dnl
|
||||
+AC_CHECK_HEADER(lzo/minilzo.h, [minilzo_h=yes], [minilzo_h=no], [-])
|
||||
+AC_CHECK_LIB(minilzo, lzo1x_1_compress, [minilzo_lib=yes], [minilzo_lib=no])
|
||||
+if test "$minilzo_h" = yes -a "$minilzo_lib" = yes; then
|
||||
+ if test "$STATICZ" = yes; then
|
||||
+ LZOLIB="-Wl,-Bstatic -lminilzo -Wl,-Bdynamic"
|
||||
+ else
|
||||
+ LZOLIB="-lminilzo"
|
||||
+ fi
|
||||
+ AC_DEFINE([HAVE_LZO],1,[Define this if you have lzo library.])
|
||||
+else
|
||||
+ LZOLIB=""
|
||||
+fi
|
||||
+AC_SUBST(LZOLIB)
|
||||
+
|
||||
+dnl
|
||||
dnl Check for bzlib headers and libraries
|
||||
dnl
|
||||
AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no], [-])
|
||||
26
dump.spec
26
dump.spec
@ -1,16 +1,15 @@
|
||||
Name: dump
|
||||
Epoch: 1
|
||||
Version: 0.4
|
||||
Release: 2
|
||||
Release: 7
|
||||
Summary: Programs for backing up and restoring ext2/3/4 filesystems
|
||||
License: BSD
|
||||
URL: http://dump.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/dump/dump-0.4b46.tar.gz
|
||||
Source0: http://downloads.sourceforge.net/dump/dump-%{version}b47.tar.gz
|
||||
|
||||
Patch0: dump-buildfix.patch
|
||||
Patch1: dump-remove-lzo.patch
|
||||
Patch1: 0001-fix-multiple-define-for-gcc10.patch
|
||||
|
||||
BuildRequires: make e2fsprogs-devel readline-devel automake libtool gdb
|
||||
BuildRequires: make e2fsprogs-devel readline-devel automake libtool
|
||||
BuildRequires: bzip2-devel libselinux-devel zlib-devel lzo-devel
|
||||
|
||||
Requires: setup rmt
|
||||
@ -28,7 +27,7 @@ Single files and directory subtrees may also be restored from full or partial ba
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-0.4b46 -p1
|
||||
%autosetup -n %{name}-0.4b47 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
@ -70,6 +69,21 @@ popd
|
||||
%{_mandir}/*/*
|
||||
|
||||
%changelog
|
||||
* Wed Nov 16 2022 wangzhiqiang <wangzhiqiang95@huawei.com> - 1:0.4-7
|
||||
- the tar package is consistent with that in the upstream community
|
||||
|
||||
* Sat Oct 29 2022 wangzhiqiang <wangzhiqiang95@huawei.com> - 1:0.4-6
|
||||
- modify source0 url
|
||||
|
||||
* Wed Nov 17 2021 Wenchao Hao <haowenchao@huawei.com> - 0.4-5
|
||||
- Update to dump-0.4b47
|
||||
|
||||
* Wed Aug 04 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.4-4
|
||||
- DESC: delete BuildRequires gdb
|
||||
|
||||
* Fri Jul 30 2021 yanglongkang <yanglongkang@huawei.com> - 1:0.4-3
|
||||
- fix multiple define for gcc10
|
||||
|
||||
* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:0.4-2
|
||||
- Add build requires of gdb
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user