SHA256
1
0
forked from pool/libewf

Accepting request 133169 from security

Upgrade to latest release
Remove Requires libewf from ewftools subpackage as requested by Coolo.
Workaround BNC 778993 license issue by using GPL-3.0+ for now (forwarded request 133168 from gregfreemyer)

OBS-URL: https://build.opensuse.org/request/show/133169
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libewf?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2012-09-11 09:25:02 +00:00 committed by Git OBS Bridge
parent a93c19c8cf
commit e433315f4e
6 changed files with 65 additions and 45 deletions

View File

@ -1,24 +0,0 @@
diff -up libewf-20100226/pyewf/Makefile.am.pyver libewf-20100226/pyewf/Makefile.am
--- libewf-20100226/pyewf/Makefile.am.pyver 2009-04-02 20:06:28.000000000 +0200
+++ libewf-20100226/pyewf/Makefile.am 2010-03-08 21:57:07.336202089 +0100
@@ -11,7 +11,7 @@ pyewf_la_SOURCES = \
pyewf_la_LIBADD = ../libewf/libewf.la
pyewf_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
-pyewf_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
+pyewf_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
endif
diff -up libewf-20100226/pyewf/Makefile.in.pyver libewf-20100226/pyewf/Makefile.in
--- libewf-20100226/pyewf/Makefile.in.pyver 2010-02-26 18:50:52.000000000 +0100
+++ libewf-20100226/pyewf/Makefile.in 2010-03-08 21:56:34.855197908 +0100
@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
@HAVE_PYTHON_TRUE@pyewf_la_LIBADD = ../libewf/libewf.la
@HAVE_PYTHON_TRUE@pyewf_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
-@HAVE_PYTHON_TRUE@pyewf_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
+@HAVE_PYTHON_TRUE@pyewf_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
all: all-am
.SUFFIXES:

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a
size 801413

3
libewf-20120813.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a127713185b11f9387a0b0ae2f7bb56d3bfbc9550c3411509ef081b5bbee5c9c
size 1556190

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Sep 6 22:19:56 UTC 2012 - Greg.Freemyer@gmail.com
- change license to GPL-3.0+ until upstream resolves LGPL-3.0+ status (BNC# 778993)
- run spec-cleaner
- make soname a define
- remove requires libewf from ewftools sub-package
-------------------------------------------------------------------
Wed Sep 5 15:36:24 UTC 2012 - Greg.Freemyer@gmail.com
- upgrade to libewf-20120813
* Bug fixes and multiple enhancements
* soname update from 1 to 2
* see ChangeLog
- remove pyver patch, now upstream
- add remove_date_time_macros.patch to keep builds consistent
- add zlib as requires as per sample specfile in tarball
- Add SLES build support
-------------------------------------------------------------------
Wed Feb 8 09:39:32 UTC 2012 - saschpe@suse.de

View File

@ -16,23 +16,33 @@
#
#
%define soname 2
Name: libewf
Version: 0.0.0+20100226
Version: 0.0.0+20120813
Release: 0
License: LGPL-3.0+
# Per website the code is LGPL-3.0+, but GPL code is present.
# Upstream has been asked to resolve
# License: LGPL-3.0+
Summary: Library for the Expert Witness Compression Format (EWF)
Url: http://sourceforge.net/projects/libewf/
License: GPL-3.0+
Group: System/Libraries
Source0: http://sourceforge.net/projects/libewf/files/libewf/libewf-20100226/libewf-20100226.tar.gz
Url: http://sourceforge.net/projects/libewf/
Source0: http://sourceforge.net/projects/libewf/files/libewf2/libewf-20120813/libewf-20120813.tar.gz
Source1: http://sourceforge.net/projects/libewf/files/mount_ewf/mount_ewf-20090113/mount_ewf-20090113.py
Patch0: libewf-20100226-pyver.patch
# PATCH-FIX-OPENSUSE remove_date_time_macros.patch Greg.Freemyer@gmail.com -- rpmlint complains about the macros
Patch0: remove_date_time_macros.patch
BuildRequires: e2fsprogs-devel
# Needed for language translation support
BuildRequires: gettext
BuildRequires: libuuid-devel
BuildRequires: openssl-devel
BuildRequires: pkg-config
#Needed for mount.ewf(.py) support
BuildRequires: python-devel
BuildRequires: zlib-devel
Requires: zlib
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
@ -41,11 +51,11 @@ Libewf is a library for support of the Expert Witness Compression Format (EWF),
it support both the SMART format (EWF-S01) and the EnCase format (EWF-E01).
Libewf allows you to read and write media information within the EWF files.
%package -n libewf1
%package -n libewf%{soname}
Summary: Library to support the Expert Witness Compression Format
Group: System/Libraries
%description -n libewf1
%description -n libewf%{soname}
libewf is a library for support of the Expert Witness Compression Format (EWF).
libewf allows you to read media information of EWF files in the SMART (EWF-S01)
format and the EnCase (EWF-E01) format. libewf allows to read files created by
@ -54,7 +64,6 @@ EnCase 1 to 6, linen and FTK Imager.
%package -n ewftools
Summary: Utilities for the Expert Witness Compression Format (EWF)
Group: System/Filesystems
Requires: %{name}1 = %{version}
Requires: python-fuse >= 0.2
%description -n ewftools
@ -64,7 +73,7 @@ It contains tools to acquire, verify and export EWF files.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
Requires: %{name}1 = %{version}
Requires: %{name}%{soname} = %{version}
Requires: pkg-config
%description devel
@ -72,8 +81,8 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q -n libewf-20100226
%patch0 -p1 -b .pyver
%setup -q -n libewf-20120813
%patch0 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing "
@ -92,20 +101,20 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}
%install
%make_install
# maintain SLES compatibility
make install DESTDIR="%buildroot"
find %{buildroot} -name '*.la' -exec rm -f {} ';'
mkdir -p %{buildroot}/sbin
install -pm 0755 %{SOURCE1} %{buildroot}/sbin/mount.ewf
install -D -pm 0755 %{SOURCE1} %{buildroot}/sbin/mount.ewf
ln -s mount.ewf %{buildroot}/sbin/umount.ewf
%post -n libewf1 -p /sbin/ldconfig
%post -n libewf%{soname} -p /sbin/ldconfig
%postun -n libewf1 -p /sbin/ldconfig
%postun -n libewf%{soname} -p /sbin/ldconfig
%files -n libewf1
%files -n libewf%{soname}
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS
%doc AUTHORS COPYING NEWS ChangeLog ABOUT-NLS
%{_libdir}/*.so.*
%files -n ewftools

View File

@ -0,0 +1,15 @@
Index: libewf-20120813/ewftools/info_handle.c
===================================================================
--- libewf-20120813.orig/ewftools/info_handle.c
+++ libewf-20120813/ewftools/info_handle.c
@@ -4193,10 +4193,6 @@ int dfxml_build_environment_fprint(
#endif
fprintf(
stream,
- "\t\t\t<compilation_date>" __DATE__ " " __TIME__ "</compilation_date>\n" );
-
- fprintf(
- stream,
"\t\t\t<library name=\"libewf\" version=\"%s\"/>\n",
LIBEWF_VERSION_STRING );