diff --git a/file-rpmlintrc b/file-rpmlintrc index 08be22c..a124502 100644 --- a/file-rpmlintrc +++ b/file-rpmlintrc @@ -1,3 +1,2 @@ -addFilter(".*W:.*no-dependency-on file.*/file-libs/libfile.*") addFilter(".*W:.*name-repeated-in-summary.*") addFilter(".*:.*shlib-fixed-dependency.*") diff --git a/file.changes b/file.changes index eb9bb38..cd2448e 100644 --- a/file.changes +++ b/file.changes @@ -1,8 +1,28 @@ +------------------------------------------------------------------- +Thu Feb 24 10:05:17 UTC 2022 - Dr. Werner Fink + +- Reenable libseccomp sandboxing + +------------------------------------------------------------------- +Thu Feb 24 08:41:32 UTC 2022 - Dominique Leuenberger + +- Fix previous entry: remove stray pkg-config call in CFLAGS (as it + was called without parameters, it only made output on stderr, + which did not impact CFLAGS; so de facto only a cleanup change). + +------------------------------------------------------------------- +Mon Feb 21 17:09:56 UTC 2022 - Dominique Leuenberger + +- Drop pkgconfig(libseccomp) BuildRequires and stop injecting + libseccomp cflags into CFLAGS: libseccomp has been disabled for a + long time already. +- Move the special 'check' part from install to %check. + ------------------------------------------------------------------- Thu Oct 21 06:24:35 UTC 2021 - Dr. Werner Fink -- Remove file-5.38-allow-readlinkat.dif as already doen in latest - file 5.41 +- Remove file-5.38-allow-readlinkat.dif as already done in latest + file 5.41 ------------------------------------------------------------------- Tue Oct 19 09:52:12 UTC 2021 - Dr. Werner Fink diff --git a/file.spec b/file.spec index d6dac6c..d63dcfc 100644 --- a/file.spec +++ b/file.spec @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,10 +22,10 @@ Name: file BuildRequires: bash >= 4.0 BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(zlib) URL: http://www.darwinsys.com/file/ # bug437293 %ifarch ppc64 @@ -139,7 +139,6 @@ autoreconf -fiv export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config libseccomp --cflags)" %configure --disable-silent-rules --datadir=%{_miscdir} \ --disable-static \ - --disable-libseccomp \ --enable-fsect-man5 make %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie" @@ -155,7 +154,9 @@ echo '# global magic file is %{_miscdir}/magic(.mgc)' >> %{buildroot}%{_sysc %if %{with decore} install -s dcore %{buildroot}%{_bindir} %endif +rm -f %{buildroot}%{_libdir}/*.la +%check # Check out that the binary does not bail out: LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH @@ -166,7 +167,6 @@ for dir in %{_bindir} /%{_lib} %{_libdir} ; do xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic done unset LD_LIBRARY_PATH -rm -f %{buildroot}%{_libdir}/*.la %post -n %libname -p /sbin/ldconfig diff --git a/python-magic.spec b/python-magic.spec index d4e8f26..50d5b29 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed