rpms/restore
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New update to version 0.4b45

Browse Source
This commit is contained in:
Josef Ridky 2016-07-29 09:48:18 +02:00
parent 857b8bf2ac
commit 232d6b2379
9 changed files with 757 additions and 3101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
dump-0.4b43.tar.gz
/dump-0.4b44.tar.gz
/dump-0.4b45.tar.gz

2924
dump-aarch64.patch
View File

File diff suppressed because it is too large Load Diff

767
dump-buildfix.patch
View File

@ -1,27 +1,750 @@
diff -up dump-0.4b44/configure.in.buildfix dump-0.4b44/configure.in
--- dump-0.4b44/configure.in.buildfix 2011-06-14 14:37:49.659652746 +0200
+++ dump-0.4b44/configure.in 2011-06-14 14:40:47.361349814 +0200
@@ -415,6 +415,11 @@ if test "$ext2fs_h" = no -o "x$EXT2FS_LI
AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
fi
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
diff -up dump-0.4b44/MCONFIG.in.buildfix dump-0.4b44/MCONFIG.in
--- dump-0.4b44/MCONFIG.in.buildfix 2011-06-14 14:41:00.869323616 +0200
+++ dump-0.4b44/MCONFIG.in 2011-06-14 14:41:12.947300187 +0200
@@ -40,7 +40,7 @@ GINC+= @EXT2FS_CFLAGS@
# 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@
+GLIBS= $(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ @COM_ERR_LIBS@
#
# Definitions (don't change them unless you know what you are doing)
+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)

82
dump-remove-lzo.patch
View File

@ -1,20 +1,5 @@
diff --git a/compat/lib/Makefile.in b/compat/lib/Makefile.in
index cc90969..59afee1 100644
--- a/compat/lib/Makefile.in
+++ b/compat/lib/Makefile.in
@@ -8,8 +8,8 @@ top_builddir= ../..
INC= -I$(top_srcdir)/compat/include
ALL_CFLAGS= @CPPFLAGS@ @CFLAGS@ @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS)
-SRCS= compaterr.c compatglob.c bylabel.c system.c rmtflags.c minilzo.c
-OBJS= compaterr.o compatglob.o bylabel.o system.o rmtflags.o minilzo.o
+SRCS= compaterr.c compatglob.c bylabel.c system.c rmtflags.c
+OBJS= compaterr.o compatglob.o bylabel.o system.o rmtflags.o
LIB= libcompat.a
.c.o:
diff --git a/configure.in b/configure.in
index e40e01b..f9d79c4 100644
index e40e01b..cd8c35b 100644
--- a/configure.in
+++ b/configure.in
@@ -551,6 +551,23 @@ fi
@ -41,68 +26,3 @@ index e40e01b..f9d79c4 100644
dnl Check for bzlib headers and libraries
dnl
AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no], [-])
diff --git a/restore/tape.c b/restore/tape.c
index 7debfd1..6376f63 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -98,7 +98,7 @@ static const char rcsid[] =
#endif /* HAVE_BZLIB */
#ifdef HAVE_LZO
-#include <minilzo.h>
+#include <lzo/minilzo.h>
#endif /* HAVE_LZO */
#include "restore.h"
diff --git a/dump/Makefile.in b/dump/Makefile.in
index f18c01e..1050ce5 100644
--- a/dump/Makefile.in
+++ b/dump/Makefile.in
@@ -9,7 +9,7 @@ top_builddir= ..
INC= -I$(top_srcdir)/dump
ALL_CFLAGS= @CPPFLAGS@ @CFLAGS@ @CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS) @DUMPDEBUG@
ALL_LDFLAGS= @LDFLAGS@ @LDOPTS@ @STATIC@
-LIBS= $(GLIBS) @ZLIB@ @BZLIB@ @BLKID@
+LIBS= $(GLIBS) @ZLIB@ @BZLIB@ @BLKID@ @LZOLIB@
DEPLIBS= ../compat/lib/libcompat.a
PROG= dump
diff --git a/dump/tape.c b/dump/tape.c
index e46d626..c7d761a 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -101,7 +101,8 @@ int write(), read();
#endif /* HAVE_BZLIB */
#ifdef HAVE_LZO
-#include <minilzo.h>
+#include <lzo/minilzo.h>
+#include <lzo/lzo1x.h>
#endif /* HAVE_LZO */
#include "dump.h"
diff --git a/restore/tape.c b/restore/tape.c
index 6376f63..7eb1c6c 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -99,6 +99,7 @@ static const char rcsid[] =
#ifdef HAVE_LZO
#include <lzo/minilzo.h>
+#include <lzo/lzo1x.h>
#endif /* HAVE_LZO */
#include "restore.h"
diff --git a/restore/Makefile.in b/restore/Makefile.in
index 6257187..1b6e214 100644
--- a/restore/Makefile.in
+++ b/restore/Makefile.in
@@ -9,7 +9,7 @@ top_builddir= ..
INC= -I$(top_srcdir)/restore
ALL_CFLAGS= @CPPFLAGS@ @CFLAGS@ @CCOPTS@ @CCTRANSSELINUX@ -pipe $(OPT) $(GINC) $(INC) $(DEFS) @RESTOREDEBUG@
ALL_LDFLAGS= @LDFLAGS@ @LDOPTS@ @STATIC@
-LIBS= $(GLIBS) -le2p @READLINE@ @ZLIB@ @BZLIB@ @LTRANSSELINUX@
+LIBS= $(GLIBS) -le2p @READLINE@ @ZLIB@ @BZLIB@ @LZOLIB@ @LTRANSSELINUX@
DEPLIBS= ../compat/lib/libcompat.a
PROG= restore

