Author: arekm Date: Sun Feb 27 19:09:16 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up for 2.12q
---- Files affected:
SOURCES:
util-linux-page.patch (NONE -> 1.1) (NEW), util-linux-blk.patch (1.4 ->
1.5) , util-linux-dm_crypt.patch (1.1 -> 1.2) , util-linux-MCONFIG.patch (1.3
-> 1.4) , util-linux-raw.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/util-linux-page.patch
diff -u /dev/null SOURCES/util-linux-page.patch:1.1
--- /dev/null Sun Feb 27 20:09:16 2005
+++ SOURCES/util-linux-page.patch Sun Feb 27 20:09:11 2005
@@ -0,0 +1,51 @@
+diff -ur util-linux-2.12q.org/disk-utils/fsck.cramfs.c
util-linux-2.12q/disk-utils/fsck.cramfs.c
+--- util-linux-2.12q.org/disk-utils/fsck.cramfs.c 2004-12-11
15:53:16.000000000 +0100
++++ util-linux-2.12q/disk-utils/fsck.cramfs.c 2005-02-27 20:03:09.000000000
+0100
+@@ -77,15 +77,7 @@
+ #define PAD_SIZE 512
+
+ #include <asm/page.h>
+-#ifdef PAGE_SIZE
+ #define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
+-#elif defined __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+-#define PAGE_CACHE_SIZE (4096)
+-#endif
+
+ /* Guarantee access to at least 8kB at a time */
+ #define ROMBUFFER_BITS 13
+@@ -95,11 +87,21 @@
+ static unsigned long read_buffer_block = ~0UL;
+
+ /* Uncompressing data structures... */
+-static char outbuffer[PAGE_CACHE_SIZE*2];
++static char *outbuffer;
+ z_stream stream;
+
+ #endif /* INCLUDE_FS_TESTS */
+
++static void init_statics(void)
++{
++#ifdef INCLUDE_FS_TESTS
++ if ((outbuffer = malloc (PAGE_CACHE_SIZE*2)) == NULL) {
++ fprintf (stderr, _("Cannot allocate space for decompression
buffer\n"));
++ exit(8);
++ }
++#endif
++}
++
+ /* Input status of 0 to print help and exit without an error. */
+ static void usage(int status)
+ {
+@@ -464,6 +466,8 @@
+ int c; /* for getopt */
+ int start = 0;
+
++ init_statics();
++
+ if (argc)
+ progname = argv[0];
+
================================================================
Index: SOURCES/util-linux-blk.patch
diff -u SOURCES/util-linux-blk.patch:1.4 SOURCES/util-linux-blk.patch:1.5
--- SOURCES/util-linux-blk.patch:1.4 Mon Feb 23 23:06:33 2004
+++ SOURCES/util-linux-blk.patch Sun Feb 27 20:09:11 2005
@@ -1,67 +1,61 @@
---- util-linux-2.12/disk-utils/elvtune.c.orig 2002-03-08 23:57:49.000000000
+0100
-+++ util-linux-2.12/disk-utils/elvtune.c 2004-02-23 23:07:41.428306200
+0100
-@@ -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"
--#define BLKELVGET _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
--#define BLKELVSET _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
-+#ifdef LIBC_HEADERS_VERSION
++#ifdef LIBC_HEADERS_VERSION
+/* Fixed headers detected */
+#include <linux/fs.h>
+#else
-+#define BLKELVGET _IOR(0x12,106,size_t) /* blkelv_ioctl_arg_t broken by
sizeof */
-+#define BLKELVSET _IOW(0x12,107,size_t) /* blkelv_ioctl_arg_t broken by
sizeof */
+ /* 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 2002-03-08 23:57:02.000000000
+0100
-+++ util-linux-2.12/disk-utils/blockdev.c 2004-02-23 23:08:09.053106592
+0100
-@@ -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)
-@@ -24,8 +26,9 @@
- #define BLKRASET _IO(0x12,98)
- #define BLKRAGET _IO(0x12,99)
- #define BLKSSZGET _IO(0x12,104)
--#define BLKBSZGET _IOR(0x12,112,sizeof(int))
--#define BLKBSZSET _IOW(0x12,113,sizeof(int))
-+#define BLKBSZGET _IOR(0x12,112,size_t) /* int broken by sizeof */
-+#define BLKBSZSET _IOW(0x12,113,size_t) /* int broken by sizeof */
+ /* 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
- #endif
-
- /* Maybe <linux/hdreg.h> could be included */
---- util-linux-2.12/fdisk/common.h.orig 2003-07-13 15:59:53.000000000
+0200
-+++ util-linux-2.12/fdisk/common.h 2004-02-23 23:09:39.330382360 +0100
-@@ -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>
+
@@ -73,8 +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) /* u64 broken by sizeof; NOT
8(==int)!!! */
+ #define BLKGETSIZE64 _IOR(0x12,114,size_t) /* size in bytes */
+#endif
/* including <linux/hdreg.h> also fails */
================================================================
Index: SOURCES/util-linux-dm_crypt.patch
diff -u SOURCES/util-linux-dm_crypt.patch:1.1
SOURCES/util-linux-dm_crypt.patch:1.2
--- SOURCES/util-linux-dm_crypt.patch:1.1 Thu Oct 28 15:13:06 2004
+++ SOURCES/util-linux-dm_crypt.patch Sun Feb 27 20:09:11 2005
@@ -1,6 +1,6 @@
-diff -Nur util-linux-2.12.orig/mount/cryptsetup.c
util-linux-2.12/mount/cryptsetup.c
---- util-linux-2.12.orig/mount/cryptsetup.c 1970-01-01 01:00:00.000000000
+0100
-+++ util-linux-2.12/mount/cryptsetup.c 2004-03-10 00:54:10.977381704 +0100
+diff -urN util-linux-2.12q.org/mount/cryptsetup.c
util-linux-2.12q/mount/cryptsetup.c
+--- util-linux-2.12q.org/mount/cryptsetup.c 1970-01-01 01:00:00.000000000
+0100
++++ util-linux-2.12q/mount/cryptsetup.c 2005-02-27 19:26:34.000000000
+0100
@@ -0,0 +1,216 @@
+/*
+ * cryptsetup.c - setup and control encrypted devices
@@ -218,18 +218,18 @@
+}
+
+#endif
-diff -Nur util-linux-2.12.orig/mount/cryptsetup.h
util-linux-2.12/mount/cryptsetup.h
---- util-linux-2.12.orig/mount/cryptsetup.h 1970-01-01 01:00:00.000000000
+0100
-+++ util-linux-2.12/mount/cryptsetup.h 2004-03-10 00:07:48.000000000 +0100
+diff -urN util-linux-2.12q.org/mount/cryptsetup.h
util-linux-2.12q/mount/cryptsetup.h
+--- util-linux-2.12q.org/mount/cryptsetup.h 1970-01-01 01:00:00.000000000
+0100
++++ util-linux-2.12q/mount/cryptsetup.h 2005-02-27 19:26:34.000000000
+0100
@@ -0,0 +1,4 @@
+extern int verbose;
+extern int set_crypt(char **, const char *, int, char **,
+ int, int *);
+extern int del_crypt(const char *);
-diff -Nur util-linux-2.12.orig/mount/Makefile util-linux-2.12/mount/Makefile
---- util-linux-2.12.orig/mount/Makefile 2003-07-16 22:07:27.000000000
+0200
-+++ util-linux-2.12/mount/Makefile 2004-03-10 00:07:48.000000000 +0100
-@@ -25,6 +25,7 @@
+diff -urN util-linux-2.12q.org/mount/Makefile util-linux-2.12q/mount/Makefile
+--- util-linux-2.12q.org/mount/Makefile 2005-02-27 19:25:37.000000000
+0100
++++ util-linux-2.12q/mount/Makefile 2005-02-27 19:27:21.000000000 +0100
+@@ -30,6 +30,7 @@
MAYBE = pivot_root swapoff
LO_OBJS = lomount.o $(LIB)/xstrncpy.o
@@ -237,24 +237,25 @@
NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o
GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c
-@@ -44,11 +45,11 @@
+@@ -49,12 +50,12 @@
- mount: mount.o fstab.o sundries.o realpath.o mntent.o version.o \
- mount_guess_fstype.o get_label_uuid.o mount_by_label.o getusername.o \
-- $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS)
-+ $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS) $(CRYPT_OBJS)
- $(LINK) $^ -o $@
-
- umount: umount.o fstab.o sundries.o realpath.o mntent.o getusername.o \
-- get_label_uuid.o version.o $(LIB)/env.o $(LO_OBJS)
-+ get_label_uuid.o version.o $(LIB)/env.o $(LO_OBJS) $(CRYPT_OBJS)
- $(LINK) $^ -o $@
-
- swapon: swapon.o version.o
-diff -Nur util-linux-2.12.orig/mount/mount.c util-linux-2.12/mount/mount.c
---- util-linux-2.12.orig/mount/mount.c 2003-07-15 23:38:48.000000000 +0200
-+++ util-linux-2.12/mount/mount.c 2004-03-10 00:28:34.619477080 +0100
-@@ -62,6 +62,7 @@
+ mount: mount.o fstab.o sundries.o xmalloc.o realpath.o mntent.o version.o \
+ get_label_uuid.o mount_by_label.o mount_blkid.o mount_guess_fstype.o \
+- getusername.o $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS)
++ getusername.o $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS)
$(LO_OBJS) $(CRYPT_OBJS)
+ $(LINK) $^ -o $@ $(BLKID_LIB)
+
+ umount: umount.o fstab.o sundries.o xmalloc.o realpath.o mntent.o \
+ getusername.o get_label_uuid.o mount_by_label.o mount_blkid.o \
+- version.o $(LIB)/env.o $(LO_OBJS)
++ version.o $(LIB)/env.o $(LO_OBJS) $(CRYPT_OBJS)
+ $(LINK) $^ -o $@ $(BLKID_LIB)
+
+ swapon: swapon.o version.o xmalloc.o \
+diff -urN util-linux-2.12q.org/mount/mount.c util-linux-2.12q/mount/mount.c
+--- util-linux-2.12q.org/mount/mount.c 2004-12-21 23:00:36.000000000 +0100
++++ util-linux-2.12q/mount/mount.c 2005-02-27 19:29:40.000000000 +0100
+@@ -28,6 +28,7 @@
#include "mntent.h"
#include "fstab.h"
#include "lomount.h"
@@ -262,24 +263,15 @@
#include "loop.h"
#include "linux_fs.h" /* for BLKGETSIZE */
#include "mount_guess_rootdev.h"
-@@ -130,6 +131,7 @@
- #define MS_USERS 0x40000000
+@@ -98,6 +99,7 @@
#define MS_USER 0x20000000
#define MS_OWNER 0x10000000
-+#define MS_CRYPT 0x00040000
- #define MS_NETDEV 0x00020000
+ #define MS_GROUP 0x08000000
++#define MS_CRYPT 0x00040000
+ #define MS_COMMENT 0x00020000
#define MS_LOOP 0x00010000
-@@ -206,7 +208,7 @@
- { "vfs=", 1, &opt_vfstype },
- { "offset=", 0, &opt_offset },
- { "encryption=", 0, &opt_encryption },
-- { "speed=", 0, &opt_speed },
-+ { "speed=", 0, &opt_speed },
- { NULL, 0, NULL }
- };
-
-@@ -586,7 +588,7 @@
+@@ -607,7 +609,7 @@
*type = opt_vfstype;
}
@@ -288,16 +280,16 @@
*loopfile = *spec;
if (*loop) {
-@@ -605,7 +607,7 @@
+@@ -626,7 +628,7 @@
printf(_("mount: going to use the loop device %s\n"), *loopdev);
- offset = opt_offset ? strtoul(opt_offset, NULL, 0) : 0;
+ offset = opt_offset ? strtoull(opt_offset, NULL, 0) : 0;
if (set_loop(*loopdev, *loopfile, offset,
- opt_encryption, pfd, &loopro)) {
+ NULL /* opt_encryption */, pfd, &loopro)) {
if (verbose)
printf(_("mount: failed setting up loop device\n"));
return EX_FAIL;
-@@ -615,6 +617,42 @@
+@@ -636,6 +638,42 @@
*spec = *loopdev;
if (loopro)
*flags |= MS_RDONLY;
@@ -340,28 +332,28 @@
}
}
-@@ -765,7 +803,9 @@
- char *spec, *node, *types;
+@@ -788,7 +826,9 @@
+ const char *opts, *spec, *node, *types;
char *user = 0;
int loop = 0;
+ int crypt = 0;
- char *loopdev = 0, *loopfile = 0;
+ const char *loopdev = 0, *loopfile = 0;
+ char *cryptdev = 0, *realdev = 0;
struct stat statbuf;
int nfs_mount_version = 0; /* any version */
-@@ -796,6 +836,10 @@
+@@ -823,6 +863,10 @@
res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile);
if (res)
- return res;
+ goto out;
+
+ res = crypt_check(&spec, &types, &flags, &crypt, &cryptdev, &realdev);
+ if (res)
-+ return res;
++ goto out;
}
/*
-@@ -832,8 +876,13 @@
+@@ -863,8 +907,13 @@
/* Mount succeeded, report this (if verbose) and write mtab entry. */
if (loop)
opt_loopdev = loopdev;
@@ -376,7 +368,7 @@
node,
types ? types : "unknown",
fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user),
-@@ -847,6 +896,8 @@
+@@ -879,6 +928,8 @@
mnt_err = errno;
@@ -385,10 +377,10 @@
if (loop)
del_loop(spec);
-diff -Nur util-linux-2.12.orig/mount/umount.c util-linux-2.12/mount/umount.c
---- util-linux-2.12.orig/mount/umount.c 2003-07-15 23:19:22.000000000
+0200
-+++ util-linux-2.12/mount/umount.c 2004-03-10 00:07:48.000000000 +0100
-@@ -41,6 +41,7 @@
+diff -urN util-linux-2.12q.org/mount/umount.c util-linux-2.12q/mount/umount.c
+--- util-linux-2.12q.org/mount/umount.c 2004-12-20 23:03:45.000000000
+0100
++++ util-linux-2.12q/mount/umount.c 2005-02-27 19:26:34.000000000 +0100
+@@ -15,6 +15,7 @@
#include "sundries.h"
#include "getusername.h"
#include "lomount.h"
@@ -396,15 +388,15 @@
#include "loop.h"
#include "fstab.h"
#include "env.h"
-@@ -249,6 +250,7 @@
- int isroot;
+@@ -274,6 +275,7 @@
int res;
+ int status;
const char *loopdev;
+ const char *cryptdev;
/* Special case for root. As of 0.99pl10 we can (almost) unmount root;
the kernel will remount it readonly so that we can carry on running
-@@ -331,12 +333,33 @@
+@@ -365,12 +367,33 @@
}
}
@@ -439,4 +431,3 @@
/* Free any loop devices that we allocated ourselves */
if (mc) {
char *optl;
-
================================================================
Index: SOURCES/util-linux-MCONFIG.patch
diff -u SOURCES/util-linux-MCONFIG.patch:1.3
SOURCES/util-linux-MCONFIG.patch:1.4
--- SOURCES/util-linux-MCONFIG.patch:1.3 Sun Jun 3 21:59:09 2001
+++ SOURCES/util-linux-MCONFIG.patch Sun Feb 27 20:09:11 2005
@@ -1,13 +1,18 @@
-diff -urN util-linux-2.11d.org/MCONFIG util-linux-2.11d/MCONFIG
---- util-linux-2.11d.org/MCONFIG Sun Jun 3 21:42:36 2001
-+++ util-linux-2.11d/MCONFIG Sun Jun 3 21:42:47 2001
-@@ -16,17 +16,17 @@
+diff -ur util-linux-2.12q.org/MCONFIG util-linux-2.12q/MCONFIG
+--- util-linux-2.12q.org/MCONFIG 2004-12-13 00:15:48.000000000 +0100
++++ util-linux-2.12q/MCONFIG 2005-02-27 19:20:32.000000000 +0100
+@@ -22,20 +22,20 @@
# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
# will use PAM for authentication. Additionally, passwd will not be
# installed as it is not PAM aware.
-HAVE_PAM=no
+HAVE_PAM=yes
+ # If HAVE_SELINUX is set to "yes", the login will make sure the user is
+ # logged into an appropriate security context
+-HAVE_SELINUX=no
++HAVE_SELINUX=yes
+
# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd,
# and vipw will not be built or installed from the login-utils
# subdirectory.
@@ -15,14 +20,13 @@
+HAVE_SHADOW=no
# If HAVE_PASSWD is set to "yes", then passwd will not be built or
- # installed from the login-utils subdirectory (but login, chfn, chsh,
- # newgrp, and vipw *will* be installed).
+ # installed from the login-utils subdirectory.
-HAVE_PASSWD=no
+HAVE_PASSWD=yes
# If you use chfn and chsh from this package, REQUIRE_PASSWORD will require
# non-root users to enter the account password before updating /etc/passwd.
-@@ -83,7 +83,7 @@
+@@ -102,7 +102,7 @@
# If HAVE_SLN is set to "yes", then sln won't be installed
# (but the man page sln.8 will be installed anyway).
# sln also comes with libc and glibc.
@@ -31,7 +35,7 @@
# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
HAVE_FDUTILS=no
-@@ -117,7 +117,7 @@
+@@ -160,7 +160,7 @@
# SLANGFLAGS=-I/usr/include/slang
# No such subdirectory - slcurses.h lives in /usr/include
# (no extra definition required).
@@ -40,7 +44,7 @@
#
# Paths used for compilation (not all are actually used, see CFLAGS below)
-@@ -175,7 +175,7 @@
+@@ -212,7 +212,7 @@
MANMODE= 644
DATMODE= 644
INFOMODE= 644
@@ -49,12 +53,12 @@
CHMOD= chmod
INSTALL= install
-@@ -183,7 +183,7 @@
+@@ -220,7 +220,7 @@
INSTALLBIN= $(INSTALL) -m $(BINMODE)
INSTALLMAN= $(INSTALL) -m $(MANMODE)
INSTALLDAT= $(INSTALL) -m $(DATMODE)
-INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root
+INSTALLSUID= $(INSTALL) -m $(SUIDMODE)
- CFLAGS := $(CFLAGS) $(OPT) -I$(LIB) $(WARNFLAGS) \
- $(CURSESFLAGS) $(SLANGFLAGS) \
+ ifeq "$(DISABLE_NLS)" "yes"
+ NLSFLAGS = -DDISABLE_NLS
================================================================
Index: SOURCES/util-linux-raw.patch
diff -u SOURCES/util-linux-raw.patch:1.4 SOURCES/util-linux-raw.patch:1.5
--- SOURCES/util-linux-raw.patch:1.4 Tue Sep 3 18:17:24 2002
+++ SOURCES/util-linux-raw.patch Sun Feb 27 20:09:11 2005
@@ -1,5 +1,31 @@
---- ./disk-utils/raw.c.orig Sat Jun 30 13:03:56 2001
-+++ ./disk-utils/raw.c Sat Jun 30 13:54:54 2001
+diff -ur util-linux-2.12q.org/configure util-linux-2.12q/configure
+--- util-linux-2.12q.org/configure 2004-12-20 23:20:35.000000000 +0100
++++ util-linux-2.12q/configure 2005-02-27 19:22:06.000000000 +0100
+@@ -45,6 +45,7 @@
+ # 13. For nfsmount: does the output of rpcgen compile?
+ # 14. For fsck.cramfs, mkfs.cramfs: do we have libz?
+ # 15. For mount, do we have blkid?
++# 16. For raw.c: does <sys/raw.h> exist?
+
+ rm -f make_include defines.h
+
+@@ -662,6 +663,13 @@
+ rm -f conftest conftest.c
+
+ #
++# 16. For raw.c: does <sys/raw.h> exist?
++#
++if ./testincl "sys/raw.h"; then
++ echo "ADD_RAW=yes" >> make_include
++fi
++
++#
+ # 13. For nfsmount: does the output of rpcgen compile?
+ #
+ # On some systems the output of rpcgen compiles with warnings
+diff -ur util-linux-2.12q.org/disk-utils/raw.c
util-linux-2.12q/disk-utils/raw.c
+--- util-linux-2.12q.org/disk-utils/raw.c 2002-03-08 23:58:37.000000000
+0100
++++ util-linux-2.12q/disk-utils/raw.c 2005-02-27 19:21:29.000000000 +0100
@@ -19,7 +19,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
@@ -18,26 +44,3 @@
char * progname;
int do_query = 0;
-
---- util-linux-2.10q.org/configure Tue Nov 21 22:08:46 2000
-+++ util-linux-2.10q/configure Tue Nov 21 22:10:35 2000
-@@ -33,6 +33,7 @@
- # 12. For hwclock.c: does struct tm have a field tm_gmtoff?
- # 13. For nfsmount: does the output of rpcgen compile?
- # 14. For fsck.cramfs, mkfs.cramfs: do we have libz?
-+# 15. For raw.c: does <sys/raw.h> exist?
-
- rm -f make_include defines.h
-
-@@ -680,4 +681,11 @@
- echo "You don't have zlib"
- fi
- rm -f conftest conftest.c
-+
-+#
-+# 15. For raw.c: does <sys/raw.h> exist?
-+#
-+if ./testincl "sys/raw.h"; then
-+ echo "ADD_RAW=yes" >> make_include
-+fi
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/util-linux-blk.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/util-linux-dm_crypt.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/util-linux-MCONFIG.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/util-linux-raw.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
