From d2555df7eec747195bce84976f31456b35a8ce21a65e7a3e5c90c0ad8a60c4d0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 6 May 2008 20:19:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=20 --- file-4.24-warn.dif | 10 ++++++++++ file.changes | 5 +++++ file.spec | 6 +++++- python-magic.spec | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 file-4.24-warn.dif diff --git a/file-4.24-warn.dif b/file-4.24-warn.dif new file mode 100644 index 0000000..8d8cc6b --- /dev/null +++ b/file-4.24-warn.dif @@ -0,0 +1,10 @@ +--- src/apprentice.c ++++ src/apprentice.c +@@ -562,6 +562,7 @@ + /* invalid search type, but no need to complain here */ + break; + } ++ return 0; + } + + /* diff --git a/file.changes b/file.changes index da76cd4..25a27c5 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 6 21:21:24 CEST 2008 - aj@suse.de + +- Do not return random data. + ------------------------------------------------------------------- Thu Apr 24 19:27:57 CEST 2008 - werner@suse.de diff --git a/file.spec b/file.spec index 03af08b..c675b9f 100644 --- a/file.spec +++ b/file.spec @@ -19,7 +19,7 @@ Group: Productivity/File utilities AutoReqProv: on # Set Version also in python-magic.spec Version: 4.24 -Release: 5 +Release: 8 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -41,6 +41,7 @@ Patch20: file-4.24-mips.dif Patch21: file-4.16-python.dif Patch22: file-4.24-cromfs.dif Patch23: file-4.24-extfs-mp3.dif +Patch24: file-4.24-warn.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -101,6 +102,7 @@ Authors: %endif %patch22 -p0 -b .cromfs %patch23 -p0 -b .extfs-mp3 +%patch24 -p0 -b .warn %patch %build @@ -164,6 +166,8 @@ unset LD_LIBRARY_PATH %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Tue May 06 2008 aj@suse.de +- Do not return random data. * Thu Apr 24 2008 werner@suse.de - Don't slip into Mp3 channel for ext file systems (bnc#383431) * Mon Apr 14 2008 werner@suse.de diff --git a/python-magic.spec b/python-magic.spec index ffafca9..606bb4f 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -20,7 +20,7 @@ License: Other uncritical OpenSource License Group: Development/Languages/Python AutoReqProv: on Version: 4.24 -Release: 3 +Release: 8 Summary: Python module to use libmagic %py_requires Source99: file.spec