- sticky bit error fix from mailinglist

Changed files:
    file.spec -> 1.195
    sticky-bit.patch -> 1.1

diff --git a/file.spec b/file.spec
index 74e8a9edd994bf3e6fd468ccaff35839d99bcdba..8326b7c959565071fad509fbbd128392682127f2 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -29,7 +29,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
 Version:       5.11
-Release:       2
+Release:       3
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ Patch1:               %{name}-selinux.patch
 Patch2:                searchpath.patch
 Patch3:                automake.patch
 Patch4:                nodejs.patch
+Patch5:                sticky-bit.patch
 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -250,6 +251,7 @@ Wiązania Pythona dla libmagic.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac

diff --git a/sticky-bit.patch b/sticky-bit.patch
new file mode 100644 (file)
index 0000000..fd3b9ad
--- /dev/null
+++ b/sticky-bit.patch
@@ -0,0 +1,14 @@
+http://mx.gw.com/pipermail/file/2012/000908.html
+
+diff --git a/src/ascmagic.c b/src/ascmagic.c
+index 5a1caac..8d6ca95 100644
+--- a/src/ascmagic.c
++++ b/src/ascmagic.c
+@@ -211,6 +211,7 @@ file_ascmagic_with_encoding(struct magic_set *ms, const unsigned char *buf,
+                               case 0:
+                                       if (file_printf(ms, ", ") == -1)
+                                               goto done;
++                                      break;
+                               case -1:
+                                       goto done;
+                               default: