1 |
commit: 18687fccebb05fee5dbbab6308e26a205fcec718 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 5 06:44:12 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 5 06:44:57 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18687fcc |
7 |
|
8 |
net-libs/libnftnl: backport symbol export fix |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../libnftnl-1.2.1-missing-export-set_elem.patch | 21 +++++++++++++++++++++ |
13 |
...ibnftnl-9999.ebuild => libnftnl-1.2.1-r1.ebuild} | 21 ++++++++++++++------- |
14 |
net-libs/libnftnl/libnftnl-9999.ebuild | 21 ++++++++++++++------- |
15 |
3 files changed, 49 insertions(+), 14 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..0ff574ddc48a |
20 |
--- /dev/null |
21 |
+++ b/net-libs/libnftnl/files/libnftnl-1.2.1-missing-export-set_elem.patch |
22 |
@@ -0,0 +1,21 @@ |
23 |
+https://git.netfilter.org/libnftnl/commit/?id=accee9a75e0e6678863d092d6a4f4afbadf0eed9 |
24 |
+ |
25 |
+From: Pablo Neira Ayuso <pablo@×××××××××.org> |
26 |
+Date: Wed, 18 May 2022 23:54:03 +0200 |
27 |
+Subject: set_elem: missing export symbol |
28 |
+ |
29 |
+nftnl_set_elem_nlmsg_build_payload() is already available through .map |
30 |
+file and headers, add missing EXPORT_SYMBOL. |
31 |
+ |
32 |
+Signed-off-by: Pablo Neira Ayuso <pablo@×××××××××.org> |
33 |
+--- a/src/set_elem.c |
34 |
++++ b/src/set_elem.c |
35 |
+@@ -300,6 +300,7 @@ err: |
36 |
+ return NULL; |
37 |
+ } |
38 |
+ |
39 |
++EXPORT_SYMBOL(nftnl_set_elem_nlmsg_build_payload); |
40 |
+ void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, |
41 |
+ struct nftnl_set_elem *e) |
42 |
+ { |
43 |
+cgit v1.2.3 |
44 |
|
45 |
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-1.2.1-r1.ebuild |
46 |
similarity index 79% |
47 |
copy from net-libs/libnftnl/libnftnl-9999.ebuild |
48 |
copy to net-libs/libnftnl/libnftnl-1.2.1-r1.ebuild |
49 |
index 215d4c569086..49e48df43765 100644 |
50 |
--- a/net-libs/libnftnl/libnftnl-9999.ebuild |
51 |
+++ b/net-libs/libnftnl/libnftnl-1.2.1-r1.ebuild |
52 |
@@ -3,33 +3,36 @@ |
53 |
|
54 |
EAPI=7 |
55 |
|
56 |
-inherit autotools linux-info usr-ldscript verify-sig |
57 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc |
58 |
+inherit linux-info usr-ldscript verify-sig |
59 |
|
60 |
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" |
61 |
HOMEPAGE="https://netfilter.org/projects/nftables/" |
62 |
|
63 |
if [[ ${PV} =~ ^[9]{4,}$ ]]; then |
64 |
- inherit git-r3 |
65 |
+ inherit autotools git-r3 |
66 |
EGIT_REPO_URI="https://git.netfilter.org/${PN}" |
67 |
else |
68 |
SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2 |
69 |
verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" |
70 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" |
71 |
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc |
72 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
73 |
+ |
74 |
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" |
75 |
fi |
76 |
|
77 |
LICENSE="GPL-2" |
78 |
SLOT="0/11" # libnftnl.so version |
79 |
IUSE="examples static-libs test" |
80 |
- |
81 |
RESTRICT="!test? ( test )" |
82 |
|
83 |
RDEPEND=">=net-libs/libmnl-1.0.4:=" |
84 |
-BDEPEND+=" |
85 |
- virtual/pkgconfig" |
86 |
+BDEPEND+=" virtual/pkgconfig" |
87 |
DEPEND="${RDEPEND}" |
88 |
|
89 |
+PATCHES=( |
90 |
+ "${FILESDIR}"/${P}-missing-export-set_elem.patch |
91 |
+) |
92 |
+ |
93 |
pkg_setup() { |
94 |
if kernel_is ge 3 13; then |
95 |
CONFIG_CHECK="~NF_TABLES" |
96 |
@@ -41,6 +44,7 @@ pkg_setup() { |
97 |
|
98 |
src_prepare() { |
99 |
default |
100 |
+ |
101 |
[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf |
102 |
} |
103 |
|
104 |
@@ -48,12 +52,15 @@ src_configure() { |
105 |
local myeconfargs=( |
106 |
$(use_enable static-libs static) |
107 |
) |
108 |
+ |
109 |
econf "${myeconfargs[@]}" |
110 |
} |
111 |
|
112 |
src_install() { |
113 |
default |
114 |
+ |
115 |
gen_usr_ldscript -a nftnl |
116 |
+ |
117 |
find "${ED}" -type f -name '*.la' -delete || die |
118 |
|
119 |
if use examples; then |
120 |
|
121 |
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild |
122 |
index 215d4c569086..49e48df43765 100644 |
123 |
--- a/net-libs/libnftnl/libnftnl-9999.ebuild |
124 |
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild |
125 |
@@ -3,33 +3,36 @@ |
126 |
|
127 |
EAPI=7 |
128 |
|
129 |
-inherit autotools linux-info usr-ldscript verify-sig |
130 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc |
131 |
+inherit linux-info usr-ldscript verify-sig |
132 |
|
133 |
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" |
134 |
HOMEPAGE="https://netfilter.org/projects/nftables/" |
135 |
|
136 |
if [[ ${PV} =~ ^[9]{4,}$ ]]; then |
137 |
- inherit git-r3 |
138 |
+ inherit autotools git-r3 |
139 |
EGIT_REPO_URI="https://git.netfilter.org/${PN}" |
140 |
else |
141 |
SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2 |
142 |
verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" |
143 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" |
144 |
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc |
145 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
146 |
+ |
147 |
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" |
148 |
fi |
149 |
|
150 |
LICENSE="GPL-2" |
151 |
SLOT="0/11" # libnftnl.so version |
152 |
IUSE="examples static-libs test" |
153 |
- |
154 |
RESTRICT="!test? ( test )" |
155 |
|
156 |
RDEPEND=">=net-libs/libmnl-1.0.4:=" |
157 |
-BDEPEND+=" |
158 |
- virtual/pkgconfig" |
159 |
+BDEPEND+=" virtual/pkgconfig" |
160 |
DEPEND="${RDEPEND}" |
161 |
|
162 |
+PATCHES=( |
163 |
+ "${FILESDIR}"/${P}-missing-export-set_elem.patch |
164 |
+) |
165 |
+ |
166 |
pkg_setup() { |
167 |
if kernel_is ge 3 13; then |
168 |
CONFIG_CHECK="~NF_TABLES" |
169 |
@@ -41,6 +44,7 @@ pkg_setup() { |
170 |
|
171 |
src_prepare() { |
172 |
default |
173 |
+ |
174 |
[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf |
175 |
} |
176 |
|
177 |
@@ -48,12 +52,15 @@ src_configure() { |
178 |
local myeconfargs=( |
179 |
$(use_enable static-libs static) |
180 |
) |
181 |
+ |
182 |
econf "${myeconfargs[@]}" |
183 |
} |
184 |
|
185 |
src_install() { |
186 |
default |
187 |
+ |
188 |
gen_usr_ldscript -a nftnl |
189 |
+ |
190 |
find "${ED}" -type f -name '*.la' -delete || die |
191 |
|
192 |
if use examples; then |