packages: file/file.spec, file/sticky-bit.patch (NEW)=?UTF-8?Q?=20?=- sticky bit error fi...

[glen]

Author: glen                         Date: Sat Jun 16 13:10:56 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sticky bit error fix from mailinglist

---- Files affected:
packages/file:
   file.spec (1.194 -> 1.195) , sticky-bit.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/file/file.spec
diff -u packages/file/file.spec:1.194 packages/file/file.spec:1.195
--- packages/file/file.spec:1.194	Sat Jun 16 15:06:02 2012
+++ packages/file/file.spec	Sat Jun 16 15:10:51 2012
@@ -30,7 +30,7 @@
 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
@@ -45,6 +45,7 @@
 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
@@ -251,6 +252,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
@@ -381,6 +383,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.195  2012/06/16 13:10:51  glen
+- sticky bit error fix from mailinglist
+
 Revision 1.194  2012/06/16 13:06:02  glen
 - recognize node.js scripts
 

================================================================
Index: packages/file/sticky-bit.patch
diff -u /dev/null packages/file/sticky-bit.patch:1.1
--- /dev/null	Sat Jun 16 15:10:56 2012
+++ packages/file/sticky-bit.patch	Sat Jun 16 15:10:51 2012
@@ -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:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/file/file.spec?r1=1.194&r2=1.195