| 1 |
commit: c91aab7ed97c3970611e11f91e4c83a230db5b98 |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 6 06:23:22 2021 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 6 06:32:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91aab7e |
| 7 |
|
| 8 |
net-fs/autofs: fix dmalloc compiling err |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
| 12 |
|
| 13 |
net-fs/autofs/autofs-5.1.8.ebuild | 2 + |
| 14 |
net-fs/autofs/files/autofs-5.1.8-dmalloc.patch | 53 ++++++++++++++++++++++++++ |
| 15 |
2 files changed, 55 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-fs/autofs/autofs-5.1.8.ebuild b/net-fs/autofs/autofs-5.1.8.ebuild |
| 18 |
index ede180337421..3c519f852c70 100644 |
| 19 |
--- a/net-fs/autofs/autofs-5.1.8.ebuild |
| 20 |
+++ b/net-fs/autofs/autofs-5.1.8.ebuild |
| 21 |
@@ -43,6 +43,8 @@ PATCHES=( |
| 22 |
"${FILESDIR}/${PN}-5.1.7-glibc.patch" |
| 23 |
"${FILESDIR}/${PN}-5.1.6-musl.patch" |
| 24 |
"${FILESDIR}/${PN}-5.1.6-pid.patch" |
| 25 |
+ "${FILESDIR}/${PN}-5.1.6-pid.patch" |
| 26 |
+ "${FILESDIR}/${P}-dmalloc.patch" |
| 27 |
) |
| 28 |
|
| 29 |
pkg_setup() { |
| 30 |
|
| 31 |
diff --git a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch |
| 32 |
new file mode 100644 |
| 33 |
index 000000000000..e2ed58fb1766 |
| 34 |
--- /dev/null |
| 35 |
+++ b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch |
| 36 |
@@ -0,0 +1,53 @@ |
| 37 |
+diff --git a/include/mounts.h b/include/mounts.h |
| 38 |
+index ddb7e4c..854e1fb 100644 |
| 39 |
+--- a/include/mounts.h |
| 40 |
++++ b/include/mounts.h |
| 41 |
+@@ -84,7 +84,7 @@ typedef void (*tree_free_t) (struct tree_node *n); |
| 42 |
+ struct tree_ops { |
| 43 |
+ tree_new_t new; |
| 44 |
+ tree_cmp_t cmp; |
| 45 |
+- tree_free_t free; |
| 46 |
++ tree_free_t set_free; |
| 47 |
+ }; |
| 48 |
+ |
| 49 |
+ typedef int (*tree_work_fn_t) (struct tree_node *n, void *ptr); |
| 50 |
+diff --git a/lib/mounts.c b/lib/mounts.c |
| 51 |
+index 4c86688..1e54a33 100644 |
| 52 |
+--- a/lib/mounts.c |
| 53 |
++++ b/lib/mounts.c |
| 54 |
+@@ -75,7 +75,7 @@ static void tree_mnt_free(struct tree_node *n); |
| 55 |
+ static struct tree_ops mnt_ops = { |
| 56 |
+ .new = tree_mnt_new, |
| 57 |
+ .cmp = tree_mnt_cmp, |
| 58 |
+- .free = tree_mnt_free, |
| 59 |
++ .set_free = tree_mnt_free, |
| 60 |
+ }; |
| 61 |
+ static struct tree_ops *tree_mnt_ops = &mnt_ops; |
| 62 |
+ |
| 63 |
+@@ -86,7 +86,7 @@ static void tree_host_free(struct tree_node *n); |
| 64 |
+ static struct tree_ops host_ops = { |
| 65 |
+ .new = tree_host_new, |
| 66 |
+ .cmp = tree_host_cmp, |
| 67 |
+- .free = tree_host_free, |
| 68 |
++ .set_free = tree_host_free, |
| 69 |
+ }; |
| 70 |
+ static struct tree_ops *tree_host_ops = &host_ops; |
| 71 |
+ |
| 72 |
+@@ -97,7 +97,7 @@ static void tree_mapent_free(struct tree_node *n); |
| 73 |
+ static struct tree_ops mapent_ops = { |
| 74 |
+ .new = tree_mapent_new, |
| 75 |
+ .cmp = tree_mapent_cmp, |
| 76 |
+- .free = tree_mapent_free, |
| 77 |
++ .set_free = tree_mapent_free, |
| 78 |
+ }; |
| 79 |
+ static struct tree_ops *tree_mapent_ops = &mapent_ops; |
| 80 |
+ |
| 81 |
+@@ -1360,7 +1360,7 @@ void tree_free(struct tree_node *root) |
| 82 |
+ tree_free(root->right); |
| 83 |
+ if (root->left) |
| 84 |
+ tree_free(root->left); |
| 85 |
+- ops->free(root); |
| 86 |
++ ops->set_free(root); |
| 87 |
+ } |
| 88 |
+ |
| 89 |
+ int tree_traverse_inorder(struct tree_node *n, tree_work_fn_t work, void *ptr) |
Archives