1 |
commit: 6eafa0eea6cf020bdb7a44c4b7295eade87cf2c4 |
2 |
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Sep 28 12:23:34 2016 +0000 |
4 |
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
5 |
CommitDate: Wed Sep 28 12:23:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6eafa0ee |
7 |
|
8 |
sys-freebsd: initial version of 11.0 |
9 |
|
10 |
sys-freebsd/boot0/boot0-11.0.ebuild | 14 +- |
11 |
sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild | 5 + |
12 |
.../files/freebsd-cddl-11.0-add-libs.patch | 87 ++++++ |
13 |
.../files/freebsd-cddl-11.0-workaround.patch | 12 + |
14 |
sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild | 16 +- |
15 |
.../files/freebsd-lib-11.0-bsdxml2expat.patch | 39 +++ |
16 |
.../files/freebsd-lib-11.0-liblink.patch | 62 ++++ |
17 |
.../files/freebsd-lib-11.0-libproc-libcxx.patch | 13 + |
18 |
.../files/freebsd-lib-11.0-libsysdecode.patch | 22 ++ |
19 |
.../files/freebsd-lib-11.0-workaround.patch | 12 + |
20 |
sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild | 33 +-- |
21 |
.../freebsd-libexec/freebsd-libexec-11.0.ebuild | 24 +- |
22 |
.../files/freebsd-mk-defs-11.0-gentoo.patch | 327 +++++++++++++++++++++ |
23 |
.../freebsd-mk-defs-11.0-libproc-libcxx.patch | 13 + |
24 |
.../files/freebsd-mk-defs-11.0-rename-libs.patch | 16 + |
25 |
.../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 5 +- |
26 |
.../freebsd-pam-modules-11.0.ebuild | 2 - |
27 |
.../files/freebsd-pf-11.0-libevent.patch | 13 + |
28 |
.../freebsd-pf/files/freebsd-pf-11.0-pflogd.patch | 13 + |
29 |
sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild | 11 +- |
30 |
.../files/freebsd-rescue-11.0-rename-libs.patch | 22 ++ |
31 |
.../freebsd-rescue/freebsd-rescue-11.0.ebuild | 7 +- |
32 |
sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild | 3 +- |
33 |
.../freebsd-share/freebsd-share-11.0.ebuild | 10 +- |
34 |
.../files/freebsd-sources-11.0-gentoo-gcc.patch | 13 + |
35 |
.../files/freebsd-sources-11.0-gentoo.patch | 13 + |
36 |
.../freebsd-sources/freebsd-sources-11.0.ebuild | 22 +- |
37 |
.../files/freebsd-ubin-11.0-setXid.patch | 147 +++++++++ |
38 |
sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild | 44 +-- |
39 |
.../files/freebsd-usbin-11.0-workaround.patch | 13 + |
40 |
.../freebsd-usbin/freebsd-usbin-11.0.ebuild | 10 +- |
41 |
31 files changed, 955 insertions(+), 88 deletions(-) |
42 |
|
43 |
diff --git a/sys-freebsd/boot0/boot0-11.0.ebuild b/sys-freebsd/boot0/boot0-11.0.ebuild |
44 |
index 49521d0..01d8eb7 100644 |
45 |
--- a/sys-freebsd/boot0/boot0-11.0.ebuild |
46 |
+++ b/sys-freebsd/boot0/boot0-11.0.ebuild |
47 |
@@ -23,15 +23,12 @@ EXTRACTONLY=" |
48 |
|
49 |
RDEPEND="" |
50 |
DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
51 |
- =sys-freebsd/freebsd-lib-${RV}*" |
52 |
+ =sys-freebsd/freebsd-lib-${RV}* |
53 |
+ !sparc-fbsd? ( sys-devel/clang )" |
54 |
|
55 |
S="${WORKDIR}/sys/boot" |
56 |
|
57 |
-PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch" |
58 |
- "${FILESDIR}/${PN}-10.3-clang.patch" |
59 |
- "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch" |
60 |
- "${FILESDIR}/${PN}-10.3-uefi-support.patch" |
61 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) |
62 |
+PATCHES=( "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) |
63 |
|
64 |
boot0_use_enable() { |
65 |
use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" |
66 |
@@ -46,12 +43,15 @@ pkg_setup() { |
67 |
} |
68 |
|
69 |
src_prepare() { |
70 |
+ use sparc-fbsd || export CC=clang |
71 |
+ |
72 |
sed -e '/-mno-align-long-strings/d' \ |
73 |
-i "${S}"/i386/boot2/Makefile \ |
74 |
-i "${S}"/i386/gptboot/Makefile \ |
75 |
-i "${S}"/i386/gptzfsboot/Makefile \ |
76 |
-i "${S}"/i386/zfsboot/Makefile || die |
77 |
|
78 |
+ mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes" |
79 |
export MAKEOBJDIRPREFIX="${WORKDIR}/build" |
80 |
} |
81 |
|
82 |
@@ -63,7 +63,7 @@ src_compile() { |
83 |
freebsd_src_compile |
84 |
|
85 |
CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" |
86 |
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand" |
87 |
+ LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand" |
88 |
export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" |
89 |
|
90 |
cd "${S}" || die |
91 |
|
92 |
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild |
93 |
index d4bf7e3..de7d832 100644 |
94 |
--- a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild |
95 |
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild |
96 |
@@ -40,3 +40,8 @@ REMOVE_SUBDIRS="csh rmail ed freebsd-version" |
97 |
pkg_setup() { |
98 |
mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " |
99 |
} |
100 |
+ |
101 |
+src_install() { |
102 |
+ dodir /usr/bin |
103 |
+ freebsd_src_install |
104 |
+} |
105 |
|
106 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch |
107 |
new file mode 100644 |
108 |
index 0000000..46f2521 |
109 |
--- /dev/null |
110 |
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch |
111 |
@@ -0,0 +1,87 @@ |
112 |
+diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile |
113 |
+index 1e386e5..a4c08ee 100644 |
114 |
+--- a/cddl/sbin/zfs/Makefile |
115 |
++++ b/cddl/sbin/zfs/Makefile |
116 |
+@@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs |
117 |
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
118 |
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
119 |
+ |
120 |
+-LIBADD= jail nvpair uutil zfs_core zfs |
121 |
++LIBADD= jail nvpair uutil zfs_core zfs umem avl |
122 |
+ |
123 |
+ .include <bsd.prog.mk> |
124 |
+diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile |
125 |
+index ebf0f90..c70a3c4 100644 |
126 |
+--- a/cddl/sbin/zpool/Makefile |
127 |
++++ b/cddl/sbin/zpool/Makefile |
128 |
+@@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
129 |
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
130 |
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
131 |
+ |
132 |
+-LIBADD= geom nvpair uutil zfs |
133 |
++LIBADD= geom nvpair uutil zfs umem avl zfs_core |
134 |
+ |
135 |
+ .include <bsd.prog.mk> |
136 |
+diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile |
137 |
+index fc68904..9af6ff2 100644 |
138 |
+--- a/cddl/usr.sbin/lockstat/Makefile |
139 |
++++ b/cddl/usr.sbin/lockstat/Makefile |
140 |
+@@ -21,6 +21,6 @@ CFLAGS+= -DNEED_ERRLOC -g |
141 |
+ |
142 |
+ #YFLAGS+= -d |
143 |
+ |
144 |
+-LIBADD= elf dtrace rt |
145 |
++LIBADD= elf dtrace rt ctf |
146 |
+ |
147 |
+ .include <bsd.prog.mk> |
148 |
+diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile |
149 |
+index 77b6139..7737efd 100644 |
150 |
+--- a/cddl/usr.sbin/plockstat/Makefile |
151 |
++++ b/cddl/usr.sbin/plockstat/Makefile |
152 |
+@@ -18,6 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
153 |
+ -I${.CURDIR}/../../../cddl/lib/libdtrace \ |
154 |
+ -I${.CURDIR}/../../../sys |
155 |
+ |
156 |
+-LIBADD= dtrace proc |
157 |
++LIBADD= dtrace proc ctf |
158 |
+ |
159 |
+ .include <bsd.prog.mk> |
160 |
+diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile |
161 |
+index 3609502..71526f7 100644 |
162 |
+--- a/cddl/usr.sbin/zdb/Makefile |
163 |
++++ b/cddl/usr.sbin/zdb/Makefile |
164 |
+@@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
165 |
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
166 |
+ CFLAGS+= -I${.CURDIR}/../../lib/libumem |
167 |
+ |
168 |
+-LIBADD= nvpair umem uutil zfs zpool |
169 |
++LIBADD= nvpair umem uutil zfs zpool avl zfs_core |
170 |
+ |
171 |
+ # Since there are many asserts in this program, it makes no sense to compile |
172 |
+ # it without debugging. |
173 |
+diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common |
174 |
+index a545609..034d418 100644 |
175 |
+--- a/cddl/usr.sbin/zfsd/Makefile.common |
176 |
++++ b/cddl/usr.sbin/zfsd/Makefile.common |
177 |
+@@ -35,7 +35,7 @@ CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} |
178 |
+ |
179 |
+ DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ |
180 |
+ ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} |
181 |
+-LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil |
182 |
++LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil umem avl |
183 |
+ |
184 |
+ cscope: |
185 |
+ find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ |
186 |
+diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile |
187 |
+index 02c51ac..d9b79a9 100644 |
188 |
+--- a/cddl/usr.sbin/zhack/Makefile |
189 |
++++ b/cddl/usr.sbin/zhack/Makefile |
190 |
+@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
191 |
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
192 |
+ CFLAGS+= -I${.CURDIR}/../../lib/libumem |
193 |
+ |
194 |
+-LIBADD= nvpair zfs zpool |
195 |
++LIBADD= nvpair zfs zpool umem uutil avl zfs_core |
196 |
+ |
197 |
+ CFLAGS+= -DDEBUG=1 |
198 |
+ #DEBUG_FLAGS+= -g |
199 |
|
200 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch |
201 |
new file mode 100644 |
202 |
index 0000000..839b6b5 |
203 |
--- /dev/null |
204 |
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch |
205 |
@@ -0,0 +1,12 @@ |
206 |
+diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common |
207 |
+index 6c71bdf..6b71908 100644 |
208 |
+--- a/cddl/usr.sbin/zfsd/Makefile.common |
209 |
++++ b/cddl/usr.sbin/zfsd/Makefile.common |
210 |
+@@ -31,6 +31,7 @@ INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs |
211 |
+ INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys |
212 |
+ |
213 |
+ CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} |
214 |
++CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} |
215 |
+ |
216 |
+ DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ |
217 |
+ ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} |
218 |
|
219 |
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild |
220 |
index afc5c8d..b6d18cf 100644 |
221 |
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild |
222 |
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild |
223 |
@@ -36,14 +36,13 @@ DEPEND="${RDEPEND} |
224 |
|
225 |
S="${WORKDIR}/cddl" |
226 |
|
227 |
-PATCHES=( |
228 |
- "${FILESDIR}/${PN}-10.2-libpaths.patch" |
229 |
- "${FILESDIR}/${PN}-10.3-underlink.patch" |
230 |
- ) |
231 |
+PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch" |
232 |
+ "${FILESDIR}/${PN}-11.0-add-libs.patch" ) |
233 |
|
234 |
pkg_setup() { |
235 |
# Add the required source files. |
236 |
use build && EXTRACTONLY+="include/ " |
237 |
+ [[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd" |
238 |
} |
239 |
|
240 |
src_prepare() { |
241 |
@@ -51,11 +50,16 @@ src_prepare() { |
242 |
# Link in include headers. |
243 |
ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." |
244 |
fi |
245 |
+ for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do |
246 |
+ LDFLAGS="${LDFLAGS} -L${S}/lib/${d}" |
247 |
+ done |
248 |
} |
249 |
|
250 |
src_compile() { |
251 |
- # Disable parallel make. |
252 |
- freebsd_src_compile -j1 |
253 |
+ cd ${S}/lib || die |
254 |
+ freebsd_src_compile |
255 |
+ cd ${S} || die |
256 |
+ freebsd_src_compile |
257 |
} |
258 |
|
259 |
src_install() { |
260 |
|
261 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-bsdxml2expat.patch |
262 |
new file mode 100644 |
263 |
index 0000000..41a394b |
264 |
--- /dev/null |
265 |
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-bsdxml2expat.patch |
266 |
@@ -0,0 +1,39 @@ |
267 |
+diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c |
268 |
+index 9dedb8e..d96420c 100644 |
269 |
+--- a/lib/libgeom/geom_xml2tree.c |
270 |
++++ b/lib/libgeom/geom_xml2tree.c |
271 |
+@@ -43,7 +43,7 @@ |
272 |
+ #include <sys/sbuf.h> |
273 |
+ #include <sys/sysctl.h> |
274 |
+ #include <err.h> |
275 |
+-#include <bsdxml.h> |
276 |
++#include <expat.h> |
277 |
+ #include <libgeom.h> |
278 |
+ |
279 |
+ struct mystate { |
280 |
+diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c |
281 |
+index d1fc0b1..89ac55e 100644 |
282 |
+--- a/lib/libmt/mtlib.c |
283 |
++++ b/lib/libmt/mtlib.c |
284 |
+@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken |
285 |
+ #include <unistd.h> |
286 |
+ #include <stdint.h> |
287 |
+ #include <errno.h> |
288 |
+-#include <bsdxml.h> |
289 |
++#include <expat.h> |
290 |
+ #include <mtlib.h> |
291 |
+ |
292 |
+ /* |
293 |
+diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c |
294 |
+index c500d3f..fe1d37e 100644 |
295 |
+--- a/lib/lib80211/lib80211_regdomain.c |
296 |
++++ b/lib/lib80211/lib80211_regdomain.c |
297 |
+@@ -40,7 +40,7 @@ static const char rcsid[] = "$FreeBSD: stable/11/lib/lib80211/lib80211_regdomain |
298 |
+ #include <err.h> |
299 |
+ #include <unistd.h> |
300 |
+ |
301 |
+-#include <bsdxml.h> |
302 |
++#include <expat.h> |
303 |
+ |
304 |
+ #include "lib80211_regdomain.h" |
305 |
+ |
306 |
|
307 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch |
308 |
new file mode 100644 |
309 |
index 0000000..da495e4 |
310 |
--- /dev/null |
311 |
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch |
312 |
@@ -0,0 +1,62 @@ |
313 |
+diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
314 |
+index 2dedf11..275f4c3 100644 |
315 |
+--- a/lib/libproc/Makefile |
316 |
++++ b/lib/libproc/Makefile |
317 |
+@@ -15,6 +15,7 @@ SRCS= proc_bkpt.c \ |
318 |
+ INCS= libproc.h |
319 |
+ |
320 |
+ CFLAGS+= -I${.CURDIR} |
321 |
++CFLAGS+= -I${.CURDIR}/../libelf |
322 |
+ |
323 |
+ .if ${MK_CXX} == "no" |
324 |
+ CFLAGS+= -DNO_CXA_DEMANGLE |
325 |
+@@ -28,6 +29,9 @@ LIBADD+= elf rtld_db util |
326 |
+ |
327 |
+ .if ${MK_CDDL} != "no" |
328 |
+ LIBADD+= ctf |
329 |
++LDADD+= -lelf |
330 |
++LDFLAGS+= -L${.OBJDIR}/../libelf |
331 |
++ |
332 |
+ IGNORE_PRAGMA= YES |
333 |
+ CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \ |
334 |
+ -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \ |
335 |
+diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile |
336 |
+index 1829883..d0065a3 100644 |
337 |
+--- a/lib/libprocstat/Makefile |
338 |
++++ b/lib/libprocstat/Makefile |
339 |
+@@ -17,6 +17,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def |
340 |
+ SYMBOL_MAPS= ${.CURDIR}/Symbol.map |
341 |
+ |
342 |
+ INCS= libprocstat.h |
343 |
++CFLAGS+= -I${.CURDIR}/../libelf |
344 |
++LDFLAGS+= -L${.OBJDIR}/../libelf |
345 |
+ CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE |
346 |
+ SHLIB_MAJOR= 1 |
347 |
+ |
348 |
+diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile |
349 |
+index 0a8ed95..11baf5b 100644 |
350 |
+--- a/lib/librtld_db/Makefile |
351 |
++++ b/lib/librtld_db/Makefile |
352 |
+@@ -11,6 +11,9 @@ SRCS= rtld_db.c |
353 |
+ INCS= rtld_db.h |
354 |
+ |
355 |
+ CFLAGS+= -I${.CURDIR} |
356 |
++CFLAGS+= -I${.CURDIR}/../libelf |
357 |
++LDADD+= -lutil -lproc |
358 |
++LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc |
359 |
+ # Avoid circular dependency, we only need the libproc.h header here. |
360 |
+ CFLAGS+= -I${.CURDIR:H}/libproc |
361 |
+ |
362 |
+diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile |
363 |
+index f84aee3..c36ade9 100644 |
364 |
+--- a/lib/libtelnet/Makefile |
365 |
++++ b/lib/libtelnet/Makefile |
366 |
+@@ -14,6 +14,8 @@ INTERNALLIB= |
367 |
+ SRCS= genget.c getent.c misc.c |
368 |
+ CFLAGS+= -I${TELNETDIR} |
369 |
+ |
370 |
++CFLAGS+= -I${.CURDIR}/../libmp |
371 |
++ |
372 |
+ WARNS?= 2 |
373 |
+ |
374 |
+ .if ${MK_OPENSSL} != "no" |
375 |
|
376 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libproc-libcxx.patch |
377 |
new file mode 100644 |
378 |
index 0000000..013ad20 |
379 |
--- /dev/null |
380 |
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libproc-libcxx.patch |
381 |
@@ -0,0 +1,13 @@ |
382 |
+diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
383 |
+index e3b2578..acd76e8 100644 |
384 |
+--- a/lib/libproc/Makefile |
385 |
++++ b/lib/libproc/Makefile |
386 |
+@@ -18,7 +18,7 @@ CFLAGS+= -I${.CURDIR} |
387 |
+ |
388 |
+ .if ${MK_CXX} == "no" |
389 |
+ CFLAGS+= -DNO_CXA_DEMANGLE |
390 |
+-.elif ${MK_LIBCPLUSPLUS} != "no" |
391 |
++.elif ${COMPILER_TYPE} == "clang" |
392 |
+ LIBADD+= cxxrt |
393 |
+ .else |
394 |
+ LIBADD+= supcplusplus |
395 |
|
396 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch |
397 |
new file mode 100644 |
398 |
index 0000000..d90aa31 |
399 |
--- /dev/null |
400 |
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch |
401 |
@@ -0,0 +1,22 @@ |
402 |
+diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile |
403 |
+index e3bfe00..51fc5f0 100644 |
404 |
+--- a/lib/libsysdecode/Makefile |
405 |
++++ b/lib/libsysdecode/Makefile |
406 |
+@@ -8,7 +8,7 @@ LIB= sysdecode |
407 |
+ SRCS= errno.c ioctl.c syscallnames.c utrace.c |
408 |
+ INCS= sysdecode.h |
409 |
+ |
410 |
+-CFLAGS+= -I${.CURDIR}/../../sys |
411 |
++CFLAGS+= -I${.CURDIR}/../../sys -I${.CURDIR} |
412 |
+ |
413 |
+ MAN+= sysdecode.3 \ |
414 |
+ sysdecode_abi_to_freebsd_errno.3 \ |
415 |
+@@ -37,7 +37,7 @@ CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} |
416 |
+ |
417 |
+ ioctl.c: mkioctls |
418 |
+ env MACHINE=${MACHINE} CPP="${CPP}" \ |
419 |
+- /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} |
420 |
++ /bin/sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} |
421 |
+ |
422 |
+ beforedepend: ioctl.c |
423 |
+ |
424 |
|
425 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-workaround.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-workaround.patch |
426 |
new file mode 100644 |
427 |
index 0000000..05f817e |
428 |
--- /dev/null |
429 |
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-workaround.patch |
430 |
@@ -0,0 +1,12 @@ |
431 |
+diff --git a/lib/libdevdctl/event.cc b/lib/libdevdctl/event.cc |
432 |
+index a8cb447..d56df2e 100644 |
433 |
+--- a/lib/libdevdctl/event.cc |
434 |
++++ b/lib/libdevdctl/event.cc |
435 |
+@@ -50,6 +50,7 @@ |
436 |
+ #include <syslog.h> |
437 |
+ #include <unistd.h> |
438 |
+ |
439 |
++#include <cstdio> |
440 |
+ #include <cstdarg> |
441 |
+ #include <cstring> |
442 |
+ #include <iostream> |
443 |
|
444 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild |
445 |
index ed4d9a8..9ca30a1 100644 |
446 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild |
447 |
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild |
448 |
@@ -11,7 +11,7 @@ SLOT="0" |
449 |
LICENSE="BSD zfs? ( CDDL )" |
450 |
|
451 |
# Security Advisory and Errata patches. |
452 |
-UPSTREAM_PATCHES=( "EN-16:06/libc.patch" ) |
453 |
+# UPSTREAM_PATCHES=() |
454 |
|
455 |
# Crypto is needed to have an internal OpenSSL header |
456 |
# sys is needed for libalias, probably we can just extract that instead of |
457 |
@@ -50,7 +50,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then |
458 |
!sys-freebsd/freebsd-headers" |
459 |
DEPEND="${RDEPEND} |
460 |
>=sys-devel/flex-2.5.31-r2 |
461 |
- >=sys-freebsd/freebsd-sources-10.3-r5" |
462 |
+ =sys-freebsd/freebsd-sources-${RV}*" |
463 |
RDEPEND="${RDEPEND} |
464 |
=sys-freebsd/freebsd-share-${RV}* |
465 |
>=virtual/libiconv-0-r2" |
466 |
@@ -107,15 +107,12 @@ pkg_setup() { |
467 |
|
468 |
PATCHES=( |
469 |
"${FILESDIR}/${PN}-6.0-pmc.patch" |
470 |
- "${FILESDIR}/${PN}-6.1-csu.patch" |
471 |
- "${FILESDIR}/${PN}-10.0-liblink.patch" |
472 |
- "${FILESDIR}/${PN}-10.2-liblink.patch" |
473 |
"${FILESDIR}/${PN}-10.0-atfcxx.patch" |
474 |
- "${FILESDIR}/${PN}-10.3-libusb.patch" |
475 |
- "${FILESDIR}/${PN}-10.0-libproc-libcxx.patch" |
476 |
- "${FILESDIR}/${PN}-10.2-bsdxml2expat.patch" |
477 |
"${FILESDIR}/${PN}-9.0-bluetooth.patch" |
478 |
- "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch" |
479 |
+ "${FILESDIR}/${PN}-11.0-workaround.patch" |
480 |
+ "${FILESDIR}/${PN}-11.0-bsdxml2expat.patch" |
481 |
+ "${FILESDIR}/${PN}-11.0-libsysdecode.patch" |
482 |
+ "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" |
483 |
"${FILESDIR}/${PN}-add-nossp-cflags.patch" |
484 |
) |
485 |
# Here we disable and remove source which we don't need or want |
486 |
@@ -170,8 +167,6 @@ src_prepare() { |
487 |
# patches "${WORKDIR}/include" |
488 |
cd "${WORKDIR}" |
489 |
epatch "${FILESDIR}/${PN}-includes.patch" |
490 |
- epatch "${FILESDIR}/${PN}-8.0-gcc45.patch" |
491 |
- epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch" |
492 |
|
493 |
# Don't install the hesiod man page or header |
494 |
rm "${WORKDIR}"/include/hesiod.h || die |
495 |
@@ -187,8 +182,7 @@ src_prepare() { |
496 |
done |
497 |
# Call LD with LDFLAGS, rename them to RAW_LDFLAGS |
498 |
sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \ |
499 |
- -i "${S}/csu/i386-elf/Makefile" \ |
500 |
- -i "${S}/csu/ia64/Makefile" || die |
501 |
+ -i "${S}/csu/i386/Makefile" || die |
502 |
|
503 |
if install --version 2> /dev/null | grep -q GNU; then |
504 |
sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" |
505 |
@@ -258,7 +252,6 @@ bootstrap_csu() { |
506 |
# Compile libssp_nonshared.a and add it's path to LDFLAGS. |
507 |
bootstrap_libssp_nonshared() { |
508 |
bootstrap_lib "gnu/lib/libssp/libssp_nonshared" |
509 |
- export LDADD="-lssp_nonshared" |
510 |
} |
511 |
|
512 |
bootstrap_libgcc() { |
513 |
@@ -329,6 +322,7 @@ do_bootstrap() { |
514 |
mkdir "${WORKDIR}/include_proper_${ABI}" || die |
515 |
CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" |
516 |
CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
517 |
+ [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" |
518 |
CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
519 |
mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc" |
520 |
fi |
521 |
@@ -347,6 +341,7 @@ do_compile() { |
522 |
do_bootstrap |
523 |
else |
524 |
CFLAGS="${CFLAGS} -isystem /usr/include" |
525 |
+ [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" |
526 |
CXXFLAGS="${CXXFLAGS} -isystem /usr/include" |
527 |
fi |
528 |
|
529 |
@@ -371,7 +366,7 @@ src_compile() { |
530 |
use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" |
531 |
|
532 |
cd "${WORKDIR}/include" |
533 |
- $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" |
534 |
+ $(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed" |
535 |
|
536 |
use crosscompile_opts_headers-only && return 0 |
537 |
|
538 |
@@ -632,16 +627,18 @@ install_includes() |
539 |
DESTDIR="${DESTDIR}" \ |
540 |
INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
541 |
BINGRP="${BINGRP}" \ |
542 |
- WITHOUT_GSSAPI= || die "install_includes() failed" |
543 |
+ WITHOUT_GSSAPI= \ |
544 |
+ SRCTOP="${WORKDIR}"|| die "install_includes() failed" |
545 |
einfo "includes installed ok." |
546 |
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex" |
547 |
+ EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper" |
548 |
for i in $EXTRA_INCLUDES; do |
549 |
einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
550 |
cd "${WORKDIR}/$i" || die |
551 |
$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ |
552 |
MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
553 |
INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
554 |
- BINGRP="${BINGRP}" || die "problem installing $i includes." |
555 |
+ BINGRP="${BINGRP}" \ |
556 |
+ SRCTOP="${WORKDIR}" || die "problem installing $i includes." |
557 |
einfo "$i includes installed ok." |
558 |
done |
559 |
} |
560 |
|
561 |
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild |
562 |
index 26851c8..88bfc2b 100644 |
563 |
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild |
564 |
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild |
565 |
@@ -17,7 +17,10 @@ EXTRACTONLY=" |
566 |
libexec/ |
567 |
usr.bin/ |
568 |
bin/ |
569 |
+ contrib/blacklist/ |
570 |
+ contrib/dma/ |
571 |
contrib/hyperv/ |
572 |
+ contrib/telnet/ |
573 |
lib/ |
574 |
etc/ |
575 |
usr.sbin/ |
576 |
@@ -39,8 +42,7 @@ REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd" |
577 |
|
578 |
IUSE="pam ssl kerberos ipv6 nis xinetd" |
579 |
|
580 |
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch" |
581 |
- "${FILESDIR}/${PN}-10.2-atf-check.patch" ) |
582 |
+PATCHES=( "${FILESDIR}/${PN}-10.2-atf-check.patch" ) |
583 |
|
584 |
pkg_setup() { |
585 |
use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
586 |
@@ -50,6 +52,18 @@ pkg_setup() { |
587 |
use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
588 |
|
589 |
mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " |
590 |
+ |
591 |
+ if has_version "<sys-freebsd/freebsd-libexec-11.0"; then |
592 |
+ REMOVE_SUBDIRS="${REMOVE_SUBDIRS} rpc.rstatd ulog-helper" |
593 |
+ fi |
594 |
+ |
595 |
+ if has_version "<sys-freebsd/freebsd-ubin-11.0"; then |
596 |
+ mymakeopts="${mymakeopts} WITHOUT_MAN_UTILS= " |
597 |
+ fi |
598 |
+ |
599 |
+ if has_version "<sys-freebsd/freebsd-share-${RV}"; then |
600 |
+ die ">=sys-freebsd/freebsd-share-${RV} is required." |
601 |
+ fi |
602 |
} |
603 |
|
604 |
src_prepare() { |
605 |
@@ -67,8 +81,11 @@ src_prepare() { |
606 |
echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h |
607 |
echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h |
608 |
echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h |
609 |
+ echo "#define NT_FREEBSD_ABI_TAG 1" >> "${S}"/rtld-elf/rtld.h |
610 |
+ echo "#define NT_FREEBSD_NOINIT_TAG 2" >> "${S}"/rtld-elf/rtld.h |
611 |
# taken from sys/sys/fcntl.h |
612 |
echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h |
613 |
+ echo "#define O_VERIFY 0x00200000" >> "${S}"/rtld-elf/rtld.h |
614 |
# taken from sys/sys/cdefs.h |
615 |
echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h |
616 |
# taken from sys/sys/mman.h |
617 |
@@ -76,6 +93,8 @@ src_prepare() { |
618 |
echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h |
619 |
echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h |
620 |
echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h |
621 |
+ |
622 |
+ export mymakeopts="${mymakeopts} MK_SYMVER=no MK_BLACKLIST_SUPPORT=no " |
623 |
fi |
624 |
} |
625 |
|
626 |
@@ -96,6 +115,7 @@ src_compile() { |
627 |
|
628 |
src_install() { |
629 |
local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
630 |
+ dodir /usr/libexec |
631 |
multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
632 |
|
633 |
insinto /etc |
634 |
|
635 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch |
636 |
new file mode 100644 |
637 |
index 0000000..3724f13 |
638 |
--- /dev/null |
639 |
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch |
640 |
@@ -0,0 +1,327 @@ |
641 |
+diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk |
642 |
+index 9fc6d8f..8ec6e9e 100644 |
643 |
+--- a/share/mk/bsd.doc.mk |
644 |
++++ b/share/mk/bsd.doc.mk |
645 |
+@@ -144,10 +144,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ |
646 |
+ realinstall: |
647 |
+ .if ${PRINTERDEVICE:Mhtml} |
648 |
+ cd ${SRCDIR}; \ |
649 |
++ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
650 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
651 |
+ ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/ |
652 |
+ .endif |
653 |
+ .for _dev in ${PRINTERDEVICE:Nhtml} |
654 |
++ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
655 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
656 |
+ ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/ |
657 |
+ .endfor |
658 |
+diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk |
659 |
+index 04a0621..45c059e 100644 |
660 |
+--- a/share/mk/bsd.files.mk |
661 |
++++ b/share/mk/bsd.files.mk |
662 |
+@@ -63,6 +63,7 @@ stage_as.${file:T}: ${file} |
663 |
+ |
664 |
+ installfiles-${group}: _${group}INS_${file:T} |
665 |
+ _${group}INS_${file:T}: ${file} |
666 |
++ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
667 |
+ ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \ |
668 |
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
669 |
+ ${.ALLSRC} \ |
670 |
+@@ -77,10 +78,12 @@ stage_files.${group}: ${_${group}FILES} |
671 |
+ installfiles-${group}: _${group}INS |
672 |
+ _${group}INS: ${_${group}FILES} |
673 |
+ .if defined(${group}NAME) |
674 |
++ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
675 |
+ ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ |
676 |
+ -m ${${group}MODE} ${.ALLSRC} \ |
677 |
+ ${DESTDIR}${${group}DIR}/${${group}NAME} |
678 |
+ .else |
679 |
++ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
680 |
+ ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ |
681 |
+ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/ |
682 |
+ .endif |
683 |
+diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk |
684 |
+index 897618a..a5548bc 100644 |
685 |
+--- a/share/mk/bsd.incs.mk |
686 |
++++ b/share/mk/bsd.incs.mk |
687 |
+@@ -62,6 +62,9 @@ stage_includes: stage_as.${header:T} |
688 |
+ |
689 |
+ installincludes: _${group}INS_${header:T} |
690 |
+ _${group}INS_${header:T}: ${header} |
691 |
++ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
692 |
++ -g ${${group}GRP_${.ALLSRC:T}} \ |
693 |
++ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
694 |
+ ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
695 |
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
696 |
+ ${.ALLSRC} \ |
697 |
+@@ -77,9 +80,13 @@ stage_includes: stage_files.${group} |
698 |
+ installincludes: _${group}INS |
699 |
+ _${group}INS: ${_${group}INCS} |
700 |
+ .if defined(${group}NAME) |
701 |
++ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
702 |
++ ${DESTDIR}${${group}DIR} |
703 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
704 |
+ ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
705 |
+ .else |
706 |
++ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
707 |
++ ${DESTDIR}${${group}DIR} |
708 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
709 |
+ ${.ALLSRC} ${DESTDIR}${${group}DIR}/ |
710 |
+ .endif |
711 |
+diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk |
712 |
+index 3081488..11d4547 100644 |
713 |
+--- a/share/mk/bsd.info.mk |
714 |
++++ b/share/mk/bsd.info.mk |
715 |
+@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
716 |
+ TEX?= tex |
717 |
+ DVIPS?= dvips |
718 |
+ DVIPS2ASCII?= dvips2ascii |
719 |
++INSTALL?= install |
720 |
+ |
721 |
+ .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
722 |
+ |
723 |
+@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
724 |
+ INSTALLINFODIRS+= ${x:S/$/-install/} |
725 |
+ ${x:S/$/-install/}: |
726 |
+ .if !empty(.MAKEFLAGS:M-j) |
727 |
++ ${INSTALL} -d ${DESTDIR}${INFODIR} |
728 |
+ lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
729 |
+ ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
730 |
+- --defsection=${INFOSECTION} \ |
731 |
+- --defentry=${INFOENTRY_${x}} \ |
732 |
++ --section=${INFOSECTION} \ |
733 |
++ --entry=${INFOENTRY_${x}} \ |
734 |
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
735 |
+ .else |
736 |
++ ${INSTALL} -d ${DESTDIR}${INFODIR} |
737 |
+ ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
738 |
+- --defsection=${INFOSECTION} \ |
739 |
+- --defentry=${INFOENTRY_${x}} \ |
740 |
++ --section=${INFOSECTION} \ |
741 |
++ --entry=${INFOENTRY_${x}} \ |
742 |
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
743 |
+ .endif |
744 |
+ .endfor |
745 |
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
746 |
+index 3145dbd..5932e17 100644 |
747 |
+--- a/share/mk/bsd.lib.mk |
748 |
++++ b/share/mk/bsd.lib.mk |
749 |
+@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS} |
750 |
+ .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" |
751 |
+ CTFFLAGS+= -g |
752 |
+ .endif |
753 |
+-.else |
754 |
+-STRIP?= -s |
755 |
+ .endif |
756 |
+ |
757 |
+ .if ${SHLIBDIR:M*lib32*} |
758 |
+@@ -335,14 +333,17 @@ realinstall: _libinstall |
759 |
+ .ORDER: beforeinstall _libinstall |
760 |
+ _libinstall: |
761 |
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
762 |
++ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
763 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
764 |
+ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ |
765 |
+ .endif |
766 |
+ .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
767 |
++ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
768 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
769 |
+ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ |
770 |
+ .endif |
771 |
+ .if defined(SHLIB_NAME) |
772 |
++ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} |
773 |
+ ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
774 |
+ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
775 |
+ ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ |
776 |
+@@ -387,10 +388,12 @@ _libinstall: |
777 |
+ .endif # SHLIB_LINK |
778 |
+ .endif # SHIB_NAME |
779 |
+ .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" |
780 |
++ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
781 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
782 |
+ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ |
783 |
+ .endif |
784 |
+ .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) |
785 |
++ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} |
786 |
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
787 |
+ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/ |
788 |
+ .endif |
789 |
+diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk |
790 |
+index 101cddf..2285b63 100644 |
791 |
+--- a/share/mk/bsd.libnames.mk |
792 |
++++ b/share/mk/bsd.libnames.mk |
793 |
+@@ -63,7 +63,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
794 |
+ LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a |
795 |
+ LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
796 |
+ LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a |
797 |
+-LIBFL?= "don't use LIBFL, use LIBL" |
798 |
++LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a |
799 |
+ LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
800 |
+ LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
801 |
+ LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a |
802 |
+@@ -92,7 +92,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a |
803 |
+ LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
804 |
+ LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
805 |
+ LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
806 |
+-LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
807 |
++LIBL?= ${DESTDIR}${LIBDIR}/libfl.a |
808 |
+ LIBLN?= "don't use LIBLN, use LIBL" |
809 |
+ LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a |
810 |
+ LIBM?= ${DESTDIR}${LIBDIR}/libm.a |
811 |
+diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk |
812 |
+index 1eec745..31089fd 100644 |
813 |
+--- a/share/mk/bsd.man.mk |
814 |
++++ b/share/mk/bsd.man.mk |
815 |
+@@ -188,9 +188,11 @@ maninstall: ${MAN} |
816 |
+ .if ${MK_MANCOMPRESS} == "no" |
817 |
+ .if defined(MANFILTER) |
818 |
+ .for __page in ${MAN} |
819 |
++ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
820 |
+ ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
821 |
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
822 |
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
823 |
++ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
824 |
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
825 |
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
826 |
+ .endif |
827 |
+@@ -204,11 +206,14 @@ maninstall: ${MAN} |
828 |
+ esac; \ |
829 |
+ page=$$1; shift; sect=$$1; shift; \ |
830 |
+ d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
831 |
++ ${ECHO} ${INSTALL} -d $${d}; \ |
832 |
++ ${INSTALL} -d $${d}; \ |
833 |
+ ${ECHO} ${MINSTALL} $${page} $${d}; \ |
834 |
+ ${MINSTALL} $${page} $${d}; \ |
835 |
+ done |
836 |
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
837 |
+ .for __page in ${MAN} |
838 |
++ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
839 |
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
840 |
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
841 |
+ .endfor |
842 |
+@@ -216,9 +221,11 @@ maninstall: ${MAN} |
843 |
+ .endif # defined(MANFILTER) |
844 |
+ .else # ${MK_MANCOMPRESS} == "yes" |
845 |
+ .for __page in ${MAN} |
846 |
++ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
847 |
+ ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
848 |
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/ |
849 |
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
850 |
++ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT} |
851 |
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
852 |
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
853 |
+ .endif |
854 |
+diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk |
855 |
+index b1a8094..91ab4f3 100644 |
856 |
+--- a/share/mk/bsd.nls.mk |
857 |
++++ b/share/mk/bsd.nls.mk |
858 |
+@@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP} |
859 |
+ SYMLINKS+= ${NLSSYMLINKS} |
860 |
+ .endif |
861 |
+ .for file in ${NLS} |
862 |
+-NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat |
863 |
++NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ |
864 |
++NLSNAME_${file:T}= ${NLSNAME}.cat |
865 |
+ .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) |
866 |
+ .if !empty(NLSLINKS_${file:R}:M${file:R}) |
867 |
+ .error NLSLINKS_${file:R} contains itself: ${file:R} |
868 |
+diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk |
869 |
+index 49f6929..2cadaea 100644 |
870 |
+--- a/share/mk/bsd.own.mk |
871 |
++++ b/share/mk/bsd.own.mk |
872 |
+@@ -233,9 +233,6 @@ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} |
873 |
+ INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} |
874 |
+ |
875 |
+ # Common variables |
876 |
+-.if !defined(DEBUG_FLAGS) |
877 |
+-STRIP?= -s |
878 |
+-.endif |
879 |
+ |
880 |
+ COMPRESS_CMD?= gzip -cn |
881 |
+ COMPRESS_EXT?= .gz |
882 |
+diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
883 |
+index bf1bd80..75d2f06 100644 |
884 |
+--- a/share/mk/bsd.prog.mk |
885 |
++++ b/share/mk/bsd.prog.mk |
886 |
+@@ -44,10 +44,6 @@ CTFFLAGS+= -g |
887 |
+ .endif |
888 |
+ .endif |
889 |
+ |
890 |
+-.if !defined(DEBUG_FLAGS) |
891 |
+-STRIP?= -s |
892 |
+-.endif |
893 |
+- |
894 |
+ .if defined(NO_ROOT) |
895 |
+ .if !defined(TAGS) || ! ${TAGS:Mpackage=*} |
896 |
+ TAGS+= package=${PACKAGE:Uruntime} |
897 |
+@@ -217,6 +213,7 @@ realinstall: _proginstall |
898 |
+ .ORDER: beforeinstall _proginstall |
899 |
+ _proginstall: |
900 |
+ .if defined(PROG) |
901 |
++ ${INSTALL} -d ${DESTDIR}${BINDIR} |
902 |
+ ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
903 |
+ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
904 |
+ .if ${MK_DEBUG_FILES} != "no" |
905 |
+@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
906 |
+ STAGE_AS_${script:T}= ${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}} |
907 |
+ _scriptsinstall: _SCRIPTSINS_${script:T} |
908 |
+ _SCRIPTSINS_${script:T}: ${script} |
909 |
++ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
910 |
+ ${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
911 |
+ -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
912 |
+ ${.ALLSRC} \ |
913 |
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
914 |
+index 7885056..6263ba8 100644 |
915 |
+--- a/share/mk/bsd.sys.mk |
916 |
++++ b/share/mk/bsd.sys.mk |
917 |
+@@ -29,9 +29,6 @@ CFLAGS+= -std=${CSTD} |
918 |
+ .if defined(WARNS) |
919 |
+ .if ${WARNS} >= 1 |
920 |
+ CWARNFLAGS+= -Wsystem-headers |
921 |
+-.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) |
922 |
+-CWARNFLAGS+= -Werror |
923 |
+-.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} |
924 |
+ .endif # WARNS >= 1 |
925 |
+ .if ${WARNS} >= 2 |
926 |
+ CWARNFLAGS+= -Wall -Wno-format-y2k |
927 |
+@@ -100,9 +97,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args |
928 |
+ .if ${WARNS} <= 3 |
929 |
+ CWARNFLAGS.clang+= -Wno-format-nonliteral |
930 |
+ .endif # WARNS <= 3 |
931 |
+-.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) |
932 |
+-CWARNFLAGS+= -Werror |
933 |
+-.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} |
934 |
+ .endif # WFORMAT > 0 |
935 |
+ .endif # WFORMAT |
936 |
+ .if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE}) |
937 |
+@@ -151,6 +145,13 @@ CFLAGS.clang+= -fno-dwarf2-cfi-asm |
938 |
+ # but not yet. |
939 |
+ CXXFLAGS.clang+= -Wno-c++11-extensions |
940 |
+ |
941 |
++.if ${MK_SSP} == "no" |
942 |
++# gcc-4.9, -fstack-protector-strong is enabled by default. |
943 |
++# Add -fno-stack-protector to disable it. Gentoo Bug #511698. |
944 |
++SSP_CFLAGS?= -fno-stack-protector |
945 |
++CFLAGS+= ${SSP_CFLAGS} |
946 |
++.endif |
947 |
++ |
948 |
+ .if ${MK_SSP} != "no" && \ |
949 |
+ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" |
950 |
+ .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \ |
951 |
+diff --git a/share/mk/sys.mk b/share/mk/sys.mk |
952 |
+index 27b259b..58091a5 100644 |
953 |
+--- a/share/mk/sys.mk |
954 |
++++ b/share/mk/sys.mk |
955 |
+@@ -418,12 +418,6 @@ YFLAGS ?= -d |
956 |
+ rm -f ${.PREFIX}.tmp.c |
957 |
+ ${CTFCONVERT_CMD} |
958 |
+ |
959 |
+-# Pull in global settings. |
960 |
+-__MAKE_CONF?=/etc/make.conf |
961 |
+-.if exists(${__MAKE_CONF}) |
962 |
+-.include "${__MAKE_CONF}" |
963 |
+-.endif |
964 |
+- |
965 |
+ # late include for customization |
966 |
+ .sinclude <local.sys.mk> |
967 |
+ |
968 |
|
969 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch |
970 |
new file mode 100644 |
971 |
index 0000000..5da025d |
972 |
--- /dev/null |
973 |
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch |
974 |
@@ -0,0 +1,13 @@ |
975 |
+diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk |
976 |
+index 14489a8..c993f7c 100644 |
977 |
+--- a/share/mk/src.libnames.mk |
978 |
++++ b/share/mk/src.libnames.mk |
979 |
+@@ -245,7 +245,7 @@ _DP_radius= crypto |
980 |
+ .endif |
981 |
+ _DP_procstat= kvm util elf |
982 |
+ .if ${MK_CXX} == "yes" |
983 |
+-.if ${MK_LIBCPLUSPLUS} != "no" |
984 |
++.if ${COMPILER_TYPE} == "clang" |
985 |
+ _DP_proc= cxxrt |
986 |
+ .else |
987 |
+ _DP_proc= supcplusplus |
988 |
|
989 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch |
990 |
new file mode 100644 |
991 |
index 0000000..fd72f1f |
992 |
--- /dev/null |
993 |
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch |
994 |
@@ -0,0 +1,16 @@ |
995 |
+diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk |
996 |
+index 249ac52..14489a8 100644 |
997 |
+--- a/share/mk/src.libnames.mk |
998 |
++++ b/share/mk/src.libnames.mk |
999 |
+@@ -343,6 +343,11 @@ LIBATF_CXX= ${DESTDIR}${LIBDIR}/libprivateatf-c++.a |
1000 |
+ LDADD_atf_c= -lprivateatf-c |
1001 |
+ LDADD_atf_cxx= -lprivateatf-c++ |
1002 |
+ |
1003 |
++LDADD_bsdxml= -lexpat |
1004 |
++LDADD_l= -lfl |
1005 |
++LDADD_termcap= -lncurses |
1006 |
++LDADD_termcapw= -lncursesw |
1007 |
++ |
1008 |
+ .for _l in ${_PRIVATELIBS} |
1009 |
+ LIB${_l:tu}?= ${DESTDIR}${LIBDIR}/libprivate${_l}.a |
1010 |
+ .endfor |
1011 |
|
1012 |
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild |
1013 |
index 571e0f8..f3a3481 100644 |
1014 |
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild |
1015 |
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild |
1016 |
@@ -25,8 +25,9 @@ RESTRICT="strip" |
1017 |
S="${WORKDIR}/share/mk" |
1018 |
|
1019 |
src_prepare() { |
1020 |
- epatch "${FILESDIR}/${PN}-10.3-gentoo.patch" |
1021 |
- epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch" |
1022 |
+ epatch "${FILESDIR}/${PN}-11.0-gentoo.patch" |
1023 |
+ epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" |
1024 |
+ epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" |
1025 |
use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" |
1026 |
} |
1027 |
|
1028 |
|
1029 |
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild |
1030 |
index 62a7b3e..ab93176 100644 |
1031 |
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild |
1032 |
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild |
1033 |
@@ -26,8 +26,6 @@ DEPEND="${RDEPEND} |
1034 |
|
1035 |
S=${WORKDIR}/lib/libpam/modules |
1036 |
|
1037 |
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch ) |
1038 |
- |
1039 |
pkg_setup() { |
1040 |
# Avoid installing pam_ssh as that has its own ebuild. |
1041 |
mymakeopts="${mymakeopts} WITHOUT_OPENSSH= " |
1042 |
|
1043 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch |
1044 |
new file mode 100644 |
1045 |
index 0000000..0f3ecb1 |
1046 |
--- /dev/null |
1047 |
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch |
1048 |
@@ -0,0 +1,13 @@ |
1049 |
+diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile |
1050 |
+index 941505f..df5ccb2 100644 |
1051 |
+--- a/usr.sbin/ftp-proxy/Makefile |
1052 |
++++ b/usr.sbin/ftp-proxy/Makefile |
1053 |
+@@ -7,8 +7,6 @@ MAN= ftp-proxy.8 |
1054 |
+ |
1055 |
+ SRCS= ftp-proxy.c filter.c |
1056 |
+ |
1057 |
+-CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent |
1058 |
+- |
1059 |
+ LIBADD= event |
1060 |
+ |
1061 |
+ WARNS?= 3 |
1062 |
|
1063 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch |
1064 |
new file mode 100644 |
1065 |
index 0000000..6435280 |
1066 |
--- /dev/null |
1067 |
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch |
1068 |
@@ -0,0 +1,13 @@ |
1069 |
+diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile |
1070 |
+index b3822dd..5912ad2 100644 |
1071 |
+--- a/sbin/pflogd/Makefile |
1072 |
++++ b/sbin/pflogd/Makefile |
1073 |
+@@ -7,8 +7,6 @@ PROG= pflogd |
1074 |
+ SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c |
1075 |
+ MAN= pflogd.8 |
1076 |
+ |
1077 |
+-CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h |
1078 |
+- |
1079 |
+ LIBADD= pcap |
1080 |
+ |
1081 |
+ WARNS?= 2 |
1082 |
|
1083 |
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild |
1084 |
index 14efdcb..feaa888 100644 |
1085 |
--- a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild |
1086 |
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild |
1087 |
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND} |
1088 |
|
1089 |
S="${WORKDIR}" |
1090 |
|
1091 |
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy" |
1092 |
+SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy" |
1093 |
|
1094 |
pkg_setup() { |
1095 |
enewgroup authpf 63 |
1096 |
@@ -42,10 +42,9 @@ src_prepare() { |
1097 |
# pcap-int.h redefines snprintf as pcap_snprintf |
1098 |
epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch" |
1099 |
# Use system's libevent |
1100 |
- epatch "${FILESDIR}/${PN}-10.0-libevent.patch" |
1101 |
- epatch "${FILESDIR}/${PN}-10.0-pflogd.patch" |
1102 |
+ epatch "${FILESDIR}/${PN}-11.0-libevent.patch" |
1103 |
+ epatch "${FILESDIR}/${PN}-11.0-pflogd.patch" |
1104 |
epatch "${FILESDIR}/${PN}-9.0-bpf.patch" |
1105 |
- epatch "${FILESDIR}/${PN}-9.0-getline.patch" |
1106 |
# Link in kernel sources |
1107 |
[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" |
1108 |
} |
1109 |
@@ -54,7 +53,7 @@ src_compile() { |
1110 |
for dir in ${SUBDIRS}; do |
1111 |
einfo "Starting make in ${dir}" |
1112 |
cd "${S}/${dir}" || die |
1113 |
- mkmake || die "Make ${dir} failed" |
1114 |
+ freebsd_src_compile || die "Make ${dir} failed" |
1115 |
done |
1116 |
} |
1117 |
|
1118 |
@@ -62,7 +61,7 @@ src_install() { |
1119 |
for dir in ${SUBDIRS}; do |
1120 |
einfo "Starting install in ${dir}" |
1121 |
cd "${S}/${dir}" || die |
1122 |
- mkinstall || die "Install ${dir} failed" |
1123 |
+ freebsd_src_install || die "Install ${dir} failed" |
1124 |
done |
1125 |
|
1126 |
cd "${WORKDIR}"/etc |
1127 |
|
1128 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch |
1129 |
new file mode 100644 |
1130 |
index 0000000..3103574 |
1131 |
--- /dev/null |
1132 |
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch |
1133 |
@@ -0,0 +1,22 @@ |
1134 |
+diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile |
1135 |
+index e747c02..a061436 100644 |
1136 |
+--- a/rescue/rescue/Makefile |
1137 |
++++ b/rescue/rescue/Makefile |
1138 |
+@@ -54,7 +54,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ |
1139 |
+ ed expr getfacl hostname kenv kill ln ls mkdir mv \ |
1140 |
+ pkill ps pwd realpath rm rmdir setfacl sh sleep stty \ |
1141 |
+ sync test |
1142 |
+-CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ll -ltermcapw -lutil -lxo |
1143 |
++CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -lfl -lncursesw -lutil -lxo |
1144 |
+ CRUNCH_BUILDTOOLS+= bin/sh |
1145 |
+ |
1146 |
+ # Additional options for specific programs |
1147 |
+@@ -128,7 +128,7 @@ CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem |
1148 |
+ # liblzma needs pthread |
1149 |
+ CRUNCH_LIBS+= -lpthread |
1150 |
+ .endif |
1151 |
+-CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv |
1152 |
++CRUNCH_LIBS+= -lgeom -lexpat -lkiconv |
1153 |
+ .if ${MK_OPENSSL} == "no" |
1154 |
+ CRUNCH_LIBS+= -lmd |
1155 |
+ .endif |
1156 |
|
1157 |
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild |
1158 |
index a0eb03f..f473264 100644 |
1159 |
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild |
1160 |
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild |
1161 |
@@ -61,12 +61,15 @@ pkg_setup() { |
1162 |
src_prepare() { |
1163 |
# As they are patches from ${WORKDIR} apply them by hand |
1164 |
cd "${WORKDIR}" || die |
1165 |
- epatch "${FILESDIR}/${PN}"-10.0-zlib.patch |
1166 |
- epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch" |
1167 |
+ epatch "${FILESDIR}/${PN}-10.0-zlib.patch" |
1168 |
+ epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" |
1169 |
epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" |
1170 |
} |
1171 |
|
1172 |
src_compile() { |
1173 |
+ export ESED=/usr/bin/sed |
1174 |
+ unalias sed |
1175 |
+ |
1176 |
tc-export CC |
1177 |
# crunchgen is now checks env MAKE. |
1178 |
# Use to force BSD's make |
1179 |
|
1180 |
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild |
1181 |
index 738e7a1..b9ccdc5 100644 |
1182 |
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild |
1183 |
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild |
1184 |
@@ -59,8 +59,7 @@ REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf" |
1185 |
PATCHES=( "${FILESDIR}/${PN}-setXid.patch" |
1186 |
"${FILESDIR}/${PN}-10.0-zlib.patch" |
1187 |
"${FILESDIR}/${PN}-6.2-ldconfig.patch" |
1188 |
- "${FILESDIR}/${PN}-6.1-pr102701.patch" |
1189 |
- "${FILESDIR}/${PN}-bsdxml2expat.patch" ) |
1190 |
+ "${FILESDIR}/${PN}-6.1-pr102701.patch" ) |
1191 |
|
1192 |
src_prepare() { |
1193 |
if [[ ! -e "${WORKDIR}/sys" ]]; then |
1194 |
|
1195 |
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild |
1196 |
index 8ab449e..20efc13 100644 |
1197 |
--- a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild |
1198 |
+++ b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild |
1199 |
@@ -26,6 +26,7 @@ EXTRACTONLY=" |
1200 |
bin/ |
1201 |
lib/ |
1202 |
etc/ |
1203 |
+ tools/tools/locale/ |
1204 |
" |
1205 |
|
1206 |
DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
1207 |
@@ -44,7 +45,7 @@ pkg_setup() { |
1208 |
use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
1209 |
use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
1210 |
[[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " |
1211 |
- |
1212 |
+ [[ ! -e /usr/bin/localedef ]] && mymakeopts="${mymakeopts} WITHOUT_LOCALES= " |
1213 |
mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= WITHOUT_CLANG= " |
1214 |
} |
1215 |
|
1216 |
@@ -79,7 +80,7 @@ src_prepare() { |
1217 |
|
1218 |
# Make proper symlinks by defining the full target. |
1219 |
local sdir |
1220 |
- for sdir in colldef mklocale monetdef msgdef numericdef timedef |
1221 |
+ for sdir in colldef monetdef msgdef numericdef timedef |
1222 |
do |
1223 |
sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ |
1224 |
"${S}/${sdir}/Makefile" || \ |
1225 |
@@ -109,5 +110,10 @@ src_compile() { |
1226 |
} |
1227 |
|
1228 |
src_install() { |
1229 |
+ if [[ -e /usr/bin/localedef ]] ; then |
1230 |
+ for d in $(grep 'SAME+' "${WORKDIR}"/share/colldef/Makefile | awk '{print $3}') ; do |
1231 |
+ dodir "/usr/share/locale/${d}" |
1232 |
+ done |
1233 |
+ fi |
1234 |
mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" |
1235 |
} |
1236 |
|
1237 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch |
1238 |
new file mode 100644 |
1239 |
index 0000000..1d3c8d6 |
1240 |
--- /dev/null |
1241 |
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch |
1242 |
@@ -0,0 +1,13 @@ |
1243 |
+diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh |
1244 |
+index e4b2ad4..411bedf 100644 |
1245 |
+--- a/sys/conf/newvers.sh |
1246 |
++++ b/sys/conf/newvers.sh |
1247 |
+@@ -110,7 +110,7 @@ else |
1248 |
+ t=`date` |
1249 |
+ fi |
1250 |
+ i=`${MAKE:-make} -V KERN_IDENT` |
1251 |
+-compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep -w 'version') |
1252 |
++compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1) |
1253 |
+ |
1254 |
+ for dir in /usr/bin /usr/local/bin; do |
1255 |
+ if [ ! -z "${svnversion}" ] ; then |
1256 |
|
1257 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch |
1258 |
new file mode 100644 |
1259 |
index 0000000..c0bfb47 |
1260 |
--- /dev/null |
1261 |
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch |
1262 |
@@ -0,0 +1,13 @@ |
1263 |
+diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk |
1264 |
+index 85be39e..b6aab23 100644 |
1265 |
+--- a/sys/conf/kern.mk |
1266 |
++++ b/sys/conf/kern.mk |
1267 |
+@@ -5,7 +5,7 @@ |
1268 |
+ # |
1269 |
+ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ |
1270 |
+ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ |
1271 |
+- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ |
1272 |
++ -Wundef -Wno-pointer-sign \ |
1273 |
+ -Wmissing-include-dirs -fdiagnostics-show-option \ |
1274 |
+ -Wno-unknown-pragmas \ |
1275 |
+ ${CWARNEXTRA} |
1276 |
|
1277 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild |
1278 |
index e01278e..92cc495 100644 |
1279 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild |
1280 |
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild |
1281 |
@@ -13,18 +13,7 @@ LICENSE="BSD zfs? ( CDDL )" |
1282 |
IUSE="+build-kernel debug dtrace zfs" |
1283 |
|
1284 |
# Security Advisory and Errata patches. |
1285 |
-UPSTREAM_PATCHES=( "SA-16:18/atkbd.patch" |
1286 |
- "SA-16:19/sendmsg.patch" |
1287 |
- "SA-16:20/linux.patch" |
1288 |
- "SA-16:21/stat.patch" |
1289 |
- "EN-16:07/ipi.patch" |
1290 |
- "EN-16:08/zfs.patch" |
1291 |
- "EN-16:11/vmbus.patch" |
1292 |
- "EN-16:12/hv_storvsc.patch" |
1293 |
- "EN-16:13/vmbus.patch" |
1294 |
- "EN-16:14/hv_storvsc.patch" |
1295 |
- "EN-16:15/vmbus.patch" |
1296 |
- "EN-16:16/hv_storvsc.patch" ) |
1297 |
+# UPSTREAM_PATCHES=() |
1298 |
|
1299 |
if [[ ${PV} != *9999* ]]; then |
1300 |
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
1301 |
@@ -56,12 +45,13 @@ S="${WORKDIR}/sys" |
1302 |
KERN_BUILD=GENTOO |
1303 |
|
1304 |
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
1305 |
- "${FILESDIR}/${PN}-10.0-gentoo.patch" |
1306 |
+ "${FILESDIR}/${PN}-11.0-gentoo.patch" |
1307 |
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" |
1308 |
+ "${FILESDIR}/${PN}-7.1-types.h-fix.patch" |
1309 |
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" |
1310 |
"${FILESDIR}/${PN}-7.1-includes.patch" |
1311 |
"${FILESDIR}/${PN}-9.0-sysctluint.patch" |
1312 |
- "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" |
1313 |
+ "${FILESDIR}/${PN}-11.0-gentoo-gcc.patch" |
1314 |
"${FILESDIR}/${PN}-10.1-gcc48.patch" ) |
1315 |
|
1316 |
pkg_setup() { |
1317 |
@@ -87,9 +77,9 @@ src_prepare() { |
1318 |
"${S}/conf/newvers.sh" |
1319 |
|
1320 |
# __FreeBSD_cc_version comes from FreeBSD's gcc. |
1321 |
- # on 10.0-RELEASE it's 1000001. |
1322 |
+ # on 11.0-RELEASE it's 1100001. |
1323 |
# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h. |
1324 |
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \ |
1325 |
+ sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1100001:g" \ |
1326 |
-i "${S}/conf/kern.pre.mk" \ |
1327 |
-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" |
1328 |
|
1329 |
|
1330 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch |
1331 |
new file mode 100644 |
1332 |
index 0000000..946cc5b |
1333 |
--- /dev/null |
1334 |
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch |
1335 |
@@ -0,0 +1,147 @@ |
1336 |
+diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile |
1337 |
+index d199a85..dc5cafd 100644 |
1338 |
+--- a/usr.bin/at/Makefile |
1339 |
++++ b/usr.bin/at/Makefile |
1340 |
+@@ -17,6 +17,8 @@ BINOWN= root |
1341 |
+ BINMODE= 4555 |
1342 |
+ CLEANFILES+= at.1 |
1343 |
+ |
1344 |
++LDFLAGS+=-Wl,-z,now |
1345 |
++ |
1346 |
+ at.1: at.man |
1347 |
+ @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ |
1348 |
+ sed -e \ |
1349 |
+diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile |
1350 |
+index 4427417..4f774a1 100644 |
1351 |
+--- a/usr.bin/chpass/Makefile |
1352 |
++++ b/usr.bin/chpass/Makefile |
1353 |
+@@ -17,6 +17,8 @@ CFLAGS+= -DYP |
1354 |
+ #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE |
1355 |
+ CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I. |
1356 |
+ |
1357 |
++LDFLAGS+=-Wl,-z,now |
1358 |
++ |
1359 |
+ LIBADD= crypt util |
1360 |
+ .if ${MK_NIS} != "no" |
1361 |
+ LIBADD+= ypclnt |
1362 |
+diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile |
1363 |
+index cd03a51..9a0fe6e 100644 |
1364 |
+--- a/usr.bin/fstat/Makefile |
1365 |
++++ b/usr.bin/fstat/Makefile |
1366 |
+@@ -9,3 +9,5 @@ LIBADD= procstat |
1367 |
+ MAN1= fuser.1 fstat.1 |
1368 |
+ |
1369 |
+ .include <bsd.prog.mk> |
1370 |
++LDFLAGS+=-Wl,-z,now |
1371 |
++ |
1372 |
+diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile |
1373 |
+index 07321f7..ed2c786 100644 |
1374 |
+--- a/usr.bin/lock/Makefile |
1375 |
++++ b/usr.bin/lock/Makefile |
1376 |
+@@ -7,4 +7,6 @@ BINMODE=4555 |
1377 |
+ |
1378 |
+ LIBADD= crypt |
1379 |
+ |
1380 |
++LDFLAGS+=-Wl,-z,now |
1381 |
++ |
1382 |
+ .include <bsd.prog.mk> |
1383 |
+diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile |
1384 |
+index 3499575..62a7356 100644 |
1385 |
+--- a/usr.bin/login/Makefile |
1386 |
++++ b/usr.bin/login/Makefile |
1387 |
+@@ -16,6 +16,8 @@ CFLAGS+= -DUSE_BSM_AUDIT |
1388 |
+ LIBADD+= bsm |
1389 |
+ .endif |
1390 |
+ |
1391 |
++LDFLAGS+=-Wl,-z,now |
1392 |
++ |
1393 |
+ .if ${MK_SETUID_LOGIN} != "no" |
1394 |
+ BINOWN= root |
1395 |
+ BINMODE=4555 |
1396 |
+diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile |
1397 |
+index 52cc3c7..11ebb2f 100644 |
1398 |
+--- a/usr.bin/netstat/Makefile |
1399 |
++++ b/usr.bin/netstat/Makefile |
1400 |
+@@ -57,6 +57,8 @@ BINGRP= kmem |
1401 |
+ BINMODE=2555 |
1402 |
+ LIBADD= kvm memstat xo util |
1403 |
+ |
1404 |
++LDFLAGS+=-Wl,-z,now |
1405 |
++ |
1406 |
+ .if ${MK_NETGRAPH_SUPPORT} != "no" |
1407 |
+ SRCS+= netgraph.c |
1408 |
+ LIBADD+= netgraph |
1409 |
+diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile |
1410 |
+index 3114a92..5c41213 100644 |
1411 |
+--- a/usr.bin/opieinfo/Makefile |
1412 |
++++ b/usr.bin/opieinfo/Makefile |
1413 |
+@@ -12,6 +12,8 @@ WARNS?= 0 |
1414 |
+ |
1415 |
+ LIBADD= opie |
1416 |
+ |
1417 |
++LDFLAGS+=-Wl,-z,now |
1418 |
++ |
1419 |
+ BINOWN= root |
1420 |
+ BINMODE=4555 |
1421 |
+ PRECIOUSPROG= |
1422 |
+diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile |
1423 |
+index ae35b20..32ba59b 100644 |
1424 |
+--- a/usr.bin/opiepasswd/Makefile |
1425 |
++++ b/usr.bin/opiepasswd/Makefile |
1426 |
+@@ -12,6 +12,8 @@ WARNS?= 0 |
1427 |
+ |
1428 |
+ LIBADD= opie |
1429 |
+ |
1430 |
++LDFLAGS+=-Wl,-z,now |
1431 |
++ |
1432 |
+ BINOWN= root |
1433 |
+ BINMODE=4555 |
1434 |
+ PRECIOUSPROG= |
1435 |
+diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile |
1436 |
+index 758be2d..ebde1a6 100644 |
1437 |
+--- a/usr.bin/passwd/Makefile |
1438 |
++++ b/usr.bin/passwd/Makefile |
1439 |
+@@ -13,6 +13,8 @@ SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd |
1440 |
+ MLINKS = passwd.1 yppasswd.1 |
1441 |
+ .endif |
1442 |
+ |
1443 |
++LDFLAGS+=-Wl,-z,now |
1444 |
++ |
1445 |
+ beforeinstall: |
1446 |
+ .for i in passwd yppasswd |
1447 |
+ [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ |
1448 |
+diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile |
1449 |
+index b3dd829..26eaa63 100644 |
1450 |
+--- a/usr.bin/su/Makefile |
1451 |
++++ b/usr.bin/su/Makefile |
1452 |
+@@ -10,6 +10,8 @@ WARNS?= 5 |
1453 |
+ LIBADD= util pam |
1454 |
+ |
1455 |
+ .if ${MK_AUDIT} != "no" |
1456 |
++LDFLAGS+=-Wl,-z,now |
1457 |
++ |
1458 |
+ CFLAGS+= -DUSE_BSM_AUDIT |
1459 |
+ LIBADD+= bsm |
1460 |
+ .endif |
1461 |
+diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile |
1462 |
+index 0579add..571be8d 100644 |
1463 |
+--- a/usr.bin/wall/Makefile |
1464 |
++++ b/usr.bin/wall/Makefile |
1465 |
+@@ -6,4 +6,6 @@ SRCS= ttymsg.c wall.c |
1466 |
+ BINGRP= tty |
1467 |
+ BINMODE=2555 |
1468 |
+ |
1469 |
++LDFLAGS+=-Wl,-z,now |
1470 |
++ |
1471 |
+ .include <bsd.prog.mk> |
1472 |
+diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile |
1473 |
+index ba06110..ba6ce04 100644 |
1474 |
+--- a/usr.bin/write/Makefile |
1475 |
++++ b/usr.bin/write/Makefile |
1476 |
+@@ -5,4 +5,6 @@ PROG= write |
1477 |
+ BINMODE=2555 |
1478 |
+ BINGRP= tty |
1479 |
+ |
1480 |
++LDFLAGS+=-Wl,-z,now |
1481 |
++ |
1482 |
+ .include <bsd.prog.mk> |
1483 |
|
1484 |
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild |
1485 |
index 3cdde79..f9bcdb2 100644 |
1486 |
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild |
1487 |
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild |
1488 |
@@ -11,9 +11,6 @@ SLOT="0" |
1489 |
IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" |
1490 |
LICENSE="BSD zfs? ( CDDL )" |
1491 |
|
1492 |
-# Security Advisory and Errata patches. |
1493 |
-UPSTREAM_PATCHES=( "SA-16:25/bspatch.patch" ) |
1494 |
- |
1495 |
if [[ ${PV} != *9999* ]]; then |
1496 |
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
1497 |
SRC_URI="${SRC_URI} |
1498 |
@@ -55,18 +52,13 @@ S="${WORKDIR}/usr.bin" |
1499 |
|
1500 |
PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" |
1501 |
"${FILESDIR}/${PN}-9.0-fixmakefiles.patch" |
1502 |
- "${FILESDIR}/${PN}-setXid.patch" |
1503 |
+ "${FILESDIR}/${PN}-11.0-setXid.patch" |
1504 |
"${FILESDIR}/${PN}-lint-stdarg.patch" |
1505 |
- "${FILESDIR}/${PN}-8.0-xinstall.patch" |
1506 |
"${FILESDIR}/${PN}-9.1-bsdar.patch" |
1507 |
"${FILESDIR}/${PN}-9.1-minigzip.patch" |
1508 |
- "${FILESDIR}/${PN}-10.0-atf.patch" |
1509 |
"${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" |
1510 |
- "${FILESDIR}/${PN}-10.0-kdump-ioctl.patch" |
1511 |
- "${FILESDIR}/${PN}-10.0-mandoc.patch" |
1512 |
- "${FILESDIR}/${PN}-10.2-bsdxml.patch" |
1513 |
"${FILESDIR}/${PN}-10.2-talk-workaround.patch" |
1514 |
- "${FILESDIR}/${PN}-10.3-bmake-workaround.patch" ) |
1515 |
+ "${FILESDIR}/${PN}-10.2-bsdxml.patch" ) |
1516 |
|
1517 |
# Here we remove some sources we don't need because they are already |
1518 |
# provided by portage's packages or similar. In order: |
1519 |
@@ -89,7 +81,8 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio |
1520 |
compile_et lex vi smbutil file vacation nc ftp telnet |
1521 |
c99 c89 |
1522 |
bc dc |
1523 |
- whois tftp man" |
1524 |
+ whois tftp man |
1525 |
+ addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings" |
1526 |
|
1527 |
pkg_setup() { |
1528 |
# Add the required source files. |
1529 |
@@ -106,7 +99,7 @@ pkg_setup() { |
1530 |
use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
1531 |
use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
1532 |
use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
1533 |
- mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= " |
1534 |
+ mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= " |
1535 |
} |
1536 |
|
1537 |
pkg_preinst() { |
1538 |
@@ -131,7 +124,7 @@ src_prepare() { |
1539 |
sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" |
1540 |
|
1541 |
# Build a dynamic make |
1542 |
- sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die |
1543 |
+ sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die |
1544 |
|
1545 |
# Disable it here otherwise our patch wont apply |
1546 |
use ar || dummy_mk ar |
1547 |
@@ -151,16 +144,29 @@ setup_multilib_vars() { |
1548 |
} |
1549 |
|
1550 |
src_compile() { |
1551 |
- # Preparing to build mandoc |
1552 |
- cd "${WORKDIR}/lib/libmandoc" || die |
1553 |
- freebsd_src_compile -j1 |
1554 |
- |
1555 |
- cd "${S}" || die |
1556 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
1557 |
+ # Preparing to build addr2line, elfcopy, m4 |
1558 |
+ local MULTIBUILD_VARIANTS="${DEFAULT_ABI}" |
1559 |
+ for dir in libelftc libpe libopenbsd ; do |
1560 |
+ cd "${WORKDIR}/lib/${dir}" || die |
1561 |
+ multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1 |
1562 |
+ done |
1563 |
+ MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
1564 |
multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 |
1565 |
} |
1566 |
|
1567 |
src_install() { |
1568 |
+ cd "${S}"/calendar/calendars || die |
1569 |
+ for dir in $(find . -type d ! -name "." ) ; do |
1570 |
+ dodir /usr/share/calendar/"$(basename ${dir})" |
1571 |
+ done |
1572 |
+ for l in en_US.ISO8859-1 en_US.ISO8859-15 fr_BE.ISO8859-1 \ |
1573 |
+ fr_BE.ISO8859-15 fr_CA.ISO8859-1 fr_CA.ISO8859-15 \ |
1574 |
+ fr_CH.ISO8859-1 fr_CH.ISO8859-15 fr_FR.ISO8859-15 \ |
1575 |
+ de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ |
1576 |
+ de_CH.ISO8859-15 de_DE.ISO8859-15 pt_PT.ISO8859-1 ; do |
1577 |
+ dodir "/usr/share/nls/${l}" |
1578 |
+ done |
1579 |
+ |
1580 |
local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
1581 |
multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
1582 |
|
1583 |
|
1584 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch |
1585 |
new file mode 100644 |
1586 |
index 0000000..04ba75a |
1587 |
--- /dev/null |
1588 |
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch |
1589 |
@@ -0,0 +1,13 @@ |
1590 |
+diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile |
1591 |
+index 033002c..d198f10 100644 |
1592 |
+--- a/usr.sbin/nmtree/Makefile |
1593 |
++++ b/usr.sbin/nmtree/Makefile |
1594 |
+@@ -5,7 +5,7 @@ |
1595 |
+ .PATH: ${.CURDIR}/../../contrib/mtree |
1596 |
+ |
1597 |
+ PROG= mtree |
1598 |
+-MAN= mtree.5 mtree.8 |
1599 |
++MAN= mtree.8 |
1600 |
+ SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ |
1601 |
+ only.c spec.c specspec.c verify.c |
1602 |
+ |
1603 |
|
1604 |
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild |
1605 |
index 28374e5..b7f4a4e 100644 |
1606 |
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild |
1607 |
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild |
1608 |
@@ -82,6 +82,7 @@ PATCHES=( |
1609 |
"${FILESDIR}/${PN}-9.0-newsyslog.patch" |
1610 |
"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch" |
1611 |
"${FILESDIR}/${PN}-10.3-bsdxml2expat.patch" |
1612 |
+ "${FILESDIR}/${PN}-11.0-workaround.patch" |
1613 |
) |
1614 |
|
1615 |
REMOVE_SUBDIRS=" |
1616 |
@@ -91,7 +92,7 @@ REMOVE_SUBDIRS=" |
1617 |
tcpdump ndp inetd |
1618 |
wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase |
1619 |
zic amd |
1620 |
- pkg pkg_install freebsd-update service sysrc bsdinstall" |
1621 |
+ pkg freebsd-update service sysrc bsdinstall" |
1622 |
|
1623 |
src_prepare() { |
1624 |
if ! use build; then |
1625 |
@@ -150,15 +151,16 @@ EOS |
1626 |
cd "${WORKDIR}/etc" || die |
1627 |
doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die |
1628 |
|
1629 |
- insinto /etc/ppp |
1630 |
- doins ppp/ppp.conf || die |
1631 |
- |
1632 |
if use bluetooth; then |
1633 |
insinto /etc/bluetooth |
1634 |
doins bluetooth/* || die |
1635 |
rm -f "${D}"/etc/bluetooth/Makefile |
1636 |
fi |
1637 |
|
1638 |
+ cd "${S}"/ppp |
1639 |
+ insinto /etc/ppp |
1640 |
+ doins ppp.conf || die |
1641 |
+ |
1642 |
# Install the periodic stuff (needs probably to be ported in a more |
1643 |
# gentooish way) |
1644 |
cd "${WORKDIR}/etc/periodic" || die |