| 1 |
commit: 50c1dd83e74b9edada2cddfce7863e06da7ab60e |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 22 23:30:52 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 22 23:30:52 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=50c1dd83 |
| 7 |
|
| 8 |
sys-boot/lilo: don't use O_ACCMODE nor O_NOACCESS. |
| 9 |
|
| 10 |
sys-boot/lilo/Manifest | 3 ++- |
| 11 |
sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch | 17 +++++++++++++++++ |
| 12 |
sys-boot/lilo/lilo-24.1.ebuild | 1 + |
| 13 |
3 files changed, 20 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest |
| 16 |
index 39eac8d..d62b99b 100644 |
| 17 |
--- a/sys-boot/lilo/Manifest |
| 18 |
+++ b/sys-boot/lilo/Manifest |
| 19 |
@@ -1,7 +1,8 @@ |
| 20 |
AUX lilo-24.1-novga.patch 500 SHA256 4911147939095f0315ea6f6e48fe53e9daaf8917b5bc3c254f56a1c8d4f37b10 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300 WHIRLPOOL 4b9a8ed4d99a6ce6ee3d80ec63d822a6b5d3c18e4d621b7b9037fa9a3f272d118e81d1ae9cbe754ded7eef7b15aeb4e3b8130008d4a536c5357837f732a71781 |
| 21 |
+AUX lilo-24.1-remove-O_ACCMODE.patch 493 SHA256 d93d221b784aa5be60fc16ec05325cc9b36904614dbc580f97df776e16253351 SHA512 a053dce3107e860dcce30453ae80cf15c3871655bcbbbb9c19942eb609e6d5973d9b9b97c543fe422c41691450756507ae9bf0143fd13e903b19b2c0a5d922c3 WHIRLPOOL eee9b4b3861fec44c5ab8b8addde0e9be4ab34d34f45c610d742110f2896654b70888e4b4d7d5427476c777baa48b72569ec7a6b3e4d250cc83aeb78277a493d |
| 22 |
AUX lilo-24.1-remove__GLIBC__.patch 475 SHA256 1a60d6ea0fa2f056de918e26a37b127e8fbc4e88d7e056698aada049679a2116 SHA512 5f9556f5e42f20d5a4545599c8cea4df1f4d8e3ff20a51a3b388a9729016c43eefa2b8ff56daa829d53d972ab0393269bbe46d259364102225fd976977c8372b WHIRLPOOL 206b97f5c2d2ef8a3bd097f894c800268339130b4c92b1b0f1955c0f513c77ff76ec8ceac37c296055832e8d27b5f9696c005b7f42fa2504e2d07c08f378093c |
| 23 |
AUX lilo.conf 1722 SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0 SHA512 3e456b950d6f6fa9d1a223e11d60b1679105d97007617f648da5719a1cc9944cb1277849f642faee58038005057c2ed3af1bd635c5c87ec35505cd464e340f49 WHIRLPOOL d6d3749971c7cceba79feef2ed130a0250ecb6961e161aa8850ad99f2272d8cf94dbf2d952abd6b67843040c9623df6b7346d32eb12a9d6586d4c54d1ea875a9 |
| 24 |
DIST dolilo-0.6.tar.bz2 3817 SHA256 01293874aea4cfa935d3f22fd52c8f4956e4a85b39a878df1255098825f2840e SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 WHIRLPOOL 7a24cf7bf4b476967a5d4ba2234ce3256ff9311744be020ef25e6227f8e86098aac89706d23df30d3f0212aa3fe313c0460d1709990b21029d93517b77f61e4e |
| 25 |
DIST lilo-24.1.tar.gz 773223 SHA256 a15280edacb8bca31b9163d65e61270b8c06cb9ffea74374a3a42164a13d4532 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883 WHIRLPOOL 6534b9494cce30c56f0ec700eb8288ebfdfb9e07ed631958e3f34d03d4fb42de372237dab5d07a8b8ef1c3da49b427d3777be14de9abca339dcd184fce550ab0 |
| 26 |
-EBUILD lilo-24.1.ebuild 4514 SHA256 06c3fabf91215c5b8b3d22e0a7a936571556eb7c69cee1a85b9487b4191e9251 SHA512 c9f25719e79da0d124bbabd543fd56b3886756794cd084f13f21c501802eb43f0ccc4aa7108983697ef957fe9097ec90c399e6b13e887df8251bdef7c2be84b5 WHIRLPOOL 787d5f4b1d89fb08c4c6c0ac5215d39a4c1ff4898940478e2fb67044da298b4920d577b255566e41e319fbd081af363652eb37447f876c4c990215637ea371d7 |
| 27 |
+EBUILD lilo-24.1.ebuild 4564 SHA256 2a25fb7bd179f31652f3cae98fadfc25467db509d86b6c5d3d8dae80f6552bde SHA512 f9d71eae845650fcdf18c91cb3b841afa198062e05cb96c7721ea6b6c7effe191ffbf7b36aab9ecf0650770a2ba813ad7c996870af24e0dabe97993cf1a33827 WHIRLPOOL 52548e76442b14d1f5b8e866fdc4ebc4b13334481b7c534c86f56e641cd9421ce0ca974f9e792a0891305503f294fc4d99112449f87e70290f5279ae0ce011e7 |
| 28 |
MISC metadata.xml 504 SHA256 4cd65dd103dd97351619de30c8a8eab3f344cb43041a2377e3d8ef8cd9470500 SHA512 decf3fe5ba2137e315f5a7ab428dabff096d01b9eecbce6869e3f33e15f2daaffba450dea1a824ada9ac88a0c2eaaa9160234990c6e0c0e13a75b1c94f0352c0 WHIRLPOOL fc6a70bf788fb0314c8c49012a403212ca080a35ac03277ca254eb29f050276c8e0b366e3258b3ae20e3050b2a72a9f45535a4c313c2f122b413b4ec80e744ca |
| 29 |
|
| 30 |
diff --git a/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch b/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch |
| 31 |
new file mode 100644 |
| 32 |
index 0000000..98e9212 |
| 33 |
--- /dev/null |
| 34 |
+++ b/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch |
| 35 |
@@ -0,0 +1,17 @@ |
| 36 |
+diff -Naur lilo-24.1.orig/src/common.h lilo-24.1/src/common.h |
| 37 |
+--- lilo-24.1.orig/src/common.h 2011-06-22 03:13:27.000000000 -0400 |
| 38 |
++++ lilo-24.1/src/common.h 2015-07-22 19:27:06.272990549 -0400 |
| 39 |
+@@ -23,12 +23,7 @@ |
| 40 |
+ # define PAGE_SIZE 4096U |
| 41 |
+ #endif |
| 42 |
+ |
| 43 |
+-#ifdef O_ACCMODE |
| 44 |
+-# define O_NOACCESS O_ACCMODE |
| 45 |
+-#else |
| 46 |
+-/* open a file for "no access" */ |
| 47 |
+-# define O_NOACCESS 3 |
| 48 |
+-#endif |
| 49 |
++#define O_NOACCESS O_RDONLY |
| 50 |
+ |
| 51 |
+ /* special for LILO, bypass the actual open in dev_open( , ,-1) */ |
| 52 |
+ #define O_BYPASS -1 |
| 53 |
|
| 54 |
diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild |
| 55 |
index 026d302..839f3fd 100644 |
| 56 |
--- a/sys-boot/lilo/lilo-24.1.ebuild |
| 57 |
+++ b/sys-boot/lilo/lilo-24.1.ebuild |
| 58 |
@@ -33,6 +33,7 @@ src_prepare() { |
| 59 |
|
| 60 |
# Remove reference to __GLIBC__ for musl. |
| 61 |
epatch "${FILESDIR}"/${P}-remove__GLIBC__.patch |
| 62 |
+ epatch "${FILESDIR}"/${P}-remove-O_ACCMODE.patch |
| 63 |
|
| 64 |
# Do not strip and have parallel make |
| 65 |
# FIXME: images/Makefile does weird stuff |
Archives