rpms/util-linux
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update some more patches

Browse Source
This commit is contained in:
Elliot Lee 2004-12-10 19:42:57 +00:00
parent 33649fddd5
commit f57f3a5c9a
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util-linux-2.12j-managed.patch Normal file
View File

@ -0,0 +1,11 @@
--- util-linux-2.12a/mount/mount.c.sopwith 2004-03-04 20:28:22.000000000 -0500
+++ util-linux-2.12a/mount/mount.c 2004-07-16 16:50:18.792814782 -0400
@@ -191,6 +191,8 @@
{ "diratime", 0, 1, MS_NODIRATIME }, /* Update dir access times */
{ "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
#endif
+ { "kudzu", 0, 0, MS_COMMENT }, /* Silently remove this option (backwards compat use only - deprecated) */
+ { "managed", 0, 0, MS_COMMENT }, /* Silently remove this option */
{ NULL, 0, 0, 0 }
};

12
util-linux.spec
View File

@ -1,7 +1,10 @@
# Rules for hacking:
# When you add a patch to fix a bug, include the bug number in its filename.
#
# TODO: # TODO:
# Investigate turning on HAVE_BLKID - it's the right idea, it just needs verifying. # Investigate turning on HAVE_BLKID - it's the right idea, it just needs verifying.
# #
# Upstream maintainer aeb@cwi.nl # Upstream maintainer Andries Brouwer <aeb@cwi.nl>
# 'raw' support is deprecated, only ship it if we need compatibility stuff. # 'raw' support is deprecated, only ship it if we need compatibility stuff.
%define include_raw 0 %define include_raw 0
@ -50,8 +53,7 @@ Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.gz
Source12: http://download.sourceforge.net/cramfs/cramfs-%{cramfsver}.tar.gz Source12: http://download.sourceforge.net/cramfs/cramfs-%{cramfsver}.tar.gz
##### Red Hat Linux-specific patches ##### Red Hat Linux-specific patches
# 1. Add the option of not installing chkdupexe (WANT_CHKDUPEXE=no) # Not really RH-specific
# 2. Change
Patch: util-linux-2.12a-moretc.patch Patch: util-linux-2.12a-moretc.patch
# Reduce MAX_PARTS to 16 (upstream reasonably won't take it) # Reduce MAX_PARTS to 16 (upstream reasonably won't take it)
@ -61,7 +63,7 @@ Patch70: util-linux-2.12a-partlimit.patch
Patch109: util-linux-2.11f-rawman.patch Patch109: util-linux-2.11f-rawman.patch
######## Patches that should be upstream eventually ######## Patches that should be upstream eventually
Patch100: util-linux-2.12a-managed.patch Patch100: util-linux-2.12j-managed.patch
Patch106: util-linux-2.11w-swaponsymlink-57300.patch Patch106: util-linux-2.11w-swaponsymlink-57300.patch
Patch107: util-linux-2.11y-procpartitions-37436.patch Patch107: util-linux-2.11y-procpartitions-37436.patch
@ -81,7 +83,6 @@ Patch143: cramfs-1.1-blocksize_and_quiet.patch
Patch144: cramfs-1.1-pagesize.patch Patch144: cramfs-1.1-pagesize.patch
Patch147: util-linux-2.12a-126572-fdiskman.patch Patch147: util-linux-2.12a-126572-fdiskman.patch
Patch148: util-linux-2.12a-127097-labelcrash.patch
Patch149: util-linux-2.12j-125531-swaplabel.patch Patch149: util-linux-2.12j-125531-swaplabel.patch
Patch150: floppy-0.12-locale.patch Patch150: floppy-0.12-locale.patch
@ -208,7 +209,6 @@ mv MCONFIG.new MCONFIG
%patch144 -p1 %patch144 -p1
%patch147 -p1 %patch147 -p1
%patch148 -p1
%patch149 -p1 %patch149 -p1
%patch150 -p0 %patch150 -p0