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

Do not ship lzo in dump package (#1132282)

Browse Source 
Signed-off-by: Petr Hracek <phracek@redhat.com>
This commit is contained in:
Petr Hracek 2015-01-20 13:38:20 +01:00
parent b1e968ba09
commit d1ae9458f3
2 changed files with 126 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
dump-remove-lzo.patch Normal file
View File

@ -0,0 +1,108 @@
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
--- 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], [-])
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

25
dump.spec
View File

@ -5,7 +5,7 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems
Name: dump
Epoch: 1
Version: 0.4
Release: 0.23.%{PREVER}%{?dist}
Release: 0.24.%{PREVER}%{?dist}
License: BSD
Group: Applications/Archiving
URL: http://dump.sourceforge.net/
@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2
BuildRequires: zlib-devel, bzip2-devel, automake
BuildRequires: device-mapper-devel, libselinux-devel
BuildRequires: lzo-minilzo
BuildRequires: lzo-devel
# This Requires is now mandatory because we need to ensure the "disk"
# group is created before installation (#60461)
Requires: setup
@ -25,6 +27,7 @@ Patch0: dump-buildfix.patch
Patch1: dump-rh664616.patch
Patch2: dump-aarch64.patch
Patch3: dump-rmt-moved-star.patch
Patch4: dump-remove-lzo.patch
%description
The dump package contains both dump and restore. Dump examines files
@ -45,6 +48,7 @@ restoring filesystems after backups.
%patch1 -p1 -b .rh664616
%patch2 -p1 -b .aarch64
%patch3 -p1 -b .rmt-moved-star
%patch4 -p1 -b .remove-lzo
for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do
iconv -f iso-8859-1 -t utf-8 $i -o $i.new
@ -52,6 +56,10 @@ for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do
mv $i.new $i
done
rm compat/include/lzoconf.h
rm compat/include/minilzo.h
rm compat/lib/minilzo.c
%build
autoreconf -fiv
@ -111,6 +119,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/rrestore.8*
%changelog
* Wed Dec 17 2014 Petr Hracek <phracek@redhat.com> - 1:0.4-0.24.b44
- Do not ship lzo in dump package (#1132282)
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.4-0.23.b44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@ -197,7 +208,7 @@ rm -rf %{buildroot}
- dump-rh489853.patch
- fix NVR to conform to Fedora policies
* Mon Apr 04 2009 Adam Tkac <atkac redhat com> 0.4b41-13
* Sat Apr 04 2009 Adam Tkac <atkac redhat com> 0.4b41-13
- display dump level correctly in all cases (#493635)
- -A option is not valid when -P is specified, correct manual page (#490627)
- fix typos in manual pages (#489853)
@ -235,7 +246,7 @@ rm -rf %{buildroot}
* Mon Jan 29 2007 Adam Tkac <atkac redhat com> 0.4b41-4
- added Andrew Kroeger's patch. Immutable files are restored correctly
* Wed Jan 18 2007 Adam Tkac <atkac redhat com> 0.4b41-3
* Thu Jan 18 2007 Adam Tkac <atkac redhat com> 0.4b41-3
- dump is now linked dynamically
- removed termcap dependency
@ -254,7 +265,7 @@ rm -rf %{buildroot}
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.4b41-1.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Tue Jan 11 2006 Jindrich Novy <jnovy@redhat.com> 0.4b41-1
* Wed Jan 11 2006 Jindrich Novy <jnovy@redhat.com> 0.4b41-1
- update to 0.4b41
- drop .fixacl patch, now applied in the new upstream release
- link against device-mapper
@ -497,7 +508,7 @@ rm -rf %{buildroot}
* Mon Jan 10 2000 Jeff Johnson <jbj@redhat.com.
- update to 0.4b12.
* Fri Jan 8 2000 Stelian Pop <pop@cybercable.fr>
* Sat Jan 8 2000 Stelian Pop <pop@cybercable.fr>
- dump 0.4b12 released, first packaging.
* Sun Dec 5 1999 Stelian Pop <pop@cybercable.fr>
@ -512,13 +523,13 @@ rm -rf %{buildroot}
* Thu Nov 11 1999 Stelian Pop <pop@cybercable.fr>
- make static versions also for rescue purposes.
* Wed Nov 5 1999 Stelian Pop <pop@cybercable.fr>
* Fri Nov 5 1999 Stelian Pop <pop@cybercable.fr>
- dump 0.4b9 released, first packaging.
* Wed Nov 3 1999 Stelian Pop <pop@cybercable.fr>
- dump 0.4b8 released, first packaging.
* Thu Oct 8 1999 Stelian Pop <pop@cybercable.fr>
* Fri Oct 8 1999 Stelian Pop <pop@cybercable.fr>
- dump 0.4b7 released, first packaging.
* Thu Sep 30 1999 Stelian Pop <pop@cybercable.fr>