packages: dietlibc/dietlibc.spec, dietlibc/dietlibc-devmacros.patch (NEW) -...

[baggins]

Author: baggins                      Date: Wed Aug 25 00:04:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- properly typed major/minor/makedev macros (fixes fubar in util-linux-ng 2.18+)

---- Files affected:
packages/dietlibc:
   dietlibc.spec (1.93 -> 1.94) , dietlibc-devmacros.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dietlibc/dietlibc.spec
diff -u packages/dietlibc/dietlibc.spec:1.93 packages/dietlibc/dietlibc.spec:1.94
--- packages/dietlibc/dietlibc.spec:1.93	Fri Jul 30 21:18:51 2010
+++ packages/dietlibc/dietlibc.spec	Wed Aug 25 02:04:38 2010
@@ -13,7 +13,7 @@
 Summary(pt_BR.UTF-8):	libc pequena otimizada para tamanho
 Name:		dietlibc
 Version:	0.32
-Release:	4
+Release:	5
 Epoch:		2
 License:	GPL v2
 Group:		Development/Libraries
@@ -36,6 +36,7 @@
 Patch13:	%{name}-strcoll.patch
 Patch15:	%{name}-memalign.patch
 Patch16:	%{name}-getsubopt.patch
+Patch17:	%{name}-devmacros.patch
 URL:		http://www.fefe.de/dietlibc/
 BuildRequires:	rpmbuild(macros) >= 1.566
 BuildRequires:	sed >= 4.0
@@ -115,6 +116,7 @@
 %patch13 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
@@ -194,6 +196,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2010/08/25 00:04:38  baggins
+- rel 5
+- properly typed major/minor/makedev macros (fixes fubar in util-linux-ng 2.18+)
+
 Revision 1.93  2010/07/30 19:18:51  glen
 - fix
 

================================================================
Index: packages/dietlibc/dietlibc-devmacros.patch
diff -u /dev/null packages/dietlibc/dietlibc-devmacros.patch:1.1
--- /dev/null	Wed Aug 25 02:04:46 2010
+++ packages/dietlibc/dietlibc-devmacros.patch	Wed Aug 25 02:04:38 2010
@@ -0,0 +1,24 @@
+diff -ur dietlibc-0.32/include/sys/stat.h dietlibc-0.32-devmacros/include/sys/stat.h
+--- dietlibc-0.32/include/sys/stat.h	2007-07-02 20:20:56.000000000 +0200
++++ dietlibc-0.32-devmacros/include/sys/stat.h	2010-08-25 02:00:21.000000000 +0200
+@@ -621,9 +592,17 @@
+ #endif
+ #endif
+ 
+-#define major(dev) ({ unsigned long long l=(dev); ((l>>8) & 0xfff) | (l >> 32) & 0xfffff000; })
+-#define minor(dev) ({ unsigned long long l=(dev); (l & 0xff) | ((l>>12)&0xffffff00); })
+-#define makedev(maj,min) ({ unsigned long long a=(maj), i=(min); ((a&0xfff)<<8) | (i&0xff) | ((a&~0xfff)<<32) | ((i&0xfffff00)<<12); })
++#define major(dev) \
++	((unsigned int)((((unsigned long long int)(dev) >> 8) & 0xfff) \
++		| ((unsigned int) ((unsigned long long int)(dev) >> 32) & ~0xfff)))
++#define minor(dev) \
++	((unsigned int)(((unsigned long long int)(dev) & 0xff) \
++		| ((unsigned int) ((unsigned long long int)(dev) >> 12) & ~0xff)))
++#define makedev(maj,min) \
++	((unsigned long long int)(((unsigned int)(minor) & 0xff) \
++		| (((unsigned int)(major) & 0xfff) << 8) \
++		| (((unsigned long long int) ((minor) & ~0xff)) << 12) \
++		| (((unsigned long long int) ((major) & ~0xfff)) << 32)))
+ 
+ extern int chmod (const char *__file, mode_t __mode) __THROW;
+ extern int fchmod (int __fd, mode_t __mode) __THROW;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dietlibc/dietlibc.spec?r1=1.93&r2=1.94&f=u