Compare commits
556 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f674e5fc9c |
||
|
|
eb04a0fe33 |
||
|
|
0615d97b81 |
||
|
|
0095d94d91 |
||
|
|
20976b8be8 |
||
|
|
c493f607ab | ||
|
|
c3c18147bd |
||
|
|
e454479c5c |
||
|
|
a0b27bcd5f |
||
|
|
386bf34c2e |
||
|
|
fdfe50c891 |
||
|
|
f0604fd61a |
||
|
|
ec87f84093 |
||
|
|
c71c8701f4 | ||
|
|
e847b805f8 | ||
|
|
ddff633d0f | ||
|
|
a6d9263e25 | ||
|
|
8080f5a15a |
||
|
|
968cac099d |
||
|
|
e3b928358b |
||
|
|
d3137f0cd0 |
||
|
|
a09814d13c | ||
|
|
6cd5ce1d7e |
||
|
|
e02261a471 |
||
|
|
7c8ffed470 | ||
|
|
ba7b19b5bf | ||
|
|
1421739c0c |
||
|
|
56dd448b26 |
||
|
|
a91df5db11 |
||
|
|
245be9f408 |
||
|
|
f6a44b3f1f | ||
|
|
fd8859df68 | ||
|
|
bf7dfdb2ce |
||
|
|
b851cbdafc |
||
|
|
bf0817f5a5 |
||
|
|
21acecbf27 | ||
|
|
6e05a62913 | ||
|
|
3040113a7a | ||
|
|
1c60283cdf | ||
|
|
f33a14f44f | ||
|
|
6bd7dce39d |
||
|
|
cce55f8f56 | ||
|
|
24c306d28d | ||
|
|
2c4d4b8151 | ||
|
|
43d181cda7 | ||
|
|
f8035e385d | ||
|
|
ea41467a56 | ||
|
|
9d850274b1 | ||
|
|
ad57d2b8e8 | ||
|
|
31230267ea | ||
|
|
cd953e11dd | ||
|
|
23b297bf58 | ||
|
|
f3c6ff7e2c | ||
|
|
4dcaf08c8b | ||
|
|
26b2c3ae54 | ||
|
|
e0f6afe5e6 | ||
|
|
2158b83433 | ||
|
|
f672fec436 | ||
|
|
cc30dec8eb | ||
|
|
9325dbbef7 | ||
|
|
1f19874524 | ||
|
|
c25beef1ca | ||
|
|
d00a2dffe1 | ||
|
|
dddf06a3e5 | ||
|
|
a39a95cf1a | ||
|
|
97967f71c8 | ||
|
|
59649f0733 | ||
|
|
4a2b84513e | ||
|
|
baf6440388 | ||
|
|
67dacdf0ad | ||
|
|
b55ae3bd16 | ||
|
|
37018cae6e | ||
|
|
9482c160b7 | ||
|
|
1250da8dfb | ||
|
|
c05b5f83e5 | ||
|
|
a0cb772e6f | ||
|
|
d21fd8df0d | ||
|
|
9666248b72 | ||
|
|
18d8c0abc1 | ||
|
|
ce3b866d19 | ||
|
|
3a336cf37e | ||
|
|
56555a47f2 | ||
|
|
e4decc2688 | ||
|
|
e680748e28 | ||
|
|
32fb61705f | ||
|
|
e3402b5fd4 | ||
|
|
1737e5c81f | ||
|
|
6b50cb9fc4 | ||
|
|
c822f6b1c0 | ||
|
|
4bd3080a00 | ||
|
|
7afd521be2 | ||
|
|
d5245cc71c | ||
|
|
581c05ccb4 | ||
|
|
44351906c7 | ||
|
|
f0b46ff947 | ||
|
|
1a18f20c40 | ||
|
|
4af0c9fc89 | ||
|
|
3a62768287 | ||
|
|
f4b85e63ba | ||
|
|
441f1d7519 | ||
|
|
5d08d14bbc | ||
|
|
fe6d386d13 | ||
|
|
27d47106a2 | ||
|
|
6d3ccf4f6f | ||
|
|
fac4ffd39e | ||
|
|
3426965b81 | ||
|
|
5d12163012 | ||
|
|
d72df4e29b | ||
|
|
1f6e0df263 | ||
|
|
bce50ab523 | ||
|
|
2f7b3e0a8c | ||
|
|
f4a53e34d0 | ||
|
|
d27f8523e2 | ||
|
|
9ed5d5b0f9 | ||
|
|
acfa9e81ec | ||
|
|
44b7afa142 | ||
|
|
4a6bfcaa46 | ||
|
|
b7eb17e7ee | ||
|
|
eadc061798 | ||
|
|
b0dc3833bf | ||
|
|
46d49783fe | ||
|
|
00f87f4b88 | ||
|
|
3dbfd57eac | ||
|
|
3957dee9a4 | ||
|
|
788bd804ff | ||
|
|
4f1cea8bda | ||
|
|
664c64dec9 | ||
|
|
5cd3289cea | ||
|
|
16fe71f18e | ||
|
|
07291932a7 | ||
|
|
2bc851a491 | ||
|
|
5637e2b274 | ||
|
|
30ec1629e9 | ||
|
|
df169bbdad | ||
|
|
990cf47f04 | ||
|
|
d3d47dee12 | ||
|
|
5decf6eab4 | ||
|
|
9cc8a839e2 | ||
|
|
71b79ae180 | ||
|
|
7c7259b187 | ||
|
|
abb9bb783a | ||
|
|
333a307888 | ||
|
|
822c7685b5 | ||
|
|
cf6dd7194c | ||
|
|
868a615b18 | ||
|
|
a38fffab2a | ||
|
|
d01deda0a2 | ||
|
|
d83775a947 | ||
|
|
44ebc66935 | ||
|
|
79b09b54df | ||
|
|
dd90a0a24b | ||
|
|
36ef66d59d | ||
|
|
359784bfb0 | ||
|
|
d507a7b94c | ||
|
|
7995abc6ec | ||
|
|
e9599c8226 |
||
|
|
4a8582e246 | ||
|
|
5d3dc8fdbd | ||
|
|
fd470b54bc | ||
|
|
79fe59c7fc | ||
|
|
d51b521e30 | ||
|
|
7effe141a5 | ||
|
|
0cb3deb32b | ||
|
|
02030dc915 | ||
|
|
ab7465c4fa | ||
|
|
bb681e6c30 | ||
|
|
2d00e2bb9a | ||
|
|
3490621545 | ||
|
|
d2d5d5d057 | ||
|
|
353860c35c | ||
|
|
8401ff18e3 | ||
|
|
28658db744 | ||
|
|
8fd1881fe2 | ||
|
|
8d02212742 | ||
|
|
6f16afd4a6 | ||
|
|
fde94e2609 | ||
|
|
34aa759415 | ||
|
|
28873d6a70 | ||
|
|
e0b67f5aa9 | ||
|
|
b9d157d0ce | ||
|
|
e00cb1843f | ||
|
|
e0567d54a7 | ||
|
|
3d65658099 | ||
|
|
4ceb7222e4 | ||
|
|
7a7c1a231c | ||
|
|
bc25708240 | ||
|
|
f1a024cc09 | ||
|
|
5e77c9c1c9 | ||
|
|
5e261ae9b9 | ||
|
|
e128603381 | ||
|
|
b3b3da0cdf | ||
|
|
c168f3b343 | ||
|
|
a4f03c6bc0 | ||
|
|
59a39fa268 | ||
|
|
8d346246a7 | ||
|
|
8d9eac4093 | ||
|
|
3ed22ec3e8 | ||
|
|
21de8b5251 | ||
|
|
380647993e | ||
|
|
0e3a55d8dc | ||
|
|
39f7c7c836 | ||
|
|
adf19d29ec | ||
|
|
8b01f2371c | ||
|
|
6cf6cd48dd | ||
|
|
d3849ced08 | ||
|
|
9551d101b0 | ||
|
|
fe09c9cd04 | ||
|
|
3bf1e52ff3 | ||
|
|
3792f36ae5 | ||
|
|
e207ff79a3 | ||
|
|
7d9e8632f3 | ||
|
|
0a63fa44ae | ||
|
|
34ffa2ef55 | ||
|
|
ee3bfc24ca | ||
|
|
0433f98b1b | ||
|
|
3b6df16a3d | ||
|
|
46ebf91d5f | ||
|
|
50e40c5f2b | ||
|
|
28edec2fbc | ||
|
|
8236de4f4b | ||
|
|
ffecc6b864 | ||
|
|
45ce637bf4 | ||
|
|
b0302efc50 | ||
|
|
96a98c054d | ||
|
|
06a5ca2716 | ||
|
|
593569e76b | ||
|
|
5440a2d9db | ||
|
|
67395a7505 | ||
|
|
cd5c4ef355 | ||
|
|
ab00e1ea64 | ||
|
|
eccec8ba45 | ||
|
|
7d9c9afa38 | ||
|
|
11e5aa1d55 | ||
|
|
01067b2813 | ||
|
|
452aa4a7e3 | ||
|
|
c553cab787 | ||
|
|
63c57dca19 | ||
|
|
7f1720d9a2 | ||
|
|
1f6f388ba3 | ||
|
|
32b1e5a154 | ||
|
|
8e9b3fd0aa | ||
|
|
49c29b4069 | ||
|
|
5dc61e9dc1 | ||
|
|
5fb9bc4700 | ||
|
|
f0951fecac | ||
|
|
c7c3ee3fab | ||
|
|
2ad92d25c0 | ||
|
|
cfbfd8c490 | ||
|
|
7b7a0554fb | ||
|
|
3775f446fe | ||
|
|
1f9b908a99 | ||
|
|
42e4196fc0 | ||
|
|
1b318dd805 | ||
|
|
138c00f55f | ||
|
|
58ee24949f | ||
|
|
e2395bc17f | ||
|
|
7adccbb026 | ||
|
|
0ea2ae6357 | ||
|
|
75d03ceef1 | ||
|
|
0006fec2f3 | ||
|
|
ac62214984 | ||
|
|
2f8deb0379 | ||
|
|
cae27396ec | ||
|
|
89879aa209 | ||
|
|
f7c8684e5e | ||
|
|
734e24e1b2 | ||
|
|
f5e87bdc05 | ||
|
|
df0e53f22d | ||
|
|
9c33d82fb4 | ||
|
|
8246976bb3 | ||
|
|
2af6179bec | ||
|
|
8d24562387 | ||
|
|
136250677d | ||
|
|
1240520fa1 | ||
|
|
156e6cc237 | ||
|
|
d700b52311 | ||
|
|
55f7ecdd4a | ||
|
|
72a0b599c4 | ||
|
|
be3c926a11 | ||
|
|
b3c0c98841 | ||
|
|
02d5a162e7 | ||
|
|
dc1142233b | ||
|
|
e241867dd1 | ||
|
|
ff51f0cc5e | ||
|
|
ef63c71412 | ||
|
|
963813cd96 | ||
|
|
40bc313160 | ||
|
|
45bd042713 | ||
|
|
9b303ebcee | ||
|
|
31d3fdd040 | ||
|
|
d6d7448c6a | ||
|
|
83c13991c9 | ||
|
|
7a1c1f8975 | ||
|
|
94edc2ddc8 | ||
|
|
f1ce0c9000 | ||
|
|
9268947eab | ||
|
|
bbc81312d7 | ||
|
|
6f9637e525 | ||
|
|
a504f0affe | ||
|
|
8ff0950897 | ||
|
|
3a87513acc | ||
|
|
a1f9baa6b8 | ||
|
|
bb33bc40ad | ||
|
|
595c0722d7 | ||
|
|
a6b6d0c94b | ||
|
|
b9de06b267 | ||
|
|
cc8ce57be2 | ||
|
|
3e3be79dfd | ||
|
|
6f1fcbc4c6 | ||
|
|
afe488cc19 | ||
|
|
bf6c8ea752 | ||
|
|
9b2b941682 | ||
|
|
32c6651930 | ||
|
|
0dcc5a0d5e | ||
|
|
bce5991c5f | ||
|
|
e8fe3e1cf6 | ||
|
|
1ad7b8db0f | ||
|
|
3da08655cd | ||
|
|
b87f1b2dfc | ||
|
|
ed5396d91e | ||
|
|
f0b6f85aff | ||
|
|
7bbf86f2fe | ||
|
|
c7a1b74c04 | ||
|
|
1ad51b6276 | ||
|
|
76ade64f4b | ||
|
|
c3f2f52e74 | ||
|
|
9c597e4334 | ||
|
|
bad02099bd | ||
|
|
bdd83b2e69 | ||
|
|
1801957473 | ||
|
|
1812652505 | ||
|
|
970e32111e | ||
|
|
c7f6c7b9f6 | ||
|
|
4c4be9e1c9 | ||
|
|
9ae2bc3ca1 | ||
|
|
3be440dcae | ||
|
|
04d73f0952 | ||
|
|
c9e9ece7a3 | ||
|
|
3b194abd70 | ||
|
|
5089cf4365 | ||
|
|
85ea3f49e4 | ||
|
|
11aeb4e734 | ||
|
|
c767e7c27a | ||
|
|
d9f99cf09b | ||
|
|
7e4f1a381e | ||
|
|
ca6f66d311 | ||
|
|
72f2f9f3eb | ||
|
|
c718b5ec2a | ||
|
|
edc2e6afec | ||
|
|
5580b508e3 | ||
|
|
8b177c8f26 | ||
|
|
fa6f383f16 | ||
|
|
7ee630cc50 | ||
|
|
89d1aa92a0 | ||
|
|
0c6cba0357 | ||
|
|
28e1367cfe | ||
|
|
5427c82f63 | ||
|
|
1a367d9c9a | ||
|
|
bfd5cf1204 | ||
|
|
315471e18a | ||
|
|
618e468330 | ||
|
|
9a7f541e9b | ||
|
|
6972fb24fa | ||
|
|
bb1a465686 | ||
|
|
1618770344 | ||
|
|
58683bf9af | ||
|
|
ec52e39a79 | ||
|
|
0af510e40c | ||
|
|
09220fef36 | ||
|
|
56e501f901 | ||
|
|
26e34c1ce3 | ||
|
|
ad3d42ec4f | ||
|
|
33b6b75afa | ||
|
|
29106aca87 | ||
|
|
7f6231bff1 | ||
|
|
377a7b8082 | ||
|
|
d910089c7d | ||
|
|
04f29fa71b | ||
|
|
586a3174f1 | ||
|
|
3c275d96b3 | ||
|
|
f531c8b978 | ||
|
|
f6278cea7c | ||
|
|
240f408e81 | ||
|
|
cdb1602dfe | ||
|
|
59d9061232 | ||
|
|
c9499bdd25 | ||
|
|
a8f8a59fc2 | ||
|
|
cb9359bd04 | ||
|
|
fbca36cbd7 | ||
|
|
b5f9200448 | ||
|
|
a68f226c74 | ||
|
|
6ff9fce161 | ||
|
|
9938e5be66 | ||
|
|
4afb5b057d | ||
|
|
c9c477adae | ||
|
|
65b57c538d | ||
|
|
2947a97744 | ||
|
|
d79f57cc32 | ||
|
|
575258689b | ||
|
|
50a3bada88 | ||
|
|
fdeedf2670 | ||
|
|
7a041cc0d8 | ||
|
|
9207a1510e | ||
|
|
e734c6455a | ||
|
|
78e0be209f | ||
|
|
f467b43c7c | ||
|
|
95b1c6985e | ||
|
|
16cfab74f0 | ||
|
|
b3f814c1b6 | ||
|
|
7165b2fd59 | ||
|
|
0c817be19f | ||
|
|
58ba6d5250 | ||
|
|
1c281144c3 | ||
|
|
1dfeb25767 | ||
|
|
826eac74c1 | ||
|
|
163de8bee0 | ||
|
|
35cd801647 | ||
|
|
9170895a87 | ||
|
|
c07997606c | ||
|
|
bd229edf8d | ||
|
|
eed90449e8 | ||
|
|
98ff9fee21 | ||
|
|
801235770d | ||
|
|
0a5116219c | ||
|
|
eacfb88d2c | ||
|
|
a921d1b238 | ||
|
|
c28546fac4 | ||
|
|
f050d2d59c | ||
|
|
28c58ff02c | ||
|
|
2a672b5b69 | ||
|
|
24132a00a8 | ||
|
|
437af5569d | ||
|
|
93d4e3a79f | ||
|
|
4bdb7ac780 | ||
|
|
182b0889a6 | ||
|
|
2fb3ab2d41 | ||
|
|
5408b3bda3 | ||
|
|
c9dda99c50 | ||
|
|
c61df8518b | ||
|
|
09425ca8ae | ||
|
|
5421281a0d | ||
|
|
12996d09a1 | ||
|
|
a5bbdc735f | ||
|
|
d059274f53 | ||
|
|
80779cc2b9 | ||
|
|
515305b108 | ||
|
|
edc268cf05 | ||
|
|
5e50360426 | ||
|
|
20666c9d9c | ||
|
|
6a2111b547 | ||
|
|
f27ce018bd | ||
|
|
5e9aa7bfb4 | ||
|
|
c6e08c0277 | ||
|
|
d3f2dba129 | ||
|
|
3376fb410c | ||
|
|
dc24bf67e6 | ||
|
|
083eee0f58 | ||
|
|
9956da5309 | ||
|
|
437c9e4ea2 | ||
|
|
99cafffe10 | ||
|
|
75e385fc3e | ||
|
|
0ab9d455d1 | ||
|
|
422af9d036 | ||
|
|
e6c89339d8 | ||
|
|
c77f9b75dc | ||
|
|
4bef77de29 | ||
|
|
c8937976c4 | ||
|
|
66a4fe9b1a | ||
|
|
af1fb4eb12 | ||
|
|
4f2a56081b | ||
|
|
f8d3fd6d8e | ||
|
|
207519174e | ||
|
|
fa0337b2a5 | ||
|
|
e87ead322a | ||
|
|
ae3959bffe | ||
|
|
066fd3a5cb | ||
|
|
2277f1a25d | ||
|
|
4c2f2aae39 | ||
|
|
f0deff4c0d | ||
|
|
6a4350f7d9 | ||
|
|
2505178971 | ||
|
|
266a669f62 | ||
|
|
61fe33cb1c | ||
|
|
2c2fd97500 | ||
|
|
79c2ad7ebe | ||
|
|
23a4715f2a | ||
|
|
063897c2f3 | ||
|
|
f494e3c6ec | ||
|
|
5fd0b055f5 | ||
|
|
1bc86eb295 | ||
|
|
e1052e34a1 | ||
|
|
378338cdef | ||
|
|
7915d210f2 | ||
|
|
ff18ef69d3 | ||
|
|
3dc23f3518 | ||
|
|
777ce54cea | ||
|
|
7f2b3258d5 | ||
|
|
67e264c142 | ||
|
|
17e0cac955 | ||
|
|
64938e3ecc | ||
|
|
187c0782af | ||
|
|
1ef0ec681f | ||
|
|
ca7ca126aa | ||
|
|
81a387abc6 | ||
|
|
92dfad507f | ||
|
|
579172fc3b | ||
|
|
d540fa5fff | ||
|
|
bfff2133f5 | ||
|
|
c39fe6a1cc | ||
|
|
a359684b15 | ||
|
|
49c94e6cef | ||
|
|
be82102c5b | ||
|
|
4de88fbc58 | ||
|
|
c4b1fe4c8a | ||
|
|
eded8d92cb | ||
|
|
f88f91b802 | ||
|
|
b264912790 | ||
|
|
f7b5421d46 | ||
|
|
5a43cb54ac | ||
|
|
25edeeda75 | ||
|
|
8283df33d5 | ||
|
|
e8a61f5499 | ||
|
|
185a101acb | ||
|
|
c2ee73dbca | ||
|
|
e18e41532f | ||
|
|
e464e338f2 | ||
|
|
1896a2ae6f | ||
|
|
46776ebb82 | ||
|
|
893c38877c | ||
|
|
3a1addac9b | ||
|
|
146c35e640 | ||
|
|
0beb80a141 | ||
|
|
680b5e35f9 | ||
|
|
e1155495fa | ||
|
|
9cd65b9a55 | ||
|
|
f4e74ff9f8 | ||
|
|
75d13c2a17 | ||
|
|
b8498f9e0c | ||
|
|
4bfed977b1 | ||
|
|
a7cab66ce1 | ||
|
|
2481699c0d | ||
|
|
c7a6abf853 | ||
|
|
0e06139f50 | ||
|
|
717c3451c3 | ||
|
|
3ed40da1f4 | ||
|
|
c8e66e12c9 | ||
|
|
98cf8da1e8 | ||
|
|
393646c215 | ||
|
|
5f9af7f6c9 | ||
|
|
8738c500a0 | ||
|
|
26314cd521 | ||
|
|
07ce6e0dfb | ||
|
|
97c49fbdc6 | ||
|
|
25defc901f | ||
|
|
4ff137bab6 | ||
|
|
a81ef24536 |
60 changed files with 6391 additions and 9408 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
||||||
coreutils-6.10.tar.lzma
|
/coreutils-[0-9.]*.tar.xz
|
||||||
|
/coreutils-[0-9.]*.tar.xz.sig
|
||||||
|
|
|
||||||
7
STAGE1-coreutils
Normal file
7
STAGE1-coreutils
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
srpm coreutils
|
||||||
|
mcd $BUILDDIR/$1
|
||||||
|
(cd $SRC/${1}-*/ ; autoreconf -vif)
|
||||||
|
$SRC/${1}-*/configure $TCONFIGARGS --disable-pam
|
||||||
|
notparallel
|
||||||
|
make $J man1_MANS= V=1
|
||||||
|
make $J man1_MANS= install DESTDIR=${ROOTFS}
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
--- coreutils-5.92/src/date.c.langinfo 2005-09-16 09:06:57.000000000 +0100
|
|
||||||
+++ coreutils-5.92/src/date.c 2005-10-24 18:09:16.000000000 +0100
|
|
||||||
@@ -451,14 +451,7 @@
|
|
||||||
format = DATE_FMT_LANGINFO ();
|
|
||||||
if (! *format)
|
|
||||||
{
|
|
||||||
- /* Do not wrap the following literal format string with _(...).
|
|
||||||
- For example, suppose LC_ALL is unset, LC_TIME="POSIX",
|
|
||||||
- and LANG="ko_KR". In that case, POSIX says that LC_TIME
|
|
||||||
- determines the format and contents of date and time strings
|
|
||||||
- written by date, which means "date" must generate output
|
|
||||||
- using the POSIX locale; but adding _() would cause "date"
|
|
||||||
- to use a Korean translation of the format. */
|
|
||||||
- format = "%a %b %e %H:%M:%S %Z %Y";
|
|
||||||
+ format = dcgettext(NULL, N_("%a %b %e %H:%M:%S %Z %Y"), LC_TIME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
--- coreutils-5.97/src/uname.c.sysinfo 2005-09-15 20:57:04.000000000 +0100
|
|
||||||
+++ coreutils-5.97/src/uname.c 2006-08-24 17:15:56.000000000 +0100
|
|
||||||
@@ -263,7 +263,7 @@
|
|
||||||
int
|
|
||||||
main (int argc, char **argv)
|
|
||||||
{
|
|
||||||
- static char const unknown[] = "unknown";
|
|
||||||
+ static char unknown[] = "unknown";
|
|
||||||
|
|
||||||
/* Mask indicating which elements to print. */
|
|
||||||
unsigned int toprint = 0;
|
|
||||||
@@ -306,13 +306,35 @@
|
|
||||||
|
|
||||||
if (toprint & PRINT_PROCESSOR)
|
|
||||||
{
|
|
||||||
- char const *element = unknown;
|
|
||||||
+ char *element = unknown;
|
|
||||||
#if HAVE_SYSINFO && defined SI_ARCHITECTURE
|
|
||||||
{
|
|
||||||
static char processor[257];
|
|
||||||
if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
|
|
||||||
element = processor;
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ {
|
|
||||||
+ struct utsname u;
|
|
||||||
+ uname(&u);
|
|
||||||
+ element = u.machine;
|
|
||||||
+#ifdef linux
|
|
||||||
+ if(!strcmp(element, "i686")) { /* Check for Athlon */
|
|
||||||
+ char cinfo[1024];
|
|
||||||
+ FILE *f=fopen("/proc/cpuinfo", "r");
|
|
||||||
+ if(f) {
|
|
||||||
+ while(fgets(cinfo, 1024, f)) {
|
|
||||||
+ if(!strncmp(cinfo, "vendor_id", 9)) {
|
|
||||||
+ if(strstr(cinfo, "AuthenticAMD"))
|
|
||||||
+ element="athlon";
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ fclose(f);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
#endif
|
|
||||||
#ifdef UNAME_PROCESSOR
|
|
||||||
if (element == unknown)
|
|
||||||
@@ -348,7 +370,7 @@
|
|
||||||
|
|
||||||
if (toprint & PRINT_HARDWARE_PLATFORM)
|
|
||||||
{
|
|
||||||
- char const *element = unknown;
|
|
||||||
+ char *element = unknown;
|
|
||||||
#if HAVE_SYSINFO && defined SI_PLATFORM
|
|
||||||
{
|
|
||||||
static char hardware_platform[257];
|
|
||||||
@@ -356,6 +378,14 @@
|
|
||||||
hardware_platform, sizeof hardware_platform))
|
|
||||||
element = hardware_platform;
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ {
|
|
||||||
+ struct utsname u;
|
|
||||||
+ uname(&u);
|
|
||||||
+ element = u.machine;
|
|
||||||
+ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6')
|
|
||||||
+ element[1]='3';
|
|
||||||
+ }
|
|
||||||
#endif
|
|
||||||
#ifdef UNAME_HARDWARE_PLATFORM
|
|
||||||
if (element == unknown)
|
|
||||||
|
|
@ -1,83 +0,0 @@
|
||||||
From 50654566c77d1335870206f657507a2d1c23f628 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik <at> redhat.com>
|
|
||||||
Date: Thu, 9 Oct 2008 10:56:54 +0200
|
|
||||||
Subject: [PATCH] doc: ls: clarify exit status description
|
|
||||||
|
|
||||||
* src/ls.c (exit_status): Clarify comments.
|
|
||||||
(usage): Clarify exit status description in --help output.
|
|
||||||
* doc/coreutils.texi (ls invocation): Clarify exit status documentation
|
|
||||||
Reported by Greg Metcalfe in <http://bugzilla.redhat.com/446294>.
|
|
||||||
---
|
|
||||||
THANKS | 1 +
|
|
||||||
doc/coreutils.texi | 7 +++++--
|
|
||||||
src/ls.c | 16 ++++++++++++----
|
|
||||||
3 files changed, 18 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/THANKS b/THANKS
|
|
||||||
index e6e48b3..d06f755 100644
|
|
||||||
--- a/THANKS
|
|
||||||
+++ b/THANKS
|
|
||||||
@@ -201,6 +201,7 @@ Guochun Shi gshi@ncsa.uiuc.edu
|
|
||||||
GOTO Masanori gotom@debian.or.jp
|
|
||||||
Greg Louis glouis@dynamicro.on.ca
|
|
||||||
Greg McGary gkm@gnu.org
|
|
||||||
+Greg Metcalfe metcalfegreg@qwest.net
|
|
||||||
Greg Schafer gschafer@zip.com.au
|
|
||||||
Greg Troxel gdt@bbn.com
|
|
||||||
Greg Wooledge gawooledge@sherwin.com
|
|
||||||
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
|
||||||
index a0d2202..b7e044d 100644
|
|
||||||
--- a/doc/coreutils.texi
|
|
||||||
+++ b/doc/coreutils.texi
|
|
||||||
@@ -6073,8 +6073,11 @@ ls invocation
|
|
||||||
|
|
||||||
@display
|
|
||||||
0 success
|
|
||||||
-1 minor problems (e.g., a subdirectory was not found)
|
|
||||||
-2 serious trouble (e.g., memory exhausted)
|
|
||||||
+1 minor problems (e.g., failure to access a file or directory not
|
|
||||||
+ specified as a command line argument. This happens when listing a
|
|
||||||
+ directory in which entries are actively being removed or renamed.)
|
|
||||||
+2 serious trouble (e.g., memory exhausted, invalid option or failure
|
|
||||||
+ to access file or directory specified as a command line argument)
|
|
||||||
@end display
|
|
||||||
|
|
||||||
Also see @ref{Common options}.
|
|
||||||
diff --git a/src/ls.c b/src/ls.c
|
|
||||||
index e107162..108d669 100644
|
|
||||||
--- a/src/ls.c
|
|
||||||
+++ b/src/ls.c
|
|
||||||
@@ -715,11 +715,14 @@ static int exit_status;
|
|
||||||
/* Exit statuses. */
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
- /* "ls" had a minor problem (e.g., it could not stat a directory
|
|
||||||
- entry). */
|
|
||||||
+ /* "ls" had a minor problem. E.g., while processing a directory,
|
|
||||||
+ ls obtained the name of an entry via readdir, yet was later
|
|
||||||
+ unable to stat that name. This happens when listing a directory
|
|
||||||
+ in which entries are actively being removed or renamed. */
|
|
||||||
LS_MINOR_PROBLEM = 1,
|
|
||||||
|
|
||||||
- /* "ls" had more serious trouble. */
|
|
||||||
+ /* "ls" had more serious trouble (e.g., memory exhausted, invalid
|
|
||||||
+ option or failure to stat a command line argument. */
|
|
||||||
LS_FAILURE = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -4527,7 +4530,12 @@ colors, and can be set easily by the dircolors command.\n\
|
|
||||||
"), stdout);
|
|
||||||
fputs (_("\
|
|
||||||
\n\
|
|
||||||
-Exit status is 0 if OK, 1 if minor problems, 2 if serious trouble.\n\
|
|
||||||
+Exit status:\n\
|
|
||||||
+0 if OK,\n\
|
|
||||||
+1 if minor problems (e.g., failure to access a file or directory not\n\
|
|
||||||
+ specified as a command line argument\n\
|
|
||||||
+2 if serious trouble (e.g., memory exhausted, invalid option or failure\n\
|
|
||||||
+ to access a file or directory specified as a command line argument).\n\
|
|
||||||
"), stdout);
|
|
||||||
emit_bug_reporting_address ();
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.6.0.2.514.g23abd3
|
|
||||||
|
|
@ -1,59 +0,0 @@
|
||||||
diff -urNp coreutils-6.12-orig/man/chcon.1 coreutils-6.12/man/chcon.1
|
|
||||||
--- coreutils-6.12-orig/man/chcon.1 2008-10-08 14:45:59.000000000 +0200
|
|
||||||
+++ coreutils-6.12/man/chcon.1 2008-10-08 16:35:55.000000000 +0200
|
|
||||||
@@ -17,9 +17,6 @@ chcon \- change file SELinux security co
|
|
||||||
Change the SELinux security context of each FILE to CONTEXT.
|
|
||||||
With \fB\-\-reference\fR, change the security context of each FILE to that of RFILE.
|
|
||||||
.TP
|
|
||||||
-\fB\-c\fR, \fB\-\-changes\fR
|
|
||||||
-like verbose but report only when a change is made
|
|
||||||
-.TP
|
|
||||||
\fB\-h\fR, \fB\-\-no\-dereference\fR
|
|
||||||
affect symbolic links instead of any referenced file
|
|
||||||
.TP
|
|
||||||
diff -urNp coreutils-6.12-orig/src/chcon.c coreutils-6.12/src/chcon.c
|
|
||||||
--- coreutils-6.12-orig/src/chcon.c 2008-10-08 14:45:59.000000000 +0200
|
|
||||||
+++ coreutils-6.12/src/chcon.c 2008-10-08 16:28:36.000000000 +0200
|
|
||||||
@@ -35,25 +35,6 @@
|
|
||||||
proper_name ("Russell Coker"), \
|
|
||||||
proper_name ("Jim Meyering")
|
|
||||||
|
|
||||||
-enum Change_status
|
|
||||||
-{
|
|
||||||
- CH_NOT_APPLIED,
|
|
||||||
- CH_SUCCEEDED,
|
|
||||||
- CH_FAILED,
|
|
||||||
- CH_NO_CHANGE_REQUESTED
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
-enum Verbosity
|
|
||||||
-{
|
|
||||||
- /* Print a message for each file that is processed. */
|
|
||||||
- V_high,
|
|
||||||
-
|
|
||||||
- /* Print a message for each file whose attributes we change. */
|
|
||||||
- V_changes_only,
|
|
||||||
-
|
|
||||||
- /* Do not be verbose. This is the default. */
|
|
||||||
- V_off
|
|
||||||
-};
|
|
||||||
|
|
||||||
/* The name the program was run with. */
|
|
||||||
char *program_name;
|
|
||||||
@@ -374,7 +355,6 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
|
|
||||||
Change the security context of each FILE to CONTEXT.\n\
|
|
||||||
With --reference, change the security context of each FILE to that of RFILE.\n\
|
|
||||||
\n\
|
|
||||||
- -c, --changes like verbose but report only when a change is made\n\
|
|
||||||
-h, --no-dereference affect symbolic links instead of any referenced file\n\
|
|
||||||
"), stdout);
|
|
||||||
fputs (_("\
|
|
||||||
@@ -435,7 +415,7 @@ main (int argc, char **argv)
|
|
||||||
|
|
||||||
atexit (close_stdout);
|
|
||||||
|
|
||||||
- while ((optc = getopt_long (argc, argv, "HLPRchvu:r:t:l:", long_options, NULL))
|
|
||||||
+ while ((optc = getopt_long (argc, argv, "HLPRhvu:r:t:l:", long_options, NULL))
|
|
||||||
!= -1)
|
|
||||||
{
|
|
||||||
switch (optc)
|
|
||||||
|
|
@ -1,421 +0,0 @@
|
||||||
--- coreutils-6.10/tests/misc/help-version.runuser
|
|
||||||
+++ coreutils-6.10/tests/misc/help-version
|
|
||||||
@@ -168,6 +168,7 @@
|
|
||||||
seq_args=10
|
|
||||||
sleep_args=0
|
|
||||||
su_args=--version
|
|
||||||
+runuser_args=--version
|
|
||||||
|
|
||||||
# I'd rather not run sync, since it spins up disks that I've
|
|
||||||
# deliberately caused to spin down (but not unmounted).
|
|
||||||
--- coreutils-6.10/README.runuser
|
|
||||||
+++ coreutils-6.10/README
|
|
||||||
@@ -11,8 +11,8 @@
|
|
||||||
factor false fmt fold groups head hostid hostname id install join kill
|
|
||||||
link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
|
|
||||||
od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
|
|
||||||
- runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
|
|
||||||
- sleep sort split stat stty su sum sync tac tail tee test touch tr true
|
|
||||||
+ runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
|
|
||||||
+ shuf sleep sort split stat stty su sum sync tac tail tee test touch tr true
|
|
||||||
tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes
|
|
||||||
|
|
||||||
See the file NEWS for a list of major changes in the current release.
|
|
||||||
--- coreutils-6.7/src/su.c.runuser 2007-01-09 17:27:56.000000000 +0000
|
|
||||||
+++ coreutils-6.7/src/su.c 2007-01-09 17:30:12.000000000 +0000
|
|
||||||
@@ -110,9 +110,15 @@
|
|
||||||
#include "error.h"
|
|
||||||
|
|
||||||
/* The official name of this program (e.g., no `g' prefix). */
|
|
||||||
+#ifndef RUNUSER
|
|
||||||
#define PROGRAM_NAME "su"
|
|
||||||
+#else
|
|
||||||
+#define PROGRAM_NAME "runuser"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
+#ifndef AUTHORS
|
|
||||||
#define AUTHORS "David MacKenzie"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#if HAVE_PATHS_H
|
|
||||||
# include <paths.h>
|
|
||||||
@@ -150,6 +156,10 @@
|
|
||||||
#ifndef USE_PAM
|
|
||||||
char *crypt ();
|
|
||||||
#endif
|
|
||||||
+#ifndef CHECKPASSWD
|
|
||||||
+#define CHECKPASSWD 1
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
char *getusershell ();
|
|
||||||
void endusershell ();
|
|
||||||
void setusershell ();
|
|
||||||
@@ -157,7 +167,11 @@
|
|
||||||
extern char **environ;
|
|
||||||
|
|
||||||
static void run_shell (char const *, char const *, char **, size_t,
|
|
||||||
- const struct passwd *)
|
|
||||||
+ const struct passwd *
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ , gid_t *groups, int num_groups
|
|
||||||
+#endif
|
|
||||||
+ )
|
|
||||||
#ifdef USE_PAM
|
|
||||||
;
|
|
||||||
#else
|
|
||||||
@@ -187,6 +201,10 @@
|
|
||||||
{"login", no_argument, NULL, 'l'},
|
|
||||||
{"preserve-environment", no_argument, NULL, 'p'},
|
|
||||||
{"shell", required_argument, NULL, 's'},
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ {"group", required_argument, NULL, 'g'},
|
|
||||||
+ {"supp-group", required_argument, NULL, 'G'},
|
|
||||||
+#endif
|
|
||||||
{GETOPT_HELP_OPTION_DECL},
|
|
||||||
{GETOPT_VERSION_OPTION_DECL},
|
|
||||||
{NULL, 0, NULL, 0}
|
|
||||||
@@ -288,10 +306,12 @@
|
|
||||||
retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
|
|
||||||
PAM_BAIL_P;
|
|
||||||
|
|
||||||
+#ifndef RUNUSER
|
|
||||||
if (getuid() != 0 && !isatty(0)) {
|
|
||||||
fprintf(stderr, "standard in must be a tty\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
caller = getpwuid(getuid());
|
|
||||||
if(caller != NULL && caller->pw_name != NULL) {
|
|
||||||
@@ -308,6 +328,11 @@
|
|
||||||
retval = pam_set_item(pamh, PAM_TTY, tty_name);
|
|
||||||
PAM_BAIL_P;
|
|
||||||
}
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ if (getuid() != geteuid())
|
|
||||||
+ /* safety net: deny operation if we are suid by accident */
|
|
||||||
+ error(EXIT_FAILURE, 1, "runuser may not be setuid");
|
|
||||||
+#else
|
|
||||||
retval = pam_authenticate(pamh, 0);
|
|
||||||
PAM_BAIL_P;
|
|
||||||
retval = pam_acct_mgmt(pamh, 0);
|
|
||||||
@@ -317,6 +342,7 @@
|
|
||||||
PAM_BAIL_P;
|
|
||||||
}
|
|
||||||
PAM_BAIL_P;
|
|
||||||
+#endif
|
|
||||||
/* must be authenticated if this point was reached */
|
|
||||||
return 1;
|
|
||||||
#else /* !USE_PAM */
|
|
||||||
@@ -398,11 +424,22 @@
|
|
||||||
/* Become the user and group(s) specified by PW. */
|
|
||||||
|
|
||||||
static void
|
|
||||||
-change_identity (const struct passwd *pw)
|
|
||||||
+change_identity (const struct passwd *pw
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ , gid_t *groups, int num_groups
|
|
||||||
+#endif
|
|
||||||
+ )
|
|
||||||
{
|
|
||||||
#ifdef HAVE_INITGROUPS
|
|
||||||
+ int rc = 0;
|
|
||||||
errno = 0;
|
|
||||||
- if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ if (num_groups)
|
|
||||||
+ rc = setgroups(num_groups, groups);
|
|
||||||
+ else
|
|
||||||
+#endif
|
|
||||||
+ rc = initgroups(pw->pw_name, pw->pw_gid);
|
|
||||||
+ if (rc == -1) {
|
|
||||||
#ifdef USE_PAM
|
|
||||||
pam_close_session(pamh, 0);
|
|
||||||
pam_end(pamh, PAM_ABORT);
|
|
||||||
@@ -449,7 +486,11 @@
|
|
||||||
|
|
||||||
static void
|
|
||||||
run_shell (char const *shell, char const *command, char **additional_args,
|
|
||||||
- size_t n_additional_args, const struct passwd *pw)
|
|
||||||
+ size_t n_additional_args, const struct passwd *pw
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ , gid_t *groups, int num_groups
|
|
||||||
+#endif
|
|
||||||
+ )
|
|
||||||
{
|
|
||||||
size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
|
|
||||||
char const **args = xnmalloc (n_args, sizeof *args);
|
|
||||||
@@ -480,7 +521,11 @@
|
|
||||||
|
|
||||||
child = fork();
|
|
||||||
if (child == 0) { /* child shell */
|
|
||||||
- change_identity (pw);
|
|
||||||
+ change_identity (pw
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ , groups, num_groups
|
|
||||||
+#endif
|
|
||||||
+ );
|
|
||||||
pam_end(pamh, 0);
|
|
||||||
if (!same_session)
|
|
||||||
setsid ();
|
|
||||||
@@ -628,6 +673,27 @@ usage (int status)
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name);
|
|
||||||
+ printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name);
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ fputs (_("\
|
|
||||||
+Change the effective user id and group id to that of USER. No PAM hooks\n\
|
|
||||||
+are run, and there will be no password prompt. This command is useful\n\
|
|
||||||
+when run as the root user. If run as a non-root user without privilege\n\
|
|
||||||
+to set user ID, the command will fail.\n\
|
|
||||||
+\n\
|
|
||||||
+ -, -l, --login make the shell a login shell, uses runuser-l\n\
|
|
||||||
+ PAM file instead of default one\n\
|
|
||||||
+ -g --group=group specify the primary group\n\
|
|
||||||
+ -G --supp-group=group specify a supplemental group\n\
|
|
||||||
+ -c, --command=COMMAND pass a single COMMAND to the shell with -c\n\
|
|
||||||
+ --session-command=COMMAND pass a single COMMAND to the shell with -c\n\
|
|
||||||
+ and do not create a new session\n\
|
|
||||||
+ -f, --fast pass -f to the shell (for csh or tcsh)\n\
|
|
||||||
+ -m, --preserve-environment do not reset environment variables\n\
|
|
||||||
+ -p same as -m\n\
|
|
||||||
+ -s, --shell=SHELL run SHELL if /etc/shells allows it\n\
|
|
||||||
+"), stdout);
|
|
||||||
+#else
|
|
||||||
fputs (_("\
|
|
||||||
Change the effective user id and group id to that of USER.\n\
|
|
||||||
\n\
|
|
||||||
@@ -640,6 +706,7 @@ Change the effective user id and group i
|
|
||||||
-p same as -m\n\
|
|
||||||
-s, --shell=SHELL run SHELL if /etc/shells allows it\n\
|
|
||||||
"), stdout);
|
|
||||||
+#endif
|
|
||||||
fputs (HELP_OPTION_DESCRIPTION, stdout);
|
|
||||||
fputs (VERSION_OPTION_DESCRIPTION, stdout);
|
|
||||||
fputs (_("\
|
|
||||||
@@ -657,6 +724,12 @@
|
|
||||||
char *shell = NULL;
|
|
||||||
struct passwd *pw;
|
|
||||||
struct passwd pw_copy;
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ struct group *gr;
|
|
||||||
+ gid_t groups[NGROUPS_MAX];
|
|
||||||
+ int num_supp_groups = 0;
|
|
||||||
+ int use_gid = 0;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
initialize_main (&argc, &argv);
|
|
||||||
program_name = argv[0];
|
|
||||||
@@ -671,7 +744,11 @@
|
|
||||||
simulate_login = false;
|
|
||||||
change_environment = true;
|
|
||||||
|
|
||||||
- while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1)
|
|
||||||
+ while ((optc = getopt_long (argc, argv, "c:flmps:"
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ "g:G:"
|
|
||||||
+#endif
|
|
||||||
+ , longopts, NULL)) != -1)
|
|
||||||
{
|
|
||||||
switch (optc)
|
|
||||||
{
|
|
||||||
@@ -701,6 +778,28 @@
|
|
||||||
shell = optarg;
|
|
||||||
break;
|
|
||||||
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ case 'g':
|
|
||||||
+ gr = getgrnam(optarg);
|
|
||||||
+ if (!gr)
|
|
||||||
+ error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
|
|
||||||
+ use_gid = 1;
|
|
||||||
+ groups[0] = gr->gr_gid;
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ case 'G':
|
|
||||||
+ num_supp_groups++;
|
|
||||||
+ if (num_supp_groups >= NGROUPS_MAX)
|
|
||||||
+ error (EXIT_FAILURE, 0,
|
|
||||||
+ _("Can't specify more than %d supplemental groups"),
|
|
||||||
+ NGROUPS_MAX - 1);
|
|
||||||
+ gr = getgrnam(optarg);
|
|
||||||
+ if (!gr)
|
|
||||||
+ error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg);
|
|
||||||
+ groups[num_supp_groups] = gr->gr_gid;
|
|
||||||
+ break;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
case_GETOPT_HELP_CHAR;
|
|
||||||
|
|
||||||
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
|
|
||||||
@@ -739,7 +838,20 @@
|
|
||||||
: DEFAULT_SHELL);
|
|
||||||
endpwent ();
|
|
||||||
|
|
||||||
- if (!correct_password (pw))
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ if (num_supp_groups && !use_gid)
|
|
||||||
+ {
|
|
||||||
+ pw->pw_gid = groups[1];
|
|
||||||
+ memmove (groups, groups + 1, sizeof(gid_t) * num_supp_groups);
|
|
||||||
+ }
|
|
||||||
+ else if (use_gid)
|
|
||||||
+ {
|
|
||||||
+ pw->pw_gid = groups[0];
|
|
||||||
+ num_supp_groups++;
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ if (CHECKPASSWD && !correct_password (pw))
|
|
||||||
{
|
|
||||||
#ifdef SYSLOG_FAILURE
|
|
||||||
log_su (pw, false);
|
|
||||||
@@ -771,8 +883,16 @@
|
|
||||||
modify_environment (pw, shell);
|
|
||||||
|
|
||||||
#ifndef USE_PAM
|
|
||||||
- change_identity (pw);
|
|
||||||
+ change_identity (pw
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ , groups, num_supp_groups
|
|
||||||
+#endif
|
|
||||||
+ );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
- run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
|
|
||||||
+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw
|
|
||||||
+#ifdef RUNUSER
|
|
||||||
+ , groups, num_supp_groups
|
|
||||||
+#endif
|
|
||||||
+ );
|
|
||||||
}
|
|
||||||
--- coreutils-6.10/src/Makefile.am.runuser
|
|
||||||
+++ coreutils-6.10/src/Makefile.am
|
|
||||||
@@ -38,7 +38,7 @@
|
|
||||||
shuf sort split sum tac tail tr tsort unexpand uniq wc \
|
|
||||||
basename date dirname echo env expr factor false \
|
|
||||||
id kill logname pathchk printenv printf pwd \
|
|
||||||
- runcon seq sleep tee \
|
|
||||||
+ runcon runuser seq sleep tee \
|
|
||||||
test true tty whoami yes \
|
|
||||||
base64
|
|
||||||
|
|
||||||
@@ -112,6 +112,10 @@
|
|
||||||
mv_LDADD += $(LIB_ACL)
|
|
||||||
ginstall_LDADD += $(LIB_ACL)
|
|
||||||
|
|
||||||
+runuser_SOURCES = su.c
|
|
||||||
+runuser_CFLAGS = -DRUNUSER -DAUTHORS="\"David MacKenzie, Dan Walsh\""
|
|
||||||
+runuser_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
|
|
||||||
+
|
|
||||||
$(PROGRAMS): ../lib/libcoreutils.a
|
|
||||||
|
|
||||||
SUFFIXES = .sh
|
|
||||||
@@ -126,7 +130,7 @@
|
|
||||||
chmod +x $@-t
|
|
||||||
mv $@-t $@
|
|
||||||
|
|
||||||
-all-local: su$(EXEEXT)
|
|
||||||
+all-local: su$(EXEEXT) runuser
|
|
||||||
|
|
||||||
installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
|
|
||||||
|
|
||||||
--- coreutils-6.10/AUTHORS.runuser
|
|
||||||
+++ coreutils-6.10/AUTHORS
|
|
||||||
@@ -60,6 +60,7 @@
|
|
||||||
readlink: Dmitry V. Levin
|
|
||||||
rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
|
|
||||||
rmdir: David MacKenzie
|
|
||||||
+runuser: David MacKenzie, Dan Walsh
|
|
||||||
runcon: Russell Coker
|
|
||||||
seq: Ulrich Drepper
|
|
||||||
sha1sum: Ulrich Drepper, Scott Miller, David Madore
|
|
||||||
--- coreutils-6.10/man/Makefile.am.runuser
|
|
||||||
+++ coreutils-6.10/man/Makefile.am
|
|
||||||
@@ -92,6 +92,7 @@
|
|
||||||
rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c
|
|
||||||
rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c
|
|
||||||
runcon.1: $(common_dep) $(srcdir)/runcon.x ../src/runcon.c
|
|
||||||
+runuser.1: $(common_dep) $(srcdir)/runuser.x ../src/su.c
|
|
||||||
seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c
|
|
||||||
sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c
|
|
||||||
sha224sum.1: $(common_dep) $(srcdir)/sha224sum.x ../src/md5sum.c
|
|
||||||
--- /dev/null 2007-01-09 09:38:07.860075128 +0000
|
|
||||||
+++ coreutils-6.7/man/runuser.x 2007-01-09 17:27:56.000000000 +0000
|
|
||||||
@@ -0,0 +1,4 @@
|
|
||||||
+[NAME]
|
|
||||||
+runuser \- run a shell with substitute user and group IDs
|
|
||||||
+[DESCRIPTION]
|
|
||||||
+.\" Add any additional description here
|
|
||||||
--- /dev/null 2007-01-09 09:38:07.860075128 +0000
|
|
||||||
+++ coreutils-6.10/man/runuser.1 2007-01-09 17:27:56.000000000 +0000
|
|
||||||
@@ -0,0 +1,68 @@
|
|
||||||
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
|
|
||||||
+.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands"
|
|
||||||
+.SH NAME
|
|
||||||
+runuser \- run a shell with substitute user and group IDs, similar to su, but will not run PAM hooks
|
|
||||||
+.SH SYNOPSIS
|
|
||||||
+.B runuser
|
|
||||||
+[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...]
|
|
||||||
+.SH DESCRIPTION
|
|
||||||
+.\" Add any additional description here
|
|
||||||
+.PP
|
|
||||||
+Change the effective user id and group id to that of USER. No PAM hooks
|
|
||||||
+are run, and there will be no password prompt. This command is useful
|
|
||||||
+when run as the root user. If run as a non-root user without privilege
|
|
||||||
+to set user ID, the command will fail.
|
|
||||||
+.TP
|
|
||||||
+-, \fB\-l\fR, \fB\-\-login\fR
|
|
||||||
+make the shell a login shell, uses runuser-l PAM file instead of default one.
|
|
||||||
+.TP
|
|
||||||
+\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
|
|
||||||
+pass a single COMMAND to the shell with \fB\-c\fR
|
|
||||||
+.TP
|
|
||||||
+\fB\-f\fR, \fB\-\-fast\fR
|
|
||||||
+pass \fB\-f\fR to the shell (for csh or tcsh)
|
|
||||||
+.TP
|
|
||||||
+\fB\-g\fR, \fB\-\-group\fR=\fIGROUP\fR
|
|
||||||
+specify the primary group
|
|
||||||
+.TP
|
|
||||||
+\fB\-G\fR, \fB\-\-supp-group\fR=\fIGROUP\fR
|
|
||||||
+specify a supplemental group
|
|
||||||
+.TP
|
|
||||||
+\fB\-m\fR, \fB\-\-preserve\-environment\fR
|
|
||||||
+do not reset environment variables
|
|
||||||
+.TP
|
|
||||||
+\fB\-p\fR
|
|
||||||
+same as \fB\-m\fR
|
|
||||||
+.TP
|
|
||||||
+\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR
|
|
||||||
+run SHELL if /etc/shells allows it
|
|
||||||
+.TP
|
|
||||||
+\fB\-\-help\fR
|
|
||||||
+display this help and exit
|
|
||||||
+.TP
|
|
||||||
+\fB\-\-version\fR
|
|
||||||
+output version information and exit
|
|
||||||
+.PP
|
|
||||||
+A mere - implies \fB\-l\fR. If USER not given, assume root.
|
|
||||||
+.SH AUTHOR
|
|
||||||
+Written by David MacKenzie, Dan Walsh.
|
|
||||||
+.SH "REPORTING BUGS"
|
|
||||||
+Report bugs to <bug-coreutils@gnu.org>.
|
|
||||||
+.SH COPYRIGHT
|
|
||||||
+Copyright \(co 2004 Free Software Foundation, Inc.
|
|
||||||
+.br
|
|
||||||
+This is free software; see the source for copying conditions. There is NO
|
|
||||||
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
+.SH "SEE ALSO"
|
|
||||||
+Since this command is trimmed down version of su use you can use the su manual.
|
|
||||||
+The full documentation for
|
|
||||||
+.B su
|
|
||||||
+is maintained as a Texinfo manual. If the
|
|
||||||
+.B info
|
|
||||||
+and
|
|
||||||
+.B su
|
|
||||||
+programs are properly installed at your site, the command
|
|
||||||
+.IP
|
|
||||||
+.B info coreutils su
|
|
||||||
+.PP
|
|
||||||
+should give you access to the complete manual.
|
|
||||||
|
|
@ -1,130 +0,0 @@
|
||||||
diff -urNp coreutils-6.11-orig/tests/touch/no-create-missing coreutils-6.11/tests/touch/no-create-missing
|
|
||||||
--- coreutils-6.11-orig/tests/touch/no-create-missing 2008-04-19 23:34:23.000000000 +0200
|
|
||||||
+++ coreutils-6.11/tests/touch/no-create-missing 2008-04-24 12:34:52.000000000 +0200
|
|
||||||
@@ -36,7 +36,7 @@ test="$abs_top_builddir/src/test"
|
|
||||||
# This test is ineffective unless /dev/stdout also works.
|
|
||||||
if "$test" -w /dev/stdout >/dev/null &&
|
|
||||||
"$test" ! -w /dev/stdout >&-; then
|
|
||||||
- touch -c - >&- 2> /dev/null || fail=1
|
|
||||||
+ #touch -c - >&- || fail=1
|
|
||||||
touch -cm - >&- 2> /dev/null || fail=1
|
|
||||||
touch -ca - >&- 2> /dev/null || fail=1
|
|
||||||
fi
|
|
||||||
diff -urp coreutils-6.10-orig/src/Makefile.am coreutils-6.10/src/Makefile.am
|
|
||||||
--- coreutils-6.10-orig/src/Makefile.am 2008-01-11 11:34:22.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/Makefile.am 2008-01-23 14:52:26.000000000 +0100
|
|
||||||
@@ -170,7 +170,7 @@ install_su = \
|
|
||||||
echo " chown root $(installed_su)"; \
|
|
||||||
chown root $(installed_su); \
|
|
||||||
echo " chmod $(setuid_root_mode) $(installed_su)"; \
|
|
||||||
- chmod $(setuid_root_mode) $(installed_su) \
|
|
||||||
+ chmod $(setuid_root_mode) $(installed_su); \
|
|
||||||
else \
|
|
||||||
:; \
|
|
||||||
fi
|
|
||||||
diff -urp coreutils-6.10-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.10/gnulib-tests/test-getaddrinfo.c
|
|
||||||
--- coreutils-6.10-orig/gnulib-tests/test-getaddrinfo.c 2007-11-17 07:59:42.000000000 +0100
|
|
||||||
+++ coreutils-6.10/gnulib-tests/test-getaddrinfo.c 2008-01-25 19:19:43.000000000 +0100
|
|
||||||
@@ -61,6 +61,10 @@ int simple (char *host, char *service)
|
|
||||||
if (res == EAI_SERVICE)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
+ /* Do not fail this test for temporary name resolution errors. */
|
|
||||||
+ if (res == EAI_AGAIN)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/misc/chcon coreutils-6.10/tests/misc/chcon
|
|
||||||
--- coreutils-6.10-orig/tests/misc/chcon 2008-01-05 23:59:11.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/misc/chcon 2008-03-26 13:19:37.000000000 +0100
|
|
||||||
@@ -21,9 +21,15 @@ u1=root
|
|
||||||
r1=object_r
|
|
||||||
t1=tmp_t
|
|
||||||
ctx=$u1:$r1:$t1
|
|
||||||
-chcon $ctx f || fail=1
|
|
||||||
+chcon $ctx f 2>outerror || fail=1
|
|
||||||
stat --printf='f|%C\n' f > out || fail=1
|
|
||||||
|
|
||||||
+cat <<\EOF > experror || fail=1
|
|
||||||
+chcon: failed to change context of `f' to `root:object_r:tmp_t': Invalid argument
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+compare outerror experror >/dev/null && skip_test_ "Missing mcstransd, skipping the test"
|
|
||||||
+
|
|
||||||
# Use --reference.
|
|
||||||
chcon --ref=f g || fail=1
|
|
||||||
stat --printf='g|%C\n' g >> out || fail=1
|
|
||||||
@@ -38,8 +38,9 @@ stat --printf='g|%C\n' g >> out || fail=
|
|
||||||
u2=user_u
|
|
||||||
r2=object_r
|
|
||||||
t2=file_t
|
|
||||||
-l2=SystemLow-SystemHigh
|
|
||||||
-for i in --user=$u2 --role=$r2 --type=$t2 --range=$l2; do
|
|
||||||
+#do not set range here, it will fail in enforcing mode, requires permissive
|
|
||||||
+#l2=SystemLow-SystemHigh
|
|
||||||
+for i in --user=$u2 --role=$r2 --type=$t2; do
|
|
||||||
chcon $i f || fail=1
|
|
||||||
stat --printf="f|$i|"'%C\n' f >> out || fail=1
|
|
||||||
done
|
|
||||||
@@ -56,12 +57,24 @@ g|$ctx
|
|
||||||
f|--user=$u2|$u2:$r1:$t1
|
|
||||||
f|--role=$r2|$u2:$r2:$t1
|
|
||||||
f|--type=$t2|$u2:$r2:$t2
|
|
||||||
-f|--range=$l2|$u2:$r2:$t2:$l2
|
|
||||||
-f|-uroot|root:object_r:file_t:SystemLow-SystemHigh
|
|
||||||
-f|-robject_r|root:object_r:file_t:SystemLow-SystemHigh
|
|
||||||
-f|-ttmp_t|root:object_r:tmp_t:SystemLow-SystemHigh
|
|
||||||
+f|-uroot|root:object_r:file_t
|
|
||||||
+f|-robject_r|root:object_r:file_t
|
|
||||||
+f|-ttmp_t|root:object_r:tmp_t
|
|
||||||
EOF
|
|
||||||
|
|
||||||
compare out exp || fail=1
|
|
||||||
|
|
||||||
+SELINUX_MODE=$(getenforce)
|
|
||||||
+if [ $SELINUX_MODE == "Permissive" ]; then
|
|
||||||
+#check running range for Permisive mode
|
|
||||||
+l2=SystemLow-SystemHigh
|
|
||||||
+chcon --range=$l2 f || fail
|
|
||||||
+stat --printf="f|--range=$l2|"'%C\n' f >> permout || fail=1
|
|
||||||
+cat <<EOF > permexp || fail=1
|
|
||||||
+f|--range=$l2|root:object_r:tmp_t:SystemLow-SystemHigh
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+compare permout permexp || fail=1
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
(exit $fail); exit $fail
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/misc/factor coreutils-6.10/tests/misc/factor
|
|
||||||
--- coreutils-6.10-orig/tests/misc/factor 2007-12-13 00:14:28.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/misc/factor 2008-03-28 13:49:34.000000000 +0100
|
|
||||||
@@ -71,6 +71,7 @@ my @Tests =
|
|
||||||
['x', '4294966896', {OUT => '2 2 2 2 3 3 3 11 607 1489'}],
|
|
||||||
['y', '4294966998', {OUT => '2 3 7 3917 26107'}],
|
|
||||||
['z', '-1',
|
|
||||||
+ {ERR_SUBST => q!s/'1'/1/!}, # map newer glibc diagnostic to expected.
|
|
||||||
{ERR => "$prog: invalid option -- 1\n"
|
|
||||||
. "Try `$prog --help' for more information.\n"},
|
|
||||||
{EXIT => 1}],
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/cp/cp-a-selinux coreutils-6.10/tests/cp/cp-a-selinux
|
|
||||||
--- coreutils-6.10-orig/tests/cp/cp-a-selinux 2008-01-05 23:59:11.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/cp/cp-a-selinux 2008-03-26 13:52:24.000000000 +0100
|
|
||||||
@@ -27,6 +27,16 @@ PRIV_CHECK_ARG=require-root . $srcdir/..
|
|
||||||
. $srcdir/../test-lib.sh
|
|
||||||
require_selinux_
|
|
||||||
|
|
||||||
+#check for missing mcstrans(d)
|
|
||||||
+touch f || fail=1
|
|
||||||
+chcon root:object_r:tmp_t f 2>outerror || fail=1
|
|
||||||
+
|
|
||||||
+cat <<\EOF > experror || fail=1
|
|
||||||
+chcon: failed to change context of `f' to `root:object_r:tmp_t': Invalid argument
|
|
||||||
+EOF
|
|
||||||
+
|
|
||||||
+compare outerror experror && skip_test_ "Missing mcstransd, skipping the test"
|
|
||||||
+
|
|
||||||
cwd=`pwd`
|
|
||||||
cleanup_() { cd /; umount "$cwd/mnt"; }
|
|
||||||
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
diff -urNp coreutils-6.10-orig/src/paste.c coreutils-6.10/src/paste.c
|
|
||||||
--- coreutils-6.10-orig/src/paste.c 2007-11-25 14:23:31.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/paste.c 2008-03-27 14:47:02.000000000 +0100
|
|
||||||
@@ -42,6 +42,7 @@
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include "system.h"
|
|
||||||
#include "error.h"
|
|
||||||
+#include "quotearg.h"
|
|
||||||
|
|
||||||
/* The official name of this program (e.g., no `g' prefix). */
|
|
||||||
#define PROGRAM_NAME "paste"
|
|
||||||
@@ -79,12 +80,17 @@ static struct option const longopts[] =
|
|
||||||
/* Set globals delims and delim_end. Copy STRPTR to DELIMS, converting
|
|
||||||
backslash representations of special characters in STRPTR to their actual
|
|
||||||
values. The set of possible backslash characters has been expanded beyond
|
|
||||||
- that recognized by the Unix version. */
|
|
||||||
+ that recognized by the Unix version.
|
|
||||||
+ Return 0 upon success.
|
|
||||||
+ If the string ends in an odd number of backslashes, ignore the
|
|
||||||
+ final backslash and return nonzero. */
|
|
||||||
|
|
||||||
-static void
|
|
||||||
+static int
|
|
||||||
collapse_escapes (char const *strptr)
|
|
||||||
{
|
|
||||||
char *strout = xstrdup (strptr);
|
|
||||||
+ bool backslash_at_end = false;
|
|
||||||
+
|
|
||||||
delims = strout;
|
|
||||||
|
|
||||||
while (*strptr)
|
|
||||||
@@ -123,6 +129,15 @@ collapse_escapes (char const *strptr)
|
|
||||||
*strout++ = '\v';
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case '\\':
|
|
||||||
+ *strout++ = '\\';
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ case '\0':
|
|
||||||
+ backslash_at_end = true;
|
|
||||||
+ goto done;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
default:
|
|
||||||
*strout++ = *strptr;
|
|
||||||
break;
|
|
||||||
@@ -130,7 +145,11 @@ collapse_escapes (char const *strptr)
|
|
||||||
strptr++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ done:;
|
|
||||||
+
|
|
||||||
delim_end = strout;
|
|
||||||
+ return backslash_at_end ? 1 : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Report a write error and exit. */
|
|
||||||
@@ -481,7 +500,15 @@ main (int argc, char **argv)
|
|
||||||
if (optind == argc)
|
|
||||||
argv[argc++] = "-";
|
|
||||||
|
|
||||||
- collapse_escapes (delim_arg);
|
|
||||||
+ if (collapse_escapes (delim_arg))
|
|
||||||
+ {
|
|
||||||
+ /* Don't use the default quoting style, because that would double the
|
|
||||||
+ number of displayed backslashes, making the diagnostic look bogus. */
|
|
||||||
+ set_quoting_style (NULL, escape_quoting_style);
|
|
||||||
+ error (EXIT_FAILURE, 0,
|
|
||||||
+ _("delimiter list ends with an unescaped backslash: %s"),
|
|
||||||
+ quotearg_colon (delim_arg));
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (!serial_merge)
|
|
||||||
ok = paste_parallel (argc - optind, &argv[optind]);
|
|
||||||
diff -urNp coreutils-6.10-orig/src/ptx.c coreutils-6.10/src/ptx.c
|
|
||||||
--- coreutils-6.10-orig/src/ptx.c 2007-11-25 14:23:31.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/ptx.c 2008-03-27 14:53:24.000000000 +0100
|
|
||||||
@@ -387,6 +387,11 @@ copy_unescaped_string (const char *strin
|
|
||||||
string++;
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case '\0': /* lone backslash at end of string */
|
|
||||||
+ /* ignore it */
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
default:
|
|
||||||
*cursor++ = '\\';
|
|
||||||
*cursor++ = *string++;
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff -urp coreutils-6.10-orig/lib/long-options.c coreutils-6.10/lib/long-options.c
|
|
||||||
--- coreutils-6.10-orig/lib/long-options.c 2007-10-17 15:47:26.000000000 +0200
|
|
||||||
+++ coreutils-6.10/lib/long-options.c 2008-01-31 14:28:01.000000000 +0100
|
|
||||||
@@ -57,8 +57,7 @@ parse_long_options (int argc,
|
|
||||||
/* Don't print an error message for unrecognized options. */
|
|
||||||
opterr = 0;
|
|
||||||
|
|
||||||
- if (argc == 2
|
|
||||||
- && (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
|
|
||||||
+ while ((c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
|
|
||||||
{
|
|
||||||
switch (c)
|
|
||||||
{
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
diff -urp coreutils-6.10-orig/man/md5sum.1 coreutils-6.10/man/md5sum.1
|
|
||||||
--- coreutils-6.10-orig/man/md5sum.1 2008-01-28 14:33:16.000000000 +0100
|
|
||||||
+++ coreutils-6.10/man/md5sum.1 2008-01-28 14:54:29.000000000 +0100
|
|
||||||
@@ -19,6 +19,8 @@ read MD5 sums from the FILEs and check t
|
|
||||||
.TP
|
|
||||||
\fB\-t\fR, \fB\-\-text\fR
|
|
||||||
read in text mode (default)
|
|
||||||
+.br
|
|
||||||
+\fBNote:\fR There is no difference between binary and text mode option on GNU system.
|
|
||||||
.SS "The following two options are useful only when verifying checksums:"
|
|
||||||
.TP
|
|
||||||
\fB\-\-status\fR
|
|
||||||
diff -urp coreutils-6.10-orig/man/sort.1 coreutils-6.10/man/sort.1
|
|
||||||
--- coreutils-6.10-orig/man/sort.1 2008-01-28 14:33:17.000000000 +0100
|
|
||||||
+++ coreutils-6.10/man/sort.1 2008-01-28 16:02:28.000000000 +0100
|
|
||||||
@@ -56,7 +56,7 @@ compress temporaries with PROG;
|
|
||||||
decompress them with PROG \fB\-d\fR
|
|
||||||
.TP
|
|
||||||
\fB\-k\fR, \fB\-\-key\fR=\fIPOS1[\fR,POS2]
|
|
||||||
-start a key at POS1, end it at POS2 (origin 1)
|
|
||||||
+start a key at POS1, end it at POS2 (origin 1) - when no POS2 is specified, end of line is used
|
|
||||||
.TP
|
|
||||||
\fB\-m\fR, \fB\-\-merge\fR
|
|
||||||
merge already sorted files; do not sort
|
|
||||||
@@ -103,8 +103,8 @@ With no FILE, or when FILE is \-, read s
|
|
||||||
.PP
|
|
||||||
*** WARNING ***
|
|
||||||
The locale specified by the environment affects sort order.
|
|
||||||
-Set LC_ALL=C to get the traditional sort order that uses
|
|
||||||
-native byte values.
|
|
||||||
+Set LC_ALL=C (by "export LC_ALL=C") to get the traditional
|
|
||||||
+sort order that uses native byte values.
|
|
||||||
.SH AUTHOR
|
|
||||||
Written by Mike Haertel and Paul Eggert.
|
|
||||||
.SH "REPORTING BUGS"
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
||||||
diff -urNp coreutils-6.10-orig/src/md5sum.c coreutils-6.10/src/md5sum.c
|
|
||||||
--- coreutils-6.10-orig/src/md5sum.c 2007-11-25 14:23:31.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/md5sum.c 2008-04-15 21:04:09.000000000 +0200
|
|
||||||
@@ -205,6 +205,9 @@ bsd_split_3 (char *s, size_t s_len, unsi
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
+ if (s_len ==0)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
*file_name = s;
|
|
||||||
|
|
||||||
/* Find end of filename. The BSD 'md5' and 'sha1' commands do not escape
|
|
||||||
diff -urNp coreutils-6.10-orig/src/md5sum.c coreutils-6.10/src/md5sum.c
|
|
||||||
--- coreutils-6.10-orig/src/md5sum.c 2008-05-13 15:09:09.000000000 +0200
|
|
||||||
+++ coreutils-6.10/src/md5sum.c 2008-05-13 15:10:59.000000000 +0200
|
|
||||||
@@ -343,16 +343,19 @@ split_3 (char *s, size_t s_len,
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Return true if S is a NUL-terminated string of DIGEST_HEX_BYTES hex digits.
|
|
||||||
+ Otherwise, return false. */
|
|
||||||
static bool
|
|
||||||
hex_digits (unsigned char const *s)
|
|
||||||
{
|
|
||||||
- while (*s)
|
|
||||||
+ unsigned int i;
|
|
||||||
+ for (i = 0; i < digest_hex_bytes; i++)
|
|
||||||
{
|
|
||||||
if (!isxdigit (*s))
|
|
||||||
return false;
|
|
||||||
++s;
|
|
||||||
}
|
|
||||||
- return true;
|
|
||||||
+ return *s == '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
/* An interface to the function, DIGEST_STREAM.
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/misc/sha1sum coreutils-6.10/tests/misc/sha1sum
|
|
||||||
--- coreutils-6.10-orig/tests/misc/sha1sum 2007-12-13 00:14:28.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/misc/sha1sum 2008-04-15 21:05:43.000000000 +0200
|
|
||||||
@@ -29,7 +29,7 @@ exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF
|
|
||||||
require 5.003;
|
|
||||||
use strict;
|
|
||||||
|
|
||||||
-(my $program_name = $0) =~ s|.*/||;
|
|
||||||
+my $prog = 'sha1sum';
|
|
||||||
|
|
||||||
# Turn off localisation of executable's ouput.
|
|
||||||
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
|
|
||||||
@@ -72,6 +72,8 @@ my @Tests =
|
|
||||||
['check-bsd3', '--check', '--status',
|
|
||||||
{IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}},
|
|
||||||
{AUX=> {f=> 'bar'}}, {EXIT=> 1}],
|
|
||||||
+ ['bsd-segv', '--check', {IN=> {'z' => "SHA1 ("}}, {EXIT=> 1},
|
|
||||||
+ {ERR=> "$prog: z: no properly formatted SHA1 checksum lines found\n"}],
|
|
||||||
);
|
|
||||||
|
|
||||||
# Insert the `--text' argument for each test.
|
|
||||||
@@ -86,7 +88,6 @@ foreach $t (@Tests)
|
|
||||||
my $save_temps = $ENV{DEBUG};
|
|
||||||
my $verbose = $ENV{VERBOSE};
|
|
||||||
|
|
||||||
-my $prog = 'sha1sum';
|
|
||||||
-my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
|
|
||||||
+my $fail = run_tests ($prog, $prog, \@Tests, $save_temps, $verbose);
|
|
||||||
exit $fail;
|
|
||||||
EOF
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/misc/md5sum coreutils-6.10/tests/misc/md5sum
|
|
||||||
--- coreutils-6.10-orig/tests/misc/md5sum 2007-12-13 00:14:28.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/misc/md5sum 2008-05-13 15:15:48.000000000 +0200
|
|
||||||
@@ -70,6 +70,15 @@ my @Tests =
|
|
||||||
['check-bsd3', '--check', '--status',
|
|
||||||
{IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}},
|
|
||||||
{AUX=> {f=> 'bar'}}, {EXIT=> 1}],
|
|
||||||
+ ['bsd-segv', '--check', {IN=> {'z' => "MD5 ("}}, {EXIT=> 1},
|
|
||||||
+ {ERR=> "md5sum: z: no properly formatted MD5 checksum lines found\n"}],
|
|
||||||
+ # Ensure that when there's a NUL byte among the checksum hex digits
|
|
||||||
+ # we detect the invalid formatting and don't even open the file.
|
|
||||||
+ # Up to coreutils-6.10, this would report:
|
|
||||||
+ # h: FAILED
|
|
||||||
+ # md5sum: WARNING: 1 of 1 computed checksum did NOT match
|
|
||||||
+ ['nul-in-cksum', '--check', {IN=> {'h'=>("\0"x32)." h\n"}}, {EXIT=> 1},
|
|
||||||
+ {ERR=> "md5sum: h: no properly formatted MD5 checksum lines found\n"}],
|
|
||||||
);
|
|
||||||
|
|
||||||
# Insert the `--text' argument for each test.
|
|
||||||
|
|
@ -1,97 +0,0 @@
|
||||||
diff -urNp coreutils-6.10-orig/src/mkdir.c coreutils-6.10/src/mkdir.c
|
|
||||||
--- coreutils-6.10-orig/src/mkdir.c 2008-03-27 14:42:40.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/mkdir.c 2008-03-27 14:51:48.000000000 +0100
|
|
||||||
@@ -211,7 +211,7 @@ main (int argc, char **argv)
|
|
||||||
if (scontext && setfscreatecon (scontext) < 0)
|
|
||||||
error (EXIT_FAILURE, errno,
|
|
||||||
_("failed to set default file creation context to %s"),
|
|
||||||
- quote (optarg));
|
|
||||||
+ quote (scontext));
|
|
||||||
|
|
||||||
if (options.make_ancestor_function || specified_mode)
|
|
||||||
{
|
|
||||||
diff -urNp coreutils-6.10-orig/src/mkfifo.c coreutils-6.10/src/mkfifo.c
|
|
||||||
--- coreutils-6.10-orig/src/mkfifo.c 2008-03-29 17:53:27.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/mkfifo.c 2008-03-29 17:55:44.000000000 +0100
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* mkfifo -- make fifo's (named pipes)
|
|
||||||
- Copyright (C) 90, 91, 1995-2007 Free Software Foundation, Inc.
|
|
||||||
+ Copyright (C) 90, 91, 1995-2008 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -123,7 +123,7 @@ main (int argc, char **argv)
|
|
||||||
if (scontext && setfscreatecon (scontext) < 0)
|
|
||||||
error (EXIT_FAILURE, errno,
|
|
||||||
_("failed to set default file creation context to %s"),
|
|
||||||
- quote (optarg));
|
|
||||||
+ quote (scontext));
|
|
||||||
|
|
||||||
newmode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
|
|
||||||
if (specified_mode)
|
|
||||||
diff -urNp coreutils-6.10-orig/src/mknod.c coreutils-6.10/src/mknod.c
|
|
||||||
--- coreutils-6.10-orig/src/mknod.c 2008-03-29 17:53:27.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/mknod.c 2008-03-29 17:55:36.000000000 +0100
|
|
||||||
@@ -175,7 +175,7 @@ main (int argc, char **argv)
|
|
||||||
if (scontext && setfscreatecon (scontext) < 0)
|
|
||||||
error (EXIT_FAILURE, errno,
|
|
||||||
_("failed to set default file creation context to %s"),
|
|
||||||
- quote (optarg));
|
|
||||||
+ quote (scontext));
|
|
||||||
|
|
||||||
/* Only check the first character, to allow mnemonic usage like
|
|
||||||
`mknod /dev/rst0 character 18 0'. */
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/mkdir/selinux coreutils-6.10/tests/mkdir/selinux
|
|
||||||
--- coreutils-6.10-orig/tests/mkdir/selinux 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/mkdir/selinux 2008-03-29 17:58:25.000000000 +0100
|
|
||||||
@@ -0,0 +1,50 @@
|
|
||||||
+#!/bin/sh
|
|
||||||
+# ensure that an invalid context doesn't cause a segfault
|
|
||||||
+
|
|
||||||
+# Copyright (C) 2008 Free Software Foundation, Inc.
|
|
||||||
+
|
|
||||||
+# This program is free software: you can redistribute it and/or modify
|
|
||||||
+# it under the terms of the GNU General Public License as published by
|
|
||||||
+# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
+# (at your option) any later version.
|
|
||||||
+
|
|
||||||
+# This program is distributed in the hope that it will be useful,
|
|
||||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
+# GNU General Public License for more details.
|
|
||||||
+
|
|
||||||
+# You should have received a copy of the GNU General Public License
|
|
||||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
+
|
|
||||||
+if test "$VERBOSE" = yes; then
|
|
||||||
+ set -x
|
|
||||||
+ mkdir --version
|
|
||||||
+ mkfifo --version
|
|
||||||
+ mknod --version
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+. $srcdir/../envvar-check
|
|
||||||
+. $srcdir/../lang-default
|
|
||||||
+. $srcdir/../test-lib.sh
|
|
||||||
+
|
|
||||||
+c=invalid-selinux-context
|
|
||||||
+fail=0
|
|
||||||
+msg="failed to set default file creation context to \`$c':"
|
|
||||||
+
|
|
||||||
+# Test each of mkdir, mknod, mkfifo with "-Z invalid-context".
|
|
||||||
+
|
|
||||||
+for cmd_w_arg in 'mkdir dir' 'mknod b p' 'mkfifo f'; do
|
|
||||||
+ $cmd_w_arg -Z $c 2> out && fail=1
|
|
||||||
+ set $cmd_w_arg; cmd=$1
|
|
||||||
+ echo "$cmd: $msg" > exp || fail=1
|
|
||||||
+
|
|
||||||
+ # Some systems fail with ENOTSUP, or EINVAL, or even ENOENT.
|
|
||||||
+ sed \
|
|
||||||
+ -e 's/ Invalid argument$//' \
|
|
||||||
+ -e 's/ Operation not supported$//' \
|
|
||||||
+ -e 's/ No such file or directory$//' out > k || fail=1
|
|
||||||
+ mv k out || fail=1
|
|
||||||
+ compare out exp || fail=1
|
|
||||||
+done
|
|
||||||
+
|
|
||||||
+(exit $fail); exit $fail
|
|
||||||
|
|
@ -1,155 +0,0 @@
|
||||||
diff -urNp coreutils-6.10-orig/src/sort.c coreutils-6.10/src/sort.c
|
|
||||||
--- coreutils-6.10-orig/src/sort.c 2008-01-22 00:33:25.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/sort.c 2009-02-27 11:19:35.000000000 +0100
|
|
||||||
@@ -1390,7 +1390,6 @@ begfield_uni (const struct line *line, c
|
|
||||||
char *ptr = line->text, *lim = ptr + line->length - 1;
|
|
||||||
size_t sword = key->sword;
|
|
||||||
size_t schar = key->schar;
|
|
||||||
- size_t remaining_bytes;
|
|
||||||
|
|
||||||
/* The leading field separator itself is included in a field when -t
|
|
||||||
is absent. */
|
|
||||||
@@ -1416,12 +1415,7 @@ begfield_uni (const struct line *line, c
|
|
||||||
while (ptr < lim && blanks[to_uchar (*ptr)])
|
|
||||||
++ptr;
|
|
||||||
|
|
||||||
- /* Advance PTR by SCHAR (if possible), but no further than LIM. */
|
|
||||||
- remaining_bytes = lim - ptr;
|
|
||||||
- if (schar < remaining_bytes)
|
|
||||||
- ptr += schar;
|
|
||||||
- else
|
|
||||||
- ptr = lim;
|
|
||||||
+ ptr = MIN (lim, ptr + schar);
|
|
||||||
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
@@ -1493,7 +1487,9 @@ limfield_uni (const struct line *line, c
|
|
||||||
{
|
|
||||||
char *ptr = line->text, *lim = ptr + line->length - 1;
|
|
||||||
size_t eword = key->eword, echar = key->echar;
|
|
||||||
- size_t remaining_bytes;
|
|
||||||
+
|
|
||||||
+ if (echar == 0)
|
|
||||||
+ eword++; /* Skip all of end field. */
|
|
||||||
|
|
||||||
/* Move PTR past EWORD fields or to one past the last byte on LINE,
|
|
||||||
whichever comes first. If there are more than EWORD fields, leave
|
|
||||||
@@ -1566,19 +1566,13 @@ limfield_uni (const struct line *line, c
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
- /* If we're ignoring leading blanks when computing the End
|
|
||||||
- of the field, don't start counting bytes until after skipping
|
|
||||||
- past any leading blanks. */
|
|
||||||
- if (key->skipeblanks)
|
|
||||||
- while (ptr < lim && blanks[to_uchar (*ptr)])
|
|
||||||
- ++ptr;
|
|
||||||
-
|
|
||||||
- /* Advance PTR by ECHAR (if possible), but no further than LIM. */
|
|
||||||
- remaining_bytes = lim - ptr;
|
|
||||||
- if (echar < remaining_bytes)
|
|
||||||
- ptr += echar;
|
|
||||||
- else
|
|
||||||
- ptr = lim;
|
|
||||||
+ if (echar != 0) /* We need to skip over a portion of the end field. */
|
|
||||||
+ {
|
|
||||||
+ if (key->skipeblanks) /* blanks not counted in echar. */
|
|
||||||
+ while (ptr < lim && blanks[to_uchar (*ptr)])
|
|
||||||
+ ++ptr;
|
|
||||||
+ ptr = MIN (lim, ptr + echar);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
@@ -3582,12 +3579,9 @@ main (int argc, char **argv)
|
|
||||||
badfieldspec (optarg, N_("field number is zero"));
|
|
||||||
}
|
|
||||||
if (*s == '.')
|
|
||||||
- s = parse_field_count (s + 1, &key->echar,
|
|
||||||
- N_("invalid number after `.'"));
|
|
||||||
- else
|
|
||||||
{
|
|
||||||
- /* `-k 2,3' is equivalent to `+1 -3'. */
|
|
||||||
- key->eword++;
|
|
||||||
+ s = parse_field_count (s + 1, &key->echar,
|
|
||||||
+ N_("invalid number after `.'"));
|
|
||||||
}
|
|
||||||
s = set_ordering (s, key, bl_end);
|
|
||||||
}
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/sort/sort-tests coreutils-6.10/tests/sort/sort-tests
|
|
||||||
--- coreutils-6.10-orig/tests/sort/sort-tests 2008-01-22 00:33:25.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/sort/sort-tests 2009-02-27 11:19:35.000000000 +0100
|
|
||||||
@@ -1008,6 +1008,24 @@ else
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
test -s 07d.E || rm -f 07d.E
|
|
||||||
+_POSIX2_VERSION=199209 $xx -k 2,3.0 $srcdir/07e.I > 07e.O 2> 07e.E
|
|
||||||
+code=$?
|
|
||||||
+if test $code != 0; then
|
|
||||||
+ $echo "Test 07e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
|
|
||||||
+ errors=`expr $errors + 1`
|
|
||||||
+else
|
|
||||||
+ cmp 07e.O $srcdir/07e.X > /dev/null 2>&1
|
|
||||||
+ case $? in
|
|
||||||
+ 0) if test "$VERBOSE"; then $echo "passed 07d(_POSIX2_VERSION=199209)"; fi;;
|
|
||||||
+ 1) $echo "Test 07e(_POSIX2_VERSION=199209) failed: files 07e.O and $srcdir/07e.X differ" 1>&2
|
|
||||||
+ (diff -c 07e.O $srcdir/07e.X) 2> /dev/null
|
|
||||||
+ errors=`expr $errors + 1`;;
|
|
||||||
+ 2) $echo "Test 07e(_POSIX2_VERSION=199209) may have failed." 1>&2
|
|
||||||
+ $echo The command "cmp 07e.O $srcdir/07e.X" failed. 1>&2
|
|
||||||
+ errors=`expr $errors + 1`;;
|
|
||||||
+ esac
|
|
||||||
+fi
|
|
||||||
+test -s 07e.E || rm -f 07e.E
|
|
||||||
_POSIX2_VERSION=199209 $xx -k 2.,3 $srcdir/08a.I > 08a.O 2> 08a.E
|
|
||||||
code=$?
|
|
||||||
if test $code != 2; then
|
|
||||||
@@ -1728,6 +1746,24 @@ else
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
test -s 18e.E || rm -f 18e.E
|
|
||||||
+_POSIX2_VERSION=199209 $xx -k1,1b $srcdir/18f.I > 18f.O 2> 18f.E
|
|
||||||
+code=$?
|
|
||||||
+if test $code != 0; then
|
|
||||||
+ $echo "Test 18f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
|
|
||||||
+ errors=`expr $errors + 1`
|
|
||||||
+else
|
|
||||||
+ cmp 18f.O $srcdir/18f.X > /dev/null 2>&1
|
|
||||||
+ case $? in
|
|
||||||
+ 0) if test "$VERBOSE"; then $echo "passed 18f(_POSIX2_VERSION=199209)"; fi;;
|
|
||||||
+ 1) $echo "Test 18f(_POSIX2_VERSION=199209) failed: files 18f.O and $srcdir/18f.X differ" 1>&2
|
|
||||||
+ (diff -c 18f.O $srcdir/18f.X) 2> /dev/null
|
|
||||||
+ errors=`expr $errors + 1`;;
|
|
||||||
+ 2) $echo "Test 18f(_POSIX2_VERSION=199209) may have failed." 1>&2
|
|
||||||
+ $echo The command "cmp 18f.O $srcdir/18f.X" failed. 1>&2
|
|
||||||
+ errors=`expr $errors + 1`;;
|
|
||||||
+ esac
|
|
||||||
+fi
|
|
||||||
+test -s 18f.E || rm -f 18f.E
|
|
||||||
_POSIX2_VERSION=199209 $xx +0 +1nr $srcdir/19a.I > 19a.O 2> 19a.E
|
|
||||||
code=$?
|
|
||||||
if test $code != 0; then
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/sort/07e.I coreutils-6.10/tests/sort/07e.I
|
|
||||||
--- coreutils-6.10-orig/tests/sort/07e.I 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/sort/07e.I 2009-02-27 11:21:24.000000000 +0100
|
|
||||||
@@ -0,0 +1,2 @@
|
|
||||||
+a a b
|
|
||||||
+z a a
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/sort/07e.X coreutils-6.10/tests/sort/07e.X
|
|
||||||
--- coreutils-6.10-orig/tests/sort/07e.X 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/sort/07e.X 2009-02-27 11:21:10.000000000 +0100
|
|
||||||
@@ -0,0 +1,2 @@
|
|
||||||
+z a a
|
|
||||||
+a a b
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/sort/18f.I coreutils-6.10/tests/sort/18f.I
|
|
||||||
--- coreutils-6.10-orig/tests/sort/18f.I 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/sort/18f.I 2009-02-27 11:14:41.000000000 +0100
|
|
||||||
@@ -0,0 +1,2 @@
|
|
||||||
+a y
|
|
||||||
+a z
|
|
||||||
diff -urNp coreutils-6.10-orig/tests/sort/18f.X coreutils-6.10/tests/sort/18f.X
|
|
||||||
--- coreutils-6.10-orig/tests/sort/18f.X 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/sort/18f.X 2009-02-27 11:15:07.000000000 +0100
|
|
||||||
@@ -0,0 +1,2 @@
|
|
||||||
+a y
|
|
||||||
+a z
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
diff -up coreutils-6.10/lib/sha256.c.sparc coreutils-6.10/lib/sha256.c
|
|
||||||
--- coreutils-6.10/lib/sha256.c.sparc 2007-11-25 08:23:31.000000000 -0500
|
|
||||||
+++ coreutils-6.10/lib/sha256.c 2008-05-29 15:57:56.000000000 -0400
|
|
||||||
@@ -85,6 +85,15 @@ sha224_init_ctx (struct sha256_ctx *ctx)
|
|
||||||
ctx->buflen = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Copy the value from v into the memory location pointed to by *cp,
|
|
||||||
+ If your architecture allows unaligned access this is equivalent to
|
|
||||||
+ * (uint32_t *) cp = v */
|
|
||||||
+static inline void
|
|
||||||
+set_uint32 (char *cp, uint32_t v)
|
|
||||||
+{
|
|
||||||
+ memcpy (cp, &v, sizeof v);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Put result from CTX in first 32 bytes following RESBUF. The result
|
|
||||||
must be in little endian byte order.
|
|
||||||
|
|
||||||
@@ -129,9 +138,13 @@ sha256_conclude_ctx (struct sha256_ctx *
|
|
||||||
if (ctx->total[0] < bytes)
|
|
||||||
++ctx->total[1];
|
|
||||||
|
|
||||||
- /* Put the 64-bit file length in *bits* at the end of the buffer. */
|
|
||||||
- ctx->buffer[size - 2] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
|
|
||||||
- ctx->buffer[size - 1] = SWAP (ctx->total[0] << 3);
|
|
||||||
+ /* Put the 64-bit file length in *bits* at the end of the buffer.
|
|
||||||
+ Use set_uint32 rather than a simple assignment, to avoid risk of
|
|
||||||
+ unaligned access. */
|
|
||||||
+ set_uint32 ((char *) &ctx->buffer[size - 2],
|
|
||||||
+ SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29)));
|
|
||||||
+ set_uint32 ((char *) &ctx->buffer[size - 1],
|
|
||||||
+ SWAP (ctx->total[0] << 3));
|
|
||||||
|
|
||||||
memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
|
|
||||||
|
|
||||||
diff -up coreutils-6.10/lib/sha512.c.sparc coreutils-6.10/lib/sha512.c
|
|
||||||
--- coreutils-6.10/lib/sha512.c.sparc 2007-11-25 08:23:31.000000000 -0500
|
|
||||||
+++ coreutils-6.10/lib/sha512.c 2008-05-29 15:58:49.000000000 -0400
|
|
||||||
@@ -92,6 +92,15 @@ sha384_init_ctx (struct sha512_ctx *ctx)
|
|
||||||
ctx->buflen = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Copy the value from V into the memory location pointed to by *CP,
|
|
||||||
+ If your architecture allows unaligned access, this is equivalent to
|
|
||||||
+ * (__typeof__ (v) *) cp = v */
|
|
||||||
+static inline void
|
|
||||||
+set_uint64 (char *cp, u64 v)
|
|
||||||
+{
|
|
||||||
+ memcpy (cp, &v, sizeof v);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Put result from CTX in first 64 bytes following RESBUF. The result
|
|
||||||
must be in little endian byte order.
|
|
||||||
|
|
||||||
@@ -136,10 +145,14 @@ sha512_conclude_ctx (struct sha512_ctx *
|
|
||||||
if (u64lt (ctx->total[0], u64lo (bytes)))
|
|
||||||
ctx->total[1] = u64plus (ctx->total[1], u64lo (1));
|
|
||||||
|
|
||||||
- /* Put the 64-bit file length in *bits* at the end of the buffer. */
|
|
||||||
- ctx->buffer[size - 2] = SWAP (u64or (u64shl (ctx->total[1], 3),
|
|
||||||
- u64shr (ctx->total[0], 61)));
|
|
||||||
- ctx->buffer[size - 1] = SWAP (u64shl (ctx->total[0], 3));
|
|
||||||
+ /* Put the 128-bit file length in *bits* at the end of the buffer.
|
|
||||||
+ Use set_uint64 rather than a simple assignment, to avoid risk of
|
|
||||||
+ unaligned access. */
|
|
||||||
+ set_uint64 ((char *) &ctx->buffer[size - 2],
|
|
||||||
+ SWAP (u64or (u64shl (ctx->total[1], 3),
|
|
||||||
+ u64shr (ctx->total[0], 61))));
|
|
||||||
+ set_uint64 ((char *) &ctx->buffer[size - 1],
|
|
||||||
+ SWAP (u64shl (ctx->total[0], 3)));
|
|
||||||
|
|
||||||
memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 8 - bytes);
|
|
||||||
|
|
||||||
diff -up coreutils-6.10/src/Makefile.am.BAD coreutils-6.10/src/Makefile.am
|
|
||||||
--- coreutils-6.10/src/Makefile.am.BAD 2008-05-29 16:42:30.000000000 -0400
|
|
||||||
+++ coreutils-6.10/src/Makefile.am 2008-05-29 16:43:00.000000000 -0400
|
|
||||||
@@ -99,6 +99,7 @@ shred_LDADD = $(LDADD) $(LIB_GETHRXTIME)
|
|
||||||
shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME)
|
|
||||||
mktemp_LDADD = $(LDADD) $(LIB_GETHRXTIME)
|
|
||||||
vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX)
|
|
||||||
+tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
|
|
||||||
|
|
||||||
## If necessary, add -lm to resolve use of pow in lib/strtod.c.
|
|
||||||
sort_LDADD = $(LDADD) $(POW_LIB) $(LIB_GETHRXTIME)
|
|
||||||
diff -up coreutils-6.10/src/Makefile.in.BAD coreutils-6.10/src/Makefile.in
|
|
||||||
--- coreutils-6.10/src/Makefile.in.BAD 2008-05-29 16:43:31.000000000 -0400
|
|
||||||
+++ coreutils-6.10/src/Makefile.in 2008-05-29 16:44:03.000000000 -0400
|
|
||||||
@@ -1242,6 +1242,7 @@ shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME)
|
|
||||||
mktemp_LDADD = $(LDADD) $(LIB_GETHRXTIME)
|
|
||||||
vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_ACL)
|
|
||||||
sort_LDADD = $(LDADD) $(POW_LIB) $(LIB_GETHRXTIME)
|
|
||||||
+tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
|
|
||||||
|
|
||||||
# for get_date and gettime
|
|
||||||
date_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
|
|
||||||
|
|
@ -1,227 +0,0 @@
|
||||||
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
|
||||||
index df6792d..e3a0d50 100644
|
|
||||||
--- a/doc/coreutils.texi
|
|
||||||
+++ b/doc/coreutils.texi
|
|
||||||
@@ -2838,7 +2838,7 @@ Use digits in suffixes rather than lower-case letters.
|
|
||||||
|
|
||||||
@itemx --verbose
|
|
||||||
@opindex --verbose
|
|
||||||
-Write a diagnostic to standard error just before each output file is opened.
|
|
||||||
+Write a diagnostic just before each output file is opened.
|
|
||||||
|
|
||||||
@end table
|
|
||||||
|
|
||||||
@@ -8190,7 +8190,7 @@ If a file has multiple links, only the named links will be removed.
|
|
||||||
@itemx --verbose
|
|
||||||
@opindex -v
|
|
||||||
@opindex --verbose
|
|
||||||
-Display status updates as sterilization proceeds.
|
|
||||||
+Display to standard error status updates as sterilization proceeds.
|
|
||||||
|
|
||||||
@item -x
|
|
||||||
@itemx --exact
|
|
||||||
diff --git a/src/install.c b/src/install.c
|
|
||||||
index db08751..6925c55 100644
|
|
||||||
--- a/src/install.c
|
|
||||||
+++ b/src/install.c
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* install - copy files and set attributes
|
|
||||||
- Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc.
|
|
||||||
+ Copyright (C) 89, 90, 91, 1995-2008 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -160,6 +160,19 @@ static struct option const long_options[] =
|
|
||||||
{NULL, 0, NULL, 0}
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Verbose formatted output of variable count of arguments. */
|
|
||||||
+static void
|
|
||||||
+verbose_output (FILE *fp, char const *fmt, ...)
|
|
||||||
+{
|
|
||||||
+ va_list ap;
|
|
||||||
+ fputs (program_name, fp);
|
|
||||||
+ fputs (": ", fp);
|
|
||||||
+ va_start (ap, fmt);
|
|
||||||
+ vfprintf (fp, fmt, ap);
|
|
||||||
+ va_end (ap);
|
|
||||||
+ fputc ('\n', fp);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
cp_option_init (struct cp_options *x)
|
|
||||||
{
|
|
||||||
@@ -762,7 +775,7 @@ announce_mkdir (char const *dir, void *options)
|
|
||||||
{
|
|
||||||
struct cp_options const *x = options;
|
|
||||||
if (x->verbose)
|
|
||||||
- error (0, 0, _("creating directory %s"), quote (dir));
|
|
||||||
+ verbose_output (stdout,_("creating directory %s"), quote (dir));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Make ancestor directory DIR, whose last file name component is
|
|
||||||
diff --git a/src/rmdir.c b/src/rmdir.c
|
|
||||||
index bb1a0c8..1f17f6a 100644
|
|
||||||
--- a/src/rmdir.c
|
|
||||||
+++ b/src/rmdir.c
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
/* rmdir -- remove directories
|
|
||||||
|
|
||||||
- Copyright (C) 90, 91, 1995-2002, 2004, 2005, 2006, 2007 Free Software
|
|
||||||
+ Copyright (C) 90, 91, 1995-2002, 2004-2008 Free Software
|
|
||||||
Foundation, Inc.
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
@@ -72,6 +72,19 @@ static struct option const longopts[] =
|
|
||||||
{NULL, 0, NULL, 0}
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Verbose formatted output of variable count of arguments. */
|
|
||||||
+static void
|
|
||||||
+verbose_output (FILE *fp, char const *fmt, ...)
|
|
||||||
+{
|
|
||||||
+ va_list ap;
|
|
||||||
+ fputs (program_name, fp);
|
|
||||||
+ fputs (": ", fp);
|
|
||||||
+ va_start (ap, fmt);
|
|
||||||
+ vfprintf (fp, fmt, ap);
|
|
||||||
+ va_end (ap);
|
|
||||||
+ fputc ('\n', fp);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Return true if ERROR_NUMBER is one of the values associated
|
|
||||||
with a failed rmdir due to non-empty target directory. */
|
|
||||||
static bool
|
|
||||||
@@ -134,7 +147,7 @@ remove_parents (char *dir)
|
|
||||||
|
|
||||||
/* Give a diagnostic for each attempted removal if --verbose. */
|
|
||||||
if (verbose)
|
|
||||||
- error (0, 0, _("removing directory, %s"), quote (dir));
|
|
||||||
+ verbose_output (stdout,_("removing directory, %s"), quote (dir));
|
|
||||||
|
|
||||||
ok = (rmdir (dir) == 0);
|
|
||||||
|
|
||||||
@@ -233,7 +246,7 @@ main (int argc, char **argv)
|
|
||||||
|
|
||||||
/* Give a diagnostic for each attempted removal if --verbose. */
|
|
||||||
if (verbose)
|
|
||||||
- error (0, 0, _("removing directory, %s"), dir);
|
|
||||||
+ verbose_output(stdout, _("removing directory, %s"), dir);
|
|
||||||
|
|
||||||
if (rmdir (dir) != 0)
|
|
||||||
{
|
|
||||||
diff --git a/src/mkdir.c b/src/mkdir.c
|
|
||||||
index 0704077..3781065 100644
|
|
||||||
--- a/src/mkdir.c
|
|
||||||
+++ b/src/mkdir.c
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* mkdir -- make directories
|
|
||||||
- Copyright (C) 90, 1995-2002, 2004-2007 Free Software Foundation, Inc.
|
|
||||||
+ Copyright (C) 90, 1995-2002, 2004-2008 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -79,6 +79,19 @@ Mandatory arguments to long options are mandatory for short options too.\n\
|
|
||||||
exit (status);
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Verbose formatted output of variable count of arguments. */
|
|
||||||
+static void
|
|
||||||
+verbose_output (FILE *fp, char const *fmt, ...)
|
|
||||||
+{
|
|
||||||
+ va_list ap;
|
|
||||||
+ fputs (program_name, fp);
|
|
||||||
+ fputs (": ", fp);
|
|
||||||
+ va_start (ap, fmt);
|
|
||||||
+ vfprintf (fp, fmt, ap);
|
|
||||||
+ va_end (ap);
|
|
||||||
+ fputc ('\n', fp);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Options passed to subsidiary functions. */
|
|
||||||
struct mkdir_options
|
|
||||||
{
|
|
||||||
@@ -105,7 +118,7 @@ announce_mkdir (char const *dir, void *options)
|
|
||||||
{
|
|
||||||
struct mkdir_options const *o = options;
|
|
||||||
if (o->created_directory_format)
|
|
||||||
- error (0, 0, o->created_directory_format, quote (dir));
|
|
||||||
+ verbose_output (stdout, o->created_directory_format, quote (dir));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Make ancestor directory DIR, whose last component is COMPONENT,
|
|
||||||
diff --git a/src/split.c b/src/split.c
|
|
||||||
index 5807a1c..f84d40e 100644
|
|
||||||
--- a/src/split.c
|
|
||||||
+++ b/src/split.c
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* split.c -- split a file into pieces.
|
|
||||||
- Copyright (C) 1988, 1991, 1995-2007 Free Software Foundation, Inc.
|
|
||||||
+ Copyright (C) 1988, 1991, 1995-2008 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -122,8 +122,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
|
|
||||||
-l, --lines=NUMBER put NUMBER lines per output file\n\
|
|
||||||
"), DEFAULT_SUFFIX_LENGTH);
|
|
||||||
fputs (_("\
|
|
||||||
- --verbose print a diagnostic to standard error just\n\
|
|
||||||
- before each output file is opened\n\
|
|
||||||
+ --verbose print a diagnostic just before each\n\
|
|
||||||
+ output file is opened\n\
|
|
||||||
"), stdout);
|
|
||||||
fputs (HELP_OPTION_DESCRIPTION, stdout);
|
|
||||||
fputs (VERSION_OPTION_DESCRIPTION, stdout);
|
|
||||||
@@ -208,7 +208,7 @@ cwrite (bool new_file_flag, const char *bp, size_t bytes)
|
|
||||||
|
|
||||||
next_file_name ();
|
|
||||||
if (verbose)
|
|
||||||
- fprintf (stderr, _("creating file %s\n"), quote (outfile));
|
|
||||||
+ fprintf (stdout, _("creating file %s\n"), quote (outfile));
|
|
||||||
output_desc = open (outfile,
|
|
||||||
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
|
|
||||||
(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
|
|
||||||
diff --git a/tests/misc/split-a b/tests/misc/split-a
|
|
||||||
index 794115f..a8eed38 100755
|
|
||||||
--- a/tests/misc/split-a
|
|
||||||
+++ b/tests/misc/split-a
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#!/bin/sh
|
|
||||||
# Show that split -a works.
|
|
||||||
|
|
||||||
-# Copyright (C) 2002-2007 Free Software Foundation, Inc.
|
|
||||||
+# Copyright (C) 2002-2008 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -39,7 +39,7 @@ test -f xaz && fail=1
|
|
||||||
rm -f x*
|
|
||||||
|
|
||||||
# With a longer suffix, it must succeed.
|
|
||||||
-split --verbose -b 1 -a 2 in 2> err || fail=1
|
|
||||||
+split --verbose -b 1 -a 2 in > err || fail=1
|
|
||||||
test -f xaa || fail=1
|
|
||||||
test -f xaz || fail=1
|
|
||||||
test -f xba || fail=1
|
|
||||||
diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v
|
|
||||||
index 2c84b41..569e9b0 100755
|
|
||||||
--- a/tests/mkdir/p-v
|
|
||||||
+++ b/tests/mkdir/p-v
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#!/bin/sh
|
|
||||||
# Test mkdir -pv.
|
|
||||||
|
|
||||||
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
|
|
||||||
+# Copyright (C) 2006-2008 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -24,7 +24,7 @@ fi
|
|
||||||
. $srcdir/../lang-default
|
|
||||||
. $srcdir/../test-lib.sh
|
|
||||||
|
|
||||||
-mkdir -pv foo/a/b/c/d 2>out || exit
|
|
||||||
+mkdir -pv foo/a/b/c/d >out || exit
|
|
||||||
|
|
||||||
diff - out <<\EOF
|
|
||||||
mkdir: created directory `foo'
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
From 63467fa18794f02497c7a46e3b7783ba1180f8fc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jim Meyering <meyering@redhat.com>
|
|
||||||
Date: Fri, 4 Jul 2008 16:34:39 +0200
|
|
||||||
Subject: [PATCH] who -r: don't print "last=" when the corresponding byte is unprintable
|
|
||||||
|
|
||||||
* src/who.c (print_runlevel): Print last=%c only when the "preceding
|
|
||||||
run-level" byte is printable. Reported by Gian Piero De Lolliis in
|
|
||||||
<http://bugzilla.redhat.com/453249>.
|
|
||||||
---
|
|
||||||
src/who.c | 3 ++-
|
|
||||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/who.c b/src/who.c
|
|
||||||
index 5529618..0bba912 100644
|
|
||||||
--- a/src/who.c
|
|
||||||
+++ b/src/who.c
|
|
||||||
@@ -30,6 +30,7 @@
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include "system.h"
|
|
||||||
|
|
||||||
+#include "c-ctype.h"
|
|
||||||
#include "canon-host.h"
|
|
||||||
#include "readutmp.h"
|
|
||||||
#include "error.h"
|
|
||||||
@@ -511,7 +512,7 @@ print_runlevel (const STRUCT_UTMP *utmp_ent)
|
|
||||||
sprintf (comment, "%s%c", _("last="), (last == 'N') ? 'S' : last);
|
|
||||||
|
|
||||||
print_line (-1, "", ' ', -1, runlevline, time_string (utmp_ent),
|
|
||||||
- "", "", comment, "");
|
|
||||||
+ "", "", c_isprint (last) ? comment : "", "");
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.5.6.1.206.g8dcaf96
|
|
||||||
|
|
||||||
From 10db2e5e05c67eea205b3ec76a2408f46356a7fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
|
|
||||||
Date: Wed, 2 Jul 2008 14:11:05 +0200
|
|
||||||
Subject: [PATCH] doci: describe who's -p -r and -t options
|
|
||||||
|
|
||||||
* doc/coreutils.texi (who invocation):
|
|
||||||
---
|
|
||||||
doc/coreutils.texi | 18 ++++++++++++++++++
|
|
||||||
1 files changed, 18 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
|
||||||
index 155ba8d..c0ea237 100644
|
|
||||||
--- a/doc/coreutils.texi
|
|
||||||
+++ b/doc/coreutils.texi
|
|
||||||
@@ -12710,6 +12710,24 @@ automatic dial-up internet access.
|
|
||||||
@opindex --heading
|
|
||||||
Print a line of column headings.
|
|
||||||
|
|
||||||
+@item -p
|
|
||||||
+@itemx --process
|
|
||||||
+@opindex -p
|
|
||||||
+@opindex --process
|
|
||||||
+List active processes spawned by init.
|
|
||||||
+
|
|
||||||
+@item -r
|
|
||||||
+@itemx --runlevel
|
|
||||||
+@opindex -r
|
|
||||||
+@opindex --runlevel
|
|
||||||
+Print the current (and maybe previous) run-level of the init process.
|
|
||||||
+
|
|
||||||
+@item -t
|
|
||||||
+@itemx --time
|
|
||||||
+@opindex -t
|
|
||||||
+@opindex --time
|
|
||||||
+Print last system clock change.
|
|
||||||
+
|
|
||||||
@item -w
|
|
||||||
@itemx -T
|
|
||||||
@itemx --mesg
|
|
||||||
--
|
|
||||||
1.5.2.2
|
|
||||||
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
From a089634c855312a28f2ff3c2e7c08df5d030e2f5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jim Meyering <meyering <at> redhat.com>
|
|
||||||
Date: Tue, 20 May 2008 17:58:42 +0200
|
|
||||||
Subject: [PATCH] install: avoid a leak in currently-ifdef'd-out code
|
|
||||||
|
|
||||||
* src/install.c (setdefaultfilecon)
|
|
||||||
[ENABLE_WHEN_MATCHPATHCON_IS_MORE_EFFICIENT]:
|
|
||||||
Call matchpathcon_init_prefix only once.
|
|
||||||
Suggestion from Stephen Smalley. Reported by Ben Webb in
|
|
||||||
<http://bugzilla.redhat.com/447410>.
|
|
||||||
---
|
|
||||||
src/install.c | 5 ++++-
|
|
||||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/install.c b/src/install.c
|
|
||||||
index 964ab36..b531f45 100644
|
|
||||||
--- a/src/install.c
|
|
||||||
+++ b/src/install.c
|
|
||||||
@@ -208,6 +208,8 @@ setdefaultfilecon (char const *file)
|
|
||||||
{
|
|
||||||
struct stat st;
|
|
||||||
security_context_t scontext = NULL;
|
|
||||||
+ static bool first_call = true;
|
|
||||||
+
|
|
||||||
if (selinux_enabled != 1)
|
|
||||||
{
|
|
||||||
/* Indicate no context found. */
|
|
||||||
@@ -216,7 +218,7 @@ setdefaultfilecon (char const *file)
|
|
||||||
if (lstat (file, &st) != 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
- if (IS_ABSOLUTE_FILE_NAME (file))
|
|
||||||
+ if (first_call && IS_ABSOLUTE_FILE_NAME (file))
|
|
||||||
{
|
|
||||||
/* Calling matchpathcon_init_prefix (NULL, "/first_component/")
|
|
||||||
is an optimization to minimize the expense of the following
|
|
||||||
@@ -247,6 +249,7 @@ setdefaultfilecon (char const *file)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ first_call = false;
|
|
||||||
|
|
||||||
/* If there's an error determining the context, or it has none,
|
|
||||||
return to allow default context */
|
|
||||||
--
|
|
||||||
1.5.5.1.249.g68ef3
|
|
||||||
|
|
@ -1,381 +0,0 @@
|
||||||
diff -urNp coreutils-6.12-orig/lib/getdate.y coreutils-6.12/lib/getdate.y
|
|
||||||
--- coreutils-6.12-orig/lib/getdate.y 2008-01-31 19:37:19.000000000 +0100
|
|
||||||
+++ coreutils-6.12/lib/getdate.y 2008-10-08 15:49:35.000000000 +0200
|
|
||||||
@@ -1,8 +1,8 @@
|
|
||||||
%{
|
|
||||||
/* Parse a string into an internal time stamp.
|
|
||||||
|
|
||||||
- Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
|
|
||||||
- Foundation, Inc.
|
|
||||||
+ Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
|
||||||
+ Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -60,7 +60,7 @@
|
|
||||||
# undef static
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include <ctype.h>
|
|
||||||
+#include <c-ctype.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
@@ -205,7 +205,7 @@ typedef struct
|
|
||||||
union YYSTYPE;
|
|
||||||
static int yylex (union YYSTYPE *, parser_control *);
|
|
||||||
static int yyerror (parser_control const *, char const *);
|
|
||||||
-static long int time_zone_hhmm (textint, long int);
|
|
||||||
+static long int time_zone_hhmm (parser_control *, textint, long int);
|
|
||||||
|
|
||||||
/* Extract into *PC any date and time info from a string of digits
|
|
||||||
of the form e.g., YYYYMMDD, YYMMDD, HHMM, HH (and sometimes YYY,
|
|
||||||
@@ -246,6 +246,31 @@ digits_to_date_time (parser_control *pc,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Increment PC->rel by FACTOR * REL (FACTOR is 1 or -1). */
|
|
||||||
+static void
|
|
||||||
+apply_relative_time (parser_control *pc, relative_time rel, int factor)
|
|
||||||
+{
|
|
||||||
+ pc->rel.ns += factor * rel.ns;
|
|
||||||
+ pc->rel.seconds += factor * rel.seconds;
|
|
||||||
+ pc->rel.minutes += factor * rel.minutes;
|
|
||||||
+ pc->rel.hour += factor * rel.hour;
|
|
||||||
+ pc->rel.day += factor * rel.day;
|
|
||||||
+ pc->rel.month += factor * rel.month;
|
|
||||||
+ pc->rel.year += factor * rel.year;
|
|
||||||
+ pc->rels_seen = true;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* Set PC-> hour, minutes, seconds and nanoseconds members from arguments. */
|
|
||||||
+static void
|
|
||||||
+set_hhmmss (parser_control *pc, long int hour, long int minutes,
|
|
||||||
+ time_t sec, long int nsec)
|
|
||||||
+{
|
|
||||||
+ pc->hour = hour;
|
|
||||||
+ pc->minutes = minutes;
|
|
||||||
+ pc->seconds.tv_sec = sec;
|
|
||||||
+ pc->seconds.tv_nsec = nsec;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
%}
|
|
||||||
|
|
||||||
/* We want a reentrant parser, even if the TZ manipulation and the calls to
|
|
||||||
@@ -268,7 +293,7 @@ digits_to_date_time (parser_control *pc,
|
|
||||||
%token tAGO tDST
|
|
||||||
|
|
||||||
%token tYEAR_UNIT tMONTH_UNIT tHOUR_UNIT tMINUTE_UNIT tSEC_UNIT
|
|
||||||
-%token <intval> tDAY_UNIT
|
|
||||||
+%token <intval> tDAY_UNIT tDAY_SHIFT
|
|
||||||
|
|
||||||
%token <intval> tDAY tDAYZONE tLOCAL_ZONE tMERIDIAN
|
|
||||||
%token <intval> tMONTH tORDINAL tZONE
|
|
||||||
@@ -279,7 +304,7 @@ digits_to_date_time (parser_control *pc,
|
|
||||||
%type <intval> o_colon_minutes o_merid
|
|
||||||
%type <timespec> seconds signed_seconds unsigned_seconds
|
|
||||||
|
|
||||||
-%type <rel> relunit relunit_snumber
|
|
||||||
+%type <rel> relunit relunit_snumber dayshift
|
|
||||||
|
|
||||||
%%
|
|
||||||
|
|
||||||
@@ -313,7 +338,6 @@ item:
|
|
||||||
| day
|
|
||||||
{ pc->days_seen++; }
|
|
||||||
| rel
|
|
||||||
- { pc->rels_seen = true; }
|
|
||||||
| number
|
|
||||||
| hybrid
|
|
||||||
;
|
|
||||||
@@ -321,45 +345,32 @@ item:
|
|
||||||
time:
|
|
||||||
tUNUMBER tMERIDIAN
|
|
||||||
{
|
|
||||||
- pc->hour = $1.value;
|
|
||||||
- pc->minutes = 0;
|
|
||||||
- pc->seconds.tv_sec = 0;
|
|
||||||
- pc->seconds.tv_nsec = 0;
|
|
||||||
+ set_hhmmss (pc, $1.value, 0, 0, 0);
|
|
||||||
pc->meridian = $2;
|
|
||||||
}
|
|
||||||
| tUNUMBER ':' tUNUMBER o_merid
|
|
||||||
{
|
|
||||||
- pc->hour = $1.value;
|
|
||||||
- pc->minutes = $3.value;
|
|
||||||
- pc->seconds.tv_sec = 0;
|
|
||||||
- pc->seconds.tv_nsec = 0;
|
|
||||||
+ set_hhmmss (pc, $1.value, $3.value, 0, 0);
|
|
||||||
pc->meridian = $4;
|
|
||||||
}
|
|
||||||
| tUNUMBER ':' tUNUMBER tSNUMBER o_colon_minutes
|
|
||||||
{
|
|
||||||
- pc->hour = $1.value;
|
|
||||||
- pc->minutes = $3.value;
|
|
||||||
- pc->seconds.tv_sec = 0;
|
|
||||||
- pc->seconds.tv_nsec = 0;
|
|
||||||
+ set_hhmmss (pc, $1.value, $3.value, 0, 0);
|
|
||||||
pc->meridian = MER24;
|
|
||||||
pc->zones_seen++;
|
|
||||||
- pc->time_zone = time_zone_hhmm ($4, $5);
|
|
||||||
+ pc->time_zone = time_zone_hhmm (pc, $4, $5);
|
|
||||||
}
|
|
||||||
| tUNUMBER ':' tUNUMBER ':' unsigned_seconds o_merid
|
|
||||||
{
|
|
||||||
- pc->hour = $1.value;
|
|
||||||
- pc->minutes = $3.value;
|
|
||||||
- pc->seconds = $5;
|
|
||||||
+ set_hhmmss (pc, $1.value, $3.value, $5.tv_sec, $5.tv_nsec);
|
|
||||||
pc->meridian = $6;
|
|
||||||
}
|
|
||||||
| tUNUMBER ':' tUNUMBER ':' unsigned_seconds tSNUMBER o_colon_minutes
|
|
||||||
{
|
|
||||||
- pc->hour = $1.value;
|
|
||||||
- pc->minutes = $3.value;
|
|
||||||
- pc->seconds = $5;
|
|
||||||
+ set_hhmmss (pc, $1.value, $3.value, $5.tv_sec, $5.tv_nsec);
|
|
||||||
pc->meridian = MER24;
|
|
||||||
pc->zones_seen++;
|
|
||||||
- pc->time_zone = time_zone_hhmm ($6, $7);
|
|
||||||
+ pc->time_zone = time_zone_hhmm (pc, $6, $7);
|
|
||||||
}
|
|
||||||
;
|
|
||||||
|
|
||||||
@@ -381,16 +392,9 @@ zone:
|
|
||||||
{ pc->time_zone = $1; }
|
|
||||||
| tZONE relunit_snumber
|
|
||||||
{ pc->time_zone = $1;
|
|
||||||
- pc->rel.ns += $2.ns;
|
|
||||||
- pc->rel.seconds += $2.seconds;
|
|
||||||
- pc->rel.minutes += $2.minutes;
|
|
||||||
- pc->rel.hour += $2.hour;
|
|
||||||
- pc->rel.day += $2.day;
|
|
||||||
- pc->rel.month += $2.month;
|
|
||||||
- pc->rel.year += $2.year;
|
|
||||||
- pc->rels_seen = true; }
|
|
||||||
+ apply_relative_time (pc, $2, 1); }
|
|
||||||
| tZONE tSNUMBER o_colon_minutes
|
|
||||||
- { pc->time_zone = $1 + time_zone_hhmm ($2, $3); }
|
|
||||||
+ { pc->time_zone = $1 + time_zone_hhmm (pc, $2, $3); }
|
|
||||||
| tDAYZONE
|
|
||||||
{ pc->time_zone = $1 + 60; }
|
|
||||||
| tZONE tDST
|
|
||||||
@@ -495,25 +499,11 @@ date:
|
|
||||||
|
|
||||||
rel:
|
|
||||||
relunit tAGO
|
|
||||||
- {
|
|
||||||
- pc->rel.ns -= $1.ns;
|
|
||||||
- pc->rel.seconds -= $1.seconds;
|
|
||||||
- pc->rel.minutes -= $1.minutes;
|
|
||||||
- pc->rel.hour -= $1.hour;
|
|
||||||
- pc->rel.day -= $1.day;
|
|
||||||
- pc->rel.month -= $1.month;
|
|
||||||
- pc->rel.year -= $1.year;
|
|
||||||
- }
|
|
||||||
+ { apply_relative_time (pc, $1, -1); }
|
|
||||||
| relunit
|
|
||||||
- {
|
|
||||||
- pc->rel.ns += $1.ns;
|
|
||||||
- pc->rel.seconds += $1.seconds;
|
|
||||||
- pc->rel.minutes += $1.minutes;
|
|
||||||
- pc->rel.hour += $1.hour;
|
|
||||||
- pc->rel.day += $1.day;
|
|
||||||
- pc->rel.month += $1.month;
|
|
||||||
- pc->rel.year += $1.year;
|
|
||||||
- }
|
|
||||||
+ { apply_relative_time (pc, $1, 1); }
|
|
||||||
+ | dayshift
|
|
||||||
+ { apply_relative_time (pc, $1, 1); }
|
|
||||||
;
|
|
||||||
|
|
||||||
relunit:
|
|
||||||
@@ -575,6 +565,11 @@ relunit_snumber:
|
|
||||||
{ $$ = RELATIVE_TIME_0; $$.seconds = $1.value; }
|
|
||||||
;
|
|
||||||
|
|
||||||
+dayshift:
|
|
||||||
+ tDAY_SHIFT
|
|
||||||
+ { $$ = RELATIVE_TIME_0; $$.day = $1; }
|
|
||||||
+ ;
|
|
||||||
+
|
|
||||||
seconds: signed_seconds | unsigned_seconds;
|
|
||||||
|
|
||||||
signed_seconds:
|
|
||||||
@@ -600,14 +595,7 @@ hybrid:
|
|
||||||
/* Hybrid all-digit and relative offset, so that we accept e.g.,
|
|
||||||
"YYYYMMDD +N days" as well as "YYYYMMDD N days". */
|
|
||||||
digits_to_date_time (pc, $1);
|
|
||||||
- pc->rel.ns += $2.ns;
|
|
||||||
- pc->rel.seconds += $2.seconds;
|
|
||||||
- pc->rel.minutes += $2.minutes;
|
|
||||||
- pc->rel.hour += $2.hour;
|
|
||||||
- pc->rel.day += $2.day;
|
|
||||||
- pc->rel.month += $2.month;
|
|
||||||
- pc->rel.year += $2.year;
|
|
||||||
- pc->rels_seen = true;
|
|
||||||
+ apply_relative_time (pc, $2, 1);
|
|
||||||
}
|
|
||||||
;
|
|
||||||
|
|
||||||
@@ -688,10 +676,10 @@ static table const time_units_table[] =
|
|
||||||
/* Assorted relative-time words. */
|
|
||||||
static table const relative_time_table[] =
|
|
||||||
{
|
|
||||||
- { "TOMORROW", tDAY_UNIT, 1 },
|
|
||||||
- { "YESTERDAY",tDAY_UNIT, -1 },
|
|
||||||
- { "TODAY", tDAY_UNIT, 0 },
|
|
||||||
- { "NOW", tDAY_UNIT, 0 },
|
|
||||||
+ { "TOMORROW", tDAY_SHIFT, 1 },
|
|
||||||
+ { "YESTERDAY",tDAY_SHIFT, -1 },
|
|
||||||
+ { "TODAY", tDAY_SHIFT, 0 },
|
|
||||||
+ { "NOW", tDAY_SHIFT, 0 },
|
|
||||||
{ "LAST", tORDINAL, -1 },
|
|
||||||
{ "THIS", tORDINAL, 0 },
|
|
||||||
{ "NEXT", tORDINAL, 1 },
|
|
||||||
@@ -814,15 +802,33 @@ static table const military_table[] =
|
|
||||||
|
|
||||||
/* Convert a time zone expressed as HH:MM into an integer count of
|
|
||||||
minutes. If MM is negative, then S is of the form HHMM and needs
|
|
||||||
- to be picked apart; otherwise, S is of the form HH. */
|
|
||||||
+ to be picked apart; otherwise, S is of the form HH. As specified in
|
|
||||||
+ http://www.opengroup.org/susv3xbd/xbd_chap08.html#tag_08_03, allow
|
|
||||||
+ only valid TZ range, and consider first two digits as hours, if no
|
|
||||||
+ minutes specified. */
|
|
||||||
|
|
||||||
static long int
|
|
||||||
-time_zone_hhmm (textint s, long int mm)
|
|
||||||
+time_zone_hhmm (parser_control *pc, textint s, long int mm)
|
|
||||||
{
|
|
||||||
+ long int n_minutes;
|
|
||||||
+
|
|
||||||
+ /* If the length of S is 1 or 2 and no minutes are specified,
|
|
||||||
+ interpret it as a number of hours. */
|
|
||||||
+ if (s.digits <= 2 && mm < 0)
|
|
||||||
+ s.value *= 100;
|
|
||||||
+
|
|
||||||
if (mm < 0)
|
|
||||||
- return (s.value / 100) * 60 + s.value % 100;
|
|
||||||
+ n_minutes = (s.value / 100) * 60 + s.value % 100;
|
|
||||||
else
|
|
||||||
- return s.value * 60 + (s.negative ? -mm : mm);
|
|
||||||
+ n_minutes = s.value * 60 + (s.negative ? -mm : mm);
|
|
||||||
+
|
|
||||||
+ /* If the absolute number of minutes is larger than 24 hours,
|
|
||||||
+ arrange to reject it by incrementing pc->zones_seen. Thus,
|
|
||||||
+ we allow only values in the range UTC-24:00 to UTC+24:00. */
|
|
||||||
+ if (24 * 60 < abs (n_minutes))
|
|
||||||
+ pc->zones_seen++;
|
|
||||||
+
|
|
||||||
+ return n_minutes;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
@@ -919,7 +925,7 @@ lookup_word (parser_control const *pc, c
|
|
||||||
for (p = word; *p; p++)
|
|
||||||
{
|
|
||||||
unsigned char ch = *p;
|
|
||||||
- *p = toupper (ch);
|
|
||||||
+ *p = c_toupper (ch);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (tp = meridian_table; tp->name; tp++)
|
|
||||||
@@ -984,7 +990,7 @@ yylex (YYSTYPE *lvalp, parser_control *p
|
|
||||||
|
|
||||||
for (;;)
|
|
||||||
{
|
|
||||||
- while (c = *pc->input, isspace (c))
|
|
||||||
+ while (c = *pc->input, c_isspace (c))
|
|
||||||
pc->input++;
|
|
||||||
|
|
||||||
if (ISDIGIT (c) || c == '-' || c == '+')
|
|
||||||
@@ -995,7 +1001,7 @@ yylex (YYSTYPE *lvalp, parser_control *p
|
|
||||||
if (c == '-' || c == '+')
|
|
||||||
{
|
|
||||||
sign = c == '-' ? -1 : 1;
|
|
||||||
- while (c = *++pc->input, isspace (c))
|
|
||||||
+ while (c = *++pc->input, c_isspace (c))
|
|
||||||
continue;
|
|
||||||
if (! ISDIGIT (c))
|
|
||||||
/* skip the '-' sign */
|
|
||||||
@@ -1099,7 +1105,7 @@ yylex (YYSTYPE *lvalp, parser_control *p
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (isalpha (c))
|
|
||||||
+ if (c_isalpha (c))
|
|
||||||
{
|
|
||||||
char buff[20];
|
|
||||||
char *p = buff;
|
|
||||||
@@ -1111,7 +1117,7 @@ yylex (YYSTYPE *lvalp, parser_control *p
|
|
||||||
*p++ = c;
|
|
||||||
c = *++pc->input;
|
|
||||||
}
|
|
||||||
- while (isalpha (c) || c == '.');
|
|
||||||
+ while (c_isalpha (c) || c == '.');
|
|
||||||
|
|
||||||
*p = '\0';
|
|
||||||
tp = lookup_word (pc, buff);
|
|
||||||
@@ -1224,7 +1230,7 @@ get_date (struct timespec *result, char
|
|
||||||
if (! tmp)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
- while (c = *p, isspace (c))
|
|
||||||
+ while (c = *p, c_isspace (c))
|
|
||||||
p++;
|
|
||||||
|
|
||||||
if (strncmp (p, "TZ=\"", 4) == 0)
|
|
||||||
@@ -1436,25 +1442,6 @@ get_date (struct timespec *result, char
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pc.zones_seen)
|
|
||||||
- {
|
|
||||||
- long int delta = pc.time_zone * 60;
|
|
||||||
- time_t t1;
|
|
||||||
-#ifdef HAVE_TM_GMTOFF
|
|
||||||
- delta -= tm.tm_gmtoff;
|
|
||||||
-#else
|
|
||||||
- time_t t = Start;
|
|
||||||
- struct tm const *gmt = gmtime (&t);
|
|
||||||
- if (! gmt)
|
|
||||||
- goto fail;
|
|
||||||
- delta -= tm_diff (&tm, gmt);
|
|
||||||
-#endif
|
|
||||||
- t1 = Start - delta;
|
|
||||||
- if ((Start < t1) != (delta < 0))
|
|
||||||
- goto fail; /* time_t overflow */
|
|
||||||
- Start = t1;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
/* Add relative date. */
|
|
||||||
if (pc.rel.year | pc.rel.month | pc.rel.day)
|
|
||||||
{
|
|
||||||
@@ -1477,6 +1464,27 @@ get_date (struct timespec *result, char
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* The only "output" of this if-block is an updated Start value,
|
|
||||||
+ so this block must follow others that clobber Start. */
|
|
||||||
+ if (pc.zones_seen)
|
|
||||||
+ {
|
|
||||||
+ long int delta = pc.time_zone * 60;
|
|
||||||
+ time_t t1;
|
|
||||||
+#ifdef HAVE_TM_GMTOFF
|
|
||||||
+ delta -= tm.tm_gmtoff;
|
|
||||||
+#else
|
|
||||||
+ time_t t = Start;
|
|
||||||
+ struct tm const *gmt = gmtime (&t);
|
|
||||||
+ if (! gmt)
|
|
||||||
+ goto fail;
|
|
||||||
+ delta -= tm_diff (&tm, gmt);
|
|
||||||
+#endif
|
|
||||||
+ t1 = Start - delta;
|
|
||||||
+ if ((Start < t1) != (delta < 0))
|
|
||||||
+ goto fail; /* time_t overflow */
|
|
||||||
+ Start = t1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* Add relative hours, minutes, and seconds. On hosts that support
|
|
||||||
leap seconds, ignore the possibility of leap seconds; e.g.,
|
|
||||||
"+ 10 minutes" adds 600 seconds, even if one of them is a
|
|
||||||
|
|
@ -1,181 +0,0 @@
|
||||||
From 9f8be4b0b83d1e0cbf1326f8cb7e077d026d9b0b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Wed, 23 Jul 2008 11:29:21 +0200
|
|
||||||
Subject: [PATCH] dd: iflag=fullblock now read full blocks if possible
|
|
||||||
* src/dd.c (iread_fullblock): New function for reading full blocks.
|
|
||||||
(scanargs): Check for new parameter iflag=fullblock.
|
|
||||||
(skip): Use iread_fnc pointer instead of iread function.
|
|
||||||
(dd_copy): Use iread_fnc pointer instead of iread function.
|
|
||||||
* tests/dd/misc: Add test for dd - read full blocks.
|
|
||||||
* doc/coretuils.texi: Mention new parameter iflag=fullblock.
|
|
||||||
* NEWS: Mentioned the change.
|
|
||||||
|
|
||||||
---
|
|
||||||
NEWS | 4 ++++
|
|
||||||
doc/coreutils.texi | 6 ++++++
|
|
||||||
src/dd.c | 39 +++++++++++++++++++++++++++++++++++++--
|
|
||||||
tests/dd/misc | 9 +++++++++
|
|
||||||
4 files changed, 56 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
|
||||||
index 81e3b91..b95f8dc 100644
|
|
||||||
--- a/doc/coreutils.texi
|
|
||||||
+++ b/doc/coreutils.texi
|
|
||||||
@@ -7719,6 +7719,12 @@ platforms that distinguish binary from text I/O.
|
|
||||||
Use text I/O. Like @samp{binary}, this option has no effect on
|
|
||||||
standard platforms.
|
|
||||||
|
|
||||||
+@item fullblock
|
|
||||||
+@opindex fullblock
|
|
||||||
+Read full blocks from input if possible. read() may return early
|
|
||||||
+if a full block is not available, so retry until data is available
|
|
||||||
+or end of file is reached. This flag can be used only for the iflag option.
|
|
||||||
+
|
|
||||||
@end table
|
|
||||||
|
|
||||||
These flags are not supported on all systems, and @samp{dd} rejects
|
|
||||||
diff --git a/src/dd.c b/src/dd.c
|
|
||||||
index ead9574..1b620df 100644
|
|
||||||
--- a/src/dd.c
|
|
||||||
+++ b/src/dd.c
|
|
||||||
@@ -225,6 +225,9 @@ static sig_atomic_t volatile interrupt_signal;
|
|
||||||
/* A count of the number of pending info signals that have been received. */
|
|
||||||
static sig_atomic_t volatile info_signal_count;
|
|
||||||
|
|
||||||
+/* Function used for read (to handle iflag=fullblock parameter) */
|
|
||||||
+static ssize_t (*iread_fnc) (int fd, char *buf, size_t size);
|
|
||||||
+
|
|
||||||
/* A longest symbol in the struct symbol_values tables below. */
|
|
||||||
#define LONGEST_SYMBOL "fdatasync"
|
|
||||||
|
|
||||||
@@ -257,6 +260,7 @@ static struct symbol_value const conversions[] =
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Flags, for iflag="..." and oflag="...". */
|
|
||||||
+#define O_FULLBLOCK 010000000 /* Read only full blocks from input */
|
|
||||||
static struct symbol_value const flags[] =
|
|
||||||
{
|
|
||||||
{"append", O_APPEND},
|
|
||||||
@@ -271,6 +275,7 @@ static struct symbol_value const flags[] =
|
|
||||||
{"nonblock", O_NONBLOCK},
|
|
||||||
{"sync", O_SYNC},
|
|
||||||
{"text", O_TEXT},
|
|
||||||
+ {"fullblock", O_FULLBLOCK}, /* Read only full blocks from input */
|
|
||||||
{"", 0}
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -762,6 +767,27 @@ iread (int fd, char *buf, size_t size)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Wrapper around iread function which reads full blocks if possible */
|
|
||||||
+static ssize_t
|
|
||||||
+iread_fullblock (int fd, char *buf, size_t size)
|
|
||||||
+{
|
|
||||||
+ ssize_t nread = 0;
|
|
||||||
+
|
|
||||||
+ while (0 < size)
|
|
||||||
+ {
|
|
||||||
+ ssize_t ncurr = iread(fd, buf, size);
|
|
||||||
+ if (ncurr < 0)
|
|
||||||
+ return ncurr;
|
|
||||||
+ if (ncurr == 0)
|
|
||||||
+ break;
|
|
||||||
+ nread += ncurr;
|
|
||||||
+ buf += ncurr;
|
|
||||||
+ size -= ncurr;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return nread;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Write to FD the buffer BUF of size SIZE, processing any signals
|
|
||||||
that arrive. Return the number of bytes written, setting errno if
|
|
||||||
this is less than SIZE. Keep trying if there are partial
|
|
||||||
@@ -1000,6 +1026,15 @@ scanargs (int argc, char *const *argv)
|
|
||||||
if (input_flags & (O_DSYNC | O_SYNC))
|
|
||||||
input_flags |= O_RSYNC;
|
|
||||||
|
|
||||||
+ if (output_flags & O_FULLBLOCK)
|
|
||||||
+ {
|
|
||||||
+ error (0, 0, "%s: %s", _("invalid output flag"), "'fullblock'");
|
|
||||||
+ usage (EXIT_FAILURE);
|
|
||||||
+ }
|
|
||||||
+ iread_fnc = (input_flags & O_FULLBLOCK)?
|
|
||||||
+ iread_fullblock:
|
|
||||||
+ iread;
|
|
||||||
+
|
|
||||||
if (multiple_bits_set (conversions_mask & (C_ASCII | C_EBCDIC | C_IBM)))
|
|
||||||
error (EXIT_FAILURE, 0, _("cannot combine any two of {ascii,ebcdic,ibm}"));
|
|
||||||
if (multiple_bits_set (conversions_mask & (C_BLOCK | C_UNBLOCK)))
|
|
||||||
@@ -1197,7 +1232,7 @@ skip (int fdesc, char const *file, uintmax_t records, size_t blocksize,
|
|
||||||
|
|
||||||
do
|
|
||||||
{
|
|
||||||
- ssize_t nread = iread (fdesc, buf, blocksize);
|
|
||||||
+ ssize_t nread = iread_fnc (fdesc, buf, blocksize);
|
|
||||||
if (nread < 0)
|
|
||||||
{
|
|
||||||
if (fdesc == STDIN_FILENO)
|
|
||||||
@@ -1508,7 +1543,7 @@ dd_copy (void)
|
|
||||||
(conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0',
|
|
||||||
input_blocksize);
|
|
||||||
|
|
||||||
- nread = iread (STDIN_FILENO, ibuf, input_blocksize);
|
|
||||||
+ nread = iread_fnc (STDIN_FILENO, ibuf, input_blocksize);
|
|
||||||
|
|
||||||
if (nread == 0)
|
|
||||||
break; /* EOF. */
|
|
||||||
diff --git a/tests/dd/misc b/tests/dd/misc
|
|
||||||
index d54fbfa..24e5eba 100755
|
|
||||||
--- a/tests/dd/misc
|
|
||||||
+++ b/tests/dd/misc
|
|
||||||
@@ -88,6 +88,15 @@ fi
|
|
||||||
outbytes=`echo x | dd bs=3 ibs=10 obs=10 conv=sync 2>/dev/null | wc -c`
|
|
||||||
test "$outbytes" -eq 3 || fail=1
|
|
||||||
|
|
||||||
+(echo a; sleep .1; echo b) \
|
|
||||||
+ | LC_ALL=C dd bs=4 status=noxfer iflag=fullblock >out 2>err || fail=1
|
|
||||||
+echo "a
|
|
||||||
+b" > out_ok
|
|
||||||
+echo "1+0 records in
|
|
||||||
+1+0 records out" > err_ok
|
|
||||||
+compare out out_ok || fail=1
|
|
||||||
+compare err err_ok || fail=1
|
|
||||||
+
|
|
||||||
test $fail -eq 0 && fail=$warn
|
|
||||||
|
|
||||||
(exit $fail); exit $fail
|
|
||||||
diff -ruN coreutils-6.12.old/doc/coreutils.info coreutils-6.12/doc/coreutils.info
|
|
||||||
--- coreutils-6.12.old/doc/coreutils.info 2008-07-24 12:49:57.000000000 +0200
|
|
||||||
+++ coreutils-6.12/doc/coreutils.info 2008-07-24 12:52:17.000000000 +0200
|
|
||||||
@@ -6112,6 +6112,12 @@
|
|
||||||
Use text I/O. Like `binary', this option has no effect on
|
|
||||||
standard platforms.
|
|
||||||
|
|
||||||
+ 'fullblock'
|
|
||||||
+ Read full blocks from input if possible. read() may return
|
|
||||||
+ early if a full block is not available, so retry until data
|
|
||||||
+ is available or end of file is reached. This flag can be used
|
|
||||||
+ only for the iflag option.
|
|
||||||
+
|
|
||||||
|
|
||||||
These flags are not supported on all systems, and `dd' rejects
|
|
||||||
attempts to use them when they are not supported. When reading
|
|
||||||
diff -ruN coreutils-6.12.old/man/dd.1 coreutils-6.12/man/dd.1
|
|
||||||
--- coreutils-6.12.old/man/dd.1 2008-07-24 12:51:06.000000000 +0200
|
|
||||||
+++ coreutils-6.12/man/dd.1 2008-07-24 12:59:06.000000000 +0200
|
|
||||||
@@ -111,6 +111,13 @@
|
|
||||||
.TP
|
|
||||||
direct
|
|
||||||
use direct I/O for data
|
|
||||||
+.PP
|
|
||||||
+FLAG symbols only for iflag option:
|
|
||||||
+.TP
|
|
||||||
+fullblock
|
|
||||||
+Read full blocks from input if possible. read() may return early
|
|
||||||
+if a full block is not available, so retry until data is available
|
|
||||||
+or end of file is reached.
|
|
||||||
.IP
|
|
||||||
directory fail unless a directory
|
|
||||||
dsync use synchronized I/O for data
|
|
||||||
|
|
@ -1,256 +0,0 @@
|
||||||
From 7634188624dc7f48c047b29fab3715dc7a468059 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Wed, 23 Jul 2008 09:52:05 +0200
|
|
||||||
Subject: [PATCH] ls: --color now highlights files with capabilities, too
|
|
||||||
* configure.ac: New option: --disable-libcap. Check for libcap usability.
|
|
||||||
* src/Makefile.am (dir_LDADD, ls_LDADD, ...): Append $(LIB_CAP).
|
|
||||||
* src/ls.c: [HAVE_CAP] Include <sys/capability.h>.
|
|
||||||
(has_capability): New function for capability detection.
|
|
||||||
(print_color_indicator): Colorize file with capability.
|
|
||||||
* src/dircolors.c: Update color lists.
|
|
||||||
* src/dircolors.hin: Mention new CAPABILITY color attribute.
|
|
||||||
* tests/ls/capability: Test for ls - colorize file with capability.
|
|
||||||
* tests/Makefile.am (TESTS): Add ls/capability.
|
|
||||||
* NEWS: Mention the change.
|
|
||||||
|
|
||||||
---
|
|
||||||
NEWS | 2 ++
|
|
||||||
configure.ac | 13 +++++++++++++
|
|
||||||
src/Makefile.am | 6 +++---
|
|
||||||
src/dircolors.c | 4 ++--
|
|
||||||
src/dircolors.hin | 1 +
|
|
||||||
src/ls.c | 43 +++++++++++++++++++++++++++++++++++++++++--
|
|
||||||
tests/Makefile.am | 1 +
|
|
||||||
tests/ls/capability | 43 +++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
8 files changed, 106 insertions(+), 7 deletions(-)
|
|
||||||
create mode 100755 tests/ls/capability
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index ac93e1c..96b2fda 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -44,6 +44,19 @@ gl_EARLY
|
|
||||||
gl_INIT
|
|
||||||
coreutils_MACROS
|
|
||||||
|
|
||||||
+dnl Check whether libcap is usable
|
|
||||||
+AC_ARG_ENABLE([libcap],
|
|
||||||
+ AC_HELP_STRING([--disable-libcap], [disable libcap support]),
|
|
||||||
+ AC_MSG_WARN([libcap support disabled by user]),
|
|
||||||
+ [AC_CHECK_LIB([cap], [cap_get_file],
|
|
||||||
+ [AC_CHECK_HEADER([sys/capability.h],
|
|
||||||
+ [LIB_CAP="-lcap" AC_DEFINE(HAVE_CAP, 1, [libcap usability])],
|
|
||||||
+ [AC_MSG_WARN([header sys/capability.h was not found, support for libcap will not be built])]
|
|
||||||
+ )],
|
|
||||||
+ [AC_MSG_WARN([libcap library was not found or not usable, support for libcap will not be built])])
|
|
||||||
+ ])
|
|
||||||
+AC_SUBST([LIB_CAP])
|
|
||||||
+
|
|
||||||
AC_FUNC_FORK
|
|
||||||
|
|
||||||
optional_bin_progs=
|
|
||||||
diff -ruN coreutils-6.12.orig/src/Makefile.am coreutils-6.12/src/Makefile.am
|
|
||||||
--- coreutils-6.12.orig/src/Makefile.am 2008-07-10 12:30:03.000000000 +0200
|
|
||||||
+++ coreutils-6.12/src/Makefile.am 2008-07-24 13:18:43.000000000 +0200
|
|
||||||
@@ -91,14 +91,14 @@
|
|
||||||
|
|
||||||
# for clock_gettime and fdatasync
|
|
||||||
dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
|
|
||||||
-dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX)
|
|
||||||
+dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP)
|
|
||||||
id_LDADD = $(LDADD) $(LIB_SELINUX)
|
|
||||||
-ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX)
|
|
||||||
+ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP)
|
|
||||||
pr_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
|
|
||||||
shred_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
|
|
||||||
shuf_LDADD = $(LDADD) $(LIB_GETHRXTIME)
|
|
||||||
mktemp_LDADD = $(LDADD) $(LIB_GETHRXTIME)
|
|
||||||
-vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX)
|
|
||||||
+vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_SELINUX) $(LIB_CAP)
|
|
||||||
tac_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
|
|
||||||
|
|
||||||
## If necessary, add -lm to resolve use of pow in lib/strtod.c.
|
|
||||||
diff -ruN coreutils-6.10.orig/src/dircolors.c coreutils-6.10/src/dircolors.c
|
|
||||||
--- coreutils-6.10.orig/src/dircolors.c 2008-07-24 14:29:44.000000000 +0200
|
|
||||||
+++ coreutils-6.10/src/dircolors.c 2008-07-24 14:38:14.000000000 +0200
|
|
||||||
@@ -63,14 +63,14 @@
|
|
||||||
"SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK",
|
|
||||||
"CHR", "CHAR", "DOOR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE",
|
|
||||||
"END", "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "STICKY",
|
|
||||||
- "OTHER_WRITABLE", "OWR", "STICKY_OTHER_WRITABLE", "OWT", NULL
|
|
||||||
+ "OTHER_WRITABLE", "OWR", "STICKY_OTHER_WRITABLE", "OWT", "CAPABILITY", NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
static const char *const ls_codes[] =
|
|
||||||
{
|
|
||||||
"no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi",
|
|
||||||
"so", "bd", "bd", "cd", "cd", "do", "ex", "lc", "lc", "rc", "rc", "ec", "ec",
|
|
||||||
- "su", "su", "sg", "sg", "st", "ow", "ow", "tw", "tw", NULL
|
|
||||||
+ "su", "su", "sg", "sg", "st", "ow", "ow", "tw", "tw", "ca", NULL
|
|
||||||
};
|
|
||||||
#define array_len(Array) (sizeof (Array) / sizeof *(Array))
|
|
||||||
verify (array_len (slack_codes) == array_len (ls_codes));
|
|
||||||
diff --git a/src/dircolors.hin b/src/dircolors.hin
|
|
||||||
index 38914c8..5137cc6 100644
|
|
||||||
--- a/src/dircolors.hin
|
|
||||||
+++ b/src/dircolors.hin
|
|
||||||
@@ -77,6 +77,7 @@ CHR 40;33;01 # character device driver
|
|
||||||
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file
|
|
||||||
SETUID 37;41 # file that is setuid (u+s)
|
|
||||||
SETGID 30;43 # file that is setgid (g+s)
|
|
||||||
+CAPABILITY 30;41 # file with capability
|
|
||||||
STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
|
|
||||||
OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
|
|
||||||
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
|
|
||||||
diff --git a/src/ls.c b/src/ls.c
|
|
||||||
index 4b69f7d..9bc66a1 100644
|
|
||||||
--- a/src/ls.c
|
|
||||||
+++ b/src/ls.c
|
|
||||||
@@ -38,6 +38,10 @@
|
|
||||||
#include <config.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
+#ifdef HAVE_CAP
|
|
||||||
+# include <sys/capability.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if HAVE_TERMIOS_H
|
|
||||||
# include <termios.h>
|
|
||||||
#endif
|
|
||||||
@@ -518,14 +518,14 @@
|
|
||||||
{
|
|
||||||
C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
|
|
||||||
C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR, C_SETUID, C_SETGID,
|
|
||||||
- C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE
|
|
||||||
+ C_STICKY, C_OTHER_WRITABLE, C_STICKY_OTHER_WRITABLE, C_CAP
|
|
||||||
};
|
|
||||||
|
|
||||||
static const char *const indicator_name[]=
|
|
||||||
{
|
|
||||||
"lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
|
|
||||||
"bd", "cd", "mi", "or", "ex", "do", "su", "sg", "st",
|
|
||||||
- "ow", "tw", NULL
|
|
||||||
+ "ow", "tw", "ca", NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
struct color_ext_type
|
|
||||||
@@ -553,6 +557,7 @@ static struct bin_str color_indicator[] =
|
|
||||||
{ LEN_STR_PAIR ("37;44") }, /* st: sticky: black on blue */
|
|
||||||
{ LEN_STR_PAIR ("34;42") }, /* ow: other-writable: blue on green */
|
|
||||||
{ LEN_STR_PAIR ("30;42") }, /* tw: ow w/ sticky: black on green */
|
|
||||||
+ { LEN_STR_PAIR ("30;41") }, /* capability: black on red */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* FIXME: comment */
|
|
||||||
@@ -3953,6 +3953,38 @@
|
|
||||||
DIRED_PUTCHAR (c);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef HAVE_CAP
|
|
||||||
+static bool
|
|
||||||
+/* Return true if NAME has a capability (see linux/capability.h) */
|
|
||||||
+has_capability (const char *name)
|
|
||||||
+{
|
|
||||||
+ cap_t cap_d;
|
|
||||||
+ char *result;
|
|
||||||
+ bool has_cap;
|
|
||||||
+
|
|
||||||
+ cap_d = cap_get_file (name);
|
|
||||||
+ if (cap_d == NULL)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ result = cap_to_text (cap_d, NULL);
|
|
||||||
+ cap_free (cap_d);
|
|
||||||
+ if (!result)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ /* check if human-readable capability string is empty */
|
|
||||||
+ has_cap = !!*result;
|
|
||||||
+
|
|
||||||
+ cap_free (result);
|
|
||||||
+ return has_cap;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
+static bool
|
|
||||||
+has_capability (const char *name)
|
|
||||||
+{
|
|
||||||
+ return false;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
print_color_indicator (const char *name, mode_t mode, int linkok,
|
|
||||||
bool stat_ok, enum filetype filetype)
|
|
||||||
@@ -3923,6 +3960,8 @@ print_color_indicator (const char *name, mode_t mode, int linkok,
|
|
||||||
type = C_SETUID;
|
|
||||||
else if ((mode & S_ISGID) != 0)
|
|
||||||
type = C_SETGID;
|
|
||||||
+ else if (has_capability (name))
|
|
||||||
+ type = C_CAP;
|
|
||||||
else if ((mode & S_IXUGO) != 0)
|
|
||||||
type = C_EXEC;
|
|
||||||
}
|
|
||||||
diff -ruN coreutils-6.10.orig/tests/ls/Makefile.am coreutils-6.10/tests/ls/Makefile.am
|
|
||||||
--- coreutils-6.10.orig/tests/ls/Makefile.am 2007-11-25 14:23:31.000000000 +0100
|
|
||||||
+++ coreutils-6.10/tests/ls/Makefile.am 2008-07-24 14:46:36.000000000 +0200
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
TESTS = \
|
|
||||||
stat-free-symlinks \
|
|
||||||
nameless-uid \
|
|
||||||
- color-dtype-dir \
|
|
||||||
+ color-dtype-dir capability \
|
|
||||||
stat-failed \
|
|
||||||
stat-dtype \
|
|
||||||
inode dangle file-type recursive dired infloop \
|
|
||||||
diff --git a/tests/ls/capability b/tests/ls/capability
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..549e06b
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/ls/capability
|
|
||||||
@@ -0,0 +1,43 @@
|
|
||||||
+#!/bin/sh
|
|
||||||
+# Ensure "ls --color" properly colorizes file with capability.
|
|
||||||
+
|
|
||||||
+# Copyright (C) 2008 Free Software Foundation, Inc.
|
|
||||||
+
|
|
||||||
+# This program is free software: you can redistribute it and/or modify
|
|
||||||
+# it under the terms of the GNU General Public License as published by
|
|
||||||
+# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
+# (at your option) any later version.
|
|
||||||
+
|
|
||||||
+# This program is distributed in the hope that it will be useful,
|
|
||||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
+# GNU General Public License for more details.
|
|
||||||
+
|
|
||||||
+# You should have received a copy of the GNU General Public License
|
|
||||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
+
|
|
||||||
+if test "$VERBOSE" = yes; then
|
|
||||||
+ set -x
|
|
||||||
+ ls --version
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+. $srcdir/../test-lib.sh
|
|
||||||
+uid_is_privileged_ || skip_test_ "must be run as root"
|
|
||||||
+
|
|
||||||
+(setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \
|
|
||||||
+ || skip_test_ "setcap utility not found"
|
|
||||||
+fail=0
|
|
||||||
+
|
|
||||||
+# Don't let a different umask perturb the results.
|
|
||||||
+umask 22
|
|
||||||
+
|
|
||||||
+touch test
|
|
||||||
+setcap cap_net_bind_service=ep test \
|
|
||||||
+ || framework_failure
|
|
||||||
+code='30;41'
|
|
||||||
+LS_COLORS="ca=$code" \
|
|
||||||
+ ls --color=always test > out || fail=1
|
|
||||||
+printf "\033[0m\033[${code}mtest\033[0m\n\033[m" > out_ok || fail=1
|
|
||||||
+compare out out_ok || fail=1
|
|
||||||
+
|
|
||||||
+(exit $fail); exit $fail
|
|
||||||
--
|
|
||||||
1.5.4.1
|
|
||||||
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
diff -urNp coreutils-6.12-orig/src/seq.c coreutils-6.12/src/seq.c
|
|
||||||
--- coreutils-6.12-orig/src/seq.c 2008-05-26 08:40:32.000000000 +0200
|
|
||||||
+++ coreutils-6.12/src/seq.c 2008-09-29 22:09:21.000000000 +0200
|
|
||||||
@@ -304,7 +304,10 @@ print_numbers (char const *fmt, struct l
|
|
||||||
bool print_extra_number = false;
|
|
||||||
long double x_val;
|
|
||||||
char *x_str;
|
|
||||||
- int x_strlen = asprintf (&x_str, fmt, x);
|
|
||||||
+ int x_strlen;
|
|
||||||
+ setlocale (LC_NUMERIC, "C");
|
|
||||||
+ x_strlen = asprintf (&x_str, fmt, x);
|
|
||||||
+ setlocale (LC_NUMERIC, "");
|
|
||||||
if (x_strlen < 0)
|
|
||||||
xalloc_die ();
|
|
||||||
x_str[x_strlen - layout.suffix_len] = '\0';
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1.4.6 (GNU/Linux)
|
|
||||||
|
|
||||||
iD8DBQBFeKRc/dLerNMzy6ERAiEJAJ435eWCOpfJkoCKoSpnh8Fwwb9XugCgnQ5H
|
|
||||||
SYg6l7M/jyvUdsFM1yS4RKk=
|
|
||||||
=GOOc
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1.4.6 (GNU/Linux)
|
|
||||||
|
|
||||||
iD8DBQBGAvc3/dLerNMzy6ERAnyfAKC4MPj62hCSRYNu0ysD9SahdQvZIACgsNl/
|
|
||||||
CzQjwTNo5FUiiNm0FxtL5Ow=
|
|
||||||
=gl3O
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
26
coreutils-8.26-selinuxenable.patch
Normal file
26
coreutils-8.26-selinuxenable.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
From 6880c3dc9098b3337612850d1500b474aeb944ca Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Tue, 29 Aug 2017 17:33:51 +0200
|
||||||
|
Subject: [PATCH] require_selinux_(): use selinuxenabled(8) if available
|
||||||
|
|
||||||
|
---
|
||||||
|
init.cfg | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/init.cfg b/init.cfg
|
||||||
|
index af6b581..f887b3a 100644
|
||||||
|
--- a/init.cfg
|
||||||
|
+++ b/init.cfg
|
||||||
|
@@ -114,6 +114,9 @@ require_selinux_()
|
||||||
|
grep 'selinuxfs$' /proc/filesystems > /dev/null \
|
||||||
|
|| skip_ "this system lacks SELinux support"
|
||||||
|
|
||||||
|
+ # use the 'selinuxenabled' utility if available
|
||||||
|
+ selinuxenabled; [ $? = 1 ] && skip_ "SELinux is disabled"
|
||||||
|
+
|
||||||
|
# Independent of whether SELinux is enabled system-wide,
|
||||||
|
# the current file system may lack SELinux support.
|
||||||
|
# Also the current build may have SELinux support disabled.
|
||||||
|
--
|
||||||
|
2.9.5
|
||||||
|
|
||||||
29
coreutils-8.26-test-lock.patch
Normal file
29
coreutils-8.26-test-lock.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
From 0d04ee8ddedb2bf33d64f148f246a3b7ec4fef21 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Mon, 23 Jan 2017 12:35:41 +0100
|
||||||
|
Subject: [PATCH] test-lock: disable the rwlock test
|
||||||
|
|
||||||
|
It hangs indefinitely if the system rwlock implementation does not
|
||||||
|
prevent writer starvation (and glibc does not implement it).
|
||||||
|
|
||||||
|
Bug: http://www.mail-archive.com/bug-gnulib@gnu.org/msg33017.html
|
||||||
|
---
|
||||||
|
gnulib-tests/test-lock.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/gnulib-tests/test-lock.c b/gnulib-tests/test-lock.c
|
||||||
|
index aa6de27..5af0a6c 100644
|
||||||
|
--- a/gnulib-tests/test-lock.c
|
||||||
|
+++ b/gnulib-tests/test-lock.c
|
||||||
|
@@ -42,7 +42,7 @@
|
||||||
|
Uncomment some of these, to verify that all tests crash if no locking
|
||||||
|
is enabled. */
|
||||||
|
#define DO_TEST_LOCK 1
|
||||||
|
-#define DO_TEST_RWLOCK 1
|
||||||
|
+#define DO_TEST_RWLOCK 0
|
||||||
|
#define DO_TEST_RECURSIVE_LOCK 1
|
||||||
|
#define DO_TEST_ONCE 1
|
||||||
|
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
100
coreutils-8.32-DIR_COLORS.patch
Normal file
100
coreutils-8.32-DIR_COLORS.patch
Normal file
|
|
@ -0,0 +1,100 @@
|
||||||
|
From bca11e30e8a6281a8cbddc9fb196dd86ab09c955 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Fri, 17 Jun 2016 16:58:18 +0200
|
||||||
|
Subject: [PATCH] downstream changes to default DIR_COLORS
|
||||||
|
|
||||||
|
---
|
||||||
|
DIR_COLORS | 9 ++++++++-
|
||||||
|
DIR_COLORS.lightbgcolor | 21 +++++++++++++++------
|
||||||
|
2 files changed, 23 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/DIR_COLORS b/DIR_COLORS
|
||||||
|
index 540f6cd..b4785b6 100644
|
||||||
|
--- a/DIR_COLORS
|
||||||
|
+++ b/DIR_COLORS
|
||||||
|
@@ -1,3 +1,7 @@
|
||||||
|
+# This file goes in the /etc directory, and must be world readable.
|
||||||
|
+# You can override the system defaults by making a copy of this file
|
||||||
|
+# as ~/.dir_colors
|
||||||
|
+
|
||||||
|
# Configuration file for dircolors, a utility to help you set the
|
||||||
|
# LS_COLORS environment variable used by GNU ls with the --color option.
|
||||||
|
|
||||||
|
@@ -11,6 +15,9 @@
|
||||||
|
|
||||||
|
# Global config options can be specified before TERM or COLORTERM entries
|
||||||
|
|
||||||
|
+# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
|
||||||
|
+# disable colorization. See https://bugzilla.redhat.com/1349579 for details.
|
||||||
|
+
|
||||||
|
# ===================================================================
|
||||||
|
# Terminal filters
|
||||||
|
# ===================================================================
|
||||||
|
@@ -70,7 +77,7 @@ DOOR 01;35 # door
|
||||||
|
BLK 40;33;01 # block device driver
|
||||||
|
CHR 40;33;01 # character device driver
|
||||||
|
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
|
||||||
|
-MISSING 00 # ... and the files they point to
|
||||||
|
+MISSING 01;37;41 # ... and the files they point to
|
||||||
|
SETUID 37;41 # regular file that is setuid (u+s)
|
||||||
|
SETGID 30;43 # regular file that is setgid (g+s)
|
||||||
|
CAPABILITY 00 # regular file with capability (very expensive to lookup)
|
||||||
|
diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor
|
||||||
|
index e3b0ec3..39a0a4c 100644
|
||||||
|
--- a/DIR_COLORS.lightbgcolor
|
||||||
|
+++ b/DIR_COLORS.lightbgcolor
|
||||||
|
@@ -1,3 +1,9 @@
|
||||||
|
+# Configuration file for the color ls utility - modified for lighter backgrounds
|
||||||
|
+
|
||||||
|
+# This file goes in the /etc directory, and must be world readable.
|
||||||
|
+# You can override the system defaults by making a copy of this file
|
||||||
|
+# as ~/.dir_colors
|
||||||
|
+
|
||||||
|
# Configuration file for dircolors, a utility to help you set the
|
||||||
|
# LS_COLORS environment variable used by GNU ls with the --color option.
|
||||||
|
|
||||||
|
@@ -11,6 +17,9 @@
|
||||||
|
|
||||||
|
# Global config options can be specified before TERM or COLORTERM entries
|
||||||
|
|
||||||
|
+# For compatibility, the pattern "^COLOR.*none" is recognized as a way to
|
||||||
|
+# disable colorization. See https://bugzilla.redhat.com/1349579 for details.
|
||||||
|
+
|
||||||
|
# ===================================================================
|
||||||
|
# Terminal filters
|
||||||
|
# ===================================================================
|
||||||
|
@@ -60,17 +69,17 @@ TERM xterm*
|
||||||
|
#NORMAL 00 # no color code at all
|
||||||
|
#FILE 00 # regular file: use no color at all
|
||||||
|
RESET 0 # reset to "normal" color
|
||||||
|
-DIR 01;34 # directory
|
||||||
|
-LINK 01;36 # symbolic link. (If you set this to 'target' instead of a
|
||||||
|
+DIR 00;34 # directory
|
||||||
|
+LINK 00;36 # symbolic link. (If you set this to 'target' instead of a
|
||||||
|
# numerical value, the color is as for the file pointed to.)
|
||||||
|
MULTIHARDLINK 00 # regular file with more than one link
|
||||||
|
FIFO 40;33 # pipe
|
||||||
|
-SOCK 01;35 # socket
|
||||||
|
-DOOR 01;35 # door
|
||||||
|
+SOCK 00;35 # socket
|
||||||
|
+DOOR 00;35 # door
|
||||||
|
BLK 40;33;01 # block device driver
|
||||||
|
CHR 40;33;01 # character device driver
|
||||||
|
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
|
||||||
|
-MISSING 00 # ... and the files they point to
|
||||||
|
+MISSING 01;37;41 # ... and the files they point to
|
||||||
|
SETUID 37;41 # regular file that is setuid (u+s)
|
||||||
|
SETGID 30;43 # regular file that is setgid (g+s)
|
||||||
|
CAPABILITY 00 # regular file with capability (very expensive to lookup)
|
||||||
|
@@ -79,7 +88,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
|
||||||
|
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
|
||||||
|
|
||||||
|
# This is for regular files with execute permission:
|
||||||
|
-EXEC 01;32
|
||||||
|
+EXEC 00;32
|
||||||
|
|
||||||
|
# ===================================================================
|
||||||
|
# File extension attributes
|
||||||
|
--
|
||||||
|
2.49.0
|
||||||
|
|
||||||
28
coreutils-9.9-fix-cut-test-aarch64.patch
Normal file
28
coreutils-9.9-fix-cut-test-aarch64.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
From 95044cb5eaea83d02f768feb5ab79fcf5e6ad782 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||||
|
Date: Mon, 22 Dec 2025 17:12:48 +0000
|
||||||
|
Subject: [PATCH] tests: avoid false failure due to ulimit on aarch64
|
||||||
|
|
||||||
|
* tests/cut/cut-huge-range.sh: Add an extra 1MiB headroom,
|
||||||
|
which was seen with aarch64.
|
||||||
|
Reported at https://bugzilla.redhat.com/2424302
|
||||||
|
|
||||||
|
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||||
|
Upstream-commit: 95044cb5eaea83d02f768feb5ab79fcf5e6ad782
|
||||||
|
---
|
||||||
|
tests/cut/cut-huge-range.sh | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/tests/cut/cut-huge-range.sh b/tests/cut/cut-huge-range.sh
|
||||||
|
index 4bd1b129d8..98d7e8f0b9 100755
|
||||||
|
--- a/tests/cut/cut-huge-range.sh
|
||||||
|
+++ b/tests/cut/cut-huge-range.sh
|
||||||
|
@@ -22,6 +22,7 @@ getlimits_
|
||||||
|
|
||||||
|
vm=$(get_min_ulimit_v_ returns_ 0 cut -b1 /dev/null) \
|
||||||
|
|| skip_ 'shell lacks ulimit, or ASAN enabled'
|
||||||
|
+vm=$(($vm+1000)) # https://bugzilla.redhat.com/2424302
|
||||||
|
|
||||||
|
# Ensure we can cut up to our sentinel value.
|
||||||
|
# Don't use expr to subtract one,
|
||||||
|
|
||||||
169
coreutils-9.9-gnulib-c23.patch
Normal file
169
coreutils-9.9-gnulib-c23.patch
Normal file
|
|
@ -0,0 +1,169 @@
|
||||||
|
From 891761bca1aa78336e5b18c121075b6e4696c5d4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
Date: Sun, 23 Nov 2025 00:50:40 -0800
|
||||||
|
Subject: [PATCH] Port to C23 qualifier-generic fns like strchr
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
This ports Gnulib to strict C23 platforms that reject code
|
||||||
|
like ‘char *q = strchr (P, 'x');’ when P is a pointer to const,
|
||||||
|
because in C23 strchr is a qualifier-generic function so
|
||||||
|
strchr (P, 'x') returns char const *.
|
||||||
|
This patch does not attempt to do the following two things,
|
||||||
|
which might be useful in the future:
|
||||||
|
1. When compiling on non-C23 platforms, check user code for
|
||||||
|
portability to platforms that define qualifier-generic functions.
|
||||||
|
2. Port Gnulib to platforms that have qualifier-generic functions
|
||||||
|
not listed in the C23 standard, e.g., strchrnul. I don’t know
|
||||||
|
of any such platforms.
|
||||||
|
* lib/mbschr.c (mbschr):
|
||||||
|
* lib/memchr2.c (memchr2):
|
||||||
|
Port to C23, where functions like strchr are qualifier-generic.
|
||||||
|
* lib/c++defs.h (_GL_FUNCDECL_SYS_NAME): New macro.
|
||||||
|
* lib/c++defs.h (_GL_FUNCDECL_SYS):
|
||||||
|
* lib/stdlib.in.h (bsearch):
|
||||||
|
Use it, to prevent C23 names like strchr from acting like macros.
|
||||||
|
* lib/string.in.h (memchr, strchr, strpbrk, strrchr):
|
||||||
|
Do not #undef when GNULIB_POSIXCHECK is defined, as this could
|
||||||
|
cause conforming C23 code to fail to conform. It’s not clear why
|
||||||
|
_GL_WARN_ON_USE_CXX; perhaps it was needed but isn’t any more?
|
||||||
|
But for now, limit the removal of #undef to these four functions
|
||||||
|
where #undeffing is clearly undesirable in C23.
|
||||||
|
* lib/wchar.in.h (wmemchr): Parenthesize function name in decl,
|
||||||
|
to prevent it from acting like a macro.
|
||||||
|
|
||||||
|
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||||
|
Upstream-commit: df17f4f37ed3ca373d23ad42eae51122bdb96626
|
||||||
|
---
|
||||||
|
lib/c++defs.h | 12 +++++++++++-
|
||||||
|
lib/mbschr.c | 2 +-
|
||||||
|
lib/memchr2.c | 2 +-
|
||||||
|
lib/stdlib.in.h | 6 +++---
|
||||||
|
lib/string.in.h | 4 ----
|
||||||
|
lib/wchar.in.h | 2 +-
|
||||||
|
6 files changed, 17 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/c++defs.h b/lib/c++defs.h
|
||||||
|
index b77979a..7384457 100644
|
||||||
|
--- a/lib/c++defs.h
|
||||||
|
+++ b/lib/c++defs.h
|
||||||
|
@@ -127,6 +127,16 @@
|
||||||
|
#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
|
||||||
|
_GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
|
||||||
|
|
||||||
|
+/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
|
||||||
|
+ parenthsized func otherwise. Parenthesization is needed in C23 if
|
||||||
|
+ the function is like strchr and so is a qualifier-generic macro
|
||||||
|
+ that expands to something more complicated. */
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
+# define _GL_FUNCDECL_SYS_NAME(func) func
|
||||||
|
+#else
|
||||||
|
+# define _GL_FUNCDECL_SYS_NAME(func) (func)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
|
||||||
|
declares the system function, named func, with the given prototype,
|
||||||
|
consisting of return type, parameters, and attributes.
|
||||||
|
@@ -139,7 +149,7 @@
|
||||||
|
_GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
|
||||||
|
*/
|
||||||
|
#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
|
||||||
|
- _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
|
||||||
|
+ _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
|
||||||
|
|
||||||
|
/* _GL_CXXALIAS_RPL (func, rettype, parameters);
|
||||||
|
declares a C++ alias called GNULIB_NAMESPACE::func
|
||||||
|
diff --git a/lib/mbschr.c b/lib/mbschr.c
|
||||||
|
index c9e14b5..6582134 100644
|
||||||
|
--- a/lib/mbschr.c
|
||||||
|
+++ b/lib/mbschr.c
|
||||||
|
@@ -65,5 +65,5 @@ mbschr (const char *string, int c)
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- return strchr (string, c);
|
||||||
|
+ return (char *) strchr (string, c);
|
||||||
|
}
|
||||||
|
diff --git a/lib/memchr2.c b/lib/memchr2.c
|
||||||
|
index 7493823..d7724ae 100644
|
||||||
|
--- a/lib/memchr2.c
|
||||||
|
+++ b/lib/memchr2.c
|
||||||
|
@@ -55,7 +55,7 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
|
||||||
|
c2 = (unsigned char) c2_in;
|
||||||
|
|
||||||
|
if (c1 == c2)
|
||||||
|
- return memchr (s, c1, n);
|
||||||
|
+ return (void *) memchr (s, c1, n);
|
||||||
|
|
||||||
|
/* Handle the first few bytes by reading one byte at a time.
|
||||||
|
Do this until VOID_PTR is aligned on a longword boundary. */
|
||||||
|
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
|
||||||
|
index bef0aaa..fd0e1e0 100644
|
||||||
|
--- a/lib/stdlib.in.h
|
||||||
|
+++ b/lib/stdlib.in.h
|
||||||
|
@@ -224,9 +224,9 @@ _GL_INLINE_HEADER_BEGIN
|
||||||
|
|
||||||
|
/* Declarations for ISO C N3322. */
|
||||||
|
#if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
|
||||||
|
-_GL_EXTERN_C void *bsearch (const void *__key,
|
||||||
|
- const void *__base, size_t __nmemb, size_t __size,
|
||||||
|
- int (*__compare) (const void *, const void *))
|
||||||
|
+_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
|
||||||
|
+ (const void *__key, const void *__base, size_t __nmemb, size_t __size,
|
||||||
|
+ int (*__compare) (const void *, const void *))
|
||||||
|
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
|
||||||
|
_GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
|
||||||
|
int (*__compare) (const void *, const void *))
|
||||||
|
diff --git a/lib/string.in.h b/lib/string.in.h
|
||||||
|
index fdcdd21..8b56acf 100644
|
||||||
|
--- a/lib/string.in.h
|
||||||
|
+++ b/lib/string.in.h
|
||||||
|
@@ -409,7 +409,6 @@ _GL_CXXALIASWARN1 (memchr, void const *,
|
||||||
|
_GL_CXXALIASWARN (memchr);
|
||||||
|
# endif
|
||||||
|
#elif defined GNULIB_POSIXCHECK
|
||||||
|
-# undef memchr
|
||||||
|
/* Assume memchr is always declared. */
|
||||||
|
_GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
|
||||||
|
"use gnulib module memchr for portability" );
|
||||||
|
@@ -674,7 +673,6 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - "
|
||||||
|
#if defined GNULIB_POSIXCHECK
|
||||||
|
/* strchr() does not work with multibyte strings if the locale encoding is
|
||||||
|
GB18030 and the character to be searched is a digit. */
|
||||||
|
-# undef strchr
|
||||||
|
/* Assume strchr is always declared. */
|
||||||
|
_GL_WARN_ON_USE_CXX (strchr,
|
||||||
|
const char *, char *, (const char *, int),
|
||||||
|
@@ -981,7 +979,6 @@ _GL_CXXALIASWARN (strpbrk);
|
||||||
|
Even in this simple case, it does not work with multibyte strings if the
|
||||||
|
locale encoding is GB18030 and one of the characters to be searched is a
|
||||||
|
digit. */
|
||||||
|
-# undef strpbrk
|
||||||
|
_GL_WARN_ON_USE_CXX (strpbrk,
|
||||||
|
const char *, char *, (const char *, const char *),
|
||||||
|
"strpbrk cannot work correctly on character strings "
|
||||||
|
@@ -1011,7 +1008,6 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings "
|
||||||
|
#if defined GNULIB_POSIXCHECK
|
||||||
|
/* strrchr() does not work with multibyte strings if the locale encoding is
|
||||||
|
GB18030 and the character to be searched is a digit. */
|
||||||
|
-# undef strrchr
|
||||||
|
/* Assume strrchr is always declared. */
|
||||||
|
_GL_WARN_ON_USE_CXX (strrchr,
|
||||||
|
const char *, char *, (const char *, int),
|
||||||
|
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
|
||||||
|
index ab602a2..6be4515 100644
|
||||||
|
--- a/lib/wchar.in.h
|
||||||
|
+++ b/lib/wchar.in.h
|
||||||
|
@@ -301,7 +301,7 @@ _GL_EXTERN_C int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
|
||||||
|
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
|
||||||
|
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
|
||||||
|
# ifndef __cplusplus
|
||||||
|
-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
|
||||||
|
+_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
|
||||||
|
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
|
||||||
|
# endif
|
||||||
|
_GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
|
||||||
|
--
|
||||||
|
2.52.0
|
||||||
|
|
||||||
|
|
@ -1,183 +0,0 @@
|
||||||
# Configuration file for the color ls utility
|
|
||||||
# This file goes in the /etc directory, and must be world readable.
|
|
||||||
# You can copy this file to .dir_colors in your $HOME directory to override
|
|
||||||
# the system defaults.
|
|
||||||
|
|
||||||
# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
|
|
||||||
# pipes. 'all' adds color characters to all output. 'none' shuts colorization
|
|
||||||
# off.
|
|
||||||
COLOR tty
|
|
||||||
|
|
||||||
# Extra command line options for ls go here.
|
|
||||||
# Basically these ones are:
|
|
||||||
# -F = show '/' for dirs, '*' for executables, etc.
|
|
||||||
# -T 0 = don't trust tab spacing when formatting ls output.
|
|
||||||
OPTIONS -F -T 0
|
|
||||||
|
|
||||||
# Below, there should be one TERM entry for each termtype that is colorizable
|
|
||||||
TERM Eterm
|
|
||||||
TERM ansi
|
|
||||||
TERM color-xterm
|
|
||||||
TERM con132x25
|
|
||||||
TERM con132x30
|
|
||||||
TERM con132x43
|
|
||||||
TERM con132x60
|
|
||||||
TERM con80x25
|
|
||||||
TERM con80x28
|
|
||||||
TERM con80x30
|
|
||||||
TERM con80x43
|
|
||||||
TERM con80x50
|
|
||||||
TERM con80x60
|
|
||||||
TERM cons25
|
|
||||||
TERM console
|
|
||||||
TERM cygwin
|
|
||||||
TERM dtterm
|
|
||||||
TERM eterm-color
|
|
||||||
TERM gnome
|
|
||||||
TERM konsole
|
|
||||||
TERM kterm
|
|
||||||
TERM linux
|
|
||||||
TERM linux-c
|
|
||||||
TERM mach-color
|
|
||||||
TERM mlterm
|
|
||||||
TERM putty
|
|
||||||
TERM rxvt
|
|
||||||
TERM rxvt-cygwin
|
|
||||||
TERM rxvt-cygwin-native
|
|
||||||
TERM rxvt-unicode
|
|
||||||
TERM screen
|
|
||||||
TERM screen-256color
|
|
||||||
TERM screen-bce
|
|
||||||
TERM screen-w
|
|
||||||
TERM screen.linux
|
|
||||||
TERM vt100
|
|
||||||
TERM xterm
|
|
||||||
TERM xterm-16color
|
|
||||||
TERM xterm-256color
|
|
||||||
TERM xterm-88color
|
|
||||||
TERM xterm-color
|
|
||||||
TERM xterm-debian
|
|
||||||
|
|
||||||
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
|
|
||||||
EIGHTBIT 1
|
|
||||||
|
|
||||||
# Below are the color init strings for the basic file types. A color init
|
|
||||||
# string consists of one or more of the following numeric codes:
|
|
||||||
# Attribute codes:
|
|
||||||
# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
|
|
||||||
# Text color codes:
|
|
||||||
# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
|
|
||||||
# Background color codes:
|
|
||||||
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
|
|
||||||
NORMAL 00 # global default, although everything should be something.
|
|
||||||
FILE 00 # normal file
|
|
||||||
DIR 01;34 # directory
|
|
||||||
LINK 01;36 # symbolic link (If you set this to 'target' instead of a
|
|
||||||
# numerical value, the color is as for the file pointed to.)
|
|
||||||
FIFO 40;33 # pipe
|
|
||||||
SOCK 01;35 # socket
|
|
||||||
DOOR 01;35 # door
|
|
||||||
BLK 40;33;01 # block device driver
|
|
||||||
CHR 40;33;01 # character device driver
|
|
||||||
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file
|
|
||||||
MISSING 01;05;37;41 # ... and the files they point to
|
|
||||||
SETUID 37;41 # file that is setuid (u+s)
|
|
||||||
SETGID 30;43 # file that is setgid (g+s)
|
|
||||||
STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
|
|
||||||
OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
|
|
||||||
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
|
|
||||||
|
|
||||||
|
|
||||||
# This is for files with execute permission:
|
|
||||||
EXEC 01;32
|
|
||||||
|
|
||||||
# List any file extensions like '.gz' or '.tar' that you would like ls
|
|
||||||
# to colorize below. Put the extension, a space, and the color init string.
|
|
||||||
# (and any comments you want to add after a '#')
|
|
||||||
# executables (bright green)
|
|
||||||
.cmd 01;32
|
|
||||||
.exe 01;32
|
|
||||||
.com 01;32
|
|
||||||
.btm 01;32
|
|
||||||
.bat 01;32
|
|
||||||
.sh 01;32
|
|
||||||
.csh 01;32
|
|
||||||
# archives or compressed (bright red)
|
|
||||||
.tar 01;31
|
|
||||||
.tgz 01;31
|
|
||||||
.svgz 01;31
|
|
||||||
.arj 01;31
|
|
||||||
.taz 01;31
|
|
||||||
.lzh 01;31
|
|
||||||
.lzma 01;31
|
|
||||||
.zip 01;31
|
|
||||||
.z 01;31
|
|
||||||
.Z 01;31
|
|
||||||
.dz 01;31
|
|
||||||
.gz 01;31
|
|
||||||
.bz2 01;31
|
|
||||||
.tbz2 01;31
|
|
||||||
.bz 01;31
|
|
||||||
.tz 01;31
|
|
||||||
.deb 01;31
|
|
||||||
.rpm 01;31
|
|
||||||
.jar 01;31
|
|
||||||
.rar 01;31
|
|
||||||
.ace 01;31
|
|
||||||
.zoo 01;31
|
|
||||||
.cpio 01;31
|
|
||||||
.7z 01;31
|
|
||||||
.rz 01;31
|
|
||||||
# image formats (magenta)
|
|
||||||
.jpg 01;35
|
|
||||||
.jpeg 01;35
|
|
||||||
.gif 01;35
|
|
||||||
.bmp 01;35
|
|
||||||
.pbm 01;35
|
|
||||||
.pgm 01;35
|
|
||||||
.ppm 01;35
|
|
||||||
.tga 01;35
|
|
||||||
.xbm 01;35
|
|
||||||
.xpm 01;35
|
|
||||||
.tif 01;35
|
|
||||||
.tiff 01;35
|
|
||||||
.png 01;35
|
|
||||||
.mng 01;35
|
|
||||||
.pcx 01;35
|
|
||||||
.mov 01;35
|
|
||||||
.mpg 01;35
|
|
||||||
.mpeg 01;35
|
|
||||||
.m2v 01;35
|
|
||||||
.mkv 01;35
|
|
||||||
.ogm 01;35
|
|
||||||
.mp4 01;35
|
|
||||||
.m4v 01;35
|
|
||||||
.mp4v 01;35
|
|
||||||
.vob 01;35
|
|
||||||
.qt 01;35
|
|
||||||
.nuv 01;35
|
|
||||||
.wmv 01;35
|
|
||||||
.asf 01;35
|
|
||||||
.rm 01;35
|
|
||||||
.rmvb 01;35
|
|
||||||
.flc 01;35
|
|
||||||
.avi 01;35
|
|
||||||
.fli 01;35
|
|
||||||
.gl 01;35
|
|
||||||
.dl 01;35
|
|
||||||
.xcf 01;35
|
|
||||||
.xwd 01;35
|
|
||||||
.yuv 01;35
|
|
||||||
.svg 01;35
|
|
||||||
# audio formats (cyan)
|
|
||||||
.aac 00;36
|
|
||||||
.au 00;36
|
|
||||||
.flac 00;36
|
|
||||||
.mid 00;36
|
|
||||||
.midi 00;36
|
|
||||||
.mka 00;36
|
|
||||||
.mp3 00;36
|
|
||||||
.mpc 00;36
|
|
||||||
.ogg 00;36
|
|
||||||
.ra 00;36
|
|
||||||
.wav 00;36
|
|
||||||
|
|
@ -1,161 +0,0 @@
|
||||||
# Configuration file for the 256color ls utility
|
|
||||||
# This file goes in the /etc directory, and must be world readable.
|
|
||||||
# You can copy this file to .dir_colors in your $HOME directory to override
|
|
||||||
# the system defaults.
|
|
||||||
# In the case that you are not satisfied with supplied colors, please
|
|
||||||
# submit your color configuration or attach your file with colors readable
|
|
||||||
# on ALL color background schemas (white,gray,black) to RedHat Bugzilla
|
|
||||||
# ticket on https://bugzilla.redhat.com/show_bug.cgi?id=429121 . TIA.
|
|
||||||
# Please just keep ls color conventions from 8 color scheme.
|
|
||||||
|
|
||||||
# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
|
|
||||||
# pipes. 'all' adds color characters to all output. 'none' shuts colorization
|
|
||||||
# off.
|
|
||||||
COLOR tty
|
|
||||||
|
|
||||||
# Extra command line options for ls go here.
|
|
||||||
# Basically these ones are:
|
|
||||||
# -F = show '/' for dirs, '*' for executables, etc.
|
|
||||||
# -T 0 = don't trust tab spacing when formatting ls output.
|
|
||||||
OPTIONS -F -T 0
|
|
||||||
|
|
||||||
# Below, there should be one TERM entry for each termtype that is colorizable
|
|
||||||
TERM putty-256color
|
|
||||||
TERM rxvt-256color
|
|
||||||
TERM screen-256color
|
|
||||||
TERM xterm-256color
|
|
||||||
TERM gnome-256color
|
|
||||||
|
|
||||||
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
|
|
||||||
EIGHTBIT 1
|
|
||||||
|
|
||||||
# Below are the color init strings for the basic file types. A color init
|
|
||||||
# string consists of one or more of the following numeric codes:
|
|
||||||
# Attribute codes:
|
|
||||||
# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
|
|
||||||
# Text color(8 colors mode) codes:
|
|
||||||
# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
|
|
||||||
# Background color(8 colors mode) codes:
|
|
||||||
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
|
|
||||||
# Text color(256 colors mode) codes:
|
|
||||||
# Valid syntax for text 256color is 38;5;<color number> , where color number
|
|
||||||
# is number between 0 and 255.
|
|
||||||
# You may find following command useful to search the best one for you:
|
|
||||||
# for ((x=0; x<=255; x++));do echo -e "${x}:\033[38;5;${x}mcolor\033[000m";done
|
|
||||||
# Background color(256 colors mode) codes:
|
|
||||||
# Valid syntax for background 256color is 48;5;<color number> , where
|
|
||||||
# color number is number between 0 and 255.
|
|
||||||
# You may find following command useful to search the best one for you:
|
|
||||||
# for ((x=0; x<=255; x++));do echo -e "${x}:\033[48;5;${x}mcolor\033[000m";done
|
|
||||||
|
|
||||||
NORMAL 00 # global default, although everything should be something.
|
|
||||||
FILE 00 # normal file
|
|
||||||
DIR 01;38;5;27 # directory
|
|
||||||
LINK 01;38;5;51 # symbolic link (If you set this to 'target' instead of a
|
|
||||||
# numerical value, the color is as for the file pointed to.)
|
|
||||||
FIFO 40;38;5;11 # pipe
|
|
||||||
SOCK 01;38;5;13 # socket
|
|
||||||
DOOR 01;38;5;5 # door
|
|
||||||
BLK 01;48;5;232;38;5;11 # block device driver
|
|
||||||
CHR 01;48;5;232;38;5;3 # character device driver
|
|
||||||
ORPHAN 01;48;5;232;38;5;9 # symlink to nonexistent file, or non-stat'able file
|
|
||||||
MISSING 01;05;48;5;232;38;5;15 # ... and the files they point to
|
|
||||||
SETUID 48;5;196;38;5;15 # file that is setuid (u+s)
|
|
||||||
SETGID 48;5;11;38;5;16 # file that is setgid (g+s)
|
|
||||||
STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable (+t,o+w)
|
|
||||||
OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky
|
|
||||||
STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable
|
|
||||||
|
|
||||||
# This is for files with execute permission:
|
|
||||||
EXEC 01;38;5;34
|
|
||||||
|
|
||||||
# List any file extensions like '.gz' or '.tar' that you would like ls
|
|
||||||
# to colorize below. Put the extension, a space, and the color init string.
|
|
||||||
# (and any comments you want to add after a '#')
|
|
||||||
# executables (bright green)
|
|
||||||
.cmd 01;38;5;34
|
|
||||||
.exe 01;38;5;34
|
|
||||||
.com 01;38;5;34
|
|
||||||
.btm 01;38;5;34
|
|
||||||
.bat 01;38;5;34
|
|
||||||
.sh 01;38;5;34
|
|
||||||
.csh 01;38;5;34
|
|
||||||
# archives or compressed (bright red)
|
|
||||||
.tar 01;38;5;9
|
|
||||||
.tgz 01;38;5;9
|
|
||||||
.svgz 01;38;5;9
|
|
||||||
.arj 01;38;5;9
|
|
||||||
.taz 01;38;5;9
|
|
||||||
.lzh 01;38;5;9
|
|
||||||
.lzma 01;38;5;9
|
|
||||||
.zip 01;38;5;9
|
|
||||||
.z 01;38;5;9
|
|
||||||
.Z 01;38;5;9
|
|
||||||
.dz 01;38;5;9
|
|
||||||
.gz 01;38;5;9
|
|
||||||
.bz2 01;38;5;9
|
|
||||||
.tbz2 01;38;5;9
|
|
||||||
.bz 01;38;5;9
|
|
||||||
.tz 01;38;5;9
|
|
||||||
.deb 01;38;5;9
|
|
||||||
.rpm 01;38;5;9
|
|
||||||
.jar 01;38;5;9
|
|
||||||
.rar 01;38;5;9
|
|
||||||
.ace 01;38;5;9
|
|
||||||
.zoo 01;38;5;9
|
|
||||||
.cpio 01;38;5;9
|
|
||||||
.7z 01;38;5;9
|
|
||||||
.rz 01;38;5;9
|
|
||||||
# image formats (magenta)
|
|
||||||
.jpg 01;38;5;13
|
|
||||||
.jpeg 01;38;5;13
|
|
||||||
.gif 01;38;5;13
|
|
||||||
.bmp 01;38;5;13
|
|
||||||
.pbm 01;38;5;13
|
|
||||||
.pgm 01;38;5;13
|
|
||||||
.ppm 01;38;5;13
|
|
||||||
.tga 01;38;5;13
|
|
||||||
.xbm 01;38;5;13
|
|
||||||
.xpm 01;38;5;13
|
|
||||||
.tif 01;38;5;13
|
|
||||||
.tiff 01;38;5;13
|
|
||||||
.png 01;38;5;13
|
|
||||||
.mng 01;38;5;13
|
|
||||||
.pcx 01;38;5;13
|
|
||||||
.mov 01;38;5;13
|
|
||||||
.mpg 01;38;5;13
|
|
||||||
.mpeg 01;38;5;13
|
|
||||||
.m2v 01;38;5;13
|
|
||||||
.mkv 01;38;5;13
|
|
||||||
.ogm 01;38;5;13
|
|
||||||
.mp4 01;38;5;13
|
|
||||||
.m4v 01;38;5;13
|
|
||||||
.mp4v 01;38;5;13
|
|
||||||
.vob 01;38;5;13
|
|
||||||
.qt 01;38;5;13
|
|
||||||
.nuv 01;38;5;13
|
|
||||||
.wmv 01;38;5;13
|
|
||||||
.asf 01;38;5;13
|
|
||||||
.rm 01;38;5;13
|
|
||||||
.rmvb 01;38;5;13
|
|
||||||
.flc 01;38;5;13
|
|
||||||
.avi 01;38;5;13
|
|
||||||
.fli 01;38;5;13
|
|
||||||
.gl 01;38;5;13
|
|
||||||
.dl 01;38;5;13
|
|
||||||
.xcf 01;38;5;13
|
|
||||||
.xwd 01;38;5;13
|
|
||||||
.yuv 01;38;5;13
|
|
||||||
.svg 01;38;5;13
|
|
||||||
# audio formats (cyan)
|
|
||||||
.aac 00;38;5;45
|
|
||||||
.au 00;38;5;45
|
|
||||||
.flac 00;38;5;45
|
|
||||||
.mid 00;38;5;45
|
|
||||||
.midi 00;38;5;45
|
|
||||||
.mka 00;38;5;45
|
|
||||||
.mp3 00;38;5;45
|
|
||||||
.mpc 00;38;5;45
|
|
||||||
.ogg 00;38;5;45
|
|
||||||
.ra 00;38;5;45
|
|
||||||
.wav 00;38;5;45
|
|
||||||
|
|
@ -1,164 +0,0 @@
|
||||||
# Configuration file for the color ls utility
|
|
||||||
# This file goes in the /etc directory, and must be world readable.
|
|
||||||
# You can copy this file to .dir_colors in your $HOME directory to override
|
|
||||||
# the system defaults.
|
|
||||||
|
|
||||||
# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
|
|
||||||
# pipes. 'all' adds color characters to all output. 'none' shuts colorization
|
|
||||||
# off.
|
|
||||||
COLOR tty
|
|
||||||
|
|
||||||
# Extra command line options for ls go here.
|
|
||||||
# Basically these ones are:
|
|
||||||
# -F = show '/' for dirs, '*' for executables, etc.
|
|
||||||
# -T 0 = don't trust tab spacing when formatting ls output.
|
|
||||||
OPTIONS -F -T 0
|
|
||||||
|
|
||||||
# Below, there should be one TERM entry for each termtype that is colorizable
|
|
||||||
TERM linux
|
|
||||||
TERM console
|
|
||||||
TERM con132x25
|
|
||||||
TERM con132x30
|
|
||||||
TERM con132x43
|
|
||||||
TERM con132x60
|
|
||||||
TERM con80x25
|
|
||||||
TERM con80x28
|
|
||||||
TERM con80x30
|
|
||||||
TERM con80x43
|
|
||||||
TERM con80x50
|
|
||||||
TERM con80x60
|
|
||||||
TERM cons25
|
|
||||||
TERM xterm
|
|
||||||
TERM xterm-16color
|
|
||||||
TERM xterm-88color
|
|
||||||
TERM xterm-256color
|
|
||||||
TERM rxvt
|
|
||||||
TERM rxvt-unicode
|
|
||||||
TERM xterm-color
|
|
||||||
TERM color-xterm
|
|
||||||
TERM vt100
|
|
||||||
TERM dtterm
|
|
||||||
TERM color_xterm
|
|
||||||
|
|
||||||
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
|
|
||||||
EIGHTBIT 1
|
|
||||||
|
|
||||||
# Below are the color init strings for the basic file types. A color init
|
|
||||||
# string consists of one or more of the following numeric codes:
|
|
||||||
# Attribute codes:
|
|
||||||
# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
|
|
||||||
# Text color codes:
|
|
||||||
# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
|
|
||||||
# Background color codes:
|
|
||||||
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
|
|
||||||
NORMAL 00 # global default, although everything should be something.
|
|
||||||
FILE 00 # normal file
|
|
||||||
DIR 00;34 # directory
|
|
||||||
LINK 00;36 # symbolic link (If you set this to 'target' instead of a
|
|
||||||
# numerical value, the color is as for the file pointed to.)
|
|
||||||
FIFO 40;33 # pipe
|
|
||||||
SOCK 00;35 # socket
|
|
||||||
DOOR 00;35 # door
|
|
||||||
BLK 40;33;01 # block device driver
|
|
||||||
CHR 40;33;01 # character device driver
|
|
||||||
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file
|
|
||||||
MISSING 01;05;37;41 # ... and the files they point to
|
|
||||||
SETUID 37;41 # file that is setuid (u+s)
|
|
||||||
SETGID 30;43 # file that is setgid (g+s)
|
|
||||||
STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
|
|
||||||
OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
|
|
||||||
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
|
|
||||||
|
|
||||||
|
|
||||||
# This is for files with execute permission:
|
|
||||||
EXEC 00;32
|
|
||||||
|
|
||||||
# List any file extensions like '.gz' or '.tar' that you would like ls
|
|
||||||
# to colorize below. Put the extension, a space, and the color init string.
|
|
||||||
# (and any comments you want to add after a '#')
|
|
||||||
.cmd 00;32 # executables (green)
|
|
||||||
.exe 00;32
|
|
||||||
.com 00;32
|
|
||||||
.btm 00;32
|
|
||||||
.bat 00;32
|
|
||||||
.sh 00;32
|
|
||||||
.csh 00;32
|
|
||||||
# archives or compressed (red)
|
|
||||||
.tar 00;31
|
|
||||||
.tgz 00;31
|
|
||||||
.svgz 00;31
|
|
||||||
.arj 00;31
|
|
||||||
.taz 00;31
|
|
||||||
.lzh 00;31
|
|
||||||
.lzma 00;31
|
|
||||||
.zip 00;31
|
|
||||||
.z 00;31
|
|
||||||
.Z 00;31
|
|
||||||
.dz 00;31
|
|
||||||
.gz 00;31
|
|
||||||
.bz2 00;31
|
|
||||||
.tbz2 00;31
|
|
||||||
.bz 00;31
|
|
||||||
.tz 00;31
|
|
||||||
.deb 00;31
|
|
||||||
.rpm 00;31
|
|
||||||
.jar 00;31
|
|
||||||
.rar 00;31
|
|
||||||
.ace 00;31
|
|
||||||
.zoo 00;31
|
|
||||||
.cpio 00;31
|
|
||||||
.7z 00;31
|
|
||||||
.rz 00;31
|
|
||||||
# image formats (magenta)
|
|
||||||
.jpg 00;35
|
|
||||||
.jpeg 00;35
|
|
||||||
.gif 00;35
|
|
||||||
.bmp 00;35
|
|
||||||
.pbm 00;35
|
|
||||||
.pgm 00;35
|
|
||||||
.ppm 00;35
|
|
||||||
.tga 00;35
|
|
||||||
.xbm 00;35
|
|
||||||
.xpm 00;35
|
|
||||||
.tif 00;35
|
|
||||||
.tiff 00;35
|
|
||||||
.png 00;35
|
|
||||||
.mng 00;35
|
|
||||||
.pcx 00;35
|
|
||||||
.mov 00;35
|
|
||||||
.mpg 00;35
|
|
||||||
.mpeg 00;35
|
|
||||||
.m2v 00;35
|
|
||||||
.mkv 00;35
|
|
||||||
.ogm 00;35
|
|
||||||
.mp4 00;35
|
|
||||||
.m4v 00;35
|
|
||||||
.mp4v 00;35
|
|
||||||
.vob 00;35
|
|
||||||
.qt 00;35
|
|
||||||
.nuv 00;35
|
|
||||||
.wmv 00;35
|
|
||||||
.asf 00;35
|
|
||||||
.rm 00;35
|
|
||||||
.rmvb 00;35
|
|
||||||
.flc 00;35
|
|
||||||
.avi 00;35
|
|
||||||
.fli 00;35
|
|
||||||
.gl 00;35
|
|
||||||
.dl 00;35
|
|
||||||
.xcf 00;35
|
|
||||||
.xwd 00;35
|
|
||||||
.yuv 00;35
|
|
||||||
.svg 00;35
|
|
||||||
# audio formats (cyan)
|
|
||||||
.aac 00;36
|
|
||||||
.au 00;36
|
|
||||||
.flac 00;36
|
|
||||||
.mid 00;36
|
|
||||||
.midi 00;36
|
|
||||||
.mka 00;36
|
|
||||||
.mp3 00;36
|
|
||||||
.mpc 00;36
|
|
||||||
.ogg 00;36
|
|
||||||
.ra 00;36
|
|
||||||
.wav 00;36
|
|
||||||
|
|
@ -1,59 +0,0 @@
|
||||||
Signed-off-by: Ondřej Vašík <ovasik@redhat.com>
|
|
||||||
Signed-off-by: Jim Meyering <meyering@redhat.com>
|
|
||||||
|
|
||||||
* src/echo.c (AUTHORS) : Use bash builtin echo authors instead of FIXME unknown
|
|
||||||
* src/basename.c (AUTHORS): List David as the author.
|
|
||||||
* AUTHORS: Update here, too.
|
|
||||||
---
|
|
||||||
AUTHORS | 4 ++--
|
|
||||||
src/basename.c | 2 +-
|
|
||||||
src/echo.c | 4 +++-
|
|
||||||
3 files changed, 6 insertions(+), 4 deletions(-)
|
|
||||||
diff --git a/src/basename.c b/src/basename.c
|
|
||||||
index 38e8879..69b708f 100644
|
|
||||||
--- a/src/basename.c
|
|
||||||
+++ b/src/basename.c
|
|
||||||
@@ -37,7 +37,7 @@
|
|
||||||
/* The official name of this program (e.g., no `g' prefix). */
|
|
||||||
#define PROGRAM_NAME "basename"
|
|
||||||
|
|
||||||
-#define AUTHORS "FIXME unknown"
|
|
||||||
+#define AUTHORS "David MacKenzie"
|
|
||||||
|
|
||||||
/* The name this program was run with. */
|
|
||||||
char *program_name;
|
|
||||||
diff --git a/AUTHORS b/AUTHORS
|
|
||||||
index 404cf70..666edc1 100644
|
|
||||||
--- a/AUTHORS
|
|
||||||
+++ b/AUTHORS
|
|
||||||
@@ -3,7 +3,7 @@ each followed by the name(s) of its author(s).
|
|
||||||
|
|
||||||
arch: David MacKenzie, Karel Zak
|
|
||||||
base64: Simon Josefsson
|
|
||||||
-basename: FIXME unknown
|
|
||||||
+basename: David MacKenzie
|
|
||||||
cat: Torbjorn Granlund, Richard M. Stallman
|
|
||||||
chcon: Russell Coker, Jim Meyering
|
|
||||||
chgrp: David MacKenzie, Jim Meyering
|
|
||||||
@@ -22,7 +22,7 @@ dir: Richard M. Stallman, David MacKenzie
|
|
||||||
dircolors: H. Peter Anvin
|
|
||||||
dirname: David MacKenzie, Jim Meyering
|
|
||||||
du: Torbjorn Granlund, David MacKenzie, Paul Eggert, Jim Meyering
|
|
||||||
-echo: FIXME unknown
|
|
||||||
+echo: Brian Fox, Chet Ramey
|
|
||||||
env: Richard Mlynarik, David MacKenzie
|
|
||||||
expand: David MacKenzie
|
|
||||||
expr: Mike Parker
|
|
||||||
diff --git a/src/echo.c b/src/echo.c
|
|
||||||
index ebbf5b8..11e648e 100644
|
|
||||||
--- a/src/echo.c
|
|
||||||
+++ b/src/echo.c
|
|
||||||
@@ -24,7 +24,7 @@
|
|
||||||
/* The official name of this program (e.g., no `g' prefix). */
|
|
||||||
#define PROGRAM_NAME "echo"
|
|
||||||
|
|
||||||
-#define AUTHORS "FIXME unknown"
|
|
||||||
+#define AUTHORS "Brian Fox", "Chet Ramey"
|
|
||||||
|
|
||||||
/* echo [-neE] [arg ...]
|
|
||||||
Output the ARGs. If -n is specified, the trailing newline is
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
--- coreutils-5.92/tests/group-names.chgrp 2005-10-28 09:20:12.000000000 +0100
|
|
||||||
+++ coreutils-5.92/tests/group-names 2005-10-28 09:55:27.000000000 +0100
|
|
||||||
@@ -18,3 +18,11 @@
|
|
||||||
(exit 77); exit 77
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
+
|
|
||||||
+set `id -Gn`
|
|
||||||
+if echo "$2" | grep -q '[^0-9]'
|
|
||||||
+then
|
|
||||||
+ exit 0
|
|
||||||
+else
|
|
||||||
+ (exit 77); exit 77
|
|
||||||
+fi
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
#! /bin/csh -f
|
# skip everything for non-interactive shells
|
||||||
|
if (! $?prompt) exit
|
||||||
|
|
||||||
# color-ls initialization
|
# color-ls initialization
|
||||||
if ( $?USER_LS_COLORS ) then
|
if ( $?USER_LS_COLORS ) then
|
||||||
if ( "$USER_LS_COLORS" != "" ) then
|
if ( "$USER_LS_COLORS" != "" ) then
|
||||||
#when USER_LS_COLORS defined do not override user
|
#when USER_LS_COLORS defined do not override user
|
||||||
#specified LS_COLORS and use them
|
#specified LS_COLORS and use them
|
||||||
goto finish
|
goto finish
|
||||||
endif
|
endif
|
||||||
|
|
@ -11,34 +13,49 @@ endif
|
||||||
alias ll 'ls -l'
|
alias ll 'ls -l'
|
||||||
alias l. 'ls -d .*'
|
alias l. 'ls -d .*'
|
||||||
set COLORS=/etc/DIR_COLORS
|
set COLORS=/etc/DIR_COLORS
|
||||||
|
|
||||||
if ($?TERM) then
|
if ($?TERM) then
|
||||||
if ( -e "/etc/DIR_COLORS.$TERM" ) then
|
if ( -e "/etc/DIR_COLORS.$TERM" ) then
|
||||||
set COLORS="/etc/DIR_COLORS.$TERM"
|
set COLORS="/etc/DIR_COLORS.$TERM"
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
if ( -e "/etc/DIR_COLORS.256color" ) then
|
|
||||||
if ( "`tput colors`" == "256" ) then
|
|
||||||
set COLORS=/etc/DIR_COLORS.256color
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
if ( -f ~/.dircolors ) set COLORS=~/.dircolors
|
if ( -f ~/.dircolors ) set COLORS=~/.dircolors
|
||||||
if ( -f ~/.dir_colors ) set COLORS=~/.dir_colors
|
if ( -f ~/.dir_colors ) set COLORS=~/.dir_colors
|
||||||
if ($?TERM) then
|
if ($?TERM) then
|
||||||
if ( -f ~/.dircolors."$TERM" ) set COLORS=~/.dircolors."$TERM"
|
if ( -f ~/.dircolors."$TERM" ) set COLORS=~/.dircolors."$TERM"
|
||||||
if ( -f ~/.dir_colors."$TERM" ) set COLORS=~/.dir_colors."$TERM"
|
if ( -f ~/.dir_colors."$TERM" ) set COLORS=~/.dir_colors."$TERM"
|
||||||
endif
|
endif
|
||||||
|
set INCLUDE="`/usr/bin/cat "$COLORS" | /usr/bin/grep '^INCLUDE' | /usr/bin/cut -d ' ' -f2-`"
|
||||||
|
|
||||||
if ( ! -e "$COLORS" ) exit
|
if ( ! -e "$COLORS" ) exit
|
||||||
|
|
||||||
eval `dircolors -c $COLORS`
|
set _tmp="`/usr/bin/mktemp .colorlsXXX -q --tmpdir=/tmp`"
|
||||||
|
#if mktemp fails, exit when include was active, otherwise use $COLORS file
|
||||||
|
if ( "$_tmp" == '' ) then
|
||||||
|
if ( "$INCLUDE" == '' ) then
|
||||||
|
eval "`/usr/bin/dircolors -c $COLORS`"
|
||||||
|
endif
|
||||||
|
goto cleanup
|
||||||
|
endif
|
||||||
|
|
||||||
|
if ( "$INCLUDE" != '' ) /usr/bin/cat "$INCLUDE" >> $_tmp
|
||||||
|
/usr/bin/grep -v '^INCLUDE' "$COLORS" >> $_tmp
|
||||||
|
|
||||||
|
eval "`/usr/bin/dircolors -c $_tmp`"
|
||||||
|
|
||||||
|
/usr/bin/rm -f $_tmp
|
||||||
|
|
||||||
if ( "$LS_COLORS" == '' ) exit
|
if ( "$LS_COLORS" == '' ) exit
|
||||||
set color_none=`sed -n '/^COLOR.*none/Ip' < $COLORS`
|
cleanup:
|
||||||
if ( "$color_none" != '' ) then
|
set color_none=`/usr/bin/sed -n '/^COLOR.*none/Ip' < $COLORS`
|
||||||
|
if ( "$color_none" != '' ) then
|
||||||
unset color_none
|
unset color_none
|
||||||
exit
|
exit
|
||||||
endif
|
endif
|
||||||
unset color_none
|
unset color_none
|
||||||
|
unset _tmp
|
||||||
|
unset INCLUDE
|
||||||
|
unset COLORS
|
||||||
|
|
||||||
finish:
|
finish:
|
||||||
alias ll 'ls -l --color=auto'
|
alias ll 'ls -l --color=auto'
|
||||||
|
|
|
||||||
|
|
@ -1,40 +1,53 @@
|
||||||
# color-ls initialization
|
# color-ls initialization
|
||||||
|
|
||||||
|
# Skip all for noninteractive shells.
|
||||||
|
[ ! -t 0 ] && return
|
||||||
|
|
||||||
#when USER_LS_COLORS defined do not override user LS_COLORS, but use them.
|
#when USER_LS_COLORS defined do not override user LS_COLORS, but use them.
|
||||||
if [ -z "$USER_LS_COLORS" ]; then
|
if [ -z "$USER_LS_COLORS" ]; then
|
||||||
|
|
||||||
alias ll='ls -l' 2>/dev/null
|
alias ll='ls -l' 2>/dev/null
|
||||||
alias l.='ls -d .*' 2>/dev/null
|
alias l.='ls -d .*' 2>/dev/null
|
||||||
|
|
||||||
|
INCLUDE=
|
||||||
# Skip the rest for noninteractive shells.
|
|
||||||
[ -z "$PS1" ] && return
|
|
||||||
|
|
||||||
COLORS=
|
COLORS=
|
||||||
|
|
||||||
for colors in "$HOME/.dir_colors.$TERM" "$HOME/.dircolors.$TERM" \
|
for colors in "$HOME/.dir_colors.$TERM" "$HOME/.dircolors.$TERM" \
|
||||||
"$HOME/.dir_colors" "$HOME/.dircolors"; do
|
"$HOME/.dir_colors" "$HOME/.dircolors"; do
|
||||||
[ -e "$colors" ] && COLORS="$colors" && break
|
[ -e "$colors" ] && COLORS="$colors" && \
|
||||||
|
INCLUDE="`/usr/bin/cat "$COLORS" | /usr/bin/grep '^INCLUDE' | /usr/bin/cut -d ' ' -f2-`" && \
|
||||||
|
break
|
||||||
done
|
done
|
||||||
|
|
||||||
[ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \
|
[ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.$TERM" ] && \
|
||||||
[ "x`tput colors 2>/dev/null`" = "x256" ] && \
|
COLORS="/etc/DIR_COLORS.$TERM"
|
||||||
COLORS="/etc/DIR_COLORS.256color"
|
|
||||||
|
|
||||||
if [ -z "$COLORS" ]; then
|
[ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS" ] && \
|
||||||
for colors in "/etc/DIR_COLORS.$TERM" "/etc/DIR_COLORS" ; do
|
COLORS="/etc/DIR_COLORS"
|
||||||
[ -e "$colors" ] && COLORS="$colors" && break
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Existence of $COLORS already checked above.
|
# Existence of $COLORS already checked above.
|
||||||
[ -n "$COLORS" ] || return
|
[ -n "$COLORS" ] || return
|
||||||
|
|
||||||
eval `dircolors --sh "$COLORS" 2>/dev/null`
|
if [ -e "$INCLUDE" ];
|
||||||
|
then
|
||||||
|
TMP="`/usr/bin/mktemp .colorlsXXX -q --tmpdir=/tmp`"
|
||||||
|
[ -z "$TMP" ] && return
|
||||||
|
|
||||||
|
/usr/bin/cat "$INCLUDE" >> $TMP
|
||||||
|
/usr/bin/grep -v '^INCLUDE' "$COLORS" >> $TMP
|
||||||
|
|
||||||
|
eval "`/usr/bin/dircolors --sh $TMP 2>/dev/null`"
|
||||||
|
/usr/bin/rm -f $TMP
|
||||||
|
else
|
||||||
|
eval "`/usr/bin/dircolors --sh $COLORS 2>/dev/null`"
|
||||||
|
fi
|
||||||
|
|
||||||
[ -z "$LS_COLORS" ] && return
|
[ -z "$LS_COLORS" ] && return
|
||||||
egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
|
/usr/bin/grep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
unset TMP COLORS INCLUDE
|
||||||
|
|
||||||
alias ll='ls -l --color=auto' 2>/dev/null
|
alias ll='ls -l --color=auto' 2>/dev/null
|
||||||
alias l.='ls -d .* --color=auto' 2>/dev/null
|
alias l.='ls -d .* --color=auto' 2>/dev/null
|
||||||
alias ls='ls --color=auto' 2>/dev/null
|
alias ls='ls --color=auto' 2>/dev/null
|
||||||
|
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
diff -urNp coreutils-6.10-orig/src/dd.c coreutils-6.10/src/dd.c
|
|
||||||
--- coreutils-6.10-orig/src/dd.c 2007-12-06 14:22:42.000000000 +0100
|
|
||||||
+++ coreutils-6.10/src/dd.c 2008-03-11 12:48:12.000000000 +0100
|
|
||||||
@@ -391,6 +391,25 @@ static char const ebcdic_to_ascii[] =
|
|
||||||
'\070', '\071', '\372', '\373', '\374', '\375', '\376', '\377'
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* True if we need to close the standard output *stream*. */
|
|
||||||
+static bool close_stdout_required = true;
|
|
||||||
+
|
|
||||||
+/* The only reason to close the standard output *stream* is if
|
|
||||||
+ parse_long_options fails (as it does for --help or --version).
|
|
||||||
+ In any other case, dd uses only the STDOUT_FILENO file descriptor,
|
|
||||||
+ and the "cleanup" function calls "close (STDOUT_FILENO)".
|
|
||||||
+ Closing the file descriptor and then letting the usual atexit-run
|
|
||||||
+ close_stdout function call "fclose (stdout)" would result in a
|
|
||||||
+ harmless failure of the close syscall (with errno EBADF).
|
|
||||||
+ This function serves solely to avoid the unnecessary close_stdout
|
|
||||||
+ call, once parse_long_options has succeeded. */
|
|
||||||
+static void
|
|
||||||
+maybe_close_stdout (void)
|
|
||||||
+{
|
|
||||||
+ if (close_stdout_required)
|
|
||||||
+ close_stdout ();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
usage (int status)
|
|
||||||
{
|
|
||||||
@@ -1639,12 +1658,14 @@ main (int argc, char **argv)
|
|
||||||
textdomain (PACKAGE);
|
|
||||||
|
|
||||||
/* Arrange to close stdout if parse_long_options exits. */
|
|
||||||
- atexit (close_stdout);
|
|
||||||
+ atexit (maybe_close_stdout);
|
|
||||||
|
|
||||||
page_size = getpagesize ();
|
|
||||||
|
|
||||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
|
||||||
usage, AUTHORS, (char const *) NULL);
|
|
||||||
+ close_stdout_required = false;
|
|
||||||
+
|
|
||||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
|
||||||
usage (EXIT_FAILURE);
|
|
||||||
|
|
||||||
187
coreutils-df-direct.patch
Normal file
187
coreutils-df-direct.patch
Normal file
|
|
@ -0,0 +1,187 @@
|
||||||
|
From 91be1a584108a6a3d96f64382bbf206c4213b3db Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Mon, 29 Mar 2010 17:20:34 +0000
|
||||||
|
Subject: [PATCH] coreutils-df-direct.patch
|
||||||
|
|
||||||
|
---
|
||||||
|
doc/coreutils.texi | 7 ++++++
|
||||||
|
src/df.c | 34 ++++++++++++++++++++++++++--
|
||||||
|
tests/df/direct.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
3 files changed, 94 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100755 tests/df/direct.sh
|
||||||
|
|
||||||
|
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
||||||
|
index b420606..0ccb368 100644
|
||||||
|
--- a/doc/coreutils.texi
|
||||||
|
+++ b/doc/coreutils.texi
|
||||||
|
@@ -12597,6 +12597,13 @@ some systems (notably Solaris), doing this yields more up to date results,
|
||||||
|
but in general this option makes @command{df} much slower, especially when
|
||||||
|
there are many or very busy file systems.
|
||||||
|
|
||||||
|
+@item --direct
|
||||||
|
+@opindex --direct
|
||||||
|
+@cindex direct statfs for a file
|
||||||
|
+Do not resolve mount point and show statistics directly for a file. It can be
|
||||||
|
+especially useful for NFS mount points if there is a boundary between two
|
||||||
|
+storage policies behind the mount point.
|
||||||
|
+
|
||||||
|
@item --total
|
||||||
|
@opindex --total
|
||||||
|
@cindex grand total of file system size, usage and available space
|
||||||
|
diff --git a/src/df.c b/src/df.c
|
||||||
|
index 75e638c..ef9f0a7 100644
|
||||||
|
--- a/src/df.c
|
||||||
|
+++ b/src/df.c
|
||||||
|
@@ -121,6 +121,9 @@ static bool print_type;
|
||||||
|
/* If true, print a grand total at the end. */
|
||||||
|
static bool print_grand_total;
|
||||||
|
|
||||||
|
+/* If true, show statistics for a file instead of mount point. */
|
||||||
|
+static bool direct_statfs;
|
||||||
|
+
|
||||||
|
/* Grand total data. */
|
||||||
|
static struct fs_usage grand_fsu;
|
||||||
|
|
||||||
|
@@ -248,13 +251,15 @@ enum
|
||||||
|
NO_SYNC_OPTION = CHAR_MAX + 1,
|
||||||
|
SYNC_OPTION,
|
||||||
|
TOTAL_OPTION,
|
||||||
|
- OUTPUT_OPTION
|
||||||
|
+ OUTPUT_OPTION,
|
||||||
|
+ DIRECT_OPTION
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct option const long_options[] =
|
||||||
|
{
|
||||||
|
{"all", no_argument, nullptr, 'a'},
|
||||||
|
{"block-size", required_argument, nullptr, 'B'},
|
||||||
|
+ {"direct", no_argument, nullptr, DIRECT_OPTION},
|
||||||
|
{"inodes", no_argument, nullptr, 'i'},
|
||||||
|
{"human-readable", no_argument, nullptr, 'h'},
|
||||||
|
{"si", no_argument, nullptr, 'H'},
|
||||||
|
@@ -571,7 +576,10 @@ get_header (void)
|
||||||
|
for (idx_t col = 0; col < ncolumns; col++)
|
||||||
|
{
|
||||||
|
char *cell;
|
||||||
|
- char const *header = _(columns[col]->caption);
|
||||||
|
+ char const *header = (columns[col]->field == TARGET_FIELD
|
||||||
|
+ && direct_statfs)?
|
||||||
|
+ _("File") :
|
||||||
|
+ _(columns[col]->caption);
|
||||||
|
|
||||||
|
if (columns[col]->field == SIZE_FIELD
|
||||||
|
&& (header_mode == DEFAULT_MODE
|
||||||
|
@@ -1446,6 +1454,17 @@ get_point (char const *point, const struct stat *statp)
|
||||||
|
static void
|
||||||
|
get_entry (char const *name, struct stat const *statp)
|
||||||
|
{
|
||||||
|
+ if (direct_statfs)
|
||||||
|
+ {
|
||||||
|
+ char *resolved = canonicalize_file_name (name);
|
||||||
|
+ if (resolved)
|
||||||
|
+ {
|
||||||
|
+ get_dev (NULL, resolved, name, NULL, NULL, false, false, NULL, false);
|
||||||
|
+ free (resolved);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
|
||||||
|
&& get_device (name))
|
||||||
|
return;
|
||||||
|
@@ -1516,6 +1535,7 @@ or all file systems by default.\n\
|
||||||
|
-B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n\
|
||||||
|
'-BM' prints sizes in units of 1,048,576 bytes;\n\
|
||||||
|
see SIZE format below\n\
|
||||||
|
+ --direct show statistics for a file instead of mount point\n\
|
||||||
|
-h, --human-readable print sizes in powers of 1024 (e.g., 1023M)\n\
|
||||||
|
-H, --si print sizes in powers of 1000 (e.g., 1.1G)\n\
|
||||||
|
"), stdout);
|
||||||
|
@@ -1610,6 +1630,9 @@ main (int argc, char **argv)
|
||||||
|
xstrtol_fatal (e, oi, c, long_options, optarg);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
+ case DIRECT_OPTION:
|
||||||
|
+ direct_statfs = true;
|
||||||
|
+ break;
|
||||||
|
case 'i':
|
||||||
|
if (header_mode == OUTPUT_MODE)
|
||||||
|
{
|
||||||
|
@@ -1706,6 +1729,13 @@ main (int argc, char **argv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (direct_statfs && show_local_fs)
|
||||||
|
+ {
|
||||||
|
+ error (0, 0, _("options --direct and --local (-l) are mutually "
|
||||||
|
+ "exclusive"));
|
||||||
|
+ usage (EXIT_FAILURE);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (human_output_opts == -1)
|
||||||
|
{
|
||||||
|
if (posix_format)
|
||||||
|
diff --git a/tests/df/direct.sh b/tests/df/direct.sh
|
||||||
|
new file mode 100755
|
||||||
|
index 0000000..8e4cfb8
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/df/direct.sh
|
||||||
|
@@ -0,0 +1,55 @@
|
||||||
|
+#!/bin/sh
|
||||||
|
+# Ensure "df --direct" works as documented
|
||||||
|
+
|
||||||
|
+# Copyright (C) 2010 Free Software Foundation, Inc.
|
||||||
|
+
|
||||||
|
+# This program is free software: you can redistribute it and/or modify
|
||||||
|
+# it under the terms of the GNU General Public License as published by
|
||||||
|
+# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
+# (at your option) any later version.
|
||||||
|
+
|
||||||
|
+# This program is distributed in the hope that it will be useful,
|
||||||
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
+# GNU General Public License for more details.
|
||||||
|
+
|
||||||
|
+# You should have received a copy of the GNU General Public License
|
||||||
|
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
+
|
||||||
|
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
|
||||||
|
+print_ver_ df
|
||||||
|
+
|
||||||
|
+df || skip_ "df fails"
|
||||||
|
+
|
||||||
|
+DIR=`pwd` || framework_failure
|
||||||
|
+FILE="$DIR/file"
|
||||||
|
+touch "$FILE" || framework_failure
|
||||||
|
+echo "$FILE" > file_exp || framework_failure
|
||||||
|
+echo "Mounted on" > header_mounted_exp || framework_failure
|
||||||
|
+echo "File" > header_file_exp || framework_failure
|
||||||
|
+
|
||||||
|
+fail=0
|
||||||
|
+
|
||||||
|
+df --portability "$FILE" > df_out || fail=1
|
||||||
|
+df --portability --direct "$FILE" > df_direct_out || fail=1
|
||||||
|
+df --portability --direct --local "$FILE" > /dev/null 2>&1 && fail=1
|
||||||
|
+
|
||||||
|
+# check df header
|
||||||
|
+$AWK '{ if (NR==1) print $6 " " $7; }' df_out > header_mounted_out \
|
||||||
|
+ || framework_failure
|
||||||
|
+$AWK '{ if (NR==1) print $6; }' df_direct_out > header_file_out \
|
||||||
|
+ || framework_failure
|
||||||
|
+compare header_mounted_out header_mounted_exp || fail=1
|
||||||
|
+compare header_file_out header_file_exp || fail=1
|
||||||
|
+
|
||||||
|
+# check df output (without --direct)
|
||||||
|
+$AWK '{ if (NR==2) print $6; }' df_out > file_out \
|
||||||
|
+ || framework_failure
|
||||||
|
+compare file_out file_exp && fail=1
|
||||||
|
+
|
||||||
|
+# check df output (with --direct)
|
||||||
|
+$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \
|
||||||
|
+ || framework_failure
|
||||||
|
+compare file_out file_exp || fail=1
|
||||||
|
+
|
||||||
|
+Exit $fail
|
||||||
|
--
|
||||||
|
2.52.0
|
||||||
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
--- coreutils-6.8+/tests/cp/acl.getfacl-exit-code 2007-03-01 16:48:29.000000000 +0000
|
|
||||||
+++ coreutils-6.8+/tests/cp/acl 2007-03-01 16:49:35.000000000 +0000
|
|
||||||
@@ -70,16 +70,16 @@
|
|
||||||
# copy a file without preserving permissions
|
|
||||||
cp a/file b/ || fail=1
|
|
||||||
|
|
||||||
-acl2=`cd b && getfacl file` || framework_failure
|
|
||||||
+acl2=`cd b && getfacl file`
|
|
||||||
test "$acl1" = "$acl2" || fail=1
|
|
||||||
rm a/file || framework_failure
|
|
||||||
|
|
||||||
# copy a file, preserving permissions
|
|
||||||
touch a/file || framework_failure
|
|
||||||
-setfacl -m user:bin:rw a/file || framework_failure
|
|
||||||
-acl1=`cd a && getfacl file` || framework_failure
|
|
||||||
+setfacl -m user:bin:rw a/file
|
|
||||||
+acl1=`cd a && getfacl file`
|
|
||||||
cp -p a/file b/ || fail=1
|
|
||||||
-acl2=`cd b && getfacl file` || framework_failure
|
|
||||||
+acl2=`cd b && getfacl file`
|
|
||||||
test "$acl1" = "$acl2" || fail=1
|
|
||||||
|
|
||||||
exit $fail
|
|
||||||
|
|
@ -1,82 +0,0 @@
|
||||||
diff -urp coreutils-6.10-orig/lib/getugroups.c coreutils-6.10/lib/getugroups.c
|
|
||||||
--- coreutils-6.10-orig/lib/getugroups.c 2007-10-17 15:47:25.000000000 +0200
|
|
||||||
+++ coreutils-6.10/lib/getugroups.c 2008-01-24 16:37:04.000000000 +0100
|
|
||||||
@@ -19,6 +19,9 @@
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
+/* We do not need this code if getgrouplist(3) is available. */
|
|
||||||
+#ifndef HAVE_GETGROUPLIST
|
|
||||||
+
|
|
||||||
#include "getugroups.h"
|
|
||||||
|
|
||||||
#include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
|
|
||||||
@@ -114,3 +117,4 @@ getugroups (int maxcount, GETGROUPS_T *g
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
+#endif /* have getgrouplist */
|
|
||||||
diff -urp coreutils-6.10-orig/lib/mgetgroups.c coreutils-6.10/lib/mgetgroups.c
|
|
||||||
--- coreutils-6.10-orig/lib/mgetgroups.c 2007-11-25 14:23:31.000000000 +0100
|
|
||||||
+++ coreutils-6.10/lib/mgetgroups.c 2008-01-24 16:41:15.000000000 +0100
|
|
||||||
@@ -43,9 +43,17 @@ mgetgroups (const char *username, gid_t
|
|
||||||
int ng;
|
|
||||||
GETGROUPS_T *g;
|
|
||||||
|
|
||||||
- max_n_groups = (username
|
|
||||||
- ? getugroups (0, NULL, username, gid)
|
|
||||||
- : getgroups (0, NULL));
|
|
||||||
+ if (!username)
|
|
||||||
+ max_n_groups = getgroups(0, NULL);
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+#ifdef HAVE_GETGROUPLIST
|
|
||||||
+ max_n_groups = 0;
|
|
||||||
+ getgrouplist (username, gid, NULL, &max_n_groups);
|
|
||||||
+#else
|
|
||||||
+ max_n_groups = getugroups (0, NULL, username, gid);
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* If we failed to count groups with NULL for a buffer,
|
|
||||||
try again with a non-NULL one, just in case. */
|
|
||||||
@@ -62,9 +70,25 @@ mgetgroups (const char *username, gid_t
|
|
||||||
if (g == NULL)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
- ng = (username
|
|
||||||
- ? getugroups (max_n_groups, g, username, gid)
|
|
||||||
- : getgroups (max_n_groups, g));
|
|
||||||
+ if (!username)
|
|
||||||
+ ng = getgroups (max_n_groups, g);
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+#ifdef HAVE_GETGROUPLIST
|
|
||||||
+ int e;
|
|
||||||
+ ng = max_n_groups;
|
|
||||||
+ while ((e = getgrouplist (username, gid, g, &ng)) == -1
|
|
||||||
+ && ng > max_n_groups)
|
|
||||||
+ {
|
|
||||||
+ max_n_groups = ng;
|
|
||||||
+ g = xrealloc (g, max_n_groups * sizeof (GETGROUPS_T));
|
|
||||||
+ }
|
|
||||||
+ if (e == -1)
|
|
||||||
+ ng = -1;
|
|
||||||
+#else
|
|
||||||
+ ng = getugroups (max_n_groups, g, username, gid);
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (ng < 0)
|
|
||||||
{
|
|
||||||
diff -urp coreutils-6.10-orig/m4/jm-macros.m4 coreutils-6.10/m4/jm-macros.m4
|
|
||||||
--- coreutils-6.10-orig/m4/jm-macros.m4 2007-11-25 14:23:31.000000000 +0100
|
|
||||||
+++ coreutils-6.10/m4/jm-macros.m4 2008-01-24 16:42:00.000000000 +0100
|
|
||||||
@@ -52,6 +52,7 @@ AC_DEFUN([coreutils_MACROS],
|
|
||||||
fchown \
|
|
||||||
fchmod \
|
|
||||||
ftruncate \
|
|
||||||
+ getgrouplist \
|
|
||||||
iswspace \
|
|
||||||
mkfifo \
|
|
||||||
mbrlen \
|
|
||||||
7351
coreutils-i18n.patch
7351
coreutils-i18n.patch
File diff suppressed because it is too large
Load diff
312
coreutils-keyring.gpg
Normal file
312
coreutils-keyring.gpg
Normal file
|
|
@ -0,0 +1,312 @@
|
||||||
|
Release GPG keyring of coreutils group.
|
||||||
|
|
||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
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
|
||||||
|
0rQiUMOhZHJhaWcgQnJhZHkgPHBicmFkeUByZWRoYXQuY29tPokCHwQwAQIACQUC
|
||||||
|
Vp+cpgIdIAAKCRDfb9lxMGA32UftD/9jYqsCfNAzb0vhDOaU1AchzaQa1pIKEjoL
|
||||||
|
6d4AMeXFSBpMi4nYJpN+rmM8DAzcbenBcSoIqecdfENp3mY+hI8mYdnMiVpldsro
|
||||||
|
EAl/SDxY6//pPd0Dnmoe6sNodBB2uwHxhQi9ubz72iWX5WiKP8+OUAj91cLMl9nK
|
||||||
|
IYfcHy3iinSRqT02JP33DGDwsHCoAMmp59g6AHnf0sjCtZEtK79MtKiKTkUdMazP
|
||||||
|
VGs81x1jCO2kvvmy0fDZxkGuyso0inae2hsaMSqqoga5lC0jQanFIXSEkLZgJglj
|
||||||
|
LmiWPO0IGHPFth/e//51atGUmpdd2ufQ/QVoxSnQKRFQ98eO/SQ75bO5vbE8dGv8
|
||||||
|
oX9S3M9NjKOY9VnXC/JDyMXt2aMDs9tqSo22lJuT2Wq20wM5hlszxKI7c9QphnuH
|
||||||
|
yPNtszzXo1+5/UEuCNIQoe59MoscGmx7GN5WvlENaixGg7tzpZ+wdftN7BUcpJfC
|
||||||
|
gsEQurHzPEIomlszp3xraX0G84plClas13Ie8CIVM7UPbF0Cwx6XwhryjaDTkq3f
|
||||||
|
+mjQXtNJQk487q8cc9dxplslXiDqBYVngV+oDKOjrqc5PXSQm2M8EYRn9SXuFnT8
|
||||||
|
iF5SkuFYtgOEj3KNZ04ZB1I7AQebylS2LGwWan8yWJSAs22eR9urWBVpmre6GUGZ
|
||||||
|
fo7YBdOvbLQiUMOhZHJhaWcgQnJhZHkgPHBpeGVsYmVhdEBnbnUub3JnPokCOAQT
|
||||||
|
AQIAIgUCTnyAtAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ32/ZcTBg
|
||||||
|
N9moHg/+Mjq/O1RnNg7kdUjRK1wOflym7itgE8kq4G55EJvLSxo6wIgd7ZKUj+cv
|
||||||
|
X+iXQpGRc3bicpNTsKcW6EjDtyg+VCSWD7qJ3EtwxVf9mN3bIqWSVwP0k8kc1N+t
|
||||||
|
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
|
||||||
|
ELphkzjc6eM3CaOZ73u4GVXotheeUabUHQ==
|
||||||
|
=drvb
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
@ -1,103 +0,0 @@
|
||||||
src/copy.c | 5 +++--
|
|
||||||
tests/mv/Makefile.am | 4 ++--
|
|
||||||
tests/mv/atomic2 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
3 files changed, 55 insertions(+), 4 deletions(-)
|
|
||||||
create mode 100755 tests/mv/atomic2
|
|
||||||
|
|
||||||
diff --git a/src/copy.c b/src/copy.c
|
|
||||||
index fd31b5c..208a674 100644
|
|
||||||
--- a/src/copy.c
|
|
||||||
+++ b/src/copy.c
|
|
||||||
@@ -1339,10 +1339,11 @@ copy_internal (char const *src_name, char const *dst_name,
|
|
||||||
new_dst = true;
|
|
||||||
}
|
|
||||||
else if (! S_ISDIR (dst_sb.st_mode)
|
|
||||||
+ /* Never unlink dst_name when in move mode. */
|
|
||||||
+ && ! x->move_mode
|
|
||||||
&& (x->unlink_dest_before_opening
|
|
||||||
|| (x->preserve_links && 1 < dst_sb.st_nlink)
|
|
||||||
- || (!x->move_mode
|
|
||||||
- && x->dereference == DEREF_NEVER
|
|
||||||
+ || (x->dereference == DEREF_NEVER
|
|
||||||
&& S_ISLNK (src_sb.st_mode))
|
|
||||||
))
|
|
||||||
{
|
|
||||||
diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am
|
|
||||||
index c121911..92ec68e 100644
|
|
||||||
--- a/tests/mv/Makefile.am
|
|
||||||
+++ b/tests/mv/Makefile.am
|
|
||||||
@@ -1,7 +1,6 @@
|
|
||||||
# Make coreutils tests for "mv". -*-Makefile-*-
|
|
||||||
|
|
||||||
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
|
||||||
-# Free Software Foundation, Inc.
|
|
||||||
+# Copyright (C) 1998-2008 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
@@ -17,6 +16,7 @@
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
TESTS = \
|
|
||||||
+ atomic2 \
|
|
||||||
sticky-to-xpart \
|
|
||||||
hard-verbose \
|
|
||||||
backup-dir \
|
|
||||||
diff --git a/tests/mv/atomic2 b/tests/mv/atomic2
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..d1029aa
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/mv/atomic2
|
|
||||||
@@ -0,0 +1,50 @@
|
|
||||||
+#!/bin/sh
|
|
||||||
+# ensure that mv doesn't first unlink a multi-hard-linked destination
|
|
||||||
+
|
|
||||||
+# Copyright (C) 2008 Free Software Foundation, Inc.
|
|
||||||
+
|
|
||||||
+# This program is free software: you can redistribute it and/or modify
|
|
||||||
+# it under the terms of the GNU General Public License as published by
|
|
||||||
+# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
+# (at your option) any later version.
|
|
||||||
+
|
|
||||||
+# This program is distributed in the hope that it will be useful,
|
|
||||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
+# GNU General Public License for more details.
|
|
||||||
+
|
|
||||||
+# You should have received a copy of the GNU General Public License
|
|
||||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
+
|
|
||||||
+if test "$VERBOSE" = yes; then
|
|
||||||
+ set -x
|
|
||||||
+ mv --version
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+. $srcdir/../strace
|
|
||||||
+. $srcdir/../test-lib.sh
|
|
||||||
+
|
|
||||||
+# Before the fix, mv would unnecessarily unlink the destination symlink:
|
|
||||||
+# $ rm -f a b b2; touch a b; ln b b2; strace -e unlink /p/bin/mv a b
|
|
||||||
+# unlink("b") = 0
|
|
||||||
+#
|
|
||||||
+# With the fix, it doesn't call unlink:
|
|
||||||
+# $ rm -f a b b2; touch a b; ln b b2; strace -e unlink ./mv a b
|
|
||||||
+# $
|
|
||||||
+
|
|
||||||
+touch a b || framework_failure
|
|
||||||
+ln b b2 || framework_failure
|
|
||||||
+
|
|
||||||
+fail=0
|
|
||||||
+
|
|
||||||
+strace -qe unlink mv a b > out 2>&1 || fail=1
|
|
||||||
+$EGREP 'unlink.*"b"' out && fail=1
|
|
||||||
+
|
|
||||||
+# Ensure that the source, "a", is gone.
|
|
||||||
+ls -dl a > /dev/null 2>&1 && fail=1
|
|
||||||
+
|
|
||||||
+# Ensure that the destination, "b", has link count 1.
|
|
||||||
+n_links=`stat --printf=%h b` || fail=1
|
|
||||||
+test "$n_links" = 1 || fail=1
|
|
||||||
+
|
|
||||||
+(exit $fail); exit $fail
|
|
||||||
--
|
|
||||||
1.5.5.rc0.7.g57e83
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- coreutils-5.2.1/src/who.c.overflow 2005-05-25 09:59:06.000000000 +0100
|
|
||||||
+++ coreutils-5.2.1/src/who.c 2005-05-25 10:00:31.000000000 +0100
|
|
||||||
@@ -75,7 +75,7 @@
|
|
||||||
# define UT_TYPE_NEW_TIME(U) false
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#define IDLESTR_LEN 6
|
|
||||||
+#define IDLESTR_LEN 10
|
|
||||||
|
|
||||||
#if HAVE_STRUCT_XTMP_UT_PID
|
|
||||||
# define PIDSTR_DECL_AND_INIT(Var, Utmp_ent) \
|
|
||||||
|
|
@ -1,422 +0,0 @@
|
||||||
--- coreutils-6.7/src/Makefile.am.pam 2006-11-24 21:28:10.000000000 +0000
|
|
||||||
+++ coreutils-6.7/src/Makefile.am 2007-01-09 17:00:01.000000000 +0000
|
|
||||||
@@ -103,7 +103,7 @@
|
|
||||||
# If necessary, add -lm to resolve use of pow in lib/strtod.c.
|
|
||||||
uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
|
|
||||||
|
|
||||||
-su_LDADD = $(LDADD) $(LIB_CRYPT)
|
|
||||||
+su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
|
|
||||||
|
|
||||||
dir_LDADD += $(LIB_ACL)
|
|
||||||
ls_LDADD += $(LIB_ACL)
|
|
||||||
--- coreutils-6.7/src/su.c.pam 2007-01-09 17:00:01.000000000 +0000
|
|
||||||
+++ coreutils-6.7/src/su.c 2007-01-09 17:16:43.000000000 +0000
|
|
||||||
@@ -38,6 +38,16 @@
|
|
||||||
restricts who can su to UID 0 accounts. RMS considers that to
|
|
||||||
be fascist.
|
|
||||||
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+
|
|
||||||
+ Actually, with PAM, su has nothing to do with whether or not a
|
|
||||||
+ wheel group is enforced by su. RMS tries to restrict your access
|
|
||||||
+ to a su which implements the wheel group, but PAM considers that
|
|
||||||
+ to be fascist, and gives the user/sysadmin the opportunity to
|
|
||||||
+ enforce a wheel group by proper editing of /etc/pam.conf
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
Compile-time options:
|
|
||||||
-DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog.
|
|
||||||
-DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog.
|
|
||||||
@@ -59,6 +69,15 @@
|
|
||||||
prototype (returning `int') in <unistd.h>. */
|
|
||||||
#define getusershell _getusershell_sys_proto_
|
|
||||||
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+# include <signal.h>
|
|
||||||
+# include <sys/wait.h>
|
|
||||||
+# include <sys/fsuid.h>
|
|
||||||
+# include <unistd.h>
|
|
||||||
+# include <security/pam_appl.h>
|
|
||||||
+# include <security/pam_misc.h>
|
|
||||||
+#endif /* USE_PAM */
|
|
||||||
+
|
|
||||||
#include "system.h"
|
|
||||||
#include "getpass.h"
|
|
||||||
|
|
||||||
@@ -128,15 +147,22 @@
|
|
||||||
/* The user to become if none is specified. */
|
|
||||||
#define DEFAULT_USER "root"
|
|
||||||
|
|
||||||
+#ifndef USE_PAM
|
|
||||||
char *crypt ();
|
|
||||||
+#endif
|
|
||||||
char *getusershell ();
|
|
||||||
void endusershell ();
|
|
||||||
void setusershell ();
|
|
||||||
|
|
||||||
extern char **environ;
|
|
||||||
|
|
||||||
-static void run_shell (char const *, char const *, char **, size_t)
|
|
||||||
+static void run_shell (char const *, char const *, char **, size_t,
|
|
||||||
+ const struct passwd *)
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+ ;
|
|
||||||
+#else
|
|
||||||
ATTRIBUTE_NORETURN;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* The name this program was run with. */
|
|
||||||
char *program_name;
|
|
||||||
@@ -225,7 +251,26 @@
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+static pam_handle_t *pamh = NULL;
|
|
||||||
+static int retval;
|
|
||||||
+static struct pam_conv conv = {
|
|
||||||
+ misc_conv,
|
|
||||||
+ NULL
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#define PAM_BAIL_P if (retval) { \
|
|
||||||
+ pam_end(pamh, PAM_SUCCESS); \
|
|
||||||
+ return 0; \
|
|
||||||
+}
|
|
||||||
+#define PAM_BAIL_P_VOID if (retval) { \
|
|
||||||
+ pam_end(pamh, PAM_SUCCESS); \
|
|
||||||
+return; \
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* Ask the user for a password.
|
|
||||||
+ If PAM is in use, let PAM ask for the password if necessary.
|
|
||||||
Return true if the user gives the correct password for entry PW,
|
|
||||||
false if not. Return true without asking for a password if run by UID 0
|
|
||||||
or if PW has an empty password. */
|
|
||||||
@@ -233,6 +278,44 @@
|
|
||||||
static bool
|
|
||||||
correct_password (const struct passwd *pw)
|
|
||||||
{
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+ struct passwd *caller;
|
|
||||||
+ char *tty_name, *ttyn;
|
|
||||||
+ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
|
|
||||||
+ PAM_BAIL_P;
|
|
||||||
+
|
|
||||||
+ if (getuid() != 0 && !isatty(0)) {
|
|
||||||
+ fprintf(stderr, "standard in must be a tty\n");
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ caller = getpwuid(getuid());
|
|
||||||
+ if(caller != NULL && caller->pw_name != NULL) {
|
|
||||||
+ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name);
|
|
||||||
+ PAM_BAIL_P;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ ttyn = ttyname(0);
|
|
||||||
+ if (ttyn) {
|
|
||||||
+ if (strncmp(ttyn, "/dev/", 5) == 0)
|
|
||||||
+ tty_name = ttyn+5;
|
|
||||||
+ else
|
|
||||||
+ tty_name = ttyn;
|
|
||||||
+ retval = pam_set_item(pamh, PAM_TTY, tty_name);
|
|
||||||
+ PAM_BAIL_P;
|
|
||||||
+ }
|
|
||||||
+ retval = pam_authenticate(pamh, 0);
|
|
||||||
+ PAM_BAIL_P;
|
|
||||||
+ retval = pam_acct_mgmt(pamh, 0);
|
|
||||||
+ if (retval == PAM_NEW_AUTHTOK_REQD) {
|
|
||||||
+ /* password has expired. Offer option to change it. */
|
|
||||||
+ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
|
|
||||||
+ PAM_BAIL_P;
|
|
||||||
+ }
|
|
||||||
+ PAM_BAIL_P;
|
|
||||||
+ /* must be authenticated if this point was reached */
|
|
||||||
+ return 1;
|
|
||||||
+#else /* !USE_PAM */
|
|
||||||
char *unencrypted, *encrypted, *correct;
|
|
||||||
#if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
|
|
||||||
/* Shadow passwd stuff for SVR3 and maybe other systems. */
|
|
||||||
@@ -257,6 +340,7 @@
|
|
||||||
encrypted = crypt (unencrypted, correct);
|
|
||||||
memset (unencrypted, 0, strlen (unencrypted));
|
|
||||||
return STREQ (encrypted, correct);
|
|
||||||
+#endif /* !USE_PAM */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Update `environ' for the new shell based on PW, with SHELL being
|
|
||||||
@@ -270,12 +354,18 @@
|
|
||||||
/* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
|
|
||||||
Unset all other environment variables. */
|
|
||||||
char const *term = getenv ("TERM");
|
|
||||||
+ char const *display = getenv ("DISPLAY");
|
|
||||||
+ char const *xauthority = getenv ("XAUTHORITY");
|
|
||||||
if (term)
|
|
||||||
term = xstrdup (term);
|
|
||||||
environ = xmalloc ((6 + !!term) * sizeof (char *));
|
|
||||||
environ[0] = NULL;
|
|
||||||
if (term)
|
|
||||||
xsetenv ("TERM", term);
|
|
||||||
+ if (display)
|
|
||||||
+ xsetenv ("DISPLAY", display);
|
|
||||||
+ if (xauthority)
|
|
||||||
+ xsetenv ("XAUTHORITY", xauthority);
|
|
||||||
xsetenv ("HOME", pw->pw_dir);
|
|
||||||
xsetenv ("SHELL", shell);
|
|
||||||
xsetenv ("USER", pw->pw_name);
|
|
||||||
@@ -308,8 +398,13 @@
|
|
||||||
{
|
|
||||||
#ifdef HAVE_INITGROUPS
|
|
||||||
errno = 0;
|
|
||||||
- if (initgroups (pw->pw_name, pw->pw_gid) == -1)
|
|
||||||
+ if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+ pam_close_session(pamh, 0);
|
|
||||||
+ pam_end(pamh, PAM_ABORT);
|
|
||||||
+#endif
|
|
||||||
error (EXIT_FAILURE, errno, _("cannot set groups"));
|
|
||||||
+ }
|
|
||||||
endgrent ();
|
|
||||||
#endif
|
|
||||||
if (setgid (pw->pw_gid))
|
|
||||||
@@ -318,6 +413,31 @@
|
|
||||||
error (EXIT_FAILURE, errno, _("cannot set user id"));
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+static int caught=0;
|
|
||||||
+/* Signal handler for parent process later */
|
|
||||||
+static void su_catch_sig(int sig)
|
|
||||||
+{
|
|
||||||
+ ++caught;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+pam_copyenv (pam_handle_t *pamh)
|
|
||||||
+{
|
|
||||||
+ char **env;
|
|
||||||
+
|
|
||||||
+ env = pam_getenvlist(pamh);
|
|
||||||
+ if(env) {
|
|
||||||
+ while(*env) {
|
|
||||||
+ if (putenv (*env))
|
|
||||||
+ xalloc_die ();
|
|
||||||
+ env++;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return(0);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
|
|
||||||
If COMMAND is nonzero, pass it to the shell with the -c option.
|
|
||||||
Pass ADDITIONAL_ARGS to the shell as more arguments; there
|
|
||||||
@@ -325,17 +445,49 @@
|
|
||||||
|
|
||||||
static void
|
|
||||||
run_shell (char const *shell, char const *command, char **additional_args,
|
|
||||||
- size_t n_additional_args)
|
|
||||||
+ size_t n_additional_args, const struct passwd *pw)
|
|
||||||
{
|
|
||||||
size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
|
|
||||||
char const **args = xnmalloc (n_args, sizeof *args);
|
|
||||||
size_t argno = 1;
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+ int child;
|
|
||||||
+ sigset_t ourset;
|
|
||||||
+ int status;
|
|
||||||
+
|
|
||||||
+ retval = pam_open_session(pamh,0);
|
|
||||||
+ if (retval != PAM_SUCCESS) {
|
|
||||||
+ fprintf (stderr, "could not open session\n");
|
|
||||||
+ exit (1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+/* do this at the last possible moment, because environment variables may
|
|
||||||
+ be passed even in the session phase
|
|
||||||
+*/
|
|
||||||
+ if(pam_copyenv(pamh) != PAM_SUCCESS)
|
|
||||||
+ fprintf (stderr, "error copying PAM environment\n");
|
|
||||||
+
|
|
||||||
+ /* Credentials should be set in the parent */
|
|
||||||
+ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) {
|
|
||||||
+ pam_close_session(pamh, 0);
|
|
||||||
+ fprintf(stderr, "could not set PAM credentials\n");
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ child = fork();
|
|
||||||
+ if (child == 0) { /* child shell */
|
|
||||||
+ change_identity (pw);
|
|
||||||
+ pam_end(pamh, 0);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (simulate_login)
|
|
||||||
{
|
|
||||||
char *arg0;
|
|
||||||
char *shell_basename;
|
|
||||||
|
|
||||||
+ if(chdir(pw->pw_dir))
|
|
||||||
+ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
|
|
||||||
+
|
|
||||||
shell_basename = last_component (shell);
|
|
||||||
arg0 = xmalloc (strlen (shell_basename) + 2);
|
|
||||||
arg0[0] = '-';
|
|
||||||
@@ -360,6 +512,66 @@
|
|
||||||
error (0, errno, "%s", shell);
|
|
||||||
exit (exit_status);
|
|
||||||
}
|
|
||||||
+#ifdef USE_PAM
|
|
||||||
+ } else if (child == -1) {
|
|
||||||
+ fprintf(stderr, "can not fork user shell: %s", strerror(errno));
|
|
||||||
+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
|
|
||||||
+ pam_close_session(pamh, 0);
|
|
||||||
+ pam_end(pamh, PAM_ABORT);
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+ /* parent only */
|
|
||||||
+ sigfillset(&ourset);
|
|
||||||
+ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
|
|
||||||
+ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME);
|
|
||||||
+ caught = 1;
|
|
||||||
+ }
|
|
||||||
+ if (!caught) {
|
|
||||||
+ struct sigaction action;
|
|
||||||
+ action.sa_handler = su_catch_sig;
|
|
||||||
+ sigemptyset(&action.sa_mask);
|
|
||||||
+ action.sa_flags = 0;
|
|
||||||
+ sigemptyset(&ourset);
|
|
||||||
+ if (sigaddset(&ourset, SIGTERM)
|
|
||||||
+ || sigaddset(&ourset, SIGALRM)
|
|
||||||
+ || sigaction(SIGTERM, &action, NULL)
|
|
||||||
+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
|
|
||||||
+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
|
|
||||||
+ caught = 1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if (!caught) {
|
|
||||||
+ do {
|
|
||||||
+ int pid;
|
|
||||||
+
|
|
||||||
+ pid = waitpid(-1, &status, WUNTRACED);
|
|
||||||
+
|
|
||||||
+ if (WIFSTOPPED(status)) {
|
|
||||||
+ kill(getpid(), SIGSTOP);
|
|
||||||
+ /* once we get here, we must have resumed */
|
|
||||||
+ kill(pid, SIGCONT);
|
|
||||||
+ }
|
|
||||||
+ } while (WIFSTOPPED(status));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (caught) {
|
|
||||||
+ fprintf(stderr, "\nSession terminated, killing shell...");
|
|
||||||
+ kill (child, SIGTERM);
|
|
||||||
+ }
|
|
||||||
+ /* Not checking retval on this because we need to call close session */
|
|
||||||
+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
|
|
||||||
+ retval = pam_close_session(pamh, 0);
|
|
||||||
+ PAM_BAIL_P_VOID;
|
|
||||||
+ retval = pam_end(pamh, PAM_SUCCESS);
|
|
||||||
+ PAM_BAIL_P_VOID;
|
|
||||||
+ if (caught) {
|
|
||||||
+ sleep(2);
|
|
||||||
+ kill(child, SIGKILL);
|
|
||||||
+ fprintf(stderr, " ...killed.\n");
|
|
||||||
+ exit(-1);
|
|
||||||
+ }
|
|
||||||
+ exit (WEXITSTATUS(status));
|
|
||||||
+#endif /* USE_PAM */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Return true if SHELL is a restricted shell (one not returned by
|
|
||||||
@@ -527,9 +739,9 @@
|
|
||||||
shell = xstrdup (shell ? shell : pw->pw_shell);
|
|
||||||
modify_environment (pw, shell);
|
|
||||||
|
|
||||||
+#ifndef USE_PAM
|
|
||||||
change_identity (pw);
|
|
||||||
- if (simulate_login && chdir (pw->pw_dir) != 0)
|
|
||||||
- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
- run_shell (shell, command, argv + optind, MAX (0, argc - optind));
|
|
||||||
+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
|
|
||||||
}
|
|
||||||
--- coreutils-6.7/doc/coreutils.texi.pam 2006-10-27 15:30:48.000000000 +0100
|
|
||||||
+++ coreutils-6.7/doc/coreutils.texi 2007-01-09 17:00:01.000000000 +0000
|
|
||||||
@@ -13395,8 +13395,11 @@
|
|
||||||
@findex syslog
|
|
||||||
@command{su} can optionally be compiled to use @code{syslog} to report
|
|
||||||
failed, and optionally successful, @command{su} attempts. (If the system
|
|
||||||
-supports @code{syslog}.) However, GNU @command{su} does not check if the
|
|
||||||
-user is a member of the @code{wheel} group; see below.
|
|
||||||
+supports @code{syslog}.)
|
|
||||||
+
|
|
||||||
+This version of @command{su} has support for using PAM for
|
|
||||||
+authentication. You can edit @file{/etc/pam.d/su} to customize its
|
|
||||||
+behaviour.
|
|
||||||
|
|
||||||
The program accepts the following options. Also see @ref{Common options}.
|
|
||||||
|
|
||||||
@@ -12815,6 +12815,8 @@
|
|
||||||
@env{PATH} to a compiled-in default value. Change to @var{user}'s home
|
|
||||||
directory. Prepend @samp{-} to the shell's name, intended to make it
|
|
||||||
read its login startup file(s).
|
|
||||||
+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables
|
|
||||||
+are preserved as well for PAM functionality.
|
|
||||||
|
|
||||||
@item -m
|
|
||||||
@itemx -p
|
|
||||||
@@ -13477,33 +13480,6 @@
|
|
||||||
the exit status of the subshell otherwise
|
|
||||||
@end display
|
|
||||||
|
|
||||||
-@cindex wheel group, not supported
|
|
||||||
-@cindex group wheel, not supported
|
|
||||||
-@cindex fascism
|
|
||||||
-@subsection Why GNU @command{su} does not support the @samp{wheel} group
|
|
||||||
-
|
|
||||||
-(This section is by Richard Stallman.)
|
|
||||||
-
|
|
||||||
-@cindex Twenex
|
|
||||||
-@cindex MIT AI lab
|
|
||||||
-Sometimes a few of the users try to hold total power over all the
|
|
||||||
-rest. For example, in 1984, a few users at the MIT AI lab decided to
|
|
||||||
-seize power by changing the operator password on the Twenex system and
|
|
||||||
-keeping it secret from everyone else. (I was able to thwart this coup
|
|
||||||
-and give power back to the users by patching the kernel, but I
|
|
||||||
-wouldn't know how to do that in Unix.)
|
|
||||||
-
|
|
||||||
-However, occasionally the rulers do tell someone. Under the usual
|
|
||||||
-@command{su} mechanism, once someone learns the root password who
|
|
||||||
-sympathizes with the ordinary users, he or she can tell the rest. The
|
|
||||||
-``wheel group'' feature would make this impossible, and thus cement the
|
|
||||||
-power of the rulers.
|
|
||||||
-
|
|
||||||
-I'm on the side of the masses, not that of the rulers. If you are
|
|
||||||
-used to supporting the bosses and sysadmins in whatever they do, you
|
|
||||||
-might find this idea strange at first.
|
|
||||||
-
|
|
||||||
-
|
|
||||||
@node Process control
|
|
||||||
@chapter Process control
|
|
||||||
|
|
||||||
--- coreutils-6.7/configure.ac.pam 2006-12-07 21:30:24.000000000 +0000
|
|
||||||
+++ coreutils-6.7/configure.ac 2007-01-09 17:18:04.000000000 +0000
|
|
||||||
@@ -44,6 +44,13 @@
|
|
||||||
gl_INIT
|
|
||||||
coreutils_MACROS
|
|
||||||
|
|
||||||
+dnl Give the chance to enable PAM
|
|
||||||
+AC_ARG_ENABLE(pam, dnl
|
|
||||||
+[ --enable-pam Enable use of the PAM libraries],
|
|
||||||
+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
|
|
||||||
+LIB_PAM="-ldl -lpam -lpam_misc"
|
|
||||||
+AC_SUBST(LIB_PAM)])
|
|
||||||
+
|
|
||||||
AC_FUNC_FORK
|
|
||||||
|
|
||||||
optional_bin_progs=
|
|
||||||
65
coreutils-python3.patch
Normal file
65
coreutils-python3.patch
Normal file
|
|
@ -0,0 +1,65 @@
|
||||||
|
From 8927d505ecb5334f09c48ef98ef1f464f581d0f7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: rpm-build <rpm-build>
|
||||||
|
Date: Tue, 2 Apr 2024 14:11:26 +0100
|
||||||
|
Subject: [PATCH] coreutils-python3.patch
|
||||||
|
|
||||||
|
---
|
||||||
|
init.cfg | 4 ++--
|
||||||
|
tests/d_type-check | 2 +-
|
||||||
|
tests/du/move-dir-while-traversing.sh | 6 +++---
|
||||||
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/init.cfg b/init.cfg
|
||||||
|
index ac05f7b..26d9516 100644
|
||||||
|
--- a/init.cfg
|
||||||
|
+++ b/init.cfg
|
||||||
|
@@ -601,10 +601,10 @@ seek_data_capable_()
|
||||||
|
# Skip the current test if "." lacks d_type support.
|
||||||
|
require_dirent_d_type_()
|
||||||
|
{
|
||||||
|
- python < /dev/null \
|
||||||
|
+ python3 < /dev/null \
|
||||||
|
|| skip_ python missing: assuming no d_type support
|
||||||
|
|
||||||
|
- python "$abs_srcdir"/tests/d_type-check \
|
||||||
|
+ python3 "$abs_srcdir"/tests/d_type-check \
|
||||||
|
|| skip_ requires d_type support
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/tests/d_type-check b/tests/d_type-check
|
||||||
|
index 1a2f76f..42d3924 100644
|
||||||
|
--- a/tests/d_type-check
|
||||||
|
+++ b/tests/d_type-check
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/python
|
||||||
|
+#!/usr/bin/python3
|
||||||
|
# Exit 0 if "." and "./tempfile" have useful d_type information, else 1.
|
||||||
|
# Intended to exit 0 only on Linux/GNU systems.
|
||||||
|
import os
|
||||||
|
diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh
|
||||||
|
index adf482b..cf9214a 100755
|
||||||
|
--- a/tests/du/move-dir-while-traversing.sh
|
||||||
|
+++ b/tests/du/move-dir-while-traversing.sh
|
||||||
|
@@ -21,8 +21,8 @@ print_ver_ du
|
||||||
|
require_trap_signame_
|
||||||
|
|
||||||
|
# We use a python-inotify script, so...
|
||||||
|
-python -m pyinotify -h > /dev/null \
|
||||||
|
- || skip_ 'python inotify package not installed'
|
||||||
|
+python3 -m pyinotify -h > /dev/null \
|
||||||
|
+ || skip_ 'python3 inotify package not installed'
|
||||||
|
|
||||||
|
# Move a directory "up" while du is processing its sub-directories.
|
||||||
|
# While du is processing a hierarchy .../B/C/D/... this script
|
||||||
|
@@ -33,7 +33,7 @@ python -m pyinotify -h > /dev/null \
|
||||||
|
# rename syscall before du finishes processing the subtree under D/.
|
||||||
|
|
||||||
|
cat <<'EOF' > inotify-watch-for-dir-access.py
|
||||||
|
-#!/usr/bin/env python
|
||||||
|
+#!/usr/bin/env python3
|
||||||
|
import pyinotify as pn
|
||||||
|
import os,sys
|
||||||
|
|
||||||
|
--
|
||||||
|
2.51.0
|
||||||
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
#%PAM-1.0
|
|
||||||
auth include runuser
|
|
||||||
session optional pam_keyinit.so force revoke
|
|
||||||
session include runuser
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
#%PAM-1.0
|
|
||||||
auth sufficient pam_rootok.so
|
|
||||||
session optional pam_keyinit.so revoke
|
|
||||||
session required pam_limits.so
|
|
||||||
session required pam_unix.so
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,70 +0,0 @@
|
||||||
diff -urNp coreutils-6.10-orig/man/cp.1 coreutils-6.10/man/cp.1
|
|
||||||
--- coreutils-6.10-orig/man/cp.1 2008-04-07 14:46:37.000000000 +0200
|
|
||||||
+++ coreutils-6.10/man/cp.1 2008-04-07 15:34:17.000000000 +0200
|
|
||||||
@@ -19,7 +19,7 @@ Copy SOURCE to DEST, or multiple SOURCE(
|
|
||||||
Mandatory arguments to long options are mandatory for short options too.
|
|
||||||
.TP
|
|
||||||
\fB\-a\fR, \fB\-\-archive\fR
|
|
||||||
-same as \fB\-dpR\fR
|
|
||||||
+same as \fB\-cdpR\fR
|
|
||||||
.TP
|
|
||||||
\fB\-\-backup\fR[=\fICONTROL\fR]
|
|
||||||
make a backup of each existing destination file
|
|
||||||
@@ -55,6 +55,9 @@ never follow symbolic links in SOURCE
|
|
||||||
\fB\-p\fR
|
|
||||||
same as \fB\-\-preserve\fR=\fImode\fR,ownership,timestamps
|
|
||||||
.TP
|
|
||||||
+\fB\-c\fR
|
|
||||||
+same as \fB\-\-preserve\fR=context\fR
|
|
||||||
+.TP
|
|
||||||
\fB\-\-preserve\fR[=\fIATTR_LIST\fR]
|
|
||||||
preserve the specified attributes (default:
|
|
||||||
mode,ownership,timestamps), if possible
|
|
||||||
diff -urNp coreutils-6.10-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info
|
|
||||||
--- coreutils-6.10-orig/doc/coreutils.info 2008-04-07 17:52:11.000000000 +0200
|
|
||||||
+++ coreutils-6.10/doc/coreutils.info 2008-04-07 18:03:27.000000000 +0200
|
|
||||||
@@ -5642,7 +5642,7 @@ options::.
|
|
||||||
Preserve as much as possible of the structure and attributes of the
|
|
||||||
original files in the copy (but do not attempt to preserve internal
|
|
||||||
directory structure; i.e., `ls -U' may list the entries in a copied
|
|
||||||
- directory in a different order). Equivalent to `-dpR'.
|
|
||||||
+ directory in a different order). Equivalent to `-cdpR'.
|
|
||||||
|
|
||||||
`-b'
|
|
||||||
`--backup[=METHOD]'
|
|
||||||
@@ -5660,6 +5660,11 @@ options::.
|
|
||||||
cp --backup --force -- "$i" "$i"
|
|
||||||
done
|
|
||||||
|
|
||||||
+`-c'
|
|
||||||
+ Preserve SELinux security context of the original files if possible.
|
|
||||||
+ Note: Some file systems don't support storing of SELinux security
|
|
||||||
+ context.
|
|
||||||
+
|
|
||||||
`--copy-contents'
|
|
||||||
If copying recursively, copy the contents of any special files
|
|
||||||
(e.g., FIFOs and device files) as if they were regular files.
|
|
||||||
diff -urNp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi
|
|
||||||
--- coreutils-6.10-orig/doc/coreutils.texi 2008-04-07 17:52:11.000000000 +0200
|
|
||||||
+++ coreutils-6.10/doc/coreutils.texi 2008-04-07 18:01:43.000000000 +0200
|
|
||||||
@@ -6957,7 +6957,7 @@ Preserve as much as possible of the stru
|
|
||||||
original files in the copy (but do not attempt to preserve internal
|
|
||||||
directory structure; i.e., @samp{ls -U} may list the entries in a copied
|
|
||||||
directory in a different order).
|
|
||||||
-Equivalent to @option{-dpR}.
|
|
||||||
+Equivalent to @option{-cdpR}.
|
|
||||||
|
|
||||||
@item -b
|
|
||||||
@itemx @w{@kbd{--backup}[=@var{method}]}
|
|
||||||
@@ -6981,6 +6981,11 @@ for i; do
|
|
||||||
done
|
|
||||||
@end example
|
|
||||||
|
|
||||||
+@item -c
|
|
||||||
+@cindex SELinux security context information, preserving
|
|
||||||
+Preserve SELinux security context of the original files if possible.
|
|
||||||
+Some file systems don't support storing of SELinux security context.
|
|
||||||
+
|
|
||||||
@item --copy-contents
|
|
||||||
@cindex directories, copying recursively
|
|
||||||
@cindex copying directories recursively
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
--- coreutils-6.7/src/su.c.setsid 2007-01-09 17:26:26.000000000 +0000
|
|
||||||
+++ coreutils-6.7/src/su.c 2007-01-09 17:26:57.000000000 +0000
|
|
||||||
@@ -176,9 +176,13 @@
|
|
||||||
/* If true, change some environment vars to indicate the user su'd to. */
|
|
||||||
static bool change_environment;
|
|
||||||
|
|
||||||
+/* If true, then don't call setsid() with a command. */
|
|
||||||
+int same_session = 0;
|
|
||||||
+
|
|
||||||
static struct option const longopts[] =
|
|
||||||
{
|
|
||||||
{"command", required_argument, NULL, 'c'},
|
|
||||||
+ {"session-command", required_argument, NULL, 'C'},
|
|
||||||
{"fast", no_argument, NULL, 'f'},
|
|
||||||
{"login", no_argument, NULL, 'l'},
|
|
||||||
{"preserve-environment", no_argument, NULL, 'p'},
|
|
||||||
@@ -478,6 +482,8 @@
|
|
||||||
if (child == 0) { /* child shell */
|
|
||||||
change_identity (pw);
|
|
||||||
pam_end(pamh, 0);
|
|
||||||
+ if (!same_session)
|
|
||||||
+ setsid ();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (simulate_login)
|
|
||||||
@@ -532,13 +538,27 @@
|
|
||||||
sigemptyset(&action.sa_mask);
|
|
||||||
action.sa_flags = 0;
|
|
||||||
sigemptyset(&ourset);
|
|
||||||
- if (sigaddset(&ourset, SIGTERM)
|
|
||||||
- || sigaddset(&ourset, SIGALRM)
|
|
||||||
- || sigaction(SIGTERM, &action, NULL)
|
|
||||||
- || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
|
|
||||||
+ if (!same_session)
|
|
||||||
+ {
|
|
||||||
+ if (sigaddset(&ourset, SIGINT) || sigaddset(&ourset, SIGQUIT))
|
|
||||||
+ {
|
|
||||||
+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
|
|
||||||
+ caught = 1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if (!caught && (sigaddset(&ourset, SIGTERM)
|
|
||||||
+ || sigaddset(&ourset, SIGALRM)
|
|
||||||
+ || sigaction(SIGTERM, &action, NULL)
|
|
||||||
+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL))) {
|
|
||||||
fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
|
|
||||||
caught = 1;
|
|
||||||
}
|
|
||||||
+ if (!caught && !same_session && (sigaction(SIGINT, &action, NULL)
|
|
||||||
+ || sigaction(SIGQUIT, &action, NULL)))
|
|
||||||
+ {
|
|
||||||
+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
|
|
||||||
+ caught = 1;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
if (!caught) {
|
|
||||||
do {
|
|
||||||
@@ -609,6 +629,8 @@
|
|
||||||
\n\
|
|
||||||
-, -l, --login make the shell a login shell\n\
|
|
||||||
-c, --command=COMMAND pass a single COMMAND to the shell with -c\n\
|
|
||||||
+ --session-command=COMMAND pass a single COMMAND to the shell with -c\n\
|
|
||||||
+ and do not create a new session\n\
|
|
||||||
-f, --fast pass -f to the shell (for csh or tcsh)\n\
|
|
||||||
-m, --preserve-environment do not reset environment variables\n\
|
|
||||||
-p same as -m\n\
|
|
||||||
@@ -631,6 +653,7 @@
|
|
||||||
int optc;
|
|
||||||
const char *new_user = DEFAULT_USER;
|
|
||||||
char *command = NULL;
|
|
||||||
+ int request_same_session = 0;
|
|
||||||
char *shell = NULL;
|
|
||||||
struct passwd *pw;
|
|
||||||
struct passwd pw_copy;
|
|
||||||
@@ -656,6 +679,11 @@
|
|
||||||
command = optarg;
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case 'C':
|
|
||||||
+ command = optarg;
|
|
||||||
+ request_same_session = 1;
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
case 'f':
|
|
||||||
fast_startup = true;
|
|
||||||
break;
|
|
||||||
@@ -725,6 +753,9 @@
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ if (request_same_session || !command || !pw->pw_uid)
|
|
||||||
+ same_session = 1;
|
|
||||||
+
|
|
||||||
if (!shell && !change_environment)
|
|
||||||
shell = getenv ("SHELL");
|
|
||||||
if (shell && getuid () != 0 && restricted_shell (pw->pw_shell))
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
diff -uNrp -x '*~' coreutils-5.97-orig/src/su.c coreutils-5.97/src/su.c
|
|
||||||
--- coreutils-5.97-orig/src/su.c 2006-07-13 12:14:40.000000000 +0100
|
|
||||||
+++ coreutils-5.97/src/su.c 2006-07-13 12:24:33.000000000 +0100
|
|
||||||
@@ -131,11 +131,15 @@
|
|
||||||
|
|
||||||
#include "error.h"
|
|
||||||
|
|
||||||
-/* The official name of this program (e.g., no `g' prefix). */
|
|
||||||
+/* The official name of this program (e.g., no `g' prefix).
|
|
||||||
+ * - Add a "-l" to the name passed to PAM if this is a login simulation
|
|
||||||
+ */
|
|
||||||
#ifndef RUNUSER
|
|
||||||
#define PROGRAM_NAME "su"
|
|
||||||
+#define PROGRAM_NAME_L "su-l"
|
|
||||||
#else
|
|
||||||
#define PROGRAM_NAME "runuser"
|
|
||||||
+#define PROGRAM_NAME_L "runuser-l"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef AUTHORS
|
|
||||||
@@ -310,7 +314,8 @@ correct_password (const struct passwd *p
|
|
||||||
#ifdef USE_PAM
|
|
||||||
struct passwd *caller;
|
|
||||||
char *tty_name, *ttyn;
|
|
||||||
- retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
|
|
||||||
+ retval = pam_start(simulate_login ? PROGRAM_NAME_L : PROGRAM_NAME,
|
|
||||||
+ pw->pw_name, &conv, &pamh);
|
|
||||||
PAM_BAIL_P;
|
|
||||||
|
|
||||||
#ifndef RUNUSER
|
|
||||||
diff -urp coreutils-6.10-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info
|
|
||||||
--- coreutils-6.10-orig/doc/coreutils.info 2008-01-22 00:32:44.000000000 +0100
|
|
||||||
+++ coreutils-6.10/doc/coreutils.info 2008-01-24 17:17:04.000000000 +0100
|
|
||||||
@@ -11006,7 +11006,8 @@ options::.
|
|
||||||
set, even for the super-user, as described above), and set `PATH'
|
|
||||||
to a compiled-in default value. Change to USER's home directory.
|
|
||||||
Prepend `-' to the shell's name, intended to make it read its
|
|
||||||
- login startup file(s).
|
|
||||||
+ login startup file(s). When this option is given, /etc/pam.d/su-l
|
|
||||||
+ PAM file is used instead of the default one.
|
|
||||||
|
|
||||||
`-m'
|
|
||||||
`-p'
|
|
||||||
diff -urp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi
|
|
||||||
--- coreutils-6.10-orig/doc/coreutils.texi 2008-01-24 16:50:57.000000000 +0100
|
|
||||||
+++ coreutils-6.10/doc/coreutils.texi 2008-01-24 17:12:58.000000000 +0100
|
|
||||||
@@ -13670,7 +13670,9 @@ the exit status of @var{command} otherwi
|
|
||||||
|
|
||||||
@command{su} allows one user to temporarily become another user. It runs a
|
|
||||||
command (often an interactive shell) with the real and effective user
|
|
||||||
-ID, group ID, and supplemental groups of a given @var{user}. Synopsis:
|
|
||||||
+ID, group ID, and supplemental groups of a given @var{user}. When the -l
|
|
||||||
+option is given, the su-l PAM file is used instead of the default su PAM file.
|
|
||||||
+Synopsis:
|
|
||||||
|
|
||||||
@example
|
|
||||||
su [@var{option}]@dots{} [@var{user} [@var{arg}]@dots{}]
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
#%PAM-1.0
|
|
||||||
auth include su
|
|
||||||
account include su
|
|
||||||
password include su
|
|
||||||
session optional pam_keyinit.so force revoke
|
|
||||||
session include su
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
#%PAM-1.0
|
|
||||||
auth sufficient pam_rootok.so
|
|
||||||
# Uncomment the following line to implicitly trust users in the "wheel" group.
|
|
||||||
#auth sufficient pam_wheel.so trust use_uid
|
|
||||||
# Uncomment the following line to require a user to be in the "wheel" group.
|
|
||||||
#auth required pam_wheel.so use_uid
|
|
||||||
auth include system-auth
|
|
||||||
account sufficient pam_succeed_if.so uid = 0 use_uid quiet
|
|
||||||
account include system-auth
|
|
||||||
password include system-auth
|
|
||||||
session include system-auth
|
|
||||||
session optional pam_xauth.so
|
|
||||||
1841
coreutils.spec
1841
coreutils.spec
File diff suppressed because it is too large
Load diff
|
|
@ -1,18 +0,0 @@
|
||||||
--- sh-utils-1.16/src/su.c.badpaths Mon Apr 14 14:26:55 1997
|
|
||||||
+++ sh-utils-1.16/src/su.c Sun Aug 17 14:11:31 EDT 2003
|
|
||||||
@@ -147,6 +147,15 @@
|
|
||||||
#define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* The default paths which get set are both bogus and oddly influenced
|
|
||||||
+ by <paths.h> and -D on the commands line. Just to be clear, we'll set
|
|
||||||
+ these explicitly. -ewt */
|
|
||||||
+#undef DEFAULT_LOGIN_PATH
|
|
||||||
+#undef DEFAULT_ROOT_LOGIN_PATH
|
|
||||||
+#define DEFAULT_LOGIN_PATH "/usr/local/bin:/bin:/usr/bin"
|
|
||||||
+#define DEFAULT_ROOT_LOGIN_PATH \
|
|
||||||
+ "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
|
|
||||||
+
|
|
||||||
/* The shell to run if none is given in the user's passwd entry. */
|
|
||||||
#define DEFAULT_SHELL "/bin/sh"
|
|
||||||
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
--- coreutils-5.92/man/date.1.dateman 2005-10-22 19:14:46.000000000 +0100
|
|
||||||
+++ coreutils-5.92/man/date.1 2005-10-24 17:57:38.000000000 +0100
|
|
||||||
@@ -188,6 +188,11 @@
|
|
||||||
then an optional modifier, which is either
|
|
||||||
E to use the locale's alternate representations if available, or
|
|
||||||
O to use the locale's alternate numeric symbols if available.
|
|
||||||
+.SH ENVIRONMENT
|
|
||||||
+.TP
|
|
||||||
+TZ
|
|
||||||
+Specifies the timezone, unless overridden by command line parameters.
|
|
||||||
+If neither is specified, the setting from /etc/localtime is used.
|
|
||||||
.SH AUTHOR
|
|
||||||
Written by David MacKenzie.
|
|
||||||
.SH "REPORTING BUGS"
|
|
||||||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
||||||
23582a4e8b21e837cfbafbc3834a8a4b coreutils-6.10.tar.lzma
|
SHA512 (coreutils-9.9.tar.xz.sig) = 0a3dfdfa6b4234e2e1d42142269f959bdf3cf8f6605a50270a27eff84dd22588f182121f7dd3eeb04be45f5109d02690215065b3d3b43882874d0e165a1435d0
|
||||||
|
SHA512 (coreutils-9.9.tar.xz) = e7b0e59f7732d2c098ea4934014f470248bd5c4764210e9200a698010a8e3b95bbb26e543f0cd73ed5a4b8e1f8cda932c73f39954d68175e4deaa47526610c65
|
||||||
|
|
|
||||||
105
supported_utils
Normal file
105
supported_utils
Normal file
|
|
@ -0,0 +1,105 @@
|
||||||
|
%{_bindir}/arch
|
||||||
|
%{_bindir}/b2sum
|
||||||
|
%{_bindir}/basename
|
||||||
|
%{_bindir}/basenc
|
||||||
|
%{_bindir}/cat
|
||||||
|
%{_bindir}/chgrp
|
||||||
|
%{_bindir}/chmod
|
||||||
|
%{_bindir}/chown
|
||||||
|
%{_bindir}/cp
|
||||||
|
%{_bindir}/cut
|
||||||
|
%{_bindir}/date
|
||||||
|
%{_bindir}/dd
|
||||||
|
%{_bindir}/df
|
||||||
|
%{_bindir}/echo
|
||||||
|
%{_bindir}/env
|
||||||
|
%{_bindir}/false
|
||||||
|
%{_bindir}/link
|
||||||
|
%{_bindir}/ln
|
||||||
|
%{_bindir}/ls
|
||||||
|
%{_bindir}/mkdir
|
||||||
|
%{_bindir}/mknod
|
||||||
|
%{_bindir}/mv
|
||||||
|
%{_bindir}/nice
|
||||||
|
%{_bindir}/pwd
|
||||||
|
%{_bindir}/readlink
|
||||||
|
%{_bindir}/rm
|
||||||
|
%{_bindir}/rmdir
|
||||||
|
%{_bindir}/sleep
|
||||||
|
%{_bindir}/sort
|
||||||
|
%{_bindir}/stty
|
||||||
|
%{_bindir}/sync
|
||||||
|
%{_bindir}/mktemp
|
||||||
|
%{_bindir}/touch
|
||||||
|
%{_bindir}/true
|
||||||
|
%{_bindir}/uname
|
||||||
|
%{_bindir}/unlink
|
||||||
|
%{_bindir}/[
|
||||||
|
%{_bindir}/base32
|
||||||
|
%{_bindir}/base64
|
||||||
|
%{_bindir}/chcon
|
||||||
|
%{_bindir}/cksum
|
||||||
|
%{_bindir}/comm
|
||||||
|
%{_bindir}/csplit
|
||||||
|
%{_bindir}/dir
|
||||||
|
%{_bindir}/dircolors
|
||||||
|
%{_bindir}/dirname
|
||||||
|
%{_bindir}/du
|
||||||
|
%{_bindir}/expand
|
||||||
|
%{_bindir}/expr
|
||||||
|
%{_bindir}/factor
|
||||||
|
%{_bindir}/fmt
|
||||||
|
%{_bindir}/fold
|
||||||
|
%{_bindir}/groups
|
||||||
|
%{_bindir}/head
|
||||||
|
%{_bindir}/hostid
|
||||||
|
%{_bindir}/id
|
||||||
|
%{_bindir}/install
|
||||||
|
%{_bindir}/join
|
||||||
|
%{_bindir}/logname
|
||||||
|
%{_bindir}/md5sum
|
||||||
|
%{_bindir}/mkfifo
|
||||||
|
%{_bindir}/nl
|
||||||
|
%{_bindir}/nohup
|
||||||
|
%{_bindir}/nproc
|
||||||
|
%{_bindir}/numfmt
|
||||||
|
%{_bindir}/od
|
||||||
|
%{_bindir}/paste
|
||||||
|
%{_bindir}/pathchk
|
||||||
|
%{_bindir}/pinky
|
||||||
|
%{_bindir}/pr
|
||||||
|
%{_bindir}/printenv
|
||||||
|
%{_bindir}/printf
|
||||||
|
%{_bindir}/ptx
|
||||||
|
%{_bindir}/realpath
|
||||||
|
%{_bindir}/runcon
|
||||||
|
%{_bindir}/seq
|
||||||
|
%{_bindir}/sha1sum
|
||||||
|
%{_bindir}/sha224sum
|
||||||
|
%{_bindir}/sha256sum
|
||||||
|
%{_bindir}/sha384sum
|
||||||
|
%{_bindir}/sha512sum
|
||||||
|
%{_bindir}/shred
|
||||||
|
%{_bindir}/shuf
|
||||||
|
%{_bindir}/split
|
||||||
|
%{_bindir}/stat
|
||||||
|
%{_bindir}/stdbuf
|
||||||
|
%{_bindir}/sum
|
||||||
|
%{_bindir}/tac
|
||||||
|
%{_bindir}/tail
|
||||||
|
%{_bindir}/tee
|
||||||
|
%{_bindir}/test
|
||||||
|
%{_bindir}/timeout
|
||||||
|
%{_bindir}/tr
|
||||||
|
%{_bindir}/truncate
|
||||||
|
%{_bindir}/tsort
|
||||||
|
%{_bindir}/tty
|
||||||
|
%{_bindir}/unexpand
|
||||||
|
%{_bindir}/uniq
|
||||||
|
%{_bindir}/users
|
||||||
|
%{_bindir}/vdir
|
||||||
|
%{_bindir}/wc
|
||||||
|
%{_bindir}/who
|
||||||
|
%{_bindir}/whoami
|
||||||
|
%{_bindir}/yes
|
||||||
|
%{_sbindir}/chroot
|
||||||
123
upstream-key.gpg
123
upstream-key.gpg
|
|
@ -1,123 +0,0 @@
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
Version: GnuPG v1.4.6 (GNU/Linux)
|
|
||||||
|
|
||||||
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
|
|
||||||
Ke4=
|
|
||||||
=zRdO
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue