| 1 |
commit: 8f2c2fc509094788dbe34dcc66a2a24ea697ece5 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 12 23:46:07 2013 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 29 21:30:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=8f2c2fc5 |
| 7 |
|
| 8 |
sys-fs/eudev: switch from strndup to a buffer |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.12.2 |
| 11 |
|
| 12 |
--- |
| 13 |
sys-fs/eudev/eudev-1.1.ebuild | 1 + |
| 14 |
sys-fs/eudev/files/eudev-1.1-musl.patch | 13 ++++++++----- |
| 15 |
2 files changed, 9 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-fs/eudev/eudev-1.1.ebuild b/sys-fs/eudev/eudev-1.1.ebuild |
| 18 |
index 164d374..7a4699c 100644 |
| 19 |
--- a/sys-fs/eudev/eudev-1.1.ebuild |
| 20 |
+++ b/sys-fs/eudev/eudev-1.1.ebuild |
| 21 |
@@ -132,6 +132,7 @@ src_configure() |
| 22 |
--with-rootlibdir=/$(get_libdir) |
| 23 |
--enable-split-usr |
| 24 |
--exec-prefix=/ |
| 25 |
+ --disable-manpages |
| 26 |
$(use_enable doc gtk-doc) |
| 27 |
$(use_enable gudev) |
| 28 |
$(use_enable introspection) |
| 29 |
|
| 30 |
diff --git a/sys-fs/eudev/files/eudev-1.1-musl.patch b/sys-fs/eudev/files/eudev-1.1-musl.patch |
| 31 |
index 45da1ba..ffd5719 100644 |
| 32 |
--- a/sys-fs/eudev/files/eudev-1.1-musl.patch |
| 33 |
+++ b/sys-fs/eudev/files/eudev-1.1-musl.patch |
| 34 |
@@ -25,7 +25,6 @@ index 68a06b9..595456d 100644 |
| 35 |
#include <sys/types.h> |
| 36 |
#include <sys/stat.h> |
| 37 |
diff --git a/src/libudev/path-util.c b/src/libudev/path-util.c |
| 38 |
-index fd67310..87f47a5 100644 |
| 39 |
--- a/src/libudev/path-util.c |
| 40 |
+++ b/src/libudev/path-util.c |
| 41 |
@@ -152,7 +152,7 @@ char **path_strv_canonicalize(char **l) { |
| 42 |
@@ -54,12 +53,17 @@ diff --git a/src/udev/mkdir.c b/src/udev/mkdir.c |
| 43 |
index 420a9eb..5576fbc 100644 |
| 44 |
--- a/src/udev/mkdir.c |
| 45 |
+++ b/src/udev/mkdir.c |
| 46 |
-@@ -90,7 +90,7 @@ static int mkdir_parents_internal(const char *prefix, const char *path, mode_t m |
| 47 |
+@@ -90,7 +90,12 @@ static int mkdir_parents_internal(const char *prefix, const char *path, mode_t m |
| 48 |
if (e == path) |
| 49 |
return 0; |
| 50 |
|
| 51 |
- p = strndupa(path, e - path); |
| 52 |
-+ p = strndup(path, e - path); |
| 53 |
++ char buf[PATH_MAX]; |
| 54 |
++ p = buf; |
| 55 |
++ assert(e-path < sizeof(p)); |
| 56 |
++ memcpy(buf, path, e-path); |
| 57 |
++ buf[e-path] = 0; |
| 58 |
++ |
| 59 |
r = is_dir(p); |
| 60 |
if (r > 0) |
| 61 |
return 0; |
| 62 |
@@ -67,7 +71,7 @@ diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c |
| 63 |
index 8f5b1cb..d68dce9 100644 |
| 64 |
--- a/src/udev/udevadm-hwdb.c |
| 65 |
+++ b/src/udev/udevadm-hwdb.c |
| 66 |
-@@ -123,10 +123,12 @@ static void trie_node_cleanup(struct trie_node *node) { |
| 67 |
+@@ -123,10 +128,12 @@ static void trie_node_cleanup(struct trie_node *node) { |
| 68 |
free(node); |
| 69 |
} |
| 70 |
|
| 71 |
@@ -93,7 +97,6 @@ index 8f5b1cb..d68dce9 100644 |
| 72 |
} |
| 73 |
|
| 74 |
diff --git a/src/udev/udevd.c b/src/udev/udevd.c |
| 75 |
-index a923ce7..7dc9f03 100644 |
| 76 |
--- a/src/udev/udevd.c |
| 77 |
+++ b/src/udev/udevd.c |
| 78 |
@@ -1214,15 +1214,8 @@ int main(int argc, char *argv[]) |
Archives