13
dump-restore-rmdir.patch
View File

@ -1,13 +0,0 @@
diff --git a/restore/restore.c b/restore/restore.c
index c773d90..8f89729 100644
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -593,7 +593,7 @@ findunreflinks(void)
if (np->e_type == LEAF) {
removeleaf(np);
freeentry(np);
- } else {
+ } else if (np->e_ino != 0){
np->e_flags |= TMPNAME;
deleteino(np->e_ino);
np->e_next = removelist;

32
dump-rh664616.patch
View File

@ -1,32 +0,0 @@
diff -up dump-0.4b44/restore/restore.8.in.rh664616 dump-0.4b44/restore/restore.8.in
--- dump-0.4b44/restore/restore.8.in.rh664616 2013-01-17 12:03:47.496676949 +0100
+++ dump-0.4b44/restore/restore.8.in 2013-01-17 12:04:23.081674477 +0100
@@ -142,7 +142,7 @@ current directory.
.TP
.B add \fR[\fIarg\fR]
The current directory or specified argument is added to the list of files to be
-extracted. If a directory is specified, then it and all its descendents are
+extracted. If a directory is specified, then it and all its descendants are
added to the extraction list (unless the
.B \-h
flag is specified on the command line). Files that are on the extraction list
@@ -154,7 +154,7 @@ Change the current working directory to
.TP
.B delete \fR[\fIarg\fR]
The current directory or specified argument is deleted from the list of files
-to be extracted. If a directory is specified, then it and all its descendents
+to be extracted. If a directory is specified, then it and all its descendants
are deleted from the extraction list (unless the
.B \-h
flag is specified on the command line). The most expedient way to extract most
@@ -164,8 +164,8 @@ and then delete those files that are not
.B extract
All files on the extraction list are extracted from the dump.
.B Restore
-will ask which volume the user wishes to mount. The fastest way to extract a f
-ew files is to start with the last volume and work towards the first volume.
+will ask which volume the user wishes to mount. The fastest way to extract a few
+files is to start with the last volume and work towards the first volume.
.TP
.B help
List a summary of the available commands.

10
dump-rmt-moved-star.patch
View File

@ -1,10 +0,0 @@
diff --git a/compat/include/pathnames.h b/compat/include/pathnames.h
index 281d204..2f2885a 100644
--- a/compat/include/pathnames.h
+++ b/compat/include/pathnames.h
@@ -54,4 +54,4 @@
#endif
#endif
-#define _PATH_RMT "/etc/rmt" /* path on remote host */
+#define _PATH_RMT "/usr/sbin/rmt" /* path on remote host */

27
dump.spec
View File

@ -1,11 +1,11 @@
%define PREVER b44
%define PREVER b45
%define VERSION 0.4%{PREVER}
Summary: Programs for backing up and restoring ext2/ext3 filesystems
Summary: Programs for backing up and restoring ext2/ext3/ext4 filesystems
Name: dump
Epoch: 1
Version: 0.4
Release: 0.27.%{PREVER}%{?dist}
Release: 0.1.%{PREVER}%{?dist}
License: BSD
Group: Applications/Archiving
URL: http://dump.sourceforge.net/
@ -24,11 +24,7 @@ Obsoletes: dump-static
Provides: dump-static
Patch0: dump-buildfix.patch
Patch1: dump-rh664616.patch
Patch2: dump-aarch64.patch
Patch3: dump-rmt-moved-star.patch
Patch4: dump-remove-lzo.patch
Patch5: dump-restore-rmdir.patch
Patch1: dump-remove-lzo.patch
%description
The dump package contains both dump and restore. Dump examines files
@ -46,22 +42,14 @@ restoring filesystems after backups.
%setup -q -n dump-%{VERSION}
%patch0 -p1 -b .buildfix
%patch1 -p1 -b .rh664616
%patch2 -p1 -b .aarch64
%patch3 -p1 -b .rmt-moved-star
%patch4 -p1 -b .remove-lzo
%patch5 -p1 -b .restore-rmdir
%patch1 -p1 -b .remove-lzo
for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do
for i in MAINTAINERS COPYING ChangeLog; do
iconv -f iso-8859-1 -t utf-8 $i -o $i.new
touch -r $i $i.new
mv $i.new $i
done
rm compat/include/lzoconf.h
rm compat/include/minilzo.h
rm compat/lib/minilzo.c
%build
autoreconf -fiv
@ -121,6 +109,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/rrestore.8*
%changelog
* Fri Jul 29 2016 Josef Ridky <jridky@redhat.com> - 1:0.4-0.1.b45
- New upstream release 0.4b45 (#1361495)
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4-0.27.b44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
daec97b1ad905c904eba926221f4be6d dump-0.4b44.tar.gz
dd1393bb8d642b1122324faa94f687ac dump-0.4b45.tar.gz