Author: sparky Date: Thu Feb 10 22:44:45 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- copied from util-linux-ng
---- Files affected:
packages/util-linux:
login.pamd (1.12 -> 1.13) , util-linux-blockdev.init (1.15 -> 1.16) ,
util-linux-blockdev.sysconfig (1.4 -> 1.5) , util-linux-ctrlaltdel-man.patch
(1.2 -> 1.3) , util-linux-diet.patch (NONE -> 1.1) (NEW),
util-linux-fdformat-ide.patch (1.2 -> 1.3) , util-linux-fhs.patch (1.7 -> 1.8)
, util-linux-hotkeys.patch (1.2 -> 1.3) , util-linux-login-lastlog.patch (1.2
-> 1.3) , util-linux-ng-ppc.patch (NONE -> 1.1) (NEW),
util-linux-ng-union-mount.patch (NONE -> 1.1) (NEW), util-linux-ng.spec (NONE
-> 1.1) (NEW), util-linux-procpartitions.patch (1.2 -> 1.3) ,
util-linux-swaponsymlink.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/util-linux/login.pamd
diff -u /dev/null packages/util-linux/login.pamd:1.13
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/login.pamd Thu Feb 10 23:44:39 2011
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth required pam_listfile.so item=user sense=deny
file=/etc/security/blacklist.login onerr=succeed
+auth required pam_securetty.so
+auth include system-auth
+account required pam_shells.so
+account required pam_nologin.so
+account required pam_access.so
+account include system-auth
+password include system-auth
+# pam_selinux.so close should be the first session rule
+# session required pam_selinux.so close
+session include system-auth
+session optional pam_console.so
+session optional pam_mail.so
+# pam_selinux.so open should only be followed by sessions to be executed in
the user context
+#session required pam_selinux.so open
+#session optional pam_keyinit.so force revoke
+session optional pam_ck_connector.so
================================================================
Index: packages/util-linux/util-linux-blockdev.init
diff -u /dev/null packages/util-linux/util-linux-blockdev.init:1.16
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-blockdev.init Thu Feb 10 23:44:39 2011
@@ -0,0 +1,117 @@
+#!/bin/sh
+#
+# blockdev This shell script takes care of starting and stopping
blockdev.
+#
+# chkconfig: 2345 01 99
+# description: blockdev
+#
+# processname: blockdev
+# config:
+# pidfile:
+
+[ -f /etc/sysconfig/blockdev ] || exit 0
+
+blockdevs=$(awk -F= '!/^#/ && !/^$/ {if ($2) print $1}'
/etc/sysconfig/blockdev)
+if [ -z "$blockdevs" ]; then
+ case "$1" in
+ start|stop|restart|force-reload)
+ exit 0
+ ;;
+ esac
+fi
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source blockdev configuration.
+. /etc/sysconfig/blockdev
+
+start() {
+ if [ ! -f /var/lock/subsys/blockdev ]; then
+ for var in $blockdevs; do
+ realdrive=
+ drive=${var#BLOCKDEV_}
+ if [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ];
then
+ realdrive="/dev/${drive}"
+ elif [ -e "/dev/mapper/${drive}" ]; then
+ realdrive="/dev/mapper/${drive}"
+ elif drive=$(echo $drive | tr _ -) && [ -d
"/sys/block/${drive}" -a -e "/dev/${drive}" ]; then
+ realdrive="/dev/${drive}"
+ elif [ -e "/dev/mapper/${drive}" ]; then
+ realdrive="/dev/mapper/${drive}"
+ fi
+
+ if [ -n "$realdrive" ]; then
+ eval PARAMS=\$$var
+ if [ -n "${PARAMS}" ]; then
+ show "Setting parameters for block
drive %s (%s)" "$drive" "$PARAMS"
+ busy
+ /sbin/blockdev ${PARAMS} $realdrive
+ ok
+ fi
+ fi
+ done
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blockdev
+ else
+ msg_already_running blockdev
+ fi
+}
+
+stop() {
+ # Stop daemons.
+ if [ ! -f /var/lock/subsys/blockdev ]; then
+ msg_not_running blockdev
+ fi
+ rm -f /var/lock/subsys/blockdev
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|force-reload)
+ stop
+ start
+ ;;
+ status)
+ if [ "$blockdevs" ]; then
+ echo "blockdev configured for:"
+ for var in $blockdevs; do
+ drive=${var#BLOCKDEV_}
+ echo -n "- $drive: "
+
+ realdrive=
+ if [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ];
then
+ realdrive="/dev/${drive}"
+ elif [ -e "/dev/mapper/${drive}" ]; then
+ realdrive="/dev/mapper/${drive}"
+ elif drive=$(echo $drive | tr _ -) && [ -d
"/sys/block/${drive}" -a -e "/dev/${drive}" ]; then
+ realdrive="/dev/${drive}"
+ elif [ -e "/dev/mapper/${drive}" ]; then
+ realdrive="/dev/mapper/${drive}"
+ fi
+
+ eval PARAMS=\$$var
+ if [ -n "$realdrive" ]; then
+ echo "${PARAMS}; device=$realdrive"
+ else
+ echo "${PARAMS}; device not present"
+ fi
+
+ done
+ else
+ echo "no devices configured for blockdev"
+ fi
+ ;;
+ *)
+ msg_usage "$0 {start|stop|restart|force-reload|status}"
+ exit 3
+esac
+
+exit $RETVAL
================================================================
Index: packages/util-linux/util-linux-blockdev.sysconfig
diff -u /dev/null packages/util-linux/util-linux-blockdev.sysconfig:1.5
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-blockdev.sysconfig Thu Feb 10 23:44:39 2011
@@ -0,0 +1,13 @@
+# This file lets you set your block device parameters for better performance.
+# If device name contains dash (-), then it's translated to underscore (_)
here.
+# You may also use device names from /dev/mapper.
+#
+# See blockdev(8) for details of blockdev arguments.
+
+#BLOCKDEV_hda=
+#BLOCKDEV_hdb="--setra 4096"
+#BLOCKDEV_hdb=
+#BLOCKDEV_hdc=
+#BLOCKDEV_hdd=
+#BLOCKDEV_lvm_rootfs=
+#BLOCKDEV_dm_0=
================================================================
Index: packages/util-linux/util-linux-ctrlaltdel-man.patch
diff -u /dev/null packages/util-linux/util-linux-ctrlaltdel-man.patch:1.3
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-ctrlaltdel-man.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,12 @@
+- Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
+
+--- util-linux-2.13-pre6/sys-utils/ctrlaltdel.8.kzak 2006-08-10
12:23:53.000000000 +0200
++++ util-linux-2.13-pre6/sys-utils/ctrlaltdel.8 2006-08-10
12:24:08.000000000 +0200
+@@ -32,7 +32,6 @@
+ .SH FILES
+ .I /etc/rc.local
+ .SH "SEE ALSO"
+-.BR simpleinit (8),
+ .BR init (8)
+ .SH AUTHOR
+ Peter Orbaek (p...@daimi.aau.dk)
================================================================
Index: packages/util-linux/util-linux-diet.patch
diff -u /dev/null packages/util-linux/util-linux-diet.patch:1.1
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-diet.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,197 @@
+--- util-linux-ng-2.18/shlibs/mount/src/fs.c~ 2010-06-08 10:44:20.000000000
+0200
++++ util-linux-ng-2.18/shlibs/mount/src/fs.c 2010-08-26 11:12:31.326572794
+0200
+@@ -17,6 +17,9 @@
+ #include <errno.h>
+ #include <blkid.h>
+ #include <stddef.h>
++#ifdef __dietlibc__
++#include <sys/stat.h> /* for major and minor macros */
++#endif
+
+ #include "nls.h"
+ #include "mountP.h"
+--- util-linux-ng-2.18/shlibs/mount/src/tab_parse.c~ 2010-06-07
12:35:06.000000000 +0200
++++ util-linux-ng-2.18/shlibs/mount/src/tab_parse.c 2010-08-26
11:16:35.762572782 +0200
+@@ -9,6 +9,9 @@
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#ifdef __dietlibc__
++#include <sys/stat.h> /* for makedev macro */
++#endif
+
+ #include "nls.h"
+ #include "mangle.h"
+--- util-linux-ng-2.18/lib/tt.c~ 2010-06-07 11:44:06.000000000 +0200
++++ util-linux-ng-2.18/lib/tt.c 2010-08-26 11:32:34.886572774 +0200
+@@ -54,7 +54,7 @@
+ };
+
+ #else /* !HAVE_WIDECHAR */
+-# define mbs_width strlen(_s)
++# define mbs_width(_s) strlen(_s)
+ #endif /* !HAVE_WIDECHAR */
+
+ #define is_last_column(_tb, _cl) \
+--- util-linux-2.19/lib/strutils.c~ 2011-01-31 16:43:47.000000000 +0100
++++ util-linux-2.19/lib/strutils.c 2011-02-10 12:49:12.221843465 +0100
+@@ -12,6 +12,9 @@
+ #include <sys/stat.h>
+ #include <locale.h>
+ #include <string.h>
++#ifdef __dietlibc__
++#include <stdint.h>
++#endif
+
+ static int do_scale_by_power (uintmax_t *x, int base, int power)
+ {
+--- util-linux-2.19/shlibs/mount/src/utils.c~ 2011-01-24 23:46:29.000000000
+0100
++++ util-linux-2.19/shlibs/mount/src/utils.c 2011-02-10 20:12:00.499611392
+0100
+@@ -398,7 +398,11 @@
+ int rc = -1;
+ struct passwd pwd;
+ struct passwd *pw;
++#ifdef _SC_GETPW_R_SIZE_MAX
+ size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
++#else
++ size_t sz = 0;
++#endif
+ char *buf;
+
+ if (!username || !uid)
+@@ -427,7 +431,11 @@
+ int rc = -1;
+ struct group grp;
+ struct group *gr;
++#ifdef _SC_GETGR_R_SIZE_MAX
+ size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX);
++#else
++ size_t sz = 0;
++#endif
+ char *buf;
+
+ if (!groupname || !gid)
+--- util-linux-2.19/shlibs/mount/src/tab_update.c~ 2011-02-09
14:23:48.000000000 +0100
++++ util-linux-2.19/shlibs/mount/src/tab_update.c 2011-02-10
20:26:15.846797059 +0100
+@@ -610,8 +610,14 @@
+
+ DBG(UPDATE, mnt_debug("%s: locking", lfile));
+
+- fd = open(lfile, O_RDONLY|O_CREAT|O_CLOEXEC, S_IWUSR|
+- S_IRUSR|S_IRGRP|S_IROTH);
++ fd = open(lfile,
++#ifdef O_CLOEXEC
++ O_RDONLY|O_CREAT|O_CLOEXEC,
++#else
++ O_RDONLY|O_CREAT,
++#endif
++ S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH);
++
+ free(lfile);
+
+ if (fd < 0)
+--- util-linux-2.19/lib/at.c~ 2011-01-31 16:43:47.000000000 +0100
++++ util-linux-2.19/lib/at.c 2011-02-10 20:30:37.336797058 +0100
+@@ -7,6 +7,7 @@
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <limits.h>
+
+ #include "at.h"
+
+--- util-linux-2.19/shlibs/mount/src/utils.c~ 2011-02-10 20:32:07.906797058
+0100
++++ util-linux-2.19/shlibs/mount/src/utils.c 2011-02-10 20:49:24.336797058
+0100
+@@ -664,7 +664,15 @@
+ if (rc <= 0)
+ return -errno;
+
++#ifndef HAVE_MKOSTEMP
++ if ( mktemp( n ) == NULL ) {
++ free(n);
++ return -errno;
++ }
++ fd = open(n, flags | O_EXCL);
++#else
+ fd = mkostemp(n, flags | O_EXCL);
++#endif
+ if (fd >= 0 && name)
+ *name = n;
+ else
+--- util-linux-2.19/misc-utils/findmnt.c~ 2011-01-31 16:43:47.000000000
+0100
++++ util-linux-2.19/misc-utils/findmnt.c 2011-02-10 20:54:23.100130391
+0100
+@@ -30,6 +30,9 @@
+ #include <sys/ioctl.h>
+ #endif
+ #include <assert.h>
++#ifdef __dietlibc__
++#include <sys/stat.h> /* for major and minor macros */
++#endif
+
+ #define USE_UNSTABLE_LIBMOUNT_API
+ #include <libmount.h>
+--- util-linux-2.19/fsck/fsck.c~ 2011-02-07 16:19:29.000000000 +0100
++++ util-linux-2.19/fsck/fsck.c 2011-02-10 21:09:27.024658725 +0100
+@@ -270,7 +270,13 @@
+ if (verbose)
+ printf(_("Locking disk %s ... "), diskname);
+
+- inst->lock = open(diskname, O_CLOEXEC | O_RDONLY);
++ inst->lock = open(diskname,
++#ifdef O_CLOEXEC
++ O_CLOEXEC | O_RDONLY
++#else
++ O_RDONLY
++#endif
++ );
+ if (inst->lock >= 0) {
+ int rc = -1;
+
+--- util-linux-2.19/configure.ac~ 2011-02-10 21:28:23.395401725 +0100
++++ util-linux-2.19/configure.ac 2011-02-10 22:12:29.997898392 +0100
+@@ -188,6 +188,8 @@
+ lchown \
+ llseek \
+ lseek64 \
++ mkostemp \
++ versionsort \
+ strtoull \
+ sysconf \
+ getdtablesize \
+--- util-linux-2.19/misc-utils/findfs.c~ 2011-01-31 16:43:47.000000000
+0100
++++ util-linux-2.19/misc-utils/findfs.c 2011-02-10 22:24:39.615735924
+0100
+@@ -12,6 +12,7 @@
+
+ #include <blkid.h>
+
++#include "c.h"
+ #include "nls.h"
+
+ static void __attribute__((__noreturn__)) usage(int rc)
+--- util-linux-2.19/misc-utils/scriptreplay.c~ 2011-01-31 16:43:47.000000000
+0100
++++ util-linux-2.19/misc-utils/scriptreplay.c 2011-02-10 22:26:22.019069258
+0100
+@@ -28,6 +28,7 @@
+ #include <unistd.h>
+ #include <err.h>
+
++#include "c.h"
+ #include "nls.h"
+
+ #define SCRIPT_MIN_DELAY 0.0001 /* from original sripreplay.pl
*/
+--- util-linux-2.19/shlibs/mount/src/tab_parse.c~ 2011-02-10
23:28:02.091461025 +0100
++++ util-linux-2.19/shlibs/mount/src/tab_parse.c 2011-02-10
23:29:04.934794359 +0100
+@@ -422,7 +422,13 @@
+
+ /* TODO: it would be nice to have a scandir() implementaion that
+ * is able to use already opened directory */
+- n = scandir(dirname, &namelist, NULL, versionsort);
++ n = scandir(dirname, &namelist, NULL,
++#ifdef HAVE_VERSIONSORT
++ versionsort
++#else
++ alphasort
++#endif
++ );
+ if (n <= 0)
+ return 0;
+
================================================================
Index: packages/util-linux/util-linux-fdformat-ide.patch
diff -u /dev/null packages/util-linux/util-linux-fdformat-ide.patch:1.3
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-fdformat-ide.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,22 @@
+--- util-linux-2.12p/disk-utils/fdformat.8.ide 2005-04-25 11:39:19.528340384
+0200
++++ util-linux-2.12p/disk-utils/fdformat.8 2005-04-25 11:44:07.189609224
+0200
+@@ -45,6 +45,10 @@
+ .BR setfdprm (8)
+ to load the disk parameters.
+
++For ATAPI IDE floppy driver (also known as LS-120 drives or "Superdisk"
++drives) you have to use the
++.BR floppy (8).
++
+ .SH OPTIONS
+ .TP
+ .B \-n
+@@ -54,6 +58,7 @@
+ .BR fd (4),
+ .BR setfdprm (8),
+ .BR mkfs (8),
+-.BR emkfs (8)
++.BR emkfs (8),
++.BR floppy (8)
+ .SH AUTHOR
+ Werner Almesberger (almes...@nessie.cs.id.ethz.ch)
================================================================
Index: packages/util-linux/util-linux-fhs.patch
diff -u /dev/null packages/util-linux/util-linux-fhs.patch:1.8
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-fhs.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,17 @@
+--- util-linux-ng-2.17.2/include/pathnames.h.orig 2010-03-22
09:05:42.000000000 +0100
++++ util-linux-ng-2.17.2/include/pathnames.h 2010-05-09 10:46:42.934937584
+0200
+@@ -20,12 +20,12 @@
+ #define _PATH_DEFPATH_ROOT
"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
+
+ #define _PATH_SECURETTY "/etc/securetty"
+-#define _PATH_WTMPLOCK "/etc/wtmplock"
++#define _PATH_WTMPLOCK "/var/lock/wtmplock"
+
+ #define _PATH_HUSHLOGIN ".hushlogin"
+
+ #ifndef _PATH_MAILDIR
+-#define _PATH_MAILDIR "/var/spool/mail"
++#define _PATH_MAILDIR "/var/mail"
+ #endif
+ #define _PATH_MOTDFILE "/etc/motd"
+ #define _PATH_NOLOGIN "/etc/nologin"
================================================================
Index: packages/util-linux/util-linux-hotkeys.patch
diff -u /dev/null packages/util-linux/util-linux-hotkeys.patch:1.3
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-hotkeys.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,68 @@
+- vipw asks for editing shadow in local language but only "Y" is accepted as
yes
+
+--- util-linux-2.12j/po/ca.po.sopwith 2004-12-05 14:08:08.000000000 -0500
++++ util-linux-2.12j/po/ca.po 2004-12-10 13:10:52.411668785 -0500
+@@ -7183,7 +7183,7 @@
+ #: login-utils/vipw.c:354
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "Desitgeu editar %s ara? [s/n] "
++msgstr "Desitgeu editar %s ara? [y/n] "
+
+ #: login-utils/wall.c:104
+ #, c-format
+--- util-linux-ng-2.17.2/po/de.po.orig 2010-05-09 12:46:21.882940098 +0200
++++ util-linux-ng-2.17.2/po/de.po 2010-05-09 12:46:26.774938422 +0200
+@@ -7945,7 +7945,7 @@
+ #: login-utils/vipw.c:352
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "Würden Sie jetzt gerne %s bearbeiten [j/n]? "
++msgstr "Würden Sie jetzt gerne %s bearbeiten [y/n]? "
+
+ #: login-utils/wall.c:112
+ #, c-format
+--- util-linux-ng-2.17.2/po/hu.po.orig 2010-05-09 12:47:26.586942613 +0200
++++ util-linux-ng-2.17.2/po/hu.po 2010-05-09 12:47:30.750935908 +0200
+@@ -7794,7 +7794,7 @@
+ #: login-utils/vipw.c:352
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "Kívánja szerkeszteni a következőt: %s [i/n]? "
++msgstr "Kívánja szerkeszteni a következőt: %s [y/n]? "
+
+ #: login-utils/wall.c:112
+ #, c-format
+--- util-linux-2.12j/po/pt_BR.po.sopwith 2004-12-05 14:08:15.000000000
-0500
++++ util-linux-2.12j/po/pt_BR.po 2004-12-10 13:11:47.560587674 -0500
+@@ -7161,7 +7161,7 @@
+ #: login-utils/vipw.c:354
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "Voc� gostaria de editar %s agora [s/n]"
++msgstr "Voc� gostaria de editar %s agora [y/n]"
+
+ #: login-utils/wall.c:104
+ #, c-format
+--- util-linux-ng-2.17.2/po/ru.po.orig 2010-05-09 12:51:15.306941775 +0200
++++ util-linux-ng-2.17.2/po/ru.po 2010-05-09 12:51:21.562935070 +0200
+@@ -7799,7 +7799,7 @@
+ #: login-utils/vipw.c:352
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "������ �� �� ������ ��������������� %s [�/�]? "
++msgstr "������ �� �� ������ ��������������� %s [y/n]? "
+
+ #: login-utils/wall.c:112
+ #, c-format
+--- util-linux-ng-2.17.2/po/tr.po.orig 2010-05-09 12:52:29.066940098 +0200
++++ util-linux-ng-2.17.2/po/tr.po 2010-05-09 12:52:33.602936746 +0200
+@@ -7771,7 +7771,7 @@
+ #: login-utils/vipw.c:352
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "%s dosyasını şimdi düzenlemek ister misiniz [e/h]? "
++msgstr "%s dosyasını şimdi düzenlemek ister misiniz [y/n]? "
+
+ #: login-utils/wall.c:112
+ #, c-format
================================================================
Index: packages/util-linux/util-linux-login-lastlog.patch
diff -u /dev/null packages/util-linux/util-linux-login-lastlog.patch:1.3
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-login-lastlog.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.17.2/login-utils/login.c.orig 2010-03-18
23:11:23.000000000 +0100
++++ util-linux-ng-2.17.2/login-utils/login.c 2010-05-09 11:42:42.890935908
+0200
+@@ -1431,7 +1431,7 @@
+ struct lastlog ll;
+ int fd;
+
+- if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) >= 0) {
++ if ((fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT, 0)) >= 0) {
+ lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), SEEK_SET);
+ if (!quiet) {
+ if (read(fd, (char *)&ll, sizeof(ll)) == sizeof(ll) &&
================================================================
Index: packages/util-linux/util-linux-ng-ppc.patch
diff -u /dev/null packages/util-linux/util-linux-ng-ppc.patch:1.1
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-ng-ppc.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,12 @@
+--- ./hwclock/clock-ppc.c.org 2007-08-28 09:58:10.336900636 +0200
++++ ./hwclock/clock-ppc.c 2007-08-28 09:58:22.769681100 +0200
+@@ -31,7 +31,8 @@
+ #include <getopt.h>
+ #include <sys/time.h>
+
+-#include <asm/cuda.h>
++#include <linux/cuda.h>
++#include <linux/adb.h>
+
+ /*
+ * Adapted for Power Macintosh by Paul Mackerras.
================================================================
Index: packages/util-linux/util-linux-ng-union-mount.patch
diff -u /dev/null packages/util-linux/util-linux-ng-union-mount.patch:1.1
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-ng-union-mount.patch Thu Feb 10 23:44:39 2011
@@ -0,0 +1,64 @@
+The VFS union mount patches require some changes to util-linux and
+e2fsprogs to support the union mount option and the ext2 whiteout
+feature flag. We are not submitting them for formal review at this
+time, but the patches are below for quick reference. They are also
+available in git repos linked to from the Union Mount HOWTO page:
+
+http://valerieaurora.org/union/
+
+-VAL
+
+From: Valerie Aurora Henson <vaur...@redhat.com>
+Date: Sat, 21 Mar 2009 20:56:57 -0700
+Subject: [PATCH 1/1] union mount patches from:
+
+ftp://ftp.suse.com/pub/people/jblunck/union-mount/util-linux-2.13-union_mount.diff
+---
+ mount/mount.c | 5 +++++
+ mount/mount_constants.h | 3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/mount/mount.c b/mount/mount.c
+index 9cbc466..9bf766b 100644
+--- a/mount/mount.c
++++ b/mount/mount.c
+@@ -138,6 +138,7 @@ static const struct opt_map opt_map[] = {
+ { "sync", 0, 0, MS_SYNCHRONOUS}, /* synchronous I/O */
+ { "async", 0, 1, MS_SYNCHRONOUS}, /* asynchronous I/O */
+ { "dirsync", 0, 0, MS_DIRSYNC}, /* synchronous directory
modifications */
++ { "union", 0, 0, MS_UNION }, /* Union mount */
+ { "remount", 0, 0, MS_REMOUNT}, /* Alter flags of mounted FS */
+ { "bind", 0, 0, MS_BIND }, /* Remount part of tree elsewhere */
+ { "rbind", 0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */
+@@ -1638,6 +1639,7 @@ static struct option longopts[] = {
+ { "make-rprivate", 0, 0, 142 },
+ { "make-runbindable", 0, 0, 143 },
+ { "no-canonicalize", 0, 0, 144 },
++ { "union", 0, 0, 145 },
+ { "internal-only", 0, 0, 'i' },
+ { NULL, 0, 0, 0 }
+ };
+@@ -1929,6 +1931,9 @@ main(int argc, char *argv[]) {
+ case 143:
+ mounttype = (MS_UNBINDABLE | MS_REC);
+ break;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/login.pamd?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-blockdev.init?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-blockdev.sysconfig?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-ctrlaltdel-man.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-fdformat-ide.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-fhs.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-hotkeys.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-login-lastlog.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-procpartitions.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-swaponsymlink.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
