- rel 5

- properly typed major/minor/makedev macros (fixes fubar in util-linux-ng 2.18+)

Changed files:
    dietlibc-devmacros.patch -> 1.1
    dietlibc.spec -> 1.94

diff --git a/dietlibc-devmacros.patch b/dietlibc-devmacros.patch
new file mode 100644 (file)
index 0000000..c6becdc
--- /dev/null
+++ b/dietlibc-devmacros.patch
@@ -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;

diff --git a/dietlibc.spec b/dietlibc.spec
index babc3351f9ca9798bd33727ac5afd9f811f5d1b5..31dfb46d518dfa8e419f966f03ca914dcce9d1cd 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    Biblioteka standardowa C zoptymalizowana na rozmiar
 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
@@ -35,6 +35,7 @@ Patch12:      %{name}-noexecstacks.patch
 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
@@ -114,6 +115,7 @@ statyczne.
 %patch13 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile