- pam_rootok.so must be first

[packages/util-linux.git] / util-linux-blk.patch

diff --git a/util-linux-blk.patch b/util-linux-blk.patch
index e1e466499f3487f2e30ec9d0abaf530d68def834..06a46ac513e4a387b09408556704916fb9d55a98 100644 (file)
--- a/util-linux-blk.patch
+++ b/util-linux-blk.patch
@@ -1,61 +1,61 @@
---- util-linux-2.12/disk-utils/elvtune.c.orig  Sun Feb  8 18:37:01 2004
-+++ util-linux-2.12/disk-utils/elvtune.c       Sun Feb  8 18:39:03 2004
-@@ -27,6 +27,7 @@
+diff -urN util-linux-2.12q.org/disk-utils/blockdev.c util-linux-2.12q/disk-utils/blockdev.c
+--- util-linux-2.12q.org/disk-utils/blockdev.c 2004-08-18 19:52:20.000000000 +0200
++++ util-linux-2.12q/disk-utils/blockdev.c     2005-02-27 19:35:19.000000000 +0100
+@@ -9,9 +9,14 @@
+ #include <string.h>
  #include <unistd.h>
- #include <stdlib.h>
- #include "nls.h"
+ #include <sys/ioctl.h>
 +#include <linux/version.h>
  
- /* this has to match with the kernel structure */
- /* current version for ac19 and 2.2.16 */
-@@ -37,8 +38,13 @@
-       int max_bomb_segments;
- } blkelv_ioctl_arg_t;
+ #include "nls.h"
  
-+#ifdef LIBC_HEADERS_VERSION 
++#ifdef LIBC_HEADERS_VERSION
 +/* Fixed headers detected */
 +#include <linux/fs.h>
 +#else
- #define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
- #define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
+ /* Since it is impossible to include <linux/fs.h>, let us
+    give the ioctls explicitly. */
+ 
+@@ -28,6 +33,7 @@
+ #define BLKBSZSET  _IOW(0x12,113,size_t)
+ #define BLKGETSIZE64 _IOR(0x12,114,size_t)
+ #endif
 +#endif
  
- static void
- usage(void) {
---- util-linux-2.12/disk-utils/blockdev.c.orig Sun Feb  8 18:39:35 2004
-+++ util-linux-2.12/disk-utils/blockdev.c      Sun Feb  8 18:47:44 2004
-@@ -9,12 +9,14 @@
+ /* Maybe <linux/hdreg.h> could be included */
+ #ifndef HDIO_GETGEO
+diff -urN util-linux-2.12q.org/disk-utils/elvtune.c util-linux-2.12q/disk-utils/elvtune.c
+--- util-linux-2.12q.org/disk-utils/elvtune.c  2004-09-19 15:57:09.000000000 +0200
++++ util-linux-2.12q/disk-utils/elvtune.c      2005-02-27 19:34:27.000000000 +0100
+@@ -29,6 +29,7 @@
  #include <string.h>
- #include <unistd.h>
  #include <sys/ioctl.h>
+ #include <sys/utsname.h>
 +#include <linux/version.h>
- 
  #include "nls.h"
  
--/* Since it is impossible to include <linux/fs.h>, let us
--   give the ioctls explicitly. */
--
+ /* this has to match with the kernel structure */
+@@ -40,9 +41,14 @@
+       int max_bomb_segments;
+ } blkelv_ioctl_arg_t;
+ 
 +#ifdef LIBC_HEADERS_VERSION
 +/* Fixed headers detected */
 +#include <linux/fs.h>
 +#else
- #ifndef BLKROSET
- #define BLKROSET   _IO(0x12,93)
- #define BLKROGET   _IO(0x12,94)
-@@ -27,6 +29,7 @@
- #define BLKBSZGET  _IOR(0x12,112,sizeof(int))
- #define BLKBSZSET  _IOW(0x12,113,sizeof(int))
- #endif
+ /* ioctls introduced in 2.2.16, removed in 2.5.58 */
+ #define BLKELVGET   _IOR(0x12,106,size_t)
+ #define BLKELVSET   _IOW(0x12,107,size_t)
 +#endif
  
- /* Maybe <linux/hdreg.h> could be included */
- #ifndef HDIO_GETGEO
---- util-linux-2.12/fdisk/common.h.orig        Sun Feb  8 18:48:00 2004
-+++ util-linux-2.12/fdisk/common.h     Sun Feb  8 18:51:04 2004
-@@ -1,12 +1,18 @@
- /* common stuff for fdisk, cfdisk, sfdisk */
- 
--/* including <linux/fs.h> fails */
+ static void
+ usage(void) {
+diff -urN util-linux-2.12q.org/fdisk/common.h util-linux-2.12q/fdisk/common.h
+--- util-linux-2.12q.org/fdisk/common.h        2004-09-06 20:07:11.000000000 +0200
++++ util-linux-2.12q/fdisk/common.h    2005-02-27 19:35:53.000000000 +0100
+@@ -3,11 +3,18 @@
+ /* including <linux/fs.h> fails */
+ #include <sys/types.h>
  #include <sys/ioctl.h>
 +#include <linux/version.h>
 +
@@ -67,7 +67,7 @@
  #define BLKGETSIZE   _IO(0x12,96)    /* return device size */
  #define BLKFLSBUF    _IO(0x12,97)    /* flush buffer cache */
  #define BLKSSZGET    _IO(0x12,104)   /* get block device sector size */
- #define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */
+ #define BLKGETSIZE64 _IOR(0x12,114,size_t)    /* size in bytes */
 +#endif
  
  /* including <linux/hdreg.h> also fails */