| 1 |
commit: 4933d8a774f911cc7ec2b371f62cbcec83447438 |
| 2 |
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Nov 2 12:57:07 2016 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 5 |
CommitDate: Wed Nov 2 12:57:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=4933d8a7 |
| 7 |
|
| 8 |
clean up freebsd 11.0 related files. |
| 9 |
|
| 10 |
eclass/bsdmk.eclass | 83 --- |
| 11 |
eclass/freebsd.eclass | 327 ----------- |
| 12 |
sys-freebsd/boot0/Manifest | 13 - |
| 13 |
sys-freebsd/boot0/boot0-11.0.ebuild | 82 --- |
| 14 |
.../files/boot0-10.1-drop-unsupport-cflags.patch | 26 - |
| 15 |
sys-freebsd/boot0/files/boot0-10.1-gcc46.patch | 67 --- |
| 16 |
sys-freebsd/boot0/files/boot0-10.3-clang.patch | 30 - |
| 17 |
.../files/boot0-10.3-drop-unsupport-cflags.patch | 28 - |
| 18 |
.../boot0/files/boot0-10.3-uefi-support.patch | 33 -- |
| 19 |
sys-freebsd/boot0/files/boot0-11.0-gcc46.patch | 14 - |
| 20 |
.../boot0/files/boot0-11.0-uefi-support.patch | 21 - |
| 21 |
.../boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 - |
| 22 |
sys-freebsd/boot0/files/boot0-9.2-gcc46.patch | 66 --- |
| 23 |
.../boot0/files/boot0-add-nossp-cflags.patch | 11 - |
| 24 |
sys-freebsd/boot0/metadata.xml | 12 - |
| 25 |
sys-freebsd/freebsd-bin/Manifest | 3 - |
| 26 |
sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild | 42 -- |
| 27 |
sys-freebsd/freebsd-bin/metadata.xml | 8 - |
| 28 |
sys-freebsd/freebsd-cddl/Manifest | 16 - |
| 29 |
.../files/freebsd-cddl-10.2-libpaths.patch | 220 ------- |
| 30 |
.../files/freebsd-cddl-10.3-underlink.patch | 12 - |
| 31 |
.../files/freebsd-cddl-11.0-add-libs.patch | 87 --- |
| 32 |
.../files/freebsd-cddl-11.0-workaround.patch | 12 - |
| 33 |
.../files/freebsd-cddl-8.0-libpaths.patch | 114 ---- |
| 34 |
.../files/freebsd-cddl-8.2-libpaths.patch | 22 - |
| 35 |
.../files/freebsd-cddl-9.0-bsdxml.patch | 28 - |
| 36 |
.../files/freebsd-cddl-9.0-libpaths.patch | 167 ------ |
| 37 |
.../files/freebsd-cddl-9.0-underlink.patch | 22 - |
| 38 |
.../files/freebsd-cddl-9.2-libpaths.patch | 220 ------- |
| 39 |
sys-freebsd/freebsd-cddl/files/zfs.initd | 24 - |
| 40 |
sys-freebsd/freebsd-cddl/files/zvol.initd | 47 -- |
| 41 |
sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 | 45 -- |
| 42 |
sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild | 79 --- |
| 43 |
sys-freebsd/freebsd-cddl/metadata.xml | 8 - |
| 44 |
sys-freebsd/freebsd-lib/Manifest | 43 -- |
| 45 |
.../files/freebsd-lib-10.0-atfcxx.patch | 49 -- |
| 46 |
.../files/freebsd-lib-10.0-liblink.patch | 98 ---- |
| 47 |
.../files/freebsd-lib-10.0-libproc-libcxx.patch | 16 - |
| 48 |
.../files/freebsd-lib-10.0-libusb.patch | 19 - |
| 49 |
.../files/freebsd-lib-10.2-bsdxml2expat.patch | 39 -- |
| 50 |
.../files/freebsd-lib-10.2-liblink.patch | 26 - |
| 51 |
.../files/freebsd-lib-10.3-libusb.patch | 13 - |
| 52 |
.../files/freebsd-lib-11.0-bsdxml2expat.patch | 39 -- |
| 53 |
.../files/freebsd-lib-11.0-liblink.patch | 62 -- |
| 54 |
.../files/freebsd-lib-11.0-libproc-libcxx.patch | 13 - |
| 55 |
.../files/freebsd-lib-11.0-libsysdecode.patch | 22 - |
| 56 |
.../files/freebsd-lib-11.0-workaround.patch | 12 - |
| 57 |
.../files/freebsd-lib-6.0-flex-2.5.31.patch | 13 - |
| 58 |
.../files/freebsd-lib-6.0-gccfloat.patch | 16 - |
| 59 |
.../freebsd-lib/files/freebsd-lib-6.0-pmc.patch | 13 - |
| 60 |
.../freebsd-lib/files/freebsd-lib-6.1-csu.patch | 20 - |
| 61 |
.../files/freebsd-lib-6.2-bluetooth.patch | 11 - |
| 62 |
.../files/freebsd-lib-7.1-types.h-fix.patch | 15 - |
| 63 |
.../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch | 28 - |
| 64 |
.../freebsd-lib/files/freebsd-lib-8.0-log2.patch | 21 - |
| 65 |
.../files/freebsd-lib-8.0-rpcsec_gss.patch | 12 - |
| 66 |
.../files/freebsd-lib-8.2-liblink.patch | 19 - |
| 67 |
.../files/freebsd-lib-8.2-nlm_syscall.patch | 10 - |
| 68 |
.../files/freebsd-lib-9.0-bluetooth.patch | 12 - |
| 69 |
.../files/freebsd-lib-9.0-cve-2010-2632.patch | 215 ------- |
| 70 |
.../files/freebsd-lib-9.0-liblink.patch | 21 - |
| 71 |
.../files/freebsd-lib-9.0-netware.patch | 11 - |
| 72 |
.../files/freebsd-lib-9.0-opieincludes.patch | 122 ---- |
| 73 |
.../files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch | 17 - |
| 74 |
.../files/freebsd-lib-9.1-aligned_alloc.patch | 51 -- |
| 75 |
.../files/freebsd-lib-9.1-rmgssapi.patch | 16 - |
| 76 |
.../files/freebsd-lib-add-nossp-cflags.patch | 30 - |
| 77 |
.../freebsd-lib/files/freebsd-lib-bsdxml.patch | 13 - |
| 78 |
.../files/freebsd-lib-bsdxml2expat.patch | 26 - |
| 79 |
.../freebsd-lib/files/freebsd-lib-includes.patch | 13 - |
| 80 |
.../freebsd-lib/files/freebsd-lib-new_as.patch | 68 --- |
| 81 |
.../files/freebsd-sources-9.0-sysctluint.patch | 13 - |
| 82 |
sys-freebsd/freebsd-lib/files/libmap.conf | 8 - |
| 83 |
sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in | 11 - |
| 84 |
sys-freebsd/freebsd-lib/files/libusb.pc.in | 11 - |
| 85 |
sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild | 644 --------------------- |
| 86 |
sys-freebsd/freebsd-lib/metadata.xml | 16 - |
| 87 |
sys-freebsd/freebsd-libexec/Manifest | 15 - |
| 88 |
sys-freebsd/freebsd-libexec/files/bootpd.confd | 7 - |
| 89 |
sys-freebsd/freebsd-libexec/files/bootpd.initd | 27 - |
| 90 |
.../files/freebsd-libexec-10.2-atf-check.patch | 28 - |
| 91 |
.../files/freebsd-libexec-7.2-pic.patch | 13 - |
| 92 |
.../files/freebsd-libexec-8.2-rtld.patch | 40 -- |
| 93 |
.../files/freebsd-libexec-9.2-no_ld32.patch | 15 - |
| 94 |
sys-freebsd/freebsd-libexec/files/ftpd.pamd | 8 - |
| 95 |
sys-freebsd/freebsd-libexec/files/rquotad.xinetd | 11 - |
| 96 |
sys-freebsd/freebsd-libexec/files/rstatd.xinetd | 11 - |
| 97 |
sys-freebsd/freebsd-libexec/files/rusersd.xinetd | 11 - |
| 98 |
sys-freebsd/freebsd-libexec/files/sprayd.xinetd | 11 - |
| 99 |
sys-freebsd/freebsd-libexec/files/walld.xinetd | 11 - |
| 100 |
.../freebsd-libexec/freebsd-libexec-11.0.ebuild | 131 ----- |
| 101 |
sys-freebsd/freebsd-libexec/metadata.xml | 8 - |
| 102 |
sys-freebsd/freebsd-mk-defs/Manifest | 15 - |
| 103 |
.../files/freebsd-mk-defs-10.2-gnu.patch | 63 -- |
| 104 |
.../files/freebsd-mk-defs-10.3-gentoo.patch | 337 ----------- |
| 105 |
...reebsd-mk-defs-11.0-drop-unsupport-cflags.patch | 13 - |
| 106 |
.../files/freebsd-mk-defs-11.0-gentoo.patch | 343 ----------- |
| 107 |
.../files/freebsd-mk-defs-11.0-gnu.patch | 63 -- |
| 108 |
.../freebsd-mk-defs-11.0-libproc-libcxx.patch | 13 - |
| 109 |
.../files/freebsd-mk-defs-11.0-rename-libs.patch | 16 - |
| 110 |
.../files/freebsd-mk-defs-8.0-gentoo.patch | 332 ----------- |
| 111 |
.../files/freebsd-mk-defs-8.0-gnu.patch | 121 ---- |
| 112 |
.../files/freebsd-mk-defs-9.1-gentoo.patch | 326 ----------- |
| 113 |
.../files/freebsd-mk-defs-9.1-gnu.patch | 77 --- |
| 114 |
.../files/freebsd-mk-defs-add-nossp-cflags.patch | 28 - |
| 115 |
.../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 55 -- |
| 116 |
sys-freebsd/freebsd-mk-defs/metadata.xml | 8 - |
| 117 |
sys-freebsd/freebsd-pam-modules/Manifest | 6 - |
| 118 |
sys-freebsd/freebsd-pam-modules/files/README.pamd | 63 -- |
| 119 |
.../files/freebsd-pam-modules-6.0-gentoo.patch | 24 - |
| 120 |
.../files/freebsd-pam-modules-9.0-gentoo.patch | 22 - |
| 121 |
.../freebsd-pam-modules-11.0.ebuild | 46 -- |
| 122 |
sys-freebsd/freebsd-pam-modules/metadata.xml | 8 - |
| 123 |
sys-freebsd/freebsd-pf/Manifest | 16 - |
| 124 |
.../files/freebsd-pf-10.0-libevent.patch | 16 - |
| 125 |
.../freebsd-pf/files/freebsd-pf-10.0-pflogd.patch | 15 - |
| 126 |
.../files/freebsd-pf-11.0-libevent.patch | 13 - |
| 127 |
.../freebsd-pf/files/freebsd-pf-11.0-pflogd.patch | 13 - |
| 128 |
.../freebsd-pf/files/freebsd-pf-7.0-libevent.patch | 12 - |
| 129 |
.../files/freebsd-pf-7.0-pcap_pollution.patch | 18 - |
| 130 |
.../freebsd-pf/files/freebsd-pf-9.0-bpf.patch | 10 - |
| 131 |
.../freebsd-pf/files/freebsd-pf-9.0-getline.patch | 38 -- |
| 132 |
.../freebsd-pf/files/freebsd-pf-9.0-libevent.patch | 15 - |
| 133 |
.../files/freebsd-pf-9.0-pcap_pollution.patch | 17 - |
| 134 |
.../freebsd-pf/files/freebsd-pf-9.0-pflogd.patch | 13 - |
| 135 |
sys-freebsd/freebsd-pf/files/pf.confd | 9 - |
| 136 |
sys-freebsd/freebsd-pf/files/pf.initd | 50 -- |
| 137 |
sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild | 71 --- |
| 138 |
sys-freebsd/freebsd-pf/metadata.xml | 8 - |
| 139 |
sys-freebsd/freebsd-rescue/Manifest | 12 - |
| 140 |
.../files/freebsd-rescue-10.0-zlib.patch | 22 - |
| 141 |
.../files/freebsd-rescue-11.0-rename-libs.patch | 22 - |
| 142 |
.../files/freebsd-rescue-7.1-zlib.patch | 21 - |
| 143 |
...sd-rescue-8.0-pkgconfig_static_libarchive.patch | 11 - |
| 144 |
.../files/freebsd-rescue-8.2-libzcleverlink.patch | 20 - |
| 145 |
.../files/freebsd-rescue-9.1-bsdtar.patch | 12 - |
| 146 |
.../files/freebsd-rescue-9.1-libcleverlink.patch | 21 - |
| 147 |
.../files/freebsd-sbin-bsdxml2expat.patch | 13 - |
| 148 |
.../files/freebsd-ubin-10.2-bsdxml.patch | 13 - |
| 149 |
.../freebsd-rescue/freebsd-rescue-11.0.ebuild | 85 --- |
| 150 |
sys-freebsd/freebsd-rescue/metadata.xml | 12 - |
| 151 |
sys-freebsd/freebsd-sbin/Manifest | 17 - |
| 152 |
sys-freebsd/freebsd-sbin/files/adjkerntz-crontab | 4 - |
| 153 |
sys-freebsd/freebsd-sbin/files/devd.conf | 153 ----- |
| 154 |
sys-freebsd/freebsd-sbin/files/devd.initd | 47 -- |
| 155 |
sys-freebsd/freebsd-sbin/files/devd_queue | 50 -- |
| 156 |
.../files/freebsd-sbin-10.0-zlib.patch | 22 - |
| 157 |
.../files/freebsd-sbin-6.1-pr102701.patch | 17 - |
| 158 |
.../files/freebsd-sbin-6.2-ldconfig.patch | 13 - |
| 159 |
.../freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch | 21 - |
| 160 |
.../files/freebsd-sbin-bsdxml2expat.patch | 13 - |
| 161 |
.../freebsd-sbin/files/freebsd-sbin-setXid.patch | 20 - |
| 162 |
sys-freebsd/freebsd-sbin/files/idmapd.initd | 20 - |
| 163 |
sys-freebsd/freebsd-sbin/files/ipfw.confd | 10 - |
| 164 |
sys-freebsd/freebsd-sbin/files/ipfw.initd | 110 ---- |
| 165 |
sys-freebsd/freebsd-sbin/files/sysctl.initd | 28 - |
| 166 |
sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild | 100 ---- |
| 167 |
sys-freebsd/freebsd-sbin/metadata.xml | 20 - |
| 168 |
sys-freebsd/freebsd-share/Manifest | 10 - |
| 169 |
.../files/freebsd-share-10.0-gentoo-eapi3.patch | 17 - |
| 170 |
.../files/freebsd-share-10.2-gnu-miscfiles.patch | 30 - |
| 171 |
.../files/freebsd-share-10.3-gentoo-skel.patch | 20 - |
| 172 |
.../files/freebsd-share-5.3-doc-locations.patch | 20 - |
| 173 |
.../files/freebsd-share-5.4-gentoo-skel.patch | 20 - |
| 174 |
.../files/freebsd-share-8.0-gnu-miscfiles.patch | 26 - |
| 175 |
.../files/freebsd-share-9.2-gnu-miscfiles.patch | 28 - |
| 176 |
.../freebsd-share/freebsd-share-11.0.ebuild | 114 ---- |
| 177 |
sys-freebsd/freebsd-share/metadata.xml | 12 - |
| 178 |
sys-freebsd/freebsd-sources/Manifest | 39 -- |
| 179 |
sys-freebsd/freebsd-sources/files/config-GENTOO | 4 - |
| 180 |
.../files/freebsd-sources-10.0-gentoo.patch | 22 - |
| 181 |
.../files/freebsd-sources-10.1-gcc48.patch | 18 - |
| 182 |
.../files/freebsd-sources-11.0-gentoo-gcc.patch | 13 - |
| 183 |
.../files/freebsd-sources-11.0-gentoo.patch | 22 - |
| 184 |
.../files/freebsd-sources-6.0-flex-2.5.31.patch | 22 - |
| 185 |
.../files/freebsd-sources-6.1-ntfs.patch | 32 - |
| 186 |
.../freebsd-sources-7.0-tmpfs_whiteout_stub.patch | 44 -- |
| 187 |
.../files/freebsd-sources-7.1-binutils_link.patch | 37 -- |
| 188 |
.../files/freebsd-sources-7.1-includes.patch | 13 - |
| 189 |
.../files/freebsd-sources-7.1-types.h-fix.patch | 15 - |
| 190 |
.../files/freebsd-sources-7.2-debug-O2.patch | 27 - |
| 191 |
.../files/freebsd-sources-8.0-gentoo.patch | 33 -- |
| 192 |
.../freebsd-sources-8.0-subnet-route-pr40133.patch | 21 - |
| 193 |
.../files/freebsd-sources-8.2-unix2.patch | 55 -- |
| 194 |
.../freebsd-sources-9.0-disable-optimization.patch | 32 - |
| 195 |
.../files/freebsd-sources-9.0-ipv6refcount.patch | 128 ---- |
| 196 |
.../files/freebsd-sources-9.0-sysctluint.patch | 13 - |
| 197 |
.../files/freebsd-sources-9.1-ciss.patch | 65 --- |
| 198 |
.../files/freebsd-sources-9.1-cve-2013-3077.patch | 26 - |
| 199 |
.../files/freebsd-sources-9.1-cve-2013-3266.patch | 13 - |
| 200 |
.../files/freebsd-sources-9.1-cve-2013-5209.patch | 19 - |
| 201 |
.../files/freebsd-sources-9.1-cve-2013-5691.patch | 89 --- |
| 202 |
.../files/freebsd-sources-9.1-cve-2013-5710.patch | 28 - |
| 203 |
.../files/freebsd-sources-9.1-cve-2014-1453.patch | 70 --- |
| 204 |
.../files/freebsd-sources-9.1-exec.patch | 66 --- |
| 205 |
.../files/freebsd-sources-9.1-gentoo.patch | 21 - |
| 206 |
.../files/freebsd-sources-9.1-ktrace.patch | 12 - |
| 207 |
.../files/freebsd-sources-9.1-mmap-2014.patch | 20 - |
| 208 |
.../files/freebsd-sources-9.1-mmap.patch | 20 - |
| 209 |
.../files/freebsd-sources-9.1-nfsserver.patch | 16 - |
| 210 |
.../files/freebsd-sources-9.1-random.patch | 27 - |
| 211 |
.../files/freebsd-sources-9.1-tcp.patch | 32 - |
| 212 |
.../files/freebsd-sources-9.2-gentoo-gcc.patch | 13 - |
| 213 |
.../files/freebsd-sources-cve-2012-0217.patch | 26 - |
| 214 |
.../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 - |
| 215 |
.../freebsd-sources/freebsd-sources-11.0.ebuild | 170 ------ |
| 216 |
sys-freebsd/freebsd-sources/metadata.xml | 13 - |
| 217 |
sys-freebsd/freebsd-ubin/Manifest | 33 -- |
| 218 |
.../freebsd-ubin/files/freebsd-ubin-10.0-atf.patch | 15 - |
| 219 |
.../files/freebsd-ubin-10.0-dtc-gcc46.patch | 25 - |
| 220 |
.../files/freebsd-ubin-10.0-kdump-ioctl.patch | 26 - |
| 221 |
.../files/freebsd-ubin-10.0-mandoc.patch | 13 - |
| 222 |
.../files/freebsd-ubin-10.1-kdump-workaround.patch | 13 - |
| 223 |
.../files/freebsd-ubin-10.2-bsdxml.patch | 13 - |
| 224 |
.../files/freebsd-ubin-10.2-talk-workaround.patch | 12 - |
| 225 |
.../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 - |
| 226 |
.../files/freebsd-ubin-11.0-setXid.patch | 147 ----- |
| 227 |
.../files/freebsd-ubin-6.0-bsdcmp.patch | 13 - |
| 228 |
.../files/freebsd-ubin-6.0-fixmakefiles.patch | 35 -- |
| 229 |
.../files/freebsd-ubin-6.0-kdump-ioctl.patch | 28 - |
| 230 |
.../files/freebsd-ubin-8.0-bsdar.patch | 21 - |
| 231 |
.../files/freebsd-ubin-8.0-xinstall.patch | 26 - |
| 232 |
.../files/freebsd-ubin-8.2-compress.patch | 55 -- |
| 233 |
.../files/freebsd-ubin-9.0-fixmakefiles.patch | 11 - |
| 234 |
.../files/freebsd-ubin-9.1-ar-libarchive3.patch | 19 - |
| 235 |
.../files/freebsd-ubin-9.1-bsdar.patch | 25 - |
| 236 |
.../freebsd-ubin/files/freebsd-ubin-9.1-grep.patch | 17 - |
| 237 |
.../files/freebsd-ubin-9.1-kdump-ioctl.patch | 24 - |
| 238 |
.../files/freebsd-ubin-9.1-minigzip.patch | 10 - |
| 239 |
.../files/freebsd-ubin-lint-stdarg.patch | 24 - |
| 240 |
.../freebsd-ubin/files/freebsd-ubin-setXid.patch | 129 ----- |
| 241 |
.../freebsd-ubin/files/locate-updatedb-cron | 6 - |
| 242 |
sys-freebsd/freebsd-ubin/files/login.1.pamd | 4 - |
| 243 |
sys-freebsd/freebsd-ubin/files/login.pamd | 20 - |
| 244 |
sys-freebsd/freebsd-ubin/files/passwd.1.pamd | 9 - |
| 245 |
sys-freebsd/freebsd-ubin/files/passwd.pamd | 11 - |
| 246 |
sys-freebsd/freebsd-ubin/files/su.1.pamd | 17 - |
| 247 |
sys-freebsd/freebsd-ubin/files/su.pamd | 17 - |
| 248 |
sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild | 209 ------- |
| 249 |
sys-freebsd/freebsd-ubin/metadata.xml | 24 - |
| 250 |
sys-freebsd/freebsd-usbin/Manifest | 33 -- |
| 251 |
.../files/freebsd-usbin-10.0-bsdxml2expat.patch | 24 - |
| 252 |
.../files/freebsd-usbin-10.3-bsdxml2expat.patch | 13 - |
| 253 |
.../files/freebsd-usbin-11.0-workaround.patch | 13 - |
| 254 |
.../files/freebsd-usbin-7.0-nowrap.patch | 45 -- |
| 255 |
.../files/freebsd-usbin-8.2-newsyslog.patch | 10 - |
| 256 |
.../files/freebsd-usbin-9.0-libarchive.patch | 12 - |
| 257 |
.../files/freebsd-usbin-9.0-newsyslog.patch | 12 - |
| 258 |
.../files/freebsd-usbin-9.1-bsdxml2expat.patch | 12 - |
| 259 |
.../files/freebsd-usbin-9.1-kldxref.patch | 30 - |
| 260 |
.../files/freebsd-usbin-adduser.patch | 20 - |
| 261 |
sys-freebsd/freebsd-usbin/files/iscsid.initd | 20 - |
| 262 |
sys-freebsd/freebsd-usbin/files/mountd.patch | 15 - |
| 263 |
sys-freebsd/freebsd-usbin/files/moused.confd | 20 - |
| 264 |
sys-freebsd/freebsd-usbin/files/moused.initd | 66 --- |
| 265 |
sys-freebsd/freebsd-usbin/files/nfs.confd | 10 - |
| 266 |
sys-freebsd/freebsd-usbin/files/nfs.initd | 54 -- |
| 267 |
sys-freebsd/freebsd-usbin/files/nfsmount.initd | 63 -- |
| 268 |
sys-freebsd/freebsd-usbin/files/nfsuserd.confd | 5 - |
| 269 |
sys-freebsd/freebsd-usbin/files/nfsuserd.initd | 20 - |
| 270 |
sys-freebsd/freebsd-usbin/files/powerd.confd | 14 - |
| 271 |
sys-freebsd/freebsd-usbin/files/powerd.initd | 27 - |
| 272 |
sys-freebsd/freebsd-usbin/files/pw.conf | 5 - |
| 273 |
sys-freebsd/freebsd-usbin/files/rarpd.confd | 7 - |
| 274 |
sys-freebsd/freebsd-usbin/files/rarpd.initd | 35 -- |
| 275 |
sys-freebsd/freebsd-usbin/files/rpc.lockd.initd | 20 - |
| 276 |
sys-freebsd/freebsd-usbin/files/rpc.statd.initd | 20 - |
| 277 |
sys-freebsd/freebsd-usbin/files/rpcbind.initd | 30 - |
| 278 |
sys-freebsd/freebsd-usbin/files/syscons.confd | 14 - |
| 279 |
sys-freebsd/freebsd-usbin/files/syscons.initd | 78 --- |
| 280 |
sys-freebsd/freebsd-usbin/files/syslogd.initd | 25 - |
| 281 |
.../freebsd-usbin/freebsd-usbin-11.0.ebuild | 186 ------ |
| 282 |
sys-freebsd/freebsd-usbin/metadata.xml | 19 - |
| 283 |
273 files changed, 11225 deletions(-) |
| 284 |
|
| 285 |
diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass |
| 286 |
deleted file mode 100644 |
| 287 |
index a92b4c0..0000000 |
| 288 |
--- a/eclass/bsdmk.eclass |
| 289 |
+++ /dev/null |
| 290 |
@@ -1,83 +0,0 @@ |
| 291 |
-# Copyright 1999-2011 Gentoo Foundation |
| 292 |
-# Distributed under the terms of the GNU General Public License v2 |
| 293 |
-# $Id$ |
| 294 |
- |
| 295 |
-# @ECLASS: bsdmk.eclass |
| 296 |
-# @MAINTAINER: |
| 297 |
-# maintainer-needed@g.o |
| 298 |
-# @BLURB: Some functions for BSDmake |
| 299 |
- |
| 300 |
-inherit toolchain-funcs portability flag-o-matic |
| 301 |
- |
| 302 |
-EXPORT_FUNCTIONS src_compile src_install |
| 303 |
- |
| 304 |
-RDEPEND="" |
| 305 |
-# this should actually be BDEPEND, but this works. |
| 306 |
-DEPEND="virtual/pmake" |
| 307 |
- |
| 308 |
-ESED="/usr/bin/sed" |
| 309 |
- |
| 310 |
-# @ECLASS-VARIABLE: mymakeopts |
| 311 |
-# @DESCRIPTION: |
| 312 |
-# Options for bsd-make |
| 313 |
- |
| 314 |
-# @FUNCTION: append-opt |
| 315 |
-# @USAGE: < options > |
| 316 |
-# @DESCRIPTION: |
| 317 |
-# append options to enable or disable features |
| 318 |
-append-opt() { |
| 319 |
- mymakeopts="${mymakeopts} $@" |
| 320 |
-} |
| 321 |
- |
| 322 |
-# @FUNCTION: mkmake |
| 323 |
-# @USAGE: [ options ] |
| 324 |
-# @DESCRIPTION: |
| 325 |
-# calls bsd-make command with the given options, passing ${mymakeopts} to |
| 326 |
-# enable ports to useflags bridge. |
| 327 |
-mkmake() { |
| 328 |
- [[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)" |
| 329 |
- |
| 330 |
- tc-export CC CXX LD RANLIB |
| 331 |
- |
| 332 |
- ${BMAKE} ${MAKEOPTS} ${EXTRA_EMAKE} ${mymakeopts} NO_WERROR= STRIP= "$@" |
| 333 |
-} |
| 334 |
- |
| 335 |
-# @FUNCTION: mkinstall |
| 336 |
-# @USAGE: [ options ] |
| 337 |
-# @DESCRIPTION: |
| 338 |
-# Calls "bsd-make install" with the given options, passing ${mamakeopts} to |
| 339 |
-# enable ports to useflags bridge |
| 340 |
-mkinstall() { |
| 341 |
- [[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)" |
| 342 |
- |
| 343 |
- # STRIP= will replace the default value of -s, leaving to portage the |
| 344 |
- # task of stripping executables. |
| 345 |
- ${BMAKE} ${mymakeopts} NO_WERROR= STRIP= MANSUBDIR= DESTDIR="${D}" "$@" install |
| 346 |
-} |
| 347 |
- |
| 348 |
-# @FUNCTION: dummy_mk |
| 349 |
-# @USAGE: < dirnames > |
| 350 |
-# @DESCRIPTION: |
| 351 |
-# removes the specified subdirectories and creates a dummy makefile in them |
| 352 |
-# useful to remove the need for "minimal" patches |
| 353 |
-dummy_mk() { |
| 354 |
- for dir in $@; do |
| 355 |
- [ -d ${dir} ] || ewarn "dummy_mk called on a non-existing directory: $dir" |
| 356 |
- [ -f ${dir}/Makefile ] || ewarn "dummy_mk called on a directory without Makefile: $dir" |
| 357 |
- echo ".include <bsd.lib.mk>" > ${dir}/Makefile |
| 358 |
- done |
| 359 |
-} |
| 360 |
- |
| 361 |
-# @FUNCTION: bsdmk_src_compile |
| 362 |
-# @DESCRIPTION: |
| 363 |
-# The bsdmk src_compile function, which is exported |
| 364 |
-bsdmk_src_compile() { |
| 365 |
- mkmake "$@" || die "make failed" |
| 366 |
-} |
| 367 |
- |
| 368 |
-# @FUNCTION: bsdmk_src_install |
| 369 |
-# @DESCRIPTION: |
| 370 |
-# The bsdmk src_install function, which is exported |
| 371 |
-bsdmk_src_install() { |
| 372 |
- mkinstall "$@" || die "install failed" |
| 373 |
-} |
| 374 |
|
| 375 |
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass |
| 376 |
deleted file mode 100644 |
| 377 |
index 8f6b204..0000000 |
| 378 |
--- a/eclass/freebsd.eclass |
| 379 |
+++ /dev/null |
| 380 |
@@ -1,327 +0,0 @@ |
| 381 |
-# Copyright 1999-2015 Gentoo Foundation |
| 382 |
-# Distributed under the terms of the GNU General Public License v2 |
| 383 |
-# $Id$ |
| 384 |
-# |
| 385 |
-# @MAINTAINER: |
| 386 |
-# maintainer-needed@g.o |
| 387 |
-# @AUTHOR: |
| 388 |
-# Diego Pettenò <flameeyes@g.o> |
| 389 |
- |
| 390 |
-inherit versionator eutils flag-o-matic bsdmk |
| 391 |
- |
| 392 |
-# Drop patch level from ${PV} |
| 393 |
-MY_PV=${PV/_p*} |
| 394 |
-PLEVEL=${PV##*_p} |
| 395 |
- |
| 396 |
-LICENSE="BSD" |
| 397 |
-HOMEPAGE="http://www.freebsd.org/" |
| 398 |
- |
| 399 |
-# Define global package names |
| 400 |
-LIB="freebsd-lib-${PV}" |
| 401 |
-BIN="freebsd-bin-${PV}" |
| 402 |
-CONTRIB="freebsd-contrib-${PV}" |
| 403 |
-SHARE="freebsd-share-${PV}" |
| 404 |
-UBIN="freebsd-ubin-${PV}" |
| 405 |
-USBIN="freebsd-usbin-${PV}" |
| 406 |
-CRYPTO="freebsd-crypto-${PV}" |
| 407 |
-LIBEXEC="freebsd-libexec-${PV}" |
| 408 |
-SBIN="freebsd-sbin-${PV}" |
| 409 |
-GNU="freebsd-gnu-${PV}" |
| 410 |
-ETC="freebsd-etc-${PV}" |
| 411 |
-SYS="freebsd-sys-${PV}" |
| 412 |
-INCLUDE="freebsd-include-${PV}" |
| 413 |
-RESCUE="freebsd-rescue-${PV}" |
| 414 |
-CDDL="freebsd-cddl-${PV}" |
| 415 |
-SECURE="freebsd-secure-${PV}" |
| 416 |
- |
| 417 |
-# Release version (5.3, 5.4, 6.0, etc) |
| 418 |
-RV="$(get_version_component_range 1-2 ${MY_PV})" |
| 419 |
- |
| 420 |
-# SVN ebuild support. |
| 421 |
-# 9.1.0.9999 --> release/9.1.0 |
| 422 |
-# 9.1.9999 --> releng/9.1 |
| 423 |
-# 9.9999 --> stable/9 |
| 424 |
-# 9999 --> head |
| 425 |
-# |
| 426 |
-# svn revision can be specified by patch level: |
| 427 |
-# freebsd-lib-9.9999_p247000 --> set svn -r 247000 |
| 428 |
- |
| 429 |
-if [[ ${MY_PV} == *9999* ]]; then |
| 430 |
- inherit subversion |
| 431 |
- |
| 432 |
- # Set SVN revision using patch level. |
| 433 |
- [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}" |
| 434 |
- |
| 435 |
- case ${MY_PV%.9999} in |
| 436 |
- *.*.*) BRANCH="release";; |
| 437 |
- *.*) BRANCH="releng" ;; |
| 438 |
- 9999) BRANCH="head" ;; |
| 439 |
- *) BRANCH="stable" ;; |
| 440 |
- esac |
| 441 |
- |
| 442 |
- if [[ ${BRANCH} == head ]] ; then |
| 443 |
- SVN_SUB_URI="${BRANCH}" |
| 444 |
- else |
| 445 |
- SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}" |
| 446 |
- fi |
| 447 |
- |
| 448 |
- ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}" |
| 449 |
- ESVN_PROJECT="freebsd-${BRANCH}" |
| 450 |
-fi |
| 451 |
- |
| 452 |
-# use the original source code. |
| 453 |
-if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then |
| 454 |
- DL_PV=${MY_PV/_rc/-RC} |
| 455 |
- DL_PV=${DL_PV/_beta/-BETA} |
| 456 |
- DL_PV=${DL_PV/_alpha/-ALPHA} |
| 457 |
- if [[ ${DL_PV} == ${MY_PV} ]]; then |
| 458 |
- DL_PV="${DL_PV}-RELEASE" |
| 459 |
- fi |
| 460 |
- SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz" |
| 461 |
-fi |
| 462 |
- |
| 463 |
-IUSE="profile" |
| 464 |
- |
| 465 |
-#unalias -a |
| 466 |
-alias install-info='/usr/bin/bsdinstall-info' |
| 467 |
- |
| 468 |
-EXPORT_FUNCTIONS src_compile src_install src_unpack |
| 469 |
- |
| 470 |
-# doperiodic <kind> <file> ... |
| 471 |
-doperiodic() { |
| 472 |
- local kind=$1 |
| 473 |
- shift |
| 474 |
- |
| 475 |
- ( # dont want to pollute calling env |
| 476 |
- insinto /etc/periodic/${kind} |
| 477 |
- insopts -m 0755 |
| 478 |
- doins "$@" |
| 479 |
- ) |
| 480 |
-} |
| 481 |
- |
| 482 |
-freebsd_get_bmake() { |
| 483 |
- local bmake |
| 484 |
- bmake=$(get_bmake) |
| 485 |
- if version_is_at_least 11.0 ${RV} ; then |
| 486 |
- if [[ ${CBUILD} == *-freebsd* ]] ; then |
| 487 |
- bmake="${bmake} -m /usr/share/mk/system" |
| 488 |
- else |
| 489 |
- bmake="${bmake} -m /usr/share/mk/freebsd/system" |
| 490 |
- fi |
| 491 |
- else |
| 492 |
- [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" |
| 493 |
- fi |
| 494 |
- |
| 495 |
- echo "${bmake}" |
| 496 |
-} |
| 497 |
- |
| 498 |
-# Generates a patch SRC_URI or DISTDIR of upstream. |
| 499 |
-freebsd_upstream_patches() { |
| 500 |
- local opt=$1 |
| 501 |
- [[ ${#UPSTREAM_PATCHES[@]} -eq 0 ]] && return 1 |
| 502 |
- for x in "${UPSTREAM_PATCHES[@]}" |
| 503 |
- do |
| 504 |
- local out=${PN}-${x/\//-} |
| 505 |
- out=${out/:/} |
| 506 |
- if [[ ${opt} == -s ]] ; then |
| 507 |
- echo "${DISTDIR}/${out}" |
| 508 |
- else |
| 509 |
- echo "https://security.freebsd.org/patches/${x} -> ${out}" |
| 510 |
- fi |
| 511 |
- done |
| 512 |
-} |
| 513 |
- |
| 514 |
-freebsd_do_patches() { |
| 515 |
- if [[ ${#PATCHES[@]} -gt 1 ]] ; then |
| 516 |
- for x in "${PATCHES[@]}"; do |
| 517 |
- epatch "${x}" |
| 518 |
- done |
| 519 |
- else |
| 520 |
- for x in ${PATCHES} ; do |
| 521 |
- epatch "${x}" |
| 522 |
- done |
| 523 |
- fi |
| 524 |
- [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] && epatch $(freebsd_upstream_patches -s) |
| 525 |
- epatch_user |
| 526 |
-} |
| 527 |
- |
| 528 |
-freebsd_rename_libraries() { |
| 529 |
- ebegin "Renaming libraries" |
| 530 |
- # We don't use libtermcap, we use libncurses |
| 531 |
- find "${S}" -name Makefile -print0 | xargs -0 \ |
| 532 |
- sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g' |
| 533 |
- # flex provides libfl, not libl |
| 534 |
- find "${S}" -name Makefile -print0 | xargs -0 \ |
| 535 |
- sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g' |
| 536 |
- # ncurses provides libncursesw not libcursesw |
| 537 |
- find "${S}" -name Makefile -print0 | xargs -0 \ |
| 538 |
- sed -i -e 's:-lcursesw:-lncursesw:g' |
| 539 |
- # we use expat instead of bsdxml |
| 540 |
- find "${S}" -name Makefile -print0 | xargs -0 \ |
| 541 |
- sed -i -e 's:-lbsdxml:-lexpat:g' |
| 542 |
- |
| 543 |
- eend $? |
| 544 |
-} |
| 545 |
- |
| 546 |
-freebsd_src_unpack() { |
| 547 |
- if [[ ${MY_PV} == *9999* ]]; then |
| 548 |
- S="${WORKDIR}" subversion_src_unpack |
| 549 |
- |
| 550 |
- # When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0 |
| 551 |
- # Removed "${WORKDIR}"/share/mk/*.mk, use to force /usr/share/mk. |
| 552 |
- if [[ ${PN} != freebsd-mk-defs ]] ; then |
| 553 |
- [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk |
| 554 |
- fi |
| 555 |
- else |
| 556 |
- if version_is_at_least 10.0 ${RV} ; then |
| 557 |
- local tarball="freebsd-src-${MY_PV}.tar.xz" |
| 558 |
- local topdir="usr/src/" |
| 559 |
- local extractlist=() |
| 560 |
- for i in ${EXTRACTONLY} ; do |
| 561 |
- extractlist+=( ${topdir}${i} ) |
| 562 |
- done |
| 563 |
- ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" |
| 564 |
- cd "${WORKDIR}" || die |
| 565 |
- tar -xJpf "${DISTDIR}/${tarball}" --strip-components=2 "${extractlist[@]}" 2> /dev/null || die "tar extract command failed" |
| 566 |
- cd - || die |
| 567 |
- else |
| 568 |
- for f in ${A} ; do |
| 569 |
- [[ ${f} == *.tar.* ]] && unpack ${f} |
| 570 |
- done |
| 571 |
- fi |
| 572 |
- fi |
| 573 |
- cd "${S}" |
| 574 |
- |
| 575 |
- dummy_mk ${REMOVE_SUBDIRS} |
| 576 |
- |
| 577 |
- freebsd_do_patches |
| 578 |
- if ! version_is_at_least 11.0 ${RV} ; then |
| 579 |
- freebsd_rename_libraries |
| 580 |
- fi |
| 581 |
- |
| 582 |
- # Starting from FreeBSD 9.2, its install command supports the -l option and |
| 583 |
- # they now use it. Emulate it if we are on a system that does not have it. |
| 584 |
- if version_is_at_least 9.2 ${RV} && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then |
| 585 |
- export INSTALL_LINK="ln -f" |
| 586 |
- export INSTALL_SYMLINK="ln -fs" |
| 587 |
- fi |
| 588 |
- if version_is_at_least 11.0 ${RV} ; then |
| 589 |
- export RSYMLINK=" -l s" |
| 590 |
- fi |
| 591 |
- |
| 592 |
- # When CC=clang, force use clang-cpp #478810, #595878 |
| 593 |
- if [[ $(tc-getCC) == *clang* ]] ; then |
| 594 |
- if type -P clang-cpp > /dev/null ; then |
| 595 |
- export CPP=clang-cpp |
| 596 |
- else |
| 597 |
- mkdir "${WORKDIR}"/workaround_clang-cpp || die "Could not create ${WORKDIR}/workaround_clang-cpp" |
| 598 |
- ln -s "$(type -P clang)" "${WORKDIR}"/workaround_clang-cpp/clang-cpp || die "Could not create clang-cpp symlink." |
| 599 |
- export CPP="${WORKDIR}/workaround_clang-cpp/clang-cpp" |
| 600 |
- fi |
| 601 |
- fi |
| 602 |
- |
| 603 |
- # Add a special CFLAGS required for multilib support. |
| 604 |
- use amd64-fbsd && export CFLAGS_x86_fbsd="${CFLAGS_x86_fbsd} -DCOMPAT_32BIT -B/usr/lib32 -L/usr/lib32" |
| 605 |
-} |
| 606 |
- |
| 607 |
-freebsd_src_compile() { |
| 608 |
- use profile && filter-flags "-fomit-frame-pointer" |
| 609 |
- if version_is_at_least 11.0 ${RV} ; then |
| 610 |
- if ! use profile ; then |
| 611 |
- mymakeopts="${mymakeopts} WITHOUT_PROFILE= " |
| 612 |
- fi |
| 613 |
- # Disable debugging info, use FEATURES=splitdebug instead. |
| 614 |
- mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " |
| 615 |
- # Test does not support yet. |
| 616 |
- mymakeopts="${mymakeopts} WITHOUT_TESTS= " |
| 617 |
- # Force set SRCTOP. |
| 618 |
- mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " |
| 619 |
- # Set common option. |
| 620 |
- mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " |
| 621 |
- else |
| 622 |
- use profile || mymakeopts="${mymakeopts} NO_PROFILE= " |
| 623 |
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " |
| 624 |
- fi |
| 625 |
- |
| 626 |
- mymakeopts="${mymakeopts} NO_FSCHG=" |
| 627 |
- |
| 628 |
- # Make sure to use FreeBSD definitions while crosscompiling |
| 629 |
- [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" |
| 630 |
- |
| 631 |
- # Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of |
| 632 |
- # tree builds easily. |
| 633 |
- if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then |
| 634 |
- mkmake obj || die |
| 635 |
- fi |
| 636 |
- |
| 637 |
- bsdmk_src_compile "$@" |
| 638 |
-} |
| 639 |
- |
| 640 |
-# Helper function to make a multilib build with FreeBSD Makefiles. |
| 641 |
-# Usage: |
| 642 |
-# MULTIBUILD_VARIANTS=( $(get_all_abis) ) |
| 643 |
-# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function |
| 644 |
-# |
| 645 |
-# Important note: To use this function you _have_ to: |
| 646 |
-# - inherit multilib.eclass and multibuild.eclass |
| 647 |
-# - set MULTIBUILD_VARIANTS |
| 648 |
- |
| 649 |
-freebsd_multilib_multibuild_wrapper() { |
| 650 |
- # Get the ABI from multibuild.eclass |
| 651 |
- # This assumes MULTIBUILD_VARIANTS contains only valid ABIs. |
| 652 |
- local ABI=${MULTIBUILD_VARIANT} |
| 653 |
- |
| 654 |
- # First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts. |
| 655 |
- for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do |
| 656 |
- export ${i}_SAVE="${!i}" |
| 657 |
- done |
| 658 |
- |
| 659 |
- # Setup the variables specific to this ABI. |
| 660 |
- multilib_toolchain_setup "${ABI}" |
| 661 |
- |
| 662 |
- local target="$(tc-arch-kernel ${CHOST})" |
| 663 |
- mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)" |
| 664 |
- if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then |
| 665 |
- mymakeopts="${mymakeopts} COMPAT_32BIT=" |
| 666 |
- fi |
| 667 |
- |
| 668 |
- einfo "Building for ABI=${ABI} and TARGET=${target}" |
| 669 |
- |
| 670 |
- export MAKEOBJDIRPREFIX="${BUILD_DIR}" |
| 671 |
- if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then |
| 672 |
- mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}." |
| 673 |
- fi |
| 674 |
- |
| 675 |
- CTARGET="${CHOST}" "$@" |
| 676 |
- |
| 677 |
- # Restore the variables now. |
| 678 |
- for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do |
| 679 |
- ii="${i}_SAVE" |
| 680 |
- export ${i}="${!ii}" |
| 681 |
- done |
| 682 |
-} |
| 683 |
- |
| 684 |
-freebsd_src_install() { |
| 685 |
- if version_is_at_least 11.0 ${RV} ; then |
| 686 |
- if ! use profile ; then |
| 687 |
- mymakeopts="${mymakeopts} WITHOUT_PROFILE= " |
| 688 |
- fi |
| 689 |
- # Disable debugging info, use FEATURES=splitdebug instead. |
| 690 |
- mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " |
| 691 |
- # Test does not support yet. |
| 692 |
- mymakeopts="${mymakeopts} WITHOUT_TESTS= " |
| 693 |
- # Force set SRCTOP. |
| 694 |
- mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " |
| 695 |
- # Set common option. |
| 696 |
- mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " |
| 697 |
- else |
| 698 |
- use profile || mymakeopts="${mymakeopts} NO_PROFILE= " |
| 699 |
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " |
| 700 |
- fi |
| 701 |
- |
| 702 |
- mymakeopts="${mymakeopts} NO_FSCHG=" |
| 703 |
- |
| 704 |
- [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" |
| 705 |
- |
| 706 |
- bsdmk_src_install "$@" |
| 707 |
-} |
| 708 |
|
| 709 |
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest |
| 710 |
deleted file mode 100644 |
| 711 |
index bda3b4c..0000000 |
| 712 |
--- a/sys-freebsd/boot0/Manifest |
| 713 |
+++ /dev/null |
| 714 |
@@ -1,13 +0,0 @@ |
| 715 |
-AUX boot0-10.1-drop-unsupport-cflags.patch 893 SHA256 7d58c67b73ed6ae7326b03e7a4c1204d17808328de0ac904973604658bc1804c SHA512 c4d441c9538489585f27f292fa0acd921496cdd10e06a7de45f4db7f6a6300f41401a387c9e65bf909790e7755fb92001131d668c6246a2505756b8e9e10eeea WHIRLPOOL 9ce41efe802fc181fac9026eb310d3d48173df7db585f4ddb5424ced43f5e7081a8baefc12370588ba2979e0ef6234fa5718457e3e854f66c7d1309778d863f4 |
| 716 |
-AUX boot0-10.1-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8 |
| 717 |
-AUX boot0-10.3-clang.patch 847 SHA256 6687fa92439ec0813a61221f5acfc6fe4588432c6660f9e6962437d2589f5a1c SHA512 74a64f9853dc28e5354d1d3d1a97c9543b6f80d48568d264874a23355c4bcab9e6a90a22630b2c7afea4b51c906db4745cb2773feaf42979a9192b8f995d7405 WHIRLPOOL 3a299ffc554ad91a763a974268978755dc7819a6e4c21736efca6df1c0e5a95b07184103724634af3eb634fb2da77abb40d6bfb493cb6effb7463abe2c339905 |
| 718 |
-AUX boot0-10.3-drop-unsupport-cflags.patch 971 SHA256 26a7aef66e0b436201698f0df262d8af50061da203f90e1bc8babd79815f62b9 SHA512 ca2d36c332515c0c7b89bae24213e5dd21065e7bdd689726e1777d4439dfc850918ad4312751cdc69a417f05724f484f14a8254895e673844245e69133b8cf46 WHIRLPOOL 6ff2f96c33857433ed3160241a7137aef9375d15533f7fd3db979ac8294ee28f21fc9e1c292450fac6a3dd515e86f5969b7b517d36636712ef921af5956faa0f |
| 719 |
-AUX boot0-10.3-uefi-support.patch 762 SHA256 5089401accfd622091253ec652b0e86edaf00021ec7372829bec56d08ba4d83c SHA512 6ff9b34969475f9580b364c6fca591901554107ac0eacb7e19888a05411fc4e9928ec632525dba30449678bb14f22cef23605ca5843370f882ca90bb1dc32a1a WHIRLPOOL cb83d397f0a1660b6ee0154b1c2d6e7807e2c6e61d92790e5be37233fa6f8bec3947f9c49d5046329486654a648e758f0e4d9f6d2ce7b2cf448c181059745281 |
| 720 |
-AUX boot0-11.0-gcc46.patch 481 SHA256 d05e22731b13b3eb12c75034c3f3d5ba74c1d842271ba1c81669698d0cfe1911 SHA512 114580260572d03ae145f38d9e7552e18d1d9eace430c102dbc73de055e453fdff9fd81e1ee6f4237d36b87800ff1da63b78ecdd17208ecf8969919fa245cf01 WHIRLPOOL a4a1620b892850f9affac443399901f52af2344539e251169d08d6b7db588a23db5ec3b4857992acda96b9893a7acde848a3171689eebf332fdbb1c9e18e858a |
| 721 |
-AUX boot0-11.0-uefi-support.patch 715 SHA256 ca983122c1a73575ce81cfad1c11378b60cdcb869dea4db4fafd387a38136086 SHA512 e6b4b48e5442ad4d948389aa4862484947fce5f15deedd6603cf5616054ccf9fa61a0c190443cdbe76502225a44da37675d1bccf49476ffedd633fe8128a2db6 WHIRLPOOL 0bf282dff86cd8cd59dbf42ad99aae10cf056260e356f4ac88392698107b4c26970c2028300c795ee28e91b8b5129b414e6c25d8f8587effac6cdf8ee56e6e65 |
| 722 |
-AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4 |
| 723 |
-AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1 |
| 724 |
-AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe |
| 725 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 726 |
-EBUILD boot0-11.0.ebuild 1862 SHA256 3247b5ca4135f21acf4710536c85389f5a76738da24ded110711678aaa4364a4 SHA512 fdb37a29b7916ff1f8912bb544ddb3e40cd95395a7b42e830adac5c9c8df21b3a5577d3b8baf6ecd74482c53bebd63ecf3d7bbec47923ffe9f7ef96cd23b2558 WHIRLPOOL dc761ab66f1b874dfee3fb458cc97ce0e98a35589fc9f45520edc1449b1ccb42b5e130e634f741d2e164217e34bfd4de1556cf87ea3a32a8ce0bc6bcffe48111 |
| 727 |
-MISC metadata.xml 385 SHA256 1b6dbb50d321102c9a48b5f6bce5825e88ce8dfcabd86892194b2fa10e540b11 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808 WHIRLPOOL f073e698718e05e55026bad3888ce2809d2a0a7f4d0e4090e5c1fb16be55846e0bbf81c09748b76ea960a77e74b96678031c888852b8e4e259640d67386cc655 |
| 728 |
|
| 729 |
diff --git a/sys-freebsd/boot0/boot0-11.0.ebuild b/sys-freebsd/boot0/boot0-11.0.ebuild |
| 730 |
deleted file mode 100644 |
| 731 |
index d108508..0000000 |
| 732 |
--- a/sys-freebsd/boot0/boot0-11.0.ebuild |
| 733 |
+++ /dev/null |
| 734 |
@@ -1,82 +0,0 @@ |
| 735 |
-# Copyright 1999-2016 Gentoo Foundation |
| 736 |
-# Distributed under the terms of the GNU General Public License v2 |
| 737 |
-# $Id$ |
| 738 |
- |
| 739 |
-EAPI=5 |
| 740 |
- |
| 741 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
| 742 |
- |
| 743 |
-DESCRIPTION="FreeBSD's bootloader" |
| 744 |
-SLOT="0" |
| 745 |
- |
| 746 |
-IUSE="bzip2 ieee1394 tftp zfs" |
| 747 |
- |
| 748 |
-if [[ ${PV} != *9999* ]]; then |
| 749 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 750 |
-fi |
| 751 |
- |
| 752 |
-EXTRACTONLY=" |
| 753 |
- sys/ |
| 754 |
- lib/ |
| 755 |
- contrib/bzip2/ |
| 756 |
-" |
| 757 |
- |
| 758 |
-RDEPEND="" |
| 759 |
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
| 760 |
- =sys-freebsd/freebsd-lib-${RV}*" |
| 761 |
- |
| 762 |
-S="${WORKDIR}/sys/boot" |
| 763 |
- |
| 764 |
-PATCHES=( "${FILESDIR}/${PN}-11.0-gcc46.patch" |
| 765 |
- "${FILESDIR}/${PN}-11.0-uefi-support.patch" |
| 766 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) |
| 767 |
- |
| 768 |
-boot0_use_enable() { |
| 769 |
- use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" |
| 770 |
- use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= " |
| 771 |
-} |
| 772 |
- |
| 773 |
-pkg_setup() { |
| 774 |
- boot0_use_enable ieee1394 FIREWIRE |
| 775 |
- boot0_use_enable zfs ZFS |
| 776 |
- boot0_use_enable tftp TFTP |
| 777 |
- boot0_use_enable bzip2 BZIP2 |
| 778 |
-} |
| 779 |
- |
| 780 |
-src_prepare() { |
| 781 |
- sed -e '/-mno-align-long-strings/d' \ |
| 782 |
- -i "${S}"/i386/boot2/Makefile \ |
| 783 |
- -i "${S}"/i386/gptboot/Makefile \ |
| 784 |
- -i "${S}"/i386/gptzfsboot/Makefile \ |
| 785 |
- -i "${S}"/i386/zfsboot/Makefile || die |
| 786 |
- |
| 787 |
- mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes" |
| 788 |
- export MAKEOBJDIRPREFIX="${WORKDIR}/build" |
| 789 |
-} |
| 790 |
- |
| 791 |
-src_compile() { |
| 792 |
- strip-flags |
| 793 |
- append-flags "-fno-strict-aliasing" |
| 794 |
- |
| 795 |
- cd "${WORKDIR}/lib/libstand" || die |
| 796 |
- freebsd_src_compile |
| 797 |
- |
| 798 |
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" |
| 799 |
- LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand" |
| 800 |
- export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" |
| 801 |
- |
| 802 |
- cd "${S}" || die |
| 803 |
- NOFLAGSTRIP="yes" freebsd_src_compile |
| 804 |
-} |
| 805 |
- |
| 806 |
-src_install() { |
| 807 |
- dodir /boot/defaults |
| 808 |
- freebsd_src_install FILESDIR=/boot |
| 809 |
- |
| 810 |
- cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die |
| 811 |
- insinto /boot |
| 812 |
- newins GENERIC.hints device.hints |
| 813 |
- |
| 814 |
- echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 |
| 815 |
- doenvd "${T}"/50boot0 |
| 816 |
-} |
| 817 |
|
| 818 |
diff --git a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch |
| 819 |
deleted file mode 100644 |
| 820 |
index 4ab415b..0000000 |
| 821 |
--- a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch |
| 822 |
+++ /dev/null |
| 823 |
@@ -1,26 +0,0 @@ |
| 824 |
-diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile |
| 825 |
-index 76ed0ca..2d1d39d 100644 |
| 826 |
---- a/sys/boot/efi/libefi/Makefile |
| 827 |
-+++ b/sys/boot/efi/libefi/Makefile |
| 828 |
-@@ -17,7 +17,4 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand |
| 829 |
- CFLAGS+= -I${.CURDIR}/../../common |
| 830 |
- |
| 831 |
- |
| 832 |
--# Suppress warning from clang for FreeBSD %b and %D formats |
| 833 |
--CFLAGS+= -fformat-extensions |
| 834 |
-- |
| 835 |
- .include <bsd.lib.mk> |
| 836 |
-diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile |
| 837 |
-index d714c74..a5cfa3c 100644 |
| 838 |
---- a/sys/boot/i386/libi386/Makefile |
| 839 |
-+++ b/sys/boot/i386/libi386/Makefile |
| 840 |
-@@ -52,9 +52,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ |
| 841 |
- # the location of libstand |
| 842 |
- CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ |
| 843 |
- |
| 844 |
--# Suppress warning from clang for FreeBSD %b and %D formats |
| 845 |
--CFLAGS+= -fformat-extensions |
| 846 |
-- |
| 847 |
- .if ${MACHINE_CPUARCH} == "amd64" |
| 848 |
- CLEANFILES+= machine |
| 849 |
- machine: |
| 850 |
|
| 851 |
diff --git a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch |
| 852 |
deleted file mode 100644 |
| 853 |
index 9b31e7c..0000000 |
| 854 |
--- a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch |
| 855 |
+++ /dev/null |
| 856 |
@@ -1,67 +0,0 @@ |
| 857 |
-diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc |
| 858 |
-index 472b275..0c9409d 100644 |
| 859 |
---- a/sys/boot/i386/Makefile.inc |
| 860 |
-+++ b/sys/boot/i386/Makefile.inc |
| 861 |
-@@ -13,8 +13,6 @@ LDFLAGS+= -nostdlib |
| 862 |
- .if ${MACHINE_CPUARCH} == "amd64" |
| 863 |
- CFLAGS+= -m32 |
| 864 |
- ACFLAGS+= -m32 |
| 865 |
--# LD_FLAGS is passed directly to ${LD}, not via ${CC}: |
| 866 |
--LD_FLAGS+= -m elf_i386_fbsd |
| 867 |
- AFLAGS+= --32 |
| 868 |
- .endif |
| 869 |
- |
| 870 |
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile |
| 871 |
-index 428950e..6a15450 100644 |
| 872 |
---- a/sys/boot/i386/boot2/Makefile |
| 873 |
-+++ b/sys/boot/i386/boot2/Makefile |
| 874 |
-@@ -113,3 +113,10 @@ machine: |
| 875 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 876 |
- CFLAGS.boot1.S= ${CLANG_NO_IAS} |
| 877 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 878 |
-+ |
| 879 |
-+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. |
| 880 |
-+CFLAGS+= -fno-asynchronous-unwind-tables |
| 881 |
-+ |
| 882 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 883 |
-+LD_FLAGS+= -m elf_i386_fbsd |
| 884 |
-+.endif |
| 885 |
-diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile |
| 886 |
-index a90e712..d60ae00 100644 |
| 887 |
---- a/sys/boot/i386/gptboot/Makefile |
| 888 |
-+++ b/sys/boot/i386/gptboot/Makefile |
| 889 |
-@@ -81,3 +81,8 @@ machine: |
| 890 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 891 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
| 892 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 893 |
-+ |
| 894 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 895 |
-+LD_FLAGS+= -m elf_i386_fbsd |
| 896 |
-+.endif |
| 897 |
-+ |
| 898 |
-diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile |
| 899 |
-index 5eb2383..c10a917 100644 |
| 900 |
---- a/sys/boot/i386/gptzfsboot/Makefile |
| 901 |
-+++ b/sys/boot/i386/gptzfsboot/Makefile |
| 902 |
-@@ -78,3 +78,8 @@ machine: |
| 903 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 904 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
| 905 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 906 |
-+ |
| 907 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 908 |
-+LD_FLAGS+= -m elf_i386_fbsd |
| 909 |
-+.endif |
| 910 |
-+ |
| 911 |
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile |
| 912 |
-index 149f43a..be1e46a 100644 |
| 913 |
---- a/sys/boot/i386/zfsboot/Makefile |
| 914 |
-+++ b/sys/boot/i386/zfsboot/Makefile |
| 915 |
-@@ -91,3 +91,8 @@ machine: |
| 916 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 917 |
- CFLAGS.zfsldr.S= ${CLANG_NO_IAS} |
| 918 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 919 |
-+ |
| 920 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 921 |
-+LD_FLAGS+= -m elf_i386_fbsd |
| 922 |
-+.endif |
| 923 |
-+ |
| 924 |
|
| 925 |
diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch |
| 926 |
deleted file mode 100644 |
| 927 |
index 4245e21..0000000 |
| 928 |
--- a/sys-freebsd/boot0/files/boot0-10.3-clang.patch |
| 929 |
+++ /dev/null |
| 930 |
@@ -1,30 +0,0 @@ |
| 931 |
-Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676 |
| 932 |
- |
| 933 |
-https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479 |
| 934 |
- |
| 935 |
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile |
| 936 |
-index 8a6e771..c030853 100644 |
| 937 |
---- a/sys/boot/i386/boot2/Makefile |
| 938 |
-+++ b/sys/boot/i386/boot2/Makefile |
| 939 |
-@@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 |
| 940 |
- #BOOT2_UFS?= UFS2_ONLY |
| 941 |
- #BOOT2_UFS?= UFS1_ONLY |
| 942 |
- |
| 943 |
--CFLAGS= -Os \ |
| 944 |
-- -fomit-frame-pointer \ |
| 945 |
-+CFLAGS= -fomit-frame-pointer \ |
| 946 |
- -mrtd \ |
| 947 |
- -mregparm=3 \ |
| 948 |
- -DUSE_XREAD \ |
| 949 |
-@@ -40,7 +39,10 @@ CFLAGS= -Os \ |
| 950 |
- -Winline \ |
| 951 |
- ${CLANG_OPT_SMALL} |
| 952 |
- |
| 953 |
--CFLAGS.gcc+= -fno-guess-branch-probability \ |
| 954 |
-+CFLAGS.clang+= -Oz |
| 955 |
-+ |
| 956 |
-+CFLAGS.gcc+= -Os \ |
| 957 |
-+ -fno-guess-branch-probability \ |
| 958 |
- -fno-unit-at-a-time \ |
| 959 |
- --param max-inline-insns-single=100 |
| 960 |
- .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201 |
| 961 |
|
| 962 |
diff --git a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch |
| 963 |
deleted file mode 100644 |
| 964 |
index af1d351..0000000 |
| 965 |
--- a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch |
| 966 |
+++ /dev/null |
| 967 |
@@ -1,28 +0,0 @@ |
| 968 |
-diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile |
| 969 |
-index fc66e01..470453d 100644 |
| 970 |
---- a/sys/boot/efi/libefi/Makefile |
| 971 |
-+++ b/sys/boot/efi/libefi/Makefile |
| 972 |
-@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand |
| 973 |
- # Pick up the bootstrap header for some interface items |
| 974 |
- CFLAGS+= -I${.CURDIR}/../../common |
| 975 |
- |
| 976 |
-- |
| 977 |
--# Suppress warning from clang for FreeBSD %b and %D formats |
| 978 |
--CFLAGS+= -fformat-extensions |
| 979 |
- CFLAGS+= -DTERM_EMU |
| 980 |
- |
| 981 |
- .include <bsd.lib.mk> |
| 982 |
-diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile |
| 983 |
-index 24cc4c1..e5d2bae 100644 |
| 984 |
---- a/sys/boot/i386/libi386/Makefile |
| 985 |
-+++ b/sys/boot/i386/libi386/Makefile |
| 986 |
-@@ -55,9 +55,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ |
| 987 |
- # the location of libstand |
| 988 |
- CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ |
| 989 |
- |
| 990 |
--# Suppress warning from clang for FreeBSD %b and %D formats |
| 991 |
--CFLAGS+= -fformat-extensions |
| 992 |
-- |
| 993 |
- .if ${MACHINE_CPUARCH} == "amd64" |
| 994 |
- CLEANFILES+= machine |
| 995 |
- machine: |
| 996 |
|
| 997 |
diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch |
| 998 |
deleted file mode 100644 |
| 999 |
index fdafe74..0000000 |
| 1000 |
--- a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch |
| 1001 |
+++ /dev/null |
| 1002 |
@@ -1,33 +0,0 @@ |
| 1003 |
-diff --git a/efi/Makefile b/efi/Makefile |
| 1004 |
-index 30024e3..a33efb2 100644 |
| 1005 |
---- a/efi/Makefile |
| 1006 |
-+++ b/efi/Makefile |
| 1007 |
-@@ -2,15 +2,10 @@ |
| 1008 |
- |
| 1009 |
- .include <bsd.own.mk> |
| 1010 |
- |
| 1011 |
--# In-tree GCC does not support __attribute__((ms_abi)). |
| 1012 |
--.if ${COMPILER_TYPE} != "gcc" |
| 1013 |
-- |
| 1014 |
- .if ${MACHINE_CPUARCH} == "amd64" |
| 1015 |
- SUBDIR+= libefi loader boot1 |
| 1016 |
- .endif |
| 1017 |
- |
| 1018 |
--.endif # ${COMPILER_TYPE} != "gcc" |
| 1019 |
-- |
| 1020 |
- .if ${MACHINE_CPUARCH} == "ia64" |
| 1021 |
- SUBDIR+= libefi |
| 1022 |
- .endif |
| 1023 |
-diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile |
| 1024 |
-index 4ffdfda..8ec0e00 100644 |
| 1025 |
---- a/efi/boot1/Makefile |
| 1026 |
-+++ b/efi/boot1/Makefile |
| 1027 |
-@@ -64,7 +64,7 @@ LDFLAGS+= -Wl,-znocombreloc |
| 1028 |
- # Add libstand for required string and memory functions for all platforms. |
| 1029 |
- # |
| 1030 |
- DPADD+= ${LIBSTAND} |
| 1031 |
--LDADD+= -lstand |
| 1032 |
-+LDADD+= ${LIBSTAND} |
| 1033 |
- |
| 1034 |
- DPADD+= ${LDSCRIPT} |
| 1035 |
- |
| 1036 |
|
| 1037 |
diff --git a/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch b/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch |
| 1038 |
deleted file mode 100644 |
| 1039 |
index ec17d92..0000000 |
| 1040 |
--- a/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch |
| 1041 |
+++ /dev/null |
| 1042 |
@@ -1,14 +0,0 @@ |
| 1043 |
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile |
| 1044 |
-index ead9ad1..af5e021 100644 |
| 1045 |
---- a/sys/boot/i386/boot2/Makefile |
| 1046 |
-+++ b/sys/boot/i386/boot2/Makefile |
| 1047 |
-@@ -45,6 +45,9 @@ CFLAGS.gcc+= -Os \ |
| 1048 |
- .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201 |
| 1049 |
- CFLAGS.gcc+= -mno-align-long-strings |
| 1050 |
- .endif |
| 1051 |
-+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40600 |
| 1052 |
-+CFLAGS.gcc+= -fno-asynchronous-unwind-tables |
| 1053 |
-+.endif |
| 1054 |
- |
| 1055 |
- CFLAGS.clang+= -Oz ${CLANG_OPT_SMALL} |
| 1056 |
- |
| 1057 |
|
| 1058 |
diff --git a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch b/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch |
| 1059 |
deleted file mode 100644 |
| 1060 |
index c7a69d6..0000000 |
| 1061 |
--- a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch |
| 1062 |
+++ /dev/null |
| 1063 |
@@ -1,21 +0,0 @@ |
| 1064 |
-diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile |
| 1065 |
-index 79ee9a9..f7789f1 100644 |
| 1066 |
---- a/sys/boot/efi/Makefile |
| 1067 |
-+++ b/sys/boot/efi/Makefile |
| 1068 |
-@@ -4,7 +4,7 @@ |
| 1069 |
- |
| 1070 |
- # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer |
| 1071 |
- # than 4.5 supports it. |
| 1072 |
--.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 |
| 1073 |
-+.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 |
| 1074 |
- |
| 1075 |
- .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" |
| 1076 |
- .if ${MK_FDT} != "no" |
| 1077 |
-@@ -18,6 +18,6 @@ SUBDIR+= fdt |
| 1078 |
- SUBDIR+= libefi loader boot1 |
| 1079 |
- .endif |
| 1080 |
- |
| 1081 |
--.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 |
| 1082 |
-+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 |
| 1083 |
- |
| 1084 |
- .include <bsd.subdir.mk> |
| 1085 |
|
| 1086 |
diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch |
| 1087 |
deleted file mode 100644 |
| 1088 |
index a3a33d5..0000000 |
| 1089 |
--- a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch |
| 1090 |
+++ /dev/null |
| 1091 |
@@ -1,13 +0,0 @@ |
| 1092 |
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile |
| 1093 |
-index bb16ea3..7dedb49 100644 |
| 1094 |
---- a/sys/boot/i386/zfsboot/Makefile |
| 1095 |
-+++ b/sys/boot/i386/zfsboot/Makefile |
| 1096 |
-@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out |
| 1097 |
- zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o |
| 1098 |
- ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} |
| 1099 |
- |
| 1100 |
-+drv.o: drv.c xreadorg.h |
| 1101 |
-+ |
| 1102 |
- zfsboot.o: zfsboot.s |
| 1103 |
- |
| 1104 |
- SRCS= zfsboot.c xreadorg.h |
| 1105 |
|
| 1106 |
diff --git a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch |
| 1107 |
deleted file mode 100644 |
| 1108 |
index ffd9f43..0000000 |
| 1109 |
--- a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch |
| 1110 |
+++ /dev/null |
| 1111 |
@@ -1,66 +0,0 @@ |
| 1112 |
-diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc |
| 1113 |
-index f5faec7..a9cf593 100644 |
| 1114 |
---- a/sys/boot/i386/Makefile.inc |
| 1115 |
-+++ b/sys/boot/i386/Makefile.inc |
| 1116 |
-@@ -12,7 +12,6 @@ LDFLAGS+= -nostdlib |
| 1117 |
- .if ${MACHINE_CPUARCH} == "amd64" |
| 1118 |
- CFLAGS+= -m32 |
| 1119 |
- ACFLAGS+= -m32 |
| 1120 |
--LDFLAGS+= -m elf_i386_fbsd |
| 1121 |
- AFLAGS+= --32 |
| 1122 |
- .endif |
| 1123 |
- |
| 1124 |
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile |
| 1125 |
-index 65815a5..61840dd 100644 |
| 1126 |
---- a/sys/boot/i386/boot2/Makefile |
| 1127 |
-+++ b/sys/boot/i386/boot2/Makefile |
| 1128 |
-@@ -109,3 +109,10 @@ machine: |
| 1129 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 1130 |
- CFLAGS.boot1.S= ${CLANG_NO_IAS} |
| 1131 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 1132 |
-+ |
| 1133 |
-+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. |
| 1134 |
-+CFLAGS+= -fno-asynchronous-unwind-tables |
| 1135 |
-+ |
| 1136 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 1137 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 1138 |
-+.endif |
| 1139 |
-diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile |
| 1140 |
-index e1a640a..29886cc 100644 |
| 1141 |
---- a/sys/boot/i386/gptboot/Makefile |
| 1142 |
-+++ b/sys/boot/i386/gptboot/Makefile |
| 1143 |
-@@ -78,3 +78,8 @@ machine: |
| 1144 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 1145 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
| 1146 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 1147 |
-+ |
| 1148 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 1149 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 1150 |
-+.endif |
| 1151 |
-+ |
| 1152 |
-diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile |
| 1153 |
-index a2b8fcc..107f531 100644 |
| 1154 |
---- a/sys/boot/i386/gptzfsboot/Makefile |
| 1155 |
-+++ b/sys/boot/i386/gptzfsboot/Makefile |
| 1156 |
-@@ -76,3 +76,8 @@ machine: |
| 1157 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 1158 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
| 1159 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 1160 |
-+ |
| 1161 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 1162 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 1163 |
-+.endif |
| 1164 |
-+ |
| 1165 |
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile |
| 1166 |
-index b2db778..252dc62 100644 |
| 1167 |
---- a/sys/boot/i386/zfsboot/Makefile |
| 1168 |
-+++ b/sys/boot/i386/zfsboot/Makefile |
| 1169 |
-@@ -89,3 +89,8 @@ machine: |
| 1170 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 1171 |
- CFLAGS.zfsldr.S= ${CLANG_NO_IAS} |
| 1172 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 1173 |
-+ |
| 1174 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 1175 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 1176 |
-+.endif |
| 1177 |
-+ |
| 1178 |
|
| 1179 |
diff --git a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch |
| 1180 |
deleted file mode 100644 |
| 1181 |
index abc6a57..0000000 |
| 1182 |
--- a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch |
| 1183 |
+++ /dev/null |
| 1184 |
@@ -1,11 +0,0 @@ |
| 1185 |
-https://bugs.gentoo.org/show_bug.cgi?id=511698 |
| 1186 |
- |
| 1187 |
-diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc |
| 1188 |
-index e0039b9..533dea0 100644 |
| 1189 |
---- a/sys/boot/Makefile.inc |
| 1190 |
-+++ b/sys/boot/Makefile.inc |
| 1191 |
-@@ -1,3 +1,3 @@ |
| 1192 |
- # $FreeBSD: release/10.0.0/sys/boot/Makefile.inc 188895 2009-02-21 15:04:31Z ru $ |
| 1193 |
- |
| 1194 |
--SSP_CFLAGS= |
| 1195 |
-+SSP_CFLAGS= -fno-stack-protector |
| 1196 |
|
| 1197 |
diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml |
| 1198 |
deleted file mode 100644 |
| 1199 |
index d9f0c83..0000000 |
| 1200 |
--- a/sys-freebsd/boot0/metadata.xml |
| 1201 |
+++ /dev/null |
| 1202 |
@@ -1,12 +0,0 @@ |
| 1203 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 1204 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1205 |
-<pkgmetadata> |
| 1206 |
-<maintainer type="project"> |
| 1207 |
- <email>bsd@g.o</email> |
| 1208 |
- <name>BSD Project</name> |
| 1209 |
- </maintainer> |
| 1210 |
- <use> |
| 1211 |
- <flag name="tftp">Enable PXE/TFTP boot support.</flag> |
| 1212 |
- <flag name="zfs">Enable booting on ZFS filesystems.</flag> |
| 1213 |
- </use> |
| 1214 |
-</pkgmetadata> |
| 1215 |
|
| 1216 |
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest |
| 1217 |
deleted file mode 100644 |
| 1218 |
index 353f2b2..0000000 |
| 1219 |
--- a/sys-freebsd/freebsd-bin/Manifest |
| 1220 |
+++ /dev/null |
| 1221 |
@@ -1,3 +0,0 @@ |
| 1222 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 1223 |
-EBUILD freebsd-bin-11.0.ebuild 800 SHA256 ccc8ba3dce3c251ccf7fbc468b803d41414968012808a89baa85fdffdf374dbf SHA512 7a0e427a5621bf195544cfeed199bf93c2f5d42bce139d31c5477019c2ee9c8e9cd1bcea41cb5b3cb10f972db89f29f4868c5c7687062d85a3d51051f72fe5fb WHIRLPOOL 8f64ea4813d9db4b379a53a12222eaea8d1ff43a49a961a64e844bb30768029aec2b953b7c8afbbedd35451070b25322ff04dc0019524a2bbb3ffb6ee766aa53 |
| 1224 |
-MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a |
| 1225 |
|
| 1226 |
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild |
| 1227 |
deleted file mode 100644 |
| 1228 |
index d4bf7e3..0000000 |
| 1229 |
--- a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild |
| 1230 |
+++ /dev/null |
| 1231 |
@@ -1,42 +0,0 @@ |
| 1232 |
-# Copyright 1999-2016 Gentoo Foundation |
| 1233 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1234 |
-# $Id$ |
| 1235 |
- |
| 1236 |
-EAPI=5 |
| 1237 |
- |
| 1238 |
-inherit bsdmk freebsd |
| 1239 |
- |
| 1240 |
-DESCRIPTION="FreeBSD /bin tools" |
| 1241 |
-SLOT="0" |
| 1242 |
- |
| 1243 |
-IUSE="" |
| 1244 |
- |
| 1245 |
-if [[ ${PV} != *9999* ]]; then |
| 1246 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 1247 |
-fi |
| 1248 |
- |
| 1249 |
-EXTRACTONLY=" |
| 1250 |
- bin/ |
| 1251 |
- usr.bin/ |
| 1252 |
- sbin/ |
| 1253 |
- lib/ |
| 1254 |
-" |
| 1255 |
- |
| 1256 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
| 1257 |
- >=dev-libs/libedit-20120311.3.0-r1 |
| 1258 |
- sys-libs/ncurses:0= |
| 1259 |
- sys-apps/ed |
| 1260 |
- !app-misc/realpath |
| 1261 |
- !<sys-freebsd/freebsd-ubin-8" |
| 1262 |
-DEPEND="${RDEPEND} |
| 1263 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 1264 |
- >=sys-devel/flex-2.5.31-r2" |
| 1265 |
- |
| 1266 |
-S=${WORKDIR}/bin |
| 1267 |
- |
| 1268 |
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff. |
| 1269 |
-REMOVE_SUBDIRS="csh rmail ed freebsd-version" |
| 1270 |
- |
| 1271 |
-pkg_setup() { |
| 1272 |
- mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " |
| 1273 |
-} |
| 1274 |
|
| 1275 |
diff --git a/sys-freebsd/freebsd-bin/metadata.xml b/sys-freebsd/freebsd-bin/metadata.xml |
| 1276 |
deleted file mode 100644 |
| 1277 |
index a00f3ae..0000000 |
| 1278 |
--- a/sys-freebsd/freebsd-bin/metadata.xml |
| 1279 |
+++ /dev/null |
| 1280 |
@@ -1,8 +0,0 @@ |
| 1281 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 1282 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1283 |
-<pkgmetadata> |
| 1284 |
-<maintainer type="project"> |
| 1285 |
- <email>bsd@g.o</email> |
| 1286 |
- <name>BSD Project</name> |
| 1287 |
-</maintainer> |
| 1288 |
-</pkgmetadata> |
| 1289 |
|
| 1290 |
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest |
| 1291 |
deleted file mode 100644 |
| 1292 |
index 55d9aa4..0000000 |
| 1293 |
--- a/sys-freebsd/freebsd-cddl/Manifest |
| 1294 |
+++ /dev/null |
| 1295 |
@@ -1,16 +0,0 @@ |
| 1296 |
-AUX freebsd-cddl-10.2-libpaths.patch 9569 SHA256 80350e3493fd667840555d06e453769e02604da8362d6e76280573a30dd9185b SHA512 615caa713eee62030a9f4630578f8f7ae8c4a2df71307237083115e2226734646ba1923f5de46aaf1523ffaa6b4c83b5fc64ceee552b15cb0244583408736ed4 WHIRLPOOL 3fd3f8d42057ab01965b4314f4565009076ea54da83401efdedd838299cf554092717d7795ba7a4dca22420c993d521411021dc4f521a273af4ff894bb938353 |
| 1297 |
-AUX freebsd-cddl-10.3-underlink.patch 437 SHA256 ac486d44bf8ed4dd1b30d6200c59446e552e9e21f30535077533a080a28280ef SHA512 9ef6768be960a0c08cef094ba220e045b434aef6cfdb0be4631a63ea0b233158e927ca32c4f1d47a2f9a1e4a568f3850e61f56dcab35bd26cf1cea49035240fd WHIRLPOOL 8d5de341ceeca0e4a6c22b3bde9ddfdd611b1508344e837d34b926a3f8ac411a9daebaf30198fb323197d0860f102dc5b76172b7213a4cd4d41e623b79111393 |
| 1298 |
-AUX freebsd-cddl-11.0-add-libs.patch 3401 SHA256 d722c667769b403a0b1485d7df23e6b37a5406c2ed3c9b09959e7f0ac1851b19 SHA512 7a3da3a57bde26a79784dcb023961ed0a292da4945c49e07c4a69035fe6cd0773e09cec25eab638a64c6ccc54bb775c169b1553743f7a9b4af60ce49f1fee54c WHIRLPOOL aae94c0c23568359c135db4f3f2745280292fc337c3bf03516182ef38b920b4344049fe260a71d6769f3ecd8b53d7497361e768b7d67fdab3eba126128051cad |
| 1299 |
-AUX freebsd-cddl-11.0-workaround.patch 576 SHA256 38f7af5e9560ead4ea3cae3a756b73a3d605e7053c944b4ed8abc0a0c9788723 SHA512 0a2280caeb23622454351657d61e8e465c597b82bf49cb534a924758844cd7da2df330434ba6282e159d9bc2e6ade27c2a9db41980ada6370bcab59c6a57da22 WHIRLPOOL 8a6afdbb8f5243822e6040d07af966a45c21c52bb0e916aea2b1be03b3ff6cfec40da5c3b0268881abbf6b2edc8b43bf005fca81714461567a0e6edc15178073 |
| 1300 |
-AUX freebsd-cddl-8.0-libpaths.patch 4418 SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c SHA512 dac14bcac23d16ee8acc7a3adfe7de896f6595d98dd3d0c93e39205aa5bdf1a0fc35adf338e05df66b18186da4b10f578cfe2d084b446aeb84eb49d07f5736d5 WHIRLPOOL 0ed3869833b9606ce325b30874f01106c2d288c6bff703398f63abe00602c6d3adf1d2faf2dc629a220dcfeb4c3d819f672875ce3b7bb4ab969977b5ce6920fd |
| 1301 |
-AUX freebsd-cddl-8.2-libpaths.patch 822 SHA256 f6884f9c471f2d1bf522c26b2f2607e9506d7fea9612c24b4392f1e861a1a5db SHA512 1d335eb70592436941b093c76ad2e7573cb317333f81b11be7a2ef9cc0b3e57e21d797bf43c5ac9154d9817aa136851640f2b7b67bdd66b8abde7a589fd9f567 WHIRLPOOL 3ecdb9ea5050d4309b2561dd37082982450180e6eb8b77373ca3949f62ccd7719e5178a3c3a61346b2820fa827e0bc13075d2266d5500a5f80d8efab16adb414 |
| 1302 |
-AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d410e1efed144dd14a46cbd2cf4a44542 SHA512 8ea86f6918b2629c33286c2396226bb4944e373069a423104d96f65e387162e0da94707458fd5caebcab08b9305b435ac66f4207aa6b15ce9571a5fa5878f3c5 WHIRLPOOL 5af01d3ba6e1e4a038de1f3274bf3bd241264db05b021fa374c5a56c805901320a4c30c2234013902eb2f5ca879a4972d3468e0157315dd98e73ce1ee4359e0a |
| 1303 |
-AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f |
| 1304 |
-AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995 |
| 1305 |
-AUX freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643 |
| 1306 |
-AUX zfs.initd 375 SHA256 4d87977d430ba846a0b1c8ef383838891d93b40480d4a2816c94902b0cbe274d SHA512 b70d0c2e6214bb09e1258548f3bbca09aeade26550e27a212d53691d5d5778d3ced78402449612ca753f44e04863382692d12a4777c4e451f9b25a18e34fa221 WHIRLPOOL 7b906d372fcc064ba0780fcbb71c2ce3e734531fbf17679b5d695b851586274df06cf8a99a71b08e544d23f4e27f66765eb0d6e63199d4911abe64ba70f2e5b5 |
| 1307 |
-AUX zvol.initd 845 SHA256 70f237d969b5e539ad1c83fa49b0e5e85d4e2f588e97c1f2e65161edc9c93484 SHA512 18b706cd611858299228a7b74314149fc9a30351f03695accea8a0afbae164acfd8b10df4018b8103273adea1b6e764ca52e0ee3cb07d8f3ff8952b16201edb0 WHIRLPOOL 430d429b43c7be432133859dcd12820362ea03ea4a28a3f335230d66873bcc1658dcbb62e779942de06e7e8a987be30fc968194f31d5431f3b0e3e609509e79a |
| 1308 |
-AUX zvol.initd-9.0 819 SHA256 42d8b9a3eed04273e1638e0e7f7aa1f3b939e925c068260ef11a760fc61b5afb SHA512 1d59d5001ecb0ab4416f4bea8e2f4ff2c7ca19891d23b2a24cd1f389ca66f7cbe3a12bf913633dd90c013b730301dd704c072b94e5d95f7724203d3810314c70 WHIRLPOOL bdb6f1da1c420a254fb12776c0af378619b98c030c0830bcb3fcf2ee6eabf3e89576079d1a31a797e311e9b98d45dfcdf0ea22bddfe7ebc0a1936016474a469b |
| 1309 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 1310 |
-EBUILD freebsd-cddl-11.0.ebuild 1708 SHA256 5639b9aa8083c825eb2e8df97f336dbfde36094072b820363af4f2d5d1bf6d9a SHA512 82579abdd555463b191143c210e57c3db4c179dfaa6365b07632f5f92e9db82ba01f6f7148ca369d4ce84a263293783219c67f7073a6d61166d054c6e8f49f04 WHIRLPOOL 549801fee4dc1270e854dd8029b17f5739670c9fbe716ce041da08e7232b1c9d390ec3ee2d3ee058999a9e7735dba364dc6991ec33c681653fd3ef4ddc73cfee |
| 1311 |
-MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a |
| 1312 |
|
| 1313 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch |
| 1314 |
deleted file mode 100644 |
| 1315 |
index 9af7cfb..0000000 |
| 1316 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch |
| 1317 |
+++ /dev/null |
| 1318 |
@@ -1,220 +0,0 @@ |
| 1319 |
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile |
| 1320 |
-index d8bcccb..2cebbcb 100644 |
| 1321 |
---- a/cddl/lib/libzfs/Makefile |
| 1322 |
-+++ b/cddl/lib/libzfs/Makefile |
| 1323 |
-@@ -59,6 +59,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 1324 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
| 1325 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair |
| 1326 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
| 1327 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1328 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1329 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1330 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 1331 |
-+ |
| 1332 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
| 1333 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common |
| 1334 |
- |
| 1335 |
-diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile |
| 1336 |
-index 262d3e9..9643210 100644 |
| 1337 |
---- a/cddl/lib/libzfs_core/Makefile |
| 1338 |
-+++ b/cddl/lib/libzfs_core/Makefile |
| 1339 |
-@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
| 1340 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common |
| 1341 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
| 1342 |
- |
| 1343 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1344 |
-+ |
| 1345 |
- .include <bsd.lib.mk> |
| 1346 |
-diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile |
| 1347 |
-index 83cefca..55c56d5 100644 |
| 1348 |
---- a/cddl/lib/libzpool/Makefile |
| 1349 |
-+++ b/cddl/lib/libzpool/Makefile |
| 1350 |
-@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread |
| 1351 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys |
| 1352 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include |
| 1353 |
- |
| 1354 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1355 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1356 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1357 |
-+ |
| 1358 |
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ |
| 1359 |
- ${LIBAVL} ${LIBUMEM} |
| 1360 |
- LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem |
| 1361 |
-diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile |
| 1362 |
-index 1f909aa..2590302 100644 |
| 1363 |
---- a/cddl/sbin/zfs/Makefile |
| 1364 |
-+++ b/cddl/sbin/zfs/Makefile |
| 1365 |
-@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs |
| 1366 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 1367 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1368 |
- |
| 1369 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1370 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1371 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1372 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1373 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 1374 |
-+ |
| 1375 |
- DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ |
| 1376 |
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} |
| 1377 |
- LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs |
| 1378 |
-diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile |
| 1379 |
-index 4b5b898..f89d010 100644 |
| 1380 |
---- a/cddl/sbin/zpool/Makefile |
| 1381 |
-+++ b/cddl/sbin/zpool/Makefile |
| 1382 |
-@@ -27,6 +27,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 1383 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
| 1384 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
| 1385 |
- |
| 1386 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1387 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1388 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1389 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1390 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1391 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 1392 |
-+ |
| 1393 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ |
| 1394 |
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} |
| 1395 |
- LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs |
| 1396 |
-diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile |
| 1397 |
-index 6cb9529..e76fbc4 100644 |
| 1398 |
---- a/cddl/usr.bin/ctfconvert/Makefile |
| 1399 |
-+++ b/cddl/usr.bin/ctfconvert/Makefile |
| 1400 |
-@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
| 1401 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 1402 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 1403 |
- |
| 1404 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 1405 |
-+ |
| 1406 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 1407 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 1408 |
- |
| 1409 |
-diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile |
| 1410 |
-index 673c7e3..5fff940 100644 |
| 1411 |
---- a/cddl/usr.bin/ctfmerge/Makefile |
| 1412 |
-+++ b/cddl/usr.bin/ctfmerge/Makefile |
| 1413 |
-@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
| 1414 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 1415 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 1416 |
- |
| 1417 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 1418 |
-+ |
| 1419 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 1420 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 1421 |
- |
| 1422 |
-diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile |
| 1423 |
-index b6605cb..7028630 100644 |
| 1424 |
---- a/cddl/usr.bin/zinject/Makefile |
| 1425 |
-+++ b/cddl/usr.bin/zinject/Makefile |
| 1426 |
-@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ |
| 1427 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 1428 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1429 |
- |
| 1430 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1431 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1432 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1433 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1434 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1435 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1436 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 1437 |
-+ |
| 1438 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ |
| 1439 |
- ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
| 1440 |
- LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool |
| 1441 |
-diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile |
| 1442 |
-index 888b9af..523ba44 100644 |
| 1443 |
---- a/cddl/usr.bin/zstreamdump/Makefile |
| 1444 |
-+++ b/cddl/usr.bin/zstreamdump/Makefile |
| 1445 |
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
| 1446 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 1447 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1448 |
- |
| 1449 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1450 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1451 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1452 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1453 |
-+ |
| 1454 |
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 1455 |
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 1456 |
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 1457 |
-diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile |
| 1458 |
-index f6f7e03..6fed691 100644 |
| 1459 |
---- a/cddl/usr.bin/ztest/Makefile |
| 1460 |
-+++ b/cddl/usr.bin/ztest/Makefile |
| 1461 |
-@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
| 1462 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 1463 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1464 |
- |
| 1465 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1466 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1467 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1468 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1469 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1470 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1471 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 1472 |
-+ |
| 1473 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 1474 |
- ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} |
| 1475 |
- LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ |
| 1476 |
-diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile |
| 1477 |
-index fb5729f..ea9a752 100644 |
| 1478 |
---- a/cddl/usr.sbin/dtrace/Makefile |
| 1479 |
-+++ b/cddl/usr.sbin/dtrace/Makefile |
| 1480 |
-@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ |
| 1481 |
- LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ |
| 1482 |
- -lrtld_db |
| 1483 |
- |
| 1484 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace |
| 1485 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 1486 |
-+ |
| 1487 |
- .include <bsd.prog.mk> |
| 1488 |
-diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile |
| 1489 |
-index ccd8189..827a197 100644 |
| 1490 |
---- a/cddl/usr.sbin/lockstat/Makefile |
| 1491 |
-+++ b/cddl/usr.sbin/lockstat/Makefile |
| 1492 |
-@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
| 1493 |
- |
| 1494 |
- CFLAGS+= -DNEED_ERRLOC -g |
| 1495 |
- |
| 1496 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace |
| 1497 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 1498 |
-+ |
| 1499 |
- #YFLAGS+= -d |
| 1500 |
- |
| 1501 |
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ |
| 1502 |
-diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile |
| 1503 |
-index c2a6b1d..f411fc0 100644 |
| 1504 |
---- a/cddl/usr.sbin/zdb/Makefile |
| 1505 |
-+++ b/cddl/usr.sbin/zdb/Makefile |
| 1506 |
-@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1507 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 1508 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1509 |
- |
| 1510 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1511 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1512 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1513 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1514 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1515 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1516 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 1517 |
-+ |
| 1518 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
| 1519 |
- ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
| 1520 |
- LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool |
| 1521 |
-diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile |
| 1522 |
-index 1957aad..9a5570a 100644 |
| 1523 |
---- a/cddl/usr.sbin/zhack/Makefile |
| 1524 |
-+++ b/cddl/usr.sbin/zhack/Makefile |
| 1525 |
-@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1526 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 1527 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1528 |
- |
| 1529 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1530 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1531 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1532 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1533 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1534 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 1535 |
-+ |
| 1536 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
| 1537 |
- ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
| 1538 |
- LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool |
| 1539 |
|
| 1540 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch |
| 1541 |
deleted file mode 100644 |
| 1542 |
index c8ce8e1..0000000 |
| 1543 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch |
| 1544 |
+++ /dev/null |
| 1545 |
@@ -1,12 +0,0 @@ |
| 1546 |
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile |
| 1547 |
-index 2a66337..04988d7 100644 |
| 1548 |
---- a/cddl/lib/libzfs/Makefile |
| 1549 |
-+++ b/cddl/lib/libzfs/Makefile |
| 1550 |
-@@ -12,6 +12,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ |
| 1551 |
- |
| 1552 |
- LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ |
| 1553 |
- -lbsdxml -lgeom -lnvpair -lz -lzfs_core |
| 1554 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1555 |
- |
| 1556 |
- SRCS= deviceid.c \ |
| 1557 |
- fsshare.c \ |
| 1558 |
|
| 1559 |
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 |
| 1560 |
deleted file mode 100644 |
| 1561 |
index 46f2521..0000000 |
| 1562 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch |
| 1563 |
+++ /dev/null |
| 1564 |
@@ -1,87 +0,0 @@ |
| 1565 |
-diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile |
| 1566 |
-index 1e386e5..a4c08ee 100644 |
| 1567 |
---- a/cddl/sbin/zfs/Makefile |
| 1568 |
-+++ b/cddl/sbin/zfs/Makefile |
| 1569 |
-@@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs |
| 1570 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 1571 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1572 |
- |
| 1573 |
--LIBADD= jail nvpair uutil zfs_core zfs |
| 1574 |
-+LIBADD= jail nvpair uutil zfs_core zfs umem avl |
| 1575 |
- |
| 1576 |
- .include <bsd.prog.mk> |
| 1577 |
-diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile |
| 1578 |
-index ebf0f90..c70a3c4 100644 |
| 1579 |
---- a/cddl/sbin/zpool/Makefile |
| 1580 |
-+++ b/cddl/sbin/zpool/Makefile |
| 1581 |
-@@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 1582 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
| 1583 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
| 1584 |
- |
| 1585 |
--LIBADD= geom nvpair uutil zfs |
| 1586 |
-+LIBADD= geom nvpair uutil zfs umem avl zfs_core |
| 1587 |
- |
| 1588 |
- .include <bsd.prog.mk> |
| 1589 |
-diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile |
| 1590 |
-index fc68904..9af6ff2 100644 |
| 1591 |
---- a/cddl/usr.sbin/lockstat/Makefile |
| 1592 |
-+++ b/cddl/usr.sbin/lockstat/Makefile |
| 1593 |
-@@ -21,6 +21,6 @@ CFLAGS+= -DNEED_ERRLOC -g |
| 1594 |
- |
| 1595 |
- #YFLAGS+= -d |
| 1596 |
- |
| 1597 |
--LIBADD= elf dtrace rt |
| 1598 |
-+LIBADD= elf dtrace rt ctf |
| 1599 |
- |
| 1600 |
- .include <bsd.prog.mk> |
| 1601 |
-diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile |
| 1602 |
-index 77b6139..7737efd 100644 |
| 1603 |
---- a/cddl/usr.sbin/plockstat/Makefile |
| 1604 |
-+++ b/cddl/usr.sbin/plockstat/Makefile |
| 1605 |
-@@ -18,6 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
| 1606 |
- -I${.CURDIR}/../../../cddl/lib/libdtrace \ |
| 1607 |
- -I${.CURDIR}/../../../sys |
| 1608 |
- |
| 1609 |
--LIBADD= dtrace proc |
| 1610 |
-+LIBADD= dtrace proc ctf |
| 1611 |
- |
| 1612 |
- .include <bsd.prog.mk> |
| 1613 |
-diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile |
| 1614 |
-index 3609502..71526f7 100644 |
| 1615 |
---- a/cddl/usr.sbin/zdb/Makefile |
| 1616 |
-+++ b/cddl/usr.sbin/zdb/Makefile |
| 1617 |
-@@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1618 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 1619 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1620 |
- |
| 1621 |
--LIBADD= nvpair umem uutil zfs zpool |
| 1622 |
-+LIBADD= nvpair umem uutil zfs zpool avl zfs_core |
| 1623 |
- |
| 1624 |
- # Since there are many asserts in this program, it makes no sense to compile |
| 1625 |
- # it without debugging. |
| 1626 |
-diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common |
| 1627 |
-index a545609..034d418 100644 |
| 1628 |
---- a/cddl/usr.sbin/zfsd/Makefile.common |
| 1629 |
-+++ b/cddl/usr.sbin/zfsd/Makefile.common |
| 1630 |
-@@ -35,7 +35,7 @@ CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} |
| 1631 |
- |
| 1632 |
- DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ |
| 1633 |
- ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} |
| 1634 |
--LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil |
| 1635 |
-+LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil umem avl |
| 1636 |
- |
| 1637 |
- cscope: |
| 1638 |
- find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ |
| 1639 |
-diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile |
| 1640 |
-index 02c51ac..d9b79a9 100644 |
| 1641 |
---- a/cddl/usr.sbin/zhack/Makefile |
| 1642 |
-+++ b/cddl/usr.sbin/zhack/Makefile |
| 1643 |
-@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1644 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 1645 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1646 |
- |
| 1647 |
--LIBADD= nvpair zfs zpool |
| 1648 |
-+LIBADD= nvpair zfs zpool umem uutil avl zfs_core |
| 1649 |
- |
| 1650 |
- CFLAGS+= -DDEBUG=1 |
| 1651 |
- #DEBUG_FLAGS+= -g |
| 1652 |
|
| 1653 |
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 |
| 1654 |
deleted file mode 100644 |
| 1655 |
index 839b6b5..0000000 |
| 1656 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch |
| 1657 |
+++ /dev/null |
| 1658 |
@@ -1,12 +0,0 @@ |
| 1659 |
-diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common |
| 1660 |
-index 6c71bdf..6b71908 100644 |
| 1661 |
---- a/cddl/usr.sbin/zfsd/Makefile.common |
| 1662 |
-+++ b/cddl/usr.sbin/zfsd/Makefile.common |
| 1663 |
-@@ -31,6 +31,7 @@ INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs |
| 1664 |
- INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys |
| 1665 |
- |
| 1666 |
- CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} |
| 1667 |
-+CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} |
| 1668 |
- |
| 1669 |
- DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ |
| 1670 |
- ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} |
| 1671 |
|
| 1672 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch |
| 1673 |
deleted file mode 100644 |
| 1674 |
index ad5c83e..0000000 |
| 1675 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch |
| 1676 |
+++ /dev/null |
| 1677 |
@@ -1,114 +0,0 @@ |
| 1678 |
-diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile |
| 1679 |
---- cddl.orig/lib/libctf/Makefile 2009-01-24 03:36:33 -0200 |
| 1680 |
-+++ cddl/lib/libctf/Makefile 2009-01-24 03:55:10 -0200 |
| 1681 |
-@@ -4,6 +4,7 @@ |
| 1682 |
- |
| 1683 |
- LIB= ctf |
| 1684 |
- SHLIB_MAJOR= 2 |
| 1685 |
-+LDADD+=-lz |
| 1686 |
- |
| 1687 |
- SRCS= ctf_create.c \ |
| 1688 |
- ctf_decl.c \ |
| 1689 |
-diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile |
| 1690 |
---- cddl.orig/lib/libdtrace/Makefile 2009-01-24 00:18:47 -0200 |
| 1691 |
-+++ cddl/lib/libdtrace/Makefile 2009-01-24 03:31:06 -0200 |
| 1692 |
-@@ -74,7 +74,7 @@ |
| 1693 |
- .endif |
| 1694 |
- |
| 1695 |
- LFLAGS+=-l |
| 1696 |
-- |
| 1697 |
-+LDADD+=-lz -lproc |
| 1698 |
- YFLAGS+=-d |
| 1699 |
- |
| 1700 |
- CLEANFILES= dt_errtags.c dt_names.c |
| 1701 |
-diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile |
| 1702 |
---- cddl.orig/lib/libzfs/Makefile 2008-06-22 10:26:18 -0300 |
| 1703 |
-+++ cddl/lib/libzfs/Makefile 2008-06-22 10:26:26 -0300 |
| 1704 |
-@@ -7,7 +7,8 @@ |
| 1705 |
- |
| 1706 |
- LIB= zfs |
| 1707 |
- DPADD= ${LIBUTIL} |
| 1708 |
--LDADD= -lutil |
| 1709 |
-+LDADD= -lutil -lgeom -lm -luutil -lumem |
| 1710 |
-+LDFLAGS+= -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem |
| 1711 |
- |
| 1712 |
- SRCS= deviceid.c \ |
| 1713 |
- mnttab.c \ |
| 1714 |
-diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile |
| 1715 |
---- cddl.orig/lib/libzpool/Makefile 2008-06-22 10:35:15 -0300 |
| 1716 |
-+++ cddl/lib/libzpool/Makefile 2008-06-22 10:37:06 -0300 |
| 1717 |
-@@ -42,7 +42,8 @@ |
| 1718 |
- CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair |
| 1719 |
- |
| 1720 |
- DPADD= ${LIBPTHREAD} ${LIBZ} |
| 1721 |
--LDADD= -lpthread -lz |
| 1722 |
-+LDADD= -lpthread -lz -lavl -lumem |
| 1723 |
-+LDFLAGS+= -L${.CURDIR}/../libavl -L${.CURDIR}/../libumem |
| 1724 |
- |
| 1725 |
- # atomic.S doesn't like profiling. |
| 1726 |
- NO_PROFILE= |
| 1727 |
-diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile |
| 1728 |
---- cddl.orig/sbin/zfs/Makefile 2008-06-22 10:02:30 -0300 |
| 1729 |
-+++ cddl/sbin/zfs/Makefile 2008-06-22 10:14:23 -0300 |
| 1730 |
-@@ -23,5 +23,7 @@ |
| 1731 |
- ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} |
| 1732 |
- LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ |
| 1733 |
- -lm -lnvpair -luutil -lutil |
| 1734 |
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \ |
| 1735 |
-+ -L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib |
| 1736 |
- |
| 1737 |
- .include <bsd.prog.mk> |
| 1738 |
-diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile |
| 1739 |
---- cddl.orig/sbin/zpool/Makefile 2008-06-22 10:02:30 -0300 |
| 1740 |
-+++ cddl/sbin/zpool/Makefile 2008-06-22 10:14:47 -0300 |
| 1741 |
-@@ -23,5 +23,7 @@ |
| 1742 |
- ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} |
| 1743 |
- LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ |
| 1744 |
- -lm -lnvpair -luutil -lutil |
| 1745 |
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib \ |
| 1746 |
-+ -L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil |
| 1747 |
- |
| 1748 |
- .include <bsd.prog.mk> |
| 1749 |
-diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile |
| 1750 |
---- cddl.orig/usr.bin/ztest/Makefile 2008-06-22 10:02:30 -0300 |
| 1751 |
-+++ cddl/usr.bin/ztest/Makefile 2008-06-22 10:12:40 -0300 |
| 1752 |
-@@ -18,5 +18,7 @@ |
| 1753 |
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 1754 |
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 1755 |
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 1756 |
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ |
| 1757 |
-+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib |
| 1758 |
- |
| 1759 |
- .include <bsd.prog.mk> |
| 1760 |
-diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc |
| 1761 |
---- cddl.orig/usr.bin/Makefile.inc 2009-01-10 07:21:10 +0000 |
| 1762 |
-+++ cddl/usr.bin/Makefile.inc 2009-01-10 07:18:55 +0000 |
| 1763 |
-@@ -1,5 +1,6 @@ |
| 1764 |
- # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $ |
| 1765 |
- |
| 1766 |
- BINDIR?= /usr/bin |
| 1767 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 1768 |
- |
| 1769 |
- .include "../Makefile.inc" |
| 1770 |
---- cddl.orig/usr.sbin/zdb/Makefile 2010-03-11 13:19:48 +0100 |
| 1771 |
-+++ cddl/usr.sbin/zdb/Makefile 2010-03-11 13:20:08 +0100 |
| 1772 |
-@@ -22,6 +22,8 @@ |
| 1773 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
| 1774 |
- ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} |
| 1775 |
- LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool |
| 1776 |
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ |
| 1777 |
-+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs |
| 1778 |
- |
| 1779 |
- CSTD= c99 |
| 1780 |
- |
| 1781 |
---- cddl.orig/usr.bin/zinject/Makefile 2010-03-11 13:30:32 +0100 |
| 1782 |
-+++ cddl/usr.bin/zinject/Makefile 2010-03-11 13:33:27 +0100 |
| 1783 |
-@@ -21,5 +21,8 @@ |
| 1784 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ |
| 1785 |
- ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL} |
| 1786 |
- LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool |
| 1787 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \ |
| 1788 |
-+ -L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \ |
| 1789 |
-+ -L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool |
| 1790 |
- |
| 1791 |
- .include <bsd.prog.mk> |
| 1792 |
|
| 1793 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch |
| 1794 |
deleted file mode 100644 |
| 1795 |
index a0e5677..0000000 |
| 1796 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch |
| 1797 |
+++ /dev/null |
| 1798 |
@@ -1,22 +0,0 @@ |
| 1799 |
---- cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000 |
| 1800 |
-+++ cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000 |
| 1801 |
-@@ -24,6 +24,8 @@ |
| 1802 |
- #CFLAGS+= -DNEED_ERRLOC |
| 1803 |
- #YFLAGS+= -d |
| 1804 |
- |
| 1805 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf |
| 1806 |
-+ |
| 1807 |
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ |
| 1808 |
- ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} |
| 1809 |
- LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ |
| 1810 |
---- cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000 |
| 1811 |
-+++ cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000 |
| 1812 |
-@@ -23,6 +23,8 @@ |
| 1813 |
- |
| 1814 |
- CFLAGS+= -DNEED_ERRLOC -g |
| 1815 |
- |
| 1816 |
-+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf |
| 1817 |
-+ |
| 1818 |
- #YFLAGS+= -d |
| 1819 |
- |
| 1820 |
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ |
| 1821 |
|
| 1822 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch |
| 1823 |
deleted file mode 100644 |
| 1824 |
index b3d95bb..0000000 |
| 1825 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch |
| 1826 |
+++ /dev/null |
| 1827 |
@@ -1,28 +0,0 @@ |
| 1828 |
-diff -ur cddl.old/sbin/zfs/Makefile cddl/sbin/zfs/Makefile |
| 1829 |
---- cddl.old/sbin/zfs/Makefile 2011-11-04 10:01:46.000000000 +0000 |
| 1830 |
-+++ cddl/sbin/zfs/Makefile 2011-11-04 10:07:15.000000000 +0000 |
| 1831 |
-@@ -21,8 +21,8 @@ |
| 1832 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 1833 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1834 |
- |
| 1835 |
--DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ |
| 1836 |
-+DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ |
| 1837 |
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} |
| 1838 |
--LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 1839 |
-+LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 1840 |
- |
| 1841 |
- .include <bsd.prog.mk> |
| 1842 |
-diff -ur cddl.old/sbin/zpool/Makefile cddl/sbin/zpool/Makefile |
| 1843 |
---- cddl.old/sbin/zpool/Makefile 2011-11-04 10:01:46.000000000 +0000 |
| 1844 |
-+++ cddl/sbin/zpool/Makefile 2011-11-04 10:06:38.000000000 +0000 |
| 1845 |
-@@ -26,8 +26,8 @@ |
| 1846 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
| 1847 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
| 1848 |
- |
| 1849 |
--DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ |
| 1850 |
-+DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ |
| 1851 |
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} |
| 1852 |
--LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 1853 |
-+LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 1854 |
- |
| 1855 |
- .include <bsd.prog.mk> |
| 1856 |
|
| 1857 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch |
| 1858 |
deleted file mode 100644 |
| 1859 |
index c81a2c3..0000000 |
| 1860 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch |
| 1861 |
+++ /dev/null |
| 1862 |
@@ -1,167 +0,0 @@ |
| 1863 |
-diff -upNr a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile |
| 1864 |
---- a/cddl/lib/libzfs/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1865 |
-+++ b/cddl/lib/libzfs/Makefile 2012-03-30 19:04:39.904906253 +0000 |
| 1866 |
-@@ -54,4 +54,8 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont |
| 1867 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
| 1868 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
| 1869 |
- |
| 1870 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1871 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1872 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1873 |
-+ |
| 1874 |
- .include <bsd.lib.mk> |
| 1875 |
-diff -upNr a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile |
| 1876 |
---- a/cddl/lib/libzpool/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1877 |
-+++ b/cddl/lib/libzpool/Makefile 2012-03-30 19:04:55.839233753 +0000 |
| 1878 |
-@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt |
| 1879 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys |
| 1880 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include |
| 1881 |
- |
| 1882 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1883 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1884 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1885 |
-+ |
| 1886 |
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} |
| 1887 |
- LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl |
| 1888 |
- |
| 1889 |
-diff -upNr a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile |
| 1890 |
---- a/cddl/sbin/zfs/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1891 |
-+++ b/cddl/sbin/zfs/Makefile 2012-03-30 19:05:11.094859502 +0000 |
| 1892 |
-@@ -21,6 +21,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1893 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 1894 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 1895 |
- |
| 1896 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1897 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1898 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1899 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1900 |
-+ |
| 1901 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ |
| 1902 |
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} |
| 1903 |
- LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 1904 |
-diff -upNr a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile |
| 1905 |
---- a/cddl/sbin/zpool/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1906 |
-+++ b/cddl/sbin/zpool/Makefile 2012-03-30 19:05:24.830721002 +0000 |
| 1907 |
-@@ -26,6 +26,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1908 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
| 1909 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
| 1910 |
- |
| 1911 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1912 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1913 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1914 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1915 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1916 |
-+ |
| 1917 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ |
| 1918 |
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} |
| 1919 |
- LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 1920 |
-diff -upNr a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile |
| 1921 |
---- a/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1922 |
-+++ b/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 19:05:49.454897012 +0000 |
| 1923 |
-@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1924 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 1925 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 1926 |
- |
| 1927 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 1928 |
-+ |
| 1929 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 1930 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 1931 |
- |
| 1932 |
-diff -upNr a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile |
| 1933 |
---- a/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1934 |
-+++ b/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 19:06:08.084858412 +0000 |
| 1935 |
-@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1936 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 1937 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 1938 |
- |
| 1939 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 1940 |
-+ |
| 1941 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 1942 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 1943 |
- |
| 1944 |
-diff -upNr a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile |
| 1945 |
---- a/cddl/usr.bin/zinject/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1946 |
-+++ b/cddl/usr.bin/zinject/Makefile 2012-03-30 19:06:25.084865592 +0000 |
| 1947 |
-@@ -19,6 +19,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1948 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 1949 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1950 |
- |
| 1951 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1952 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1953 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1954 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 1955 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 1956 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1957 |
-+ |
| 1958 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ |
| 1959 |
- ${LIBZFS} ${LIBZPOOL} |
| 1960 |
- LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool |
| 1961 |
-diff -upNr a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile |
| 1962 |
---- a/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1963 |
-+++ b/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 19:06:44.544860132 +0000 |
| 1964 |
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1965 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 1966 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1967 |
- |
| 1968 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1969 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1970 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1971 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1972 |
-+ |
| 1973 |
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 1974 |
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 1975 |
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 1976 |
-diff -upNr a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile |
| 1977 |
---- a/cddl/usr.bin/ztest/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 1978 |
-+++ b/cddl/usr.bin/ztest/Makefile 2012-03-30 19:06:58.344895642 +0000 |
| 1979 |
-@@ -17,6 +17,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1980 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 1981 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1982 |
- |
| 1983 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1984 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 1985 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 1986 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 1987 |
-+ |
| 1988 |
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 1989 |
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 1990 |
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 1991 |
-diff -upNr a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile |
| 1992 |
---- a/cddl/usr.sbin/zdb/Makefile 2012-03-30 18:58:53.164736000 +0000 |
| 1993 |
-+++ b/cddl/usr.sbin/zdb/Makefile 2012-03-30 19:07:17.454861002 +0000 |
| 1994 |
-@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 1995 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 1996 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 1997 |
- |
| 1998 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 1999 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2000 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2001 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2002 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 2003 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 2004 |
-+ |
| 2005 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
| 2006 |
- ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} |
| 2007 |
- LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool |
| 2008 |
---- a/cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000 |
| 2009 |
-+++ b/cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000 |
| 2010 |
-@@ -24,6 +24,8 @@ |
| 2011 |
- #CFLAGS+= -DNEED_ERRLOC |
| 2012 |
- #YFLAGS+= -d |
| 2013 |
- |
| 2014 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf |
| 2015 |
-+ |
| 2016 |
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ |
| 2017 |
- ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} |
| 2018 |
- LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ |
| 2019 |
---- a/cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000 |
| 2020 |
-+++ b/cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000 |
| 2021 |
-@@ -23,6 +23,8 @@ |
| 2022 |
- |
| 2023 |
- CFLAGS+= -DNEED_ERRLOC -g |
| 2024 |
- |
| 2025 |
-+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf |
| 2026 |
-+ |
| 2027 |
- #YFLAGS+= -d |
| 2028 |
- |
| 2029 |
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ |
| 2030 |
|
| 2031 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch |
| 2032 |
deleted file mode 100644 |
| 2033 |
index ff87d2c..0000000 |
| 2034 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch |
| 2035 |
+++ /dev/null |
| 2036 |
@@ -1,22 +0,0 @@ |
| 2037 |
---- cddl/lib/libzfs/Makefile.old 2011-11-04 10:27:30.000000000 +0000 |
| 2038 |
-+++ cddl/lib/libzfs/Makefile 2011-11-04 10:28:59.000000000 +0000 |
| 2039 |
-@@ -7,7 +7,7 @@ |
| 2040 |
- |
| 2041 |
- LIB= zfs |
| 2042 |
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} |
| 2043 |
--LDADD= -lmd -lpthread -lumem -lutil |
| 2044 |
-+LDADD= -lmd -lpthread -lumem -lutil -luutil -lnvpair -lm -lgeom |
| 2045 |
- |
| 2046 |
- SRCS= deviceid.c \ |
| 2047 |
- fsshare.c \ |
| 2048 |
---- cddl/lib/libzpool/Makefile.old 2011-11-04 18:22:28.000000000 +0000 |
| 2049 |
-+++ cddl/lib/libzpool/Makefile 2011-11-04 18:24:01.000000000 +0000 |
| 2050 |
-@@ -57,7 +57,7 @@ |
| 2051 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include |
| 2052 |
- |
| 2053 |
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} |
| 2054 |
--LDADD= -lmd -lpthread -lz |
| 2055 |
-+LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl |
| 2056 |
- |
| 2057 |
- # atomic.S doesn't like profiling. |
| 2058 |
- NO_PROFILE= |
| 2059 |
|
| 2060 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch |
| 2061 |
deleted file mode 100644 |
| 2062 |
index 36eb570..0000000 |
| 2063 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch |
| 2064 |
+++ /dev/null |
| 2065 |
@@ -1,220 +0,0 @@ |
| 2066 |
-diff --git a/lib/libzfs/Makefile b/lib/libzfs/Makefile |
| 2067 |
-index 5b6b47d..c8549b4 100644 |
| 2068 |
---- a/lib/libzfs/Makefile |
| 2069 |
-+++ b/lib/libzfs/Makefile |
| 2070 |
-@@ -55,6 +55,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 2071 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
| 2072 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair |
| 2073 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
| 2074 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2075 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2076 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2077 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 2078 |
-+ |
| 2079 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
| 2080 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common |
| 2081 |
- |
| 2082 |
-diff --git a/lib/libzfs_core/Makefile b/lib/libzfs_core/Makefile |
| 2083 |
-index a470fbc..ae8c649 100644 |
| 2084 |
---- a/lib/libzfs_core/Makefile |
| 2085 |
-+++ b/lib/libzfs_core/Makefile |
| 2086 |
-@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
| 2087 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common |
| 2088 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
| 2089 |
- |
| 2090 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2091 |
-+ |
| 2092 |
- .include <bsd.lib.mk> |
| 2093 |
-diff --git a/lib/libzpool/Makefile b/lib/libzpool/Makefile |
| 2094 |
-index 417c1cc..838cdb5 100644 |
| 2095 |
---- a/lib/libzpool/Makefile |
| 2096 |
-+++ b/lib/libzpool/Makefile |
| 2097 |
-@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread |
| 2098 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys |
| 2099 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include |
| 2100 |
- |
| 2101 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 2102 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2103 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2104 |
-+ |
| 2105 |
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} |
| 2106 |
- LDADD= -lmd -lpthread -lz |
| 2107 |
- |
| 2108 |
-diff --git a/sbin/zfs/Makefile b/sbin/zfs/Makefile |
| 2109 |
-index a49d278..b22442e 100644 |
| 2110 |
---- a/sbin/zfs/Makefile |
| 2111 |
-+++ b/sbin/zfs/Makefile |
| 2112 |
-@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs |
| 2113 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 2114 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 2115 |
- |
| 2116 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2117 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2118 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2119 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 2120 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 2121 |
-+ |
| 2122 |
- DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ |
| 2123 |
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} |
| 2124 |
- LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs |
| 2125 |
-diff --git a/sbin/zpool/Makefile b/sbin/zpool/Makefile |
| 2126 |
-index 1884d24..5f06d5f 100644 |
| 2127 |
---- a/sbin/zpool/Makefile |
| 2128 |
-+++ b/sbin/zpool/Makefile |
| 2129 |
-@@ -26,6 +26,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 2130 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
| 2131 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
| 2132 |
- |
| 2133 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 2134 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2135 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2136 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2137 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 2138 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 2139 |
-+ |
| 2140 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ |
| 2141 |
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} |
| 2142 |
- LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs |
| 2143 |
-diff --git a/usr.bin/ctfconvert/Makefile b/usr.bin/ctfconvert/Makefile |
| 2144 |
-index 7e4a05a..72327ad 100644 |
| 2145 |
---- a/usr.bin/ctfconvert/Makefile |
| 2146 |
-+++ b/usr.bin/ctfconvert/Makefile |
| 2147 |
-@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
| 2148 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 2149 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 2150 |
- |
| 2151 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 2152 |
-+ |
| 2153 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 2154 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 2155 |
- |
| 2156 |
-diff --git a/usr.bin/ctfmerge/Makefile b/usr.bin/ctfmerge/Makefile |
| 2157 |
-index ba4840e..845d28c 100644 |
| 2158 |
---- a/usr.bin/ctfmerge/Makefile |
| 2159 |
-+++ b/usr.bin/ctfmerge/Makefile |
| 2160 |
-@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
| 2161 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 2162 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 2163 |
- |
| 2164 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 2165 |
-+ |
| 2166 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 2167 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 2168 |
- |
| 2169 |
-diff --git a/usr.bin/zinject/Makefile b/usr.bin/zinject/Makefile |
| 2170 |
-index 8c5c141..3db2b29 100644 |
| 2171 |
---- a/usr.bin/zinject/Makefile |
| 2172 |
-+++ b/usr.bin/zinject/Makefile |
| 2173 |
-@@ -19,6 +19,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
| 2174 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 2175 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 2176 |
- |
| 2177 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 2178 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2179 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2180 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2181 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 2182 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 2183 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 2184 |
-+ |
| 2185 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ |
| 2186 |
- ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
| 2187 |
- LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool |
| 2188 |
-diff --git a/usr.bin/zstreamdump/Makefile b/usr.bin/zstreamdump/Makefile |
| 2189 |
-index 304ff7c..5f0b00e 100644 |
| 2190 |
---- a/usr.bin/zstreamdump/Makefile |
| 2191 |
-+++ b/usr.bin/zstreamdump/Makefile |
| 2192 |
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
| 2193 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 2194 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 2195 |
- |
| 2196 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 2197 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2198 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2199 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 2200 |
-+ |
| 2201 |
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 2202 |
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 2203 |
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 2204 |
-diff --git a/usr.bin/ztest/Makefile b/usr.bin/ztest/Makefile |
| 2205 |
-index 965300e..ad40a92 100644 |
| 2206 |
---- a/usr.bin/ztest/Makefile |
| 2207 |
-+++ b/usr.bin/ztest/Makefile |
| 2208 |
-@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
| 2209 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 2210 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 2211 |
- |
| 2212 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 2213 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2214 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2215 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2216 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 2217 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 2218 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 2219 |
-+ |
| 2220 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 2221 |
- ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} |
| 2222 |
- LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ |
| 2223 |
-diff --git a/usr.sbin/dtrace/Makefile b/usr.sbin/dtrace/Makefile |
| 2224 |
-index 3930f01..4bdbd1a 100644 |
| 2225 |
---- a/usr.sbin/dtrace/Makefile |
| 2226 |
-+++ b/usr.sbin/dtrace/Makefile |
| 2227 |
-@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ |
| 2228 |
- LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \ |
| 2229 |
- -lrtld_db |
| 2230 |
- |
| 2231 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace |
| 2232 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 2233 |
-+ |
| 2234 |
- .include <bsd.prog.mk> |
| 2235 |
-diff --git a/usr.sbin/lockstat/Makefile b/usr.sbin/lockstat/Makefile |
| 2236 |
-index 70515ef..d65e4c3 100644 |
| 2237 |
---- a/usr.sbin/lockstat/Makefile |
| 2238 |
-+++ b/usr.sbin/lockstat/Makefile |
| 2239 |
-@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
| 2240 |
- |
| 2241 |
- CFLAGS+= -DNEED_ERRLOC -g |
| 2242 |
- |
| 2243 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace |
| 2244 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 2245 |
-+ |
| 2246 |
- #YFLAGS+= -d |
| 2247 |
- |
| 2248 |
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ |
| 2249 |
-diff --git a/usr.sbin/zdb/Makefile b/usr.sbin/zdb/Makefile |
| 2250 |
-index 8068385..337e324 100644 |
| 2251 |
---- a/usr.sbin/zdb/Makefile |
| 2252 |
-+++ b/usr.sbin/zdb/Makefile |
| 2253 |
-@@ -23,6 +23,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 2254 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 2255 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 2256 |
- |
| 2257 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 2258 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2259 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2260 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2261 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 2262 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 2263 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 2264 |
-+ |
| 2265 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
| 2266 |
- ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
| 2267 |
- LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool |
| 2268 |
-diff --git a/usr.sbin/zhack/Makefile b/usr.sbin/zhack/Makefile |
| 2269 |
-index f09d2d8..fc3d7a4 100644 |
| 2270 |
---- a/usr.sbin/zhack/Makefile |
| 2271 |
-+++ b/usr.sbin/zhack/Makefile |
| 2272 |
-@@ -22,6 +22,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 2273 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 2274 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 2275 |
- |
| 2276 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 2277 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 2278 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 2279 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 2280 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 2281 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
| 2282 |
-+ |
| 2283 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
| 2284 |
- ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
| 2285 |
- LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool |
| 2286 |
|
| 2287 |
diff --git a/sys-freebsd/freebsd-cddl/files/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd |
| 2288 |
deleted file mode 100644 |
| 2289 |
index 7daf445..0000000 |
| 2290 |
--- a/sys-freebsd/freebsd-cddl/files/zfs.initd |
| 2291 |
+++ /dev/null |
| 2292 |
@@ -1,24 +0,0 @@ |
| 2293 |
-#!/sbin/openrc-run |
| 2294 |
-# Copyright 1999-2012 Gentoo Foundation |
| 2295 |
-# Distributed under the terms of the GNU General Public License v2 |
| 2296 |
-# $Id$ |
| 2297 |
- |
| 2298 |
-depend() { |
| 2299 |
- need hostid |
| 2300 |
- before fsck |
| 2301 |
-} |
| 2302 |
- |
| 2303 |
-start() { |
| 2304 |
- einfo "Starting zfs ..." |
| 2305 |
- zfs mount -a |
| 2306 |
- zfs share -a |
| 2307 |
- if [ ! -r /etc/zfs/exports ]; then |
| 2308 |
- touch /etc/zfs/exports |
| 2309 |
- fi |
| 2310 |
-} |
| 2311 |
- |
| 2312 |
-stop() { |
| 2313 |
- einfo "Stopping zfs ..." |
| 2314 |
- zfs unshare -a |
| 2315 |
- zfs unmount -a |
| 2316 |
-} |
| 2317 |
|
| 2318 |
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd |
| 2319 |
deleted file mode 100644 |
| 2320 |
index 0f9fcb9..0000000 |
| 2321 |
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd |
| 2322 |
+++ /dev/null |
| 2323 |
@@ -1,47 +0,0 @@ |
| 2324 |
-#!/sbin/openrc-run |
| 2325 |
-# Copyright 1999-2011 Gentoo Foundation |
| 2326 |
-# Distributed under the terms of the GNU General Public License v2 |
| 2327 |
-# $Id$ |
| 2328 |
- |
| 2329 |
-depend() { |
| 2330 |
- need hostid |
| 2331 |
- before fsck |
| 2332 |
-} |
| 2333 |
- |
| 2334 |
-start() { |
| 2335 |
- einfo "Starting zfs volumes..." |
| 2336 |
- zfs volinit |
| 2337 |
- eend $? |
| 2338 |
- # Enable swap on ZVOLs that have org.freebsd:swap=on. |
| 2339 |
- zfs list -H -o org.freebsd:swap,name -t volume | \ |
| 2340 |
- while read state name; do |
| 2341 |
- case "${state}" in |
| 2342 |
- [oO][nN]) |
| 2343 |
- einfo "Enabling swap on zvol ${name}" |
| 2344 |
- swapon /dev/zvol/${name} |
| 2345 |
- eend $? |
| 2346 |
- ;; |
| 2347 |
- esac |
| 2348 |
- done |
| 2349 |
-} |
| 2350 |
- |
| 2351 |
-stop() { |
| 2352 |
- # Disable what we had enabled before. |
| 2353 |
- zfs list -H -o org.freebsd:swap,name -t volume | \ |
| 2354 |
- while read state name; do |
| 2355 |
- case "${state}" in |
| 2356 |
- [oO][nN]) |
| 2357 |
- einfo "Disabling swap on zvol ${name}" |
| 2358 |
- swapoff /dev/zvol/${name} |
| 2359 |
- eend $? |
| 2360 |
- ;; |
| 2361 |
- esac |
| 2362 |
- done |
| 2363 |
- einfo "Stopping zfs volumes..." |
| 2364 |
- zfs volfini |
| 2365 |
- eend $? |
| 2366 |
-} |
| 2367 |
- |
| 2368 |
-restart() { |
| 2369 |
- : |
| 2370 |
-} |
| 2371 |
|
| 2372 |
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 |
| 2373 |
deleted file mode 100644 |
| 2374 |
index bfba28f..0000000 |
| 2375 |
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 |
| 2376 |
+++ /dev/null |
| 2377 |
@@ -1,45 +0,0 @@ |
| 2378 |
-#!/sbin/openrc-run |
| 2379 |
-# Copyright 1999-2012 Gentoo Foundation |
| 2380 |
-# Distributed under the terms of the GNU General Public License v2 |
| 2381 |
-# $Id$ |
| 2382 |
- |
| 2383 |
-depend() { |
| 2384 |
- need hostid |
| 2385 |
- before fsck |
| 2386 |
-} |
| 2387 |
- |
| 2388 |
-start() { |
| 2389 |
- einfo "Starting zfs volumes..." |
| 2390 |
- eend $? |
| 2391 |
- # Enable swap on ZVOLs that have org.freebsd:swap=on. |
| 2392 |
- zfs list -H -o org.freebsd:swap,name -t volume | \ |
| 2393 |
- while read state name; do |
| 2394 |
- case "${state}" in |
| 2395 |
- [oO][nN]) |
| 2396 |
- einfo "Enabling swap on zvol ${name}" |
| 2397 |
- swapon /dev/zvol/${name} |
| 2398 |
- eend $? |
| 2399 |
- ;; |
| 2400 |
- esac |
| 2401 |
- done |
| 2402 |
-} |
| 2403 |
- |
| 2404 |
-stop() { |
| 2405 |
- # Disable what we had enabled before. |
| 2406 |
- zfs list -H -o org.freebsd:swap,name -t volume | \ |
| 2407 |
- while read state name; do |
| 2408 |
- case "${state}" in |
| 2409 |
- [oO][nN]) |
| 2410 |
- einfo "Disabling swap on zvol ${name}" |
| 2411 |
- swapoff /dev/zvol/${name} |
| 2412 |
- eend $? |
| 2413 |
- ;; |
| 2414 |
- esac |
| 2415 |
- done |
| 2416 |
- einfo "Stopping zfs volumes..." |
| 2417 |
- eend $? |
| 2418 |
-} |
| 2419 |
- |
| 2420 |
-restart() { |
| 2421 |
- : |
| 2422 |
-} |
| 2423 |
|
| 2424 |
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild |
| 2425 |
deleted file mode 100644 |
| 2426 |
index 2efbb35..0000000 |
| 2427 |
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild |
| 2428 |
+++ /dev/null |
| 2429 |
@@ -1,79 +0,0 @@ |
| 2430 |
-# Copyright 1999-2016 Gentoo Foundation |
| 2431 |
-# Distributed under the terms of the GNU General Public License v2 |
| 2432 |
-# $Id$ |
| 2433 |
- |
| 2434 |
-EAPI=5 |
| 2435 |
- |
| 2436 |
-inherit bsdmk freebsd toolchain-funcs multilib |
| 2437 |
- |
| 2438 |
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" |
| 2439 |
-SLOT="0" |
| 2440 |
- |
| 2441 |
-IUSE="build" |
| 2442 |
-LICENSE="CDDL GPL-2" |
| 2443 |
- |
| 2444 |
-if [[ ${PV} != *9999* ]]; then |
| 2445 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
| 2446 |
-fi |
| 2447 |
- |
| 2448 |
-# sys is required. |
| 2449 |
-EXTRACTONLY=" |
| 2450 |
- cddl/ |
| 2451 |
- contrib/ |
| 2452 |
- usr.bin/ |
| 2453 |
- lib/ |
| 2454 |
- sbin/ |
| 2455 |
- sys/ |
| 2456 |
-" |
| 2457 |
- |
| 2458 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
| 2459 |
- =sys-freebsd/freebsd-libexec-${RV}* |
| 2460 |
- build? ( sys-apps/baselayout )" |
| 2461 |
- |
| 2462 |
-DEPEND="${RDEPEND} |
| 2463 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 2464 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )" |
| 2465 |
- |
| 2466 |
-S="${WORKDIR}/cddl" |
| 2467 |
- |
| 2468 |
-PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch" |
| 2469 |
- "${FILESDIR}/${PN}-11.0-add-libs.patch" ) |
| 2470 |
- |
| 2471 |
-pkg_setup() { |
| 2472 |
- # Add the required source files. |
| 2473 |
- use build && EXTRACTONLY+="include/ " |
| 2474 |
- [[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd" |
| 2475 |
-} |
| 2476 |
- |
| 2477 |
-src_prepare() { |
| 2478 |
- if [[ ! -e "${WORKDIR}/include" ]]; then |
| 2479 |
- # Link in include headers. |
| 2480 |
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." |
| 2481 |
- fi |
| 2482 |
- for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do |
| 2483 |
- LDFLAGS="${LDFLAGS} -L${S}/lib/${d}" |
| 2484 |
- done |
| 2485 |
-} |
| 2486 |
- |
| 2487 |
-src_compile() { |
| 2488 |
- cd "${S}"/lib || die |
| 2489 |
- freebsd_src_compile |
| 2490 |
- cd "${S}" || die |
| 2491 |
- freebsd_src_compile |
| 2492 |
-} |
| 2493 |
- |
| 2494 |
-src_install() { |
| 2495 |
- # Install libraries proper place |
| 2496 |
- local mylibdir=$(get_libdir) |
| 2497 |
- freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" |
| 2498 |
- |
| 2499 |
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core |
| 2500 |
- |
| 2501 |
- # Install zfs volinit script. |
| 2502 |
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol |
| 2503 |
- |
| 2504 |
- # Install zfs script |
| 2505 |
- newinitd "${FILESDIR}"/zfs.initd zfs |
| 2506 |
- |
| 2507 |
- keepdir /etc/zfs |
| 2508 |
-} |
| 2509 |
|
| 2510 |
diff --git a/sys-freebsd/freebsd-cddl/metadata.xml b/sys-freebsd/freebsd-cddl/metadata.xml |
| 2511 |
deleted file mode 100644 |
| 2512 |
index a00f3ae..0000000 |
| 2513 |
--- a/sys-freebsd/freebsd-cddl/metadata.xml |
| 2514 |
+++ /dev/null |
| 2515 |
@@ -1,8 +0,0 @@ |
| 2516 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 2517 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 2518 |
-<pkgmetadata> |
| 2519 |
-<maintainer type="project"> |
| 2520 |
- <email>bsd@g.o</email> |
| 2521 |
- <name>BSD Project</name> |
| 2522 |
-</maintainer> |
| 2523 |
-</pkgmetadata> |
| 2524 |
|
| 2525 |
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest |
| 2526 |
deleted file mode 100644 |
| 2527 |
index 25129fa..0000000 |
| 2528 |
--- a/sys-freebsd/freebsd-lib/Manifest |
| 2529 |
+++ /dev/null |
| 2530 |
@@ -1,43 +0,0 @@ |
| 2531 |
-AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2 |
| 2532 |
-AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf |
| 2533 |
-AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33 |
| 2534 |
-AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370 |
| 2535 |
-AUX freebsd-lib-10.2-bsdxml2expat.patch 982 SHA256 0dab6d4525cee88eb1d6ce6c1176100ff9271222d6c6cde20f894781c02eb075 SHA512 b65fd732825e2813d499bd519bc5ef69b4c603ad57b047d2716405cc47a221c6e137a1f2e890b79a23bc26036834f7696dc9ac5953400f26975a0139fedad7c5 WHIRLPOOL dd2bd2384e12ee5e978dfb284ecdee73ce07f32d16dd67302a8cfc0ca324d078ab8b6153e170753a2fbe22993e07a4240e848d7b00aad78b58a4fa5cd27d0c26 |
| 2536 |
-AUX freebsd-lib-10.2-liblink.patch 653 SHA256 a252201ec74f0cf0940b28b626e72f909cfab04addcb86b8f9abe984265c074e SHA512 c75c1fd81bd826685db5258ce0cd2407e385990dd576973fad361206271eda678d1fbe95a406909904bfee22890c79eb0f4cbfab09ddbee579552d003df2e6b1 WHIRLPOOL 3a579e65e07d7b8b558004eae9923c249d9dbd13983e3e263cb5384734d4e8c739440baa95a67953a56d2c6b7ff0a2cb8d2d7d8f7a0fbb4366001d0ea990cc4d |
| 2537 |
-AUX freebsd-lib-10.3-libusb.patch 339 SHA256 64c737051839e430108c96914485bc200e83ea951832033ace683470da823791 SHA512 15ad67c805c34e5a67f21de0db9ec3826aa96fadb880f2cca8110d4b26ed3722eea8aa9ee2c8e1976288b5e9be5e6046e4bd60d515305fff283ad50cc01d3d0f WHIRLPOOL 59ad6cb93295a95f8bb94fb7d2b13e1a8bd83267a96bc816142f9254bbdf494fd17670a0e8634eaeebe93f7535467c1b388f044eb459e222eecb84a7e21745bc |
| 2538 |
-AUX freebsd-lib-11.0-bsdxml2expat.patch 1103 SHA256 fea5f9bb3f59bcf9277253d41763ccf415dcb5fb6fa88e49459102cecbb43e18 SHA512 a0e9d99ff47ce813a98a5c1fd3605dd757ceb6c4f68e3784f1b48192c9f0966cbf1c769387a808ae4511f004b00242fc47f7fd3a2971e371de587cac6827533e WHIRLPOOL 9d7cac8b4b1cc575ddb0a74657e3e228a2d9439d43e5a69b4863247838d9224fa7d26818992629fda0f6db07d08da433e012cb63f4516c62206f2d9d71bda1c1 |
| 2539 |
-AUX freebsd-lib-11.0-liblink.patch 1771 SHA256 07231f264161547cbfca2c6647b84d058c8e9610b6660d9af12edd43781800c4 SHA512 94ae726ede275090093dbd39edf1accbc06d618c0fd8d9b96bc72337998a5d85a909ec2a5a011bd10729f82eb83b1a71dce0523c62e8c85361274383da47d21b WHIRLPOOL 519788ddac01ae2503e93878f9c5dcc2e3d2c7c33ae33eef093bbe6639c635785c4666dcf500ed2f0326a7130329f46ecf8f1a413bc64db8a69d44810fd8b54f |
| 2540 |
-AUX freebsd-lib-11.0-libproc-libcxx.patch 350 SHA256 23f5d80d5fb5cf683f3b7990e4899612a82ab878af450423a0da4179d846ad40 SHA512 c9ace882ac2fb2a077839a02a4307ce7df1dd0699cef081e6a99f12f9c2b443e4a4e4f85415a59d208859442dc665d7b9cae22de8d61f80ab8a5875d423c5795 WHIRLPOOL f1dc721386c698c50e69b4b4bd4b82be0ac47ae63546b15ba421a5a7784ee3af33e852484bf8cf763897d646857924bdae5a6551e4585740ce06deb628bc8653 |
| 2541 |
-AUX freebsd-lib-11.0-libsysdecode.patch 680 SHA256 7f458085c5cddaec8fb94053150803058f444513ba0f3bb528e0e654022e653b SHA512 2601924267ea0efc1fee4bb582fa22918aa83964cbe519eec69c6e6bf09b6943b025d65833982fdfea01b74726ee5fba3f78ecf6ed2877f22965141c78074fd8 WHIRLPOOL d5ec768349e1524a3416c522f0d108fc5f2f0c1622bfefbf7c2a5a3530bf452f1163d038a5416fe8607c3af6282ee0db45d864ab21586f6f7a48fe0a3ed3b7fe |
| 2542 |
-AUX freebsd-lib-11.0-workaround.patch 295 SHA256 5f09d646d7137649b8dc0e1736a81a4ab7f2599fc48f4f75ac3341a9cd817773 SHA512 5c7559dc1876e833f440bc85e23e601eaa5dd26484b1905a5a59e29345f83438208770671c248b4dfb5138c4dded1f08234c77070afadb5c6b54e2b6dc35e24a WHIRLPOOL 165245510300f2b5f75d4a0cbeefee4b56971da5ddb70324885506d8223a86ee0c866921f008225674d520bbdd9c9bc22c43bfc32d55cc2f6a1094e7d48bc7f9 |
| 2543 |
-AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0 |
| 2544 |
-AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e |
| 2545 |
-AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f |
| 2546 |
-AUX freebsd-lib-6.1-csu.patch 655 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1 SHA512 926d8aafd6f517a0fb97af61746d53bafab7fe7003f71181c43b4f9b31e7652624d060a350cc23d83ca7da7c1be2dcc048bb00a581c3524f0f2b7b06de6100b4 WHIRLPOOL fada1ac622c48e1e5af34245bdb17507b2b317938265f722c8cbdbbce3d14bbe76f39a231c0e7237bd229a8c0687952643c6f56e65ffc56b18508969fad837f7 |
| 2547 |
-AUX freebsd-lib-6.2-bluetooth.patch 243 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658 SHA512 60d938a6f1162f106ec93c4122707a4dd9ca6afc73be4d90871db745ad084ca1d229e7460f4faa9885c4f6d192a41cb8be7cf671b0c8ec720eccd1c7af994bbc WHIRLPOOL df2ab6e6d9223c7e2369fb8baf19638cb897343b6ba571c7b9294be7d335068b7978690b2cd50174b4ee0215f2409322a9cc2a374140fc14dff460e181c05578 |
| 2548 |
-AUX freebsd-lib-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3 |
| 2549 |
-AUX freebsd-lib-8.0-gcc45.patch 1264 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d SHA512 12b81def4e7690cf5b910f31466b06c3fdf58f38a41f63dd359582d8f480e8081b54fd4997c6595e9e1a8912f991ba1b8d04989e270f242dd547d72c9ad5ea57 WHIRLPOOL 0cb37d909a02492a1ca700a5b990e4b6ce42a7f7d55e14a5a3fe685d28f360a10e95d97bd489f1dae0b152e168e9d901bfc13bf08bc91d8dfa1d263d4dba9abf |
| 2550 |
-AUX freebsd-lib-8.0-log2.patch 667 SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214 SHA512 72f99ecc4632ba9b5ea8f26cbe7311a2ada1822c1c3ccf2c6690d72fb91748e7e70915f33e0f29087125c4027ef084c1d37638fc423bde533595e8d4910084c3 WHIRLPOOL dbe9a686efa26dab9ca129ed39ddab49556490fee22b43f6aa07bd9cbebfa24bd8ccb6e30f0d213bab857571a022bcd1b110d47bd85c6f70462441772bfeb243 |
| 2551 |
-AUX freebsd-lib-8.0-rpcsec_gss.patch 298 SHA256 775ec2ee12c49f134938fa8264c04c6b2bf95f8001371f20b85058c25ff1c472 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702 WHIRLPOOL 884b76cd6d5d01f801b2fb13f53cfa6ed26dd0b9b2a5062ac9dbe63a6813bfe737e4c3f98b3d94c32dfb6ce3cc19cd5c8760c81250f4b2d5980a4f084d7dc54b |
| 2552 |
-AUX freebsd-lib-8.2-liblink.patch 510 SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee SHA512 52a050078dc71163709e6dbe6d1c3177adbc51cb9b30a6990194ddd32f5b54e107b758801f0ff5632c4fe800c6734d63d42e53378a78caa0072847060fbb0dee WHIRLPOOL c0b95cb074ff6fd7699a03dfe31572a5edbde2b59c8aac3431fb85a0a0d71ad28566500951e0fb96ed9a8d3081abca7ec507c26e12e988f0ff2ece51bb0df2d1 |
| 2553 |
-AUX freebsd-lib-8.2-nlm_syscall.patch 385 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b SHA512 1c871dc00da4b6d1106720954014f60933c99508dfc34fe08ae37b2f67ca05f70ac5e1bb75d0d1d119c7750405871ee3fb6e95ebd3ec378fc84e819cc0c4c9fd WHIRLPOOL 4d335910c00f21d2d8d5f80cd99c5316e5c485f935eefb782398e2e308e20a2cd4da0e1acf74c07a2c6d8ff446b3757cc416c0bee7e1be9d9cae0843a45e0748 |
| 2554 |
-AUX freebsd-lib-9.0-bluetooth.patch 318 SHA256 5b8810471bd57e1100cc7ee6eee3ed92799e1a5c0244f5ae42f3715189fb06c3 SHA512 71cba168c1530407840dde9e25ce374abb7e0d69800e85bf6f5aff28d1a777ff31f47a84ab763e1518d3492f604d1c09ca95cf8ec5b4e05e8bd5b85267ca4488 WHIRLPOOL eccb54dd10a01358aa7e8267e64f103b89c2981ab2475f27282d5ea0bfe8adb8a106c869ca661553c3d2eda0c1d3d9dec669da6cfe61c23d5749535bdcc8c28b |
| 2555 |
-AUX freebsd-lib-9.0-cve-2010-2632.patch 6963 SHA256 a6383bd3b59bb6a8989ba7746f89115b91e5082768d914bab169842144569c45 SHA512 bb7090a0acbf8ab431334245b1e767da60dcf8f2d23de97a4690e879ae5d528065f5462e2ad3647313662a906f139cfff04f15bce80efede2d2174f74792a07b WHIRLPOOL 6df4a824cd657e79cce984f9181f3e6b20e998f9b9bc1a233bbc5dd7f2e40c055e9f9d401453b49bffb3cc8ef6bb541400f486a966339e56584569c08b358ee4 |
| 2556 |
-AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70a068573086484d5efd6826b7c4c3c SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616 WHIRLPOOL b59e3bb0aaede34492d1940a77b11c7e5192643122f18ee6ad363053f9dec2600218ca416dd153e1d0b3bb6621d6f9e2ec50621e6e7f4b610abbd69993dc428a |
| 2557 |
-AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041b765c79eef392970665740411c382 SHA512 07ebde5797480f37502e60db2a8c9ce9459bd55b176e79c0f20a859cf737f619559cb27706fb0e83fb501493677a3ffeaa9a98d45db3c0c539b71d2f18140246 WHIRLPOOL 2d78565fe0bc0dcdd61d028ba24b20d2db94f32b40536e7e8e1d5e7f485e0e2f3125807dbb6607d26e4366a6aa8ee89a8f0af7c9498f1fba9431f652c181a8f1 |
| 2558 |
-AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473 |
| 2559 |
-AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133 |
| 2560 |
-AUX freebsd-lib-9.1-aligned_alloc.patch 1355 SHA256 379880b3e1be34a145d6388481645af5212eea7830285a7660a56a02e47dc608 SHA512 d9ac6008650efcd02ff1a0f64ac486e413c926681082d4ab9c1cb5abfbf1070e44b723e685a0b5b0e7159ab9071d85c5ee08c9063c9dcda470dfaa06a29391bc WHIRLPOOL fd80089b4b31f0a0d4dcb912d5dde74b3eb9e0530a3dc145f40ac476ef89ae256a0847123b44a0a59966c28f7f7529c401ce0dab493400a7aa24513989853e36 |
| 2561 |
-AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414 |
| 2562 |
-AUX freebsd-lib-add-nossp-cflags.patch 1193 SHA256 53a844511feca44a9db4ac19de336320398335d18617b39cbc4e66db3f88e861 SHA512 fcb290527381df5b91355ca7f36bb4c770378b014890e7a4d129b7cc28e7c18cb1f87ef9e1b308e0de61b54d767677865969c77a9877d8874f2bec223331f9f8 WHIRLPOOL 20e4a0cd017f9aee59f0e4fa809ae74c855fcb7c7a794e1e71b1e5900390d08a9bdfaf5a36a45b057d6211c056a5fb69adfc688fa2adb0586f115be0aea40219 |
| 2563 |
-AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee |
| 2564 |
-AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb |
| 2565 |
-AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317 |
| 2566 |
-AUX freebsd-lib-new_as.patch 1494 SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982 SHA512 f53aa3833179c701a8c0fc6c48c3ab9d1a2694a1c30287ae08e9ea94ddf8c547f7bfe632908b9c3a3ffc4541ed2bf41277a309ffbb7d3eea58d389198d884adb WHIRLPOOL 738b312f04f8a51ab7182c4fde21bfa18d90c9a85486cd071724a61c2ecdb58cb3cdf4c52c50219baab91f15ccebf7de7700267952da65ec52e7c71eab3f954b |
| 2567 |
-AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8 |
| 2568 |
-AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e |
| 2569 |
-AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae |
| 2570 |
-AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 |
| 2571 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 2572 |
-EBUILD freebsd-lib-11.0.ebuild 19400 SHA256 4695f889de60e8c782108a50835dbc3951613286898c671683ad37564ca3161b SHA512 909ed2a228d4af07abe8971f1ef16ec69a13ec6a78279ff59d4c5627d2b6ae2d01bf3f8aa9540aec58c878bf51b19a2d98b4845cfaf07b59b8590f0f48d08c7c WHIRLPOOL db6a0c89df20fc3621bfe11a64ead7612741692627353436caf892a1f559bc60404d564c2360d2ae44a8bb5a7735ae2d812e299004818c3ae174b2e2d157bc5e |
| 2573 |
-MISC metadata.xml 500 SHA256 82c704031ba7ec4dec7348c15d1188fad5e9df804c12f90c04afcb0a46eb5dd6 SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470 WHIRLPOOL 0837f442d3673e9bac470774a9868ad4992056a4edae8e07759248ec58830cb1a596cf39b347d04a3e33b16d88329084571df30f33bdc9c9e73073f32ca015ae |
| 2574 |
|
| 2575 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch |
| 2576 |
deleted file mode 100644 |
| 2577 |
index 42b64b5..0000000 |
| 2578 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch |
| 2579 |
+++ /dev/null |
| 2580 |
@@ -1,49 +0,0 @@ |
| 2581 |
-diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc |
| 2582 |
-index 937187a..d5277f3 100644 |
| 2583 |
---- a/lib/atf/Makefile.inc |
| 2584 |
-+++ b/lib/atf/Makefile.inc |
| 2585 |
-@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' |
| 2586 |
- CFLAGS+= -DATF_SHELL='"/bin/sh"' |
| 2587 |
- CFLAGS+= -DATF_WORKDIR='"/tmp"' |
| 2588 |
- |
| 2589 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
| 2590 |
-+CXXFLAGS+= -DATF_ARCH='"${MACHINE}"' |
| 2591 |
-+CXXFLAGS+= -DATF_BUILD_CC='"${CC}"' |
| 2592 |
-+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' |
| 2593 |
-+CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"' |
| 2594 |
-+CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"' |
| 2595 |
-+CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"' |
| 2596 |
-+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' |
| 2597 |
-+CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"' |
| 2598 |
-+CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' |
| 2599 |
-+CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"' |
| 2600 |
-+CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' |
| 2601 |
-+CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"' |
| 2602 |
-+CXXFLAGS+= -DATF_M4='"/usr/bin/m4"' |
| 2603 |
-+CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' |
| 2604 |
-+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' |
| 2605 |
-+CXXFLAGS+= -DATF_WORKDIR='"/tmp"' |
| 2606 |
-+ |
| 2607 |
- WARNS?= 3 |
| 2608 |
- |
| 2609 |
- # vim: syntax=make |
| 2610 |
-diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile |
| 2611 |
-index 37d6073..90a2687 100644 |
| 2612 |
---- a/lib/atf/libatf-c++/Makefile |
| 2613 |
-+++ b/lib/atf/libatf-c++/Makefile |
| 2614 |
-@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c |
| 2615 |
- .PATH: ${ATF}/atf-c++ |
| 2616 |
- .PATH: ${ATF}/atf-c++/detail |
| 2617 |
- |
| 2618 |
--CFLAGS+= -I${ATF} |
| 2619 |
--CFLAGS+= -I${.CURDIR}/../libatf-c |
| 2620 |
--CFLAGS+= -I. |
| 2621 |
-+CXXFLAGS+= -I${ATF} |
| 2622 |
-+CXXFLAGS+= -I${.CURDIR}/../libatf-c |
| 2623 |
-+CXXFLAGS+= -I. |
| 2624 |
- |
| 2625 |
--CFLAGS+= -DHAVE_CONFIG_H |
| 2626 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
| 2627 |
- |
| 2628 |
- SRCS= application.cpp \ |
| 2629 |
- build.cpp \ |
| 2630 |
|
| 2631 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch |
| 2632 |
deleted file mode 100644 |
| 2633 |
index 6ef3f07..0000000 |
| 2634 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch |
| 2635 |
+++ /dev/null |
| 2636 |
@@ -1,98 +0,0 @@ |
| 2637 |
-diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile |
| 2638 |
-index 9a21dde..0815f0a 100644 |
| 2639 |
---- a/lib/libcam/Makefile |
| 2640 |
-+++ b/lib/libcam/Makefile |
| 2641 |
-@@ -8,6 +8,7 @@ INCS= camlib.h |
| 2642 |
- |
| 2643 |
- DPADD= ${LIBSBUF} |
| 2644 |
- LDADD= -lsbuf |
| 2645 |
-+LDFLAGS+= -L${.OBJDIR}/../libsbuf |
| 2646 |
- |
| 2647 |
- MAN= cam.3 cam_cdbparse.3 |
| 2648 |
- |
| 2649 |
-diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile |
| 2650 |
-index dbd7895..607b1f6 100644 |
| 2651 |
---- a/lib/libdwarf/Makefile |
| 2652 |
-+++ b/lib/libdwarf/Makefile |
| 2653 |
-@@ -21,6 +21,7 @@ SRCS= \ |
| 2654 |
- INCS= dwarf.h libdwarf.h |
| 2655 |
- |
| 2656 |
- CFLAGS+= -I${.CURDIR} |
| 2657 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2658 |
- |
| 2659 |
- SHLIB_MAJOR= 3 |
| 2660 |
- |
| 2661 |
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
| 2662 |
-index 4449c06..f024cf0 100644 |
| 2663 |
---- a/lib/libproc/Makefile |
| 2664 |
-+++ b/lib/libproc/Makefile |
| 2665 |
-@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \ |
| 2666 |
- INCS= libproc.h |
| 2667 |
- |
| 2668 |
- CFLAGS+= -I${.CURDIR} |
| 2669 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2670 |
- |
| 2671 |
- .if ${MK_LIBCPLUSPLUS} != "no" |
| 2672 |
- LDADD+= -lcxxrt |
| 2673 |
-@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2 |
| 2674 |
- |
| 2675 |
- WITHOUT_MAN= |
| 2676 |
- |
| 2677 |
-+LDADD+= -lelf |
| 2678 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
| 2679 |
-+ |
| 2680 |
- .include <bsd.lib.mk> |
| 2681 |
-diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile |
| 2682 |
-index af5a775..c01aa05 100644 |
| 2683 |
---- a/lib/libprocstat/Makefile |
| 2684 |
-+++ b/lib/libprocstat/Makefile |
| 2685 |
-@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def |
| 2686 |
- SYMBOL_MAPS= ${.CURDIR}/Symbol.map |
| 2687 |
- |
| 2688 |
- INCS= libprocstat.h |
| 2689 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2690 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
| 2691 |
- CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE |
| 2692 |
- SHLIB_MAJOR= 1 |
| 2693 |
- |
| 2694 |
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile |
| 2695 |
-index 2815a07..e992662 100644 |
| 2696 |
---- a/lib/librtld_db/Makefile |
| 2697 |
-+++ b/lib/librtld_db/Makefile |
| 2698 |
-@@ -10,5 +10,8 @@ SRCS= rtld_db.c |
| 2699 |
- INCS= rtld_db.h |
| 2700 |
- |
| 2701 |
- CFLAGS+= -I${.CURDIR} |
| 2702 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2703 |
-+LDADD+= -lutil -lproc |
| 2704 |
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc |
| 2705 |
- |
| 2706 |
- .include <bsd.lib.mk> |
| 2707 |
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile |
| 2708 |
-index 1cf52a0..3d25fae 100644 |
| 2709 |
---- a/lib/libtelnet/Makefile |
| 2710 |
-+++ b/lib/libtelnet/Makefile |
| 2711 |
-@@ -13,6 +13,8 @@ INTERNALLIB= |
| 2712 |
- SRCS= genget.c getent.c misc.c |
| 2713 |
- CFLAGS+= -I${TELNETDIR} |
| 2714 |
- |
| 2715 |
-+CFLAGS+= -I${.CURDIR}/../libmp |
| 2716 |
-+ |
| 2717 |
- WARNS?= 2 |
| 2718 |
- |
| 2719 |
- .if !defined(RELEASE_CRUNCH) |
| 2720 |
-diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile |
| 2721 |
-index 30a1dfb..9f8a99c 100644 |
| 2722 |
---- a/lib/libexecinfo/Makefile |
| 2723 |
-+++ b/lib/libexecinfo/Makefile |
| 2724 |
-@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1 |
| 2725 |
- INCS= execinfo.h |
| 2726 |
- SRCS= backtrace.c symtab.c unwind.c |
| 2727 |
- |
| 2728 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2729 |
- DPADD= ${LIBELF} |
| 2730 |
- LDADD= -lelf |
| 2731 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
| 2732 |
- |
| 2733 |
- MAN= backtrace.3 |
| 2734 |
- |
| 2735 |
|
| 2736 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch |
| 2737 |
deleted file mode 100644 |
| 2738 |
index 55987aa..0000000 |
| 2739 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch |
| 2740 |
+++ /dev/null |
| 2741 |
@@ -1,16 +0,0 @@ |
| 2742 |
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
| 2743 |
-index f9e01ab..15b27d8 100644 |
| 2744 |
---- a/lib/libproc/Makefile |
| 2745 |
-+++ b/lib/libproc/Makefile |
| 2746 |
-@@ -15,7 +15,10 @@ INCS= libproc.h |
| 2747 |
- |
| 2748 |
- CFLAGS+= -I${.CURDIR} |
| 2749 |
- |
| 2750 |
--.if ${MK_LIBCPLUSPLUS} != "no" |
| 2751 |
-+.if ${CXX:T:M*-stdlib=libc++*} |
| 2752 |
-+LDADD+= -lcxxrt |
| 2753 |
-+DPADD+= ${LIBCXXRT} |
| 2754 |
-+.elif ${CXXFLAGS:T:M*-stdlib=libc++*} |
| 2755 |
- LDADD+= -lcxxrt |
| 2756 |
- DPADD+= ${LIBCXXRT} |
| 2757 |
- .else |
| 2758 |
|
| 2759 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch |
| 2760 |
deleted file mode 100644 |
| 2761 |
index 2968252..0000000 |
| 2762 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch |
| 2763 |
+++ /dev/null |
| 2764 |
@@ -1,19 +0,0 @@ |
| 2765 |
-diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile |
| 2766 |
-index 21016a9..26010e8 100644 |
| 2767 |
---- a/lib/libusb/Makefile |
| 2768 |
-+++ b/lib/libusb/Makefile |
| 2769 |
-@@ -40,11 +40,11 @@ CFLAGS+= -DCOMPAT_32BIT |
| 2770 |
- |
| 2771 |
- beforeinstall: |
| 2772 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 2773 |
-- ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig |
| 2774 |
-+ ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDIR}/pkgconfig |
| 2775 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 2776 |
-- ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig |
| 2777 |
-+ ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDIR}/pkgconfig |
| 2778 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 2779 |
-- ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig |
| 2780 |
-+ ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDIR}/pkgconfig |
| 2781 |
- |
| 2782 |
- # |
| 2783 |
- # Cross platform support |
| 2784 |
|
| 2785 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch |
| 2786 |
deleted file mode 100644 |
| 2787 |
index 303f422..0000000 |
| 2788 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch |
| 2789 |
+++ /dev/null |
| 2790 |
@@ -1,39 +0,0 @@ |
| 2791 |
-diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile |
| 2792 |
-index bbfb57b..a7c17e3 100644 |
| 2793 |
---- a/lib/libgeom/Makefile |
| 2794 |
-+++ b/lib/libgeom/Makefile |
| 2795 |
-@@ -13,7 +13,7 @@ CFLAGS += -I${.CURDIR} |
| 2796 |
- |
| 2797 |
- WARNS?= 3 |
| 2798 |
- |
| 2799 |
--DPADD= ${LIBBSDXML} ${LIBSBUF} |
| 2800 |
-+DPADD= ${LIBSBUF} |
| 2801 |
- LDADD= -lbsdxml -lsbuf |
| 2802 |
- |
| 2803 |
- MAN= libgeom.3 |
| 2804 |
-diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c |
| 2805 |
-index 9dedb8e..d96420c 100644 |
| 2806 |
---- a/lib/libgeom/geom_xml2tree.c |
| 2807 |
-+++ b/lib/libgeom/geom_xml2tree.c |
| 2808 |
-@@ -43,7 +43,7 @@ |
| 2809 |
- #include <sys/sbuf.h> |
| 2810 |
- #include <sys/sysctl.h> |
| 2811 |
- #include <err.h> |
| 2812 |
--#include <bsdxml.h> |
| 2813 |
-+#include <expat.h> |
| 2814 |
- #include <libgeom.h> |
| 2815 |
- |
| 2816 |
- struct mystate { |
| 2817 |
-diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c |
| 2818 |
-index d1fc0b1..89ac55e 100644 |
| 2819 |
---- a/lib/libmt/mtlib.c |
| 2820 |
-+++ b/lib/libmt/mtlib.c |
| 2821 |
-@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken |
| 2822 |
- #include <unistd.h> |
| 2823 |
- #include <stdint.h> |
| 2824 |
- #include <errno.h> |
| 2825 |
--#include <bsdxml.h> |
| 2826 |
-+#include <expat.h> |
| 2827 |
- #include <mtlib.h> |
| 2828 |
- |
| 2829 |
- /* |
| 2830 |
|
| 2831 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch |
| 2832 |
deleted file mode 100644 |
| 2833 |
index b08d95f..0000000 |
| 2834 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch |
| 2835 |
+++ /dev/null |
| 2836 |
@@ -1,26 +0,0 @@ |
| 2837 |
-diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile |
| 2838 |
-index cb1da71..43de5a5 100644 |
| 2839 |
---- a/lib/libmt/Makefile |
| 2840 |
-+++ b/lib/libmt/Makefile |
| 2841 |
-@@ -5,6 +5,7 @@ SHLIBDIR?= /lib |
| 2842 |
- SRCS= mtlib.c |
| 2843 |
- INCS= mtlib.h |
| 2844 |
- |
| 2845 |
-+CFLAGS+= -I${.CURDIR} |
| 2846 |
- DPADD= ${LIBSBUF} |
| 2847 |
- LDADD= -lsbuf |
| 2848 |
- |
| 2849 |
-diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile |
| 2850 |
-index e9384b7..085ef62 100644 |
| 2851 |
---- a/lib/libdpv/Makefile |
| 2852 |
-+++ b/lib/libdpv/Makefile |
| 2853 |
-@@ -11,7 +11,8 @@ LDADD= -ldialog -lfigpar -lncursesw -lutil |
| 2854 |
- |
| 2855 |
- SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c |
| 2856 |
- |
| 2857 |
--CFLAGS+= -I${.CURDIR} |
| 2858 |
-+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libfigpar |
| 2859 |
-+LDFLAGS+= -L${.OBJDIR}/../libfigpar |
| 2860 |
- |
| 2861 |
- WARNS?= 6 |
| 2862 |
- |
| 2863 |
|
| 2864 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch |
| 2865 |
deleted file mode 100644 |
| 2866 |
index 813a42b..0000000 |
| 2867 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch |
| 2868 |
+++ /dev/null |
| 2869 |
@@ -1,13 +0,0 @@ |
| 2870 |
-diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile |
| 2871 |
-index 88ec3fe..076b8d4 100644 |
| 2872 |
---- a/lib/libusb/Makefile |
| 2873 |
-+++ b/lib/libusb/Makefile |
| 2874 |
-@@ -38,7 +38,7 @@ SRCS+= libusb10_io.c |
| 2875 |
- CFLAGS+= -DCOMPAT_32BIT |
| 2876 |
- .else |
| 2877 |
- FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc |
| 2878 |
--FILESDIR= ${LIBDATADIR}/pkgconfig |
| 2879 |
-+FILESDIR= ${LIBDIR}/pkgconfig |
| 2880 |
- .endif |
| 2881 |
- |
| 2882 |
- # |
| 2883 |
|
| 2884 |
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 |
| 2885 |
deleted file mode 100644 |
| 2886 |
index 41a394b..0000000 |
| 2887 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-bsdxml2expat.patch |
| 2888 |
+++ /dev/null |
| 2889 |
@@ -1,39 +0,0 @@ |
| 2890 |
-diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c |
| 2891 |
-index 9dedb8e..d96420c 100644 |
| 2892 |
---- a/lib/libgeom/geom_xml2tree.c |
| 2893 |
-+++ b/lib/libgeom/geom_xml2tree.c |
| 2894 |
-@@ -43,7 +43,7 @@ |
| 2895 |
- #include <sys/sbuf.h> |
| 2896 |
- #include <sys/sysctl.h> |
| 2897 |
- #include <err.h> |
| 2898 |
--#include <bsdxml.h> |
| 2899 |
-+#include <expat.h> |
| 2900 |
- #include <libgeom.h> |
| 2901 |
- |
| 2902 |
- struct mystate { |
| 2903 |
-diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c |
| 2904 |
-index d1fc0b1..89ac55e 100644 |
| 2905 |
---- a/lib/libmt/mtlib.c |
| 2906 |
-+++ b/lib/libmt/mtlib.c |
| 2907 |
-@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken |
| 2908 |
- #include <unistd.h> |
| 2909 |
- #include <stdint.h> |
| 2910 |
- #include <errno.h> |
| 2911 |
--#include <bsdxml.h> |
| 2912 |
-+#include <expat.h> |
| 2913 |
- #include <mtlib.h> |
| 2914 |
- |
| 2915 |
- /* |
| 2916 |
-diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c |
| 2917 |
-index c500d3f..fe1d37e 100644 |
| 2918 |
---- a/lib/lib80211/lib80211_regdomain.c |
| 2919 |
-+++ b/lib/lib80211/lib80211_regdomain.c |
| 2920 |
-@@ -40,7 +40,7 @@ static const char rcsid[] = "$FreeBSD: stable/11/lib/lib80211/lib80211_regdomain |
| 2921 |
- #include <err.h> |
| 2922 |
- #include <unistd.h> |
| 2923 |
- |
| 2924 |
--#include <bsdxml.h> |
| 2925 |
-+#include <expat.h> |
| 2926 |
- |
| 2927 |
- #include "lib80211_regdomain.h" |
| 2928 |
- |
| 2929 |
|
| 2930 |
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 |
| 2931 |
deleted file mode 100644 |
| 2932 |
index da495e4..0000000 |
| 2933 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch |
| 2934 |
+++ /dev/null |
| 2935 |
@@ -1,62 +0,0 @@ |
| 2936 |
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
| 2937 |
-index 2dedf11..275f4c3 100644 |
| 2938 |
---- a/lib/libproc/Makefile |
| 2939 |
-+++ b/lib/libproc/Makefile |
| 2940 |
-@@ -15,6 +15,7 @@ SRCS= proc_bkpt.c \ |
| 2941 |
- INCS= libproc.h |
| 2942 |
- |
| 2943 |
- CFLAGS+= -I${.CURDIR} |
| 2944 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2945 |
- |
| 2946 |
- .if ${MK_CXX} == "no" |
| 2947 |
- CFLAGS+= -DNO_CXA_DEMANGLE |
| 2948 |
-@@ -28,6 +29,9 @@ LIBADD+= elf rtld_db util |
| 2949 |
- |
| 2950 |
- .if ${MK_CDDL} != "no" |
| 2951 |
- LIBADD+= ctf |
| 2952 |
-+LDADD+= -lelf |
| 2953 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
| 2954 |
-+ |
| 2955 |
- IGNORE_PRAGMA= YES |
| 2956 |
- CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \ |
| 2957 |
- -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \ |
| 2958 |
-diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile |
| 2959 |
-index 1829883..d0065a3 100644 |
| 2960 |
---- a/lib/libprocstat/Makefile |
| 2961 |
-+++ b/lib/libprocstat/Makefile |
| 2962 |
-@@ -17,6 +17,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def |
| 2963 |
- SYMBOL_MAPS= ${.CURDIR}/Symbol.map |
| 2964 |
- |
| 2965 |
- INCS= libprocstat.h |
| 2966 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2967 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
| 2968 |
- CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE |
| 2969 |
- SHLIB_MAJOR= 1 |
| 2970 |
- |
| 2971 |
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile |
| 2972 |
-index 0a8ed95..11baf5b 100644 |
| 2973 |
---- a/lib/librtld_db/Makefile |
| 2974 |
-+++ b/lib/librtld_db/Makefile |
| 2975 |
-@@ -11,6 +11,9 @@ SRCS= rtld_db.c |
| 2976 |
- INCS= rtld_db.h |
| 2977 |
- |
| 2978 |
- CFLAGS+= -I${.CURDIR} |
| 2979 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
| 2980 |
-+LDADD+= -lutil -lproc |
| 2981 |
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc |
| 2982 |
- # Avoid circular dependency, we only need the libproc.h header here. |
| 2983 |
- CFLAGS+= -I${.CURDIR:H}/libproc |
| 2984 |
- |
| 2985 |
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile |
| 2986 |
-index f84aee3..c36ade9 100644 |
| 2987 |
---- a/lib/libtelnet/Makefile |
| 2988 |
-+++ b/lib/libtelnet/Makefile |
| 2989 |
-@@ -14,6 +14,8 @@ INTERNALLIB= |
| 2990 |
- SRCS= genget.c getent.c misc.c |
| 2991 |
- CFLAGS+= -I${TELNETDIR} |
| 2992 |
- |
| 2993 |
-+CFLAGS+= -I${.CURDIR}/../libmp |
| 2994 |
-+ |
| 2995 |
- WARNS?= 2 |
| 2996 |
- |
| 2997 |
- .if ${MK_OPENSSL} != "no" |
| 2998 |
|
| 2999 |
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 |
| 3000 |
deleted file mode 100644 |
| 3001 |
index 013ad20..0000000 |
| 3002 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libproc-libcxx.patch |
| 3003 |
+++ /dev/null |
| 3004 |
@@ -1,13 +0,0 @@ |
| 3005 |
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
| 3006 |
-index e3b2578..acd76e8 100644 |
| 3007 |
---- a/lib/libproc/Makefile |
| 3008 |
-+++ b/lib/libproc/Makefile |
| 3009 |
-@@ -18,7 +18,7 @@ CFLAGS+= -I${.CURDIR} |
| 3010 |
- |
| 3011 |
- .if ${MK_CXX} == "no" |
| 3012 |
- CFLAGS+= -DNO_CXA_DEMANGLE |
| 3013 |
--.elif ${MK_LIBCPLUSPLUS} != "no" |
| 3014 |
-+.elif ${COMPILER_TYPE} == "clang" |
| 3015 |
- LIBADD+= cxxrt |
| 3016 |
- .else |
| 3017 |
- LIBADD+= supcplusplus |
| 3018 |
|
| 3019 |
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 |
| 3020 |
deleted file mode 100644 |
| 3021 |
index d90aa31..0000000 |
| 3022 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch |
| 3023 |
+++ /dev/null |
| 3024 |
@@ -1,22 +0,0 @@ |
| 3025 |
-diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile |
| 3026 |
-index e3bfe00..51fc5f0 100644 |
| 3027 |
---- a/lib/libsysdecode/Makefile |
| 3028 |
-+++ b/lib/libsysdecode/Makefile |
| 3029 |
-@@ -8,7 +8,7 @@ LIB= sysdecode |
| 3030 |
- SRCS= errno.c ioctl.c syscallnames.c utrace.c |
| 3031 |
- INCS= sysdecode.h |
| 3032 |
- |
| 3033 |
--CFLAGS+= -I${.CURDIR}/../../sys |
| 3034 |
-+CFLAGS+= -I${.CURDIR}/../../sys -I${.CURDIR} |
| 3035 |
- |
| 3036 |
- MAN+= sysdecode.3 \ |
| 3037 |
- sysdecode_abi_to_freebsd_errno.3 \ |
| 3038 |
-@@ -37,7 +37,7 @@ CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} |
| 3039 |
- |
| 3040 |
- ioctl.c: mkioctls |
| 3041 |
- env MACHINE=${MACHINE} CPP="${CPP}" \ |
| 3042 |
-- /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} |
| 3043 |
-+ /bin/sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} |
| 3044 |
- |
| 3045 |
- beforedepend: ioctl.c |
| 3046 |
- |
| 3047 |
|
| 3048 |
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 |
| 3049 |
deleted file mode 100644 |
| 3050 |
index 05f817e..0000000 |
| 3051 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-workaround.patch |
| 3052 |
+++ /dev/null |
| 3053 |
@@ -1,12 +0,0 @@ |
| 3054 |
-diff --git a/lib/libdevdctl/event.cc b/lib/libdevdctl/event.cc |
| 3055 |
-index a8cb447..d56df2e 100644 |
| 3056 |
---- a/lib/libdevdctl/event.cc |
| 3057 |
-+++ b/lib/libdevdctl/event.cc |
| 3058 |
-@@ -50,6 +50,7 @@ |
| 3059 |
- #include <syslog.h> |
| 3060 |
- #include <unistd.h> |
| 3061 |
- |
| 3062 |
-+#include <cstdio> |
| 3063 |
- #include <cstdarg> |
| 3064 |
- #include <cstring> |
| 3065 |
- #include <iostream> |
| 3066 |
|
| 3067 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch |
| 3068 |
deleted file mode 100644 |
| 3069 |
index 00de8a6..0000000 |
| 3070 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch |
| 3071 |
+++ /dev/null |
| 3072 |
@@ -1,13 +0,0 @@ |
| 3073 |
-Index: fbsd-6/lib/libipsec/policy_token.l |
| 3074 |
-=================================================================== |
| 3075 |
---- fbsd-6.orig/lib/libipsec/policy_token.l |
| 3076 |
-+++ fbsd-6/lib/libipsec/policy_token.l |
| 3077 |
-@@ -138,8 +138,6 @@ void |
| 3078 |
- __policy__strbuffer__init__(msg) |
| 3079 |
- char *msg; |
| 3080 |
- { |
| 3081 |
-- if (yy_current_buffer) |
| 3082 |
-- yy_delete_buffer(yy_current_buffer); |
| 3083 |
- strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg); |
| 3084 |
- yy_switch_to_buffer(strbuffer); |
| 3085 |
- |
| 3086 |
|
| 3087 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch |
| 3088 |
deleted file mode 100644 |
| 3089 |
index a3e7d5e..0000000 |
| 3090 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch |
| 3091 |
+++ /dev/null |
| 3092 |
@@ -1,16 +0,0 @@ |
| 3093 |
-This patch is needed to avoid inclusion of GCC's float.h that defines |
| 3094 |
-LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64. |
| 3095 |
- |
| 3096 |
-Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c |
| 3097 |
-=================================================================== |
| 3098 |
---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c |
| 3099 |
-+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c |
| 3100 |
-@@ -28,7 +28,7 @@ |
| 3101 |
- __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $"); |
| 3102 |
- |
| 3103 |
- #include <fenv.h> |
| 3104 |
--#include <float.h> |
| 3105 |
-+#include <machine/float.h> |
| 3106 |
- #include <math.h> |
| 3107 |
- |
| 3108 |
- /* |
| 3109 |
|
| 3110 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch |
| 3111 |
deleted file mode 100644 |
| 3112 |
index 2f6de46..0000000 |
| 3113 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch |
| 3114 |
+++ /dev/null |
| 3115 |
@@ -1,13 +0,0 @@ |
| 3116 |
-Index: freebsd-6.0_beta4/lib/libpmc/Makefile |
| 3117 |
-=================================================================== |
| 3118 |
---- freebsd-6.0_beta4.orig/lib/libpmc/Makefile |
| 3119 |
-+++ freebsd-6.0_beta4/lib/libpmc/Makefile |
| 3120 |
-@@ -9,6 +9,8 @@ WARNS?= 6 |
| 3121 |
- |
| 3122 |
- MAN= pmc.3 pmclog.3 |
| 3123 |
- |
| 3124 |
-+CFLAGS+= -I${.CURDIR} |
| 3125 |
-+ |
| 3126 |
- MLINKS+= \ |
| 3127 |
- pmc.3 pmc_allocate.3 \ |
| 3128 |
- pmc.3 pmc_attach.3 \ |
| 3129 |
|
| 3130 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch |
| 3131 |
deleted file mode 100644 |
| 3132 |
index 075f278..0000000 |
| 3133 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch |
| 3134 |
+++ /dev/null |
| 3135 |
@@ -1,20 +0,0 @@ |
| 3136 |
---- lib/csu/amd64/Makefile.orig 2006-07-04 07:49:58 -0300 |
| 3137 |
-+++ lib/csu/amd64/Makefile 2006-07-04 07:50:15 -0300 |
| 3138 |
-@@ -16,6 +16,7 @@ |
| 3139 |
- ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c |
| 3140 |
- |
| 3141 |
- realinstall: |
| 3142 |
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 3143 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 3144 |
- ${OBJS} ${DESTDIR}${LIBDIR} |
| 3145 |
- |
| 3146 |
---- lib/csu/sparc64/Makefile.orig 2006-10-06 15:13:55 +0100 |
| 3147 |
-+++ lib/csu/sparc64/Makefile 2006-10-06 15:15:06 +0100 |
| 3148 |
-@@ -15,6 +15,7 @@ |
| 3149 |
- ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} |
| 3150 |
- |
| 3151 |
- realinstall: |
| 3152 |
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 3153 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 3154 |
- ${OBJS} ${DESTDIR}${LIBDIR} |
| 3155 |
- |
| 3156 |
|
| 3157 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch |
| 3158 |
deleted file mode 100644 |
| 3159 |
index a9b8435..0000000 |
| 3160 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch |
| 3161 |
+++ /dev/null |
| 3162 |
@@ -1,11 +0,0 @@ |
| 3163 |
---- lib/libsdp/Makefile 2007-06-15 12:04:37 +0200 |
| 3164 |
-+++ lib.sdp/libsdp/Makefile 2007-06-15 12:26:14 +0200 |
| 3165 |
-@@ -5,7 +5,7 @@ |
| 3166 |
- MAN= sdp.3 |
| 3167 |
- |
| 3168 |
- WARNS?= 2 |
| 3169 |
--CFLAGS+= -I${.CURDIR} |
| 3170 |
-+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libbluetooth |
| 3171 |
- |
| 3172 |
- SHLIB_MAJOR= 2 |
| 3173 |
- |
| 3174 |
|
| 3175 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch |
| 3176 |
deleted file mode 100644 |
| 3177 |
index 8de5df2..0000000 |
| 3178 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch |
| 3179 |
+++ /dev/null |
| 3180 |
@@ -1,15 +0,0 @@ |
| 3181 |
-Fixes a compile error if XOPEN_SOURCE 600 is defined. |
| 3182 |
- |
| 3183 |
-See: http://www.mailinglistarchive.com/freebsd-current@×××××××.org/msg15011.html |
| 3184 |
- |
| 3185 |
---- sys/sys/types.h.orig |
| 3186 |
-+++ sys/sys/types.h |
| 3187 |
-@@ -46,7 +46,7 @@ |
| 3188 |
- |
| 3189 |
- #include <sys/_pthreadtypes.h> |
| 3190 |
- |
| 3191 |
--#if __BSD_VISIBLE |
| 3192 |
-+#ifndef _POSIX_SOURCE |
| 3193 |
- typedef unsigned char u_char; |
| 3194 |
- typedef unsigned short u_short; |
| 3195 |
- typedef unsigned int u_int; |
| 3196 |
|
| 3197 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch |
| 3198 |
deleted file mode 100644 |
| 3199 |
index 2ddb9ea..0000000 |
| 3200 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch |
| 3201 |
+++ /dev/null |
| 3202 |
@@ -1,28 +0,0 @@ |
| 3203 |
-diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x |
| 3204 |
---- work.orig/include/rpcsvc/nis.x 2009-10-25 10:10:29.000000000 +0900 |
| 3205 |
-+++ work/include/rpcsvc/nis.x 2011-04-13 21:25:13.000000000 +0900 |
| 3206 |
-@@ -399,10 +399,7 @@ |
| 3207 |
- %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights) |
| 3208 |
- %#define WORLD_DEFAULT (NIS_READ_ACC) |
| 3209 |
- %#define GROUP_DEFAULT (NIS_READ_ACC << 8) |
| 3210 |
--%#define OWNER_DEFAULT ((NIS_READ_ACC +\ |
| 3211 |
-- NIS_MODIFY_ACC +\ |
| 3212 |
-- NIS_CREATE_ACC +\ |
| 3213 |
-- NIS_DESTROY_ACC) << 16) |
| 3214 |
-+%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16) |
| 3215 |
- %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT) |
| 3216 |
- % |
| 3217 |
- %/* Result manipulation defines ... */ |
| 3218 |
-@@ -431,10 +428,8 @@ |
| 3219 |
- % * these definitions they take an nis_object *, and an int and return |
| 3220 |
- % * a u_char * for Value, and an int for length. |
| 3221 |
- % */ |
| 3222 |
--%#define ENTRY_VAL(obj, col) \ |
| 3223 |
-- (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val |
| 3224 |
--%#define ENTRY_LEN(obj, col) \ |
| 3225 |
-- (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len |
| 3226 |
-+%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val |
| 3227 |
-+%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len |
| 3228 |
- % |
| 3229 |
- %#ifdef __cplusplus |
| 3230 |
- %} |
| 3231 |
|
| 3232 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch |
| 3233 |
deleted file mode 100644 |
| 3234 |
index a9fd189..0000000 |
| 3235 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch |
| 3236 |
+++ /dev/null |
| 3237 |
@@ -1,21 +0,0 @@ |
| 3238 |
-log2 and log2f are required by C99 and are not implemented. |
| 3239 |
-Workaround the deficiency. |
| 3240 |
- |
| 3241 |
---- lib/msun/src/math.h.old 2010-03-14 17:02:25.000000000 +0100 |
| 3242 |
-+++ lib/msun/src/math.h 2010-03-14 17:07:03.000000000 +0100 |
| 3243 |
-@@ -203,6 +203,7 @@ |
| 3244 |
- double frexp(double, int *); /* fundamentally !__pure2 */ |
| 3245 |
- double ldexp(double, int); |
| 3246 |
- double log(double); |
| 3247 |
-+#define log2(x) log(x)/log(2.0) |
| 3248 |
- double log10(double); |
| 3249 |
- double modf(double, double *); /* fundamentally !__pure2 */ |
| 3250 |
- |
| 3251 |
-@@ -319,6 +320,7 @@ |
| 3252 |
- float log10f(float); |
| 3253 |
- float log1pf(float); |
| 3254 |
- float logf(float); |
| 3255 |
-+#define log2f(x) logf(x)/logf(2.0) |
| 3256 |
- float modff(float, float *); /* fundamentally !__pure2 */ |
| 3257 |
- |
| 3258 |
- float powf(float, float); |
| 3259 |
|
| 3260 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch |
| 3261 |
deleted file mode 100644 |
| 3262 |
index a7de06f..0000000 |
| 3263 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch |
| 3264 |
+++ /dev/null |
| 3265 |
@@ -1,12 +0,0 @@ |
| 3266 |
-Without this linking fails during a stage3 build. |
| 3267 |
- |
| 3268 |
---- lib/librpcsec_gss/Makefile.orig |
| 3269 |
-+++ lib/librpcsec_gss/Makefile |
| 3270 |
-@@ -8,6 +8,7 @@ |
| 3271 |
- |
| 3272 |
- DPADD+= ${LIBGSSAPI} |
| 3273 |
- LDADD+= -lgssapi |
| 3274 |
-+LDFLAGS+= -L${.OBJDIR}/../libgssapi |
| 3275 |
- |
| 3276 |
- VERSION_DEF= ${.CURDIR}/../libc/Versions.def |
| 3277 |
- SYMBOL_MAPS= ${.CURDIR}/Symbol.map |
| 3278 |
|
| 3279 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch |
| 3280 |
deleted file mode 100644 |
| 3281 |
index c8be7f4..0000000 |
| 3282 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch |
| 3283 |
+++ /dev/null |
| 3284 |
@@ -1,19 +0,0 @@ |
| 3285 |
---- lib/libproc/Makefile.old 2011-07-06 00:58:04.000000000 +0000 |
| 3286 |
-+++ lib/libproc/Makefile 2011-07-06 00:58:58.000000000 +0000 |
| 3287 |
-@@ -18,5 +18,6 @@ |
| 3288 |
- WARNS?= 6 |
| 3289 |
- |
| 3290 |
- WITHOUT_MAN= yes |
| 3291 |
-+LDADD=-lelf |
| 3292 |
- |
| 3293 |
- .include <bsd.lib.mk> |
| 3294 |
---- lib/librtld_db/Makefile.old 2011-07-06 00:58:12.000000000 +0000 |
| 3295 |
-+++ lib/librtld_db/Makefile 2011-07-06 00:59:27.000000000 +0000 |
| 3296 |
-@@ -10,5 +10,7 @@ |
| 3297 |
- INCS= rtld_db.h |
| 3298 |
- |
| 3299 |
- CFLAGS+= -I${.CURDIR} |
| 3300 |
-+LDADD=-lutil -lproc |
| 3301 |
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc |
| 3302 |
- |
| 3303 |
- .include <bsd.lib.mk> |
| 3304 |
|
| 3305 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch |
| 3306 |
deleted file mode 100644 |
| 3307 |
index 556ade5..0000000 |
| 3308 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch |
| 3309 |
+++ /dev/null |
| 3310 |
@@ -1,10 +0,0 @@ |
| 3311 |
---- include/unistd.h 2010/12/20 20:39:49 216602 |
| 3312 |
-+++ include/unistd.h 2010/12/20 21:12:18 216603 |
| 3313 |
-@@ -529,6 +529,7 @@ |
| 3314 |
- #define _MKTEMP_DECLARED |
| 3315 |
- #endif |
| 3316 |
- int nfssvc(int, void *); |
| 3317 |
-+int nlm_syscall(int, int, int, char **); |
| 3318 |
- int profil(char *, size_t, vm_offset_t, int); |
| 3319 |
- int rcmd(char **, int, const char *, const char *, const char *, int *); |
| 3320 |
- int rcmd_af(char **, int, const char *, |
| 3321 |
|
| 3322 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch |
| 3323 |
deleted file mode 100644 |
| 3324 |
index cf1172a..0000000 |
| 3325 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch |
| 3326 |
+++ /dev/null |
| 3327 |
@@ -1,12 +0,0 @@ |
| 3328 |
-diff -Nur lib.orig/libsdp/Makefile lib/libsdp/Makefile |
| 3329 |
---- lib.orig/libsdp/Makefile 2012-12-25 20:28:50.000000000 +0900 |
| 3330 |
-+++ lib/libsdp/Makefile 2012-12-25 20:31:19.000000000 +0900 |
| 3331 |
-@@ -5,7 +5,7 @@ |
| 3332 |
- MAN= sdp.3 |
| 3333 |
- |
| 3334 |
- WARNS?= 2 |
| 3335 |
--CFLAGS+= -I${.CURDIR} |
| 3336 |
-+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libbluetooth |
| 3337 |
- |
| 3338 |
- SHLIB_MAJOR= 4 |
| 3339 |
- |
| 3340 |
|
| 3341 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch |
| 3342 |
deleted file mode 100644 |
| 3343 |
index ad9b960..0000000 |
| 3344 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch |
| 3345 |
+++ /dev/null |
| 3346 |
@@ -1,215 +0,0 @@ |
| 3347 |
-Index: lib/libc/gen/glob.c |
| 3348 |
-=================================================================== |
| 3349 |
---- lib/libc/gen/glob.c (revision 246357) |
| 3350 |
-+++ lib/libc/gen/glob.c (working copy) |
| 3351 |
-@@ -94,6 +94,25 @@ __FBSDID("$FreeBSD$"); |
| 3352 |
- |
| 3353 |
- #include "collate.h" |
| 3354 |
- |
| 3355 |
-+/* |
| 3356 |
-+ * glob(3) expansion limits. Stop the expansion if any of these limits |
| 3357 |
-+ * is reached. This caps the runtime in the face of DoS attacks. See |
| 3358 |
-+ * also CVE-2010-2632 |
| 3359 |
-+ */ |
| 3360 |
-+#define GLOB_LIMIT_BRACE 128 /* number of brace calls */ |
| 3361 |
-+#define GLOB_LIMIT_PATH 65536 /* number of path elements */ |
| 3362 |
-+#define GLOB_LIMIT_READDIR 16384 /* number of readdirs */ |
| 3363 |
-+#define GLOB_LIMIT_STAT 1024 /* number of stat system calls */ |
| 3364 |
-+#define GLOB_LIMIT_STRING ARG_MAX /* maximum total size for paths */ |
| 3365 |
-+ |
| 3366 |
-+struct glob_limit { |
| 3367 |
-+ size_t l_brace_cnt; |
| 3368 |
-+ size_t l_path_lim; |
| 3369 |
-+ size_t l_readdir_cnt; |
| 3370 |
-+ size_t l_stat_cnt; |
| 3371 |
-+ size_t l_string_cnt; |
| 3372 |
-+}; |
| 3373 |
-+ |
| 3374 |
- #define DOLLAR '$' |
| 3375 |
- #define DOT '.' |
| 3376 |
- #define EOS '\0' |
| 3377 |
-@@ -153,15 +172,18 @@ static const Char *g_strchr(const Char *, wchar_t) |
| 3378 |
- static Char *g_strcat(Char *, const Char *); |
| 3379 |
- #endif |
| 3380 |
- static int g_stat(Char *, struct stat *, glob_t *); |
| 3381 |
--static int glob0(const Char *, glob_t *, size_t *); |
| 3382 |
--static int glob1(Char *, glob_t *, size_t *); |
| 3383 |
--static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *); |
| 3384 |
--static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *); |
| 3385 |
--static int globextend(const Char *, glob_t *, size_t *); |
| 3386 |
--static const Char * |
| 3387 |
-+static int glob0(const Char *, glob_t *, struct glob_limit *); |
| 3388 |
-+static int glob1(Char *, glob_t *, struct glob_limit *); |
| 3389 |
-+static int glob2(Char *, Char *, Char *, Char *, glob_t *, |
| 3390 |
-+ struct glob_limit *); |
| 3391 |
-+static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, |
| 3392 |
-+ struct glob_limit *); |
| 3393 |
-+static int globextend(const Char *, glob_t *, struct glob_limit *); |
| 3394 |
-+static const Char * |
| 3395 |
- globtilde(const Char *, Char *, size_t, glob_t *); |
| 3396 |
--static int globexp1(const Char *, glob_t *, size_t *); |
| 3397 |
--static int globexp2(const Char *, const Char *, glob_t *, int *, size_t *); |
| 3398 |
-+static int globexp1(const Char *, glob_t *, struct glob_limit *); |
| 3399 |
-+static int globexp2(const Char *, const Char *, glob_t *, int *, |
| 3400 |
-+ struct glob_limit *); |
| 3401 |
- static int match(Char *, Char *, Char *); |
| 3402 |
- #ifdef DEBUG |
| 3403 |
- static void qprintf(const char *, Char *); |
| 3404 |
-@@ -171,8 +193,8 @@ int |
| 3405 |
- glob(const char * __restrict pattern, int flags, |
| 3406 |
- int (*errfunc)(const char *, int), glob_t * __restrict pglob) |
| 3407 |
- { |
| 3408 |
-+ struct glob_limit limit = { 0, 0, 0, 0, 0 }; |
| 3409 |
- const char *patnext; |
| 3410 |
-- size_t limit; |
| 3411 |
- Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot; |
| 3412 |
- mbstate_t mbs; |
| 3413 |
- wchar_t wc; |
| 3414 |
-@@ -186,11 +208,10 @@ glob(const char * __restrict pattern, int flags, |
| 3415 |
- pglob->gl_offs = 0; |
| 3416 |
- } |
| 3417 |
- if (flags & GLOB_LIMIT) { |
| 3418 |
-- limit = pglob->gl_matchc; |
| 3419 |
-- if (limit == 0) |
| 3420 |
-- limit = ARG_MAX; |
| 3421 |
-- } else |
| 3422 |
-- limit = 0; |
| 3423 |
-+ limit.l_path_lim = pglob->gl_matchc; |
| 3424 |
-+ if (limit.l_path_lim == 0) |
| 3425 |
-+ limit.l_path_lim = GLOB_LIMIT_PATH; |
| 3426 |
-+ } |
| 3427 |
- pglob->gl_flags = flags & ~GLOB_MAGCHAR; |
| 3428 |
- pglob->gl_errfunc = errfunc; |
| 3429 |
- pglob->gl_matchc = 0; |
| 3430 |
-@@ -243,11 +264,17 @@ glob(const char * __restrict pattern, int flags, |
| 3431 |
- * characters |
| 3432 |
- */ |
| 3433 |
- static int |
| 3434 |
--globexp1(const Char *pattern, glob_t *pglob, size_t *limit) |
| 3435 |
-+globexp1(const Char *pattern, glob_t *pglob, struct glob_limit *limit) |
| 3436 |
- { |
| 3437 |
- const Char* ptr = pattern; |
| 3438 |
- int rv; |
| 3439 |
- |
| 3440 |
-+ if ((pglob->gl_flags & GLOB_LIMIT) && |
| 3441 |
-+ limit->l_brace_cnt++ >= GLOB_LIMIT_BRACE) { |
| 3442 |
-+ errno = 0; |
| 3443 |
-+ return (GLOB_NOSPACE); |
| 3444 |
-+ } |
| 3445 |
-+ |
| 3446 |
- /* Protect a single {}, for find(1), like csh */ |
| 3447 |
- if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS) |
| 3448 |
- return glob0(pattern, pglob, limit); |
| 3449 |
-@@ -266,7 +293,8 @@ static int |
| 3450 |
- * If it fails then it tries to glob the rest of the pattern and returns. |
| 3451 |
- */ |
| 3452 |
- static int |
| 3453 |
--globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, size_t *limit) |
| 3454 |
-+globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, |
| 3455 |
-+ struct glob_limit *limit) |
| 3456 |
- { |
| 3457 |
- int i; |
| 3458 |
- Char *lm, *ls; |
| 3459 |
-@@ -436,7 +464,7 @@ globtilde(const Char *pattern, Char *patbuf, size_ |
| 3460 |
- * if things went well, nonzero if errors occurred. |
| 3461 |
- */ |
| 3462 |
- static int |
| 3463 |
--glob0(const Char *pattern, glob_t *pglob, size_t *limit) |
| 3464 |
-+glob0(const Char *pattern, glob_t *pglob, struct glob_limit *limit) |
| 3465 |
- { |
| 3466 |
- const Char *qpatnext; |
| 3467 |
- int err; |
| 3468 |
-@@ -529,7 +557,7 @@ compare(const void *p, const void *q) |
| 3469 |
- } |
| 3470 |
- |
| 3471 |
- static int |
| 3472 |
--glob1(Char *pattern, glob_t *pglob, size_t *limit) |
| 3473 |
-+glob1(Char *pattern, glob_t *pglob, struct glob_limit *limit) |
| 3474 |
- { |
| 3475 |
- Char pathbuf[MAXPATHLEN]; |
| 3476 |
- |
| 3477 |
-@@ -547,7 +575,7 @@ static int |
| 3478 |
- */ |
| 3479 |
- static int |
| 3480 |
- glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern, |
| 3481 |
-- glob_t *pglob, size_t *limit) |
| 3482 |
-+ glob_t *pglob, struct glob_limit *limit) |
| 3483 |
- { |
| 3484 |
- struct stat sb; |
| 3485 |
- Char *p, *q; |
| 3486 |
-@@ -563,6 +591,15 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_ |
| 3487 |
- if (g_lstat(pathbuf, &sb, pglob)) |
| 3488 |
- return(0); |
| 3489 |
- |
| 3490 |
-+ if ((pglob->gl_flags & GLOB_LIMIT) && |
| 3491 |
-+ limit->l_stat_cnt++ >= GLOB_LIMIT_STAT) { |
| 3492 |
-+ errno = 0; |
| 3493 |
-+ if (pathend + 1 > pathend_last) |
| 3494 |
-+ return (GLOB_ABORTED); |
| 3495 |
-+ *pathend++ = SEP; |
| 3496 |
-+ *pathend = EOS; |
| 3497 |
-+ return (GLOB_NOSPACE); |
| 3498 |
-+ } |
| 3499 |
- if (((pglob->gl_flags & GLOB_MARK) && |
| 3500 |
- pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) |
| 3501 |
- || (S_ISLNK(sb.st_mode) && |
| 3502 |
-@@ -606,7 +643,7 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_ |
| 3503 |
- static int |
| 3504 |
- glob3(Char *pathbuf, Char *pathend, Char *pathend_last, |
| 3505 |
- Char *pattern, Char *restpattern, |
| 3506 |
-- glob_t *pglob, size_t *limit) |
| 3507 |
-+ glob_t *pglob, struct glob_limit *limit) |
| 3508 |
- { |
| 3509 |
- struct dirent *dp; |
| 3510 |
- DIR *dirp; |
| 3511 |
-@@ -652,6 +689,19 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_ |
| 3512 |
- size_t clen; |
| 3513 |
- mbstate_t mbs; |
| 3514 |
- |
| 3515 |
-+ if ((pglob->gl_flags & GLOB_LIMIT) && |
| 3516 |
-+ limit->l_readdir_cnt++ >= GLOB_LIMIT_READDIR) { |
| 3517 |
-+ errno = 0; |
| 3518 |
-+ if (pathend + 1 > pathend_last) |
| 3519 |
-+ err = GLOB_ABORTED; |
| 3520 |
-+ else { |
| 3521 |
-+ *pathend++ = SEP; |
| 3522 |
-+ *pathend = EOS; |
| 3523 |
-+ err = GLOB_NOSPACE; |
| 3524 |
-+ } |
| 3525 |
-+ break; |
| 3526 |
-+ } |
| 3527 |
-+ |
| 3528 |
- /* Initial DOT must be matched literally. */ |
| 3529 |
- if (dp->d_name[0] == DOT && *pattern != DOT) |
| 3530 |
- continue; |
| 3531 |
-@@ -702,14 +752,15 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_ |
| 3532 |
- * gl_pathv points to (gl_offs + gl_pathc + 1) items. |
| 3533 |
- */ |
| 3534 |
- static int |
| 3535 |
--globextend(const Char *path, glob_t *pglob, size_t *limit) |
| 3536 |
-+globextend(const Char *path, glob_t *pglob, struct glob_limit *limit) |
| 3537 |
- { |
| 3538 |
- char **pathv; |
| 3539 |
- size_t i, newsize, len; |
| 3540 |
- char *copy; |
| 3541 |
- const Char *p; |
| 3542 |
- |
| 3543 |
-- if (*limit && pglob->gl_pathc > *limit) { |
| 3544 |
-+ if ((pglob->gl_flags & GLOB_LIMIT) && |
| 3545 |
-+ pglob->gl_matchc > limit->l_path_lim) { |
| 3546 |
- errno = 0; |
| 3547 |
- return (GLOB_NOSPACE); |
| 3548 |
- } |
| 3549 |
-@@ -737,6 +788,12 @@ static int |
| 3550 |
- for (p = path; *p++;) |
| 3551 |
- continue; |
| 3552 |
- len = MB_CUR_MAX * (size_t)(p - path); /* XXX overallocation */ |
| 3553 |
-+ limit->l_string_cnt += len; |
| 3554 |
-+ if ((pglob->gl_flags & GLOB_LIMIT) && |
| 3555 |
-+ limit->l_string_cnt >= GLOB_LIMIT_STRING) { |
| 3556 |
-+ errno = 0; |
| 3557 |
-+ return (GLOB_NOSPACE); |
| 3558 |
-+ } |
| 3559 |
- if ((copy = malloc(len)) != NULL) { |
| 3560 |
- if (g_Ctoc(path, copy, len)) { |
| 3561 |
- free(copy); |
| 3562 |
|
| 3563 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch |
| 3564 |
deleted file mode 100644 |
| 3565 |
index f8e4707..0000000 |
| 3566 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch |
| 3567 |
+++ /dev/null |
| 3568 |
@@ -1,21 +0,0 @@ |
| 3569 |
-diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile |
| 3570 |
---- lib.ol/libproc/Makefile 2011-11-02 14:02:17.000000000 +0000 |
| 3571 |
-+++ lib/libproc/Makefile 2011-11-02 14:03:09.000000000 +0000 |
| 3572 |
-@@ -16,5 +16,6 @@ |
| 3573 |
- SHLIB_MAJOR= 2 |
| 3574 |
- |
| 3575 |
- WITHOUT_MAN= |
| 3576 |
-+LDADD+=-lelf |
| 3577 |
- |
| 3578 |
- .include <bsd.lib.mk> |
| 3579 |
-diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile |
| 3580 |
---- lib.ol/librtld_db/Makefile 2011-11-02 14:02:13.000000000 +0000 |
| 3581 |
-+++ lib/librtld_db/Makefile 2011-11-02 14:04:00.000000000 +0000 |
| 3582 |
-@@ -10,5 +10,7 @@ |
| 3583 |
- INCS= rtld_db.h |
| 3584 |
- |
| 3585 |
- CFLAGS+= -I${.CURDIR} |
| 3586 |
-+LDADD+=-lutil -lproc |
| 3587 |
-+LDFLAGS+=-L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc |
| 3588 |
- |
| 3589 |
- .include <bsd.lib.mk> |
| 3590 |
|
| 3591 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch |
| 3592 |
deleted file mode 100644 |
| 3593 |
index c1c2a0e..0000000 |
| 3594 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch |
| 3595 |
+++ /dev/null |
| 3596 |
@@ -1,11 +0,0 @@ |
| 3597 |
-diff -Nur lib.orig/libncp/Makefile lib/libncp/Makefile |
| 3598 |
---- lib.orig/libncp/Makefile 2012-12-25 20:35:16.000000000 +0900 |
| 3599 |
-+++ lib/libncp/Makefile 2012-12-25 20:36:23.000000000 +0900 |
| 3600 |
-@@ -6,6 +6,7 @@ |
| 3601 |
- |
| 3602 |
- DPADD= ${LIBIPX} |
| 3603 |
- LDADD= -lipx |
| 3604 |
-+LDFLAGS+=-L${.OBJDIR}/../libipx |
| 3605 |
- |
| 3606 |
- SRCS= ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \ |
| 3607 |
- ncpl_net.c ncpl_rcfile.c ncpl_conn.c ncpl_nls.c ncpl_msg.c \ |
| 3608 |
|
| 3609 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch |
| 3610 |
deleted file mode 100644 |
| 3611 |
index bf77a0a..0000000 |
| 3612 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch |
| 3613 |
+++ /dev/null |
| 3614 |
@@ -1,122 +0,0 @@ |
| 3615 |
-Fixes warnings like: |
| 3616 |
-/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5: |
| 3617 |
-warning: incompatible implicit declaration of built-in function ‘strcpy’ |
| 3618 |
- |
| 3619 |
-diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c |
| 3620 |
---- contrib.old/opie/libopie/accessfile.c 2012-05-25 08:54:33.000000000 -0400 |
| 3621 |
-+++ contrib/opie/libopie/accessfile.c 2012-05-25 09:12:34.000000000 -0400 |
| 3622 |
-@@ -46,6 +46,7 @@ |
| 3623 |
- #ifdef DEBUG |
| 3624 |
- #include <syslog.h> |
| 3625 |
- #endif /* DEBUG */ |
| 3626 |
-+#include <ctype.h> |
| 3627 |
- |
| 3628 |
- #include "opie.h" |
| 3629 |
- |
| 3630 |
-diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c |
| 3631 |
---- contrib.old/opie/libopie/generator.c 2012-05-25 08:54:33.000000000 -0400 |
| 3632 |
-+++ contrib/opie/libopie/generator.c 2012-05-25 08:58:10.000000000 -0400 |
| 3633 |
-@@ -50,6 +50,7 @@ |
| 3634 |
- #include <syslog.h> |
| 3635 |
- #endif /* DEBUG */ |
| 3636 |
- #include "opie.h" |
| 3637 |
-+#include <stdio.h> |
| 3638 |
- |
| 3639 |
- static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" }; |
| 3640 |
- |
| 3641 |
-diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c |
| 3642 |
---- contrib.old/opie/libopie/lookup.c 2012-05-25 08:54:33.000000000 -0400 |
| 3643 |
-+++ contrib/opie/libopie/lookup.c 2012-05-25 09:15:08.000000000 -0400 |
| 3644 |
-@@ -14,6 +14,7 @@ |
| 3645 |
- #include "opie_cfg.h" |
| 3646 |
- #include <stdio.h> |
| 3647 |
- #include "opie.h" |
| 3648 |
-+#include <string.h> |
| 3649 |
- |
| 3650 |
- int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal) |
| 3651 |
- { |
| 3652 |
-diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c |
| 3653 |
---- contrib.old/opie/libopie/newseed.c 2012-05-25 08:54:33.000000000 -0400 |
| 3654 |
-+++ contrib/opie/libopie/newseed.c 2012-05-25 09:14:37.000000000 -0400 |
| 3655 |
-@@ -36,6 +36,9 @@ |
| 3656 |
- #include <syslog.h> |
| 3657 |
- #endif /* DEBUG */ |
| 3658 |
- #include "opie.h" |
| 3659 |
-+#include <stdio.h> |
| 3660 |
-+#include <stdlib.h> |
| 3661 |
-+#include <time.h> |
| 3662 |
- |
| 3663 |
- int opienewseed FUNCTION((seed), char *seed) |
| 3664 |
- { |
| 3665 |
-diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c |
| 3666 |
---- contrib.old/opie/libopie/parsechallenge.c 2012-05-25 08:54:33.000000000 -0400 |
| 3667 |
-+++ contrib/opie/libopie/parsechallenge.c 2012-05-25 09:15:54.000000000 -0400 |
| 3668 |
-@@ -20,6 +20,8 @@ |
| 3669 |
- #include <string.h> |
| 3670 |
- #endif /* HAVE_STRING_H */ |
| 3671 |
- #include "opie.h" |
| 3672 |
-+#include <stdlib.h> |
| 3673 |
-+#include <ctype.h> |
| 3674 |
- |
| 3675 |
- struct algorithm { |
| 3676 |
- char *name; |
| 3677 |
-diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c |
| 3678 |
---- contrib.old/opie/libopie/passwd.c 2012-05-25 08:54:33.000000000 -0400 |
| 3679 |
-+++ contrib/opie/libopie/passwd.c 2012-05-25 09:13:45.000000000 -0400 |
| 3680 |
-@@ -22,6 +22,7 @@ |
| 3681 |
- |
| 3682 |
- #include "opie_cfg.h" |
| 3683 |
- #include "opie.h" |
| 3684 |
-+#include <string.h> |
| 3685 |
- |
| 3686 |
- int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks) |
| 3687 |
- { |
| 3688 |
-diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c |
| 3689 |
---- contrib.old/opie/libopie/randomchallenge.c 2012-05-25 08:54:33.000000000 -0400 |
| 3690 |
-+++ contrib/opie/libopie/randomchallenge.c 2012-05-25 09:00:27.000000000 -0400 |
| 3691 |
-@@ -28,6 +28,9 @@ |
| 3692 |
- |
| 3693 |
- #include "opie_cfg.h" |
| 3694 |
- #include "opie.h" |
| 3695 |
-+#include <stdio.h> |
| 3696 |
-+#include <string.h> |
| 3697 |
-+#include <stdlib.h> |
| 3698 |
- |
| 3699 |
- static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" }; |
| 3700 |
- |
| 3701 |
-diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c |
| 3702 |
---- contrib.old/opie/libopie/verify.c 2012-05-25 08:54:33.000000000 -0400 |
| 3703 |
-+++ contrib/opie/libopie/verify.c 2012-05-25 09:12:09.000000000 -0400 |
| 3704 |
-@@ -25,6 +25,7 @@ |
| 3705 |
- #include <string.h> |
| 3706 |
- #endif /* HAVE_STRING_H */ |
| 3707 |
- #include "opie.h" |
| 3708 |
-+#include <ctype.h> |
| 3709 |
- |
| 3710 |
- #define RESPONSE_STANDARD 0 |
| 3711 |
- #define RESPONSE_WORD 1 |
| 3712 |
-diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c |
| 3713 |
---- contrib.old/opie/libopie/version.c 2012-05-25 08:54:33.000000000 -0400 |
| 3714 |
-+++ contrib/opie/libopie/version.c 2012-05-25 09:13:15.000000000 -0400 |
| 3715 |
-@@ -19,6 +19,8 @@ |
| 3716 |
- */ |
| 3717 |
- #include "opie_cfg.h" |
| 3718 |
- #include "opie.h" |
| 3719 |
-+#include <stdio.h> |
| 3720 |
-+#include <stdlib.h> |
| 3721 |
- |
| 3722 |
- VOIDRET opieversion FUNCTION_NOARGS |
| 3723 |
- { |
| 3724 |
-diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h |
| 3725 |
---- contrib.old/opie/opie.h 2012-05-25 08:54:33.000000000 -0400 |
| 3726 |
-+++ contrib/opie/opie.h 2012-05-25 09:21:28.000000000 -0400 |
| 3727 |
-@@ -158,6 +158,9 @@ |
| 3728 |
- int __opiereadrec __P((struct opie *)); |
| 3729 |
- int __opiewriterec __P((struct opie *)); |
| 3730 |
- int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts)); |
| 3731 |
-+VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n); |
| 3732 |
-+int opieinsecure FUNCTION_NOARGS; |
| 3733 |
-+int opienewseed FUNCTION((seed), char *seed); |
| 3734 |
- __END_DECLS |
| 3735 |
- |
| 3736 |
- #define opiestrncpy(dst, src, n) \ |
| 3737 |
|
| 3738 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch |
| 3739 |
deleted file mode 100644 |
| 3740 |
index fdb7e16..0000000 |
| 3741 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch |
| 3742 |
+++ /dev/null |
| 3743 |
@@ -1,17 +0,0 @@ |
| 3744 |
-Fix "no .eh_frame_hdr table will be created" error. |
| 3745 |
- |
| 3746 |
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47829 |
| 3747 |
-http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4a0e0cd7377c45dc21d5c71bcab931b5e5727e74 |
| 3748 |
- |
| 3749 |
-diff -Nur lib.orig/csu/i386-elf/Makefile lib/csu/i386-elf/Makefile |
| 3750 |
---- lib.orig/csu/i386-elf/Makefile 2013-03-06 01:07:57.000000000 +0900 |
| 3751 |
-+++ lib/csu/i386-elf/Makefile 2013-03-06 01:10:09.000000000 +0900 |
| 3752 |
-@@ -10,6 +10,8 @@ |
| 3753 |
- FILESDIR= ${LIBDIR} |
| 3754 |
- CFLAGS+= -I${.CURDIR}/../common \ |
| 3755 |
- -I${.CURDIR}/../../libc/include |
| 3756 |
-+CFLAGS+= -fno-omit-frame-pointer |
| 3757 |
-+CFLAGS+= -fno-asynchronous-unwind-tables |
| 3758 |
- CLEANFILES= ${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o |
| 3759 |
- CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s |
| 3760 |
- |
| 3761 |
|
| 3762 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch |
| 3763 |
deleted file mode 100644 |
| 3764 |
index 97ac141..0000000 |
| 3765 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch |
| 3766 |
+++ /dev/null |
| 3767 |
@@ -1,51 +0,0 @@ |
| 3768 |
-Backport aligned_alloc for C++11 support. |
| 3769 |
- |
| 3770 |
-http://lists.freebsd.org/pipermail/svn-src-stable-9/2012-November/003313.html |
| 3771 |
- |
| 3772 |
-diff -uNr lib.old/libc/stdlib/Symbol.map lib/libc/stdlib/Symbol.map |
| 3773 |
---- lib.old/libc/stdlib/Symbol.map 2013-05-24 17:03:55.000000000 -0400 |
| 3774 |
-+++ lib/libc/stdlib/Symbol.map 2013-05-24 17:06:03.000000000 -0400 |
| 3775 |
-@@ -97,6 +97,7 @@ |
| 3776 |
- atoi_l; |
| 3777 |
- atol_l; |
| 3778 |
- atoll_l; |
| 3779 |
-+ aligned_alloc; |
| 3780 |
- at_quick_exit; |
| 3781 |
- quick_exit; |
| 3782 |
- strtod_l; |
| 3783 |
-diff -uNr lib.old/libc/stdlib/malloc.c lib/libc/stdlib/malloc.c |
| 3784 |
---- lib.old/libc/stdlib/malloc.c 2013-05-24 17:03:55.000000000 -0400 |
| 3785 |
-+++ lib/libc/stdlib/malloc.c 2013-05-24 17:05:40.000000000 -0400 |
| 3786 |
-@@ -6046,6 +6046,21 @@ |
| 3787 |
- } |
| 3788 |
- |
| 3789 |
- void * |
| 3790 |
-+aligned_alloc(size_t alignment, size_t size) |
| 3791 |
-+{ |
| 3792 |
-+ void *memptr; |
| 3793 |
-+ int ret; |
| 3794 |
-+ |
| 3795 |
-+ ret = posix_memalign(&memptr, alignment, size); |
| 3796 |
-+ if (ret != 0) { |
| 3797 |
-+ errno = ret; |
| 3798 |
-+ return (NULL); |
| 3799 |
-+ } |
| 3800 |
-+ return (memptr); |
| 3801 |
-+} |
| 3802 |
-+ |
| 3803 |
-+ |
| 3804 |
-+void * |
| 3805 |
- calloc(size_t num, size_t size) |
| 3806 |
- { |
| 3807 |
- void *ret; |
| 3808 |
-diff -uNr includeold/stdlib.h include/stdlib.h |
| 3809 |
---- includeold/stdlib.h 2013-05-24 17:03:46.000000000 -0400 |
| 3810 |
-+++ include/stdlib.h 2013-05-24 17:04:46.000000000 -0400 |
| 3811 |
-@@ -155,6 +155,7 @@ |
| 3812 |
- * If we're in a mode greater than C99, expose C1x functions. |
| 3813 |
- */ |
| 3814 |
- #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L |
| 3815 |
-+void * aligned_alloc(size_t, size_t); |
| 3816 |
- _Noreturn void |
| 3817 |
- quick_exit(int); |
| 3818 |
- int at_quick_exit(void (*)(void)); |
| 3819 |
|
| 3820 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch |
| 3821 |
deleted file mode 100644 |
| 3822 |
index 62357e0..0000000 |
| 3823 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch |
| 3824 |
+++ /dev/null |
| 3825 |
@@ -1,16 +0,0 @@ |
| 3826 |
---- include/Makefile.orig 2013-06-16 10:47:52.000000000 +0200 |
| 3827 |
-+++ include/Makefile 2013-06-16 10:47:37.000000000 +0200 |
| 3828 |
-@@ -6,11 +6,11 @@ |
| 3829 |
- .include <bsd.own.mk> |
| 3830 |
- |
| 3831 |
- CLEANFILES= osreldate.h version vers.c |
| 3832 |
-+SUBDIR= arpa protocols rpcsvc rpc xlocale |
| 3833 |
--SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale |
| 3834 |
- INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ |
| 3835 |
- db.h \ |
| 3836 |
- dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ |
| 3837 |
-+ fts.h ftw.h getopt.h glob.h grp.h \ |
| 3838 |
-- fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ |
| 3839 |
- ieeefp.h ifaddrs.h \ |
| 3840 |
- inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ |
| 3841 |
- locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \ |
| 3842 |
|
| 3843 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch |
| 3844 |
deleted file mode 100644 |
| 3845 |
index 00b39f7..0000000 |
| 3846 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch |
| 3847 |
+++ /dev/null |
| 3848 |
@@ -1,30 +0,0 @@ |
| 3849 |
-Please do not disable this patch. |
| 3850 |
-All commands will be non-executable. |
| 3851 |
-Abort trap: 6 (core dumped) is displayed... |
| 3852 |
- |
| 3853 |
-Details see Gentoo Bug #511698. |
| 3854 |
-https://bugs.gentoo.org/show_bug.cgi?id=511698 |
| 3855 |
- |
| 3856 |
-diff --git a/lib/libc/Makefile b/lib/libc/Makefile |
| 3857 |
-index 1cc23b7..7dd458e 100644 |
| 3858 |
---- a/lib/libc/Makefile |
| 3859 |
-+++ b/lib/libc/Makefile |
| 3860 |
-@@ -149,6 +149,6 @@ CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/} |
| 3861 |
- # in the future to circumvent this. |
| 3862 |
- SSP_CFLAGS:= ${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/} |
| 3863 |
- # Disable stack protection for SSP symbols. |
| 3864 |
--SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/} |
| 3865 |
-+SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/:C/^$/-fno-stack-protector/} |
| 3866 |
- # Generate stack unwinding tables for cancellation points |
| 3867 |
- CANCELPOINTS_CFLAGS:= ${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//} |
| 3868 |
-diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc |
| 3869 |
-index f92d87d..7a3a2f3 100644 |
| 3870 |
---- a/lib/csu/Makefile.inc |
| 3871 |
-+++ b/lib/csu/Makefile.inc |
| 3872 |
-@@ -1,5 +1,5 @@ |
| 3873 |
- # $FreeBSD: release/9.1.0/lib/csu/Makefile.inc 204757 2010-03-05 13:29:05Z uqs $ |
| 3874 |
- |
| 3875 |
--SSP_CFLAGS= |
| 3876 |
-+SSP_CFLAGS= -fno-stack-protector |
| 3877 |
- |
| 3878 |
- .include "../Makefile.inc" |
| 3879 |
|
| 3880 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch |
| 3881 |
deleted file mode 100644 |
| 3882 |
index ec90def..0000000 |
| 3883 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch |
| 3884 |
+++ /dev/null |
| 3885 |
@@ -1,13 +0,0 @@ |
| 3886 |
-diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile |
| 3887 |
---- lib/libgeom/Makefile 2004-03-07 16:07:57 +0000 |
| 3888 |
-+++ lib.xml/libgeom/Makefile 2005-05-06 10:38:41 +0000 |
| 3889 |
-@@ -8,7 +8,8 @@ |
| 3890 |
- SRCS+= geom_ctl.c |
| 3891 |
- INCS= libgeom.h |
| 3892 |
- |
| 3893 |
--CFLAGS += -I${.CURDIR} |
| 3894 |
-+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat |
| 3895 |
-+LDFLAGS += -L${.CURDIR}/../libexpat |
| 3896 |
- |
| 3897 |
- WARNS?= 3 |
| 3898 |
- |
| 3899 |
|
| 3900 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch |
| 3901 |
deleted file mode 100644 |
| 3902 |
index 1b4e791..0000000 |
| 3903 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch |
| 3904 |
+++ /dev/null |
| 3905 |
@@ -1,26 +0,0 @@ |
| 3906 |
-diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile |
| 3907 |
---- lib/libgeom.old/Makefile 2011-07-10 14:23:51.000000000 +0000 |
| 3908 |
-+++ lib/libgeom/Makefile 2011-07-10 15:12:39.000000000 +0000 |
| 3909 |
-@@ -13,8 +13,8 @@ |
| 3910 |
- |
| 3911 |
- WARNS?= 3 |
| 3912 |
- |
| 3913 |
--DPADD= ${LIBBSDXML} ${LIBSBUF} |
| 3914 |
--LDADD= -lbsdxml -lsbuf |
| 3915 |
-+DPADD= ${LIBSBUF} |
| 3916 |
-+LDADD= -lexpat -lsbuf |
| 3917 |
- |
| 3918 |
- MAN= libgeom.3 |
| 3919 |
- |
| 3920 |
-diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c |
| 3921 |
---- lib/libgeom.old/geom_xml2tree.c 2010-12-21 17:09:25.000000000 +0000 |
| 3922 |
-+++ lib/libgeom/geom_xml2tree.c 2011-07-10 15:12:52.000000000 +0000 |
| 3923 |
-@@ -43,7 +43,7 @@ |
| 3924 |
- #include <sys/sbuf.h> |
| 3925 |
- #include <sys/sysctl.h> |
| 3926 |
- #include <err.h> |
| 3927 |
--#include <bsdxml.h> |
| 3928 |
-+#include <expat.h> |
| 3929 |
- #include <libgeom.h> |
| 3930 |
- |
| 3931 |
- struct mystate { |
| 3932 |
|
| 3933 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch |
| 3934 |
deleted file mode 100644 |
| 3935 |
index c2cf142..0000000 |
| 3936 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch |
| 3937 |
+++ /dev/null |
| 3938 |
@@ -1,13 +0,0 @@ |
| 3939 |
-Fix headers dependencies so that they can be included alone. |
| 3940 |
- |
| 3941 |
---- include/ifaddrs.h.old 2009-05-15 13:50:10 +0000 |
| 3942 |
-+++ include/ifaddrs.h 2009-05-15 13:50:23 +0000 |
| 3943 |
-@@ -28,6 +28,8 @@ |
| 3944 |
- #ifndef _IFADDRS_H_ |
| 3945 |
- #define _IFADDRS_H_ |
| 3946 |
- |
| 3947 |
-+#include <sys/types.h> |
| 3948 |
-+ |
| 3949 |
- struct ifaddrs { |
| 3950 |
- struct ifaddrs *ifa_next; |
| 3951 |
- char *ifa_name; |
| 3952 |
|
| 3953 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch |
| 3954 |
deleted file mode 100644 |
| 3955 |
index c9288a4..0000000 |
| 3956 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch |
| 3957 |
+++ /dev/null |
| 3958 |
@@ -1,68 +0,0 @@ |
| 3959 |
---- lib/msun/i387/fenv.c.orig 2007-01-05 04:15:26 -0300 |
| 3960 |
-+++ lib/msun/i387/fenv.c 2008-06-14 00:49:30 -0300 |
| 3961 |
-@@ -152,7 +152,8 @@ |
| 3962 |
- int |
| 3963 |
- feupdateenv(const fenv_t *envp) |
| 3964 |
- { |
| 3965 |
-- int mxcsr, status; |
| 3966 |
-+ int mxcsr; |
| 3967 |
-+ short status; |
| 3968 |
- |
| 3969 |
- __fnstsw(&status); |
| 3970 |
- if (__HAS_SSE()) |
| 3971 |
---- lib/msun/i387/fenv.h.orig 2007-01-06 18:46:23 -0300 |
| 3972 |
-+++ lib/msun/i387/fenv.h 2008-06-14 01:06:40 -0300 |
| 3973 |
-@@ -134,7 +134,8 @@ |
| 3974 |
- static __inline int |
| 3975 |
- fegetexceptflag(fexcept_t *__flagp, int __excepts) |
| 3976 |
- { |
| 3977 |
-- int __mxcsr, __status; |
| 3978 |
-+ int __mxcsr; |
| 3979 |
-+ short __status; |
| 3980 |
- |
| 3981 |
- __fnstsw(&__status); |
| 3982 |
- if (__HAS_SSE()) |
| 3983 |
-@@ -151,7 +152,8 @@ |
| 3984 |
- static __inline int |
| 3985 |
- fetestexcept(int __excepts) |
| 3986 |
- { |
| 3987 |
-- int __mxcsr, __status; |
| 3988 |
-+ int __mxcsr; |
| 3989 |
-+ short __status; |
| 3990 |
- |
| 3991 |
- __fnstsw(&__status); |
| 3992 |
- if (__HAS_SSE()) |
| 3993 |
---- lib/msun/amd64/fenv.c.orig 2007-01-05 04:15:26 -0300 |
| 3994 |
-+++ lib/msun/amd64/fenv.c 2008-06-14 01:02:41 -0300 |
| 3995 |
-@@ -101,7 +101,8 @@ |
| 3996 |
- int |
| 3997 |
- feupdateenv(const fenv_t *envp) |
| 3998 |
- { |
| 3999 |
-- int mxcsr, status; |
| 4000 |
-+ int mxcsr; |
| 4001 |
-+ short status; |
| 4002 |
- |
| 4003 |
- __fnstsw(&status); |
| 4004 |
- __stmxcsr(&mxcsr); |
| 4005 |
---- lib/msun/amd64/fenv.h.orig 2007-01-06 18:46:23 -0300 |
| 4006 |
-+++ lib/msun/amd64/fenv.h 2008-06-14 01:08:23 -0300 |
| 4007 |
-@@ -110,7 +110,8 @@ |
| 4008 |
- static __inline int |
| 4009 |
- fegetexceptflag(fexcept_t *__flagp, int __excepts) |
| 4010 |
- { |
| 4011 |
-- int __mxcsr, __status; |
| 4012 |
-+ int __mxcsr; |
| 4013 |
-+ short __status; |
| 4014 |
- |
| 4015 |
- __stmxcsr(&__mxcsr); |
| 4016 |
- __fnstsw(&__status); |
| 4017 |
-@@ -124,7 +125,8 @@ |
| 4018 |
- static __inline int |
| 4019 |
- fetestexcept(int __excepts) |
| 4020 |
- { |
| 4021 |
-- int __mxcsr, __status; |
| 4022 |
-+ int __mxcsr; |
| 4023 |
-+ short __status; |
| 4024 |
- |
| 4025 |
- __stmxcsr(&__mxcsr); |
| 4026 |
- __fnstsw(&__status); |
| 4027 |
|
| 4028 |
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch |
| 4029 |
deleted file mode 100644 |
| 4030 |
index 751a77c..0000000 |
| 4031 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch |
| 4032 |
+++ /dev/null |
| 4033 |
@@ -1,13 +0,0 @@ |
| 4034 |
-u_int is defined in sys/types.h |
| 4035 |
-makes header usable alone. |
| 4036 |
- |
| 4037 |
---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400 |
| 4038 |
-+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400 |
| 4039 |
-@@ -788,6 +788,7 @@ |
| 4040 |
- struct sysctl_req *); |
| 4041 |
- #else /* !_KERNEL */ |
| 4042 |
- #include <sys/cdefs.h> |
| 4043 |
-+#include <sys/types.h> /* for u_int */ |
| 4044 |
- |
| 4045 |
- __BEGIN_DECLS |
| 4046 |
- int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); |
| 4047 |
|
| 4048 |
diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf |
| 4049 |
deleted file mode 100644 |
| 4050 |
index 7a879f9..0000000 |
| 4051 |
--- a/sys-freebsd/freebsd-lib/files/libmap.conf |
| 4052 |
+++ /dev/null |
| 4053 |
@@ -1,8 +0,0 @@ |
| 4054 |
-# /etc/libmap.conf |
| 4055 |
- |
| 4056 |
-# Ensure that libthr does all threading |
| 4057 |
-libpthread.so.2 libthr.so.2 |
| 4058 |
-libpthread.so libthr.so |
| 4059 |
-libc_r.so.6 libthr.so.2 |
| 4060 |
-libc_r.so libthr.so |
| 4061 |
- |
| 4062 |
|
| 4063 |
diff --git a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in b/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in |
| 4064 |
deleted file mode 100644 |
| 4065 |
index 058ecb4..0000000 |
| 4066 |
--- a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in |
| 4067 |
+++ /dev/null |
| 4068 |
@@ -1,11 +0,0 @@ |
| 4069 |
-prefix=/usr |
| 4070 |
-exec_prefix=${prefix} |
| 4071 |
-libdir=@LIBDIR@ |
| 4072 |
-includedir=${prefix}/include |
| 4073 |
- |
| 4074 |
-Name: libusb |
| 4075 |
-Description: USB access library (FreeBSD version) |
| 4076 |
-Version: 1.0.1 |
| 4077 |
-Libs: -L${libdir} -lusb |
| 4078 |
-Cflags: -I${includedir} |
| 4079 |
- |
| 4080 |
|
| 4081 |
diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in |
| 4082 |
deleted file mode 100644 |
| 4083 |
index f63c6e3..0000000 |
| 4084 |
--- a/sys-freebsd/freebsd-lib/files/libusb.pc.in |
| 4085 |
+++ /dev/null |
| 4086 |
@@ -1,11 +0,0 @@ |
| 4087 |
-prefix=/usr |
| 4088 |
-exec_prefix=${prefix} |
| 4089 |
-libdir=@LIBDIR@ |
| 4090 |
-includedir=${prefix}/include |
| 4091 |
- |
| 4092 |
-Name: libusb |
| 4093 |
-Description: USB access library (FreeBSD version) |
| 4094 |
-Version: 0.1.12 |
| 4095 |
-Libs: -L${libdir} -lusb |
| 4096 |
-Cflags: -I${includedir} |
| 4097 |
- |
| 4098 |
|
| 4099 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild |
| 4100 |
deleted file mode 100644 |
| 4101 |
index 5265af2..0000000 |
| 4102 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild |
| 4103 |
+++ /dev/null |
| 4104 |
@@ -1,644 +0,0 @@ |
| 4105 |
-# Copyright 1999-2016 Gentoo Foundation |
| 4106 |
-# Distributed under the terms of the GNU General Public License v2 |
| 4107 |
-# $Id$ |
| 4108 |
- |
| 4109 |
-EAPI=5 |
| 4110 |
- |
| 4111 |
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build |
| 4112 |
- |
| 4113 |
-DESCRIPTION="FreeBSD's base system libraries" |
| 4114 |
-SLOT="0" |
| 4115 |
-LICENSE="BSD zfs? ( CDDL )" |
| 4116 |
- |
| 4117 |
-# Security Advisory and Errata patches. |
| 4118 |
-# UPSTREAM_PATCHES=() |
| 4119 |
- |
| 4120 |
-# Crypto is needed to have an internal OpenSSL header |
| 4121 |
-# sys is needed for libalias, probably we can just extract that instead of |
| 4122 |
-# extracting the whole tarball |
| 4123 |
-if [[ ${PV} != *9999* ]]; then |
| 4124 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 4125 |
- SRC_URI="${SRC_URI} |
| 4126 |
- $(freebsd_upstream_patches)" |
| 4127 |
-fi |
| 4128 |
- |
| 4129 |
-EXTRACTONLY=" |
| 4130 |
- lib/ |
| 4131 |
- contrib/ |
| 4132 |
- crypto/ |
| 4133 |
- libexec/ |
| 4134 |
- etc/ |
| 4135 |
- include/ |
| 4136 |
- usr.sbin/ |
| 4137 |
- gnu/ |
| 4138 |
- secure/ |
| 4139 |
-" |
| 4140 |
- |
| 4141 |
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then |
| 4142 |
- RDEPEND="ssl? ( dev-libs/openssl:0= ) |
| 4143 |
- hesiod? ( net-dns/hesiod ) |
| 4144 |
- kerberos? ( app-crypt/heimdal ) |
| 4145 |
- usb? ( !dev-libs/libusb ) |
| 4146 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) |
| 4147 |
- >=dev-libs/expat-2.0.1 |
| 4148 |
- >=dev-util/dialog-1.2.20150225 |
| 4149 |
- =sys-freebsd/freebsd-libexec-${RV}* |
| 4150 |
- !sys-libs/libutempter |
| 4151 |
- !dev-libs/libelf |
| 4152 |
- !dev-libs/libexecinfo |
| 4153 |
- !dev-libs/libiconv |
| 4154 |
- !sys-freebsd/freebsd-headers" |
| 4155 |
- DEPEND="${RDEPEND} |
| 4156 |
- >=sys-devel/flex-2.5.31-r2 |
| 4157 |
- =sys-freebsd/freebsd-sources-${RV}*" |
| 4158 |
- RDEPEND="${RDEPEND} |
| 4159 |
- =sys-freebsd/freebsd-share-${RV}* |
| 4160 |
- >=virtual/libiconv-0-r2" |
| 4161 |
-else |
| 4162 |
- EXTRACTONLY+="sys/ " |
| 4163 |
-fi |
| 4164 |
- |
| 4165 |
-DEPEND="${DEPEND} |
| 4166 |
- userland_GNU? ( sys-apps/mtree ) |
| 4167 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
| 4168 |
- |
| 4169 |
-S="${WORKDIR}/lib" |
| 4170 |
- |
| 4171 |
-export CTARGET=${CTARGET:-${CHOST}} |
| 4172 |
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then |
| 4173 |
- export CTARGET=${CATEGORY/cross-} |
| 4174 |
-fi |
| 4175 |
- |
| 4176 |
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware |
| 4177 |
- build crosscompile_opts_headers-only zfs |
| 4178 |
- userland_GNU userland_BSD" |
| 4179 |
- |
| 4180 |
-QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" |
| 4181 |
- |
| 4182 |
-pkg_setup() { |
| 4183 |
- # Add the required source files. |
| 4184 |
- use build && EXTRACTONLY+="sys/ " |
| 4185 |
- use zfs && EXTRACTONLY+="cddl/ " |
| 4186 |
- |
| 4187 |
- [ -c /dev/zero ] || \ |
| 4188 |
- die "You forgot to mount /dev; the compiled libc would break." |
| 4189 |
- |
| 4190 |
- if ! use ssl && use kerberos; then |
| 4191 |
- eerror "If you want kerberos support you need to enable ssl support, too." |
| 4192 |
- fi |
| 4193 |
- |
| 4194 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 4195 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
| 4196 |
- use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " |
| 4197 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " |
| 4198 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " |
| 4199 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
| 4200 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
| 4201 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
| 4202 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
| 4203 |
- |
| 4204 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= " |
| 4205 |
- |
| 4206 |
- if [ "${CTARGET}" != "${CHOST}" ]; then |
| 4207 |
- mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" |
| 4208 |
- mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" |
| 4209 |
- fi |
| 4210 |
-} |
| 4211 |
- |
| 4212 |
-PATCHES=( |
| 4213 |
- "${FILESDIR}/${PN}-6.0-pmc.patch" |
| 4214 |
- "${FILESDIR}/${PN}-10.0-atfcxx.patch" |
| 4215 |
- "${FILESDIR}/${PN}-9.0-bluetooth.patch" |
| 4216 |
- "${FILESDIR}/${PN}-11.0-workaround.patch" |
| 4217 |
- "${FILESDIR}/${PN}-11.0-bsdxml2expat.patch" |
| 4218 |
- "${FILESDIR}/${PN}-11.0-libsysdecode.patch" |
| 4219 |
- "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" |
| 4220 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" |
| 4221 |
- ) |
| 4222 |
-# Here we disable and remove source which we don't need or want |
| 4223 |
-# In order: |
| 4224 |
-# - ncurses stuff |
| 4225 |
-# - libexpat creates a bsdxml library which is the same as expat |
| 4226 |
-# - archiving libraries (have their own ebuild) |
| 4227 |
-# - sendmail libraries (they are installed by sendmail) |
| 4228 |
-# - SNMP library and dependency (have their own ebuilds) |
| 4229 |
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from |
| 4230 |
-# boot0 instead. |
| 4231 |
-# |
| 4232 |
-# The rest are libraries we already have somewhere else because |
| 4233 |
-# they are contribution. |
| 4234 |
-REMOVE_SUBDIRS="ncurses \ |
| 4235 |
- libexpat \ |
| 4236 |
- libz libbz2 libarchive liblzma \ |
| 4237 |
- libsm libsmdb libsmutil \ |
| 4238 |
- libbegemot libbsnmp \ |
| 4239 |
- libpam libpcap libwrap libmagic \ |
| 4240 |
- libcom_err |
| 4241 |
- libedit |
| 4242 |
- libstand |
| 4243 |
- libgssapi" |
| 4244 |
- |
| 4245 |
-# Are we building a cross-compiler? |
| 4246 |
-is_crosscompile() { |
| 4247 |
- [ "${CATEGORY#*cross-}" != "${CATEGORY}" ] |
| 4248 |
-} |
| 4249 |
- |
| 4250 |
-src_prepare() { |
| 4251 |
- # gcc-5.0 or later, Workaround for critical issue. bug 573358. |
| 4252 |
- use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 |
| 4253 |
- |
| 4254 |
- sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" |
| 4255 |
- |
| 4256 |
- # Upstream Display Managers default to using VT7 |
| 4257 |
- # We should make FreeBSD allow this by default |
| 4258 |
- local x= |
| 4259 |
- for x in "${WORKDIR}"/etc/etc.*/ttys ; do |
| 4260 |
- sed -i.bak \ |
| 4261 |
- -e '/ttyv5[[:space:]]/ a\ |
| 4262 |
-# Display Managers default to VT7.\ |
| 4263 |
-# If you use the xdm init script, keep ttyv6 commented out\ |
| 4264 |
-# unless you force a different VT for the DM being used.' \ |
| 4265 |
- -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ |
| 4266 |
- || die "Failed to sed ${x}" |
| 4267 |
- rm "${x}".bak |
| 4268 |
- done |
| 4269 |
- |
| 4270 |
- # This one is here because it also |
| 4271 |
- # patches "${WORKDIR}/include" |
| 4272 |
- cd "${WORKDIR}" |
| 4273 |
- epatch "${FILESDIR}/${PN}-includes.patch" |
| 4274 |
- |
| 4275 |
- # Don't install the hesiod man page or header |
| 4276 |
- rm "${WORKDIR}"/include/hesiod.h || die |
| 4277 |
- sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die |
| 4278 |
- sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ |
| 4279 |
- "${WORKDIR}"/lib/libc/net/Makefile.inc || die |
| 4280 |
- |
| 4281 |
- # Fix the Makefiles of these few libraries that will overwrite our LDADD. |
| 4282 |
- cd "${S}" |
| 4283 |
- for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ |
| 4284 |
- libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \ |
| 4285 |
- die "Problem fixing \"${dir}/Makefile" |
| 4286 |
- done |
| 4287 |
- # Call LD with LDFLAGS, rename them to RAW_LDFLAGS |
| 4288 |
- sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \ |
| 4289 |
- -i "${S}/csu/i386/Makefile" || die |
| 4290 |
- |
| 4291 |
- if install --version 2> /dev/null | grep -q GNU; then |
| 4292 |
- sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" |
| 4293 |
- fi |
| 4294 |
- |
| 4295 |
- # Try to fix sed calls for GNU sed. Do it only with GNU userland and force |
| 4296 |
- # BSD's sed on BSD. |
| 4297 |
- cd "${S}" |
| 4298 |
- if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then |
| 4299 |
- find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; |
| 4300 |
- sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die |
| 4301 |
- fi |
| 4302 |
- |
| 4303 |
- if use build; then |
| 4304 |
- cd "${WORKDIR}" |
| 4305 |
- # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it |
| 4306 |
- # shouldn't be a symlink to /usr/src/sys (which should be already patched) |
| 4307 |
- epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch |
| 4308 |
- return 0 |
| 4309 |
- fi |
| 4310 |
- |
| 4311 |
- if ! is_crosscompile ; then |
| 4312 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
| 4313 |
- ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" |
| 4314 |
- fi |
| 4315 |
- else |
| 4316 |
- sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ |
| 4317 |
- "${S}/libc/rpc/Makefile.inc" \ |
| 4318 |
- "${S}/libc/yp/Makefile.inc" |
| 4319 |
- fi |
| 4320 |
-} |
| 4321 |
- |
| 4322 |
-bootstrap_lib() { |
| 4323 |
- for i ; do |
| 4324 |
- cd "${WORKDIR}/${i}" || die "missing ${i}" |
| 4325 |
- freebsd_src_compile |
| 4326 |
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}" |
| 4327 |
- done |
| 4328 |
-} |
| 4329 |
- |
| 4330 |
-get_csudir() { |
| 4331 |
- if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then |
| 4332 |
- echo "lib/csu/$1-elf" |
| 4333 |
- else |
| 4334 |
- echo "lib/csu/$1" |
| 4335 |
- fi |
| 4336 |
-} |
| 4337 |
- |
| 4338 |
-bootstrap_csu() { |
| 4339 |
- local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))" |
| 4340 |
- export RAW_LDFLAGS=$(raw-ldflags) |
| 4341 |
- bootstrap_lib "${csudir}" |
| 4342 |
- |
| 4343 |
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" |
| 4344 |
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" |
| 4345 |
- |
| 4346 |
- bootstrap_lib "gnu/lib/csu" |
| 4347 |
- |
| 4348 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
| 4349 |
- for i in *.So ; do |
| 4350 |
- ln -s $i ${i%.So}S.o |
| 4351 |
- done |
| 4352 |
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
| 4353 |
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
| 4354 |
-} |
| 4355 |
- |
| 4356 |
-# Compile libssp_nonshared.a and add it's path to LDFLAGS. |
| 4357 |
-bootstrap_libssp_nonshared() { |
| 4358 |
- bootstrap_lib "gnu/lib/libssp/libssp_nonshared" |
| 4359 |
-} |
| 4360 |
- |
| 4361 |
-bootstrap_libgcc() { |
| 4362 |
- bootstrap_lib "lib/libcompiler_rt" |
| 4363 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die |
| 4364 |
- ln -s libcompiler_rt.a libgcc.a || die |
| 4365 |
- |
| 4366 |
- bootstrap_lib "lib/libc" "gnu/lib/libgcc" |
| 4367 |
-} |
| 4368 |
- |
| 4369 |
-bootstrap_libthr() { |
| 4370 |
- bootstrap_lib "lib/libthr" |
| 4371 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die |
| 4372 |
- ln -s libthr.so libpthread.so |
| 4373 |
-} |
| 4374 |
- |
| 4375 |
-# What to build for a cross-compiler. |
| 4376 |
-# We also need the csu but this has to be handled separately. |
| 4377 |
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared" |
| 4378 |
- |
| 4379 |
-# What to build for non-default ABIs. |
| 4380 |
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules" |
| 4381 |
- |
| 4382 |
-# Subdirs for a native build: |
| 4383 |
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules" |
| 4384 |
- |
| 4385 |
-# Is my $ABI native ? |
| 4386 |
-is_native_abi() { |
| 4387 |
- is_crosscompile && return 1 |
| 4388 |
- multilib_is_native_abi |
| 4389 |
-} |
| 4390 |
- |
| 4391 |
-# Do we need to bootstrap the csu and libssp_nonshared? |
| 4392 |
-need_bootstrap() { |
| 4393 |
- is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}" |
| 4394 |
-} |
| 4395 |
- |
| 4396 |
-# Get the subdirs we are building. |
| 4397 |
-get_subdirs() { |
| 4398 |
- local ret="" |
| 4399 |
- if is_native_abi ; then |
| 4400 |
- # If we are building for the native ABI, build everything |
| 4401 |
- ret="${NATIVE_SUBDIRS}" |
| 4402 |
- elif is_crosscompile ; then |
| 4403 |
- # With a cross-compiler we only build the very core parts. |
| 4404 |
- ret="${CROSS_SUBDIRS}" |
| 4405 |
- if [ "${EBUILD_PHASE}" = "install" ]; then |
| 4406 |
- # Add the csu dir first when installing. We treat it separately for |
| 4407 |
- # compiling. |
| 4408 |
- ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}" |
| 4409 |
- fi |
| 4410 |
- else |
| 4411 |
- # For the non-native ABIs we only build the csu parts and very core |
| 4412 |
- # libraries for now. |
| 4413 |
- ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))" |
| 4414 |
- fi |
| 4415 |
- echo "${ret}" |
| 4416 |
-} |
| 4417 |
- |
| 4418 |
-# Bootstrap the core libraries and setup the flags so that the other parts can |
| 4419 |
-# build against it. |
| 4420 |
-do_bootstrap() { |
| 4421 |
- einfo "Bootstrapping on ${CHOST} for ${CTARGET}" |
| 4422 |
- if ! is_crosscompile ; then |
| 4423 |
- # Pre-install headers, but not when building a cross-compiler since we |
| 4424 |
- # assume they have been installed in the previous pass. |
| 4425 |
- einfo "Pre-installing includes in include_proper_${ABI}" |
| 4426 |
- mkdir "${WORKDIR}/include_proper_${ABI}" || die |
| 4427 |
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" |
| 4428 |
- CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
| 4429 |
- [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" |
| 4430 |
- CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
| 4431 |
- mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc" |
| 4432 |
- fi |
| 4433 |
- bootstrap_csu |
| 4434 |
- bootstrap_libssp_nonshared |
| 4435 |
- is_crosscompile && bootstrap_lib "lib/libc" |
| 4436 |
- is_crosscompile || is_native_abi || bootstrap_libgcc |
| 4437 |
- is_native_abi || bootstrap_libthr |
| 4438 |
-} |
| 4439 |
- |
| 4440 |
-# Compile it. Assume we have the toolchain setup correctly. |
| 4441 |
-do_compile() { |
| 4442 |
- # Bootstrap if needed, otherwise assume the system headers are in |
| 4443 |
- # /usr/include. |
| 4444 |
- if need_bootstrap ; then |
| 4445 |
- do_bootstrap |
| 4446 |
- else |
| 4447 |
- CFLAGS="${CFLAGS} -isystem /usr/include" |
| 4448 |
- [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" |
| 4449 |
- CXXFLAGS="${CXXFLAGS} -isystem /usr/include" |
| 4450 |
- fi |
| 4451 |
- |
| 4452 |
- export RAW_LDFLAGS=$(raw-ldflags) |
| 4453 |
- |
| 4454 |
- # Everything is now setup, build it! |
| 4455 |
- for i in $(get_subdirs) ; do |
| 4456 |
- einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}" |
| 4457 |
- cd "${WORKDIR}/${i}/" || die "missing ${i}." |
| 4458 |
- freebsd_src_compile || die "make ${i} failed" |
| 4459 |
- done |
| 4460 |
-} |
| 4461 |
- |
| 4462 |
-src_compile() { |
| 4463 |
- # Does not work with GNU sed |
| 4464 |
- # Force BSD's sed on BSD. |
| 4465 |
- if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then |
| 4466 |
- export ESED=/usr/bin/sed |
| 4467 |
- unalias sed |
| 4468 |
- fi |
| 4469 |
- |
| 4470 |
- use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" |
| 4471 |
- |
| 4472 |
- cd "${WORKDIR}/include" |
| 4473 |
- $(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed" |
| 4474 |
- |
| 4475 |
- use crosscompile_opts_headers-only && return 0 |
| 4476 |
- |
| 4477 |
- # Bug #270098 |
| 4478 |
- append-flags $(test-flags -fno-strict-aliasing) |
| 4479 |
- |
| 4480 |
- # Bug #324445 |
| 4481 |
- append-flags $(test-flags -fno-strict-overflow) |
| 4482 |
- |
| 4483 |
- # strip flags and do not do it later, we only add safe, and in fact |
| 4484 |
- # needed flags after all |
| 4485 |
- strip-flags |
| 4486 |
- export NOFLAGSTRIP=yes |
| 4487 |
- if is_crosscompile ; then |
| 4488 |
- export YACC='yacc -by' |
| 4489 |
- CHOST=${CTARGET} tc-export CC LD CXX RANLIB |
| 4490 |
- mymakeopts="${mymakeopts} NLS=" |
| 4491 |
- CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include" |
| 4492 |
- CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include" |
| 4493 |
- append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" |
| 4494 |
- fi |
| 4495 |
- |
| 4496 |
- if is_crosscompile ; then |
| 4497 |
- do_compile |
| 4498 |
- else |
| 4499 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 4500 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile |
| 4501 |
- fi |
| 4502 |
-} |
| 4503 |
- |
| 4504 |
-gen_libc_ldscript() { |
| 4505 |
- # Parameters: |
| 4506 |
- # $1 = target libdir |
| 4507 |
- # $2 = source libc dir |
| 4508 |
- # $3 = source libssp_nonshared dir |
| 4509 |
- |
| 4510 |
- # Clear the symlink. |
| 4511 |
- rm -f "${DESTDIR}/$2/libc.so" || die |
| 4512 |
- |
| 4513 |
- # Move the library if needed |
| 4514 |
- if [ "$1" != "$2" ] ; then |
| 4515 |
- mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die |
| 4516 |
- fi |
| 4517 |
- |
| 4518 |
- # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking |
| 4519 |
- # this is done to avoid having to touch gcc spec file as it is currently |
| 4520 |
- # done on FreeBSD upstream, mostly because their binutils aren't able to |
| 4521 |
- # cope with linker scripts yet. |
| 4522 |
- # Taken from toolchain-funcs.eclass: |
| 4523 |
- local output_format |
| 4524 |
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
| 4525 |
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
| 4526 |
- |
| 4527 |
- # iconv symbol provided by libc_nonshared.a. |
| 4528 |
- # http://svnweb.freebsd.org/base?view=revision&revision=258283 |
| 4529 |
- cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT |
| 4530 |
-/* GNU ld script |
| 4531 |
- SSP (-fstack-protector) requires __stack_chk_fail_local to be local. |
| 4532 |
- GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if |
| 4533 |
- this symbol was provided by a shared libc. So we link in |
| 4534 |
- libssp_nonshared.a from here. |
| 4535 |
- */ |
| 4536 |
-${output_format} |
| 4537 |
-GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a ) |
| 4538 |
-END_LDSCRIPT |
| 4539 |
-} |
| 4540 |
- |
| 4541 |
-header_list="" |
| 4542 |
- |
| 4543 |
-move_header() { |
| 4544 |
- local dirname=$(dirname ${1}) |
| 4545 |
- local filename=$(basename ${1}) |
| 4546 |
- |
| 4547 |
- if [ ! -d "${dirname}/${ABI}" ] ; then |
| 4548 |
- mkdir "${dirname}/${ABI}" || die |
| 4549 |
- fi |
| 4550 |
- |
| 4551 |
- mv "${1}" "${dirname}/${ABI}/" || die |
| 4552 |
- |
| 4553 |
- export header_list="${header_list} ${1}" |
| 4554 |
-} |
| 4555 |
- |
| 4556 |
-make_header_template() { |
| 4557 |
- cat <<-END_HEADER |
| 4558 |
-/* |
| 4559 |
- * Wrapped header for multilib support. |
| 4560 |
- * See the real headers included below. |
| 4561 |
- */ |
| 4562 |
- |
| 4563 |
-#if defined(__x86_64__) |
| 4564 |
- @ABI_amd64_fbsd@ |
| 4565 |
-#elif defined(__i386__) |
| 4566 |
- @ABI_x86_fbsd@ |
| 4567 |
-#else |
| 4568 |
- @ABI_${DEFAULT_ABI}@ |
| 4569 |
-#endif |
| 4570 |
-END_HEADER |
| 4571 |
-} |
| 4572 |
- |
| 4573 |
-wrap_header() { |
| 4574 |
- local dirname=$(dirname ${1}) |
| 4575 |
- local filename=$(basename ${1}) |
| 4576 |
- |
| 4577 |
- if [ -n "${dirname#.}" ] ; then |
| 4578 |
- dirname="${dirname}/${2}" |
| 4579 |
- else |
| 4580 |
- dirname="${2}" |
| 4581 |
- fi |
| 4582 |
- |
| 4583 |
- if [ -f "${dirname}/${filename}" ] ; then |
| 4584 |
- sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1} |
| 4585 |
- else |
| 4586 |
- cat ${1} |
| 4587 |
- fi |
| 4588 |
-} |
| 4589 |
- |
| 4590 |
-wrap_header_end() { |
| 4591 |
- sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1} |
| 4592 |
-} |
| 4593 |
- |
| 4594 |
-do_install() { |
| 4595 |
- if is_crosscompile ; then |
| 4596 |
- INCLUDEDIR="/usr/${CTARGET}/usr/include" |
| 4597 |
- else |
| 4598 |
- INCLUDEDIR="/usr/include" |
| 4599 |
- fi |
| 4600 |
- |
| 4601 |
- dodir ${INCLUDEDIR} |
| 4602 |
- CTARGET="${CHOST}" \ |
| 4603 |
- install_includes ${INCLUDEDIR} |
| 4604 |
- |
| 4605 |
- is_crosscompile && use crosscompile_opts_headers-only && return 0 |
| 4606 |
- |
| 4607 |
- # Install a libusb.pc for better compat with Linux's libusb |
| 4608 |
- if use usb ; then |
| 4609 |
- dodir /usr/$(get_libdir)/pkgconfig |
| 4610 |
- sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc |
| 4611 |
- fi |
| 4612 |
- |
| 4613 |
- for i in $(get_subdirs) ; do |
| 4614 |
- if [[ ${i} != *libiconv_modules* ]] ; then |
| 4615 |
- einfo "Installing in ${i}..." |
| 4616 |
- cd "${WORKDIR}/${i}/" || die "missing ${i}." |
| 4617 |
- freebsd_src_install || die "Install ${i} failed" |
| 4618 |
- fi |
| 4619 |
- done |
| 4620 |
- |
| 4621 |
- if ! is_crosscompile; then |
| 4622 |
- local mymakeopts_save="${mymakeopts}" |
| 4623 |
- mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n" |
| 4624 |
- |
| 4625 |
- einfo "Installing in lib/libiconv_modules..." |
| 4626 |
- cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules." |
| 4627 |
- freebsd_src_install || die "Install lib/libiconv_modules failed" |
| 4628 |
- |
| 4629 |
- mymakeopts="${mymakeopts_save}" |
| 4630 |
- fi |
| 4631 |
- |
| 4632 |
- if ! is_crosscompile ; then |
| 4633 |
- if ! multilib_is_native_abi ; then |
| 4634 |
- DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" |
| 4635 |
- else |
| 4636 |
- dodir "$(get_libdir)" |
| 4637 |
- DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" |
| 4638 |
- fi |
| 4639 |
- else |
| 4640 |
- CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib" |
| 4641 |
- # We're done for the cross libc here. |
| 4642 |
- return 0 |
| 4643 |
- fi |
| 4644 |
- |
| 4645 |
- # Generate ldscripts for core libraries that will go in / |
| 4646 |
- multilib_is_native_abi && \ |
| 4647 |
- gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ |
| 4648 |
- kvm m md procstat sbuf thr ufs util elf |
| 4649 |
- |
| 4650 |
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then |
| 4651 |
- cd "${D}/usr/include" |
| 4652 |
- for i in machine/*.h fenv.h ; do |
| 4653 |
- move_header ${i} |
| 4654 |
- done |
| 4655 |
- if multilib_is_native_abi ; then |
| 4656 |
- # Supposedly the last one! |
| 4657 |
- local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')" |
| 4658 |
- for j in ${uniq_headers} ; do |
| 4659 |
- make_header_template > ${j} |
| 4660 |
- for i in $(get_all_abis) ; do |
| 4661 |
- wrap_header ${j} ${i} > ${j}.new |
| 4662 |
- cp ${j}.new ${j} |
| 4663 |
- rm -f ${j}.new |
| 4664 |
- done |
| 4665 |
- wrap_header_end ${j} > ${j}.new |
| 4666 |
- cp ${j}.new ${j} |
| 4667 |
- rm -f ${j}.new |
| 4668 |
- done |
| 4669 |
- fi |
| 4670 |
- fi |
| 4671 |
-} |
| 4672 |
- |
| 4673 |
-src_install() { |
| 4674 |
- if is_crosscompile ; then |
| 4675 |
- einfo "Installing for ${CTARGET} in ${CHOST}.." |
| 4676 |
- # From this point we need to force: get stripped with the correct tools, |
| 4677 |
- # get tc-arch-kernel to return the right value, etc. |
| 4678 |
- export CHOST=${CTARGET} |
| 4679 |
- |
| 4680 |
- mymakeopts="${mymakeopts} WITHOUT_MAN= \ |
| 4681 |
- INCLUDEDIR=/usr/${CTARGET}/usr/include \ |
| 4682 |
- SHLIBDIR=/usr/${CTARGET}/usr/lib \ |
| 4683 |
- LIBDIR=/usr/${CTARGET}/usr/lib" |
| 4684 |
- |
| 4685 |
- dosym "usr/include" "/usr/${CTARGET}/sys-include" |
| 4686 |
- do_install |
| 4687 |
- |
| 4688 |
- return 0 |
| 4689 |
- else |
| 4690 |
- export STRIP_MASK="*/usr/lib*/*crt*.o" |
| 4691 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 4692 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install |
| 4693 |
- fi |
| 4694 |
- |
| 4695 |
- cd "${WORKDIR}/etc/" |
| 4696 |
- insinto /etc |
| 4697 |
- doins nls.alias mac.conf netconfig |
| 4698 |
- |
| 4699 |
- # Install ttys file |
| 4700 |
- local MACHINE="$(tc-arch-kernel)" |
| 4701 |
- doins "etc.${MACHINE}"/* |
| 4702 |
-} |
| 4703 |
- |
| 4704 |
-install_includes() |
| 4705 |
-{ |
| 4706 |
- local INCLUDEDIR="$1" |
| 4707 |
- |
| 4708 |
- # The idea is to be called from either install or unpack. |
| 4709 |
- # During unpack it's required to install them as portage's user. |
| 4710 |
- if [[ "${EBUILD_PHASE}" == "install" ]]; then |
| 4711 |
- local DESTDIR="${D}" |
| 4712 |
- BINOWN="root" |
| 4713 |
- BINGRP="wheel" |
| 4714 |
- else |
| 4715 |
- local DESTDIR="${WORKDIR}" |
| 4716 |
- [[ -z "${USER}" ]] && USER="portage" |
| 4717 |
- BINOWN="${USER}" |
| 4718 |
- [[ -z "${GROUPS}" ]] && GROUPS="portage" |
| 4719 |
- BINGRP="${GROUPS}" |
| 4720 |
- fi |
| 4721 |
- |
| 4722 |
- # Must exist before we use it. |
| 4723 |
- [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." |
| 4724 |
- cd "${WORKDIR}/include" |
| 4725 |
- |
| 4726 |
- local MACHINE="$(tc-arch-kernel)" |
| 4727 |
- |
| 4728 |
- einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
| 4729 |
- $(freebsd_get_bmake) installincludes \ |
| 4730 |
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
| 4731 |
- DESTDIR="${DESTDIR}" \ |
| 4732 |
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
| 4733 |
- BINGRP="${BINGRP}" \ |
| 4734 |
- WITHOUT_GSSAPI= \ |
| 4735 |
- SRCTOP="${WORKDIR}"|| die "install_includes() failed" |
| 4736 |
- einfo "includes installed ok." |
| 4737 |
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper lib/libmp" |
| 4738 |
- for i in $EXTRA_INCLUDES; do |
| 4739 |
- einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
| 4740 |
- cd "${WORKDIR}/$i" || die |
| 4741 |
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ |
| 4742 |
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
| 4743 |
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
| 4744 |
- BINGRP="${BINGRP}" \ |
| 4745 |
- SRCTOP="${WORKDIR}" || die "problem installing $i includes." |
| 4746 |
- einfo "$i includes installed ok." |
| 4747 |
- done |
| 4748 |
-} |
| 4749 |
|
| 4750 |
diff --git a/sys-freebsd/freebsd-lib/metadata.xml b/sys-freebsd/freebsd-lib/metadata.xml |
| 4751 |
deleted file mode 100644 |
| 4752 |
index 24ca540..0000000 |
| 4753 |
--- a/sys-freebsd/freebsd-lib/metadata.xml |
| 4754 |
+++ /dev/null |
| 4755 |
@@ -1,16 +0,0 @@ |
| 4756 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 4757 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 4758 |
-<pkgmetadata> |
| 4759 |
- <maintainer type="project"> |
| 4760 |
- <email>bsd@g.o</email> |
| 4761 |
- <name>BSD Project</name> |
| 4762 |
- </maintainer> |
| 4763 |
- <use> |
| 4764 |
- <flag name="hesiod">Enable support for net-dns/hesiod</flag> |
| 4765 |
- <flag name="netware"> |
| 4766 |
- Build libraries and tools to work with NetWare protocols (IPX |
| 4767 |
- and NCP). |
| 4768 |
- </flag> |
| 4769 |
- <flag name="zfs">Enable ZFS support.</flag> |
| 4770 |
- </use> |
| 4771 |
-</pkgmetadata> |
| 4772 |
|
| 4773 |
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest |
| 4774 |
deleted file mode 100644 |
| 4775 |
index 2d67c7a..0000000 |
| 4776 |
--- a/sys-freebsd/freebsd-libexec/Manifest |
| 4777 |
+++ /dev/null |
| 4778 |
@@ -1,15 +0,0 @@ |
| 4779 |
-AUX bootpd.confd 183 SHA256 c70c6a7a99470354a5f61bfe5c0f71325f4896e41da150e782223a30f07a275c SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f WHIRLPOOL c6721ac9b3ba70268fdba8c81ad9225e26049a5eb5ef8ea9bccc5fbbe7a110defe15df1d27b1c4b54f92e19d7d8b2099f87e7972faa0e5ddf17b66d30e26e0ad |
| 4780 |
-AUX bootpd.initd 554 SHA256 a1b1160a3e3d8f068a446ba5c9210737e120130fe173e68026263b7d057efb7e SHA512 69bc8dc708d955e41d3e0cfb997f96b589e8a3d33b11b2728541082fc5ab0844d753ca036a6c70ddd23a2a0085c39a89340b0f7d332b1384c94671cf3fe09b66 WHIRLPOOL 4764e746340fa0ace0310880a8ac13852df14ca14ba077610b5bfea09a45c093d064b5a534ed6e3dd839c869cf0c8013bcfe022814793ecc5f6e38cc08335f92 |
| 4781 |
-AUX freebsd-libexec-10.2-atf-check.patch 809 SHA256 75cddd83ece1a3be8c10c0e2fd335180738d5b6a6b01b89e51d5c53243e54f46 SHA512 46b265db484d707e9e65906e8d5b3dbb06223c1c229c78b6cb92864f4a4a017b61cfd2de35e5533bae2eb8867adea5e1732c279bc5d90e60d07646b9a4b06681 WHIRLPOOL 77f069b1c649dd6f37ed4b0343c43609c7bc9efb09ebd0e22449a5db7d8eabbb9a870127974639108ceb3bf272bca64a3358809ea2a6a89296ac2097125cefc2 |
| 4782 |
-AUX freebsd-libexec-7.2-pic.patch 348 SHA256 424ed7b69067d3a3a77ad387026548b77d41412f52ae17c737e96e57b6cb3b0f SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5 WHIRLPOOL 6407b4f3781b56aeb62252f87f7522e38930e24952610938a05cad24c0b56c62dac8b8b517c5805699432f3d3b4b59e31784def6aa38ca6b8a6c8aabace40712 |
| 4783 |
-AUX freebsd-libexec-8.2-rtld.patch 1332 SHA256 0f0dc285b4797ab3be266db02f905ca72ffb39589c927311f74678acd9517e4d SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6 WHIRLPOOL 41489254c1f800208bc0ff2548d109cd34a84c025f5428f85c7aada69c5cbbe3f165410cc58dff773b7e792c9c9145580423f55f120f0e29159b251fc7e99d0c |
| 4784 |
-AUX freebsd-libexec-9.2-no_ld32.patch 634 SHA256 ee5568c2ffbff4cf73c87401e5eb93165e813a2ff252d953a95fc4294dd2ace8 SHA512 df5421ad4d07d9f3d5f8dfd110eca588848ff55a63c70adf76f90746c1156ac50004a79bb626783ada8f96060fdd37e153e64da6ed43148c02a8eae4493c18d8 WHIRLPOOL d11ddc097a8ff171d143c655c1f2c9dd4ee3ff5e7bd6693bbd7c5d065e72c4d9e2c5a3521b9701ea0a3c7f5234fb174675373e68fb65cbb41c95133db6eb53f5 |
| 4785 |
-AUX ftpd.pamd 192 SHA256 4b789fb18bc0d1f9b0a9b0f1bf5dac6d86166a7106e966e5f65ffd4faf5ce024 SHA512 d7e7f08ef05ccc63e63ddc65d79f96106dfa0ec2421ee9fbbb83966aaccb73d9868cb14467c1bdfaa9d12299a8ad27cbc725a33fec58e47b5b8212e52a7c18eb WHIRLPOOL 1d418e336dec5b6c34541c11068fd19ffe7546d338851f47359c50c18bc382c84230c0d751fa8185d48ca1c67250ba320fec895fc92f96c1d6909647db67a54a |
| 4786 |
-AUX rquotad.xinetd 162 SHA256 3f73f86e5a6ab3b6d25698f6179cdbe169b2fd01c682b45a9c8711f36bb317e5 SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f WHIRLPOOL 237667cbff4807d703a3c4c4eb8c2c5863d024a6263e3addf8d96ffa1461a8d1cda6318deee1de72146d27305b670b501da9ad4035880551dee5138b6798f6c6 |
| 4787 |
-AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8edb8ac327d4381 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011 WHIRLPOOL 76f8b1f3f85e97f27950549f62dc411e0620b25eba68c161c96a5252617c7c4beb0fecf94af9bc9cf931dff8fc4c750e780c41143a50b39d7538a30b7c0bd322 |
| 4788 |
-AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3 SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd WHIRLPOOL 7517089e5ab5b3925b46908c22a929cb04c8390387ad075f17c2fa0213ab38cae833d9280cfe289915afe4c2ee0b3e0299cee42daa871c23507f5f96cc22f227 |
| 4789 |
-AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f |
| 4790 |
-AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802 |
| 4791 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 4792 |
-EBUILD freebsd-libexec-11.0.ebuild 4156 SHA256 280c2f86164a03c6f29c9b1a97052a96e3440db3a5b7089f7bcc0e78f6b6a240 SHA512 2358f3abf07776f07bdf2b35d3115c2b9db3d9808970827e41574ece785cf2a9c8fd4179b896883d572717b9e1fade88239403d50898a1b3359cdb80fdcf130f WHIRLPOOL c71f337efb4120a4e28e7df79b63394e110bc5e583b68327c485f750028b4f872d789a98fba9e031c56262bd916617a17e3b3a97377280931b0faf5f7b236f30 |
| 4793 |
-MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a |
| 4794 |
|
| 4795 |
diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.confd b/sys-freebsd/freebsd-libexec/files/bootpd.confd |
| 4796 |
deleted file mode 100644 |
| 4797 |
index 6d238e4..0000000 |
| 4798 |
--- a/sys-freebsd/freebsd-libexec/files/bootpd.confd |
| 4799 |
+++ /dev/null |
| 4800 |
@@ -1,7 +0,0 @@ |
| 4801 |
-# Configuration file for /etc/init.d/bootpd |
| 4802 |
- |
| 4803 |
-# Name of the configuration file for bootpd |
| 4804 |
-# bootptab_file="/etc/bootptab" |
| 4805 |
- |
| 4806 |
-# Options to pass to bootpd. See bootpd(8). |
| 4807 |
-# bootpd_opts="" |
| 4808 |
|
| 4809 |
diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.initd b/sys-freebsd/freebsd-libexec/files/bootpd.initd |
| 4810 |
deleted file mode 100644 |
| 4811 |
index 82288eb..0000000 |
| 4812 |
--- a/sys-freebsd/freebsd-libexec/files/bootpd.initd |
| 4813 |
+++ /dev/null |
| 4814 |
@@ -1,27 +0,0 @@ |
| 4815 |
-#!/sbin/openrc-run |
| 4816 |
-# Copyright 2008 Gentoo Foundation |
| 4817 |
-# Distributed under the terms of the GNU General Public License v2 |
| 4818 |
- |
| 4819 |
-depend() { |
| 4820 |
- need net |
| 4821 |
-} |
| 4822 |
- |
| 4823 |
-start() { |
| 4824 |
- local bootptab=${bootptab_file:-/etc/bootptab} |
| 4825 |
- |
| 4826 |
- if ! [ -f "${bootptab}" ]; then |
| 4827 |
- eerror "Unable to find the bootptab file: ${bootptab}" |
| 4828 |
- eend 1 |
| 4829 |
- return 1 |
| 4830 |
- fi |
| 4831 |
- |
| 4832 |
- ebegin "Starting BOOTP server" |
| 4833 |
- start-stop-daemon --start --exec /usr/libexec/bootpd -- ${bootpd_opts} ${bootptab} |
| 4834 |
- eend $? |
| 4835 |
-} |
| 4836 |
- |
| 4837 |
-stop() { |
| 4838 |
- ebegin "Stopping BOOTP server" |
| 4839 |
- start-stop-daemon --stop --exec /usr/libexec/bootpd |
| 4840 |
- eend $? |
| 4841 |
-} |
| 4842 |
|
| 4843 |
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch |
| 4844 |
deleted file mode 100644 |
| 4845 |
index e9c0925..0000000 |
| 4846 |
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch |
| 4847 |
+++ /dev/null |
| 4848 |
@@ -1,28 +0,0 @@ |
| 4849 |
-diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc |
| 4850 |
-index b50e14e..e59a413 100644 |
| 4851 |
---- a/libexec/atf/Makefile.inc |
| 4852 |
-+++ b/libexec/atf/Makefile.inc |
| 4853 |
-@@ -25,7 +25,7 @@ |
| 4854 |
- # |
| 4855 |
- # $FreeBSD: stable/10/libexec/atf/Makefile.inc 271298 2014-09-09 04:00:30Z ngie $ |
| 4856 |
- |
| 4857 |
--CFLAGS+= -DHAVE_CONFIG_H |
| 4858 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
| 4859 |
- |
| 4860 |
- WARNS?= 3 |
| 4861 |
- |
| 4862 |
-diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile |
| 4863 |
-index 77c11db..7449ddb 100644 |
| 4864 |
---- a/libexec/atf/atf-check/Makefile |
| 4865 |
-+++ b/libexec/atf/atf-check/Makefile |
| 4866 |
-@@ -34,8 +34,8 @@ PROG_CXX= atf-check |
| 4867 |
- SRCS= atf-check.cpp |
| 4868 |
- MAN= atf-check.1 |
| 4869 |
- |
| 4870 |
--CFLAGS+= -I${ATF} |
| 4871 |
--CFLAGS+= -DATF_SHELL='"/bin/sh"' |
| 4872 |
-+CXXFLAGS+= -I${ATF} |
| 4873 |
-+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' |
| 4874 |
- |
| 4875 |
- LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++ |
| 4876 |
- LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c |
| 4877 |
|
| 4878 |
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch |
| 4879 |
deleted file mode 100644 |
| 4880 |
index 22d5658..0000000 |
| 4881 |
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch |
| 4882 |
+++ /dev/null |
| 4883 |
@@ -1,13 +0,0 @@ |
| 4884 |
-Fails to build on sparc without using -fPIC |
| 4885 |
- |
| 4886 |
---- libexec/rtld-elf/Makefile.old 2010-01-09 17:17:21 +0100 |
| 4887 |
-+++ libexec/rtld-elf/Makefile 2010-01-09 17:17:33 +0100 |
| 4888 |
-@@ -19,7 +19,7 @@ |
| 4889 |
- MLINKS= rtld.1 ld-elf.so.1.1 \ |
| 4890 |
- rtld.1 ld.so.1 |
| 4891 |
- |
| 4892 |
--CFLAGS+= -fpic -DPIC |
| 4893 |
-+CFLAGS+= -fPIC -DPIC |
| 4894 |
- LDFLAGS+= -shared -Wl,-Bsymbolic |
| 4895 |
- DPADD= ${LIBC_PIC} |
| 4896 |
- LDADD= -lc_pic |
| 4897 |
|
| 4898 |
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch |
| 4899 |
deleted file mode 100644 |
| 4900 |
index c60b2fe..0000000 |
| 4901 |
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch |
| 4902 |
+++ /dev/null |
| 4903 |
@@ -1,40 +0,0 @@ |
| 4904 |
---- head/libexec/rtld-elf/rtld.c 2011/09/15 11:50:09 225582 |
| 4905 |
-+++ head/libexec/rtld-elf/rtld.c 2011/10/08 12:39:47 226155 |
| 4906 |
-@@ -495,8 +495,12 @@ |
| 4907 |
- exit (0); |
| 4908 |
- } |
| 4909 |
- |
| 4910 |
-- /* setup TLS for main thread */ |
| 4911 |
-- dbg("initializing initial thread local storage"); |
| 4912 |
-+ /* |
| 4913 |
-+ * Processing tls relocations requires having the tls offsets |
| 4914 |
-+ * initialized. Prepare offsets before starting initial |
| 4915 |
-+ * relocation processing. |
| 4916 |
-+ */ |
| 4917 |
-+ dbg("initializing initial thread local storage offsets"); |
| 4918 |
- STAILQ_FOREACH(entry, &list_main, link) { |
| 4919 |
- /* |
| 4920 |
- * Allocate all the initial objects out of the static TLS |
| 4921 |
-@@ -504,7 +508,6 @@ |
| 4922 |
- */ |
| 4923 |
- allocate_tls_offset(entry->obj); |
| 4924 |
- } |
| 4925 |
-- allocate_initial_tls(obj_list); |
| 4926 |
- |
| 4927 |
- if (relocate_objects(obj_main, |
| 4928 |
- ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1) |
| 4929 |
-@@ -519,6 +522,14 @@ |
| 4930 |
- exit (0); |
| 4931 |
- } |
| 4932 |
- |
| 4933 |
-+ /* |
| 4934 |
-+ * Setup TLS for main thread. This must be done after the |
| 4935 |
-+ * relocations are processed, since tls initialization section |
| 4936 |
-+ * might be the subject for relocations. |
| 4937 |
-+ */ |
| 4938 |
-+ dbg("initializing initial thread local storage"); |
| 4939 |
-+ allocate_initial_tls(obj_list); |
| 4940 |
-+ |
| 4941 |
- dbg("initializing key program variables"); |
| 4942 |
- set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : ""); |
| 4943 |
- set_program_var("environ", env); |
| 4944 |
|
| 4945 |
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch |
| 4946 |
deleted file mode 100644 |
| 4947 |
index d330009..0000000 |
| 4948 |
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch |
| 4949 |
+++ /dev/null |
| 4950 |
@@ -1,15 +0,0 @@ |
| 4951 |
-Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*. |
| 4952 |
-We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue |
| 4953 |
-about LD_32_* and thus fail to run from the build directory. |
| 4954 |
- |
| 4955 |
-diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h |
| 4956 |
---- libexec.old/rtld-elf/rtld.h 2013-08-24 12:30:26.000000000 -0400 |
| 4957 |
-+++ libexec/rtld-elf/rtld.h 2013-08-26 17:10:19.000000000 -0400 |
| 4958 |
-@@ -47,7 +47,6 @@ |
| 4959 |
- #define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints" |
| 4960 |
- /* For running 32 bit binaries */ |
| 4961 |
- #define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32" |
| 4962 |
--#define LD_ "LD_32_" |
| 4963 |
- #endif |
| 4964 |
- |
| 4965 |
- #ifndef STANDARD_LIBRARY_PATH |
| 4966 |
|
| 4967 |
diff --git a/sys-freebsd/freebsd-libexec/files/ftpd.pamd b/sys-freebsd/freebsd-libexec/files/ftpd.pamd |
| 4968 |
deleted file mode 100644 |
| 4969 |
index 8e90823..0000000 |
| 4970 |
--- a/sys-freebsd/freebsd-libexec/files/ftpd.pamd |
| 4971 |
+++ /dev/null |
| 4972 |
@@ -1,8 +0,0 @@ |
| 4973 |
-# PAM configuration for the "ftpd" service |
| 4974 |
-# |
| 4975 |
- |
| 4976 |
-auth include system-auth |
| 4977 |
-account include system-auth |
| 4978 |
-password include system-auth |
| 4979 |
-session include system-auth |
| 4980 |
- |
| 4981 |
|
| 4982 |
diff --git a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd b/sys-freebsd/freebsd-libexec/files/rquotad.xinetd |
| 4983 |
deleted file mode 100644 |
| 4984 |
index 876cd16..0000000 |
| 4985 |
--- a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd |
| 4986 |
+++ /dev/null |
| 4987 |
@@ -1,11 +0,0 @@ |
| 4988 |
-service rquotad |
| 4989 |
-{ |
| 4990 |
- type = rpc |
| 4991 |
- socket_type = dgram |
| 4992 |
- protocol = udp |
| 4993 |
- wait = yes |
| 4994 |
- user = root |
| 4995 |
- server = /usr/libexec/rpc.rquotad |
| 4996 |
- rpc_version = 1 |
| 4997 |
- disabled = yes |
| 4998 |
-} |
| 4999 |
|
| 5000 |
diff --git a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd b/sys-freebsd/freebsd-libexec/files/rstatd.xinetd |
| 5001 |
deleted file mode 100644 |
| 5002 |
index ba1b819..0000000 |
| 5003 |
--- a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd |
| 5004 |
+++ /dev/null |
| 5005 |
@@ -1,11 +0,0 @@ |
| 5006 |
-service rstatd |
| 5007 |
-{ |
| 5008 |
- type = rpc |
| 5009 |
- socket_type = dgram |
| 5010 |
- protocol = udp |
| 5011 |
- wait = yes |
| 5012 |
- user = root |
| 5013 |
- server = /usr/libexec/rpc.rstatd |
| 5014 |
- rpc_version = 1-3 |
| 5015 |
- disabled = yes |
| 5016 |
-} |
| 5017 |
|
| 5018 |
diff --git a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd b/sys-freebsd/freebsd-libexec/files/rusersd.xinetd |
| 5019 |
deleted file mode 100644 |
| 5020 |
index 5cbe091..0000000 |
| 5021 |
--- a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd |
| 5022 |
+++ /dev/null |
| 5023 |
@@ -1,11 +0,0 @@ |
| 5024 |
-service rusersd |
| 5025 |
-{ |
| 5026 |
- type = rpc |
| 5027 |
- socket_type = dgram |
| 5028 |
- protocol = udp |
| 5029 |
- wait = yes |
| 5030 |
- user = root |
| 5031 |
- server = /usr/libexec/rpc.rusersd |
| 5032 |
- rpc_version = 1-2 |
| 5033 |
- disabled = yes |
| 5034 |
-} |
| 5035 |
|
| 5036 |
diff --git a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd b/sys-freebsd/freebsd-libexec/files/sprayd.xinetd |
| 5037 |
deleted file mode 100644 |
| 5038 |
index 7be5577..0000000 |
| 5039 |
--- a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd |
| 5040 |
+++ /dev/null |
| 5041 |
@@ -1,11 +0,0 @@ |
| 5042 |
-service sprayd |
| 5043 |
-{ |
| 5044 |
- type = rpc |
| 5045 |
- socket_type = dgram |
| 5046 |
- protocol = udp |
| 5047 |
- wait = yes |
| 5048 |
- user = root |
| 5049 |
- server = /usr/libexec/rpc.sprayd |
| 5050 |
- rpc_version = 1 |
| 5051 |
- disabled = yes |
| 5052 |
-} |
| 5053 |
|
| 5054 |
diff --git a/sys-freebsd/freebsd-libexec/files/walld.xinetd b/sys-freebsd/freebsd-libexec/files/walld.xinetd |
| 5055 |
deleted file mode 100644 |
| 5056 |
index 800b84f..0000000 |
| 5057 |
--- a/sys-freebsd/freebsd-libexec/files/walld.xinetd |
| 5058 |
+++ /dev/null |
| 5059 |
@@ -1,11 +0,0 @@ |
| 5060 |
-service walld |
| 5061 |
-{ |
| 5062 |
- type = rpc |
| 5063 |
- socket_type = dgram |
| 5064 |
- protocol = udp |
| 5065 |
- wait = yes |
| 5066 |
- user = root |
| 5067 |
- server = /usr/libexec/rpc.rwalld |
| 5068 |
- rpc_version = 1 |
| 5069 |
- disabled = yes |
| 5070 |
-} |
| 5071 |
|
| 5072 |
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild |
| 5073 |
deleted file mode 100644 |
| 5074 |
index 8aea14d..0000000 |
| 5075 |
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild |
| 5076 |
+++ /dev/null |
| 5077 |
@@ -1,131 +0,0 @@ |
| 5078 |
-# Copyright 1999-2016 Gentoo Foundation |
| 5079 |
-# Distributed under the terms of the GNU General Public License v2 |
| 5080 |
-# $Id$ |
| 5081 |
- |
| 5082 |
-EAPI=5 |
| 5083 |
- |
| 5084 |
-inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs |
| 5085 |
- |
| 5086 |
-DESCRIPTION="FreeBSD libexec things" |
| 5087 |
-SLOT="0" |
| 5088 |
- |
| 5089 |
-if [[ ${PV} != *9999* ]]; then |
| 5090 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 5091 |
-fi |
| 5092 |
- |
| 5093 |
-EXTRACTONLY=" |
| 5094 |
- libexec/ |
| 5095 |
- usr.bin/ |
| 5096 |
- bin/ |
| 5097 |
- contrib/blacklist/ |
| 5098 |
- contrib/dma/ |
| 5099 |
- contrib/hyperv/ |
| 5100 |
- contrib/telnet/ |
| 5101 |
- lib/ |
| 5102 |
- etc/ |
| 5103 |
- usr.sbin/ |
| 5104 |
-" |
| 5105 |
- |
| 5106 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
| 5107 |
- >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}] |
| 5108 |
- pam? ( virtual/pam )" |
| 5109 |
-DEPEND="${RDEPEND} |
| 5110 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 5111 |
- =sys-freebsd/freebsd-sources-${RV}*" |
| 5112 |
-RDEPEND="${RDEPEND} |
| 5113 |
- xinetd? ( sys-apps/xinetd )" |
| 5114 |
- |
| 5115 |
-S="${WORKDIR}/libexec" |
| 5116 |
- |
| 5117 |
-# Remove sendmail, tcp_wrapper and other useless stuff |
| 5118 |
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd" |
| 5119 |
- |
| 5120 |
-IUSE="pam ssl kerberos ipv6 nis xinetd" |
| 5121 |
- |
| 5122 |
-PATCHES=( "${FILESDIR}/${PN}-10.2-atf-check.patch" ) |
| 5123 |
- |
| 5124 |
-pkg_setup() { |
| 5125 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
| 5126 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " |
| 5127 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
| 5128 |
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " |
| 5129 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
| 5130 |
- |
| 5131 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " |
| 5132 |
- |
| 5133 |
- if has_version "<sys-freebsd/freebsd-libexec-11.0"; then |
| 5134 |
- REMOVE_SUBDIRS="${REMOVE_SUBDIRS} rpc.rstatd ulog-helper" |
| 5135 |
- fi |
| 5136 |
- |
| 5137 |
- if has_version "<sys-freebsd/freebsd-ubin-11.0"; then |
| 5138 |
- mymakeopts="${mymakeopts} WITHOUT_MAN_UTILS= " |
| 5139 |
- fi |
| 5140 |
- |
| 5141 |
- if has_version "<sys-freebsd/freebsd-share-${RV}"; then |
| 5142 |
- die ">=sys-freebsd/freebsd-share-${RV} is required." |
| 5143 |
- fi |
| 5144 |
-} |
| 5145 |
- |
| 5146 |
-src_prepare() { |
| 5147 |
- # gcc-5.0 or later, Workaround for critical issue. bug 573358. |
| 5148 |
- [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 |
| 5149 |
- |
| 5150 |
- if [[ ! -e "${WORKDIR}/include" ]]; then |
| 5151 |
- ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.." |
| 5152 |
- fi |
| 5153 |
- # allow upgrade directly from 9.x to 10.2. |
| 5154 |
- if has_version "<sys-freebsd/freebsd-lib-${RV}"; then |
| 5155 |
- # taken from sys/sys/elf_common.h |
| 5156 |
- echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h |
| 5157 |
- echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h |
| 5158 |
- echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h |
| 5159 |
- echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h |
| 5160 |
- echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h |
| 5161 |
- echo "#define NT_FREEBSD_ABI_TAG 1" >> "${S}"/rtld-elf/rtld.h |
| 5162 |
- echo "#define NT_FREEBSD_NOINIT_TAG 2" >> "${S}"/rtld-elf/rtld.h |
| 5163 |
- # taken from sys/sys/fcntl.h |
| 5164 |
- echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h |
| 5165 |
- echo "#define O_VERIFY 0x00200000" >> "${S}"/rtld-elf/rtld.h |
| 5166 |
- # taken from sys/sys/cdefs.h |
| 5167 |
- echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h |
| 5168 |
- # taken from sys/sys/mman.h |
| 5169 |
- echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h |
| 5170 |
- echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h |
| 5171 |
- echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h |
| 5172 |
- echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h |
| 5173 |
- |
| 5174 |
- export mymakeopts="${mymakeopts} WITHOUT_SYMVER= WITHOUT_BLACKLIST_SUPPORT= " |
| 5175 |
- fi |
| 5176 |
-} |
| 5177 |
- |
| 5178 |
-setup_multilib_vars() { |
| 5179 |
- if ! multilib_is_native_abi ; then |
| 5180 |
- cd "${WORKDIR}/libexec/rtld-elf" || die |
| 5181 |
- export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1" |
| 5182 |
- else |
| 5183 |
- cd "${S}" || die |
| 5184 |
- fi |
| 5185 |
- "$@" |
| 5186 |
-} |
| 5187 |
- |
| 5188 |
-src_compile() { |
| 5189 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 5190 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile |
| 5191 |
-} |
| 5192 |
- |
| 5193 |
-src_install() { |
| 5194 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 5195 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
| 5196 |
- |
| 5197 |
- insinto /etc |
| 5198 |
- doins "${WORKDIR}/etc/gettytab" |
| 5199 |
- newinitd "${FILESDIR}/bootpd.initd" bootpd |
| 5200 |
- newconfd "${FILESDIR}/bootpd.confd" bootpd |
| 5201 |
- |
| 5202 |
- if use xinetd; then |
| 5203 |
- for rpcd in rstatd rusersd walld rquotad sprayd; do |
| 5204 |
- insinto /etc/xinetd.d |
| 5205 |
- newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} |
| 5206 |
- done |
| 5207 |
- fi |
| 5208 |
-} |
| 5209 |
|
| 5210 |
diff --git a/sys-freebsd/freebsd-libexec/metadata.xml b/sys-freebsd/freebsd-libexec/metadata.xml |
| 5211 |
deleted file mode 100644 |
| 5212 |
index a00f3ae..0000000 |
| 5213 |
--- a/sys-freebsd/freebsd-libexec/metadata.xml |
| 5214 |
+++ /dev/null |
| 5215 |
@@ -1,8 +0,0 @@ |
| 5216 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 5217 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 5218 |
-<pkgmetadata> |
| 5219 |
-<maintainer type="project"> |
| 5220 |
- <email>bsd@g.o</email> |
| 5221 |
- <name>BSD Project</name> |
| 5222 |
-</maintainer> |
| 5223 |
-</pkgmetadata> |
| 5224 |
|
| 5225 |
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest |
| 5226 |
deleted file mode 100644 |
| 5227 |
index f74b1f5..0000000 |
| 5228 |
--- a/sys-freebsd/freebsd-mk-defs/Manifest |
| 5229 |
+++ /dev/null |
| 5230 |
@@ -1,15 +0,0 @@ |
| 5231 |
-AUX freebsd-mk-defs-10.2-gnu.patch 1853 SHA256 acc69cba0617496e6dcef543198bf5023fb1799b81a458451f58ea2fe63e46a1 SHA512 3913287e294a09bf17a06b8878de40995c27e63c64e79711112c8fc60bb1630e757e8df2ba4ee41720270776ed5df06d7f1cfb9c09e20b566653023466e01a1e WHIRLPOOL 1db20b2a7e39da3b86a4fb09c42980c6c028b1b46baac55c334abccea87f8c6c59f1c3aaa753bcbc2c08e9bad17d342410ca882a75e37edcf9bdfd26ac7ec1ba |
| 5232 |
-AUX freebsd-mk-defs-10.3-gentoo.patch 11845 SHA256 2298f4bead99ffed440d92c7b0d5ff81542bce0cbf07a3fe99f920201297d010 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 WHIRLPOOL 3bfdda2ebfa3ba81ad7464845c9ca9c81c438a0becf848e960d2a30171d506ae868aa5b5151cfce6f5390a5d487e423112c56eb8a4be24885e1df28a256c2da7 |
| 5233 |
-AUX freebsd-mk-defs-11.0-drop-unsupport-cflags.patch 461 SHA256 4f592c92b88173156bb4688ccc2f26d79a37fa2c9905fc93286291fe80fb9533 SHA512 82275fe36338a31f1da5ed7d60d72e3f7f5eb3c8e029700afbcb9bc6219dc3051f35a49d33694d553fb8bce0dcf2fbdfbead5bc6e074fa7d9aebda19da603168 WHIRLPOOL de041217c36baee221543ebfd6fd202bd8a7f753d27cb9118f8c38b4f94bdde6b6726db6967a007f6ed6aba4b65e39aa139ae374858b32e5a895cb7bd3335d33 |
| 5234 |
-AUX freebsd-mk-defs-11.0-gentoo.patch 12840 SHA256 30b491c6037f302f62c6d7d9cec93d32b03333ded0dc4bf54dbd37b0394801c6 SHA512 1b070418a5cb5739c55dc8f3e146ccd1390031ec6c13283573900922cd547310e0ccc18093c81df8836c3f78d6ce4279c3b56d6ad059ecb1d09f2b55b781ff79 WHIRLPOOL 1e3d87efa5303586218e9719e9d7aa86b9168413638c7b98cb64ff670f30c84d024627c66e8f53f8227c62b945333a8d625160caaaa9b7ce943718a8556c9736 |
| 5235 |
-AUX freebsd-mk-defs-11.0-gnu.patch 1946 SHA256 37005860ec5ecb6fb916668af794f43bdc6fa64a79b01ab01e93cb1156ae1435 SHA512 bda6a5396c653b964426a3de80ed9c37205d30f3a863f7df231e0cc708ce3bca65ef46f2ca8bf63ea9a37309e2d3ac74ccbf0000e147688be686c998d940ded0 WHIRLPOOL f6d4a3cc293e87789827a81e8ddd1c81226dc1bb7f894c8a397b494ae418fdc5a75ac1055ff11ff70a3deec9dbc4fb971d580d9ed588f6de9f18a11f584b2109 |
| 5236 |
-AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 SHA256 dbefba73ba46a51a252fe17dbd0530df9fcf613ea990bdfa75689151e24d9ef8 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545 WHIRLPOOL 1a6df92d61ac0d72ce04c0989377e63a08f995990abb0d7c6fbe876594bf005c6fc277d2fc63b54e5f1dafbf7c1d1740da263a6441fede72d13eb617fae4713b |
| 5237 |
-AUX freebsd-mk-defs-11.0-rename-libs.patch 478 SHA256 a776bf656af7c328d2cd02c13e95e2c869240476459d8129e0227254e79a0847 SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2 WHIRLPOOL 5e175ca3eba51680ae1fdd54dfe92eff92f83de4d9b589d7067e0cdd4480991b264da01a28f2a3e237cfe781332ca26e5bbc12f61c5fc9f8e90646a438df0a87 |
| 5238 |
-AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973 |
| 5239 |
-AUX freebsd-mk-defs-8.0-gnu.patch 4074 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0 SHA512 8196f6f01059dd7890af9e0e0be654ad264938f4e8c9a209543b995baf6be43d841417ba8b8340c3c092c8d5f14ad76d578ddcd9267c372999b857ca9a566f03 WHIRLPOOL 28a4600e93855aba192d326beb479743890814c68999290d65a94e7cfa636db897c2c2a2c4ac177a87f8af12ff0a51c1b8ba5a8bb22802e0ef695e7418469d70 |
| 5240 |
-AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924 |
| 5241 |
-AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 |
| 5242 |
-AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1 |
| 5243 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 5244 |
-EBUILD freebsd-mk-defs-11.0.ebuild 1156 SHA256 26382098451176e61b1e9309389fa3dba8d8855b12c5bd53d05feacf3bfc8c01 SHA512 55391c3f2779056847eaa491ca5bff09c0ef0f15f989c702b62358c962a0fa005de0134f2b116809888edc75c9d97352bfe4828bd644ff77d47fcb8172331604 WHIRLPOOL d835a323d911b31bf390c253e3aa0ab31cca28207e1c91ce9db743459c6d42de5ebb9f49840f336e62002443d2cd3bb3803000603cd9fdd971f94df75c1f0994 |
| 5245 |
-MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a |
| 5246 |
|
| 5247 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch |
| 5248 |
deleted file mode 100644 |
| 5249 |
index b88fde2..0000000 |
| 5250 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch |
| 5251 |
+++ /dev/null |
| 5252 |
@@ -1,63 +0,0 @@ |
| 5253 |
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
| 5254 |
-index 80549d8..fd2aac5 100644 |
| 5255 |
---- a/share/mk/bsd.lib.mk |
| 5256 |
-+++ b/share/mk/bsd.lib.mk |
| 5257 |
-@@ -173,7 +173,7 @@ _LIBS= lib${LIB}.a |
| 5258 |
- lib${LIB}.a: ${OBJS} ${STATICOBJS} |
| 5259 |
- @${ECHO} building static ${LIB} library |
| 5260 |
- @rm -f ${.TARGET} |
| 5261 |
-- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 5262 |
-+ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} |
| 5263 |
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
| 5264 |
- .endif |
| 5265 |
- |
| 5266 |
-@@ -186,7 +186,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} |
| 5267 |
- lib${LIB}_p.a: ${POBJS} |
| 5268 |
- @${ECHO} building profiled ${LIB} library |
| 5269 |
- @rm -f ${.TARGET} |
| 5270 |
-- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} |
| 5271 |
-+ @${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} |
| 5272 |
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
| 5273 |
- .endif |
| 5274 |
- |
| 5275 |
-@@ -215,7 +215,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} |
| 5276 |
- .endif |
| 5277 |
- ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ |
| 5278 |
- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 5279 |
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} |
| 5280 |
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} |
| 5281 |
- .if ${MK_CTF} != "no" |
| 5282 |
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} |
| 5283 |
- .endif |
| 5284 |
-@@ -273,13 +273,6 @@ _EXTRADEPEND: |
| 5285 |
- |
| 5286 |
- .if !target(install) |
| 5287 |
- |
| 5288 |
--.if defined(PRECIOUSLIB) |
| 5289 |
--.if !defined(NO_FSCHG) |
| 5290 |
--SHLINSTALLFLAGS+= -fschg |
| 5291 |
--.endif |
| 5292 |
--SHLINSTALLFLAGS+= -S |
| 5293 |
--.endif |
| 5294 |
-- |
| 5295 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 5296 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 5297 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 5298 |
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
| 5299 |
-index 19ad99f..46c4b09 100644 |
| 5300 |
---- a/share/mk/bsd.prog.mk |
| 5301 |
-+++ b/share/mk/bsd.prog.mk |
| 5302 |
-@@ -179,13 +179,6 @@ _EXTRADEPEND: |
| 5303 |
- |
| 5304 |
- .if !target(install) |
| 5305 |
- |
| 5306 |
--.if defined(PRECIOUSPROG) |
| 5307 |
--.if !defined(NO_FSCHG) |
| 5308 |
--INSTALLFLAGS+= -fschg |
| 5309 |
--.endif |
| 5310 |
--INSTALLFLAGS+= -S |
| 5311 |
--.endif |
| 5312 |
-- |
| 5313 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 5314 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 5315 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 5316 |
|
| 5317 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch |
| 5318 |
deleted file mode 100644 |
| 5319 |
index cdc244d..0000000 |
| 5320 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch |
| 5321 |
+++ /dev/null |
| 5322 |
@@ -1,337 +0,0 @@ |
| 5323 |
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk |
| 5324 |
-index a8aa595..476b33b 100644 |
| 5325 |
---- a/share/mk/bsd.doc.mk |
| 5326 |
-+++ b/share/mk/bsd.doc.mk |
| 5327 |
-@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ |
| 5328 |
- realinstall: |
| 5329 |
- .if ${PRINTERDEVICE:Mhtml} |
| 5330 |
- cd ${SRCDIR}; \ |
| 5331 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 5332 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 5333 |
- ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} |
| 5334 |
- .endif |
| 5335 |
- .for _dev in ${PRINTERDEVICE:Nhtml} |
| 5336 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 5337 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 5338 |
- ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} |
| 5339 |
- .endfor |
| 5340 |
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk |
| 5341 |
-index 183cb1c..5b57594 100644 |
| 5342 |
---- a/share/mk/bsd.files.mk |
| 5343 |
-+++ b/share/mk/bsd.files.mk |
| 5344 |
-@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?= ${file:T} |
| 5345 |
- .endif |
| 5346 |
- installfiles-${group}: _${group}INS_${file:T} |
| 5347 |
- _${group}INS_${file:T}: ${file} |
| 5348 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 5349 |
- ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 5350 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 5351 |
- ${.ALLSRC} \ |
| 5352 |
-@@ -52,10 +53,12 @@ _${group}FILES+= ${file} |
| 5353 |
- installfiles-${group}: _${group}INS |
| 5354 |
- _${group}INS: ${_${group}FILES} |
| 5355 |
- .if defined(${group}NAME) |
| 5356 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 5357 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 5358 |
- -m ${${group}MODE} ${.ALLSRC} \ |
| 5359 |
- ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 5360 |
- .else |
| 5361 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 5362 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 5363 |
- -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 5364 |
- .endif |
| 5365 |
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk |
| 5366 |
-index b938221..6b98e72 100644 |
| 5367 |
---- a/share/mk/bsd.incs.mk |
| 5368 |
-+++ b/share/mk/bsd.incs.mk |
| 5369 |
-@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T} |
| 5370 |
- .endif |
| 5371 |
- installincludes: _${group}INS_${header:T} |
| 5372 |
- _${group}INS_${header:T}: ${header} |
| 5373 |
-+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 5374 |
-+ -g ${${group}GRP_${.ALLSRC:T}} \ |
| 5375 |
-+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 5376 |
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 5377 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 5378 |
- ${.ALLSRC} \ |
| 5379 |
-@@ -53,9 +56,13 @@ _${group}INCS+= ${header} |
| 5380 |
- installincludes: _${group}INS |
| 5381 |
- _${group}INS: ${_${group}INCS} |
| 5382 |
- .if defined(${group}NAME) |
| 5383 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 5384 |
-+ ${DESTDIR}${${group}DIR} |
| 5385 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 5386 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 5387 |
- .else |
| 5388 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 5389 |
-+ ${DESTDIR}${${group}DIR} |
| 5390 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 5391 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 5392 |
- .endif |
| 5393 |
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk |
| 5394 |
-index 6275ce3..8d32289 100644 |
| 5395 |
---- a/share/mk/bsd.info.mk |
| 5396 |
-+++ b/share/mk/bsd.info.mk |
| 5397 |
-@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
| 5398 |
- TEX?= tex |
| 5399 |
- DVIPS?= dvips |
| 5400 |
- DVIPS2ASCII?= dvips2ascii |
| 5401 |
-+INSTALL?= install |
| 5402 |
- |
| 5403 |
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
| 5404 |
- |
| 5405 |
-@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
| 5406 |
- INSTALLINFODIRS+= ${x:S/$/-install/} |
| 5407 |
- ${x:S/$/-install/}: |
| 5408 |
- .if !empty(.MAKEFLAGS:M-j) |
| 5409 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 5410 |
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
| 5411 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 5412 |
-- --defsection=${INFOSECTION} \ |
| 5413 |
-- --defentry=${INFOENTRY_${x}} \ |
| 5414 |
-+ --section=${INFOSECTION} \ |
| 5415 |
-+ --entry=${INFOENTRY_${x}} \ |
| 5416 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 5417 |
- .else |
| 5418 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 5419 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 5420 |
-- --defsection=${INFOSECTION} \ |
| 5421 |
-- --defentry=${INFOENTRY_${x}} \ |
| 5422 |
-+ --section=${INFOSECTION} \ |
| 5423 |
-+ --entry=${INFOENTRY_${x}} \ |
| 5424 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 5425 |
- .endif |
| 5426 |
- .endfor |
| 5427 |
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
| 5428 |
-index c753afe..14f74aa 100644 |
| 5429 |
---- a/share/mk/bsd.lib.mk |
| 5430 |
-+++ b/share/mk/bsd.lib.mk |
| 5431 |
-@@ -46,8 +46,6 @@ CFLAGS+= ${DEBUG_FLAGS} |
| 5432 |
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" |
| 5433 |
- CTFFLAGS+= -g |
| 5434 |
- .endif |
| 5435 |
--.else |
| 5436 |
--STRIP?= -s |
| 5437 |
- .endif |
| 5438 |
- |
| 5439 |
- .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ |
| 5440 |
-@@ -296,14 +294,17 @@ realinstall: _libinstall |
| 5441 |
- .ORDER: beforeinstall _libinstall |
| 5442 |
- _libinstall: |
| 5443 |
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 5444 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
| 5445 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5446 |
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR} |
| 5447 |
- .endif |
| 5448 |
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 5449 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
| 5450 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5451 |
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR} |
| 5452 |
- .endif |
| 5453 |
- .if defined(SHLIB_NAME) |
| 5454 |
-+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} |
| 5455 |
- ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5456 |
- ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
| 5457 |
- ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR} |
| 5458 |
-@@ -357,10 +358,12 @@ _libinstall: |
| 5459 |
- .endif # SHLIB_LINK |
| 5460 |
- .endif # SHIB_NAME |
| 5461 |
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" |
| 5462 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
| 5463 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5464 |
- ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR} |
| 5465 |
- .endif |
| 5466 |
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) |
| 5467 |
-+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} |
| 5468 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5469 |
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} |
| 5470 |
- .endif |
| 5471 |
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk |
| 5472 |
-index c097c77..c2994d8 100644 |
| 5473 |
---- a/share/mk/bsd.libnames.mk |
| 5474 |
-+++ b/share/mk/bsd.libnames.mk |
| 5475 |
-@@ -51,7 +51,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
| 5476 |
- LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a |
| 5477 |
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
| 5478 |
- LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a |
| 5479 |
--LIBFL?= "don't use LIBFL, use LIBL" |
| 5480 |
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 5481 |
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
| 5482 |
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
| 5483 |
- LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a |
| 5484 |
-@@ -81,7 +81,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a |
| 5485 |
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
| 5486 |
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
| 5487 |
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
| 5488 |
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
| 5489 |
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 5490 |
- .if ${MK_LDNS} != "no" |
| 5491 |
- LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a |
| 5492 |
- .endif |
| 5493 |
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk |
| 5494 |
-index 574f0f5..b63b117 100644 |
| 5495 |
---- a/share/mk/bsd.links.mk |
| 5496 |
-+++ b/share/mk/bsd.links.mk |
| 5497 |
-@@ -15,6 +15,8 @@ _installlinks: |
| 5498 |
- t=${DESTDIR}$$1; \ |
| 5499 |
- shift; \ |
| 5500 |
- ${ECHO} $$t -\> $$l; \ |
| 5501 |
-+ d=`dirname $$t`; \ |
| 5502 |
-+ test -d $$d || mkdir $$d; \ |
| 5503 |
- ${INSTALL_LINK} $$l $$t; \ |
| 5504 |
- done; true |
| 5505 |
- .endif |
| 5506 |
-@@ -26,6 +28,8 @@ _installlinks: |
| 5507 |
- t=${DESTDIR}$$1; \ |
| 5508 |
- shift; \ |
| 5509 |
- ${ECHO} $$t -\> $$l; \ |
| 5510 |
-+ d=`dirname $$t`; \ |
| 5511 |
-+ test -d $$d || mkdir $$d; \ |
| 5512 |
- ${INSTALL_SYMLINK} $$l $$t; \ |
| 5513 |
- done; true |
| 5514 |
- .endif |
| 5515 |
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk |
| 5516 |
-index 0212d3a..6435936 100644 |
| 5517 |
---- a/share/mk/bsd.man.mk |
| 5518 |
-+++ b/share/mk/bsd.man.mk |
| 5519 |
-@@ -165,9 +165,11 @@ _maninstall: ${MAN} |
| 5520 |
- .if defined(NO_MANCOMPRESS) |
| 5521 |
- .if defined(MANFILTER) |
| 5522 |
- .for __page in ${MAN} |
| 5523 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
| 5524 |
- ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
| 5525 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
| 5526 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 5527 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} |
| 5528 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
| 5529 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
| 5530 |
- .endif |
| 5531 |
-@@ -181,11 +183,14 @@ _maninstall: ${MAN} |
| 5532 |
- esac; \ |
| 5533 |
- page=$$1; shift; sect=$$1; shift; \ |
| 5534 |
- d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
| 5535 |
-+ ${ECHO} ${INSTALL} -d $${d}; \ |
| 5536 |
-+ ${INSTALL} -d $${d}; \ |
| 5537 |
- ${ECHO} ${MINSTALL} $${page} $${d}; \ |
| 5538 |
- ${MINSTALL} $${page} $${d}; \ |
| 5539 |
- done |
| 5540 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 5541 |
- .for __page in ${MAN} |
| 5542 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} |
| 5543 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
| 5544 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
| 5545 |
- .endfor |
| 5546 |
-@@ -193,9 +198,11 @@ _maninstall: ${MAN} |
| 5547 |
- .endif |
| 5548 |
- .else |
| 5549 |
- .for __page in ${MAN} |
| 5550 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} |
| 5551 |
- ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
| 5552 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
| 5553 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 5554 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT} |
| 5555 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
| 5556 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
| 5557 |
- .endif |
| 5558 |
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk |
| 5559 |
-index 28255ea..2bc6546 100644 |
| 5560 |
---- a/share/mk/bsd.nls.mk |
| 5561 |
-+++ b/share/mk/bsd.nls.mk |
| 5562 |
-@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls |
| 5563 |
- # installation rules |
| 5564 |
- # |
| 5565 |
- .for file in ${NLS} |
| 5566 |
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat |
| 5567 |
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ |
| 5568 |
-+NLSNAME_${file:T}= ${NLSNAME}.cat |
| 5569 |
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) |
| 5570 |
- NLSLINKS+= ${file:R} |
| 5571 |
- .endif |
| 5572 |
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk |
| 5573 |
-index 73de02d..c6c30ca 100644 |
| 5574 |
---- a/share/mk/bsd.own.mk |
| 5575 |
-+++ b/share/mk/bsd.own.mk |
| 5576 |
-@@ -206,9 +206,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK} |
| 5577 |
- INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} |
| 5578 |
- |
| 5579 |
- # Common variables |
| 5580 |
--.if !defined(DEBUG_FLAGS) |
| 5581 |
--STRIP?= -s |
| 5582 |
--.endif |
| 5583 |
- |
| 5584 |
- COMPRESS_CMD?= gzip -cn |
| 5585 |
- COMPRESS_EXT?= .gz |
| 5586 |
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
| 5587 |
-index d6d0fa5..93a9046 100644 |
| 5588 |
---- a/share/mk/bsd.prog.mk |
| 5589 |
-+++ b/share/mk/bsd.prog.mk |
| 5590 |
-@@ -42,10 +42,6 @@ CTFFLAGS+= -g |
| 5591 |
- .endif |
| 5592 |
- .endif |
| 5593 |
- |
| 5594 |
--.if !defined(DEBUG_FLAGS) |
| 5595 |
--STRIP?= -s |
| 5596 |
--.endif |
| 5597 |
-- |
| 5598 |
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") |
| 5599 |
- LDFLAGS+= -static |
| 5600 |
- .endif |
| 5601 |
-@@ -200,6 +196,7 @@ realinstall: _proginstall |
| 5602 |
- .ORDER: beforeinstall _proginstall |
| 5603 |
- _proginstall: |
| 5604 |
- .if defined(PROG) |
| 5605 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 5606 |
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 5607 |
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
| 5608 |
- .if ${MK_DEBUG_FILES} != "no" |
| 5609 |
-@@ -233,6 +230,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} |
| 5610 |
- SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
| 5611 |
- _scriptsinstall: _SCRIPTSINS_${script:T} |
| 5612 |
- _SCRIPTSINS_${script:T}: ${script} |
| 5613 |
-+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
| 5614 |
- ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
| 5615 |
- -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
| 5616 |
- ${.ALLSRC} \ |
| 5617 |
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
| 5618 |
-index fee6ccc..c2fe39a 100644 |
| 5619 |
---- a/share/mk/bsd.sys.mk |
| 5620 |
-+++ b/share/mk/bsd.sys.mk |
| 5621 |
-@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD} |
| 5622 |
- .if defined(WARNS) |
| 5623 |
- .if ${WARNS} >= 1 |
| 5624 |
- CWARNFLAGS+= -Wsystem-headers |
| 5625 |
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ |
| 5626 |
-- || !defined(NO_WERROR.clang)) |
| 5627 |
--CWARNFLAGS+= -Werror |
| 5628 |
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
| 5629 |
- .endif # WARNS >= 1 |
| 5630 |
- .if ${WARNS} >= 2 |
| 5631 |
- CWARNFLAGS+= -Wall -Wno-format-y2k |
| 5632 |
-@@ -102,10 +98,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args |
| 5633 |
- CWARNFLAGS+= -Wno-format-nonliteral |
| 5634 |
- .endif # WARNS <= 3 |
| 5635 |
- .endif # CLANG |
| 5636 |
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ |
| 5637 |
-- || !defined(NO_WERROR.clang)) |
| 5638 |
--CWARNFLAGS+= -Werror |
| 5639 |
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
| 5640 |
- .endif # WFORMAT > 0 |
| 5641 |
- .endif # WFORMAT |
| 5642 |
- .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang)) |
| 5643 |
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk |
| 5644 |
-index c270260..68491ce 100644 |
| 5645 |
---- a/share/mk/sys.mk |
| 5646 |
-+++ b/share/mk/sys.mk |
| 5647 |
-@@ -327,12 +327,6 @@ YFLAGS ?= -d |
| 5648 |
- rm -f ${.PREFIX}.tmp.c |
| 5649 |
- ${CTFCONVERT_CMD} |
| 5650 |
- |
| 5651 |
--# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. |
| 5652 |
--__MAKE_CONF?=/etc/make.conf |
| 5653 |
--.if exists(${__MAKE_CONF}) |
| 5654 |
--.include "${__MAKE_CONF}" |
| 5655 |
--.endif |
| 5656 |
-- |
| 5657 |
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) |
| 5658 |
- SHELL= ${__MAKE_SHELL} |
| 5659 |
- .SHELL: path=${__MAKE_SHELL} |
| 5660 |
|
| 5661 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch |
| 5662 |
deleted file mode 100644 |
| 5663 |
index d12bbbe..0000000 |
| 5664 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch |
| 5665 |
+++ /dev/null |
| 5666 |
@@ -1,13 +0,0 @@ |
| 5667 |
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
| 5668 |
-index 37c4d01..e840a25 100644 |
| 5669 |
---- a/share/mk/bsd.sys.mk |
| 5670 |
-+++ b/share/mk/bsd.sys.mk |
| 5671 |
-@@ -112,7 +112,7 @@ CWARNFLAGS+= -Wno-error=unused-function -Wno-error=enum-compare -Wno-error=logic |
| 5672 |
- .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600 |
| 5673 |
- FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ |
| 5674 |
- .else |
| 5675 |
--FORMAT_EXTENSIONS= -fformat-extensions |
| 5676 |
-+FORMAT_EXTENSIONS= |
| 5677 |
- .endif |
| 5678 |
- |
| 5679 |
- .if defined(IGNORE_PRAGMA) |
| 5680 |
|
| 5681 |
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 |
| 5682 |
deleted file mode 100644 |
| 5683 |
index e87bdba..0000000 |
| 5684 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch |
| 5685 |
+++ /dev/null |
| 5686 |
@@ -1,343 +0,0 @@ |
| 5687 |
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk |
| 5688 |
-index 9f4ea2c..0f666bf 100644 |
| 5689 |
---- a/share/mk/bsd.doc.mk |
| 5690 |
-+++ b/share/mk/bsd.doc.mk |
| 5691 |
-@@ -144,10 +144,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ |
| 5692 |
- realinstall: |
| 5693 |
- .if ${PRINTERDEVICE:Mhtml} |
| 5694 |
- cd ${SRCDIR}; \ |
| 5695 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 5696 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 5697 |
- ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/ |
| 5698 |
- .endif |
| 5699 |
- .for _dev in ${PRINTERDEVICE:Nhtml} |
| 5700 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 5701 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 5702 |
- ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/ |
| 5703 |
- .endfor |
| 5704 |
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk |
| 5705 |
-index bc123e1..4707b84 100644 |
| 5706 |
---- a/share/mk/bsd.files.mk |
| 5707 |
-+++ b/share/mk/bsd.files.mk |
| 5708 |
-@@ -63,6 +63,7 @@ stage_as.${file:T}: ${file} |
| 5709 |
- |
| 5710 |
- installfiles-${group}: _${group}INS_${file:T} |
| 5711 |
- _${group}INS_${file:T}: ${file} |
| 5712 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 5713 |
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 5714 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 5715 |
- ${.ALLSRC} \ |
| 5716 |
-@@ -77,10 +78,12 @@ stage_files.${group}: ${_${group}FILES} |
| 5717 |
- installfiles-${group}: _${group}INS |
| 5718 |
- _${group}INS: ${_${group}FILES} |
| 5719 |
- .if defined(${group}NAME) |
| 5720 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 5721 |
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ |
| 5722 |
- -m ${${group}MODE} ${.ALLSRC} \ |
| 5723 |
- ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 5724 |
- .else |
| 5725 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 5726 |
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ |
| 5727 |
- -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/ |
| 5728 |
- .endif |
| 5729 |
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk |
| 5730 |
-index 9636e8c..fc2751a 100644 |
| 5731 |
---- a/share/mk/bsd.incs.mk |
| 5732 |
-+++ b/share/mk/bsd.incs.mk |
| 5733 |
-@@ -62,6 +62,9 @@ stage_includes: stage_as.${header:T} |
| 5734 |
- |
| 5735 |
- installincludes: _${group}INS_${header:T} |
| 5736 |
- _${group}INS_${header:T}: ${header} |
| 5737 |
-+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 5738 |
-+ -g ${${group}GRP_${.ALLSRC:T}} \ |
| 5739 |
-+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 5740 |
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 5741 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 5742 |
- ${.ALLSRC} \ |
| 5743 |
-@@ -77,9 +80,13 @@ stage_includes: stage_files.${group} |
| 5744 |
- installincludes: _${group}INS |
| 5745 |
- _${group}INS: ${_${group}INCS} |
| 5746 |
- .if defined(${group}NAME) |
| 5747 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 5748 |
-+ ${DESTDIR}${${group}DIR} |
| 5749 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 5750 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 5751 |
- .else |
| 5752 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 5753 |
-+ ${DESTDIR}${${group}DIR} |
| 5754 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 5755 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/ |
| 5756 |
- .endif |
| 5757 |
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk |
| 5758 |
-index 0544662..1a7aad7 100644 |
| 5759 |
---- a/share/mk/bsd.info.mk |
| 5760 |
-+++ b/share/mk/bsd.info.mk |
| 5761 |
-@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
| 5762 |
- TEX?= tex |
| 5763 |
- DVIPS?= dvips |
| 5764 |
- DVIPS2ASCII?= dvips2ascii |
| 5765 |
-+INSTALL?= install |
| 5766 |
- |
| 5767 |
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
| 5768 |
- |
| 5769 |
-@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
| 5770 |
- INSTALLINFODIRS+= ${x:S/$/-install/} |
| 5771 |
- ${x:S/$/-install/}: |
| 5772 |
- .if !empty(.MAKEFLAGS:M-j) |
| 5773 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 5774 |
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
| 5775 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 5776 |
-- --defsection=${INFOSECTION} \ |
| 5777 |
-- --defentry=${INFOENTRY_${x}} \ |
| 5778 |
-+ --section=${INFOSECTION} \ |
| 5779 |
-+ --entry=${INFOENTRY_${x}} \ |
| 5780 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 5781 |
- .else |
| 5782 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 5783 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 5784 |
-- --defsection=${INFOSECTION} \ |
| 5785 |
-- --defentry=${INFOENTRY_${x}} \ |
| 5786 |
-+ --section=${INFOSECTION} \ |
| 5787 |
-+ --entry=${INFOENTRY_${x}} \ |
| 5788 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 5789 |
- .endif |
| 5790 |
- .endfor |
| 5791 |
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
| 5792 |
-index bd93e57..92df111 100644 |
| 5793 |
---- a/share/mk/bsd.lib.mk |
| 5794 |
-+++ b/share/mk/bsd.lib.mk |
| 5795 |
-@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS} |
| 5796 |
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" |
| 5797 |
- CTFFLAGS+= -g |
| 5798 |
- .endif |
| 5799 |
--.else |
| 5800 |
--STRIP?= -s |
| 5801 |
- .endif |
| 5802 |
- |
| 5803 |
- .if ${SHLIBDIR:M*lib32*} |
| 5804 |
-@@ -335,14 +333,17 @@ realinstall: _libinstall |
| 5805 |
- .ORDER: beforeinstall _libinstall |
| 5806 |
- _libinstall: |
| 5807 |
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 5808 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
| 5809 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5810 |
- ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ |
| 5811 |
- .endif |
| 5812 |
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 5813 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
| 5814 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5815 |
- ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ |
| 5816 |
- .endif |
| 5817 |
- .if defined(SHLIB_NAME) |
| 5818 |
-+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} |
| 5819 |
- ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5820 |
- ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
| 5821 |
- ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ |
| 5822 |
-@@ -387,10 +388,12 @@ _libinstall: |
| 5823 |
- .endif # SHLIB_LINK |
| 5824 |
- .endif # SHIB_NAME |
| 5825 |
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" |
| 5826 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
| 5827 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5828 |
- ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ |
| 5829 |
- .endif |
| 5830 |
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) |
| 5831 |
-+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} |
| 5832 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 5833 |
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/ |
| 5834 |
- .endif |
| 5835 |
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk |
| 5836 |
-index 0844ae2..caec715 100644 |
| 5837 |
---- a/share/mk/bsd.libnames.mk |
| 5838 |
-+++ b/share/mk/bsd.libnames.mk |
| 5839 |
-@@ -63,7 +63,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
| 5840 |
- LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a |
| 5841 |
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
| 5842 |
- LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a |
| 5843 |
--LIBFL?= "don't use LIBFL, use LIBL" |
| 5844 |
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 5845 |
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
| 5846 |
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
| 5847 |
- LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a |
| 5848 |
-@@ -92,7 +92,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a |
| 5849 |
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
| 5850 |
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
| 5851 |
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
| 5852 |
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
| 5853 |
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 5854 |
- LIBLN?= "don't use LIBLN, use LIBL" |
| 5855 |
- LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a |
| 5856 |
- LIBM?= ${DESTDIR}${LIBDIR}/libm.a |
| 5857 |
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk |
| 5858 |
-index 0c7d063..f5d1779 100644 |
| 5859 |
---- a/share/mk/bsd.links.mk |
| 5860 |
-+++ b/share/mk/bsd.links.mk |
| 5861 |
-@@ -16,9 +16,11 @@ afterinstall: _installlinks |
| 5862 |
- _installlinks: |
| 5863 |
- .for s t in ${LINKS} |
| 5864 |
- @${ECHO} "${t} -> ${s}" ;\ |
| 5865 |
-+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\ |
| 5866 |
- ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t} |
| 5867 |
- .endfor |
| 5868 |
- .for s t in ${SYMLINKS} |
| 5869 |
- @${ECHO} "${t} -> ${s}" ;\ |
| 5870 |
-+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\ |
| 5871 |
- ${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}/${t} |
| 5872 |
- .endfor |
| 5873 |
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk |
| 5874 |
-index 6f78501..bc9a1a6 100644 |
| 5875 |
---- a/share/mk/bsd.man.mk |
| 5876 |
-+++ b/share/mk/bsd.man.mk |
| 5877 |
-@@ -188,9 +188,11 @@ maninstall: ${MAN} |
| 5878 |
- .if ${MK_MANCOMPRESS} == "no" |
| 5879 |
- .if defined(MANFILTER) |
| 5880 |
- .for __page in ${MAN} |
| 5881 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
| 5882 |
- ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
| 5883 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
| 5884 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 5885 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
| 5886 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
| 5887 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
| 5888 |
- .endif |
| 5889 |
-@@ -204,11 +206,14 @@ maninstall: ${MAN} |
| 5890 |
- esac; \ |
| 5891 |
- page=$$1; shift; sect=$$1; shift; \ |
| 5892 |
- d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
| 5893 |
-+ ${ECHO} ${INSTALL} -d $${d}; \ |
| 5894 |
-+ ${INSTALL} -d $${d}; \ |
| 5895 |
- ${ECHO} ${MINSTALL} $${page} $${d}; \ |
| 5896 |
- ${MINSTALL} $${page} $${d}; \ |
| 5897 |
- done |
| 5898 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 5899 |
- .for __page in ${MAN} |
| 5900 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
| 5901 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
| 5902 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
| 5903 |
- .endfor |
| 5904 |
-@@ -216,9 +221,11 @@ maninstall: ${MAN} |
| 5905 |
- .endif # defined(MANFILTER) |
| 5906 |
- .else # ${MK_MANCOMPRESS} == "yes" |
| 5907 |
- .for __page in ${MAN} |
| 5908 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
| 5909 |
- ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
| 5910 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/ |
| 5911 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 5912 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT} |
| 5913 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
| 5914 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
| 5915 |
- .endif |
| 5916 |
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk |
| 5917 |
-index 87a7347..c860c97 100644 |
| 5918 |
---- a/share/mk/bsd.nls.mk |
| 5919 |
-+++ b/share/mk/bsd.nls.mk |
| 5920 |
-@@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP} |
| 5921 |
- SYMLINKS+= ${NLSSYMLINKS} |
| 5922 |
- .endif |
| 5923 |
- .for file in ${NLS} |
| 5924 |
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat |
| 5925 |
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ |
| 5926 |
-+NLSNAME_${file:T}= ${NLSNAME}.cat |
| 5927 |
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) |
| 5928 |
- .if !empty(NLSLINKS_${file:R}:M${file:R}) |
| 5929 |
- .error NLSLINKS_${file:R} contains itself: ${file:R} |
| 5930 |
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk |
| 5931 |
-index c10e492..5984215 100644 |
| 5932 |
---- a/share/mk/bsd.own.mk |
| 5933 |
-+++ b/share/mk/bsd.own.mk |
| 5934 |
-@@ -233,9 +233,6 @@ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} |
| 5935 |
- INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} |
| 5936 |
- |
| 5937 |
- # Common variables |
| 5938 |
--.if !defined(DEBUG_FLAGS) |
| 5939 |
--STRIP?= -s |
| 5940 |
--.endif |
| 5941 |
- |
| 5942 |
- COMPRESS_CMD?= gzip -cn |
| 5943 |
- COMPRESS_EXT?= .gz |
| 5944 |
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
| 5945 |
-index f1a5c65..3b1ecf8 100644 |
| 5946 |
---- a/share/mk/bsd.prog.mk |
| 5947 |
-+++ b/share/mk/bsd.prog.mk |
| 5948 |
-@@ -44,10 +44,6 @@ CTFFLAGS+= -g |
| 5949 |
- .endif |
| 5950 |
- .endif |
| 5951 |
- |
| 5952 |
--.if !defined(DEBUG_FLAGS) |
| 5953 |
--STRIP?= -s |
| 5954 |
--.endif |
| 5955 |
-- |
| 5956 |
- .if defined(NO_ROOT) |
| 5957 |
- .if !defined(TAGS) || ! ${TAGS:Mpackage=*} |
| 5958 |
- TAGS+= package=${PACKAGE:Uruntime} |
| 5959 |
-@@ -217,6 +213,7 @@ realinstall: _proginstall |
| 5960 |
- .ORDER: beforeinstall _proginstall |
| 5961 |
- _proginstall: |
| 5962 |
- .if defined(PROG) |
| 5963 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 5964 |
- ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 5965 |
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
| 5966 |
- .if ${MK_DEBUG_FILES} != "no" |
| 5967 |
-@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
| 5968 |
- STAGE_AS_${script:T}= ${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}} |
| 5969 |
- _scriptsinstall: _SCRIPTSINS_${script:T} |
| 5970 |
- _SCRIPTSINS_${script:T}: ${script} |
| 5971 |
-+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
| 5972 |
- ${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
| 5973 |
- -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
| 5974 |
- ${.ALLSRC} \ |
| 5975 |
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
| 5976 |
-index 0ae45c5..37c4d01 100644 |
| 5977 |
---- a/share/mk/bsd.sys.mk |
| 5978 |
-+++ b/share/mk/bsd.sys.mk |
| 5979 |
-@@ -29,9 +29,6 @@ CFLAGS+= -std=${CSTD} |
| 5980 |
- .if defined(WARNS) |
| 5981 |
- .if ${WARNS} >= 1 |
| 5982 |
- CWARNFLAGS+= -Wsystem-headers |
| 5983 |
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) |
| 5984 |
--CWARNFLAGS+= -Werror |
| 5985 |
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} |
| 5986 |
- .endif # WARNS >= 1 |
| 5987 |
- .if ${WARNS} >= 2 |
| 5988 |
- CWARNFLAGS+= -Wall -Wno-format-y2k |
| 5989 |
-@@ -100,9 +97,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args |
| 5990 |
- .if ${WARNS} <= 3 |
| 5991 |
- CWARNFLAGS.clang+= -Wno-format-nonliteral |
| 5992 |
- .endif # WARNS <= 3 |
| 5993 |
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) |
| 5994 |
--CWARNFLAGS+= -Werror |
| 5995 |
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} |
| 5996 |
- .endif # WFORMAT > 0 |
| 5997 |
- .endif # WFORMAT |
| 5998 |
- .if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE}) |
| 5999 |
-@@ -151,6 +145,13 @@ CFLAGS.clang+= -fno-dwarf2-cfi-asm |
| 6000 |
- # but not yet. |
| 6001 |
- CXXFLAGS.clang+= -Wno-c++11-extensions |
| 6002 |
- |
| 6003 |
-+.if ${MK_SSP} == "no" |
| 6004 |
-+# gcc-4.9, -fstack-protector-strong is enabled by default. |
| 6005 |
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698. |
| 6006 |
-+SSP_CFLAGS?= -fno-stack-protector |
| 6007 |
-+CFLAGS+= ${SSP_CFLAGS} |
| 6008 |
-+.endif |
| 6009 |
-+ |
| 6010 |
- .if ${MK_SSP} != "no" && \ |
| 6011 |
- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" |
| 6012 |
- .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \ |
| 6013 |
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk |
| 6014 |
-index 5cfd0bb..25abf8e 100644 |
| 6015 |
---- a/share/mk/sys.mk |
| 6016 |
-+++ b/share/mk/sys.mk |
| 6017 |
-@@ -418,12 +418,6 @@ YFLAGS ?= -d |
| 6018 |
- rm -f ${.PREFIX}.tmp.c |
| 6019 |
- ${CTFCONVERT_CMD} |
| 6020 |
- |
| 6021 |
--# Pull in global settings. |
| 6022 |
--__MAKE_CONF?=/etc/make.conf |
| 6023 |
--.if exists(${__MAKE_CONF}) |
| 6024 |
--.include "${__MAKE_CONF}" |
| 6025 |
--.endif |
| 6026 |
-- |
| 6027 |
- # late include for customization |
| 6028 |
- .sinclude <local.sys.mk> |
| 6029 |
- |
| 6030 |
|
| 6031 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch |
| 6032 |
deleted file mode 100644 |
| 6033 |
index 97e882d..0000000 |
| 6034 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch |
| 6035 |
+++ /dev/null |
| 6036 |
@@ -1,63 +0,0 @@ |
| 6037 |
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
| 6038 |
-index 92df111..88c75d9 100644 |
| 6039 |
---- a/share/mk/bsd.lib.mk |
| 6040 |
-+++ b/share/mk/bsd.lib.mk |
| 6041 |
-@@ -184,7 +184,7 @@ _LIBS= lib${LIB_PRIVATE}${LIB}.a |
| 6042 |
- lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS} |
| 6043 |
- @${ECHO} building static ${LIB} library |
| 6044 |
- @rm -f ${.TARGET} |
| 6045 |
-- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 6046 |
-+ ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} |
| 6047 |
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
| 6048 |
- .endif |
| 6049 |
- |
| 6050 |
-@@ -199,7 +199,7 @@ CLEANFILES+= ${POBJS} |
| 6051 |
- lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS} |
| 6052 |
- @${ECHO} building profiled ${LIB} library |
| 6053 |
- @rm -f ${.TARGET} |
| 6054 |
-- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${POBJS} | tsort -q` ${ARADD} |
| 6055 |
-+ ${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} |
| 6056 |
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
| 6057 |
- .endif |
| 6058 |
- |
| 6059 |
-@@ -247,7 +247,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} |
| 6060 |
- .endif |
| 6061 |
- ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ |
| 6062 |
- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 6063 |
-- `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${SOBJS} | tsort -q` ${LDADD} |
| 6064 |
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} |
| 6065 |
- .if ${MK_CTF} != "no" |
| 6066 |
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} |
| 6067 |
- .endif |
| 6068 |
-@@ -312,13 +312,6 @@ _EXTRADEPEND: |
| 6069 |
- |
| 6070 |
- .if !target(install) |
| 6071 |
- |
| 6072 |
--.if defined(PRECIOUSLIB) |
| 6073 |
--.if !defined(NO_FSCHG) |
| 6074 |
--SHLINSTALLFLAGS+= -fschg |
| 6075 |
--.endif |
| 6076 |
--SHLINSTALLFLAGS+= -S |
| 6077 |
--.endif |
| 6078 |
-- |
| 6079 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 6080 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 6081 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 6082 |
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
| 6083 |
-index 3b1ecf8..26ac9c5 100644 |
| 6084 |
---- a/share/mk/bsd.prog.mk |
| 6085 |
-+++ b/share/mk/bsd.prog.mk |
| 6086 |
-@@ -196,13 +196,6 @@ _EXTRADEPEND: |
| 6087 |
- |
| 6088 |
- .if !target(install) |
| 6089 |
- |
| 6090 |
--.if defined(PRECIOUSPROG) |
| 6091 |
--.if !defined(NO_FSCHG) |
| 6092 |
--INSTALLFLAGS+= -fschg |
| 6093 |
--.endif |
| 6094 |
--INSTALLFLAGS+= -S |
| 6095 |
--.endif |
| 6096 |
-- |
| 6097 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 6098 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 6099 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 6100 |
|
| 6101 |
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 |
| 6102 |
deleted file mode 100644 |
| 6103 |
index 5da025d..0000000 |
| 6104 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch |
| 6105 |
+++ /dev/null |
| 6106 |
@@ -1,13 +0,0 @@ |
| 6107 |
-diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk |
| 6108 |
-index 14489a8..c993f7c 100644 |
| 6109 |
---- a/share/mk/src.libnames.mk |
| 6110 |
-+++ b/share/mk/src.libnames.mk |
| 6111 |
-@@ -245,7 +245,7 @@ _DP_radius= crypto |
| 6112 |
- .endif |
| 6113 |
- _DP_procstat= kvm util elf |
| 6114 |
- .if ${MK_CXX} == "yes" |
| 6115 |
--.if ${MK_LIBCPLUSPLUS} != "no" |
| 6116 |
-+.if ${COMPILER_TYPE} == "clang" |
| 6117 |
- _DP_proc= cxxrt |
| 6118 |
- .else |
| 6119 |
- _DP_proc= supcplusplus |
| 6120 |
|
| 6121 |
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 |
| 6122 |
deleted file mode 100644 |
| 6123 |
index fd72f1f..0000000 |
| 6124 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch |
| 6125 |
+++ /dev/null |
| 6126 |
@@ -1,16 +0,0 @@ |
| 6127 |
-diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk |
| 6128 |
-index 249ac52..14489a8 100644 |
| 6129 |
---- a/share/mk/src.libnames.mk |
| 6130 |
-+++ b/share/mk/src.libnames.mk |
| 6131 |
-@@ -343,6 +343,11 @@ LIBATF_CXX= ${DESTDIR}${LIBDIR}/libprivateatf-c++.a |
| 6132 |
- LDADD_atf_c= -lprivateatf-c |
| 6133 |
- LDADD_atf_cxx= -lprivateatf-c++ |
| 6134 |
- |
| 6135 |
-+LDADD_bsdxml= -lexpat |
| 6136 |
-+LDADD_l= -lfl |
| 6137 |
-+LDADD_termcap= -lncurses |
| 6138 |
-+LDADD_termcapw= -lncursesw |
| 6139 |
-+ |
| 6140 |
- .for _l in ${_PRIVATELIBS} |
| 6141 |
- LIB${_l:tu}?= ${DESTDIR}${LIBDIR}/libprivate${_l}.a |
| 6142 |
- .endfor |
| 6143 |
|
| 6144 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch |
| 6145 |
deleted file mode 100644 |
| 6146 |
index f17f6c4..0000000 |
| 6147 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch |
| 6148 |
+++ /dev/null |
| 6149 |
@@ -1,332 +0,0 @@ |
| 6150 |
-Index: share/mk/bsd.doc.mk |
| 6151 |
-=================================================================== |
| 6152 |
---- share/mk/bsd.doc.mk.orig |
| 6153 |
-+++ share/mk/bsd.doc.mk |
| 6154 |
-@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ |
| 6155 |
- realinstall: |
| 6156 |
- .for _dev in ${PRINTERDEVICE:Mhtml} |
| 6157 |
- cd ${SRCDIR}; \ |
| 6158 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} |
| 6159 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 6160 |
- ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} |
| 6161 |
- .endfor |
| 6162 |
- .for _dev in ${PRINTERDEVICE:Nhtml} |
| 6163 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} |
| 6164 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 6165 |
- ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} |
| 6166 |
- .endfor |
| 6167 |
-Index: share/mk/bsd.files.mk |
| 6168 |
-=================================================================== |
| 6169 |
---- share/mk/bsd.files.mk.orig |
| 6170 |
-+++ share/mk/bsd.files.mk |
| 6171 |
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} |
| 6172 |
- .endif |
| 6173 |
- installfiles: _${group}INS_${file:T} |
| 6174 |
- _${group}INS_${file:T}: ${file} |
| 6175 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} |
| 6176 |
- ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6177 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 6178 |
- ${.ALLSRC} \ |
| 6179 |
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file} |
| 6180 |
- installfiles: _${group}INS |
| 6181 |
- _${group}INS: ${_${group}FILES} |
| 6182 |
- .if defined(${group}NAME) |
| 6183 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 6184 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 6185 |
- -m ${${group}MODE} ${.ALLSRC} \ |
| 6186 |
- ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 6187 |
- .else |
| 6188 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 6189 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 6190 |
- -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 6191 |
- .endif |
| 6192 |
-Index: share/mk/bsd.incs.mk |
| 6193 |
-=================================================================== |
| 6194 |
---- share/mk/bsd.incs.mk.orig |
| 6195 |
-+++ share/mk/bsd.incs.mk |
| 6196 |
-@@ -41,6 +41,10 @@ ${group}NAME_${header:T}?= ${header:T} |
| 6197 |
- .endif |
| 6198 |
- installincludes: _${group}INS_${header:T} |
| 6199 |
- _${group}INS_${header:T}: ${header} |
| 6200 |
-+ |
| 6201 |
-+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6202 |
-+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 6203 |
-+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} |
| 6204 |
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6205 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 6206 |
- ${.ALLSRC} \ |
| 6207 |
-@@ -53,9 +57,11 @@ _${group}INCS+= ${header} |
| 6208 |
- installincludes: _${group}INS |
| 6209 |
- _${group}INS: ${_${group}INCS} |
| 6210 |
- .if defined(${group}NAME) |
| 6211 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 6212 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6213 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 6214 |
- .else |
| 6215 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 6216 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6217 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 6218 |
- .endif |
| 6219 |
-Index: share/mk/bsd.info.mk |
| 6220 |
-=================================================================== |
| 6221 |
---- share/mk/bsd.info.mk.orig |
| 6222 |
-+++ share/mk/bsd.info.mk |
| 6223 |
-@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
| 6224 |
- TEX?= tex |
| 6225 |
- DVIPS?= dvips |
| 6226 |
- DVIPS2ASCII?= dvips2ascii |
| 6227 |
-+INSTALL?= install |
| 6228 |
- |
| 6229 |
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
| 6230 |
- |
| 6231 |
-@@ -144,12 +145,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
| 6232 |
- INSTALLINFODIRS+= ${x:S/$/-install/} |
| 6233 |
- ${x:S/$/-install/}: |
| 6234 |
- .if !empty(.MAKEFLAGS:M-j) |
| 6235 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 6236 |
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
| 6237 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 6238 |
- --defsection=${INFOSECTION} \ |
| 6239 |
- --defentry=${INFOENTRY_${x}} \ |
| 6240 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 6241 |
- .else |
| 6242 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 6243 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 6244 |
- --defsection=${INFOSECTION} \ |
| 6245 |
- --defentry=${INFOENTRY_${x}} \ |
| 6246 |
-Index: share/mk/bsd.lib.mk |
| 6247 |
-=================================================================== |
| 6248 |
---- share/mk/bsd.lib.mk.orig |
| 6249 |
-+++ share/mk/bsd.lib.mk |
| 6250 |
-@@ -41,10 +41,6 @@ CTFFLAGS+= -g |
| 6251 |
- .endif |
| 6252 |
- .endif |
| 6253 |
- |
| 6254 |
--.if !defined(DEBUG_FLAGS) |
| 6255 |
--STRIP?= -s |
| 6256 |
--.endif |
| 6257 |
-- |
| 6258 |
- .include <bsd.libnames.mk> |
| 6259 |
- |
| 6260 |
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries |
| 6261 |
-@@ -276,14 +272,17 @@ realinstall: _libinstall |
| 6262 |
- .ORDER: beforeinstall _libinstall |
| 6263 |
- _libinstall: |
| 6264 |
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 6265 |
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 6266 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6267 |
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} |
| 6268 |
- .endif |
| 6269 |
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 6270 |
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 6271 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6272 |
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} |
| 6273 |
- .endif |
| 6274 |
- .if defined(SHLIB_NAME) |
| 6275 |
-+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} |
| 6276 |
- ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6277 |
- ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
| 6278 |
- ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} |
| 6279 |
-Index: share/mk/bsd.libnames.mk |
| 6280 |
-=================================================================== |
| 6281 |
---- share/mk/bsd.libnames.mk.orig |
| 6282 |
-+++ share/mk/bsd.libnames.mk |
| 6283 |
-@@ -46,7 +46,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf. |
| 6284 |
- LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a |
| 6285 |
- LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
| 6286 |
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
| 6287 |
--LIBFL?= "don't use LIBFL, use LIBL" |
| 6288 |
-+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a |
| 6289 |
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
| 6290 |
- LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a |
| 6291 |
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
| 6292 |
-@@ -77,7 +77,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca |
| 6293 |
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
| 6294 |
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
| 6295 |
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
| 6296 |
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
| 6297 |
-+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a |
| 6298 |
- LIBLN?= "don't use LIBLN, use LIBL" |
| 6299 |
- .if ${MK_BIND} != "no" |
| 6300 |
- LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a |
| 6301 |
-Index: share/mk/bsd.man.mk |
| 6302 |
-=================================================================== |
| 6303 |
---- share/mk/bsd.man.mk.orig |
| 6304 |
-+++ share/mk/bsd.man.mk |
| 6305 |
-@@ -165,9 +165,11 @@ _maninstall: ${MAN} |
| 6306 |
- .if defined(NO_MANCOMPRESS) |
| 6307 |
- .if defined(MANFILTER) |
| 6308 |
- .for __page in ${MAN} |
| 6309 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
| 6310 |
- ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
| 6311 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
| 6312 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 6313 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
| 6314 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
| 6315 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
| 6316 |
- .endif |
| 6317 |
-@@ -181,11 +183,14 @@ _maninstall: ${MAN} |
| 6318 |
- esac; \ |
| 6319 |
- page=$$1; shift; sect=$$1; shift; \ |
| 6320 |
- d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
| 6321 |
-+ ${ECHO} ${INSTALL} -d $${d}; \ |
| 6322 |
-+ ${INSTALL} -d $${d}; \ |
| 6323 |
- ${ECHO} ${MINSTALL} $${page} $${d}; \ |
| 6324 |
- ${MINSTALL} $${page} $${d}; \ |
| 6325 |
- done |
| 6326 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 6327 |
- .for __page in ${MAN} |
| 6328 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} |
| 6329 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
| 6330 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
| 6331 |
- .endfor |
| 6332 |
-@@ -193,9 +198,11 @@ _maninstall: ${MAN} |
| 6333 |
- .endif |
| 6334 |
- .else |
| 6335 |
- .for __page in ${MAN} |
| 6336 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} |
| 6337 |
- ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
| 6338 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
| 6339 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 6340 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} |
| 6341 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
| 6342 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
| 6343 |
- .endif |
| 6344 |
-Index: share/mk/bsd.prog.mk |
| 6345 |
-=================================================================== |
| 6346 |
---- share/mk/bsd.prog.mk.orig |
| 6347 |
-+++ share/mk/bsd.prog.mk |
| 6348 |
-@@ -27,10 +27,6 @@ CTFFLAGS+= -g |
| 6349 |
- CFLAGS+=${CRUNCH_CFLAGS} |
| 6350 |
- .endif |
| 6351 |
- |
| 6352 |
--.if !defined(DEBUG_FLAGS) |
| 6353 |
--STRIP?= -s |
| 6354 |
--.endif |
| 6355 |
-- |
| 6356 |
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") |
| 6357 |
- LDFLAGS+= -static |
| 6358 |
- .endif |
| 6359 |
-@@ -152,9 +148,11 @@ realinstall: _proginstall |
| 6360 |
- _proginstall: |
| 6361 |
- .if defined(PROG) |
| 6362 |
- .if defined(PROGNAME) |
| 6363 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 6364 |
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 6365 |
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
| 6366 |
- .else |
| 6367 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 6368 |
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 6369 |
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} |
| 6370 |
- .endif |
| 6371 |
-@@ -182,6 +180,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} |
| 6372 |
- SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
| 6373 |
- _scriptsinstall: _SCRIPTSINS_${script:T} |
| 6374 |
- _SCRIPTSINS_${script:T}: ${script} |
| 6375 |
-+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
| 6376 |
- ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
| 6377 |
- -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
| 6378 |
- ${.ALLSRC} \ |
| 6379 |
-Index: share/mk/bsd.sys.mk |
| 6380 |
-=================================================================== |
| 6381 |
---- share/mk/bsd.sys.mk.orig |
| 6382 |
-+++ share/mk/bsd.sys.mk |
| 6383 |
-@@ -28,9 +28,6 @@ CFLAGS += -std=${CSTD} |
| 6384 |
- . if defined(WARNS) |
| 6385 |
- . if ${WARNS} >= 1 |
| 6386 |
- CWARNFLAGS += -Wsystem-headers |
| 6387 |
--. if !defined(NO_WERROR) |
| 6388 |
--CWARNFLAGS += -Werror |
| 6389 |
--. endif |
| 6390 |
- . endif |
| 6391 |
- . if ${WARNS} >= 2 |
| 6392 |
- CWARNFLAGS += -Wall -Wno-format-y2k |
| 6393 |
-@@ -64,9 +61,6 @@ WFORMAT = 1 |
| 6394 |
- . if ${WFORMAT} > 0 |
| 6395 |
- #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args |
| 6396 |
- CWARNFLAGS += -Wformat=2 -Wno-format-extra-args |
| 6397 |
--. if !defined(NO_WERROR) |
| 6398 |
--CWARNFLAGS += -Werror |
| 6399 |
--. endif |
| 6400 |
- . endif |
| 6401 |
- . endif |
| 6402 |
- .endif |
| 6403 |
-Index: share/mk/bsd.links.mk |
| 6404 |
-=================================================================== |
| 6405 |
---- share/mk/bsd.links.mk.orig |
| 6406 |
-+++ share/mk/bsd.links.mk |
| 6407 |
-@@ -15,6 +15,8 @@ _installlinks: |
| 6408 |
- t=${DESTDIR}$$1; \ |
| 6409 |
- shift; \ |
| 6410 |
- ${ECHO} $$t -\> $$l; \ |
| 6411 |
-+ d=`dirname $$t`; \ |
| 6412 |
-+ test -d $$d || mkdir $$d; \ |
| 6413 |
- ln -f $$l $$t; \ |
| 6414 |
- done; true |
| 6415 |
- .endif |
| 6416 |
-@@ -26,6 +28,8 @@ _installlinks: |
| 6417 |
- t=${DESTDIR}$$1; \ |
| 6418 |
- shift; \ |
| 6419 |
- ${ECHO} $$t -\> $$l; \ |
| 6420 |
-+ d=`dirname $$t`; \ |
| 6421 |
-+ test -d $$d || mkdir $$d; \ |
| 6422 |
- ln -fs $$l $$t; \ |
| 6423 |
- done; true |
| 6424 |
- .endif |
| 6425 |
-Index: share/mk/bsd.own.mk |
| 6426 |
-=================================================================== |
| 6427 |
---- share/mk/bsd.own.mk.orig |
| 6428 |
-+++ share/mk/bsd.own.mk |
| 6429 |
-@@ -164,11 +164,6 @@ NLSMODE?= ${NOBINMODE} |
| 6430 |
- |
| 6431 |
- INCLUDEDIR?= /usr/include |
| 6432 |
- |
| 6433 |
--# Common variables |
| 6434 |
--.if !defined(DEBUG_FLAGS) |
| 6435 |
--STRIP?= -s |
| 6436 |
--.endif |
| 6437 |
-- |
| 6438 |
- COMPRESS_CMD?= gzip -cn |
| 6439 |
- COMPRESS_EXT?= .gz |
| 6440 |
- |
| 6441 |
-Index: share/mk/sys.mk |
| 6442 |
-=================================================================== |
| 6443 |
---- share/mk/sys.mk.orig |
| 6444 |
-+++ share/mk/sys.mk |
| 6445 |
-@@ -34,11 +34,11 @@ AFLAGS ?= |
| 6446 |
- CC ?= c89 |
| 6447 |
- CFLAGS ?= -O |
| 6448 |
- .else |
| 6449 |
--CC ?= cc |
| 6450 |
-+CC ?= gcc |
| 6451 |
- .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" |
| 6452 |
--CFLAGS ?= -O -pipe |
| 6453 |
-+CFLAGS ?= -pipe |
| 6454 |
- .else |
| 6455 |
--CFLAGS ?= -O2 -pipe |
| 6456 |
-+CFLAGS ?= -pipe |
| 6457 |
- .endif |
| 6458 |
- .if defined(NO_STRICT_ALIASING) |
| 6459 |
- CFLAGS += -fno-strict-aliasing |
| 6460 |
-@@ -64,7 +64,7 @@ CFLAGS += -g |
| 6461 |
- .endif |
| 6462 |
- .endif |
| 6463 |
- |
| 6464 |
--CXX ?= c++ |
| 6465 |
-+CXX ?= g++ |
| 6466 |
- CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} |
| 6467 |
- |
| 6468 |
- CPP ?= cpp |
| 6469 |
-@@ -333,12 +333,6 @@ YFLAGS ?= -d |
| 6470 |
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} |
| 6471 |
- .endif |
| 6472 |
- |
| 6473 |
--# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. |
| 6474 |
--__MAKE_CONF?=/etc/make.conf |
| 6475 |
--.if exists(${__MAKE_CONF}) |
| 6476 |
--.include "${__MAKE_CONF}" |
| 6477 |
--.endif |
| 6478 |
-- |
| 6479 |
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) |
| 6480 |
- SHELL= ${__MAKE_SHELL} |
| 6481 |
- .SHELL: path=${__MAKE_SHELL} |
| 6482 |
|
| 6483 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch |
| 6484 |
deleted file mode 100644 |
| 6485 |
index 41c4de4..0000000 |
| 6486 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch |
| 6487 |
+++ /dev/null |
| 6488 |
@@ -1,121 +0,0 @@ |
| 6489 |
-Index: mk/bsd.incs.mk |
| 6490 |
-=================================================================== |
| 6491 |
---- mk/bsd.incs.mk.orig |
| 6492 |
-+++ mk/bsd.incs.mk |
| 6493 |
-@@ -45,7 +45,7 @@ _${group}INS_${header:T}: ${header} |
| 6494 |
- ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6495 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 6496 |
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} |
| 6497 |
-- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6498 |
-+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6499 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 6500 |
- ${.ALLSRC} \ |
| 6501 |
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} |
| 6502 |
-@@ -58,11 +58,11 @@ installincludes: _${group}INS |
| 6503 |
- _${group}INS: ${_${group}INCS} |
| 6504 |
- .if defined(${group}NAME) |
| 6505 |
- ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 6506 |
-- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6507 |
-+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6508 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 6509 |
- .else |
| 6510 |
- ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 6511 |
-- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6512 |
-+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6513 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 6514 |
- .endif |
| 6515 |
- .endif |
| 6516 |
-Index: mk/bsd.lib.mk |
| 6517 |
-=================================================================== |
| 6518 |
---- mk/bsd.lib.mk.orig |
| 6519 |
-+++ mk/bsd.lib.mk |
| 6520 |
-@@ -156,11 +156,7 @@ _LIBS= lib${LIB}.a |
| 6521 |
- lib${LIB}.a: ${OBJS} ${STATICOBJS} |
| 6522 |
- @${ECHO} building static ${LIB} library |
| 6523 |
- @rm -f ${.TARGET} |
| 6524 |
--.if !defined(NM) |
| 6525 |
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 6526 |
--.else |
| 6527 |
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 6528 |
--.endif |
| 6529 |
-+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} |
| 6530 |
- ${RANLIB} ${.TARGET} |
| 6531 |
- .endif |
| 6532 |
- |
| 6533 |
-@@ -173,11 +169,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= |
| 6534 |
- lib${LIB}_p.a: ${POBJS} |
| 6535 |
- @${ECHO} building profiled ${LIB} library |
| 6536 |
- @rm -f ${.TARGET} |
| 6537 |
--.if !defined(NM) |
| 6538 |
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} |
| 6539 |
--.else |
| 6540 |
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} |
| 6541 |
--.endif |
| 6542 |
-+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} |
| 6543 |
- ${RANLIB} ${.TARGET} |
| 6544 |
- .endif |
| 6545 |
- |
| 6546 |
-@@ -195,15 +187,9 @@ ${SHLIB_NAME}: ${SOBJS} |
| 6547 |
- .if defined(SHLIB_LINK) |
| 6548 |
- @ln -fs ${.TARGET} ${SHLIB_LINK} |
| 6549 |
- .endif |
| 6550 |
--.if !defined(NM) |
| 6551 |
-- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ |
| 6552 |
-- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 6553 |
-- `lorder ${SOBJS} | tsort -q` ${LDADD} |
| 6554 |
--.else |
| 6555 |
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ |
| 6556 |
- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 6557 |
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} |
| 6558 |
--.endif |
| 6559 |
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} |
| 6560 |
- .if defined(CTFMERGE) |
| 6561 |
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} |
| 6562 |
- .endif |
| 6563 |
-@@ -251,13 +237,6 @@ _EXTRADEPEND: |
| 6564 |
- |
| 6565 |
- .if !target(install) |
| 6566 |
- |
| 6567 |
--.if defined(PRECIOUSLIB) |
| 6568 |
--.if !defined(NO_FSCHG) |
| 6569 |
--SHLINSTALLFLAGS+= -fschg |
| 6570 |
--.endif |
| 6571 |
--SHLINSTALLFLAGS+= -S |
| 6572 |
--.endif |
| 6573 |
-- |
| 6574 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 6575 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 6576 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 6577 |
-@@ -273,12 +252,12 @@ realinstall: _libinstall |
| 6578 |
- _libinstall: |
| 6579 |
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 6580 |
- ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 6581 |
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6582 |
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6583 |
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} |
| 6584 |
- .endif |
| 6585 |
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 6586 |
- ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 6587 |
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6588 |
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6589 |
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} |
| 6590 |
- .endif |
| 6591 |
- .if defined(SHLIB_NAME) |
| 6592 |
-Index: mk/bsd.prog.mk |
| 6593 |
-=================================================================== |
| 6594 |
---- mk/bsd.prog.mk.orig |
| 6595 |
-+++ mk/bsd.prog.mk |
| 6596 |
-@@ -130,13 +130,6 @@ _EXTRADEPEND: |
| 6597 |
- |
| 6598 |
- .if !target(install) |
| 6599 |
- |
| 6600 |
--.if defined(PRECIOUSPROG) |
| 6601 |
--.if !defined(NO_FSCHG) |
| 6602 |
--INSTALLFLAGS+= -fschg |
| 6603 |
--.endif |
| 6604 |
--INSTALLFLAGS+= -S |
| 6605 |
--.endif |
| 6606 |
-- |
| 6607 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 6608 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 6609 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 6610 |
|
| 6611 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch |
| 6612 |
deleted file mode 100644 |
| 6613 |
index 598d0b9..0000000 |
| 6614 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch |
| 6615 |
+++ /dev/null |
| 6616 |
@@ -1,326 +0,0 @@ |
| 6617 |
-diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk |
| 6618 |
---- share.orig/mk/bsd.doc.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6619 |
-+++ share/mk/bsd.doc.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6620 |
-@@ -135,10 +135,12 @@ |
| 6621 |
- realinstall: |
| 6622 |
- .for _dev in ${PRINTERDEVICE:Mhtml} |
| 6623 |
- cd ${SRCDIR}; \ |
| 6624 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 6625 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 6626 |
- ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} |
| 6627 |
- .endfor |
| 6628 |
- .for _dev in ${PRINTERDEVICE:Nhtml} |
| 6629 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 6630 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 6631 |
- ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} |
| 6632 |
- .endfor |
| 6633 |
-diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk |
| 6634 |
---- share.orig/mk/bsd.files.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6635 |
-+++ share/mk/bsd.files.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6636 |
-@@ -39,6 +39,7 @@ |
| 6637 |
- .endif |
| 6638 |
- installfiles: _${group}INS_${file:T} |
| 6639 |
- _${group}INS_${file:T}: ${file} |
| 6640 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 6641 |
- ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6642 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 6643 |
- ${.ALLSRC} \ |
| 6644 |
-@@ -51,10 +52,12 @@ |
| 6645 |
- installfiles: _${group}INS |
| 6646 |
- _${group}INS: ${_${group}FILES} |
| 6647 |
- .if defined(${group}NAME) |
| 6648 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 6649 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 6650 |
- -m ${${group}MODE} ${.ALLSRC} \ |
| 6651 |
- ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 6652 |
- .else |
| 6653 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 6654 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 6655 |
- -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 6656 |
- .endif |
| 6657 |
-diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk |
| 6658 |
---- share.orig/mk/bsd.incs.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6659 |
-+++ share/mk/bsd.incs.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6660 |
-@@ -41,6 +41,9 @@ |
| 6661 |
- .endif |
| 6662 |
- installincludes: _${group}INS_${header:T} |
| 6663 |
- _${group}INS_${header:T}: ${header} |
| 6664 |
-+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6665 |
-+ -g ${${group}GRP_${.ALLSRC:T}} \ |
| 6666 |
-+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 6667 |
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 6668 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 6669 |
- ${.ALLSRC} \ |
| 6670 |
-@@ -53,9 +56,13 @@ |
| 6671 |
- installincludes: _${group}INS |
| 6672 |
- _${group}INS: ${_${group}INCS} |
| 6673 |
- .if defined(${group}NAME) |
| 6674 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 6675 |
-+ ${DESTDIR}${${group}DIR} |
| 6676 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6677 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 6678 |
- .else |
| 6679 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 6680 |
-+ ${DESTDIR}${${group}DIR} |
| 6681 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 6682 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 6683 |
- .endif |
| 6684 |
-diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk |
| 6685 |
---- share.orig/mk/bsd.info.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6686 |
-+++ share/mk/bsd.info.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6687 |
-@@ -83,6 +83,7 @@ |
| 6688 |
- TEX?= tex |
| 6689 |
- DVIPS?= dvips |
| 6690 |
- DVIPS2ASCII?= dvips2ascii |
| 6691 |
-+INSTALL?= install |
| 6692 |
- |
| 6693 |
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
| 6694 |
- |
| 6695 |
-@@ -144,15 +145,17 @@ |
| 6696 |
- INSTALLINFODIRS+= ${x:S/$/-install/} |
| 6697 |
- ${x:S/$/-install/}: |
| 6698 |
- .if !empty(.MAKEFLAGS:M-j) |
| 6699 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 6700 |
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
| 6701 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 6702 |
-- --defsection=${INFOSECTION} \ |
| 6703 |
-- --defentry=${INFOENTRY_${x}} \ |
| 6704 |
-+ --section=${INFOSECTION} \ |
| 6705 |
-+ --entry=${INFOENTRY_${x}} \ |
| 6706 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 6707 |
- .else |
| 6708 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 6709 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 6710 |
-- --defsection=${INFOSECTION} \ |
| 6711 |
-- --defentry=${INFOENTRY_${x}} \ |
| 6712 |
-+ --section=${INFOSECTION} \ |
| 6713 |
-+ --entry=${INFOENTRY_${x}} \ |
| 6714 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 6715 |
- .endif |
| 6716 |
- .endfor |
| 6717 |
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk |
| 6718 |
---- share.orig/mk/bsd.lib.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6719 |
-+++ share/mk/bsd.lib.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6720 |
-@@ -46,10 +46,6 @@ |
| 6721 |
- .endif |
| 6722 |
- .endif |
| 6723 |
- |
| 6724 |
--.if !defined(DEBUG_FLAGS) |
| 6725 |
--STRIP?= -s |
| 6726 |
--.endif |
| 6727 |
-- |
| 6728 |
- .include <bsd.libnames.mk> |
| 6729 |
- |
| 6730 |
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries |
| 6731 |
-@@ -284,14 +280,17 @@ |
| 6732 |
- .ORDER: beforeinstall _libinstall |
| 6733 |
- _libinstall: |
| 6734 |
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 6735 |
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 6736 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6737 |
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} |
| 6738 |
- .endif |
| 6739 |
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 6740 |
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 6741 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6742 |
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} |
| 6743 |
- .endif |
| 6744 |
- .if defined(SHLIB_NAME) |
| 6745 |
-+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} |
| 6746 |
- ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6747 |
- ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
| 6748 |
- ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} |
| 6749 |
-@@ -329,10 +328,12 @@ |
| 6750 |
- .endif # SHLIB_LINK |
| 6751 |
- .endif # SHIB_NAME |
| 6752 |
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" |
| 6753 |
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 6754 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6755 |
- ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} |
| 6756 |
- .endif |
| 6757 |
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) |
| 6758 |
-+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} |
| 6759 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 6760 |
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} |
| 6761 |
- .endif |
| 6762 |
-diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk |
| 6763 |
---- share.orig/mk/bsd.libnames.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6764 |
-+++ share/mk/bsd.libnames.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6765 |
-@@ -48,7 +48,7 @@ |
| 6766 |
- LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a |
| 6767 |
- LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
| 6768 |
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
| 6769 |
--LIBFL?= "don't use LIBFL, use LIBL" |
| 6770 |
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 6771 |
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
| 6772 |
- LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a |
| 6773 |
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
| 6774 |
-@@ -79,7 +79,7 @@ |
| 6775 |
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
| 6776 |
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
| 6777 |
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
| 6778 |
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
| 6779 |
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 6780 |
- LIBLN?= "don't use LIBLN, use LIBL" |
| 6781 |
- .if ${MK_BIND} != "no" |
| 6782 |
- LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a |
| 6783 |
-diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk |
| 6784 |
---- share.orig/mk/bsd.links.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6785 |
-+++ share/mk/bsd.links.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6786 |
-@@ -15,6 +15,8 @@ |
| 6787 |
- t=${DESTDIR}$$1; \ |
| 6788 |
- shift; \ |
| 6789 |
- ${ECHO} $$t -\> $$l; \ |
| 6790 |
-+ d=`dirname $$t`; \ |
| 6791 |
-+ test -d $$d || mkdir $$d; \ |
| 6792 |
- ln -f $$l $$t; \ |
| 6793 |
- done; true |
| 6794 |
- .endif |
| 6795 |
-@@ -26,6 +28,8 @@ |
| 6796 |
- t=${DESTDIR}$$1; \ |
| 6797 |
- shift; \ |
| 6798 |
- ${ECHO} $$t -\> $$l; \ |
| 6799 |
-+ d=`dirname $$t`; \ |
| 6800 |
-+ test -d $$d || mkdir $$d; \ |
| 6801 |
- ln -fs $$l $$t; \ |
| 6802 |
- done; true |
| 6803 |
- .endif |
| 6804 |
-diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk |
| 6805 |
---- share.orig/mk/bsd.man.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6806 |
-+++ share/mk/bsd.man.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6807 |
-@@ -165,9 +165,11 @@ |
| 6808 |
- .if defined(NO_MANCOMPRESS) |
| 6809 |
- .if defined(MANFILTER) |
| 6810 |
- .for __page in ${MAN} |
| 6811 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
| 6812 |
- ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
| 6813 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
| 6814 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 6815 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} |
| 6816 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
| 6817 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
| 6818 |
- .endif |
| 6819 |
-@@ -181,11 +183,14 @@ |
| 6820 |
- esac; \ |
| 6821 |
- page=$$1; shift; sect=$$1; shift; \ |
| 6822 |
- d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
| 6823 |
-+ ${ECHO} ${INSTALL} -d $${d}; \ |
| 6824 |
-+ ${INSTALL} -d $${d}; \ |
| 6825 |
- ${ECHO} ${MINSTALL} $${page} $${d}; \ |
| 6826 |
- ${MINSTALL} $${page} $${d}; \ |
| 6827 |
- done |
| 6828 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 6829 |
- .for __page in ${MAN} |
| 6830 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} |
| 6831 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
| 6832 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
| 6833 |
- .endfor |
| 6834 |
-@@ -193,9 +198,11 @@ |
| 6835 |
- .endif |
| 6836 |
- .else |
| 6837 |
- .for __page in ${MAN} |
| 6838 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} |
| 6839 |
- ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
| 6840 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
| 6841 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 6842 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT} |
| 6843 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
| 6844 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
| 6845 |
- .endif |
| 6846 |
-diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk |
| 6847 |
---- share.orig/mk/bsd.nls.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6848 |
-+++ share/mk/bsd.nls.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6849 |
-@@ -62,7 +62,8 @@ |
| 6850 |
- # installation rules |
| 6851 |
- # |
| 6852 |
- .for file in ${NLS} |
| 6853 |
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat |
| 6854 |
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ |
| 6855 |
-+NLSNAME_${file:T}= ${NLSNAME}.cat |
| 6856 |
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) |
| 6857 |
- NLSLINKS+= ${file:R} |
| 6858 |
- .endif |
| 6859 |
-diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk |
| 6860 |
---- share.orig/mk/bsd.own.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6861 |
-+++ share/mk/bsd.own.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6862 |
-@@ -182,9 +182,6 @@ |
| 6863 |
- INCLUDEDIR?= /usr/include |
| 6864 |
- |
| 6865 |
- # Common variables |
| 6866 |
--.if !defined(DEBUG_FLAGS) |
| 6867 |
--STRIP?= -s |
| 6868 |
--.endif |
| 6869 |
- |
| 6870 |
- COMPRESS_CMD?= gzip -cn |
| 6871 |
- COMPRESS_EXT?= .gz |
| 6872 |
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk |
| 6873 |
---- share.orig/mk/bsd.prog.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6874 |
-+++ share/mk/bsd.prog.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6875 |
-@@ -33,10 +33,6 @@ |
| 6876 |
- CFLAGS+=${CRUNCH_CFLAGS} |
| 6877 |
- .endif |
| 6878 |
- |
| 6879 |
--.if !defined(DEBUG_FLAGS) |
| 6880 |
--STRIP?= -s |
| 6881 |
--.endif |
| 6882 |
-- |
| 6883 |
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") |
| 6884 |
- LDFLAGS+= -static |
| 6885 |
- .endif |
| 6886 |
-@@ -155,6 +151,7 @@ |
| 6887 |
- .ORDER: beforeinstall _proginstall |
| 6888 |
- _proginstall: |
| 6889 |
- .if defined(PROG) |
| 6890 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 6891 |
- .if defined(PROGNAME) |
| 6892 |
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 6893 |
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
| 6894 |
-@@ -186,6 +183,7 @@ |
| 6895 |
- SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
| 6896 |
- _scriptsinstall: _SCRIPTSINS_${script:T} |
| 6897 |
- _SCRIPTSINS_${script:T}: ${script} |
| 6898 |
-+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
| 6899 |
- ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
| 6900 |
- -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
| 6901 |
- ${.ALLSRC} \ |
| 6902 |
-diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk |
| 6903 |
---- share.orig/mk/bsd.sys.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6904 |
-+++ share/mk/bsd.sys.mk 2012-07-16 00:04:14.000000000 +0900 |
| 6905 |
-@@ -28,10 +28,6 @@ |
| 6906 |
- .if defined(WARNS) |
| 6907 |
- .if ${WARNS} >= 1 |
| 6908 |
- CWARNFLAGS+= -Wsystem-headers |
| 6909 |
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ |
| 6910 |
-- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) |
| 6911 |
--CWARNFLAGS+= -Werror |
| 6912 |
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
| 6913 |
- .endif # WARNS >= 1 |
| 6914 |
- .if ${WARNS} >= 2 |
| 6915 |
- CWARNFLAGS+= -Wall -Wno-format-y2k |
| 6916 |
-@@ -95,10 +91,6 @@ |
| 6917 |
- CWARNFLAGS+= -Wno-format-nonliteral |
| 6918 |
- .endif # WARNS <= 3 |
| 6919 |
- .endif # CLANG |
| 6920 |
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ |
| 6921 |
-- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) |
| 6922 |
--CWARNFLAGS+= -Werror |
| 6923 |
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
| 6924 |
- .endif # WFORMAT > 0 |
| 6925 |
- .endif # WFORMAT |
| 6926 |
- .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \ |
| 6927 |
-diff -Nur share.orig/mk/sys.mk share/mk/sys.mk |
| 6928 |
---- share.orig/mk/sys.mk 2012-07-12 13:25:44.000000000 +0900 |
| 6929 |
-+++ share/mk/sys.mk 2012-07-16 00:01:55.000000000 +0900 |
| 6930 |
-@@ -349,12 +349,6 @@ |
| 6931 |
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ |
| 6932 |
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) |
| 6933 |
- |
| 6934 |
--# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. |
| 6935 |
--__MAKE_CONF?=/etc/make.conf |
| 6936 |
--.if exists(${__MAKE_CONF}) |
| 6937 |
--.include "${__MAKE_CONF}" |
| 6938 |
--.endif |
| 6939 |
-- |
| 6940 |
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) |
| 6941 |
- SHELL= ${__MAKE_SHELL} |
| 6942 |
- .SHELL: path=${__MAKE_SHELL} |
| 6943 |
|
| 6944 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch |
| 6945 |
deleted file mode 100644 |
| 6946 |
index f986ed9..0000000 |
| 6947 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch |
| 6948 |
+++ /dev/null |
| 6949 |
@@ -1,77 +0,0 @@ |
| 6950 |
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk |
| 6951 |
---- share.orig/mk/bsd.lib.mk 2012-07-16 02:40:07.000000000 +0900 |
| 6952 |
-+++ share/mk/bsd.lib.mk 2012-07-16 02:41:40.000000000 +0900 |
| 6953 |
-@@ -155,11 +155,7 @@ |
| 6954 |
- lib${LIB}.a: ${OBJS} ${STATICOBJS} |
| 6955 |
- @${ECHO} building static ${LIB} library |
| 6956 |
- @rm -f ${.TARGET} |
| 6957 |
--.if !defined(NM) |
| 6958 |
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 6959 |
--.else |
| 6960 |
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 6961 |
--.endif |
| 6962 |
-+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} |
| 6963 |
- ${RANLIB} ${.TARGET} |
| 6964 |
- .endif |
| 6965 |
- |
| 6966 |
-@@ -172,11 +168,7 @@ |
| 6967 |
- lib${LIB}_p.a: ${POBJS} |
| 6968 |
- @${ECHO} building profiled ${LIB} library |
| 6969 |
- @rm -f ${.TARGET} |
| 6970 |
--.if !defined(NM) |
| 6971 |
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} |
| 6972 |
--.else |
| 6973 |
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} |
| 6974 |
--.endif |
| 6975 |
-+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} |
| 6976 |
- ${RANLIB} ${.TARGET} |
| 6977 |
- .endif |
| 6978 |
- |
| 6979 |
-@@ -203,15 +195,9 @@ |
| 6980 |
- .if defined(SHLIB_LINK) |
| 6981 |
- @ln -fs ${.TARGET} ${SHLIB_LINK} |
| 6982 |
- .endif |
| 6983 |
--.if !defined(NM) |
| 6984 |
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ |
| 6985 |
- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 6986 |
-- `lorder ${SOBJS} | tsort -q` ${LDADD} |
| 6987 |
--.else |
| 6988 |
-- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ |
| 6989 |
-- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 6990 |
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} |
| 6991 |
--.endif |
| 6992 |
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} |
| 6993 |
- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \ |
| 6994 |
- (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \ |
| 6995 |
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}) |
| 6996 |
-@@ -259,13 +245,6 @@ |
| 6997 |
- |
| 6998 |
- .if !target(install) |
| 6999 |
- |
| 7000 |
--.if defined(PRECIOUSLIB) |
| 7001 |
--.if !defined(NO_FSCHG) |
| 7002 |
--SHLINSTALLFLAGS+= -fschg |
| 7003 |
--.endif |
| 7004 |
--SHLINSTALLFLAGS+= -S |
| 7005 |
--.endif |
| 7006 |
-- |
| 7007 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 7008 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 7009 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 7010 |
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk |
| 7011 |
---- share.orig/mk/bsd.prog.mk 2012-07-16 02:40:07.000000000 +0900 |
| 7012 |
-+++ share/mk/bsd.prog.mk 2012-07-16 02:40:24.000000000 +0900 |
| 7013 |
-@@ -134,13 +134,6 @@ |
| 7014 |
- |
| 7015 |
- .if !target(install) |
| 7016 |
- |
| 7017 |
--.if defined(PRECIOUSPROG) |
| 7018 |
--.if !defined(NO_FSCHG) |
| 7019 |
--INSTALLFLAGS+= -fschg |
| 7020 |
--.endif |
| 7021 |
--INSTALLFLAGS+= -S |
| 7022 |
--.endif |
| 7023 |
-- |
| 7024 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 7025 |
- .for ie in ${INSTALLFLAGS_EDIT} |
| 7026 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 7027 |
|
| 7028 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch |
| 7029 |
deleted file mode 100644 |
| 7030 |
index 8eb80c3..0000000 |
| 7031 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch |
| 7032 |
+++ /dev/null |
| 7033 |
@@ -1,28 +0,0 @@ |
| 7034 |
-https://bugs.gentoo.org/show_bug.cgi?id=511698 |
| 7035 |
- |
| 7036 |
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
| 7037 |
-index e438633..de4a05b 100644 |
| 7038 |
---- a/share/mk/bsd.sys.mk |
| 7039 |
-+++ b/share/mk/bsd.sys.mk |
| 7040 |
-@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ |
| 7041 |
- CFLAGS+= -Qunused-arguments |
| 7042 |
- .endif # CLANG |
| 7043 |
- |
| 7044 |
--.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ |
| 7045 |
-- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" |
| 7046 |
-+.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \ |
| 7047 |
-+ && ${MACHINE_CPUARCH} != "mips" |
| 7048 |
-+.if ${MK_SSP} != "no" |
| 7049 |
- # Don't use -Wstack-protector as it breaks world with -Werror. |
| 7050 |
- SSP_CFLAGS?= -fstack-protector |
| 7051 |
-+.else |
| 7052 |
-+# gcc-4.9, -fstack-protector-strong is enabled by default. |
| 7053 |
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698. |
| 7054 |
-+SSP_CFLAGS= -fno-stack-protector |
| 7055 |
-+.endif #SSP |
| 7056 |
- CFLAGS+= ${SSP_CFLAGS} |
| 7057 |
--.endif # SSP && !IA64 && !ARM && !MIPS |
| 7058 |
-+.endif # !IA64 && !ARM && !MIPS |
| 7059 |
- |
| 7060 |
- # Allow user-specified additional warning flags |
| 7061 |
- CFLAGS+= ${CWARNFLAGS} |
| 7062 |
|
| 7063 |
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 |
| 7064 |
deleted file mode 100644 |
| 7065 |
index e1eb27a..0000000 |
| 7066 |
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild |
| 7067 |
+++ /dev/null |
| 7068 |
@@ -1,55 +0,0 @@ |
| 7069 |
-# Copyright 1999-2016 Gentoo Foundation |
| 7070 |
-# Distributed under the terms of the GNU General Public License v2 |
| 7071 |
-# $Id$ |
| 7072 |
- |
| 7073 |
-EAPI=5 |
| 7074 |
- |
| 7075 |
-inherit bsdmk freebsd |
| 7076 |
- |
| 7077 |
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" |
| 7078 |
-SLOT="0" |
| 7079 |
- |
| 7080 |
-IUSE="userland_GNU" |
| 7081 |
- |
| 7082 |
-if [[ ${PV} != *9999* ]]; then |
| 7083 |
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 7084 |
-fi |
| 7085 |
- |
| 7086 |
-EXTRACTONLY="share/" |
| 7087 |
- |
| 7088 |
-RDEPEND="" |
| 7089 |
-DEPEND="" |
| 7090 |
- |
| 7091 |
-RESTRICT="strip" |
| 7092 |
- |
| 7093 |
-S="${WORKDIR}/share/mk" |
| 7094 |
- |
| 7095 |
-src_prepare() { |
| 7096 |
- local installdir |
| 7097 |
- |
| 7098 |
- epatch "${FILESDIR}/${PN}-11.0-gentoo.patch" |
| 7099 |
- epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" |
| 7100 |
- epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" |
| 7101 |
- epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" |
| 7102 |
- use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch" |
| 7103 |
- |
| 7104 |
- if [[ ${CHOST} != *-freebsd* ]]; then |
| 7105 |
- installdir="/usr/share/mk/freebsd" |
| 7106 |
- else |
| 7107 |
- installdir="/usr/share/mk" |
| 7108 |
- fi |
| 7109 |
- |
| 7110 |
- sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile || die |
| 7111 |
-} |
| 7112 |
- |
| 7113 |
-src_compile() { :; } |
| 7114 |
- |
| 7115 |
-src_install() { |
| 7116 |
- freebsd_src_install |
| 7117 |
- if [[ ${CHOST} != *-freebsd* ]]; then |
| 7118 |
- insinto /usr/share/mk/freebsd/system |
| 7119 |
- else |
| 7120 |
- insinto /usr/share/mk/system |
| 7121 |
- fi |
| 7122 |
- doins *.mk *.awk |
| 7123 |
-} |
| 7124 |
|
| 7125 |
diff --git a/sys-freebsd/freebsd-mk-defs/metadata.xml b/sys-freebsd/freebsd-mk-defs/metadata.xml |
| 7126 |
deleted file mode 100644 |
| 7127 |
index a00f3ae..0000000 |
| 7128 |
--- a/sys-freebsd/freebsd-mk-defs/metadata.xml |
| 7129 |
+++ /dev/null |
| 7130 |
@@ -1,8 +0,0 @@ |
| 7131 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 7132 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 7133 |
-<pkgmetadata> |
| 7134 |
-<maintainer type="project"> |
| 7135 |
- <email>bsd@g.o</email> |
| 7136 |
- <name>BSD Project</name> |
| 7137 |
-</maintainer> |
| 7138 |
-</pkgmetadata> |
| 7139 |
|
| 7140 |
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest |
| 7141 |
deleted file mode 100644 |
| 7142 |
index dd5d3c6..0000000 |
| 7143 |
--- a/sys-freebsd/freebsd-pam-modules/Manifest |
| 7144 |
+++ /dev/null |
| 7145 |
@@ -1,6 +0,0 @@ |
| 7146 |
-AUX README.pamd 2846 SHA256 cc15a45d85590c1c1267a6083048e410b0175d863f1685b51e26745672cd1b44 SHA512 155b5ba68ffcdff57b9bc5822eb3affd01cba9dcc5ae8095c91aa5048d61f7b550cb8f4c7a0b508055f4300a1a6295770f6075cd6c0df84ce6782088c84c7f6a WHIRLPOOL 080a3c562a81986289992a8a43a8f41a6e4161ff5ff72d96ca6b76ba3182e94a949944fca1342acdf75ac4bd0e03940cbfba22390d5da7c4d150a880ace2f201 |
| 7147 |
-AUX freebsd-pam-modules-6.0-gentoo.patch 701 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995 WHIRLPOOL 2b02611fce484145fe62468826bbdb8f1dedfb1c4a7a14b01234c99f13daefe9597d08a23e0836f5804f92c26cc1b950180f7fcbd1698af360b23e06c143621c |
| 7148 |
-AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7 |
| 7149 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 7150 |
-EBUILD freebsd-pam-modules-11.0.ebuild 1042 SHA256 4442bd6cdd5ab3a18b02e000ee7d4f55131d7bd27493081c5222325cac0c55f6 SHA512 a75de8d65675770d75690cd48ba4c6d3a231fefd84e2315756a11b4632851d2643b2786e3924ac52825ae66230f598f6bd92ecd1e32c59e6554c1d67a8968a29 WHIRLPOOL 4d12fe089999575321b0c1832e19a67fd526b86fea65613fa6e1f4e9f1a7e410e246406e004b218eef6acf3193b91e7f5e9ffc712c74b2418e71d7f59e4d712e |
| 7151 |
-MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a |
| 7152 |
|
| 7153 |
diff --git a/sys-freebsd/freebsd-pam-modules/files/README.pamd b/sys-freebsd/freebsd-pam-modules/files/README.pamd |
| 7154 |
deleted file mode 100644 |
| 7155 |
index 10da6cc..0000000 |
| 7156 |
--- a/sys-freebsd/freebsd-pam-modules/files/README.pamd |
| 7157 |
+++ /dev/null |
| 7158 |
@@ -1,63 +0,0 @@ |
| 7159 |
-/etc/pam.d |
| 7160 |
- |
| 7161 |
-This directory contains configuration files for the Pluggable |
| 7162 |
-Authentication Modules (PAM) library. |
| 7163 |
- |
| 7164 |
-Each file details the module chain for a single service, and must be |
| 7165 |
-named after that service. If no configuration file is found for a |
| 7166 |
-particular service, the /etc/pam.d/other is used instead. If that |
| 7167 |
-file does not exist, /etc/pam.conf is searched for entries matching |
| 7168 |
-the specified service or, failing that, the "other" service. |
| 7169 |
- |
| 7170 |
-See the pam(8) manual page for an explanation of the workings of the |
| 7171 |
-PAM library and descriptions of the various files and modules. Below |
| 7172 |
-is a summary of the format for the pam.conf and /etc/pam.d/* files. |
| 7173 |
- |
| 7174 |
-Configuration lines take the following form: |
| 7175 |
- |
| 7176 |
-module-type control-flag module-path arguments |
| 7177 |
- |
| 7178 |
-Comments are introduced with a hash mark ('#'). Blank lines and lines |
| 7179 |
-consisting entirely of comments are ignored. |
| 7180 |
- |
| 7181 |
-The meanings of the different fields are as follows: |
| 7182 |
- |
| 7183 |
- module-type: |
| 7184 |
- auth: prompt for a password to authenticate that the user is |
| 7185 |
- who they say they are, and set any credentials. |
| 7186 |
- account: non-authentication based authorization, based on time, |
| 7187 |
- resources, etc. |
| 7188 |
- session: housekeeping before and/or after login. |
| 7189 |
- password: update authentication tokens. |
| 7190 |
- |
| 7191 |
- control-flag: How libpam handles success or failure of the module. |
| 7192 |
- required: success is required; on failure all remaining |
| 7193 |
- modules are run, but the request will be denied. |
| 7194 |
- requisite: success is required, and on failure no remaining |
| 7195 |
- modules are run. |
| 7196 |
- sufficient: success is sufficient, and if no previous required |
| 7197 |
- module failed, no remaining modules are run. |
| 7198 |
- binding: success is sufficient; on failure all remaining |
| 7199 |
- modules are run, but the request will be denied. |
| 7200 |
- optional: ignored unless the other modules return PAM_IGNORE. |
| 7201 |
- |
| 7202 |
- arguments: Module-specific options, plus some generic ones: |
| 7203 |
- debug: syslog debug info. |
| 7204 |
- no_warn: return no warning messages to the application. |
| 7205 |
- Remove this to feed back to the user the |
| 7206 |
- reason(s) they are being rejected. |
| 7207 |
- use_first_pass: try authentication using password from the |
| 7208 |
- preceding auth module. |
| 7209 |
- try_first_pass: first try authentication using password from |
| 7210 |
- the preceding auth module, and if that fails |
| 7211 |
- prompt for a new password. |
| 7212 |
- use_mapped_pass: convert cleartext password to a crypto key. |
| 7213 |
- expose_account: allow printing more info about the user when |
| 7214 |
- prompting. |
| 7215 |
- |
| 7216 |
-Note that having a "sufficient" module as the last entry for a |
| 7217 |
-particular service and module type may result in surprising behaviour. |
| 7218 |
-To get the intended semantics, add a "required" entry listing the |
| 7219 |
-pam_deny module at the end of the chain. |
| 7220 |
- |
| 7221 |
-$Id$ |
| 7222 |
|
| 7223 |
diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch |
| 7224 |
deleted file mode 100644 |
| 7225 |
index ce1a7fb..0000000 |
| 7226 |
--- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch |
| 7227 |
+++ /dev/null |
| 7228 |
@@ -1,24 +0,0 @@ |
| 7229 |
-Index: fbsd-6.0/lib/libpam/modules/Makefile.inc |
| 7230 |
-=================================================================== |
| 7231 |
---- fbsd-6.0.orig/lib/libpam/modules/Makefile.inc |
| 7232 |
-+++ fbsd-6.0/lib/libpam/modules/Makefile.inc |
| 7233 |
-@@ -5,18 +5,10 @@ PAMDIR= ${.CURDIR}/../../../../contrib/ |
| 7234 |
- NO_INSTALLLIB= |
| 7235 |
- NO_PROFILE= |
| 7236 |
- |
| 7237 |
--CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam |
| 7238 |
-+CFLAGS+= -I${.CURDIR}/../../libpam |
| 7239 |
- WARNS?= 4 |
| 7240 |
- |
| 7241 |
--# This is nasty. |
| 7242 |
--# For the static case, libpam.a depends on the modules. |
| 7243 |
--# For the dynamic case, the modules depend on libpam.so.N |
| 7244 |
--.if defined(_NO_LIBPAM_SO_YET) |
| 7245 |
--NO_PIC= |
| 7246 |
--.else |
| 7247 |
- SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} |
| 7248 |
--DPADD+= ${LIBPAM} |
| 7249 |
- LDADD+= -lpam |
| 7250 |
--.endif |
| 7251 |
- |
| 7252 |
- .include "../Makefile.inc" |
| 7253 |
|
| 7254 |
diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch |
| 7255 |
deleted file mode 100644 |
| 7256 |
index aa08d40..0000000 |
| 7257 |
--- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch |
| 7258 |
+++ /dev/null |
| 7259 |
@@ -1,22 +0,0 @@ |
| 7260 |
---- lib/libpam/modules/Makefile.inc.old 2011-11-02 20:46:56.000000000 +0000 |
| 7261 |
-+++ lib/libpam/modules/Makefile.inc 2011-11-02 20:47:16.000000000 +0000 |
| 7262 |
-@@ -5,18 +5,10 @@ |
| 7263 |
- NO_INSTALLLIB= |
| 7264 |
- NO_PROFILE= |
| 7265 |
- |
| 7266 |
--CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam |
| 7267 |
-+CFLAGS+= -I${.CURDIR}/../../libpam |
| 7268 |
- |
| 7269 |
--# This is nasty. |
| 7270 |
--# For the static case, libpam.a depends on the modules. |
| 7271 |
--# For the dynamic case, the modules depend on libpam.so.N |
| 7272 |
--.if defined(_NO_LIBPAM_SO_YET) |
| 7273 |
--NO_PIC= |
| 7274 |
--.else |
| 7275 |
- SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} |
| 7276 |
--DPADD+= ${LIBPAM} |
| 7277 |
- LDADD+= -lpam |
| 7278 |
--.endif |
| 7279 |
- |
| 7280 |
- .c.o: |
| 7281 |
- ${CC} ${CFLAGS} -DOPENPAM_STATIC_MODULES -c ${.IMPSRC} |
| 7282 |
|
| 7283 |
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 |
| 7284 |
deleted file mode 100644 |
| 7285 |
index 0172c4e..0000000 |
| 7286 |
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild |
| 7287 |
+++ /dev/null |
| 7288 |
@@ -1,46 +0,0 @@ |
| 7289 |
-# Copyright 1999-2016 Gentoo Foundation |
| 7290 |
-# Distributed under the terms of the GNU General Public License v2 |
| 7291 |
-# $Id$ |
| 7292 |
- |
| 7293 |
-EAPI=5 |
| 7294 |
- |
| 7295 |
-inherit bsdmk freebsd multilib pam |
| 7296 |
- |
| 7297 |
-DESCRIPTION="FreeBSD's PAM authentication modules" |
| 7298 |
-SLOT="0" |
| 7299 |
- |
| 7300 |
-IUSE="kerberos nis" |
| 7301 |
- |
| 7302 |
-if [[ ${PV} != *9999* ]]; then |
| 7303 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 7304 |
-fi |
| 7305 |
- |
| 7306 |
-EXTRACTONLY="lib/" |
| 7307 |
- |
| 7308 |
-RDEPEND=">=sys-auth/openpam-20050201-r1 |
| 7309 |
- kerberos? ( dev-libs/openssl:0= |
| 7310 |
- virtual/krb5 )" |
| 7311 |
-DEPEND="${RDEPEND} |
| 7312 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 7313 |
- =sys-freebsd/freebsd-sources-${RV}*" |
| 7314 |
- |
| 7315 |
-S=${WORKDIR}/lib/libpam/modules |
| 7316 |
- |
| 7317 |
-pkg_setup() { |
| 7318 |
- # Avoid installing pam_ssh as that has its own ebuild. |
| 7319 |
- mymakeopts="${mymakeopts} WITHOUT_OPENSSH= " |
| 7320 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= " |
| 7321 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
| 7322 |
-} |
| 7323 |
- |
| 7324 |
-src_prepare() { |
| 7325 |
- for module in pam_deny pam_passwdqc pam_permit pam_krb5; do |
| 7326 |
- sed -i -e "s:${module}::" "${S}"/modules.inc || die |
| 7327 |
- done |
| 7328 |
-} |
| 7329 |
- |
| 7330 |
-src_install() { |
| 7331 |
- freebsd_src_install "LIBDIR=/$(get_libdir)/security" |
| 7332 |
- |
| 7333 |
- dodoc "${FILESDIR}/README.pamd" |
| 7334 |
-} |
| 7335 |
|
| 7336 |
diff --git a/sys-freebsd/freebsd-pam-modules/metadata.xml b/sys-freebsd/freebsd-pam-modules/metadata.xml |
| 7337 |
deleted file mode 100644 |
| 7338 |
index a00f3ae..0000000 |
| 7339 |
--- a/sys-freebsd/freebsd-pam-modules/metadata.xml |
| 7340 |
+++ /dev/null |
| 7341 |
@@ -1,8 +0,0 @@ |
| 7342 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 7343 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 7344 |
-<pkgmetadata> |
| 7345 |
-<maintainer type="project"> |
| 7346 |
- <email>bsd@g.o</email> |
| 7347 |
- <name>BSD Project</name> |
| 7348 |
-</maintainer> |
| 7349 |
-</pkgmetadata> |
| 7350 |
|
| 7351 |
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest |
| 7352 |
deleted file mode 100644 |
| 7353 |
index a360de1..0000000 |
| 7354 |
--- a/sys-freebsd/freebsd-pf/Manifest |
| 7355 |
+++ /dev/null |
| 7356 |
@@ -1,16 +0,0 @@ |
| 7357 |
-AUX freebsd-pf-10.0-libevent.patch 403 SHA256 b3de99dbc75a116ae46fec1aeaab0bfcc7448a87b963e9defbb94238bb79bee0 SHA512 1ec0d97afd9392c852071d6df704b05a0ca3146a20a3daa4ac541291a2a30c7c8752330381e1f3ae3d874640dd2f04d4b94c5b4adf985a3fbf8890da6a7f9b0b WHIRLPOOL 9cfa4b4b751737b224c43eb75a6eb27ba2e02f2c99829ce8327956d5b0aa381afce7cb86455bc97792ffbe66d8919959865f0c4a5ba44302391c8ea91c7bc065 |
| 7358 |
-AUX freebsd-pf-10.0-pflogd.patch 349 SHA256 630346adc5d39d32112ebb299391b728a0e22b517376fa5f1d872593186f3800 SHA512 d4a605bb1a31837bfb0fa5d20fbac5ed449e4d579c5ab6025da2988ff101c31df7c67e23f9863f2f0b98a76788123e06402d8790d1c9baafd5b732dff0678644 WHIRLPOOL 388b3e724a6971e17867fc4749ea8769d56327a07fbba318f6e4d052ac049f78cc673911cca28dc37dbc3ca93f47eee061c07c0854101cefe6919b373746ebe1 |
| 7359 |
-AUX freebsd-pf-11.0-libevent.patch 312 SHA256 9a70eb1587538294c9d046d06fc0a14d86514061b157277805c439bf3bb89ff2 SHA512 0c9eef97f7bfa5bcf4019a2449a096a6a6b66d3f0b5275181af86694cd0efd832788433d0203d3b9a54fc11c3eb728b6e67b143a622ce6f8b36f52299a9db85f WHIRLPOOL ef2ae2aec4a52b857574325133a788e1a97099b998bc44237affc0dd48aedd5322da618e0313552f4f9d54a1dd86164804d7502b8c445aca8774f73f5e09c5cc |
| 7360 |
-AUX freebsd-pf-11.0-pflogd.patch 326 SHA256 0a2bff431b2fb3f29200b6337d7e77f1e16c8dbacefd52995d60a851a3fad5e4 SHA512 25327461327f01f1858e6d2108db973090c62c1dbccb09390d834cdfaff97d5258123b1162538e2d8faf7f452a8a7eb743ef72ebfddeac3c989aa43b96f05a90 WHIRLPOOL fab1348ddaf1f13e79c218a26de9b0b7978548be137c5e39b9bb8874789d97c7e23ae322ea3d2e899bbbd9b88e69884b8bb9bcfa4cb6d8df84e47c8df456c62d |
| 7361 |
-AUX freebsd-pf-7.0-libevent.patch 331 SHA256 ea5db9308712447cee285d2ac479d95399f1c0948afbbaf6598ad362e262c716 SHA512 fe2db637c8b1f6f8853fd4f6a88dbc0de8d58cc8f3875f0a94dbda74ef4bab4f1402409ff4732f8deae5d9da6bf5eb32d2a8e985f210b84926f94942dffe9c61 WHIRLPOOL 2f84a4ae54fa3dd53610db31af88c064b6df82460516f2024176d4acd5dd6c702c5adee98473a6a05ed701b07b0404c90dae490acd11483a48206ce542b21a96 |
| 7362 |
-AUX freebsd-pf-7.0-pcap_pollution.patch 437 SHA256 65eb1dd0c9084981faa80dfc74140deb431223ae14cf47b1ee0b83fc0fa2bfef SHA512 e08df63ac57747cbd42e32b6e61e08e92b0f7af333508e32717194e9c0d0a1b0f23bf4ed9f0b745f804c164b2c950bf92d2abc22ece58113b7ccaee5e86ea3d9 WHIRLPOOL 735d498ba1765df65acb2db018c0f058da06dd5bef27eca3137ed1409e959bd637c6040f32fe40d022d6fba98272c496765e84319e1f1f5857618ac66744c872 |
| 7363 |
-AUX freebsd-pf-9.0-bpf.patch 309 SHA256 9adf0af94c2cf2f61c1e9f2ab071c8628b3845778f7f61abfe52feb347a615a7 SHA512 e3364e372b5c2d2c4a1960ee1f6d5fa411810ba3597356ec17b275afd8bb6813cce62d781fc683663037b008d81804d28a2617f308c942a741657cf8dcf0e039 WHIRLPOOL 141a2ad5dbc1e199dc669aef995fcd9b4c71a6a0da55c11645adbef073755a8d661ae4e653d377c42ab000913599ba7f90aa611059496996a2f57282eaf07f8a |
| 7364 |
-AUX freebsd-pf-9.0-getline.patch 1159 SHA256 c56fa01870e2ea7ea187b14ef0d13801782c3f479f3e7fe31ac8fba2917969aa SHA512 2b7ab780e8a66a63e17302f9de19a9a72c7246b349f16745fbe7a2a69d8c83c9d8c5c7e18311bf0273620ce18cd9add6dcf051364013f941d477dbbf165b3ddb WHIRLPOOL 4ab2c2598b79a4066d013bc056f6e3977501cdce959568b7f14360b8b34f3622654a784291c9ba979390fb71f6b76672c26c0242ee9c1df09aadbe96e3e4156e |
| 7365 |
-AUX freebsd-pf-9.0-libevent.patch 384 SHA256 e1331cdc64d5d135f3cf33bea70031cba7813abc39778f860f06a161c395f799 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8 WHIRLPOOL ac352886754590178c550aa755a2380e493cccb66815f2875e03427d5d644394de5f711b6d01625a49fafabb4df1e63bff89ea19f47f99b1f6252ff7ca248ab2 |
| 7366 |
-AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837bae26fd06a79cd3daf5e073b889d4650276 SHA512 262d23f74449f75d628dcda09a7c7e0d501b61899c0a2a1ca71179989803f5c5f70fd4f8908f06ce998aca994d54b43efe03578892ff121c0a27e7fa36e4f1dd WHIRLPOOL 9dd4be7cf9741a8cbb0395346a79656233532b10762551d04c85a36637bd95e5d1aed0024ba1ee4259d41d1b5d26777524353787d3c13ad12e4dfb21f12955cf |
| 7367 |
-AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6 SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073 WHIRLPOOL b90b5e454e96cc6f243e99358b78d45b6a13a46810a3683d837f03721052e7b4fc3f8733ac2c96cabed204435a9be93a0652da5311f6552ece294031b0b663df |
| 7368 |
-AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc |
| 7369 |
-AUX pf.initd 810 SHA256 e2e592682e4c8e2b5de2a0be21c061e0f9adbe237d566ce8846dbda13fb56750 SHA512 7638cae25c51f8be6229992b6462ac65ad7fd53fd61aaaedd70e7f97ea3b3314278f5ed3336dde043cdd86f017f1b6d025a95931649257b596eba3dbf2c64eff WHIRLPOOL 099108815854abb3e05f4f0100e1bef515570955677eb68d2b1f1d2301057adc12f319a7ef5805af466b3de4d10414e49df53d6119ebcc674410cafe968d9992 |
| 7370 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 7371 |
-EBUILD freebsd-pf-11.0.ebuild 1498 SHA256 56f9cb1cb83e1e72ea89a09d4dadafbac81fb2fd7aba5d00113e5680b89c4f21 SHA512 0f9e4054b4d758437e5ef0aec840fde5def23e2e17b1ecb21f8404a207dabba134126623d92a23f6778faca9ca22dc672bbd459e801b094458e93abf3df1f77e WHIRLPOOL 51d26a08d3a367d06b257c26fa17b2e814849b9487a2cb9a4242986734f33540e2b621e30bd06b4bca9f11edf20fcba5a4a6005d987af0a8f0be0212d6671fdf |
| 7372 |
-MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a |
| 7373 |
|
| 7374 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch |
| 7375 |
deleted file mode 100644 |
| 7376 |
index 57474ea..0000000 |
| 7377 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch |
| 7378 |
+++ /dev/null |
| 7379 |
@@ -1,16 +0,0 @@ |
| 7380 |
-diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile |
| 7381 |
-index de49888..2ab32fb 100644 |
| 7382 |
---- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile |
| 7383 |
-+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile |
| 7384 |
-@@ -7,10 +7,7 @@ MAN= ftp-proxy.8 |
| 7385 |
- |
| 7386 |
- SRCS= ftp-proxy.c filter.c |
| 7387 |
- |
| 7388 |
--CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent |
| 7389 |
-- |
| 7390 |
--LDADD+= ${LIBEVENT} |
| 7391 |
--DPADD+= ${LIBEVENT} |
| 7392 |
-+LDADD+= -levent |
| 7393 |
- |
| 7394 |
- WARNS?= 3 |
| 7395 |
- |
| 7396 |
|
| 7397 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch |
| 7398 |
deleted file mode 100644 |
| 7399 |
index 1316d3b..0000000 |
| 7400 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch |
| 7401 |
+++ /dev/null |
| 7402 |
@@ -1,15 +0,0 @@ |
| 7403 |
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile |
| 7404 |
-index fcff8eb..0da383d 100644 |
| 7405 |
---- a/sbin/pflogd/Makefile |
| 7406 |
-+++ b/sbin/pflogd/Makefile |
| 7407 |
-@@ -6,10 +6,7 @@ PROG= pflogd |
| 7408 |
- SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c |
| 7409 |
- MAN= pflogd.8 |
| 7410 |
- |
| 7411 |
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h |
| 7412 |
-- |
| 7413 |
- LDADD= -lpcap |
| 7414 |
--DPADD= ${LIBPCAP} |
| 7415 |
- |
| 7416 |
- WARNS?= 2 |
| 7417 |
- |
| 7418 |
|
| 7419 |
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 |
| 7420 |
deleted file mode 100644 |
| 7421 |
index 0f3ecb1..0000000 |
| 7422 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch |
| 7423 |
+++ /dev/null |
| 7424 |
@@ -1,13 +0,0 @@ |
| 7425 |
-diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile |
| 7426 |
-index 941505f..df5ccb2 100644 |
| 7427 |
---- a/usr.sbin/ftp-proxy/Makefile |
| 7428 |
-+++ b/usr.sbin/ftp-proxy/Makefile |
| 7429 |
-@@ -7,8 +7,6 @@ MAN= ftp-proxy.8 |
| 7430 |
- |
| 7431 |
- SRCS= ftp-proxy.c filter.c |
| 7432 |
- |
| 7433 |
--CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent |
| 7434 |
-- |
| 7435 |
- LIBADD= event |
| 7436 |
- |
| 7437 |
- WARNS?= 3 |
| 7438 |
|
| 7439 |
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 |
| 7440 |
deleted file mode 100644 |
| 7441 |
index 6435280..0000000 |
| 7442 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch |
| 7443 |
+++ /dev/null |
| 7444 |
@@ -1,13 +0,0 @@ |
| 7445 |
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile |
| 7446 |
-index b3822dd..5912ad2 100644 |
| 7447 |
---- a/sbin/pflogd/Makefile |
| 7448 |
-+++ b/sbin/pflogd/Makefile |
| 7449 |
-@@ -7,8 +7,6 @@ PROG= pflogd |
| 7450 |
- SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c |
| 7451 |
- MAN= pflogd.8 |
| 7452 |
- |
| 7453 |
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h |
| 7454 |
-- |
| 7455 |
- LIBADD= pcap |
| 7456 |
- |
| 7457 |
- WARNS?= 2 |
| 7458 |
|
| 7459 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch |
| 7460 |
deleted file mode 100644 |
| 7461 |
index 1425db2..0000000 |
| 7462 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch |
| 7463 |
+++ /dev/null |
| 7464 |
@@ -1,12 +0,0 @@ |
| 7465 |
---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.orig 2008-06-14 00:01:52 -0300 |
| 7466 |
-+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile 2008-06-14 00:03:19 -0300 |
| 7467 |
-@@ -10,8 +10,7 @@ |
| 7468 |
- CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent |
| 7469 |
- CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf |
| 7470 |
- |
| 7471 |
--DPADD= ${LIBEVENT} |
| 7472 |
--LDADD= ${LIBEVENT} |
| 7473 |
-+LDADD= -levent |
| 7474 |
- |
| 7475 |
- WARNS?= 2 |
| 7476 |
- |
| 7477 |
|
| 7478 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch |
| 7479 |
deleted file mode 100644 |
| 7480 |
index 4a7c2e9..0000000 |
| 7481 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch |
| 7482 |
+++ /dev/null |
| 7483 |
@@ -1,18 +0,0 @@ |
| 7484 |
---- contrib/pf/pflogd/privsep.c.orig 2007-07-03 09:30:02 -0300 |
| 7485 |
-+++ contrib/pf/pflogd/privsep.c 2008-06-13 23:55:39 -0300 |
| 7486 |
-@@ -31,13 +31,14 @@ |
| 7487 |
- #include <errno.h> |
| 7488 |
- #include <fcntl.h> |
| 7489 |
- #include <limits.h> |
| 7490 |
-+#include <stdio.h> |
| 7491 |
-+#define HAVE_SNPRINTF |
| 7492 |
- #ifndef __FreeBSD__ |
| 7493 |
- #include <pcap.h> |
| 7494 |
- #include <pcap-int.h> |
| 7495 |
- #endif |
| 7496 |
- #include <pwd.h> |
| 7497 |
- #include <signal.h> |
| 7498 |
--#include <stdio.h> |
| 7499 |
- #include <stdlib.h> |
| 7500 |
- #include <string.h> |
| 7501 |
- #ifdef __FreeBSD__ |
| 7502 |
|
| 7503 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch |
| 7504 |
deleted file mode 100644 |
| 7505 |
index fb3c701..0000000 |
| 7506 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch |
| 7507 |
+++ /dev/null |
| 7508 |
@@ -1,10 +0,0 @@ |
| 7509 |
---- contrib/pf/pflogd/pflogd.c.old 2011-11-02 21:12:57.000000000 +0000 |
| 7510 |
-+++ contrib/pf/pflogd/pflogd.c 2011-11-02 21:13:11.000000000 +0000 |
| 7511 |
-@@ -39,6 +39,7 @@ |
| 7512 |
- #include <sys/stat.h> |
| 7513 |
- #include <sys/socket.h> |
| 7514 |
- #include <net/if.h> |
| 7515 |
-+#include <net/bpf.h> |
| 7516 |
- #include <stdio.h> |
| 7517 |
- #include <stdlib.h> |
| 7518 |
- #include <string.h> |
| 7519 |
|
| 7520 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch |
| 7521 |
deleted file mode 100644 |
| 7522 |
index 6679d32..0000000 |
| 7523 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch |
| 7524 |
+++ /dev/null |
| 7525 |
@@ -1,38 +0,0 @@ |
| 7526 |
---- contrib/pf/ftp-proxy/ftp-proxy.c.old 2011-11-02 21:18:19.000000000 +0000 |
| 7527 |
-+++ contrib/pf/ftp-proxy/ftp-proxy.c 2011-11-02 21:18:36.000000000 +0000 |
| 7528 |
-@@ -103,7 +103,7 @@ |
| 7529 |
- int drop_privs(void); |
| 7530 |
- void end_session(struct session *); |
| 7531 |
- void exit_daemon(void); |
| 7532 |
--int getline(char *, size_t *); |
| 7533 |
-+int ftpgetline(char *, size_t *); |
| 7534 |
- void handle_connection(const int, short, void *); |
| 7535 |
- void handle_signal(int, short, void *); |
| 7536 |
- struct session * init_session(void); |
| 7537 |
-@@ -249,7 +249,7 @@ |
| 7538 |
- buf_avail); |
| 7539 |
- s->cbuf_valid += clientread; |
| 7540 |
- |
| 7541 |
-- while ((n = getline(s->cbuf, &s->cbuf_valid)) > 0) { |
| 7542 |
-+ while ((n = ftpgetline(s->cbuf, &s->cbuf_valid)) > 0) { |
| 7543 |
- logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf); |
| 7544 |
- if (!client_parse(s)) { |
| 7545 |
- end_session(s); |
| 7546 |
-@@ -343,7 +343,7 @@ |
| 7547 |
- } |
| 7548 |
- |
| 7549 |
- int |
| 7550 |
--getline(char *buf, size_t *valid) |
| 7551 |
-+ftpgetline(char *buf, size_t *valid) |
| 7552 |
- { |
| 7553 |
- size_t i; |
| 7554 |
- |
| 7555 |
-@@ -1087,7 +1087,7 @@ |
| 7556 |
- buf_avail); |
| 7557 |
- s->sbuf_valid += srvread; |
| 7558 |
- |
| 7559 |
-- while ((n = getline(s->sbuf, &s->sbuf_valid)) > 0) { |
| 7560 |
-+ while ((n = ftpgetline(s->sbuf, &s->sbuf_valid)) > 0) { |
| 7561 |
- logmsg(LOG_DEBUG, "#%d server: %s", s->id, linebuf); |
| 7562 |
- if (!server_parse(s)) { |
| 7563 |
- end_session(s); |
| 7564 |
|
| 7565 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch |
| 7566 |
deleted file mode 100644 |
| 7567 |
index e488423..0000000 |
| 7568 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch |
| 7569 |
+++ /dev/null |
| 7570 |
@@ -1,15 +0,0 @@ |
| 7571 |
---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.old 2011-11-02 20:57:03.000000000 +0000 |
| 7572 |
-+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile 2011-11-02 20:57:21.000000000 +0000 |
| 7573 |
-@@ -7,11 +7,9 @@ |
| 7574 |
- |
| 7575 |
- SRCS= ftp-proxy.c filter.c |
| 7576 |
- |
| 7577 |
--CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent |
| 7578 |
- CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf |
| 7579 |
- |
| 7580 |
--LDADD+= ${LIBEVENT} |
| 7581 |
--DPADD+= ${LIBEVENT} |
| 7582 |
-+LDADD+= -levent |
| 7583 |
- |
| 7584 |
- WARNS?= 3 |
| 7585 |
- |
| 7586 |
|
| 7587 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch |
| 7588 |
deleted file mode 100644 |
| 7589 |
index 184ab6f..0000000 |
| 7590 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch |
| 7591 |
+++ /dev/null |
| 7592 |
@@ -1,17 +0,0 @@ |
| 7593 |
---- contrib/pf/pflogd/privsep.c.old 2011-11-02 21:04:01.000000000 +0000 |
| 7594 |
-+++ contrib/pf/pflogd/privsep.c 2011-11-02 21:04:27.000000000 +0000 |
| 7595 |
-@@ -32,11 +32,13 @@ |
| 7596 |
- #include <errno.h> |
| 7597 |
- #include <fcntl.h> |
| 7598 |
- #include <limits.h> |
| 7599 |
-+#include <stdio.h> |
| 7600 |
-+#define HAVE_SNPRINTF |
| 7601 |
-+#define HAVE_STRLCPY |
| 7602 |
- #include <pcap.h> |
| 7603 |
- #include <pcap-int.h> |
| 7604 |
- #include <pwd.h> |
| 7605 |
- #include <signal.h> |
| 7606 |
--#include <stdio.h> |
| 7607 |
- #include <stdlib.h> |
| 7608 |
- #include <string.h> |
| 7609 |
- #include <syslog.h> |
| 7610 |
|
| 7611 |
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch |
| 7612 |
deleted file mode 100644 |
| 7613 |
index d5a65ea..0000000 |
| 7614 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch |
| 7615 |
+++ /dev/null |
| 7616 |
@@ -1,13 +0,0 @@ |
| 7617 |
---- sbin/pflogd/Makefile.old 2011-11-02 21:08:46.000000000 +0000 |
| 7618 |
-+++ sbin/pflogd/Makefile 2011-11-02 21:08:53.000000000 +0000 |
| 7619 |
-@@ -6,10 +6,7 @@ |
| 7620 |
- SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c |
| 7621 |
- MAN= pflogd.8 |
| 7622 |
- |
| 7623 |
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h |
| 7624 |
-- |
| 7625 |
- LDADD= -lpcap |
| 7626 |
--DPADD= ${LIBPCAP} ${LIBUTIL} |
| 7627 |
- |
| 7628 |
- WARNS?= 2 |
| 7629 |
- |
| 7630 |
|
| 7631 |
diff --git a/sys-freebsd/freebsd-pf/files/pf.confd b/sys-freebsd/freebsd-pf/files/pf.confd |
| 7632 |
deleted file mode 100644 |
| 7633 |
index 87c21b2..0000000 |
| 7634 |
--- a/sys-freebsd/freebsd-pf/files/pf.confd |
| 7635 |
+++ /dev/null |
| 7636 |
@@ -1,9 +0,0 @@ |
| 7637 |
-# Copyright 2006 Gentoo Foundation |
| 7638 |
-# Distributed under the terms of the GNU General Public License v2 |
| 7639 |
- |
| 7640 |
-# Defines where the rules file is found, by default /etc/pf.conf |
| 7641 |
-# pf_conf=/etc/pf.conf |
| 7642 |
- |
| 7643 |
-# Extra options to pass to pfctl when loading the rules |
| 7644 |
-# See pfctl(8) |
| 7645 |
-# pf_args= |
| 7646 |
|
| 7647 |
diff --git a/sys-freebsd/freebsd-pf/files/pf.initd b/sys-freebsd/freebsd-pf/files/pf.initd |
| 7648 |
deleted file mode 100644 |
| 7649 |
index 38ee4ea..0000000 |
| 7650 |
--- a/sys-freebsd/freebsd-pf/files/pf.initd |
| 7651 |
+++ /dev/null |
| 7652 |
@@ -1,50 +0,0 @@ |
| 7653 |
-#!/sbin/openrc-run |
| 7654 |
-# Copyright 2006 Gentoo Foundation |
| 7655 |
-# Distributed under the terms of the GNU General Public License v2 |
| 7656 |
-# $Id$ |
| 7657 |
- |
| 7658 |
-depend() { |
| 7659 |
- need net |
| 7660 |
-} |
| 7661 |
- |
| 7662 |
-checkconfig() { |
| 7663 |
- if ! [ -c /dev/pf ]; then |
| 7664 |
- ewarn "Pseudo-device /dev/pf not found." |
| 7665 |
- |
| 7666 |
- ebegin "Loading pf module" |
| 7667 |
- if ! kldload pf; then |
| 7668 |
- eerror "Unable to load pf module." |
| 7669 |
- eend 1 |
| 7670 |
- return 1 |
| 7671 |
- fi |
| 7672 |
- eend $? |
| 7673 |
- |
| 7674 |
- if ! [ -c /dev/pf ]; then |
| 7675 |
- eerror "Pseudo-device /dev/pf still not found." |
| 7676 |
- return 1 |
| 7677 |
- fi |
| 7678 |
- fi |
| 7679 |
- |
| 7680 |
- return 0 |
| 7681 |
-} |
| 7682 |
- |
| 7683 |
-start() { |
| 7684 |
- checkconfig || return 1 |
| 7685 |
- |
| 7686 |
- einfo "Starting firewall" |
| 7687 |
- |
| 7688 |
- if [ -r "${PF_RULES_FILE}" ]; then |
| 7689 |
- einfo "Loading firewall rules" |
| 7690 |
- /sbin/pfctl -qe -f ${PF_RULES_FILE:-/etc/pf.conf} ${PF_OPTS} |
| 7691 |
- else |
| 7692 |
- /sbin/pfctl -qe ${PF_OPTS} |
| 7693 |
- fi |
| 7694 |
- |
| 7695 |
- eend $? |
| 7696 |
-} |
| 7697 |
- |
| 7698 |
-stop() { |
| 7699 |
- einfo "Stopping firewall" |
| 7700 |
- /sbin/pfctl -qd || retval=1 |
| 7701 |
- eend $? |
| 7702 |
-} |
| 7703 |
|
| 7704 |
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild |
| 7705 |
deleted file mode 100644 |
| 7706 |
index 914cfe1..0000000 |
| 7707 |
--- a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild |
| 7708 |
+++ /dev/null |
| 7709 |
@@ -1,71 +0,0 @@ |
| 7710 |
-# Copyright 1999-2016 Gentoo Foundation |
| 7711 |
-# Distributed under the terms of the GNU General Public License v2 |
| 7712 |
-# $Id$ |
| 7713 |
- |
| 7714 |
-EAPI=5 |
| 7715 |
- |
| 7716 |
-inherit bsdmk freebsd user |
| 7717 |
- |
| 7718 |
-DESCRIPTION="FreeBSD's base system libraries" |
| 7719 |
-SLOT="0" |
| 7720 |
- |
| 7721 |
-IUSE="" |
| 7722 |
- |
| 7723 |
-# Crypto is needed to have an internal OpenSSL header |
| 7724 |
-if [[ ${PV} != *9999* ]]; then |
| 7725 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
| 7726 |
-fi |
| 7727 |
- |
| 7728 |
-EXTRACTONLY=" |
| 7729 |
- usr.sbin/ |
| 7730 |
- sbin/ |
| 7731 |
- contrib/pf/ |
| 7732 |
- etc/ |
| 7733 |
-" |
| 7734 |
- |
| 7735 |
-RDEPEND="net-libs/libpcap" |
| 7736 |
-DEPEND="${RDEPEND} |
| 7737 |
- dev-libs/libevent |
| 7738 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 7739 |
- =sys-freebsd/freebsd-sources-${RV}*" |
| 7740 |
- |
| 7741 |
-S="${WORKDIR}" |
| 7742 |
- |
| 7743 |
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy" |
| 7744 |
- |
| 7745 |
-pkg_setup() { |
| 7746 |
- enewgroup authpf 63 |
| 7747 |
-} |
| 7748 |
- |
| 7749 |
-src_prepare() { |
| 7750 |
- # pcap-int.h redefines snprintf as pcap_snprintf |
| 7751 |
- epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch" |
| 7752 |
- # Use system's libevent |
| 7753 |
- epatch "${FILESDIR}/${PN}-11.0-libevent.patch" |
| 7754 |
- epatch "${FILESDIR}/${PN}-11.0-pflogd.patch" |
| 7755 |
- epatch "${FILESDIR}/${PN}-9.0-bpf.patch" |
| 7756 |
- # Link in kernel sources |
| 7757 |
- [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" |
| 7758 |
-} |
| 7759 |
- |
| 7760 |
-src_compile() { |
| 7761 |
- for dir in ${SUBDIRS}; do |
| 7762 |
- einfo "Starting make in ${dir}" |
| 7763 |
- cd "${S}/${dir}" || die |
| 7764 |
- freebsd_src_compile || die "Make ${dir} failed" |
| 7765 |
- done |
| 7766 |
-} |
| 7767 |
- |
| 7768 |
-src_install() { |
| 7769 |
- for dir in ${SUBDIRS}; do |
| 7770 |
- einfo "Starting install in ${dir}" |
| 7771 |
- cd "${S}/${dir}" || die |
| 7772 |
- freebsd_src_install || die "Install ${dir} failed" |
| 7773 |
- done |
| 7774 |
- |
| 7775 |
- cd "${WORKDIR}"/etc |
| 7776 |
- insinto /etc |
| 7777 |
- doins pf.os |
| 7778 |
- # pf.initd provided by openrc, but no pf.confd |
| 7779 |
- newconfd "${FILESDIR}/pf.confd" pf |
| 7780 |
-} |
| 7781 |
|
| 7782 |
diff --git a/sys-freebsd/freebsd-pf/metadata.xml b/sys-freebsd/freebsd-pf/metadata.xml |
| 7783 |
deleted file mode 100644 |
| 7784 |
index a00f3ae..0000000 |
| 7785 |
--- a/sys-freebsd/freebsd-pf/metadata.xml |
| 7786 |
+++ /dev/null |
| 7787 |
@@ -1,8 +0,0 @@ |
| 7788 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 7789 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 7790 |
-<pkgmetadata> |
| 7791 |
-<maintainer type="project"> |
| 7792 |
- <email>bsd@g.o</email> |
| 7793 |
- <name>BSD Project</name> |
| 7794 |
-</maintainer> |
| 7795 |
-</pkgmetadata> |
| 7796 |
|
| 7797 |
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest |
| 7798 |
deleted file mode 100644 |
| 7799 |
index d8fb22e..0000000 |
| 7800 |
--- a/sys-freebsd/freebsd-rescue/Manifest |
| 7801 |
+++ /dev/null |
| 7802 |
@@ -1,12 +0,0 @@ |
| 7803 |
-AUX freebsd-rescue-10.0-zlib.patch 861 SHA256 e6ed90b353f180dc805d8ebf8774ef221f99dcd2ee2df485d48e795020ae8f4c SHA512 b055878934144bb2403bcf7d93b6239d161654d822ff5839676430eec282b1a7d210e9d4d4b744995b6e6d400ac15a98af9268f0ef62e455c6e776fa79d7b037 WHIRLPOOL 13e41e3aa5d9e0ca581927a8550acddd31ca0619b8e59f34a4f1c0a4a43b1d5fe2927fe8860db9c3bbd8cce8f7267c6f88ceca139569a0ac3ab575561929b4b8 |
| 7804 |
-AUX freebsd-rescue-11.0-rename-libs.patch 874 SHA256 05dbc376b4e0b84d2d41a1d627d2a8b704584047acd0331fdbd927d44945066c SHA512 8ac692342e0ce3cd39286c08523bc89d56f15964242c08ec2065e70fbf3cec24c00608d50ab5b94ab4a7781a4175acc40c2bcc0e4a2cfaf3afcd89fa06dd77c9 WHIRLPOOL 2d3670648d3aea78b77ac0cf201e77fb9028eb00d105113543362df801a3f48610356f4adc6635a18852fc6ac750fa39c6fe223d50ab70474ab117d6199ad99b |
| 7805 |
-AUX freebsd-rescue-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef |
| 7806 |
-AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 SHA256 3690730ee66082fcc4f04ab79c49c6759772c0aefc68abdebbe4497b1155a7bc SHA512 529294fbff01e573f714e7f0474ccb85755453da057d224ffc1eab91ea6945af2efc8cafcc48db4d75f5204fa5ab514da35af66d75f90df4bde3f0b8e8aa7dc5 WHIRLPOOL 95b65d6501a8d77fe4ecbc13aea1010e85fa5591fb5fc12d4a3ccaee51b908245ac79961bccd3d0e4b8430eacd7eb0fe271907c8a94812fad8df0ab888e3bd7d |
| 7807 |
-AUX freebsd-rescue-8.2-libzcleverlink.patch 789 SHA256 80d86cb1b632d0c09fdcfd7b998fb1189e957619a41fc65682e2c439392c38fd SHA512 5c24aed5b05b1de4aad67961edbc168c31f80a2d0d034839af8b2fb73497b34d525e1af2c0979b1e23bbcbb53d6079030aa68a1b218cef470c8daa2f439d3a7f WHIRLPOOL 55b39e959f0d0821189070ca03167becdd6d446a97dff7c171c40b12629cb2365aed6633635e6d8f6e3f3fa6bea68c46f31b79e537c3d56752e4aee76d76ce84 |
| 7808 |
-AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589fb95cc2c2d1fc6e8b74d0faf3d17ef1 SHA512 320d2a69c2f0de5e6cb733238fcc46133e571d8536f2ac573597f008d4261fae4d27619c244a90a70392688004df438b80e89f6be810841f6a40a22c2c361bb4 WHIRLPOOL 412da27f4535e1300d150edc74f72cf5e4e2b8bb6d4c7e9f31a498396ac12514e97e4b3a83040484b4713a7edb6b2d6ed5e8b2fe714d13f297c35d657f90fc08 |
| 7809 |
-AUX freebsd-rescue-9.1-libcleverlink.patch 801 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831 SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3 WHIRLPOOL 88125b9143113b1f7049bf63a20a0c6d82fbe2c722198405830092b0a183f4bf7744420e6a82b601c8fb25911556c8f3a9088949798c7f66caf7843a5f9b2347 |
| 7810 |
-AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b |
| 7811 |
-AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863 |
| 7812 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 7813 |
-EBUILD freebsd-rescue-11.0.ebuild 1876 SHA256 0c95232e5325b9cf44794eddb0437aac011ea218eea4c6aa5196f853dea140f9 SHA512 c7769f4229c6d0af44e524c0208680a193e40874f4bc6010fe6d7c645c7423735123c9bbcce48fbab17b02737d49bb9f722172e9cfe37e1560bc50e8120edbf0 WHIRLPOOL 9d1eb2b421609571ba02d62a09213c1e5703d10945951fed237f8168e051fd90b543ebed5c19495c89c5c2a0c483a2e56638f9409f4932c41cd6b73c5d4396b5 |
| 7814 |
-MISC metadata.xml 402 SHA256 75ec89a9158454c340bf52b7b8c9206f5cb65fe01afd5dfd36aaf13fd68eca7b SHA512 247e4e4c80cd64a81f698fc7fbeab529a02f8b2c6b0040628936ab7d83a09c7242df0b10d7cb4e4e8d7d78806c303cd82903adc4a38b649e911337a832c35834 WHIRLPOOL 4cd689a5c3a69a0ae7614bbed3c7a51eade7c77e03eba094fbeb75390ec9faee52c2bb085655ad3069148ec03838c03c713921a62eb6c1380e2a90781d294d72 |
| 7815 |
|
| 7816 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch |
| 7817 |
deleted file mode 100644 |
| 7818 |
index 42165c4..0000000 |
| 7819 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch |
| 7820 |
+++ /dev/null |
| 7821 |
@@ -1,22 +0,0 @@ |
| 7822 |
-diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c |
| 7823 |
-index 13c0d43..1f258f3 100644 |
| 7824 |
---- a/sbin/savecore/savecore.c |
| 7825 |
-+++ b/sbin/savecore/savecore.c |
| 7826 |
-@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */ |
| 7827 |
- static int nfound, nsaved, nerr; /* statistics */ |
| 7828 |
- static int maxdumps; |
| 7829 |
- |
| 7830 |
--extern FILE *zopen(const char *, const char *); |
| 7831 |
-+extern FILE *gzopen(const char *, const char *); |
| 7832 |
- |
| 7833 |
- static sig_atomic_t got_siginfo; |
| 7834 |
- static void infohandler(int); |
| 7835 |
-@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device) |
| 7836 |
- if (compress) { |
| 7837 |
- snprintf(corename, sizeof(corename), "%s.%d.gz", |
| 7838 |
- istextdump ? "textdump.tar" : "vmcore", bounds); |
| 7839 |
-- fp = zopen(corename, "w"); |
| 7840 |
-+ fp = gzopen(corename, "w"); |
| 7841 |
- } else { |
| 7842 |
- snprintf(corename, sizeof(corename), "%s.%d", |
| 7843 |
- istextdump ? "textdump.tar" : "vmcore", bounds); |
| 7844 |
|
| 7845 |
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 |
| 7846 |
deleted file mode 100644 |
| 7847 |
index 3103574..0000000 |
| 7848 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch |
| 7849 |
+++ /dev/null |
| 7850 |
@@ -1,22 +0,0 @@ |
| 7851 |
-diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile |
| 7852 |
-index e747c02..a061436 100644 |
| 7853 |
---- a/rescue/rescue/Makefile |
| 7854 |
-+++ b/rescue/rescue/Makefile |
| 7855 |
-@@ -54,7 +54,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ |
| 7856 |
- ed expr getfacl hostname kenv kill ln ls mkdir mv \ |
| 7857 |
- pkill ps pwd realpath rm rmdir setfacl sh sleep stty \ |
| 7858 |
- sync test |
| 7859 |
--CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ll -ltermcapw -lutil -lxo |
| 7860 |
-+CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -lfl -lncursesw -lutil -lxo |
| 7861 |
- CRUNCH_BUILDTOOLS+= bin/sh |
| 7862 |
- |
| 7863 |
- # Additional options for specific programs |
| 7864 |
-@@ -128,7 +128,7 @@ CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem |
| 7865 |
- # liblzma needs pthread |
| 7866 |
- CRUNCH_LIBS+= -lpthread |
| 7867 |
- .endif |
| 7868 |
--CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv |
| 7869 |
-+CRUNCH_LIBS+= -lgeom -lexpat -lkiconv |
| 7870 |
- .if ${MK_OPENSSL} == "no" |
| 7871 |
- CRUNCH_LIBS+= -lmd |
| 7872 |
- .endif |
| 7873 |
|
| 7874 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch |
| 7875 |
deleted file mode 100644 |
| 7876 |
index 22fb2ec..0000000 |
| 7877 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch |
| 7878 |
+++ /dev/null |
| 7879 |
@@ -1,21 +0,0 @@ |
| 7880 |
-diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c |
| 7881 |
---- sbin/savecore/savecore.c 2005-02-26 01:21:50 +0000 |
| 7882 |
-+++ sbin-zlib/savecore/savecore.c 2005-05-06 12:00:06 +0000 |
| 7883 |
-@@ -95,7 +95,7 @@ |
| 7884 |
- static int checkfor, compress, clear, force, keep, verbose; /* flags */ |
| 7885 |
- static int nfound, nsaved, nerr; /* statistics */ |
| 7886 |
- |
| 7887 |
--extern FILE *zopen(const char *, const char *); |
| 7888 |
-+extern FILE *gzopen(const char *, const char *); |
| 7889 |
- |
| 7890 |
- static void |
| 7891 |
- printheader(FILE *f, const struct kerneldumpheader *h, const char *device, |
| 7892 |
-@@ -553,7 +553,7 @@ |
| 7893 |
- if (compress) { |
| 7894 |
- sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" : |
| 7895 |
- "vmcore", bounds); |
| 7896 |
-- fp = zopen(filename, "w"); |
| 7897 |
-+ fp = gzopen(filename, "w"); |
| 7898 |
- } else { |
| 7899 |
- sprintf(filename, "%s.%d", istextdump ? "textdump.tar" : |
| 7900 |
- "vmcore", bounds); |
| 7901 |
|
| 7902 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch |
| 7903 |
deleted file mode 100644 |
| 7904 |
index 7d12621..0000000 |
| 7905 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch |
| 7906 |
+++ /dev/null |
| 7907 |
@@ -1,11 +0,0 @@ |
| 7908 |
---- rescue/rescue/Makefile.old 2010-03-12 12:14:17 +0100 |
| 7909 |
-+++ rescue/rescue/Makefile 2010-03-12 12:14:47 +0100 |
| 7910 |
-@@ -209,7 +209,7 @@ |
| 7911 |
- CRUNCH_LIBS+= -lbz2 |
| 7912 |
- |
| 7913 |
- CRUNCH_PROGS_usr.bin+= tar |
| 7914 |
--CRUNCH_LIBS+= -larchive -lmd |
| 7915 |
-+CRUNCH_LIBS+= `pkg-config --static --libs libarchive` -lmd |
| 7916 |
- .if ${MK_OPENSSL} != "no" |
| 7917 |
- CRUNCH_LIBS+= -lcrypto |
| 7918 |
- .endif |
| 7919 |
|
| 7920 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch |
| 7921 |
deleted file mode 100644 |
| 7922 |
index 3d44457..0000000 |
| 7923 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch |
| 7924 |
+++ /dev/null |
| 7925 |
@@ -1,20 +0,0 @@ |
| 7926 |
---- rescue/rescue/Makefile.old 2011-07-06 01:35:13.000000000 +0000 |
| 7927 |
-+++ rescue/rescue/Makefile 2011-07-06 01:35:54.000000000 +0000 |
| 7928 |
-@@ -143,7 +143,7 @@ |
| 7929 |
- .if ${MK_ZFS} != "no" |
| 7930 |
- CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl |
| 7931 |
- .endif |
| 7932 |
--CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz |
| 7933 |
-+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs |
| 7934 |
- |
| 7935 |
- .if ${MACHINE_ARCH} == "i386" |
| 7936 |
- CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk |
| 7937 |
-@@ -234,7 +234,7 @@ |
| 7938 |
- CRUNCH_PROGS_usr.sbin+= chown |
| 7939 |
- CRUNCH_ALIAS_chown= chgrp |
| 7940 |
- ################################################################## |
| 7941 |
--CRUNCH_LIBS+= -lm |
| 7942 |
-+CRUNCH_LIBS+= -lz -lm |
| 7943 |
- |
| 7944 |
- ################################################################## |
| 7945 |
- # The following is pretty nearly a generic crunchgen-handling makefile |
| 7946 |
|
| 7947 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch |
| 7948 |
deleted file mode 100644 |
| 7949 |
index d4d23d7..0000000 |
| 7950 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch |
| 7951 |
+++ /dev/null |
| 7952 |
@@ -1,12 +0,0 @@ |
| 7953 |
-diff -Nur work.orig/contrib/libarchive/tar/bsdtar.c work/contrib/libarchive/tar/bsdtar.c |
| 7954 |
---- work.orig/contrib/libarchive/tar/bsdtar.c 2012-07-12 13:44:29.000000000 +0900 |
| 7955 |
-+++ work/contrib/libarchive/tar/bsdtar.c 2012-07-29 00:57:25.000000000 +0900 |
| 7956 |
-@@ -691,7 +691,7 @@ |
| 7957 |
- { |
| 7958 |
- printf("bsdtar %s - %s\n", |
| 7959 |
- BSDTAR_VERSION_STRING, |
| 7960 |
-- archive_version()); |
| 7961 |
-+ archive_version_string()); |
| 7962 |
- exit(0); |
| 7963 |
- } |
| 7964 |
- |
| 7965 |
|
| 7966 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch |
| 7967 |
deleted file mode 100644 |
| 7968 |
index a194397..0000000 |
| 7969 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch |
| 7970 |
+++ /dev/null |
| 7971 |
@@ -1,21 +0,0 @@ |
| 7972 |
-diff -Nur work.orig/rescue/rescue/Makefile work/rescue/rescue/Makefile |
| 7973 |
---- work.orig/rescue/rescue/Makefile 2012-07-29 00:50:20.000000000 +0900 |
| 7974 |
-+++ work/rescue/rescue/Makefile 2012-07-29 00:56:01.000000000 +0900 |
| 7975 |
-@@ -125,7 +125,7 @@ |
| 7976 |
- .if ${MK_ZFS} != "no" |
| 7977 |
- CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem |
| 7978 |
- .endif |
| 7979 |
--CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz |
| 7980 |
-+CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lreadline -lsbuf -lufs |
| 7981 |
- |
| 7982 |
- .if ${MACHINE_CPUARCH} == "i386" |
| 7983 |
- CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk |
| 7984 |
-@@ -216,7 +216,7 @@ |
| 7985 |
- CRUNCH_PROGS_usr.sbin+= chown |
| 7986 |
- CRUNCH_ALIAS_chown= chgrp |
| 7987 |
- ################################################################## |
| 7988 |
--CRUNCH_LIBS+= -lm |
| 7989 |
-+CRUNCH_LIBS+= -lmd -lz -lm |
| 7990 |
- |
| 7991 |
- .include <bsd.crunchgen.mk> |
| 7992 |
- .include <bsd.prog.mk> |
| 7993 |
|
| 7994 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch |
| 7995 |
deleted file mode 100644 |
| 7996 |
index bdda99b..0000000 |
| 7997 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch |
| 7998 |
+++ /dev/null |
| 7999 |
@@ -1,13 +0,0 @@ |
| 8000 |
-diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c |
| 8001 |
---- sbin/ifconfig.old/regdomain.c 2010-12-21 17:09:25.000000000 +0000 |
| 8002 |
-+++ sbin/ifconfig/regdomain.c 2011-07-10 15:56:27.000000000 +0000 |
| 8003 |
-@@ -39,7 +39,7 @@ |
| 8004 |
- #include <err.h> |
| 8005 |
- #include <unistd.h> |
| 8006 |
- |
| 8007 |
--#include <bsdxml.h> |
| 8008 |
-+#include <expat.h> |
| 8009 |
- |
| 8010 |
- #include "regdomain.h" |
| 8011 |
- |
| 8012 |
-Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos |
| 8013 |
|
| 8014 |
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch |
| 8015 |
deleted file mode 100644 |
| 8016 |
index 6064717..0000000 |
| 8017 |
--- a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch |
| 8018 |
+++ /dev/null |
| 8019 |
@@ -1,13 +0,0 @@ |
| 8020 |
-diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c |
| 8021 |
-index af6562b..3121c81 100644 |
| 8022 |
---- a/usr.bin/mt/mt.c |
| 8023 |
-+++ b/usr.bin/mt/mt.c |
| 8024 |
-@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $" |
| 8025 |
- #include <unistd.h> |
| 8026 |
- #include <stdint.h> |
| 8027 |
- #include <errno.h> |
| 8028 |
--#include <bsdxml.h> |
| 8029 |
-+#include <expat.h> |
| 8030 |
- #include <mtlib.h> |
| 8031 |
- |
| 8032 |
- #include <cam/cam.h> |
| 8033 |
|
| 8034 |
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild |
| 8035 |
deleted file mode 100644 |
| 8036 |
index f473264..0000000 |
| 8037 |
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild |
| 8038 |
+++ /dev/null |
| 8039 |
@@ -1,85 +0,0 @@ |
| 8040 |
-# Copyright 1999-2016 Gentoo Foundation |
| 8041 |
-# Distributed under the terms of the GNU General Public License v2 |
| 8042 |
-# $Id$ |
| 8043 |
- |
| 8044 |
-EAPI=5 |
| 8045 |
- |
| 8046 |
-inherit bsdmk freebsd toolchain-funcs |
| 8047 |
- |
| 8048 |
-DESCRIPTION="FreeBSD's rescue binaries" |
| 8049 |
-SLOT="0" |
| 8050 |
-LICENSE="BSD zfs? ( CDDL )" |
| 8051 |
- |
| 8052 |
-IUSE="atm netware nis zfs" |
| 8053 |
- |
| 8054 |
-if [[ ${PV} != *9999* ]]; then |
| 8055 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
| 8056 |
-fi |
| 8057 |
- |
| 8058 |
-EXTRACTONLY=" |
| 8059 |
- usr.bin/ |
| 8060 |
- contrib/ |
| 8061 |
- lib/ |
| 8062 |
- bin/ |
| 8063 |
- sbin/ |
| 8064 |
- usr.sbin/ |
| 8065 |
- gnu/ |
| 8066 |
- sys/ |
| 8067 |
- libexec/ |
| 8068 |
- rescue/ |
| 8069 |
-" |
| 8070 |
- |
| 8071 |
-RDEPEND="" |
| 8072 |
-DEPEND="sys-devel/flex |
| 8073 |
- app-arch/xz-utils[static-libs] |
| 8074 |
- sys-libs/ncurses[static-libs] |
| 8075 |
- dev-libs/expat[static-libs] |
| 8076 |
- app-arch/bzip2[static-libs] |
| 8077 |
- dev-libs/libedit[static-libs] |
| 8078 |
- dev-libs/libxml2:2[static-libs] |
| 8079 |
- dev-libs/openssl:0=[static-libs] |
| 8080 |
- sys-libs/zlib[static-libs] |
| 8081 |
- sys-libs/readline[static-libs] |
| 8082 |
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] |
| 8083 |
- =sys-freebsd/freebsd-sources-${RV}* |
| 8084 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 8085 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )" |
| 8086 |
- |
| 8087 |
-S="${WORKDIR}/rescue" |
| 8088 |
- |
| 8089 |
-pkg_setup() { |
| 8090 |
- # Add the required source files. |
| 8091 |
- use zfs && EXTRACTONLY+="cddl/ " |
| 8092 |
- |
| 8093 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 8094 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " |
| 8095 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
| 8096 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
| 8097 |
- mymakeopts="${mymakeopts} NO_PIC= " |
| 8098 |
-} |
| 8099 |
- |
| 8100 |
-src_prepare() { |
| 8101 |
- # As they are patches from ${WORKDIR} apply them by hand |
| 8102 |
- cd "${WORKDIR}" || die |
| 8103 |
- epatch "${FILESDIR}/${PN}-10.0-zlib.patch" |
| 8104 |
- epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" |
| 8105 |
- epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" |
| 8106 |
-} |
| 8107 |
- |
| 8108 |
-src_compile() { |
| 8109 |
- export ESED=/usr/bin/sed |
| 8110 |
- unalias sed |
| 8111 |
- |
| 8112 |
- tc-export CC |
| 8113 |
- # crunchgen is now checks env MAKE. |
| 8114 |
- # Use to force BSD's make |
| 8115 |
- export MAKE=/usr/bin/make |
| 8116 |
- |
| 8117 |
- cd "${WORKDIR}/lib/libarchive" || die |
| 8118 |
- echo "#include <expat.h>" > bsdxml.h |
| 8119 |
- freebsd_src_compile |
| 8120 |
- export CC="${CC} -L${WORKDIR}/lib/libarchive" |
| 8121 |
- |
| 8122 |
- cd "${S}" || die |
| 8123 |
- freebsd_src_compile |
| 8124 |
-} |
| 8125 |
|
| 8126 |
diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml |
| 8127 |
deleted file mode 100644 |
| 8128 |
index 8703f7b..0000000 |
| 8129 |
--- a/sys-freebsd/freebsd-rescue/metadata.xml |
| 8130 |
+++ /dev/null |
| 8131 |
@@ -1,12 +0,0 @@ |
| 8132 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 8133 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 8134 |
-<pkgmetadata> |
| 8135 |
-<maintainer type="project"> |
| 8136 |
- <email>bsd@g.o</email> |
| 8137 |
- <name>BSD Project</name> |
| 8138 |
- </maintainer> |
| 8139 |
- <use> |
| 8140 |
- <flag name="zfs">Enable ZFS support.</flag> |
| 8141 |
- <flag name="netware"> Build tools to work with NetWare protocols (IPX and NCP).</flag> |
| 8142 |
- </use> |
| 8143 |
-</pkgmetadata> |
| 8144 |
|
| 8145 |
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest |
| 8146 |
deleted file mode 100644 |
| 8147 |
index 0058061..0000000 |
| 8148 |
--- a/sys-freebsd/freebsd-sbin/Manifest |
| 8149 |
+++ /dev/null |
| 8150 |
@@ -1,17 +0,0 @@ |
| 8151 |
-AUX adjkerntz-crontab 184 SHA256 f3b08140ea38bfe502b34dd8c69aa4a6b65b786d792828cce082be8f844345dc SHA512 28ecfd94257eca2d91323e4bac1920969e589a13f877f1d67c4be0dd5d0bf4585eba8f749ae04f2e0761d5860b76e0c04993350bbdeb52736584ea9df97c6093 WHIRLPOOL 883509014af5a6f3803993eb4fc9f53608b08eaffdfcb409be3945d8234ab66b6a99c620b781a8d650aaeaff1f05db2e5249fb280f9a2bb079421062be3e5332 |
| 8152 |
-AUX devd.conf 4770 SHA256 48c6d3664813222aed6b3c0ff5badbf3e8a37477445fe705850f77a9b95e3219 SHA512 af33a24edda94487adca283427cd0c5c027033ea7c03b11ea4b75c5d402794845005551200d90b74a29867490c2f7e35c74a864a18c7fba09d792ec591fe2c75 WHIRLPOOL b249cb96a67b8c10564212cb3cef34a1779b3adc4068edc1c68b8a7bdbc8cf4f527d2a655b9c8da1e68ec50b4bb8e7a9efe36b5a10db329fac4544a06e28fed5 |
| 8153 |
-AUX devd.initd 1137 SHA256 8f574e3cda5792b5ea8db460fcd5b9052ec13a1d6a9f0cfd037ed35f108d9faf SHA512 031e3958b30b897d7a48a72688c5ff9d9961a0db1d06b57587d58e6d1685a160d8d6557536e2e4cb42263b718440fbcc8fd0ca839a7edb670d131255826e3875 WHIRLPOOL 12f50aca77a62c8efff01892e5282a98fab9b8c0a3d3f5c3ed2f0abce03e35ade51102814e6574883e81fa7350a2f50a34b151aa846b1d3e22242810eccc0196 |
| 8154 |
-AUX devd_queue 853 SHA256 af57ffa202eec7d8c050e32e5ca3f54cbf491fac2e439172f9e008ac3e5e8417 SHA512 9d14d3d41608de50877761fd015cafe29d9103e3f77d0f42726405d4e66da5508000056e3b7603e224e4fab86b992f40af2fa3a764b4aae71e2fe4a898d97d88 WHIRLPOOL 23e5d1268f85d71e761717c19a8d1bb5516d32847f47080ea10ea4536dd7154666f76a5709e9e9639989dc2121ace708bea22538e2a571244578668e0b1b5791 |
| 8155 |
-AUX freebsd-sbin-10.0-zlib.patch 861 SHA256 9e2b89c1def6424b4a628d286ced8554f5f59bdf890e647f5b07e431e4bc9351 SHA512 8a6e14d15e44e9de22863c65cd359cc408207a4329ecdfe053317fd120d01025f5d42b958447ed0bb2e584cc050391306438934ac8cae0edc4a6a785da8138b7 WHIRLPOOL ebad6febc4ebdd4355fe6a60f99af13d2b15e52f538a6c677705401982e1e55556234df7099c570fa7e6fa5ee9c9264e5a394382c626919d43c214d21023d6ba |
| 8156 |
-AUX freebsd-sbin-6.1-pr102701.patch 548 SHA256 dccf32386359a2cfd80272c86085467d612c8f4d7924a6a223cd1259a8b7a176 SHA512 2b882565670ffe559410b17e2fa6a94624eee89d25a791ef3e27d657dedcf95b2be282217a2350203af7727b839d5d6ff50368f72c4bef3d7e60fef8a6325cbe WHIRLPOOL 14db7a26e6189314cc9a0e8ff5ccd01bedba178d9ddff856df262b18ce35fbd85999f5f4a612c2388af8718c6a1c0b544db4287bca08356fa5fb191f1cccf978 |
| 8157 |
-AUX freebsd-sbin-6.2-ldconfig.patch 389 SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b SHA512 ed8f6073991ba0c8823aea1570e720273d7dc68ec6daf38d7e1d41f2285d307d7905cf674a1148d4783c69f2dafd7fc8a51e729aa4727eb46d857218ab2d71ed WHIRLPOOL 3ecccd7b56c9bee820ca92b8a6a446a1bf69e61e889324407f2e76336eb0328b1162c7dc5d5f24505ec1f36d235bfe33fbecc5c5d60bf0f04741eeca9eb5b1cb |
| 8158 |
-AUX freebsd-sbin-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef |
| 8159 |
-AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b |
| 8160 |
-AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e WHIRLPOOL a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d |
| 8161 |
-AUX idmapd.initd 441 SHA256 876ef332062f6e0335bd09152e6289ac1df8827cbf5d24d43b704e01ca875bce SHA512 69e548dd863c12dd9d525d9dd77ed06fd0418b6744c97899766d73aca26b60d12f27c791720b195c46b244fd2f3effd47d43b4fa277f795f402494f991837714 WHIRLPOOL 33e800223fac44ca8e476449044d75b274e1b1db7e8c6f1c615f4479b51f5f0255c15d46d9ea39888a8a2d0b419a6ce9786a9d9869ed81cde90b52e11fefa55d |
| 8162 |
-AUX ipfw.confd 364 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8a9effbb3d3 SHA512 6bb923386c40e7bfcc2d9a122ee3e942fe30cb49715d1cfb122923416d2dcf63fd6f61cb93510a245eb8bbd767e33f029726bb277cb0e16e98d2e856ef33ff2f WHIRLPOOL e1de6e7f8807f7079b856197d9e7a650491a0a0f7b9fab703befed7bc24ccedb3be1ff758194c70cfa4e86f0930b6f30bc03342edd8de55795621ceb5be471f0 |
| 8163 |
-AUX ipfw.initd 2912 SHA256 156801d8b99f50e2d6b48cc01ecd57c779749fb40bb214b43cc036ce82f96b98 SHA512 7e07cad7e1305cb36b98a408f9fadd9ce4f4dd40680a92d84feeb00d3a0828e15fcfdfd821b26c31133e5da8a5337e5dc8fd7b376e2ab862158e42625b3756a7 WHIRLPOOL e88c9b57955af23ee01d7281359d447db4780697fd2899bb4c86e62145cc9f035f7c8a19ecea487bb0f5c6f71f1edf29f8c70b31af62caebe22b92ac4ceaa640 |
| 8164 |
-AUX sysctl.initd 558 SHA256 e6921dc44d3e442b394eed3385d7cda9325efff2e51d08972e1db7b0d97e122d SHA512 e1858fedf435b6ada3b2846d63b6b74dfcfee98befc00946917f5ee009fc83cbc963f4dc05d5051e13c4493f2fa9d5ba2f2b7adffee8ee741d3268cb49cc6c2b WHIRLPOOL a8b59c1c3045e7441c109783a28dbf1505dd4bc9d091b291b406221091948b7526d47bd3a4f0d3e7dd6ae5810feca20e0cb855b74273e13884f7cda87ba9e004 |
| 8165 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 8166 |
-EBUILD freebsd-sbin-11.0.ebuild 2538 SHA256 742c55213680e92d28eb296a5540aeeec1a6c635b03c3974d1e4067522004a87 SHA512 d459593ae0df4571ec40c12f3f2b1a38219aadbdde0696dec178020151d7450dd1f6723065846848d6d583809a42d90b276570881d1e5ee9f68166cac6e41969 WHIRLPOOL 949e5ff234cb115d8b17ee9fe5ec8ae97f3a115c001d5d9bf172a7ba9d6017f04d5a3a10b89da2fff0e7c53428d5d1df5e3b0b1ffb573800863777ef0a5b3b9a |
| 8167 |
-MISC metadata.xml 563 SHA256 fbc171fa5f85349a31cbd904e559b5f012f86f7aa61a60c57a9eaf12a5e39dd4 SHA512 e83379562dfc0fd06156ac34e3c06677655a79ec7f51df2a3adc90fcf246dc0a779085252801d5415826bf3cb050917005b12792987d2f199484291a3635d765 WHIRLPOOL 543a80aa8e2403d4dd119572ddf3f9c7992f9a84825d6130480f46b247f310718faf3c64cad81c45e5b3e56f56439fcac4caf2a19c22b8e1a3034335c0e296a6 |
| 8168 |
|
| 8169 |
diff --git a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab b/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab |
| 8170 |
deleted file mode 100644 |
| 8171 |
index 5fc46f5..0000000 |
| 8172 |
--- a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab |
| 8173 |
+++ /dev/null |
| 8174 |
@@ -1,4 +0,0 @@ |
| 8175 |
-# Adjust the time zone if the CMOS clock keeps local time, as opposed to |
| 8176 |
-# UTC time. See adjkerntz(8) for details. |
| 8177 |
-1,31 0-5 * * * root /sbin/adjkerntz -a |
| 8178 |
- |
| 8179 |
|
| 8180 |
diff --git a/sys-freebsd/freebsd-sbin/files/devd.conf b/sys-freebsd/freebsd-sbin/files/devd.conf |
| 8181 |
deleted file mode 100644 |
| 8182 |
index fd1e035..0000000 |
| 8183 |
--- a/sys-freebsd/freebsd-sbin/files/devd.conf |
| 8184 |
+++ /dev/null |
| 8185 |
@@ -1,153 +0,0 @@ |
| 8186 |
-# Refer to devd.conf(5) and devd(8) man pages for the details on how to |
| 8187 |
-# run and configure devd. |
| 8188 |
-# |
| 8189 |
- |
| 8190 |
-# NB: All regular expressions have an implicit ^$ around them. |
| 8191 |
-# NB: device-name is shorthand for 'match device-name' |
| 8192 |
- |
| 8193 |
-options { |
| 8194 |
- # Each directory directive adds a directory the list of directories |
| 8195 |
- # that we scan for files. Files are read-in in the order that they |
| 8196 |
- # are returned from readdir(3). The rule-sets are combined to |
| 8197 |
- # create a DFA that's used to match events to actions. |
| 8198 |
- directory "/etc/devd"; |
| 8199 |
- directory "/usr/local/etc/devd"; |
| 8200 |
- pid-file "/var/run/devd.pid"; |
| 8201 |
- |
| 8202 |
- # Setup some shorthand for regex that we use later in the file. |
| 8203 |
- #XXX Yes, these are gross -- imp |
| 8204 |
- set scsi-controller-regex |
| 8205 |
- "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\ |
| 8206 |
- esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\ |
| 8207 |
- [0-9]+"; |
| 8208 |
-}; |
| 8209 |
- |
| 8210 |
-# Note that the attach/detach with the highest value wins, so that one can |
| 8211 |
-# override these general rules. |
| 8212 |
- |
| 8213 |
-# |
| 8214 |
-# For ethernet like devices start configuring the interface. Due to |
| 8215 |
-# a historical accident, this script is called pccard_ether. |
| 8216 |
-# |
| 8217 |
-attach 0 { |
| 8218 |
- media-type "ethernet"; |
| 8219 |
- action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/net.$device-name start"; |
| 8220 |
-}; |
| 8221 |
- |
| 8222 |
-detach 0 { |
| 8223 |
- media-type "ethernet"; |
| 8224 |
- action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/net.$device-name stop"; |
| 8225 |
-}; |
| 8226 |
- |
| 8227 |
-# |
| 8228 |
-# Try to start dhclient on Ethernet like interfaces when the link comes |
| 8229 |
-# up. Only devices that are configured to support DHCP will actually |
| 8230 |
-# run it. No link down rule exists because dhclient automaticly exits |
| 8231 |
-# when the link goes down. |
| 8232 |
-# |
| 8233 |
-notify 0 { |
| 8234 |
- match "system" "IFNET"; |
| 8235 |
- match "type" "LINK_UP"; |
| 8236 |
- media-type "ethernet"; |
| 8237 |
- action "/etc/devd_queue add /etc/init.d/net.$subsystem start"; |
| 8238 |
-}; |
| 8239 |
-notify 0 { |
| 8240 |
- match "system" "IFNET"; |
| 8241 |
- match "type" "LINK_DOWN"; |
| 8242 |
- media-type "ethernet"; |
| 8243 |
- action "/etc/devd_queue add /etc/init.d/net.$subsystem stop"; |
| 8244 |
-}; |
| 8245 |
- |
| 8246 |
-# |
| 8247 |
-# Like Ethernet devices, but separate because |
| 8248 |
-# they have a different media type. We may want |
| 8249 |
-# to exploit this later. |
| 8250 |
-# |
| 8251 |
-#detach 0 { |
| 8252 |
-# media-type "802.11"; |
| 8253 |
-# action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name stop"; |
| 8254 |
-#}; |
| 8255 |
-#attach 0 { |
| 8256 |
-# media-type "802.11"; |
| 8257 |
-# action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name start"; |
| 8258 |
-#}; |
| 8259 |
- |
| 8260 |
-# Not sure how to handle this in Gentoo yet |
| 8261 |
-# When a USB Bluetooth dongle appears activate it |
| 8262 |
-#attach 100 { |
| 8263 |
-# device-name "ubt[0-9]+"; |
| 8264 |
-# action "/etc/rc.d/bluetooth start $device-name"; |
| 8265 |
-#}; |
| 8266 |
-#detach 100 { |
| 8267 |
-# device-name "ubt[0-9]+"; |
| 8268 |
-# action "/etc/rc.d/bluetooth stop $device-name"; |
| 8269 |
-#}; |
| 8270 |
- |
| 8271 |
-# When a USB keyboard arrives, attach it as the console keyboard. |
| 8272 |
-attach 100 { |
| 8273 |
- device-name "ukbd0"; |
| 8274 |
- action "kbdcontrol -k /dev/ukbd0 < /dev/console"; |
| 8275 |
-}; |
| 8276 |
-detach 100 { |
| 8277 |
- device-name "ukbd0"; |
| 8278 |
- action "kbdcontrol -k /dev/kbd0 < /dev/console"; |
| 8279 |
-}; |
| 8280 |
- |
| 8281 |
-# The entry below starts and stops moused when a mouse is plugged in. |
| 8282 |
-attach 100 { |
| 8283 |
- device-name "psm[0-9]+"; |
| 8284 |
- action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name start"; |
| 8285 |
-}; |
| 8286 |
-detach 100 { |
| 8287 |
- device-name "psm[0-9]+"; |
| 8288 |
- action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name stop"; |
| 8289 |
-}; |
| 8290 |
-attach 100 { |
| 8291 |
- device-name "ums[0-9]+"; |
| 8292 |
- action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name start"; |
| 8293 |
-}; |
| 8294 |
-detach 100 { |
| 8295 |
- device-name "ums[0-9]+"; |
| 8296 |
- action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name stop"; |
| 8297 |
-}; |
| 8298 |
- |
| 8299 |
-# Notify all users before beginning emergency shutdown when we get |
| 8300 |
-# a _CRT or _HOT thermal event and we're going to power down the system |
| 8301 |
-# very soon. |
| 8302 |
-notify 10 { |
| 8303 |
- match "system" "ACPI"; |
| 8304 |
- match "subsystem" "Thermal"; |
| 8305 |
- match "notify" "0xcc"; |
| 8306 |
- action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'"; |
| 8307 |
-}; |
| 8308 |
- |
| 8309 |
-/* EXAMPLES TO END OF FILE |
| 8310 |
- |
| 8311 |
- |
| 8312 |
-# Examples of notify hooks. A notify is a generic way for a kernel |
| 8313 |
-# subsystem to send event notification to userland. |
| 8314 |
-# |
| 8315 |
-# Here are some examples of ACPI notify handlers. ACPI subsystems that |
| 8316 |
-# generate notifies include the AC adapter, power/sleep buttons, |
| 8317 |
-# control method batteries, lid switch, and thermal zones. |
| 8318 |
-# |
| 8319 |
-# Information returned is not always the same as the ACPI notify |
| 8320 |
-# events. See the ACPI specification for more information about |
| 8321 |
-# notifies. Here is the information returned for each subsystem: |
| 8322 |
-# |
| 8323 |
-# ACAD: AC line state (0 is offline, 1 is online) |
| 8324 |
-# Button: Button pressed (0 for power, 1 for sleep) |
| 8325 |
-# CMBAT: ACPI battery events |
| 8326 |
-# Lid: Lid state (0 is closed, 1 is open) |
| 8327 |
-# Thermal: ACPI thermal zone events |
| 8328 |
-# |
| 8329 |
-# This example calls a script when the AC state changes, passing the |
| 8330 |
-# notify value as the first argument. If the state is 0x00, it might |
| 8331 |
-# call some sysctls to implement economy mode. If 0x01, it might set |
| 8332 |
-# the mode to performance. |
| 8333 |
-notify 10 { |
| 8334 |
- match "system" "ACPI"; |
| 8335 |
- match "subsystem" "ACAD"; |
| 8336 |
- action "/etc/acpi_ac $notify"; |
| 8337 |
-}; |
| 8338 |
-*/ |
| 8339 |
|
| 8340 |
diff --git a/sys-freebsd/freebsd-sbin/files/devd.initd b/sys-freebsd/freebsd-sbin/files/devd.initd |
| 8341 |
deleted file mode 100644 |
| 8342 |
index 6171258..0000000 |
| 8343 |
--- a/sys-freebsd/freebsd-sbin/files/devd.initd |
| 8344 |
+++ /dev/null |
| 8345 |
@@ -1,47 +0,0 @@ |
| 8346 |
-#!/sbin/openrc-run |
| 8347 |
-# Copyright 1999-2006 Gentoo Foundation |
| 8348 |
-# Distributed under the terms of the GNU General Public License v2 |
| 8349 |
- |
| 8350 |
-depend() { |
| 8351 |
- need localmount |
| 8352 |
- after bootmisc hostname |
| 8353 |
- before net |
| 8354 |
-} |
| 8355 |
- |
| 8356 |
-start() { |
| 8357 |
- # Services may depend on us, so mark us as inactive |
| 8358 |
- mark_service_inactive "${SVCNAME}" |
| 8359 |
- |
| 8360 |
- # Create a queue so that if things went UP DOWN UP DOWN UP DOWN UP |
| 8361 |
- # We just do an UP |
| 8362 |
- # This is used by /etc/devd_queue |
| 8363 |
- mkdir -p /var/run/devd |
| 8364 |
- |
| 8365 |
- ebegin "Starting the Device State Change Daemon" |
| 8366 |
- sysctl hw.bus.devctl_disable=0 >/dev/null |
| 8367 |
- start-stop-daemon --start --exec /sbin/devd \ |
| 8368 |
- --pidfile /var/run/devd.pid |
| 8369 |
- eend $? "Failed to start devd" \ |
| 8370 |
- || return $? |
| 8371 |
- |
| 8372 |
- ebegin "Waiting for Device State Change Daemon to settle" |
| 8373 |
- LC_ALL=C sleep "${DEVD_WAIT:-2}" |
| 8374 |
- eend $? |
| 8375 |
- |
| 8376 |
- # Now flush the queue |
| 8377 |
- einfo "Flushing Device State Change Daemon queue" |
| 8378 |
- /etc/devd_queue flush |
| 8379 |
- |
| 8380 |
- mark_service_started "${SVCNAME}" |
| 8381 |
- return 0 |
| 8382 |
-} |
| 8383 |
- |
| 8384 |
-stop() { |
| 8385 |
- ebegin "Stopping the Device State Change Daemon" |
| 8386 |
- sysctl hw.bus.devctl_disable=1 >/dev/null |
| 8387 |
- start-stop-daemon --stop --exec /sbin/devd \ |
| 8388 |
- --pidfile /var/run/devd.pid |
| 8389 |
- eend $? "Failed to stop devd" |
| 8390 |
-} |
| 8391 |
- |
| 8392 |
-# vim: ts=4 : |
| 8393 |
|
| 8394 |
diff --git a/sys-freebsd/freebsd-sbin/files/devd_queue b/sys-freebsd/freebsd-sbin/files/devd_queue |
| 8395 |
deleted file mode 100644 |
| 8396 |
index d42cb83..0000000 |
| 8397 |
--- a/sys-freebsd/freebsd-sbin/files/devd_queue |
| 8398 |
+++ /dev/null |
| 8399 |
@@ -1,50 +0,0 @@ |
| 8400 |
-#!/bin/sh |
| 8401 |
- |
| 8402 |
-# Notify the rc system that we're in the background |
| 8403 |
-export IN_BACKGROUND=true |
| 8404 |
- |
| 8405 |
-arg1="$1" |
| 8406 |
-if [ -z "$arg1" ] ; then |
| 8407 |
- echo "Command required" > /dev/stderr |
| 8408 |
- exit 1 |
| 8409 |
-fi |
| 8410 |
-shift |
| 8411 |
- |
| 8412 |
-case "$arg1" in |
| 8413 |
- add) |
| 8414 |
- if [ -z "$1" ] ; then |
| 8415 |
- echo "Command missing!" > /dev/stderr |
| 8416 |
- exit 1 |
| 8417 |
- fi |
| 8418 |
- |
| 8419 |
- # If we don't have a queue then just run |
| 8420 |
- if [ ! -d /var/run/devd ] ; then |
| 8421 |
- "$@" |
| 8422 |
- exit $? |
| 8423 |
- fi |
| 8424 |
- |
| 8425 |
- cmd="$1" |
| 8426 |
- args="$*" |
| 8427 |
- if [ "$cmd" = "env" ] ; then |
| 8428 |
- shift |
| 8429 |
- while echo "$1" | grep -q "="; do |
| 8430 |
- shift |
| 8431 |
- [ "$1" = "--" ] && shift && break |
| 8432 |
- done |
| 8433 |
- cmd="$1" |
| 8434 |
- fi |
| 8435 |
- echo "$args" > /var/run/devd/$(basename "$cmd") |
| 8436 |
- ;; |
| 8437 |
- flush) |
| 8438 |
- while ! rmdir /var/run/devd 2>/dev/null ; do |
| 8439 |
- for cmd in $(cd /var/run/devd; ls) ; do |
| 8440 |
- args=$(cat /var/run/devd/$cmd) |
| 8441 |
- rm -f /var/run/devd/$cmd |
| 8442 |
- $args |
| 8443 |
- done |
| 8444 |
- done |
| 8445 |
- ;; |
| 8446 |
- *) |
| 8447 |
- echo "Unknown command $arg1" |
| 8448 |
- ;; |
| 8449 |
-esac |
| 8450 |
|
| 8451 |
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch |
| 8452 |
deleted file mode 100644 |
| 8453 |
index c0a2bf9..0000000 |
| 8454 |
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch |
| 8455 |
+++ /dev/null |
| 8456 |
@@ -1,22 +0,0 @@ |
| 8457 |
-diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c |
| 8458 |
-index bdbf7e3..a4c67ec 100644 |
| 8459 |
---- a/sbin/savecore/savecore.c |
| 8460 |
-+++ b/sbin/savecore/savecore.c |
| 8461 |
-@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */ |
| 8462 |
- static int nfound, nsaved, nerr; /* statistics */ |
| 8463 |
- static int maxdumps; |
| 8464 |
- |
| 8465 |
--extern FILE *zopen(const char *, const char *); |
| 8466 |
-+extern FILE *gzopen(const char *, const char *); |
| 8467 |
- |
| 8468 |
- static sig_atomic_t got_siginfo; |
| 8469 |
- static void infohandler(int); |
| 8470 |
-@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device) |
| 8471 |
- if (compress) { |
| 8472 |
- snprintf(corename, sizeof(corename), "%s.%d.gz", |
| 8473 |
- istextdump ? "textdump.tar" : "vmcore", bounds); |
| 8474 |
-- fp = zopen(corename, "w"); |
| 8475 |
-+ fp = gzopen(corename, "w"); |
| 8476 |
- } else { |
| 8477 |
- snprintf(corename, sizeof(corename), "%s.%d", |
| 8478 |
- istextdump ? "textdump.tar" : "vmcore", bounds); |
| 8479 |
|
| 8480 |
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch |
| 8481 |
deleted file mode 100644 |
| 8482 |
index 7b9578c..0000000 |
| 8483 |
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch |
| 8484 |
+++ /dev/null |
| 8485 |
@@ -1,17 +0,0 @@ |
| 8486 |
-Solves the issue reported in Problem Report bin/102701. |
| 8487 |
- |
| 8488 |
-Can't delete an inet6 alias address from an interface. |
| 8489 |
- |
| 8490 |
-Index: fbsd-6.1/sbin/ifconfig/af_inet6.c |
| 8491 |
-=================================================================== |
| 8492 |
---- fbsd-6.1.orig/sbin/ifconfig/af_inet6.c |
| 8493 |
-+++ fbsd-6.1/sbin/ifconfig/af_inet6.c |
| 8494 |
-@@ -515,7 +515,7 @@ static struct afswtch af_inet6 = { |
| 8495 |
- .af_settunnel = in6_set_tunnel, |
| 8496 |
- .af_difaddr = SIOCDIFADDR_IN6, |
| 8497 |
- .af_aifaddr = SIOCAIFADDR_IN6, |
| 8498 |
-- .af_ridreq = &in6_addreq, |
| 8499 |
-+ .af_ridreq = &in6_ridreq, |
| 8500 |
- .af_addreq = &in6_addreq, |
| 8501 |
- }; |
| 8502 |
- |
| 8503 |
|
| 8504 |
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch |
| 8505 |
deleted file mode 100644 |
| 8506 |
index 81ad024..0000000 |
| 8507 |
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch |
| 8508 |
+++ /dev/null |
| 8509 |
@@ -1,13 +0,0 @@ |
| 8510 |
-diff -ur sbin.orig/ldconfig/elfhints.c sbin/ldconfig/elfhints.c |
| 8511 |
---- sbin.orig/ldconfig/elfhints.c 2001-05-03 00:56:18 +0100 |
| 8512 |
-+++ sbin/ldconfig/elfhints.c 2007-08-06 10:16:24 +0100 |
| 8513 |
-@@ -245,6 +245,9 @@ |
| 8514 |
- else |
| 8515 |
- add_dir(hintsfile, argv[i], 0); |
| 8516 |
- } |
| 8517 |
-+ /* Always add our system dirs */ |
| 8518 |
-+ add_dir (hintsfile, "/lib", 1); |
| 8519 |
-+ add_dir (hintsfile, "/usr/lib", 1); |
| 8520 |
- write_elf_hints(hintsfile); |
| 8521 |
- } |
| 8522 |
- |
| 8523 |
|
| 8524 |
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch |
| 8525 |
deleted file mode 100644 |
| 8526 |
index 22fb2ec..0000000 |
| 8527 |
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch |
| 8528 |
+++ /dev/null |
| 8529 |
@@ -1,21 +0,0 @@ |
| 8530 |
-diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c |
| 8531 |
---- sbin/savecore/savecore.c 2005-02-26 01:21:50 +0000 |
| 8532 |
-+++ sbin-zlib/savecore/savecore.c 2005-05-06 12:00:06 +0000 |
| 8533 |
-@@ -95,7 +95,7 @@ |
| 8534 |
- static int checkfor, compress, clear, force, keep, verbose; /* flags */ |
| 8535 |
- static int nfound, nsaved, nerr; /* statistics */ |
| 8536 |
- |
| 8537 |
--extern FILE *zopen(const char *, const char *); |
| 8538 |
-+extern FILE *gzopen(const char *, const char *); |
| 8539 |
- |
| 8540 |
- static void |
| 8541 |
- printheader(FILE *f, const struct kerneldumpheader *h, const char *device, |
| 8542 |
-@@ -553,7 +553,7 @@ |
| 8543 |
- if (compress) { |
| 8544 |
- sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" : |
| 8545 |
- "vmcore", bounds); |
| 8546 |
-- fp = zopen(filename, "w"); |
| 8547 |
-+ fp = gzopen(filename, "w"); |
| 8548 |
- } else { |
| 8549 |
- sprintf(filename, "%s.%d", istextdump ? "textdump.tar" : |
| 8550 |
- "vmcore", bounds); |
| 8551 |
|
| 8552 |
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch |
| 8553 |
deleted file mode 100644 |
| 8554 |
index bdda99b..0000000 |
| 8555 |
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch |
| 8556 |
+++ /dev/null |
| 8557 |
@@ -1,13 +0,0 @@ |
| 8558 |
-diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c |
| 8559 |
---- sbin/ifconfig.old/regdomain.c 2010-12-21 17:09:25.000000000 +0000 |
| 8560 |
-+++ sbin/ifconfig/regdomain.c 2011-07-10 15:56:27.000000000 +0000 |
| 8561 |
-@@ -39,7 +39,7 @@ |
| 8562 |
- #include <err.h> |
| 8563 |
- #include <unistd.h> |
| 8564 |
- |
| 8565 |
--#include <bsdxml.h> |
| 8566 |
-+#include <expat.h> |
| 8567 |
- |
| 8568 |
- #include "regdomain.h" |
| 8569 |
- |
| 8570 |
-Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos |
| 8571 |
|
| 8572 |
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch |
| 8573 |
deleted file mode 100644 |
| 8574 |
index c8cbebc..0000000 |
| 8575 |
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch |
| 8576 |
+++ /dev/null |
| 8577 |
@@ -1,20 +0,0 @@ |
| 8578 |
-diff -ur sbin.orig/ping/Makefile sbin.setXid/ping/Makefile |
| 8579 |
---- sbin.orig/ping/Makefile Thu Apr 7 20:27:57 2005 |
| 8580 |
-+++ sbin.setXid/ping/Makefile Thu Apr 7 20:42:02 2005 |
| 8581 |
-@@ -18,4 +18,6 @@ |
| 8582 |
- LDADD+= -lipsec |
| 8583 |
- .endif |
| 8584 |
- |
| 8585 |
-+LDFLAGS+= -Wl,-z,now |
| 8586 |
-+ |
| 8587 |
- .include <bsd.prog.mk> |
| 8588 |
-diff -ur sbin.orig/shutdown/Makefile sbin.setXid/shutdown/Makefile |
| 8589 |
---- sbin.orig/shutdown/Makefile Thu Apr 7 20:27:57 2005 |
| 8590 |
-+++ sbin.setXid/shutdown/Makefile Thu Apr 7 20:42:17 2005 |
| 8591 |
-@@ -7,4 +7,6 @@ |
| 8592 |
- BINGRP= operator |
| 8593 |
- BINMODE=4550 |
| 8594 |
- |
| 8595 |
-+LDFLAGS+= -Wl,-z,now |
| 8596 |
-+ |
| 8597 |
- .include <bsd.prog.mk> |
| 8598 |
|
| 8599 |
diff --git a/sys-freebsd/freebsd-sbin/files/idmapd.initd b/sys-freebsd/freebsd-sbin/files/idmapd.initd |
| 8600 |
deleted file mode 100644 |
| 8601 |
index 60a0bb8..0000000 |
| 8602 |
--- a/sys-freebsd/freebsd-sbin/files/idmapd.initd |
| 8603 |
+++ /dev/null |
| 8604 |
@@ -1,20 +0,0 @@ |
| 8605 |
-#!/sbin/openrc-run |
| 8606 |
-# Copyright 1999-2008 Gentoo Foundation |
| 8607 |
-# Distributed under the terms of the GNU General Public License v2 |
| 8608 |
- |
| 8609 |
-depend() { |
| 8610 |
- need rpcbind |
| 8611 |
-} |
| 8612 |
- |
| 8613 |
-start() { |
| 8614 |
- ebegin "Starting NFS idmapd" |
| 8615 |
- start-stop-daemon --start --quiet --exec \ |
| 8616 |
- /sbin/idmapd -- $idmapdopts |
| 8617 |
- eend $? "Error starting NFS idmapd" |
| 8618 |
-} |
| 8619 |
- |
| 8620 |
-stop() { |
| 8621 |
- ebegin "Stopping NFS idmapd" |
| 8622 |
- start-stop-daemon --stop --quiet --exec /sbin/idmapd |
| 8623 |
- eend $? "Error stopping NFS idmapd" |
| 8624 |
-} |
| 8625 |
|
| 8626 |
diff --git a/sys-freebsd/freebsd-sbin/files/ipfw.confd b/sys-freebsd/freebsd-sbin/files/ipfw.confd |
| 8627 |
deleted file mode 100644 |
| 8628 |
index 687f92d..0000000 |
| 8629 |
--- a/sys-freebsd/freebsd-sbin/files/ipfw.confd |
| 8630 |
+++ /dev/null |
| 8631 |
@@ -1,10 +0,0 @@ |
| 8632 |
-# ipfw provides a stateful firewall. |
| 8633 |
-# This means we allow everything out, and if we have a connection we allow it |
| 8634 |
-# back in. This is very flexable and quite secure. |
| 8635 |
- |
| 8636 |
-# For ease of use, we allow auth and ssh ports through as well. |
| 8637 |
-# To override the list of allowed ports |
| 8638 |
-#PORTS_IN="auth ssh" |
| 8639 |
- |
| 8640 |
-# You may want to enable logging of denied connections |
| 8641 |
-#LOG_DENY="yes" |
| 8642 |
|
| 8643 |
diff --git a/sys-freebsd/freebsd-sbin/files/ipfw.initd b/sys-freebsd/freebsd-sbin/files/ipfw.initd |
| 8644 |
deleted file mode 100644 |
| 8645 |
index 13cdaee..0000000 |
| 8646 |
--- a/sys-freebsd/freebsd-sbin/files/ipfw.initd |
| 8647 |
+++ /dev/null |
| 8648 |
@@ -1,110 +0,0 @@ |
| 8649 |
-#!/sbin/openrc-run |
| 8650 |
-# Copyright 2007 Gentoo Foundation |
| 8651 |
-# Distributed under the terms of the GNU General Public License v2 |
| 8652 |
- |
| 8653 |
-# This is a nice client firewall script which should suit most desktop users. |
| 8654 |
-# We allow auth and ssh in by default. |
| 8655 |
- |
| 8656 |
-PORTS_IN=${PORTS_IN-auth ssh} |
| 8657 |
- |
| 8658 |
-opts="panic showstatus" |
| 8659 |
- |
| 8660 |
-depend() { |
| 8661 |
- before net |
| 8662 |
- provide firewall |
| 8663 |
-} |
| 8664 |
- |
| 8665 |
-ipfw() { |
| 8666 |
- /sbin/ipfw -f -q "$@" |
| 8667 |
-} |
| 8668 |
- |
| 8669 |
-init() { |
| 8670 |
- # Load the kernel module |
| 8671 |
- if ! sysctl net.inet.ip.fw.enable=1 >/dev/null 2>/dev/null ; then |
| 8672 |
- if ! kldload ipfw ; then |
| 8673 |
- eend 1 "Unable to load firewall module" |
| 8674 |
- return 1 |
| 8675 |
- fi |
| 8676 |
- fi |
| 8677 |
- |
| 8678 |
- ipfw flush |
| 8679 |
- |
| 8680 |
- ipfw add allow all from any to any via lo0 |
| 8681 |
- ipfw add allow all from any to 127.0.0.0/8 |
| 8682 |
- ipfw add deny ip from 127.0.0.0/8 to any |
| 8683 |
- |
| 8684 |
- ipfw add allow ipv6-icmp from :: to ff02::/16 |
| 8685 |
- ipfw add allow ipv6-icmp from fe80::/10 to fe80::/10 |
| 8686 |
- ipfw add allow ipv6-icmp from fe80::/10 to ff02::/16 |
| 8687 |
-} |
| 8688 |
- |
| 8689 |
-start() { |
| 8690 |
- local x= log= |
| 8691 |
- ebegin "Starting firewall rules" |
| 8692 |
- if ! init ; then |
| 8693 |
- eend 1 "Failed to flush firewall ruleset" |
| 8694 |
- return 1 |
| 8695 |
- fi |
| 8696 |
- |
| 8697 |
- [ "${LOG_DENY}" = "yes" ] && log="log" |
| 8698 |
- |
| 8699 |
- # Use a statefull firewall |
| 8700 |
- ipfw add check-state |
| 8701 |
- |
| 8702 |
- # Open our configured ports |
| 8703 |
- if [ -n "${PORTS_IN}" ] ; then |
| 8704 |
- local pin= |
| 8705 |
- for x in ${PORTS_IN} ; do |
| 8706 |
- pin="${pin}${pin:+,}${x}" |
| 8707 |
- done |
| 8708 |
- ipfw add allow tcp from any to me ${pin} established keep-state |
| 8709 |
- ipfw add allow tcp from any to me6 ${pin} established keep-state |
| 8710 |
- ipfw add allow tcp from any to me ${pin} setup keep-state |
| 8711 |
- ipfw add allow tcp from any to me6 ${pin} setup keep-state |
| 8712 |
- ipfw add allow udp from any to me ${pin} established |
| 8713 |
- ipfw add allow udp from any to me ${pin} keep-state |
| 8714 |
- ipfw add allow udp from any to me6 ${pin} established |
| 8715 |
- ipfw add allow udp from any to me6 ${pin} keep-state |
| 8716 |
- fi |
| 8717 |
- |
| 8718 |
- # Nice flexable rules that disallow incoming except for stuff we |
| 8719 |
- # have asked for, and allow all outgoing. |
| 8720 |
- ipfw add allow tcp from me to any established keep-state |
| 8721 |
- ipfw add allow tcp from me to any setup keep-state |
| 8722 |
- ipfw add allow tcp from me6 to any established keep-state |
| 8723 |
- ipfw add allow tcp from me6 to any setup keep-state |
| 8724 |
- ipfw add deny ${log} tcp from any to any |
| 8725 |
- ipfw add allow udp from me to any established |
| 8726 |
- ipfw add allow udp from me to any keep-state |
| 8727 |
- ipfw add allow udp from me6 to any established |
| 8728 |
- ipfw add allow udp from me6 to any keep-state |
| 8729 |
- ipfw add deny ${log} udp from any to any |
| 8730 |
- |
| 8731 |
- # Be a good firewall and allow some ICMP traffic. |
| 8732 |
- # Remove 8 if you really want to disallow ping. |
| 8733 |
- ipfw add allow icmp from any to any icmptypes 0,3,8,11,12 |
| 8734 |
- ipfw add allow ip6 from any to any proto ipv6-icmp |
| 8735 |
- |
| 8736 |
- eend 0 |
| 8737 |
-} |
| 8738 |
- |
| 8739 |
-stop() { |
| 8740 |
- ebegin "Stopping firewall rules" |
| 8741 |
- # We don't unload the kernel module as that action |
| 8742 |
- # can cause memory leaks as of FreeBSD 6.x |
| 8743 |
- sysctl net.inet.ip.fw.enable=0 >/dev/null |
| 8744 |
- eend $? |
| 8745 |
-} |
| 8746 |
- |
| 8747 |
-panic() { |
| 8748 |
- ebegin "Stopping firewall rules - hard" |
| 8749 |
- if ! init ; then |
| 8750 |
- eend 1 "Failed to flush firewall ruleset" |
| 8751 |
- return 1 |
| 8752 |
- fi |
| 8753 |
- eend 0 |
| 8754 |
-} |
| 8755 |
- |
| 8756 |
-showstatus() { |
| 8757 |
- ipfw show |
| 8758 |
-} |
| 8759 |
|
| 8760 |
diff --git a/sys-freebsd/freebsd-sbin/files/sysctl.initd b/sys-freebsd/freebsd-sbin/files/sysctl.initd |
| 8761 |
deleted file mode 100644 |
| 8762 |
index 9b8aaf8..0000000 |
| 8763 |
--- a/sys-freebsd/freebsd-sbin/files/sysctl.initd |
| 8764 |
+++ /dev/null |
| 8765 |
@@ -1,28 +0,0 @@ |
| 8766 |
-#!/sbin/openrc-run |
| 8767 |
-# Copyright 1999-2005 Gentoo Foundation |
| 8768 |
-# Distributed under the terms of the GNU General Public License v2 |
| 8769 |
-# $Id$ |
| 8770 |
- |
| 8771 |
-depend() { |
| 8772 |
- after checkroot root |
| 8773 |
-} |
| 8774 |
- |
| 8775 |
-start() { |
| 8776 |
- ebegin "Configuring kernel parameters" |
| 8777 |
- |
| 8778 |
- if [ ! -f /etc/sysctl.conf ]; then |
| 8779 |
- eend 1 "/etc/sysctl.conf" "not found" |
| 8780 |
- return 1 |
| 8781 |
- fi |
| 8782 |
- |
| 8783 |
- local retval=0 var= comments= |
| 8784 |
- while read var comments ; do |
| 8785 |
- case "${var}" in |
| 8786 |
- ""|"#"*) continue;; |
| 8787 |
- esac |
| 8788 |
- sysctl "${var}" >/dev/null || retval=1 |
| 8789 |
- done < /etc/sysctl.conf |
| 8790 |
- eend ${retval} "Some errors were encountered" |
| 8791 |
-} |
| 8792 |
- |
| 8793 |
-# vim: set ts=4 : |
| 8794 |
|
| 8795 |
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild |
| 8796 |
deleted file mode 100644 |
| 8797 |
index b9ccdc5..0000000 |
| 8798 |
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild |
| 8799 |
+++ /dev/null |
| 8800 |
@@ -1,100 +0,0 @@ |
| 8801 |
-# Copyright 1999-2016 Gentoo Foundation |
| 8802 |
-# Distributed under the terms of the GNU General Public License v2 |
| 8803 |
-# $Id$ |
| 8804 |
- |
| 8805 |
-EAPI=5 |
| 8806 |
- |
| 8807 |
-inherit bsdmk freebsd multilib |
| 8808 |
- |
| 8809 |
-DESCRIPTION="FreeBSD sbin utils" |
| 8810 |
-SLOT="0" |
| 8811 |
- |
| 8812 |
-if [[ ${PV} != *9999* ]]; then |
| 8813 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 8814 |
-fi |
| 8815 |
- |
| 8816 |
-EXTRACTONLY=" |
| 8817 |
- sbin/ |
| 8818 |
- contrib/ |
| 8819 |
- lib/ |
| 8820 |
- libexec/ |
| 8821 |
- usr.sbin/ |
| 8822 |
- etc/ |
| 8823 |
-" |
| 8824 |
- |
| 8825 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] |
| 8826 |
- =sys-freebsd/freebsd-libexec-${RV}* |
| 8827 |
- >=dev-libs/expat-2.0.1 |
| 8828 |
- ssl? ( dev-libs/openssl:0= ) |
| 8829 |
- >=dev-libs/libedit-20120311.3.0-r1 |
| 8830 |
- sys-libs/readline:0= |
| 8831 |
- || ( |
| 8832 |
- sys-process/cronie |
| 8833 |
- sys-process/vixie-cron |
| 8834 |
- ) |
| 8835 |
- atm? ( net-analyzer/bsnmp )" |
| 8836 |
-DEPEND="${RDEPEND} |
| 8837 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
| 8838 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
| 8839 |
- |
| 8840 |
-S="${WORKDIR}/sbin" |
| 8841 |
- |
| 8842 |
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" |
| 8843 |
- |
| 8844 |
-pkg_setup() { |
| 8845 |
- # Add the required source files. |
| 8846 |
- use build && EXTRACTONLY+="sys/ " |
| 8847 |
- |
| 8848 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 8849 |
- use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" |
| 8850 |
- use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " |
| 8851 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" |
| 8852 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
| 8853 |
- use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " |
| 8854 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" |
| 8855 |
-} |
| 8856 |
- |
| 8857 |
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf" |
| 8858 |
- |
| 8859 |
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch" |
| 8860 |
- "${FILESDIR}/${PN}-10.0-zlib.patch" |
| 8861 |
- "${FILESDIR}/${PN}-6.2-ldconfig.patch" |
| 8862 |
- "${FILESDIR}/${PN}-6.1-pr102701.patch" ) |
| 8863 |
- |
| 8864 |
-src_prepare() { |
| 8865 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
| 8866 |
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" |
| 8867 |
- fi |
| 8868 |
-} |
| 8869 |
- |
| 8870 |
-src_install() { |
| 8871 |
- mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom " |
| 8872 |
- freebsd_src_install |
| 8873 |
- keepdir /var/log |
| 8874 |
- # Needed by ldconfig: |
| 8875 |
- keepdir /var/run |
| 8876 |
- |
| 8877 |
- # Maybe ship our own sysctl.conf so things like radvd work out of the box. |
| 8878 |
- # New wireless config method requires regdomain.xml in /etc |
| 8879 |
- cd "${WORKDIR}/etc/" || die |
| 8880 |
- insinto /etc |
| 8881 |
- doins minfree sysctl.conf regdomain.xml || die |
| 8882 |
- |
| 8883 |
- # Install a crontab for adjkerntz |
| 8884 |
- insinto /etc/cron.d |
| 8885 |
- newins "${FILESDIR}/adjkerntz-crontab" adjkerntz |
| 8886 |
- |
| 8887 |
- # Install the periodic stuff (needs probably to be ported in a more |
| 8888 |
- # gentooish way) |
| 8889 |
- cd "${WORKDIR}/etc/periodic" || die |
| 8890 |
- |
| 8891 |
- doperiodic security \ |
| 8892 |
- security/*.ipfwlimit \ |
| 8893 |
- security/*.ipfwdenied || die |
| 8894 |
- |
| 8895 |
- use ipfilter && { doperiodic security \ |
| 8896 |
- security/*.ipfdenied || die ; } |
| 8897 |
- |
| 8898 |
- use pf && { doperiodic security \ |
| 8899 |
- security/*.pfdenied || die ; } |
| 8900 |
-} |
| 8901 |
|
| 8902 |
diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml |
| 8903 |
deleted file mode 100644 |
| 8904 |
index dccfe68..0000000 |
| 8905 |
--- a/sys-freebsd/freebsd-sbin/metadata.xml |
| 8906 |
+++ /dev/null |
| 8907 |
@@ -1,20 +0,0 @@ |
| 8908 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 8909 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 8910 |
-<pkgmetadata> |
| 8911 |
- <maintainer type="project"> |
| 8912 |
- <email>bsd@g.o</email> |
| 8913 |
- <name>BSD Project</name> |
| 8914 |
- </maintainer> |
| 8915 |
- <use> |
| 8916 |
- <flag name="ipfilter"> |
| 8917 |
- Build tools to administer the ipfilter firewall. |
| 8918 |
- </flag> |
| 8919 |
- <flag name="pf"> |
| 8920 |
- Build tools to administer the PF firewall. |
| 8921 |
- </flag> |
| 8922 |
- <flag name="netware"> |
| 8923 |
- Build libraries and tools to work with NetWare protocols (IPX |
| 8924 |
- and NCP). |
| 8925 |
- </flag> |
| 8926 |
- </use> |
| 8927 |
-</pkgmetadata> |
| 8928 |
|
| 8929 |
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest |
| 8930 |
deleted file mode 100644 |
| 8931 |
index d65d9d8..0000000 |
| 8932 |
--- a/sys-freebsd/freebsd-share/Manifest |
| 8933 |
+++ /dev/null |
| 8934 |
@@ -1,10 +0,0 @@ |
| 8935 |
-AUX freebsd-share-10.0-gentoo-eapi3.patch 475 SHA256 504841c762c1fa82ac14c22e16b84543e88927608f3fb972d995caa89449e487 SHA512 b7fe870aafe1cf9029c1d1d9de16413b5be8354b1c2ba0d0eab6f0fe3076ab03da08ff764c923c087e246b90355a48d55acef9b9b5a29238ddf8c92bdb3ca0f8 WHIRLPOOL 58dd84d64cea1c149b0126d7e9567caf7dbe6f238b1434eb4ffde08496e45e268691ba8604ea80da863d06d3f6ac6aeff4e9f7a01d558a28a31f347ed6c0c4c9 |
| 8936 |
-AUX freebsd-share-10.2-gnu-miscfiles.patch 913 SHA256 e2a7e8221753dabf78380b9820991ee067670b9593e3dc9d8ecc8bf487b1ebc8 SHA512 fa792f15e325117e4448b344ab3dbf64d3880719698d88d8dda60c8cc4afea8c11cb845f44fa3b78ddc98fc6b021ef9edac639f649e8d166d79bf2c0e4f654f5 WHIRLPOOL 3c9e15340a71a85f44df3cbc41a6bc46eba7f790410d1aa70266a342038c39dff2b3ec887c210afdde559fecc7c51fb5c0e1484db86d3fff1d5851c21d3f6f8d |
| 8937 |
-AUX freebsd-share-10.3-gentoo-skel.patch 600 SHA256 6860f0376babafbc0367bfde0d348fac1e4f95f42cdfd2931c3d7a027cd62536 SHA512 338eb369c50b11835f00474be5363bf6af43d8391a28a6e78e1517afc686b168fd0bfc32d45a78e79515c3d89a35b097548117cb2838b751d3d41330939c7dc2 WHIRLPOOL 1a833bc8e2376b25275d5be27dcc403cb8f7b498be08ab1532da1b27e77af32779a38b9a8d54b03d80f36b0ec398425269b58a04d9eea74fd2af5d91fec4d8b9 |
| 8938 |
-AUX freebsd-share-5.3-doc-locations.patch 608 SHA256 d949e9081a181ab9443a18e56949905a77eff2cbd16d09d37b8abb5771cee3b6 SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6 WHIRLPOOL bac15f5c439ffa81b83dfac5dce981e346e2815b6a035e9b9791db16df77d7f2e9fb6706f7b5315c65d18f209176866b23a34b311c56847f543f1257fa5e9634 |
| 8939 |
-AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767 SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af WHIRLPOOL 8fabb340e4fcb1a174e3870a2ebe737f89b892586fed61a239e96bb34fb508daaef1e8e80811634e2075dbf6a161a236bca10a589340fbc609382f685b0697a9 |
| 8940 |
-AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a |
| 8941 |
-AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b |
| 8942 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 8943 |
-EBUILD freebsd-share-11.0.ebuild 3146 SHA256 61d6c3e684e66f49fccfffb08da9b056d70d2ffab8340396bc12bf6ebf436502 SHA512 7e5fed82754beff86f5fe2062fc60b0450d516efa31a6c847b53f5c296a1c8f0d89476fe207f119703233173a23c6f712fb59678a1d08eac7ba368413ce3f5f5 WHIRLPOOL 69961e114980eeda1111f30139c631fb552297f4f414447d30d7a5005035789e59c6c2efea281f488be6754095191e74a6d5197a466c76fa1aad6b1de37410a2 |
| 8944 |
-MISC metadata.xml 359 SHA256 e204eb4e849ada468d2815276528d5bd274b727484eb9edf73f601e7b3b9d302 SHA512 998035745a4f78369a7c88d69e52a5377f09e7804ee93f37758fb26a97731b1dbde42d69cae4656b47e57c5dd6c0f2fa1c1ede360aaee38e3170acb7f73643ac WHIRLPOOL 429a60edcf9afc20c72f296f08e72f36d9e1c86bb7054a32983ca21f057c8720b457352daf15afab2c2e92b2835629ccf3b47b67d8b0833805821924eedd167f |
| 8945 |
|
| 8946 |
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch |
| 8947 |
deleted file mode 100644 |
| 8948 |
index 1d0a53e..0000000 |
| 8949 |
--- a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch |
| 8950 |
+++ /dev/null |
| 8951 |
@@ -1,17 +0,0 @@ |
| 8952 |
-diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part |
| 8953 |
-index 9ca8577..329e9fb 100644 |
| 8954 |
---- a/share/i18n/esdb/Makefile.part |
| 8955 |
-+++ b/share/i18n/esdb/Makefile.part |
| 8956 |
-@@ -13,10 +13,10 @@ PART!= sed '/^\#/d;/^ *$$/d' ${PARTFILE} |
| 8957 |
- .endif |
| 8958 |
- .if !defined(NO_EPREFIX) |
| 8959 |
- CODESETS?= ${PART:C/^/${CODE}${SEP}/} |
| 8960 |
--EPREFIX?= ${CODE}${SEP} |
| 8961 |
-+EPREFIX= ${CODE}${SEP} |
| 8962 |
- .else |
| 8963 |
- CODESETS?= ${PART} |
| 8964 |
--EPREFIX?= |
| 8965 |
-+EPREFIX= |
| 8966 |
- .endif |
| 8967 |
- ESUBDIR?= ${CODE} |
| 8968 |
- ESDB?= ${CODESETS:C/$/.esdb/:S/:/@/} |
| 8969 |
|
| 8970 |
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch |
| 8971 |
deleted file mode 100644 |
| 8972 |
index 1dc8488..0000000 |
| 8973 |
--- a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch |
| 8974 |
+++ /dev/null |
| 8975 |
@@ -1,30 +0,0 @@ |
| 8976 |
-diff --git a/share/dict/Makefile b/share/dict/Makefile |
| 8977 |
-index 3e2a0df..5395077 100644 |
| 8978 |
---- a/share/dict/Makefile |
| 8979 |
-+++ b/share/dict/Makefile |
| 8980 |
-@@ -4,8 +4,7 @@ |
| 8981 |
- NO_OBJ= |
| 8982 |
- |
| 8983 |
- # XXX MISSING: connectives words |
| 8984 |
--FILES= README propernames web2 web2a freebsd |
| 8985 |
-+FILES= README freebsd |
| 8986 |
- FILESDIR= ${BINDIR}/dict |
| 8987 |
--SYMLINKS= web2 ${FILESDIR}/words |
| 8988 |
- |
| 8989 |
- .include <bsd.prog.mk> |
| 8990 |
-diff --git a/share/misc/Makefile b/share/misc/Makefile |
| 8991 |
-index ffd42d8..7eb90bb 100644 |
| 8992 |
---- a/share/misc/Makefile |
| 8993 |
-+++ b/share/misc/Makefile |
| 8994 |
-@@ -5,9 +5,9 @@ |
| 8995 |
- |
| 8996 |
- .PATH: ${.CURDIR}/../../sys/dev/usb |
| 8997 |
- |
| 8998 |
--FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ |
| 8999 |
-+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ |
| 9000 |
- committers-src.dot eqnchar flowers init.ee \ |
| 9001 |
-- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ |
| 9002 |
-+ iso3166 iso639 man.template mdoc.template pci_vendors \ |
| 9003 |
- scsi_modes \ |
| 9004 |
- organization.dot |
| 9005 |
- |
| 9006 |
|
| 9007 |
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch |
| 9008 |
deleted file mode 100644 |
| 9009 |
index 79e29e9..0000000 |
| 9010 |
--- a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch |
| 9011 |
+++ /dev/null |
| 9012 |
@@ -1,20 +0,0 @@ |
| 9013 |
-diff --git a/share/skel/Makefile b/share/skel/Makefile |
| 9014 |
-index 024985c..6f6e563 100644 |
| 9015 |
---- a/share/skel/Makefile |
| 9016 |
-+++ b/share/skel/Makefile |
| 9017 |
-@@ -2,11 +2,11 @@ |
| 9018 |
- # $FreeBSD: stable/10/share/skel/Makefile 291794 2015-12-04 18:21:05Z bdrewery $ |
| 9019 |
- |
| 9020 |
- FILESGROUPS= FILES1 FILES2 |
| 9021 |
--FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ |
| 9022 |
-+FILES1= dot.login_conf dot.mailrc \ |
| 9023 |
- dot.shrc |
| 9024 |
--FILES2= dot.mail_aliases dot.rhosts |
| 9025 |
--FILES1DIR= ${SHAREDIR}/skel |
| 9026 |
--FILES2DIR= ${SHAREDIR}/skel |
| 9027 |
-+FILES2= dot.mail_aliases |
| 9028 |
-+FILES1DIR= /etc/skel |
| 9029 |
-+FILES2DIR= /etc/skel |
| 9030 |
- FILES1MODE= 0644 |
| 9031 |
- FILES2MODE= 0600 |
| 9032 |
- NO_OBJ= |
| 9033 |
|
| 9034 |
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch |
| 9035 |
deleted file mode 100644 |
| 9036 |
index c0798d3..0000000 |
| 9037 |
--- a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch |
| 9038 |
+++ /dev/null |
| 9039 |
@@ -1,20 +0,0 @@ |
| 9040 |
---- examples/smbfs/Makefile.orig Tue Mar 22 15:20:20 2005 |
| 9041 |
-+++ examples/smbfs/Makefile Tue Mar 22 15:20:46 2005 |
| 9042 |
-@@ -2,6 +2,7 @@ |
| 9043 |
- |
| 9044 |
- NOOBJ= |
| 9045 |
- BINDIR= /usr/share/examples/smbfs |
| 9046 |
-+FILESDIR= ${DOCDIR}/smbfs |
| 9047 |
- FILES= dot.nsmbrc |
| 9048 |
- |
| 9049 |
- .PATH: ${.CURDIR}/../../../contrib/smbfs/examples |
| 9050 |
---- examples/smbfs/print/Makefile.orig Tue Mar 22 15:22:17 2005 |
| 9051 |
-+++ examples/smbfs/print/Makefile Tue Mar 22 15:22:35 2005 |
| 9052 |
-@@ -2,6 +2,7 @@ |
| 9053 |
- |
| 9054 |
- NOOBJ= |
| 9055 |
- BINDIR= /usr/share/examples/smbfs/print |
| 9056 |
-+FILESDIR= ${DOCDIR}/smbfs/print |
| 9057 |
- FILES= lj6l ljspool printcap.sample tolj |
| 9058 |
- |
| 9059 |
- .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print |
| 9060 |
|
| 9061 |
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch |
| 9062 |
deleted file mode 100644 |
| 9063 |
index f668d04..0000000 |
| 9064 |
--- a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch |
| 9065 |
+++ /dev/null |
| 9066 |
@@ -1,20 +0,0 @@ |
| 9067 |
-Index: fbsd/share/skel/Makefile |
| 9068 |
-=================================================================== |
| 9069 |
---- fbsd.orig/share/skel/Makefile |
| 9070 |
-+++ fbsd/share/skel/Makefile |
| 9071 |
-@@ -2,11 +2,11 @@ |
| 9072 |
- # $FreeBSD: src/share/skel/Makefile,v 1.9.2.1 2005/02/13 07:23:30 obrien Exp $ |
| 9073 |
- |
| 9074 |
- FILESGROUPS= FILES1 FILES2 |
| 9075 |
--FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ |
| 9076 |
-+FILES1= dot.login_conf dot.mailrc \ |
| 9077 |
- dot.shrc |
| 9078 |
--FILES2= dot.mail_aliases dot.rhosts |
| 9079 |
--FILES1DIR= /usr/share/skel |
| 9080 |
--FILES2DIR= /usr/share/skel |
| 9081 |
-+FILES2= dot.mail_aliases |
| 9082 |
-+FILES1DIR= /etc/skel |
| 9083 |
-+FILES2DIR= /etc/skel |
| 9084 |
- FILES1MODE= 0644 |
| 9085 |
- FILES2MODE= 0600 |
| 9086 |
- NOOBJ= |
| 9087 |
|
| 9088 |
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch |
| 9089 |
deleted file mode 100644 |
| 9090 |
index 19167a6..0000000 |
| 9091 |
--- a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch |
| 9092 |
+++ /dev/null |
| 9093 |
@@ -1,26 +0,0 @@ |
| 9094 |
---- share/misc/Makefile.old 2010-03-12 01:32:39 +0100 |
| 9095 |
-+++ share/misc/Makefile 2010-03-12 01:33:25 +0100 |
| 9096 |
-@@ -3,9 +3,9 @@ |
| 9097 |
- |
| 9098 |
- .PATH: ${.CURDIR}/../../sys/dev/usb |
| 9099 |
- |
| 9100 |
--FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ |
| 9101 |
-+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ |
| 9102 |
- committers-src.dot eqnchar flowers init.ee \ |
| 9103 |
-- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ |
| 9104 |
-+ iso3166 iso639 man.template mdoc.template pci_vendors \ |
| 9105 |
- scsi_modes usb_hid_usages usbdevs |
| 9106 |
- |
| 9107 |
- NO_OBJ= |
| 9108 |
---- share/dict/Makefile.old 2010-03-12 01:33:53 +0100 |
| 9109 |
-+++ share/dict/Makefile 2010-03-12 01:34:18 +0100 |
| 9110 |
-@@ -4,8 +4,7 @@ |
| 9111 |
- NO_OBJ= |
| 9112 |
- |
| 9113 |
- # XXX MISSING: connectives words |
| 9114 |
--FILES= README propernames web2 web2a freebsd |
| 9115 |
-+FILES= README freebsd |
| 9116 |
- FILESDIR= ${BINDIR}/dict |
| 9117 |
--SYMLINKS= web2 ${FILESDIR}/words |
| 9118 |
- |
| 9119 |
- .include <bsd.prog.mk> |
| 9120 |
|
| 9121 |
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch |
| 9122 |
deleted file mode 100644 |
| 9123 |
index af84dc3..0000000 |
| 9124 |
--- a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch |
| 9125 |
+++ /dev/null |
| 9126 |
@@ -1,28 +0,0 @@ |
| 9127 |
-diff -Nur share.orig/dict/Makefile share/dict/Makefile |
| 9128 |
---- share.orig/dict/Makefile 2012-12-31 18:00:00.000000000 +0900 |
| 9129 |
-+++ share/dict/Makefile 2012-12-31 18:03:15.000000000 +0900 |
| 9130 |
-@@ -4,8 +4,7 @@ |
| 9131 |
- NO_OBJ= |
| 9132 |
- |
| 9133 |
- # XXX MISSING: connectives words |
| 9134 |
--FILES= README propernames web2 web2a freebsd |
| 9135 |
-+FILES= README freebsd |
| 9136 |
- FILESDIR= ${BINDIR}/dict |
| 9137 |
--SYMLINKS= web2 ${FILESDIR}/words |
| 9138 |
- |
| 9139 |
- .include <bsd.prog.mk> |
| 9140 |
-diff -Nur share.orig/misc/Makefile share/misc/Makefile |
| 9141 |
---- share.orig/misc/Makefile 2012-12-31 18:00:00.000000000 +0900 |
| 9142 |
-+++ share/misc/Makefile 2012-12-31 18:04:22.000000000 +0900 |
| 9143 |
-@@ -3,9 +3,9 @@ |
| 9144 |
- |
| 9145 |
- .PATH: ${.CURDIR}/../../sys/dev/usb |
| 9146 |
- |
| 9147 |
--FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ |
| 9148 |
-+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ |
| 9149 |
- committers-src.dot eqnchar flowers init.ee \ |
| 9150 |
-- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ |
| 9151 |
-+ iso3166 iso639 man.template mdoc.template pci_vendors \ |
| 9152 |
- scsi_modes usb_hid_usages usbdevs \ |
| 9153 |
- organization.dot |
| 9154 |
- |
| 9155 |
|
| 9156 |
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild |
| 9157 |
deleted file mode 100644 |
| 9158 |
index 75cbfc0..0000000 |
| 9159 |
--- a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild |
| 9160 |
+++ /dev/null |
| 9161 |
@@ -1,114 +0,0 @@ |
| 9162 |
-# Copyright 1999-2016 Gentoo Foundation |
| 9163 |
-# Distributed under the terms of the GNU General Public License v2 |
| 9164 |
-# $Id$ |
| 9165 |
- |
| 9166 |
-EAPI=5 |
| 9167 |
- |
| 9168 |
-inherit bsdmk freebsd |
| 9169 |
- |
| 9170 |
-DESCRIPTION="FreeBSD shared tools/files" |
| 9171 |
-SLOT="0" |
| 9172 |
-LICENSE="BSD zfs? ( CDDL )" |
| 9173 |
- |
| 9174 |
-IUSE="doc usb zfs" |
| 9175 |
- |
| 9176 |
-if [[ ${PV} != *9999* ]]; then |
| 9177 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 9178 |
-fi |
| 9179 |
- |
| 9180 |
-EXTRACTONLY=" |
| 9181 |
- share/ |
| 9182 |
- contrib/ |
| 9183 |
- gnu/ |
| 9184 |
- usr.bin/ |
| 9185 |
- usr.sbin/ |
| 9186 |
- sbin/ |
| 9187 |
- bin/ |
| 9188 |
- lib/ |
| 9189 |
- etc/ |
| 9190 |
- tools/tools/locale/ |
| 9191 |
-" |
| 9192 |
- |
| 9193 |
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
| 9194 |
- =sys-freebsd/freebsd-sources-${RV}*" |
| 9195 |
-RDEPEND="sys-apps/miscfiles" |
| 9196 |
- |
| 9197 |
-RESTRICT="strip" |
| 9198 |
- |
| 9199 |
-S="${WORKDIR}/share" |
| 9200 |
- |
| 9201 |
-pkg_setup() { |
| 9202 |
- # Add the required source files. |
| 9203 |
- use zfs && EXTRACTONLY+="cddl/ " |
| 9204 |
- |
| 9205 |
- use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= " |
| 9206 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
| 9207 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
| 9208 |
- [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " |
| 9209 |
- [[ ! -e /usr/bin/localedef ]] && mymakeopts="${mymakeopts} WITHOUT_LOCALES= " |
| 9210 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= " |
| 9211 |
-} |
| 9212 |
- |
| 9213 |
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset" |
| 9214 |
- |
| 9215 |
-PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch" |
| 9216 |
- "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" |
| 9217 |
- "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" ) |
| 9218 |
- |
| 9219 |
-src_prepare() { |
| 9220 |
- # Remove make.conf manpage as it describes bsdmk's make.conf. |
| 9221 |
- sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" |
| 9222 |
- # Remove rc.conf manpage as it describes bsd's rc.conf. |
| 9223 |
- sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile" |
| 9224 |
- sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile" |
| 9225 |
- # Remove mailer.conf manpage |
| 9226 |
- sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" |
| 9227 |
- # Remove pbm and moduli(ssh) manpages |
| 9228 |
- sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" |
| 9229 |
- # Remove builtins manpage |
| 9230 |
- sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" |
| 9231 |
- # Remove rc manpages |
| 9232 |
- sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" |
| 9233 |
- # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin. |
| 9234 |
- sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile" |
| 9235 |
- |
| 9236 |
- # Don't install the arch-specific directories in subdirectories |
| 9237 |
- sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile |
| 9238 |
- |
| 9239 |
- # Remove them so that they can't be included by error |
| 9240 |
- rm -rf "${S}"/mk/*.mk |
| 9241 |
- |
| 9242 |
- # Make proper symlinks by defining the full target. |
| 9243 |
- local sdir |
| 9244 |
- for sdir in colldef monetdef msgdef numericdef timedef |
| 9245 |
- do |
| 9246 |
- sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ |
| 9247 |
- "${S}/${sdir}/Makefile" || \ |
| 9248 |
- die "Error fixing ${sdir}/Makefile" |
| 9249 |
- done |
| 9250 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
| 9251 |
- ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink" |
| 9252 |
- fi |
| 9253 |
-} |
| 9254 |
- |
| 9255 |
-src_compile() { |
| 9256 |
- export ESED="/usr/bin/sed" |
| 9257 |
- |
| 9258 |
- # libiconv support. |
| 9259 |
- # i18n/csmapper/APPLE requires mkcsmapper_static |
| 9260 |
- # i18n/esdb/APPLE requires mkesdb_static |
| 9261 |
- for pkg in mkcsmapper_static mkesdb_static |
| 9262 |
- do |
| 9263 |
- cd "${WORKDIR}"/usr.bin/${pkg} || die |
| 9264 |
- freebsd_src_compile |
| 9265 |
- done |
| 9266 |
- |
| 9267 |
- # This is a groff problem and not a -shared problem. |
| 9268 |
- cd "${S}" || die |
| 9269 |
- export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/" |
| 9270 |
- freebsd_src_compile -j1 || die "emake failed" |
| 9271 |
-} |
| 9272 |
- |
| 9273 |
-src_install() { |
| 9274 |
- freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF} |
| 9275 |
-} |
| 9276 |
|
| 9277 |
diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml |
| 9278 |
deleted file mode 100644 |
| 9279 |
index 9a9053f..0000000 |
| 9280 |
--- a/sys-freebsd/freebsd-share/metadata.xml |
| 9281 |
+++ /dev/null |
| 9282 |
@@ -1,12 +0,0 @@ |
| 9283 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 9284 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 9285 |
-<pkgmetadata> |
| 9286 |
- <maintainer type="project"> |
| 9287 |
- <email>bsd@g.o</email> |
| 9288 |
- <name>BSD Project</name> |
| 9289 |
- </maintainer> |
| 9290 |
- <use> |
| 9291 |
- <flag name="isdn">Enable ISDN support</flag> |
| 9292 |
- <flag name="zfs">Enable ZFS support.</flag> |
| 9293 |
- </use> |
| 9294 |
-</pkgmetadata> |
| 9295 |
|
| 9296 |
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest |
| 9297 |
deleted file mode 100644 |
| 9298 |
index e43f572..0000000 |
| 9299 |
--- a/sys-freebsd/freebsd-sources/Manifest |
| 9300 |
+++ /dev/null |
| 9301 |
@@ -1,39 +0,0 @@ |
| 9302 |
-AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9 |
| 9303 |
-AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf |
| 9304 |
-AUX freebsd-sources-10.1-gcc48.patch 452 SHA256 26ad0753e59bd7e45f957cc98c8a11c8c1bcaf89ed55898b4efc6d95e3943671 SHA512 55e5249ec8337d880d96fd9429a0ffe5663c6182996b6b2ab8d19fe9d5168a0042b81222b2bb89de6d90f98d042b593fb40a7f4178ac739f681f84c2d62b5c96 WHIRLPOOL b6ed5ad4d7e444c79afcc0a14ce9fc85fddd5d1ae6b1d7dc8aa3e4949bb598e0da7a0d95025ba7e3981fc0af741c52e3c84fc81cba00bc79f59ab510afa85441 |
| 9305 |
-AUX freebsd-sources-11.0-gentoo-gcc.patch 430 SHA256 e8f031a81dc611c7368bbb4330f2e162a50b72af9b3cdce012c93d0130668b8f SHA512 9869ba13091cc0975a7fe1a1b18a279835d19f1f57204dd3463798d3695a250ba6c96f2c1f6a2352dfce0022d7365257b0f938032b55e7090f68e58c4455bffe WHIRLPOOL 01b61475aabca1647092a8d77c426ffd609ce66a508672eb85b87f2b25db37dbc6191a3f9bfaa24f5fe03a233c122a4f2b971c3a4f4fd9022acaad55c8ad3427 |
| 9306 |
-AUX freebsd-sources-11.0-gentoo.patch 852 SHA256 ea3a49d8d4da8bb67ae715b0551415ae144457386c1c63a11090cc80d223e70b SHA512 11f65627bb5436052b227d884c384e888bb8f44696c36b80a8715c912e41c953b57c1420b37030155c2751c72289470c4f681d14ed149e4f6aa82d8b63766ade WHIRLPOOL 418d1adc24fe6770beb7273724f510a3f89321e1f3cca1ee0242a2c6ce3e3533655339c10da67f92118b82fabf87f680487ef2d8e1781bf965e889e19adbd4b7 |
| 9307 |
-AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc |
| 9308 |
-AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14 |
| 9309 |
-AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512 |
| 9310 |
-AUX freebsd-sources-7.1-binutils_link.patch 1297 SHA256 957c03640f3aac6141efa3e775f33fcadd501f920612055d0e00b3f80fcd8f17 SHA512 0e3aa342646d18429ed76e484d7e15d353d858f00bda906dae74b01b4e73f1b4ccfb6404590d79cb206da3a732528a4437813540a26292d697ccc3b964dabfb0 WHIRLPOOL 5108bd5a1bd49f94a7902b5b478528b29f1e15fe1e06f96a80de6fbf047eaf4f925f00fcd5f83085d44e86828dee50cc2efd150ece362bbd3ab24b292d9e7249 |
| 9311 |
-AUX freebsd-sources-7.1-includes.patch 318 SHA256 70c73d0939325185430a3a133380f0bc10674cb8fbe5c7ebfe3b07630d023369 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7 WHIRLPOOL 5dca685df773113dff0c8aac16f244882728ad586b62b7c20df948240b097e89d1bb62f16ed181f2535e13835471754d8fdd0f4ef02b73ce5077b9169c958557 |
| 9312 |
-AUX freebsd-sources-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3 |
| 9313 |
-AUX freebsd-sources-7.2-debug-O2.patch 771 SHA256 ad1fdd8a6dd53186793d70b65e1b37e3d3e7a4e50c32069aa535ae9f8e9aded8 SHA512 a74dacbd24c6130ec4c762a9c2df58a37d5fee2ee6fa4a970245b53837afa5ee3f72318b6e723e0591ddce00a5aa0fd66746a06783174d4edb9814e3a3724201 WHIRLPOOL 598f1e3282f5b8ebacd43835e148e5249737d8d7b240eaa459e5374444e0aeb39a692b01d3da5a8bec6aa44b8fe97879ce3bea739796688d8d6b365baac438b6 |
| 9314 |
-AUX freebsd-sources-8.0-gentoo.patch 1138 SHA256 0bb6e4cb59bb6f5fd86c88bfd36ce8c9d148d96e8722f1d6a485f98ba892650c SHA512 677adbbbba367bda65f01b604a0a6235ac12d7b307857fa35c7722eb05e0a74d3cd35c03a9dfa56023b7869a865959c9edcfa601d841add92ff21a941d395ddc WHIRLPOOL bcf25d6f650f6435e7fa7c6d5888a1dbded300f0e4c9f595abc1386663b65fd378805efe1b8355c91efc357e0684ce7722526f93beae55a1102e813aaecbd711 |
| 9315 |
-AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5 WHIRLPOOL 01e27e011c94641498cf0c04a663e4f8f4844a57bd462aa38a1c23a8b3244e5eec226fb11b5e8e598de7227ac2d3dd33aaa98d16f6e7628329ac59e1e7ce62ae |
| 9316 |
-AUX freebsd-sources-8.2-unix2.patch 1642 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61 SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b WHIRLPOOL 5152dca64e3799cc9b6ffd97019c542f93082631489b9c0e03128a09a3d0c667da4220cfc67039c24d13a2cb527dd325db501029478d528c688c0c35cf2373c7 |
| 9317 |
-AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b WHIRLPOOL 86f9586a3f07118f95e5fbce1a65fdd3be8dd701ed1bee1379ed2133cef3d9473b437826a13ec2a53c73f7b3e1003256d912a45eb80c86195749a8cd08f9813c |
| 9318 |
-AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9 |
| 9319 |
-AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8 |
| 9320 |
-AUX freebsd-sources-9.1-ciss.patch 2067 SHA256 a450312394a9ed449144c1b320ec323f8fcd6cb744ad6c6862046b0fd5086e4e SHA512 5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989 WHIRLPOOL 59f1324eaa98e11a094e4fe48e8ad8f468bc373691de101c5082630d1a69d10a3e6d904f3b6138a2107b0f35f37c16f07da575c1efb4bbfa22869a7cf328e5e2 |
| 9321 |
-AUX freebsd-sources-9.1-cve-2013-3077.patch 1064 SHA256 2c0b8a4df43b3a2b15bbb33000f4c0e0e132901dfe5d5531a694a17b9e1fd7b8 SHA512 12244d1335ab626e4a391cdd1d435f9f002ec4142fa2a2a93832b554f03fff69de09e950c4e80c797fd0b568504a69e18341fd35bd952a56e01a05024de8206f WHIRLPOOL 01c9e9270eea92448de3754ab0d6dc2efdec4b8e06a00b0d86c550e318c07c8e4a5b2b32e645008713e399c20b96d5e91e740e5120f889050ab91416763be3fa |
| 9322 |
-AUX freebsd-sources-9.1-cve-2013-3266.patch 535 SHA256 3ddd63716570d7a08956228d3f2b165e80380d3062cecfa9ed781696542cf7e2 SHA512 04f421724d79a2e8c5a23120a44601bd611b938e4452d064034b7cf91ab36e2b019e3a12af62d5bd180a5da30ca59886f90aeb6f1255dcd2124285aec6b65fa7 WHIRLPOOL e12449b21f4a3200da65d815bdc33972e9aa7b2941560fba13a634be9baad4246b635ee87510a09dee123b65ea614ed57f17e482ba41a0ea2c986e579d75f3a9 |
| 9323 |
-AUX freebsd-sources-9.1-cve-2013-5209.patch 645 SHA256 1b334cae7f7ac266785449bc34a8b4b652b961b7b77acc3488e418f4359b6041 SHA512 1ed132883d22aaf48be98dd9adaa48cea0023f3c986cedb45f986676f1c4a40d3d5463006f516d78fe77a408e5f4821cb7b26d8fbff7091bc2aad9faac2e728a WHIRLPOOL 8ea85c387106009ed4c5ac4652520d349cf403d6568d81aedcc05f81ebdb5ac0c287a188071bb7651b4e847d95abf9874bfc8710a025c9ea1c986993b6d4a0a9 |
| 9324 |
-AUX freebsd-sources-9.1-cve-2013-5691.patch 2854 SHA256 418cb39d555c036013cd87a2205d2b1b9e4c729f409b3bd4c509648282a0a993 SHA512 6c3342e79fe3de90d37d82415b186f5012597dfbc5f522f9aadfa5420d601e4e6042b899ed348b581537491d4c49d6b4959ca3b438f9bda454b8d9b494120534 WHIRLPOOL 7436a1c9402c2de662b98e3615d1a62f290a8638c597d671474dab005a60a5c5b162ea31603902568c9443ebd39a2631297b6e19bd26f343c808e086b78da263 |
| 9325 |
-AUX freebsd-sources-9.1-cve-2013-5710.patch 704 SHA256 c076858b5dd9ab31be241144bef4de2824fa27599f7f114bcab9a2934436a1dd SHA512 a87d571aa060f435e0ac53816307703e300e16365df13c88be0a982d5851d3c224e0cc23b32ef61445413abda86762e0e43b964d475f1d816ca83d2c6b3f7d58 WHIRLPOOL 71bceec1fad2cde48cd32475805f96a33d9fef85ac8f3b69c601874514b6eef89479cf9b372bc8639d48a317dc5216bd7e2f2902570a148da865983845f5fbc6 |
| 9326 |
-AUX freebsd-sources-9.1-cve-2014-1453.patch 2239 SHA256 2605926b9a36cf2eecf65fc3bcc92ed772922562fdfebfd39c99137526f2a440 SHA512 27b48c96447cb961d2de3ad7f67a739ff78ee3904da508b2e6c1948d299090cb169bd3f289b0448e7d242c1c0d39fd5e5fc29700d92ba4877c3e6d013a6cd6a1 WHIRLPOOL 206c18f70756f77050c681ee4b14f7e0d0e38cac42d146ae0ccd9bd79a3977c4db57d1456c3bfe0294dad313eead5dfb748446e0fa401c98105ea53097505e45 |
| 9327 |
-AUX freebsd-sources-9.1-exec.patch 2032 SHA256 8e75954777f69e87b9401f3ed79d65fd6e498bd82bdad4378a076fa088480e8f SHA512 db2ac3a96b9c2bfc3e785a6ea8060e7cf516e6cb25629749a7cae4ca8171b0f3b8f1128c5b646f8dfcd78c21fb3859b548907ba1781a698235dd5cf6a90f824b WHIRLPOOL f0a29fea6f7cd5096deb29a53830c7c7e51b9c5c2eb2b28b2baca42fa0003f54181245cd8c9dc63beafea1d8000f05ac615705cfb573af33d03d6d89ee2712e6 |
| 9328 |
-AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e |
| 9329 |
-AUX freebsd-sources-9.1-ktrace.patch 463 SHA256 328d14c5fd775b1a99f065911ab8c95065823dbd488bc0b1b3bc8bf46fcb8515 SHA512 b0cf73180320e0d1295fcde2c19a281575150f28d71fecd31c5793b6f0e9784005745fbc56b8578d40615e9276cfadf25d6fd3ea5e21f315e3c6beedc0476ffa WHIRLPOOL 03e3e9a090bd14c9f8be2fbf62a0c305da6e6e20ca1f5e30dd66c22b3f031132046ebd959c6f66a9b3227756c339cc3f87f339829592625dace8116f3ed67814 |
| 9330 |
-AUX freebsd-sources-9.1-mmap-2014.patch 758 SHA256 cfc0663e536972ced5a45b5ff491b8590e95739ea6cd34687b9ca56e5d7e63b8 SHA512 fb1f28268355ad0a25705fecb7555222b53b04fd92b1b80af2db4b6f2ac02bf5a948ba0521d1674e31da57a1baf037fe0fe581c03a437d86325e185a8050aaa3 WHIRLPOOL 8995fb9d0751aa3c12bab79206f22c924ffe583060895c2cfc62e53ce89ce1cdde0f511e12e017209221075aa536e839ab68c241b8feffc26910c613aa8753ed |
| 9331 |
-AUX freebsd-sources-9.1-mmap.patch 676 SHA256 4adee0a45d519d93d4bd3554c6b685becbaac2bc5e89511f61260e85a914235e SHA512 0daff1ef440be8e4f841eeff8917a36591bd3f4c31d79feb4666f9c3d65d49ee180397b81b07753c8892efd76436bf19d2218979cef3847d3cd46bdfcf166d6b WHIRLPOOL a31b32fb6fe8d7ca4464abae9c444e62d6ff00b4d53beed7c81c89bf0e85e61cf1eed7e70c7861a3559432086a923926737c4f6a727d2e389745de045e6f30cb |
| 9332 |
-AUX freebsd-sources-9.1-nfsserver.patch 650 SHA256 b288a29155fbce8ac58460a3f64ce77b644c32ee54814e35086700d2fae3610a SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe WHIRLPOOL b4469dfb52ca87e95539bd63dcc36ba34c9a29b812b887ad9656c2adea7acee5ae6a14850d2f4733aff7248fb9d6d6107ea38f06365efba18f8f025506675de9 |
| 9333 |
-AUX freebsd-sources-9.1-random.patch 792 SHA256 46d4035d31e8a64531e1893c08b8235ee92af002848a781d9f1af1a886f17fdc SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99 WHIRLPOOL db318323bd0d757ab0a97ef5e552ee38b9fe5eaf12f87769912abf16dda40b11692ae3715cd5fc34aa11d5ae226366b8bb63feff3067c539b9fc23a9ad14c840 |
| 9334 |
-AUX freebsd-sources-9.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802126382a6ce5dbbc6617e4f81188e7a SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e WHIRLPOOL 6e81938c55e2a40f4d75a53f4bfeac1c4183feebf023bcc320c0179dbf802151cc5f04dde9302e233eff86c33fdca8a6e80dda70d47d0d762da61e22782b1b0d |
| 9335 |
-AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218 |
| 9336 |
-AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121 |
| 9337 |
-AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae |
| 9338 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 9339 |
-EBUILD freebsd-sources-11.0.ebuild 4823 SHA256 968c5d17553771f653e861cdfa78c7567049d6999dd436cc3189ada0e13707fa SHA512 ddefd5c3dca7b54c59d72e1d0ca83431b84de92be2274afaef6e77a9648f7fff82bbc500c0d225475476ebdfae04026f5d29577d5f36eb2fc407a4e258c6d72a WHIRLPOOL 6d18a50d484072a24d53d70824be5679bf6292658df83fd53ed5f8c1fd645e90bfa6f46415b1ed85b22d1451cc4a470535fc2493689a37423b4fefcdd617da99 |
| 9340 |
-MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2 |
| 9341 |
|
| 9342 |
diff --git a/sys-freebsd/freebsd-sources/files/config-GENTOO b/sys-freebsd/freebsd-sources/files/config-GENTOO |
| 9343 |
deleted file mode 100644 |
| 9344 |
index 7c7eb26..0000000 |
| 9345 |
--- a/sys-freebsd/freebsd-sources/files/config-GENTOO |
| 9346 |
+++ /dev/null |
| 9347 |
@@ -1,4 +0,0 @@ |
| 9348 |
-# Kernel configuration for Gentoo/FreeBSD. |
| 9349 |
-include GENERIC |
| 9350 |
-ident GENTOO |
| 9351 |
- |
| 9352 |
|
| 9353 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch |
| 9354 |
deleted file mode 100644 |
| 9355 |
index c7e12bd..0000000 |
| 9356 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch |
| 9357 |
+++ /dev/null |
| 9358 |
@@ -1,22 +0,0 @@ |
| 9359 |
-diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk |
| 9360 |
-index 2939a59..124ef6f 100644 |
| 9361 |
---- a/sys/conf/kern.mk |
| 9362 |
-+++ b/sys/conf/kern.mk |
| 9363 |
-@@ -5,7 +5,7 @@ |
| 9364 |
- # |
| 9365 |
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ |
| 9366 |
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ |
| 9367 |
-- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ |
| 9368 |
-+ -Wundef -Wno-pointer-sign \ |
| 9369 |
- -Wmissing-include-dirs -fdiagnostics-show-option \ |
| 9370 |
- ${CWARNEXTRA} |
| 9371 |
- # |
| 9372 |
-@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS= -fformat-extensions |
| 9373 |
- # |
| 9374 |
- .if ${MACHINE_CPUARCH} == "i386" |
| 9375 |
- .if ${COMPILER_TYPE} != "clang" |
| 9376 |
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 |
| 9377 |
-+CFLAGS+= -mpreferred-stack-boundary=2 |
| 9378 |
- .else |
| 9379 |
- CFLAGS+= -mno-aes -mno-avx |
| 9380 |
- .endif |
| 9381 |
|
| 9382 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch |
| 9383 |
deleted file mode 100644 |
| 9384 |
index 5cb4cf8..0000000 |
| 9385 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch |
| 9386 |
+++ /dev/null |
| 9387 |
@@ -1,18 +0,0 @@ |
| 9388 |
-https://svnweb.freebsd.org/base?view=revision&revision=281606 |
| 9389 |
- |
| 9390 |
-diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h |
| 9391 |
-index d4ed8b3..79847ee 100644 |
| 9392 |
---- a/sys/crypto/aesni/aesencdec.h |
| 9393 |
-+++ b/sys/crypto/aesni/aesencdec.h |
| 9394 |
-@@ -27,6 +27,11 @@ |
| 9395 |
- * |
| 9396 |
- */ |
| 9397 |
- |
| 9398 |
-+#if defined(__GNUC__) && defined(_KERNEL) |
| 9399 |
-+/* Suppress inclusion of gcc's mm_malloc.h header */ |
| 9400 |
-+#define _MM_MALLOC_H_INCLUDED 1 |
| 9401 |
-+#endif |
| 9402 |
-+ |
| 9403 |
- #include <wmmintrin.h> |
| 9404 |
- |
| 9405 |
- static inline void |
| 9406 |
|
| 9407 |
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 |
| 9408 |
deleted file mode 100644 |
| 9409 |
index 1d3c8d6..0000000 |
| 9410 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch |
| 9411 |
+++ /dev/null |
| 9412 |
@@ -1,13 +0,0 @@ |
| 9413 |
-diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh |
| 9414 |
-index e4b2ad4..411bedf 100644 |
| 9415 |
---- a/sys/conf/newvers.sh |
| 9416 |
-+++ b/sys/conf/newvers.sh |
| 9417 |
-@@ -110,7 +110,7 @@ else |
| 9418 |
- t=`date` |
| 9419 |
- fi |
| 9420 |
- i=`${MAKE:-make} -V KERN_IDENT` |
| 9421 |
--compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep -w 'version') |
| 9422 |
-+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1) |
| 9423 |
- |
| 9424 |
- for dir in /usr/bin /usr/local/bin; do |
| 9425 |
- if [ ! -z "${svnversion}" ] ; then |
| 9426 |
|
| 9427 |
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 |
| 9428 |
deleted file mode 100644 |
| 9429 |
index 6acd6aa..0000000 |
| 9430 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch |
| 9431 |
+++ /dev/null |
| 9432 |
@@ -1,22 +0,0 @@ |
| 9433 |
-diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk |
| 9434 |
-index e27ea93..615dbac 100644 |
| 9435 |
---- a/sys/conf/kern.mk |
| 9436 |
-+++ b/sys/conf/kern.mk |
| 9437 |
-@@ -5,7 +5,7 @@ |
| 9438 |
- # |
| 9439 |
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ |
| 9440 |
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ |
| 9441 |
-- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ |
| 9442 |
-+ -Wundef -Wno-pointer-sign \ |
| 9443 |
- -Wmissing-include-dirs -fdiagnostics-show-option \ |
| 9444 |
- -Wno-unknown-pragmas \ |
| 9445 |
- ${CWARNEXTRA} |
| 9446 |
-@@ -86,7 +86,7 @@ FORMAT_EXTENSIONS= -fformat-extensions |
| 9447 |
- # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 |
| 9448 |
- # |
| 9449 |
- .if ${MACHINE_CPUARCH} == "i386" |
| 9450 |
--CFLAGS.gcc+= -mno-align-long-strings -mpreferred-stack-boundary=2 |
| 9451 |
-+CFLAGS.gcc+= -mpreferred-stack-boundary=2 |
| 9452 |
- CFLAGS.clang+= -mno-aes -mno-avx |
| 9453 |
- CFLAGS+= -mno-mmx -mno-sse -msoft-float |
| 9454 |
- INLINE_LIMIT?= 8000 |
| 9455 |
|
| 9456 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch |
| 9457 |
deleted file mode 100644 |
| 9458 |
index 88710cf..0000000 |
| 9459 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch |
| 9460 |
+++ /dev/null |
| 9461 |
@@ -1,22 +0,0 @@ |
| 9462 |
-Index: fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l |
| 9463 |
-=================================================================== |
| 9464 |
---- fbsd-6.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l |
| 9465 |
-+++ fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l |
| 9466 |
-@@ -528,7 +528,7 @@ expand_macro(struct symbol *macro_symbol |
| 9467 |
- |
| 9468 |
- /* Put back everything up until the replacement. */ |
| 9469 |
- while (body_pos > next_match) |
| 9470 |
-- unput(*--body_pos); |
| 9471 |
-+ yyunput(*--body_pos, body_head); |
| 9472 |
- |
| 9473 |
- /* Perform the replacement. */ |
| 9474 |
- if (match_marg != NULL) { |
| 9475 |
-@@ -537,7 +537,7 @@ expand_macro(struct symbol *macro_symbol |
| 9476 |
- next_match = match_marg->replacement_text; |
| 9477 |
- strp = next_match + strlen(next_match); |
| 9478 |
- while (strp > next_match) |
| 9479 |
-- unput(*--strp); |
| 9480 |
-+ yyunput(*--strp, next_match); |
| 9481 |
- |
| 9482 |
- /* Skip past the unexpanded macro arg. */ |
| 9483 |
- body_pos -= match.rm_eo - match.rm_so; |
| 9484 |
|
| 9485 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch |
| 9486 |
deleted file mode 100644 |
| 9487 |
index e74fcd3..0000000 |
| 9488 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch |
| 9489 |
+++ /dev/null |
| 9490 |
@@ -1,32 +0,0 @@ |
| 9491 |
---- sys/fs/ntfs/ntfs_vnops.c.orig 2006-10-17 17:31:36 -0300 |
| 9492 |
-+++ sys/fs/ntfs/ntfs_vnops.c 2006-10-17 17:30:24 -0300 |
| 9493 |
-@@ -507,8 +507,12 @@ |
| 9494 |
- |
| 9495 |
- /* Simulate . in every dir except ROOT */ |
| 9496 |
- if( ip->i_number != NTFS_ROOTINO ) { |
| 9497 |
-- struct dirent dot = { NTFS_ROOTINO, |
| 9498 |
-- sizeof(struct dirent), DT_DIR, 1, "." }; |
| 9499 |
-+ struct dirent dot; |
| 9500 |
-+ dot.d_fileno = NTFS_ROOTINO; |
| 9501 |
-+ dot.d_reclen = sizeof(struct dirent); |
| 9502 |
-+ dot.d_type = DT_DIR; |
| 9503 |
-+ dot.d_namlen = 1; |
| 9504 |
-+ bcopy(".", dot.d_name, 1); |
| 9505 |
- |
| 9506 |
- if( uio->uio_offset < sizeof(struct dirent) ) { |
| 9507 |
- dot.d_fileno = ip->i_number; |
| 9508 |
-@@ -522,8 +526,12 @@ |
| 9509 |
- |
| 9510 |
- /* Simulate .. in every dir including ROOT */ |
| 9511 |
- if( uio->uio_offset < 2 * sizeof(struct dirent) ) { |
| 9512 |
-- struct dirent dotdot = { NTFS_ROOTINO, |
| 9513 |
-- sizeof(struct dirent), DT_DIR, 2, ".." }; |
| 9514 |
-+ struct dirent dotdot; |
| 9515 |
-+ dotdot.d_fileno = NTFS_ROOTINO; |
| 9516 |
-+ dotdot.d_reclen = sizeof(struct dirent); |
| 9517 |
-+ dotdot.d_type = DT_DIR; |
| 9518 |
-+ dotdot.d_namlen = 2; |
| 9519 |
-+ bcopy("..", dotdot.d_name, 2); |
| 9520 |
- |
| 9521 |
- error = uiomove((char *)&dotdot,sizeof(struct dirent),uio); |
| 9522 |
- if(error) |
| 9523 |
|
| 9524 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch |
| 9525 |
deleted file mode 100644 |
| 9526 |
index 13524ef..0000000 |
| 9527 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch |
| 9528 |
+++ /dev/null |
| 9529 |
@@ -1,44 +0,0 @@ |
| 9530 |
-diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c |
| 9531 |
---- sys/fs/tmpfs.orig/tmpfs_vnops.c 2008-06-22 12:17:48 -0300 |
| 9532 |
-+++ sys/fs/tmpfs/tmpfs_vnops.c 2008-06-28 12:05:10 -0300 |
| 9533 |
-@@ -1459,6 +1459,30 @@ |
| 9534 |
- return (0); |
| 9535 |
- } |
| 9536 |
- |
| 9537 |
-+ |
| 9538 |
-+/* --------------------------------------------------------------------- */ |
| 9539 |
-+/* This does absolutely nothing */ |
| 9540 |
-+#ifdef GENTOO_LIVECD |
| 9541 |
-+static int |
| 9542 |
-+tmpfs_whiteout(struct vop_whiteout_args *ap) |
| 9543 |
-+{ |
| 9544 |
-+ switch (ap->a_flags) { |
| 9545 |
-+ case LOOKUP: |
| 9546 |
-+ return (0); |
| 9547 |
-+ break; |
| 9548 |
-+ case CREATE: |
| 9549 |
-+ return(EOPNOTSUPP); |
| 9550 |
-+ break; |
| 9551 |
-+ case DELETE: |
| 9552 |
-+ return (0); |
| 9553 |
-+ break; |
| 9554 |
-+ default: |
| 9555 |
-+ return(EOPNOTSUPP); |
| 9556 |
-+ } |
| 9557 |
-+ return(0); |
| 9558 |
-+} |
| 9559 |
-+#endif |
| 9560 |
-+ |
| 9561 |
- /* --------------------------------------------------------------------- */ |
| 9562 |
- |
| 9563 |
- /* |
| 9564 |
-@@ -1484,6 +1508,9 @@ |
| 9565 |
- .vop_mkdir = tmpfs_mkdir, |
| 9566 |
- .vop_rmdir = tmpfs_rmdir, |
| 9567 |
- .vop_symlink = tmpfs_symlink, |
| 9568 |
-+#ifdef GENTOO_LIVECD |
| 9569 |
-+ .vop_whiteout = tmpfs_whiteout, |
| 9570 |
-+#endif |
| 9571 |
- .vop_readdir = tmpfs_readdir, |
| 9572 |
- .vop_readlink = tmpfs_readlink, |
| 9573 |
- .vop_inactive = tmpfs_inactive, |
| 9574 |
|
| 9575 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch |
| 9576 |
deleted file mode 100644 |
| 9577 |
index 43d01ba..0000000 |
| 9578 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch |
| 9579 |
+++ /dev/null |
| 9580 |
@@ -1,37 +0,0 @@ |
| 9581 |
-diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk |
| 9582 |
---- sys.orig/conf/kern.post.mk 2007-03-23 18:55:59 -0300 |
| 9583 |
-+++ sys/conf/kern.post.mk 2008-06-18 19:51:13 -0300 |
| 9584 |
-@@ -85,7 +85,9 @@ |
| 9585 |
- ${FULLKERNEL}: ${SYSTEM_DEP} vers.o |
| 9586 |
- @rm -f ${.TARGET} |
| 9587 |
- @echo linking ${.TARGET} |
| 9588 |
-- ${SYSTEM_LD} |
| 9589 |
-+ ${SYSTEM_LD} -o ${.TARGET}.tmp |
| 9590 |
-+ @sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt |
| 9591 |
-+ ${SYSTEM_LD} "@${.TARGET}.lopt" |
| 9592 |
- .if defined(CTFMERGE) |
| 9593 |
- ${SYSTEM_CTFMERGE} |
| 9594 |
- .endif |
| 9595 |
-diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk |
| 9596 |
---- sys.orig/conf/kmod.mk 2008-06-18 09:11:53 -0300 |
| 9597 |
-+++ sys/conf/kmod.mk 2008-06-18 19:50:01 -0300 |
| 9598 |
-@@ -176,7 +176,8 @@ |
| 9599 |
- |
| 9600 |
- .if ${MACHINE_ARCH} != amd64 |
| 9601 |
- ${FULLPROG}: ${KMOD}.kld |
| 9602 |
-- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld |
| 9603 |
-+ sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt |
| 9604 |
-+ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt" |
| 9605 |
- .if !defined(DEBUG_FLAGS) |
| 9606 |
- ${OBJCOPY} --strip-debug ${.TARGET} |
| 9607 |
- .endif |
| 9608 |
-diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options |
| 9609 |
---- sys.orig/tools/gen-ld-u-options 1969-12-31 21:00:00 -0300 |
| 9610 |
-+++ sys/tools/gen-ld-u-options 2008-06-18 19:47:56 -0300 |
| 9611 |
-@@ -0,0 +1,6 @@ |
| 9612 |
-+#!/bin/sh |
| 9613 |
-+ |
| 9614 |
-+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "` |
| 9615 |
-+do |
| 9616 |
-+ echo -n " -u __start_$i -u __stop_$i " |
| 9617 |
-+done |
| 9618 |
|
| 9619 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch |
| 9620 |
deleted file mode 100644 |
| 9621 |
index 3db46fa..0000000 |
| 9622 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch |
| 9623 |
+++ /dev/null |
| 9624 |
@@ -1,13 +0,0 @@ |
| 9625 |
-Make headers usable alone, include the headers they need. |
| 9626 |
-There are probably much more missing. |
| 9627 |
- |
| 9628 |
---- sys/net/if.h.old 2009-05-15 10:51:50 +0000 |
| 9629 |
-+++ sys/net/if.h 2009-05-15 10:52:05 +0000 |
| 9630 |
-@@ -34,6 +34,7 @@ |
| 9631 |
- #define _NET_IF_H_ |
| 9632 |
- |
| 9633 |
- #include <sys/cdefs.h> |
| 9634 |
-+#include <sys/socket.h> |
| 9635 |
- |
| 9636 |
- #ifdef _KERNEL |
| 9637 |
- #include <sys/queue.h> |
| 9638 |
|
| 9639 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch |
| 9640 |
deleted file mode 100644 |
| 9641 |
index 8de5df2..0000000 |
| 9642 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch |
| 9643 |
+++ /dev/null |
| 9644 |
@@ -1,15 +0,0 @@ |
| 9645 |
-Fixes a compile error if XOPEN_SOURCE 600 is defined. |
| 9646 |
- |
| 9647 |
-See: http://www.mailinglistarchive.com/freebsd-current@×××××××.org/msg15011.html |
| 9648 |
- |
| 9649 |
---- sys/sys/types.h.orig |
| 9650 |
-+++ sys/sys/types.h |
| 9651 |
-@@ -46,7 +46,7 @@ |
| 9652 |
- |
| 9653 |
- #include <sys/_pthreadtypes.h> |
| 9654 |
- |
| 9655 |
--#if __BSD_VISIBLE |
| 9656 |
-+#ifndef _POSIX_SOURCE |
| 9657 |
- typedef unsigned char u_char; |
| 9658 |
- typedef unsigned short u_short; |
| 9659 |
- typedef unsigned int u_int; |
| 9660 |
|
| 9661 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch |
| 9662 |
deleted file mode 100644 |
| 9663 |
index 4fa3565..0000000 |
| 9664 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch |
| 9665 |
+++ /dev/null |
| 9666 |
@@ -1,27 +0,0 @@ |
| 9667 |
-My UltraSPARC U5 panics on boot about a memory alignment error when compiled |
| 9668 |
-with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly |
| 9669 |
-affect debugging. |
| 9670 |
- |
| 9671 |
-NOTE: This does not fix the memory alignment panic when loading kernel modules. |
| 9672 |
- |
| 9673 |
-Roy Marples (uberlord@g.o) |
| 9674 |
- |
| 9675 |
---- sys/conf/kern.pre.mk.old 2009-05-22 10:09:46 +0000 |
| 9676 |
-+++ sys/conf/kern.pre.mk 2009-05-22 10:10:27 +0000 |
| 9677 |
-@@ -22,15 +22,13 @@ |
| 9678 |
- COPTFLAGS?= -O |
| 9679 |
- .else |
| 9680 |
- . if defined(DEBUG) |
| 9681 |
--_MINUS_O= -O |
| 9682 |
- CTFFLAGS+= -g |
| 9683 |
- . else |
| 9684 |
--_MINUS_O= -O2 |
| 9685 |
- . endif |
| 9686 |
- . if ${MACHINE_ARCH} == "amd64" |
| 9687 |
- COPTFLAGS?=-O2 -frename-registers -pipe |
| 9688 |
- . else |
| 9689 |
--COPTFLAGS?=${_MINUS_O} -pipe |
| 9690 |
-+COPTFLAGS?=-O2 -pipe |
| 9691 |
- . endif |
| 9692 |
- . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing) |
| 9693 |
- COPTFLAGS+= -fno-strict-aliasing |
| 9694 |
|
| 9695 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch |
| 9696 |
deleted file mode 100644 |
| 9697 |
index 0f8d070..0000000 |
| 9698 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch |
| 9699 |
+++ /dev/null |
| 9700 |
@@ -1,33 +0,0 @@ |
| 9701 |
---- sys/conf/kern.mk.old 2007-05-24 23:53:42.000000000 +0200 |
| 9702 |
-+++ sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100 |
| 9703 |
-@@ -12,7 +12,7 @@ |
| 9704 |
- .else |
| 9705 |
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ |
| 9706 |
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ |
| 9707 |
-- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions |
| 9708 |
-+ ${_wundef} ${_Wno_pointer_sign} |
| 9709 |
- .if !defined(WITH_GCC3) |
| 9710 |
- _Wno_pointer_sign=-Wno-pointer-sign |
| 9711 |
- .endif |
| 9712 |
-@@ -36,7 +36,7 @@ |
| 9713 |
- # reserved for user applications. |
| 9714 |
- # |
| 9715 |
- .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" |
| 9716 |
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \ |
| 9717 |
-+CFLAGS+= -mpreferred-stack-boundary=2 \ |
| 9718 |
- -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 |
| 9719 |
- INLINE_LIMIT?= 8000 |
| 9720 |
- .endif |
| 9721 |
-Only in ./sys/conf: kern.mk.rej |
| 9722 |
-Only in ./sys/conf: kern.mk~ |
| 9723 |
---- sys/dev/aic7xxx/aicasm/Makefile.old 2010-03-10 14:01:50 +0100 |
| 9724 |
-+++ sys/dev/aic7xxx/aicasm/Makefile 2010-03-10 14:01:56 +0100 |
| 9725 |
-@@ -14,7 +14,7 @@ |
| 9726 |
- SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS} |
| 9727 |
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g} |
| 9728 |
- DPADD= ${LIBL} |
| 9729 |
--LDADD= -ll |
| 9730 |
-+LDADD= -lfl |
| 9731 |
- WARNS?= 6 |
| 9732 |
- |
| 9733 |
- # Correct path for kernel builds |
| 9734 |
|
| 9735 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch |
| 9736 |
deleted file mode 100644 |
| 9737 |
index a7335f6..0000000 |
| 9738 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch |
| 9739 |
+++ /dev/null |
| 9740 |
@@ -1,21 +0,0 @@ |
| 9741 |
-Fixes changing the default subnet route after removing an ip address. |
| 9742 |
- |
| 9743 |
-See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133 |
| 9744 |
-and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html |
| 9745 |
- |
| 9746 |
-Thanks to Roy Marples. |
| 9747 |
---- sys/netinet/in.c.orig |
| 9748 |
-+++ sys/netinet/in.c |
| 9749 |
-@@ -858,6 +858,12 @@ |
| 9750 |
- error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags); |
| 9751 |
- if (!error) |
| 9752 |
- target->ia_flags |= IFA_ROUTE; |
| 9753 |
-+ else if (error == EEXIST) { |
| 9754 |
-+ /* |
| 9755 |
-+ * the fact that the route already exists is not an error. |
| 9756 |
-+ */ |
| 9757 |
-+ error = 0; |
| 9758 |
-+ } |
| 9759 |
- return (error); |
| 9760 |
- } |
| 9761 |
- |
| 9762 |
|
| 9763 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch |
| 9764 |
deleted file mode 100644 |
| 9765 |
index 50dacd0..0000000 |
| 9766 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch |
| 9767 |
+++ /dev/null |
| 9768 |
@@ -1,55 +0,0 @@ |
| 9769 |
-Index: sys/kern/uipc_usrreq.c |
| 9770 |
-=================================================================== |
| 9771 |
---- sys/kern/uipc_usrreq.c (revision 225745) |
| 9772 |
-+++ sys/kern/uipc_usrreq.c (working copy) |
| 9773 |
-@@ -462,6 +462,8 @@ |
| 9774 |
- unp = sotounpcb(so); |
| 9775 |
- KASSERT(unp != NULL, ("uipc_bind: unp == NULL")); |
| 9776 |
- |
| 9777 |
-+ if (soun->sun_len > sizeof(struct sockaddr_un)) |
| 9778 |
-+ return (EINVAL); |
| 9779 |
- namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path); |
| 9780 |
- if (namelen <= 0) |
| 9781 |
- return (EINVAL); |
| 9782 |
-@@ -1252,6 +1254,8 @@ |
| 9783 |
- unp = sotounpcb(so); |
| 9784 |
- KASSERT(unp != NULL, ("unp_connect: unp == NULL")); |
| 9785 |
- |
| 9786 |
-+ if (nam->sa_len > sizeof(struct sockaddr_un)) |
| 9787 |
-+ return (EINVAL); |
| 9788 |
- len = nam->sa_len - offsetof(struct sockaddr_un, sun_path); |
| 9789 |
- if (len <= 0) |
| 9790 |
- return (EINVAL); |
| 9791 |
-Index: sys/compat/linux/linux_socket.c |
| 9792 |
-=================================================================== |
| 9793 |
---- sys/compat/linux/linux_socket.c (revision 225919) |
| 9794 |
-+++ sys/compat/linux/linux_socket.c (working copy) |
| 9795 |
-@@ -104,6 +104,7 @@ |
| 9796 |
- int oldv6size; |
| 9797 |
- struct sockaddr_in6 *sin6; |
| 9798 |
- #endif |
| 9799 |
-+ int namelen; |
| 9800 |
- |
| 9801 |
- if (*osalen < 2 || *osalen > UCHAR_MAX || !osa) |
| 9802 |
- return (EINVAL); |
| 9803 |
-@@ -166,6 +167,20 @@ |
| 9804 |
- } |
| 9805 |
- } |
| 9806 |
- |
| 9807 |
-+ if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) { |
| 9808 |
-+ for (namelen = 0; |
| 9809 |
-+ namelen < *osalen - offsetof(struct sockaddr_un, sun_path); |
| 9810 |
-+ namelen++) |
| 9811 |
-+ if (!((struct sockaddr_un *)kosa)->sun_path[namelen]) |
| 9812 |
-+ break; |
| 9813 |
-+ if (namelen + offsetof(struct sockaddr_un, sun_path) > |
| 9814 |
-+ sizeof(struct sockaddr_un)) { |
| 9815 |
-+ error = EINVAL; |
| 9816 |
-+ goto out; |
| 9817 |
-+ } |
| 9818 |
-+ alloclen = sizeof(struct sockaddr_un); |
| 9819 |
-+ } |
| 9820 |
-+ |
| 9821 |
- sa = (struct sockaddr *) kosa; |
| 9822 |
- sa->sa_family = bdom; |
| 9823 |
- sa->sa_len = alloclen; |
| 9824 |
|
| 9825 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch |
| 9826 |
deleted file mode 100644 |
| 9827 |
index 4824ff6..0000000 |
| 9828 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch |
| 9829 |
+++ /dev/null |
| 9830 |
@@ -1,32 +0,0 @@ |
| 9831 |
-Taken from debian GNU/kFreeBSD. |
| 9832 |
- |
| 9833 |
-Regretably, with GCC 4.4 or later this is the only flag combination |
| 9834 |
-I could find that doesn't cause kernel panics CPU triple-faults or |
| 9835 |
-other kind of severe breakage. This is Gentoo Bug #410945. |
| 9836 |
- |
| 9837 |
-Clang can use -O2, so we do not force -O1 on it |
| 9838 |
- |
| 9839 |
---- a/sys/conf/kern.pre.mk |
| 9840 |
-+++ b/sys/conf/kern.pre.mk |
| 9841 |
-@@ -41,6 +41,9 @@ |
| 9842 |
- .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing) |
| 9843 |
- COPTFLAGS+= -fno-strict-aliasing |
| 9844 |
- .endif |
| 9845 |
-+.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s]) |
| 9846 |
-+COPTFLAGS+= -O1 |
| 9847 |
-+.endif |
| 9848 |
- .if !defined(NO_CPU_COPTFLAGS) |
| 9849 |
- COPTFLAGS+= ${_CPUCFLAGS} |
| 9850 |
- .endif |
| 9851 |
---- a/sys/conf/kmod.mk |
| 9852 |
-+++ b/sys/conf/kmod.mk |
| 9853 |
-@@ -91,6 +91,9 @@ |
| 9854 |
- .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) |
| 9855 |
- CFLAGS+= -fno-strict-aliasing |
| 9856 |
- .endif |
| 9857 |
-+.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s]) |
| 9858 |
-+CFLAGS+= -O1 |
| 9859 |
-+.endif |
| 9860 |
- WERROR?= -Werror |
| 9861 |
- CFLAGS+= ${WERROR} |
| 9862 |
- CFLAGS+= -D_KERNEL |
| 9863 |
|
| 9864 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch |
| 9865 |
deleted file mode 100644 |
| 9866 |
index f0984f6..0000000 |
| 9867 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch |
| 9868 |
+++ /dev/null |
| 9869 |
@@ -1,128 +0,0 @@ |
| 9870 |
-Index: sys/netinet6/in6.c |
| 9871 |
-=================================================================== |
| 9872 |
---- sys/netinet6/in6.c.orig |
| 9873 |
-+++ sys/netinet6/in6.c |
| 9874 |
-@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa) |
| 9875 |
- } |
| 9876 |
- |
| 9877 |
- cleanup: |
| 9878 |
-+ if (ifa0 != NULL) |
| 9879 |
-+ ifa_free(ifa0); |
| 9880 |
- |
| 9881 |
- plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */ |
| 9882 |
- if ((ia->ia_flags & IFA_ROUTE) && plen == 128) { |
| 9883 |
-@@ -1393,8 +1395,6 @@ cleanup: |
| 9884 |
- return; |
| 9885 |
- ia->ia_flags &= ~IFA_ROUTE; |
| 9886 |
- } |
| 9887 |
-- if (ifa0 != NULL) |
| 9888 |
-- ifa_free(ifa0); |
| 9889 |
- |
| 9890 |
- in6_unlink_ifa(ia, ifp); |
| 9891 |
- } |
| 9892 |
-@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c |
| 9893 |
- hostid = IFA_IN6(ifa); |
| 9894 |
- |
| 9895 |
- /* prefixlen must be <= 64. */ |
| 9896 |
-- if (64 < iflr->prefixlen) |
| 9897 |
-+ if (64 < iflr->prefixlen) { |
| 9898 |
-+ if (ifa != NULL) |
| 9899 |
-+ ifa_free(ifa); |
| 9900 |
- return EINVAL; |
| 9901 |
-+ } |
| 9902 |
- prefixlen = iflr->prefixlen; |
| 9903 |
- |
| 9904 |
- /* hostid part must be zero. */ |
| 9905 |
- sin6 = (struct sockaddr_in6 *)&iflr->addr; |
| 9906 |
- if (sin6->sin6_addr.s6_addr32[2] != 0 || |
| 9907 |
- sin6->sin6_addr.s6_addr32[3] != 0) { |
| 9908 |
-+ if (ifa != NULL) |
| 9909 |
-+ ifa_free(ifa); |
| 9910 |
- return EINVAL; |
| 9911 |
- } |
| 9912 |
- } else |
| 9913 |
-@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr |
| 9914 |
- IN6_IFADDR_RUNLOCK(); |
| 9915 |
- return (struct in6_ifaddr *)ifa; |
| 9916 |
- } |
| 9917 |
-- IN6_IFADDR_RUNLOCK(); |
| 9918 |
- |
| 9919 |
- /* use the last-resort values, that are, deprecated addresses */ |
| 9920 |
-- if (dep[0]) |
| 9921 |
-+ if (dep[0]) { |
| 9922 |
-+ ifa_ref((struct ifaddr *)dep[0]); |
| 9923 |
-+ IN6_IFADDR_RUNLOCK(); |
| 9924 |
- return dep[0]; |
| 9925 |
-- if (dep[1]) |
| 9926 |
-+ } |
| 9927 |
-+ if (dep[1]) { |
| 9928 |
-+ ifa_ref((struct ifaddr *)dep[1]); |
| 9929 |
-+ IN6_IFADDR_RUNLOCK(); |
| 9930 |
- return dep[1]; |
| 9931 |
-+ } |
| 9932 |
- |
| 9933 |
-+ IN6_IFADDR_RUNLOCK(); |
| 9934 |
- return NULL; |
| 9935 |
- } |
| 9936 |
- |
| 9937 |
-Index: sys/netinet6/ip6_input.c |
| 9938 |
-=================================================================== |
| 9939 |
---- sys/netinet6/ip6_input.c.orig |
| 9940 |
-+++ sys/netinet6/ip6_input.c |
| 9941 |
-@@ -879,19 +879,23 @@ passin: |
| 9942 |
- * as our interface address (e.g. multicast addresses, addresses |
| 9943 |
- * within FAITH prefixes and such). |
| 9944 |
- */ |
| 9945 |
-- if (deliverifp && !ip6_getdstifaddr(m)) { |
| 9946 |
-+ if (deliverifp) { |
| 9947 |
- struct in6_ifaddr *ia6; |
| 9948 |
- |
| 9949 |
-- ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); |
| 9950 |
-- if (ia6) { |
| 9951 |
-- if (!ip6_setdstifaddr(m, ia6)) { |
| 9952 |
-- /* |
| 9953 |
-- * XXX maybe we should drop the packet here, |
| 9954 |
-- * as we could not provide enough information |
| 9955 |
-- * to the upper layers. |
| 9956 |
-- */ |
| 9957 |
-+ if ((ia6 = ip6_getdstifaddr(m)) != NULL) { |
| 9958 |
-+ ifa_free(&ia6->ia_ifa); |
| 9959 |
-+ } else { |
| 9960 |
-+ ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); |
| 9961 |
-+ if (ia6) { |
| 9962 |
-+ if (!ip6_setdstifaddr(m, ia6)) { |
| 9963 |
-+ /* |
| 9964 |
-+ * XXX maybe we should drop the packet here, |
| 9965 |
-+ * as we could not provide enough information |
| 9966 |
-+ * to the upper layers. |
| 9967 |
-+ */ |
| 9968 |
-+ } |
| 9969 |
-+ ifa_free(&ia6->ia_ifa); |
| 9970 |
- } |
| 9971 |
-- ifa_free(&ia6->ia_ifa); |
| 9972 |
- } |
| 9973 |
- } |
| 9974 |
- |
| 9975 |
-Index: sys/netinet/tcp_input.c |
| 9976 |
-=================================================================== |
| 9977 |
---- sys/netinet/tcp_input.c.orig |
| 9978 |
-+++ sys/netinet/tcp_input.c |
| 9979 |
-@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto) |
| 9980 |
- (caddr_t)&ip6->ip6_dst - (caddr_t)ip6); |
| 9981 |
- return IPPROTO_DONE; |
| 9982 |
- } |
| 9983 |
-+ if (ia6) |
| 9984 |
-+ ifa_free(&ia6->ia_ifa); |
| 9985 |
- |
| 9986 |
- tcp_input(m, *offp); |
| 9987 |
- return IPPROTO_DONE; |
| 9988 |
-@@ -1240,7 +1242,8 @@ relocked: |
| 9989 |
- rstreason = BANDLIM_RST_OPENPORT; |
| 9990 |
- goto dropwithreset; |
| 9991 |
- } |
| 9992 |
-- ifa_free(&ia6->ia_ifa); |
| 9993 |
-+ if (ia6) |
| 9994 |
-+ ifa_free(&ia6->ia_ifa); |
| 9995 |
- } |
| 9996 |
- #endif /* INET6 */ |
| 9997 |
- /* |
| 9998 |
|
| 9999 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch |
| 10000 |
deleted file mode 100644 |
| 10001 |
index 751a77c..0000000 |
| 10002 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch |
| 10003 |
+++ /dev/null |
| 10004 |
@@ -1,13 +0,0 @@ |
| 10005 |
-u_int is defined in sys/types.h |
| 10006 |
-makes header usable alone. |
| 10007 |
- |
| 10008 |
---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400 |
| 10009 |
-+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400 |
| 10010 |
-@@ -788,6 +788,7 @@ |
| 10011 |
- struct sysctl_req *); |
| 10012 |
- #else /* !_KERNEL */ |
| 10013 |
- #include <sys/cdefs.h> |
| 10014 |
-+#include <sys/types.h> /* for u_int */ |
| 10015 |
- |
| 10016 |
- __BEGIN_DECLS |
| 10017 |
- int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); |
| 10018 |
|
| 10019 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch |
| 10020 |
deleted file mode 100644 |
| 10021 |
index 697984b..0000000 |
| 10022 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch |
| 10023 |
+++ /dev/null |
| 10024 |
@@ -1,65 +0,0 @@ |
| 10025 |
-Index: sys/dev/ciss/ciss.c |
| 10026 |
-=================================================================== |
| 10027 |
---- sys/dev/ciss/ciss.c (revision 264510) |
| 10028 |
-+++ sys/dev/ciss/ciss.c (revision 264511) |
| 10029 |
-@@ -180,8 +180,6 @@ |
| 10030 |
- static void ciss_cam_poll(struct cam_sim *sim); |
| 10031 |
- static void ciss_cam_complete(struct ciss_request *cr); |
| 10032 |
- static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio); |
| 10033 |
--static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, |
| 10034 |
-- int bus, int target); |
| 10035 |
- static int ciss_name_device(struct ciss_softc *sc, int bus, int target); |
| 10036 |
- |
| 10037 |
- /* periodic status monitoring */ |
| 10038 |
-@@ -3398,27 +3396,6 @@ |
| 10039 |
- |
| 10040 |
- |
| 10041 |
- /******************************************************************************** |
| 10042 |
-- * Find a peripheral attached at (target) |
| 10043 |
-- */ |
| 10044 |
--static struct cam_periph * |
| 10045 |
--ciss_find_periph(struct ciss_softc *sc, int bus, int target) |
| 10046 |
--{ |
| 10047 |
-- struct cam_periph *periph; |
| 10048 |
-- struct cam_path *path; |
| 10049 |
-- int status; |
| 10050 |
-- |
| 10051 |
-- status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), |
| 10052 |
-- target, 0); |
| 10053 |
-- if (status == CAM_REQ_CMP) { |
| 10054 |
-- periph = cam_periph_find(path, NULL); |
| 10055 |
-- xpt_free_path(path); |
| 10056 |
-- } else { |
| 10057 |
-- periph = NULL; |
| 10058 |
-- } |
| 10059 |
-- return(periph); |
| 10060 |
--} |
| 10061 |
-- |
| 10062 |
--/******************************************************************************** |
| 10063 |
- * Name the device at (target) |
| 10064 |
- * |
| 10065 |
- * XXX is this strictly correct? |
| 10066 |
-@@ -3427,12 +3404,22 @@ |
| 10067 |
- ciss_name_device(struct ciss_softc *sc, int bus, int target) |
| 10068 |
- { |
| 10069 |
- struct cam_periph *periph; |
| 10070 |
-+ struct cam_path *path; |
| 10071 |
-+ int status; |
| 10072 |
- |
| 10073 |
- if (CISS_IS_PHYSICAL(bus)) |
| 10074 |
- return (0); |
| 10075 |
-- if ((periph = ciss_find_periph(sc, bus, target)) != NULL) { |
| 10076 |
-+ |
| 10077 |
-+ status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), |
| 10078 |
-+ target, 0); |
| 10079 |
-+ |
| 10080 |
-+ if (status == CAM_REQ_CMP) { |
| 10081 |
-+ mtx_lock(&sc->ciss_mtx); |
| 10082 |
-+ periph = cam_periph_find(path, NULL); |
| 10083 |
- sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d", |
| 10084 |
- periph->periph_name, periph->unit_number); |
| 10085 |
-+ mtx_unlock(&sc->ciss_mtx); |
| 10086 |
-+ xpt_free_path(path); |
| 10087 |
- return(0); |
| 10088 |
- } |
| 10089 |
- sc->ciss_logical[bus][target].cl_name[0] = 0; |
| 10090 |
|
| 10091 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch |
| 10092 |
deleted file mode 100644 |
| 10093 |
index 23f68ed..0000000 |
| 10094 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch |
| 10095 |
+++ /dev/null |
| 10096 |
@@ -1,26 +0,0 @@ |
| 10097 |
-Index: sys/netinet/in_mcast.c |
| 10098 |
-=================================================================== |
| 10099 |
---- sys/netinet/in_mcast.c (revision 254252) |
| 10100 |
-+++ sys/netinet/in_mcast.c (working copy) |
| 10101 |
-@@ -1648,6 +1648,8 @@ |
| 10102 |
- * has asked for, but we always tell userland how big the |
| 10103 |
- * buffer really needs to be. |
| 10104 |
- */ |
| 10105 |
-+ if (msfr.msfr_nsrcs > in_mcast_maxsocksrc) |
| 10106 |
-+ msfr.msfr_nsrcs = in_mcast_maxsocksrc; |
| 10107 |
- tss = NULL; |
| 10108 |
- if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) { |
| 10109 |
- tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, |
| 10110 |
-Index: sys/netinet6/in6_mcast.c |
| 10111 |
-=================================================================== |
| 10112 |
---- sys/netinet6/in6_mcast.c (revision 254252) |
| 10113 |
-+++ sys/netinet6/in6_mcast.c (working copy) |
| 10114 |
-@@ -1625,6 +1625,8 @@ |
| 10115 |
- * has asked for, but we always tell userland how big the |
| 10116 |
- * buffer really needs to be. |
| 10117 |
- */ |
| 10118 |
-+ if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc) |
| 10119 |
-+ msfr.msfr_nsrcs = in6_mcast_maxsocksrc; |
| 10120 |
- tss = NULL; |
| 10121 |
- if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) { |
| 10122 |
- tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs, |
| 10123 |
|
| 10124 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch |
| 10125 |
deleted file mode 100644 |
| 10126 |
index 0d1a894..0000000 |
| 10127 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch |
| 10128 |
+++ /dev/null |
| 10129 |
@@ -1,13 +0,0 @@ |
| 10130 |
-Index: sys/fs/nfsserver/nfs_nfsdport.c |
| 10131 |
-=================================================================== |
| 10132 |
---- sys/fs/nfsserver/nfs_nfsdport.c (revision 249651) |
| 10133 |
-+++ sys/fs/nfsserver/nfs_nfsdport.c (working copy) |
| 10134 |
-@@ -1568,6 +1568,8 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdg |
| 10135 |
- nd->nd_repstat = NFSERR_BAD_COOKIE; |
| 10136 |
- #endif |
| 10137 |
- } |
| 10138 |
-+ if (!nd->nd_repstat && vp->v_type != VDIR) |
| 10139 |
-+ nd->nd_repstat = NFSERR_NOTDIR; |
| 10140 |
- if (nd->nd_repstat == 0 && cnt == 0) { |
| 10141 |
- if (nd->nd_flag & ND_NFSV2) |
| 10142 |
- /* NFSv2 does not have NFSERR_TOOSMALL */ |
| 10143 |
|
| 10144 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch |
| 10145 |
deleted file mode 100644 |
| 10146 |
index e6710e3..0000000 |
| 10147 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch |
| 10148 |
+++ /dev/null |
| 10149 |
@@ -1,19 +0,0 @@ |
| 10150 |
-Index: sys/netinet/sctp_output.c |
| 10151 |
-=================================================================== |
| 10152 |
---- sys/netinet/sctp_output.c (revision 254337) |
| 10153 |
-+++ sys/netinet/sctp_output.c (revision 254338) |
| 10154 |
-@@ -5406,6 +5406,14 @@ |
| 10155 |
- } |
| 10156 |
- SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk); |
| 10157 |
- |
| 10158 |
-+ /* |
| 10159 |
-+ * We might not overwrite the identification[] completely and on |
| 10160 |
-+ * some platforms time_entered will contain some padding. Therefore |
| 10161 |
-+ * zero out the cookie to avoid putting uninitialized memory on the |
| 10162 |
-+ * wire. |
| 10163 |
-+ */ |
| 10164 |
-+ memset(&stc, 0, sizeof(struct sctp_state_cookie)); |
| 10165 |
-+ |
| 10166 |
- /* the time I built cookie */ |
| 10167 |
- (void)SCTP_GETTIME_TIMEVAL(&stc.time_entered); |
| 10168 |
- |
| 10169 |
|
| 10170 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch |
| 10171 |
deleted file mode 100644 |
| 10172 |
index 9aef150..0000000 |
| 10173 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch |
| 10174 |
+++ /dev/null |
| 10175 |
@@ -1,89 +0,0 @@ |
| 10176 |
-Index: sys/net/if.c |
| 10177 |
-=================================================================== |
| 10178 |
---- sys/net/if.c (revision 254941) |
| 10179 |
-+++ sys/net/if.c (working copy) |
| 10180 |
-@@ -2553,11 +2553,23 @@ |
| 10181 |
- CURVNET_RESTORE(); |
| 10182 |
- return (EOPNOTSUPP); |
| 10183 |
- } |
| 10184 |
-+ |
| 10185 |
-+ /* |
| 10186 |
-+ * Pass the request on to the socket control method, and if the |
| 10187 |
-+ * latter returns EOPNOTSUPP, directly to the interface. |
| 10188 |
-+ * |
| 10189 |
-+ * Make an exception for the legacy SIOCSIF* requests. Drivers |
| 10190 |
-+ * trust SIOCSIFADDR et al to come from an already privileged |
| 10191 |
-+ * layer, and do not perform any credentials checks or input |
| 10192 |
-+ * validation. |
| 10193 |
-+ */ |
| 10194 |
- #ifndef COMPAT_43 |
| 10195 |
- error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd, |
| 10196 |
- data, |
| 10197 |
- ifp, td)); |
| 10198 |
-- if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL) |
| 10199 |
-+ if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL && |
| 10200 |
-+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR && |
| 10201 |
-+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK) |
| 10202 |
- error = (*ifp->if_ioctl)(ifp, cmd, data); |
| 10203 |
- #else |
| 10204 |
- { |
| 10205 |
-@@ -2601,7 +2613,9 @@ |
| 10206 |
- data, |
| 10207 |
- ifp, td)); |
| 10208 |
- if (error == EOPNOTSUPP && ifp != NULL && |
| 10209 |
-- ifp->if_ioctl != NULL) |
| 10210 |
-+ ifp->if_ioctl != NULL && |
| 10211 |
-+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR && |
| 10212 |
-+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK) |
| 10213 |
- error = (*ifp->if_ioctl)(ifp, cmd, data); |
| 10214 |
- switch (ocmd) { |
| 10215 |
- |
| 10216 |
-Index: sys/netinet6/in6.c |
| 10217 |
-=================================================================== |
| 10218 |
---- sys/netinet6/in6.c (revision 254941) |
| 10219 |
-+++ sys/netinet6/in6.c (working copy) |
| 10220 |
-@@ -431,6 +431,18 @@ |
| 10221 |
- case SIOCGIFSTAT_ICMP6: |
| 10222 |
- sa6 = &ifr->ifr_addr; |
| 10223 |
- break; |
| 10224 |
-+ case SIOCSIFADDR: |
| 10225 |
-+ case SIOCSIFBRDADDR: |
| 10226 |
-+ case SIOCSIFDSTADDR: |
| 10227 |
-+ case SIOCSIFNETMASK: |
| 10228 |
-+ /* |
| 10229 |
-+ * Although we should pass any non-INET6 ioctl requests |
| 10230 |
-+ * down to driver, we filter some legacy INET requests. |
| 10231 |
-+ * Drivers trust SIOCSIFADDR et al to come from an already |
| 10232 |
-+ * privileged layer, and do not perform any credentials |
| 10233 |
-+ * checks or input validation. |
| 10234 |
-+ */ |
| 10235 |
-+ return (EINVAL); |
| 10236 |
- default: |
| 10237 |
- sa6 = NULL; |
| 10238 |
- break; |
| 10239 |
-Index: sys/netnatm/natm.c |
| 10240 |
-=================================================================== |
| 10241 |
---- sys/netnatm/natm.c (revision 254941) |
| 10242 |
-+++ sys/netnatm/natm.c (working copy) |
| 10243 |
-@@ -339,6 +339,21 @@ |
| 10244 |
- npcb = (struct natmpcb *)so->so_pcb; |
| 10245 |
- KASSERT(npcb != NULL, ("natm_usr_control: npcb == NULL")); |
| 10246 |
- |
| 10247 |
-+ switch (cmd) { |
| 10248 |
-+ case SIOCSIFADDR: |
| 10249 |
-+ case SIOCSIFBRDADDR: |
| 10250 |
-+ case SIOCSIFDSTADDR: |
| 10251 |
-+ case SIOCSIFNETMASK: |
| 10252 |
-+ /* |
| 10253 |
-+ * Although we should pass any non-ATM ioctl requests |
| 10254 |
-+ * down to driver, we filter some legacy INET requests. |
| 10255 |
-+ * Drivers trust SIOCSIFADDR et al to come from an already |
| 10256 |
-+ * privileged layer, and do not perform any credentials |
| 10257 |
-+ * checks or input validation. |
| 10258 |
-+ */ |
| 10259 |
-+ return (EINVAL); |
| 10260 |
-+ } |
| 10261 |
-+ |
| 10262 |
- if (ifp == NULL || ifp->if_ioctl == NULL) |
| 10263 |
- return (EOPNOTSUPP); |
| 10264 |
- return ((*ifp->if_ioctl)(ifp, cmd, arg)); |
| 10265 |
|
| 10266 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch |
| 10267 |
deleted file mode 100644 |
| 10268 |
index 83f30e8..0000000 |
| 10269 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch |
| 10270 |
+++ /dev/null |
| 10271 |
@@ -1,28 +0,0 @@ |
| 10272 |
-Index: sys/fs/nullfs/null_vnops.c |
| 10273 |
-=================================================================== |
| 10274 |
---- sys/fs/nullfs/null_vnops.c (revision 254941) |
| 10275 |
-+++ sys/fs/nullfs/null_vnops.c (working copy) |
| 10276 |
-@@ -858,6 +858,15 @@ |
| 10277 |
- return (error); |
| 10278 |
- } |
| 10279 |
- |
| 10280 |
-+static int |
| 10281 |
-+null_link(struct vop_link_args *ap) |
| 10282 |
-+{ |
| 10283 |
-+ |
| 10284 |
-+ if (ap->a_tdvp->v_mount != ap->a_vp->v_mount) |
| 10285 |
-+ return (EXDEV); |
| 10286 |
-+ return (null_bypass((struct vop_generic_args *)ap)); |
| 10287 |
-+} |
| 10288 |
-+ |
| 10289 |
- /* |
| 10290 |
- * Global vfs data structures |
| 10291 |
- */ |
| 10292 |
-@@ -871,6 +880,7 @@ |
| 10293 |
- .vop_getwritemount = null_getwritemount, |
| 10294 |
- .vop_inactive = null_inactive, |
| 10295 |
- .vop_islocked = vop_stdislocked, |
| 10296 |
-+ .vop_link = null_link, |
| 10297 |
- .vop_lock1 = null_lock, |
| 10298 |
- .vop_lookup = null_lookup, |
| 10299 |
- .vop_open = null_open, |
| 10300 |
|
| 10301 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch |
| 10302 |
deleted file mode 100644 |
| 10303 |
index fe9e97e..0000000 |
| 10304 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch |
| 10305 |
+++ /dev/null |
| 10306 |
@@ -1,70 +0,0 @@ |
| 10307 |
-Index: sys/fs/nfsserver/nfs_nfsdserv.c |
| 10308 |
-=================================================================== |
| 10309 |
---- sys/fs/nfsserver/nfs_nfsdserv.c (revision 264251) |
| 10310 |
-+++ sys/fs/nfsserver/nfs_nfsdserv.c (working copy) |
| 10311 |
-@@ -1457,10 +1457,23 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr |
| 10312 |
- nfsvno_relpathbuf(&fromnd); |
| 10313 |
- goto out; |
| 10314 |
- } |
| 10315 |
-+ /* |
| 10316 |
-+ * Unlock dp in this code section, so it is unlocked before |
| 10317 |
-+ * tdp gets locked. This avoids a potential LOR if tdp is the |
| 10318 |
-+ * parent directory of dp. |
| 10319 |
-+ */ |
| 10320 |
- if (nd->nd_flag & ND_NFSV4) { |
| 10321 |
- tdp = todp; |
| 10322 |
- tnes = *toexp; |
| 10323 |
-- tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, p, 0); |
| 10324 |
-+ if (dp != tdp) { |
| 10325 |
-+ NFSVOPUNLOCK(dp, 0); |
| 10326 |
-+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, |
| 10327 |
-+ p, 0); /* Might lock tdp. */ |
| 10328 |
-+ } else { |
| 10329 |
-+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, |
| 10330 |
-+ p, 1); |
| 10331 |
-+ NFSVOPUNLOCK(dp, 0); |
| 10332 |
-+ } |
| 10333 |
- } else { |
| 10334 |
- tfh.nfsrvfh_len = 0; |
| 10335 |
- error = nfsrv_mtofh(nd, &tfh); |
| 10336 |
-@@ -1481,10 +1494,12 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr |
| 10337 |
- tnes = *exp; |
| 10338 |
- tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, |
| 10339 |
- p, 1); |
| 10340 |
-+ NFSVOPUNLOCK(dp, 0); |
| 10341 |
- } else { |
| 10342 |
-+ NFSVOPUNLOCK(dp, 0); |
| 10343 |
- nd->nd_cred->cr_uid = nd->nd_saveduid; |
| 10344 |
- nfsd_fhtovp(nd, &tfh, LK_EXCLUSIVE, &tdp, &tnes, NULL, |
| 10345 |
-- 0, p); |
| 10346 |
-+ 0, p); /* Locks tdp. */ |
| 10347 |
- if (tdp) { |
| 10348 |
- tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, |
| 10349 |
- nd->nd_cred, p, 1); |
| 10350 |
-@@ -1499,7 +1514,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr |
| 10351 |
- if (error) { |
| 10352 |
- if (tdp) |
| 10353 |
- vrele(tdp); |
| 10354 |
-- vput(dp); |
| 10355 |
-+ vrele(dp); |
| 10356 |
- nfsvno_relpathbuf(&fromnd); |
| 10357 |
- nfsvno_relpathbuf(&tond); |
| 10358 |
- goto out; |
| 10359 |
-@@ -1514,7 +1529,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr |
| 10360 |
- } |
| 10361 |
- if (tdp) |
| 10362 |
- vrele(tdp); |
| 10363 |
-- vput(dp); |
| 10364 |
-+ vrele(dp); |
| 10365 |
- nfsvno_relpathbuf(&fromnd); |
| 10366 |
- nfsvno_relpathbuf(&tond); |
| 10367 |
- goto out; |
| 10368 |
-@@ -1523,7 +1538,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr |
| 10369 |
- /* |
| 10370 |
- * Done parsing, now down to business. |
| 10371 |
- */ |
| 10372 |
-- nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp); |
| 10373 |
-+ nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, p, &fdirp); |
| 10374 |
- if (nd->nd_repstat) { |
| 10375 |
- if (nd->nd_flag & ND_NFSV3) { |
| 10376 |
- nfsrv_wcc(nd, fdirfor_ret, &fdirfor, fdiraft_ret, |
| 10377 |
|
| 10378 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch |
| 10379 |
deleted file mode 100644 |
| 10380 |
index c36bed5..0000000 |
| 10381 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch |
| 10382 |
+++ /dev/null |
| 10383 |
@@ -1,66 +0,0 @@ |
| 10384 |
-Index: sys/kern/kern_exec.c |
| 10385 |
-=================================================================== |
| 10386 |
---- sys/kern/kern_exec.c (revision 266979) |
| 10387 |
-+++ sys/kern/kern_exec.c (working copy) |
| 10388 |
-@@ -280,6 +280,7 @@ kern_execve(td, args, mac_p) |
| 10389 |
- struct mac *mac_p; |
| 10390 |
- { |
| 10391 |
- struct proc *p = td->td_proc; |
| 10392 |
-+ struct vmspace *oldvmspace; |
| 10393 |
- int error; |
| 10394 |
- |
| 10395 |
- AUDIT_ARG_ARGV(args->begin_argv, args->argc, |
| 10396 |
-@@ -296,6 +297,8 @@ kern_execve(td, args, mac_p) |
| 10397 |
- PROC_UNLOCK(p); |
| 10398 |
- } |
| 10399 |
- |
| 10400 |
-+ KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve")); |
| 10401 |
-+ oldvmspace = td->td_proc->p_vmspace; |
| 10402 |
- error = do_execve(td, args, mac_p); |
| 10403 |
- |
| 10404 |
- if (p->p_flag & P_HADTHREADS) { |
| 10405 |
-@@ -310,6 +313,12 @@ kern_execve(td, args, mac_p) |
| 10406 |
- thread_single_end(); |
| 10407 |
- PROC_UNLOCK(p); |
| 10408 |
- } |
| 10409 |
-+ if ((td->td_pflags & TDP_EXECVMSPC) != 0) { |
| 10410 |
-+ KASSERT(td->td_proc->p_vmspace != oldvmspace, |
| 10411 |
-+ ("oldvmspace still used")); |
| 10412 |
-+ vmspace_free(oldvmspace); |
| 10413 |
-+ td->td_pflags &= ~TDP_EXECVMSPC; |
| 10414 |
-+ } |
| 10415 |
- |
| 10416 |
- return (error); |
| 10417 |
- } |
| 10418 |
-Index: sys/sys/proc.h |
| 10419 |
-=================================================================== |
| 10420 |
---- sys/sys/proc.h (revision 266979) |
| 10421 |
-+++ sys/sys/proc.h (working copy) |
| 10422 |
-@@ -968,4 +968,5 @@ curthread_pflags_restore(int save) |
| 10423 |
- |
| 10424 |
- #endif /* _KERNEL */ |
| 10425 |
- |
| 10426 |
-+#define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */ |
| 10427 |
- #endif /* !_SYS_PROC_H_ */ |
| 10428 |
-Index: sys/vm/vm_map.c |
| 10429 |
-=================================================================== |
| 10430 |
---- sys/vm/vm_map.c (revision 266979) |
| 10431 |
-+++ sys/vm/vm_map.c (working copy) |
| 10432 |
-@@ -3631,6 +3631,8 @@ vmspace_exec(struct proc *p, vm_offset_t minuser, |
| 10433 |
- struct vmspace *oldvmspace = p->p_vmspace; |
| 10434 |
- struct vmspace *newvmspace; |
| 10435 |
- |
| 10436 |
-+ KASSERT((curthread->td_pflags & TDP_EXECVMSPC) == 0, |
| 10437 |
-+ ("vmspace_exec recursed")); |
| 10438 |
- newvmspace = vmspace_alloc(minuser, maxuser); |
| 10439 |
- if (newvmspace == NULL) |
| 10440 |
- return (ENOMEM); |
| 10441 |
-@@ -3647,7 +3649,7 @@ vmspace_exec(struct proc *p, vm_offset_t minuser, |
| 10442 |
- PROC_VMSPACE_UNLOCK(p); |
| 10443 |
- if (p == curthread->td_proc) |
| 10444 |
- pmap_activate(curthread); |
| 10445 |
-- vmspace_free(oldvmspace); |
| 10446 |
-+ curthread->td_pflags |= TDP_EXECVMSPC; |
| 10447 |
- return (0); |
| 10448 |
- } |
| 10449 |
- |
| 10450 |
|
| 10451 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch |
| 10452 |
deleted file mode 100644 |
| 10453 |
index b02d8b6..0000000 |
| 10454 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch |
| 10455 |
+++ /dev/null |
| 10456 |
@@ -1,21 +0,0 @@ |
| 10457 |
-diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk |
| 10458 |
---- sys.orig/conf/kern.mk 2012-07-12 13:26:37.000000000 +0900 |
| 10459 |
-+++ sys/conf/kern.mk 2012-07-16 02:32:19.000000000 +0900 |
| 10460 |
-@@ -5,7 +5,7 @@ |
| 10461 |
- # |
| 10462 |
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ |
| 10463 |
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ |
| 10464 |
-- -Wundef -Wno-pointer-sign -fformat-extensions \ |
| 10465 |
-+ -Wundef -Wno-pointer-sign \ |
| 10466 |
- -Wmissing-include-dirs -fdiagnostics-show-option \ |
| 10467 |
- ${CWARNEXTRA} |
| 10468 |
- # |
| 10469 |
-@@ -52,7 +52,7 @@ |
| 10470 |
- # |
| 10471 |
- .if ${MACHINE_CPUARCH} == "i386" |
| 10472 |
- .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang" |
| 10473 |
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 |
| 10474 |
-+CFLAGS+= -mpreferred-stack-boundary=2 |
| 10475 |
- .else |
| 10476 |
- CFLAGS+= -mno-aes -mno-avx |
| 10477 |
- .endif |
| 10478 |
|
| 10479 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch |
| 10480 |
deleted file mode 100644 |
| 10481 |
index 0fb6df7..0000000 |
| 10482 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch |
| 10483 |
+++ /dev/null |
| 10484 |
@@ -1,12 +0,0 @@ |
| 10485 |
-Index: sys/kern/kern_ktrace.c |
| 10486 |
-=================================================================== |
| 10487 |
---- sys/kern/kern_ktrace.c (revision 266771) |
| 10488 |
-+++ sys/kern/kern_ktrace.c (working copy) |
| 10489 |
-@@ -119,6 +119,7 @@ static int data_lengths[] = { |
| 10490 |
- 0, /* KTR_SYSCTL */ |
| 10491 |
- sizeof(struct ktr_proc_ctor), /* KTR_PROCCTOR */ |
| 10492 |
- 0, /* KTR_PROCDTOR */ |
| 10493 |
-+ 0, /* unused */ |
| 10494 |
- sizeof(struct ktr_fault), /* KTR_FAULT */ |
| 10495 |
- sizeof(struct ktr_faultend), /* KTR_FAULTEND */ |
| 10496 |
- }; |
| 10497 |
|
| 10498 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch |
| 10499 |
deleted file mode 100644 |
| 10500 |
index fd4040a..0000000 |
| 10501 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch |
| 10502 |
+++ /dev/null |
| 10503 |
@@ -1,20 +0,0 @@ |
| 10504 |
-Index: sys/vm/vm_map.c |
| 10505 |
-=================================================================== |
| 10506 |
---- sys/vm/vm_map.c (revision 259950) |
| 10507 |
-+++ sys/vm/vm_map.c (revision 259951) |
| 10508 |
-@@ -1207,6 +1207,7 @@ charged: |
| 10509 |
- } |
| 10510 |
- else if ((prev_entry != &map->header) && |
| 10511 |
- (prev_entry->eflags == protoeflags) && |
| 10512 |
-+ (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 && |
| 10513 |
- (prev_entry->end == start) && |
| 10514 |
- (prev_entry->wired_count == 0) && |
| 10515 |
- (prev_entry->cred == cred || |
| 10516 |
-@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm |
| 10517 |
- * NOTE: We explicitly allow bi-directional stacks. |
| 10518 |
- */ |
| 10519 |
- orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP); |
| 10520 |
-- cow &= ~orient; |
| 10521 |
- KASSERT(orient != 0, ("No stack grow direction")); |
| 10522 |
- |
| 10523 |
- if (addrbos < vm_map_min(map) || |
| 10524 |
|
| 10525 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch |
| 10526 |
deleted file mode 100644 |
| 10527 |
index ef2d0a7..0000000 |
| 10528 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch |
| 10529 |
+++ /dev/null |
| 10530 |
@@ -1,20 +0,0 @@ |
| 10531 |
-http://www.freebsd.org/security/advisories/FreeBSD-SA-13:06.mmap.asc |
| 10532 |
-https://bugs.gentoo.org/show_bug.cgi?id=473688 |
| 10533 |
- |
| 10534 |
-Index: sys/vm/vm_map.c |
| 10535 |
-=================================================================== |
| 10536 |
---- sys/vm/vm_map.c (revision 251636) |
| 10537 |
-+++ sys/vm/vm_map.c (working copy) |
| 10538 |
-@@ -3761,6 +3761,12 @@ RetryLookup:; |
| 10539 |
- vm_map_unlock_read(map); |
| 10540 |
- return (KERN_PROTECTION_FAILURE); |
| 10541 |
- } |
| 10542 |
-+ if ((fault_typea & VM_PROT_COPY) != 0 && |
| 10543 |
-+ (entry->max_protection & VM_PROT_WRITE) == 0 && |
| 10544 |
-+ (entry->eflags & MAP_ENTRY_COW) == 0) { |
| 10545 |
-+ vm_map_unlock_read(map); |
| 10546 |
-+ return (KERN_PROTECTION_FAILURE); |
| 10547 |
-+ } |
| 10548 |
- |
| 10549 |
- /* |
| 10550 |
- * If this page is not pageable, we have to get it for all possible |
| 10551 |
|
| 10552 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch |
| 10553 |
deleted file mode 100644 |
| 10554 |
index 767588f..0000000 |
| 10555 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch |
| 10556 |
+++ /dev/null |
| 10557 |
@@ -1,16 +0,0 @@ |
| 10558 |
-http://www.freebsd.org/security/advisories/FreeBSD-SA-13:08.nfsserver.asc |
| 10559 |
-https://bugs.gentoo.org/show_bug.cgi?id=478314 |
| 10560 |
- |
| 10561 |
-Index: sys/kern/vfs_export.c |
| 10562 |
-=================================================================== |
| 10563 |
---- sys/kern/vfs_export.c (revision 253367) |
| 10564 |
-+++ sys/kern/vfs_export.c (working copy) |
| 10565 |
-@@ -208,7 +208,7 @@ |
| 10566 |
- np->netc_anon = crget(); |
| 10567 |
- np->netc_anon->cr_uid = argp->ex_anon.cr_uid; |
| 10568 |
- crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups, |
| 10569 |
-- np->netc_anon->cr_groups); |
| 10570 |
-+ argp->ex_anon.cr_groups); |
| 10571 |
- np->netc_anon->cr_prison = &prison0; |
| 10572 |
- prison_hold(np->netc_anon->cr_prison); |
| 10573 |
- np->netc_numsecflavors = argp->ex_numsecflavors; |
| 10574 |
|
| 10575 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch |
| 10576 |
deleted file mode 100644 |
| 10577 |
index bb3caba..0000000 |
| 10578 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch |
| 10579 |
+++ /dev/null |
| 10580 |
@@ -1,27 +0,0 @@ |
| 10581 |
-Index: sys/dev/random/probe.c |
| 10582 |
-=================================================================== |
| 10583 |
---- sys/dev/random/probe.c (revision 260523) |
| 10584 |
-+++ sys/dev/random/probe.c (working copy) |
| 10585 |
-@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$"); |
| 10586 |
- |
| 10587 |
- #include <sys/types.h> |
| 10588 |
- #include <sys/param.h> |
| 10589 |
-+#include <sys/systm.h> |
| 10590 |
-+#include <sys/kernel.h> |
| 10591 |
- #include <sys/malloc.h> |
| 10592 |
- #include <sys/random.h> |
| 10593 |
- #include <sys/selinfo.h> |
| 10594 |
-@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat |
| 10595 |
- /* Then go looking for hardware */ |
| 10596 |
- #if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) |
| 10597 |
- if (via_feature_rng & VIA_HAS_RNG) { |
| 10598 |
-- *systat = random_nehemiah; |
| 10599 |
-+ int enable; |
| 10600 |
-+ |
| 10601 |
-+ enable = 0; |
| 10602 |
-+ TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable); |
| 10603 |
-+ if (enable) |
| 10604 |
-+ *systat = random_nehemiah; |
| 10605 |
- } |
| 10606 |
- #endif |
| 10607 |
- } |
| 10608 |
|
| 10609 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch |
| 10610 |
deleted file mode 100644 |
| 10611 |
index 2f82a5f..0000000 |
| 10612 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch |
| 10613 |
+++ /dev/null |
| 10614 |
@@ -1,32 +0,0 @@ |
| 10615 |
-Index: sys/netinet/tcp_reass.c |
| 10616 |
-=================================================================== |
| 10617 |
---- sys/netinet/tcp_reass.c (revision 264836) |
| 10618 |
-+++ sys/netinet/tcp_reass.c (working copy) |
| 10619 |
-@@ -211,7 +211,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int |
| 10620 |
- * Investigate why and re-evaluate the below limit after the behaviour |
| 10621 |
- * is understood. |
| 10622 |
- */ |
| 10623 |
-- if (th->th_seq != tp->rcv_nxt && |
| 10624 |
-+ if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) && |
| 10625 |
- tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) { |
| 10626 |
- V_tcp_reass_overflows++; |
| 10627 |
- TCPSTAT_INC(tcps_rcvmemdrop); |
| 10628 |
-@@ -234,7 +234,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int |
| 10629 |
- */ |
| 10630 |
- te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); |
| 10631 |
- if (te == NULL) { |
| 10632 |
-- if (th->th_seq != tp->rcv_nxt) { |
| 10633 |
-+ if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) { |
| 10634 |
- TCPSTAT_INC(tcps_rcvmemdrop); |
| 10635 |
- m_freem(m); |
| 10636 |
- *tlenp = 0; |
| 10637 |
-@@ -282,7 +282,8 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int |
| 10638 |
- TCPSTAT_INC(tcps_rcvduppack); |
| 10639 |
- TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp); |
| 10640 |
- m_freem(m); |
| 10641 |
-- uma_zfree(V_tcp_reass_zone, te); |
| 10642 |
-+ if (te != &tqs) |
| 10643 |
-+ uma_zfree(V_tcp_reass_zone, te); |
| 10644 |
- tp->t_segqlen--; |
| 10645 |
- /* |
| 10646 |
- * Try to present any queued data |
| 10647 |
|
| 10648 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch |
| 10649 |
deleted file mode 100644 |
| 10650 |
index 9076fd2..0000000 |
| 10651 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch |
| 10652 |
+++ /dev/null |
| 10653 |
@@ -1,13 +0,0 @@ |
| 10654 |
-diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh |
| 10655 |
-index e504f75..7aa63df 100644 |
| 10656 |
---- a/sys/conf/newvers.sh |
| 10657 |
-+++ b/sys/conf/newvers.sh |
| 10658 |
-@@ -86,7 +86,7 @@ fi |
| 10659 |
- touch version |
| 10660 |
- v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date` |
| 10661 |
- i=`${MAKE:-make} -V KERN_IDENT` |
| 10662 |
--compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version') |
| 10663 |
-+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1) |
| 10664 |
- |
| 10665 |
- for dir in /bin /usr/bin /usr/local/bin; do |
| 10666 |
- if [ -x "${dir}/svnversion" ] ; then |
| 10667 |
|
| 10668 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch |
| 10669 |
deleted file mode 100644 |
| 10670 |
index 0bf1b61..0000000 |
| 10671 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch |
| 10672 |
+++ /dev/null |
| 10673 |
@@ -1,26 +0,0 @@ |
| 10674 |
-Index: sys/amd64/amd64/trap.c |
| 10675 |
-=================================================================== |
| 10676 |
---- sys/amd64/amd64/trap.c.orig |
| 10677 |
-+++ sys/amd64/amd64/trap.c (working copy) |
| 10678 |
-@@ -972,4 +972,21 @@ |
| 10679 |
- syscallname(td->td_proc, sa.code))); |
| 10680 |
- |
| 10681 |
- syscallret(td, error, &sa); |
| 10682 |
-+ |
| 10683 |
-+ /* |
| 10684 |
-+ * If the user-supplied value of %rip is not a canonical |
| 10685 |
-+ * address, then some CPUs will trigger a ring 0 #GP during |
| 10686 |
-+ * the sysret instruction. However, the fault handler would |
| 10687 |
-+ * execute with the user's %gs and %rsp in ring 0 which would |
| 10688 |
-+ * not be safe. Instead, preemptively kill the thread with a |
| 10689 |
-+ * SIGBUS. |
| 10690 |
-+ */ |
| 10691 |
-+ if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) { |
| 10692 |
-+ ksiginfo_init_trap(&ksi); |
| 10693 |
-+ ksi.ksi_signo = SIGBUS; |
| 10694 |
-+ ksi.ksi_code = BUS_OBJERR; |
| 10695 |
-+ ksi.ksi_trapno = T_PROTFLT; |
| 10696 |
-+ ksi.ksi_addr = (void *)td->td_frame->tf_rip; |
| 10697 |
-+ trapsignal(td, &ksi); |
| 10698 |
-+ } |
| 10699 |
- } |
| 10700 |
|
| 10701 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch |
| 10702 |
deleted file mode 100644 |
| 10703 |
index c0ca444..0000000 |
| 10704 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch |
| 10705 |
+++ /dev/null |
| 10706 |
@@ -1,13 +0,0 @@ |
| 10707 |
-diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile |
| 10708 |
-index 6c6d8c2..22fec7a 100644 |
| 10709 |
---- a/usr.bin/bmake/Makefile |
| 10710 |
-+++ b/usr.bin/bmake/Makefile |
| 10711 |
-@@ -5,7 +5,7 @@ |
| 10712 |
- |
| 10713 |
- .sinclude "Makefile.inc" |
| 10714 |
- |
| 10715 |
--SRCTOP?= ${.CURDIR:H:H} |
| 10716 |
-+SRCTOP= ${.CURDIR:H:H} |
| 10717 |
- |
| 10718 |
- # look here first for config.h |
| 10719 |
- CFLAGS+= -I${.CURDIR} |
| 10720 |
|
| 10721 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild |
| 10722 |
deleted file mode 100644 |
| 10723 |
index aebc8cf..0000000 |
| 10724 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0.ebuild |
| 10725 |
+++ /dev/null |
| 10726 |
@@ -1,170 +0,0 @@ |
| 10727 |
-# Copyright 1999-2016 Gentoo Foundation |
| 10728 |
-# Distributed under the terms of the GNU General Public License v2 |
| 10729 |
-# $Id$ |
| 10730 |
- |
| 10731 |
-EAPI=5 |
| 10732 |
- |
| 10733 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
| 10734 |
- |
| 10735 |
-DESCRIPTION="FreeBSD kernel sources" |
| 10736 |
-SLOT="0" |
| 10737 |
-LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )" |
| 10738 |
- |
| 10739 |
-IUSE="+build-kernel debug dtrace zfs" |
| 10740 |
- |
| 10741 |
-# Security Advisory and Errata patches. |
| 10742 |
-# UPSTREAM_PATCHES=() |
| 10743 |
- |
| 10744 |
-if [[ ${PV} != *9999* ]]; then |
| 10745 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 10746 |
- SRC_URI="${SRC_URI} |
| 10747 |
- $(freebsd_upstream_patches)" |
| 10748 |
-fi |
| 10749 |
- |
| 10750 |
-EXTRACTONLY=" |
| 10751 |
- sys/ |
| 10752 |
- contrib/bmake/ |
| 10753 |
- usr.bin/bmake/ |
| 10754 |
-" |
| 10755 |
- |
| 10756 |
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
| 10757 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 10758 |
- !sys-freebsd/virtio-kmod |
| 10759 |
- !sys-fs/fuse4bsd |
| 10760 |
- !<sys-freebsd/freebsd-sources-9.2_beta1" |
| 10761 |
-DEPEND="build-kernel? ( |
| 10762 |
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
| 10763 |
- >=sys-freebsd/freebsd-usbin-9.1 |
| 10764 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 10765 |
- )" |
| 10766 |
- |
| 10767 |
-RESTRICT="strip binchecks" |
| 10768 |
- |
| 10769 |
-S="${WORKDIR}/sys" |
| 10770 |
- |
| 10771 |
-KERN_BUILD=GENTOO |
| 10772 |
- |
| 10773 |
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
| 10774 |
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" |
| 10775 |
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" |
| 10776 |
- "${FILESDIR}/${PN}-7.1-includes.patch" |
| 10777 |
- "${FILESDIR}/${PN}-9.0-sysctluint.patch" |
| 10778 |
- "${FILESDIR}/${PN}-11.0-gentoo.patch" |
| 10779 |
- "${FILESDIR}/${PN}-11.0-gentoo-gcc.patch" |
| 10780 |
- "${FILESDIR}/${PN}-10.1-gcc48.patch" ) |
| 10781 |
- |
| 10782 |
-pkg_setup() { |
| 10783 |
- # Add the required source files. |
| 10784 |
- use dtrace && EXTRACTONLY+="cddl/ " |
| 10785 |
- |
| 10786 |
- # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 |
| 10787 |
- [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" |
| 10788 |
- use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL=" |
| 10789 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" |
| 10790 |
-} |
| 10791 |
- |
| 10792 |
-src_prepare() { |
| 10793 |
- local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" |
| 10794 |
- |
| 10795 |
- cd "${WORKDIR}" || die |
| 10796 |
- epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch" |
| 10797 |
- cd "${S}" || die |
| 10798 |
- |
| 10799 |
- # This replaces the gentoover patch, it doesn't need reapply every time. |
| 10800 |
- sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ |
| 10801 |
- -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ |
| 10802 |
- -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ |
| 10803 |
- "${S}/conf/newvers.sh" |
| 10804 |
- |
| 10805 |
- # __FreeBSD_cc_version comes from FreeBSD's gcc. |
| 10806 |
- # on 11.0-RELEASE it's 1100001. |
| 10807 |
- # FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h. |
| 10808 |
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1100001:g" \ |
| 10809 |
- -i "${S}/conf/kern.pre.mk" \ |
| 10810 |
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" |
| 10811 |
- |
| 10812 |
- # Remove -Werror |
| 10813 |
- sed -e "s:-Werror:-Wno-error:g" \ |
| 10814 |
- -i "${S}/conf/kern.pre.mk" \ |
| 10815 |
- -i "${S}/conf/kmod.mk" || die |
| 10816 |
- |
| 10817 |
- # Set the kernel configuration using USE flags. |
| 10818 |
- cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die |
| 10819 |
- use debug || echo 'nomakeoptions DEBUG' >> "${conf}" |
| 10820 |
- use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" |
| 10821 |
- |
| 10822 |
- # hyperv fails to compile on x86-fbsd. |
| 10823 |
- if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then |
| 10824 |
- echo 'nodevice hyperv' >> "${conf}" |
| 10825 |
- dummy_mk modules/hyperv |
| 10826 |
- fi |
| 10827 |
- |
| 10828 |
- # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. |
| 10829 |
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL |
| 10830 |
-} |
| 10831 |
- |
| 10832 |
-src_configure() { |
| 10833 |
- if use build-kernel ; then |
| 10834 |
- tc-export CC |
| 10835 |
- cd "${S}/$(tc-arch-kernel)/conf" || die |
| 10836 |
- config ${KERN_BUILD} || die |
| 10837 |
- fi |
| 10838 |
-} |
| 10839 |
- |
| 10840 |
-src_compile() { |
| 10841 |
- if use build-kernel ; then |
| 10842 |
- if has_version "<sys-freebsd/freebsd-ubin-10.0"; then |
| 10843 |
- cd "${WORKDIR}"/usr.bin/bmake || die |
| 10844 |
- CC=${CHOST}-gcc freebsd_src_compile |
| 10845 |
- export BMAKE="${WORKDIR}/usr.bin/bmake/make" |
| 10846 |
- fi |
| 10847 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
| 10848 |
- freebsd_src_compile depend |
| 10849 |
- freebsd_src_compile |
| 10850 |
- else |
| 10851 |
- einfo "Nothing to compile.." |
| 10852 |
- fi |
| 10853 |
-} |
| 10854 |
- |
| 10855 |
-src_install() { |
| 10856 |
- if use build-kernel ; then |
| 10857 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
| 10858 |
- freebsd_src_install |
| 10859 |
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" |
| 10860 |
- cd "${S}" |
| 10861 |
- fi |
| 10862 |
- |
| 10863 |
- insinto "/usr/src/sys" |
| 10864 |
- doins -r "${S}/". |
| 10865 |
- if use zfs ; then |
| 10866 |
- insinto "/usr/src/cddl" |
| 10867 |
- doins -r "${WORKDIR}/cddl/". |
| 10868 |
- fi |
| 10869 |
-} |
| 10870 |
- |
| 10871 |
-pkg_preinst() { |
| 10872 |
- if [[ -L "${ROOT}/usr/src/sys" ]]; then |
| 10873 |
- einfo "/usr/src/sys is a symlink, removing it..." |
| 10874 |
- rm -f "${ROOT}/usr/src/sys" |
| 10875 |
- fi |
| 10876 |
- |
| 10877 |
- if use sparc-fbsd ; then |
| 10878 |
- ewarn "WARNING: kldload currently causes kernel panics" |
| 10879 |
- ewarn "on sparc64. This is probably a gcc-4.1 issue, but" |
| 10880 |
- ewarn "we need gcc-4.1 to compile the kernel correctly :/" |
| 10881 |
- ewarn "Please compile all modules you need into the kernel" |
| 10882 |
- fi |
| 10883 |
- |
| 10884 |
- ewarn "If you want manual compile (not recommended), please don't forget the following step." |
| 10885 |
- if ! use sparc-fbsd ; then |
| 10886 |
- ewarn "export CC=clang" |
| 10887 |
- ewarn "export CXX=clang++" |
| 10888 |
- fi |
| 10889 |
- if ! use zfs ; then |
| 10890 |
- ewarn "export WITHOUT_CDDL=" |
| 10891 |
- ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license." |
| 10892 |
- fi |
| 10893 |
- if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then |
| 10894 |
- ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." |
| 10895 |
- fi |
| 10896 |
-} |
| 10897 |
|
| 10898 |
diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml |
| 10899 |
deleted file mode 100644 |
| 10900 |
index 3860e80..0000000 |
| 10901 |
--- a/sys-freebsd/freebsd-sources/metadata.xml |
| 10902 |
+++ /dev/null |
| 10903 |
@@ -1,13 +0,0 @@ |
| 10904 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 10905 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 10906 |
-<pkgmetadata> |
| 10907 |
-<maintainer type="project"> |
| 10908 |
- <email>bsd@g.o</email> |
| 10909 |
- <name>BSD Project</name> |
| 10910 |
- </maintainer> |
| 10911 |
- <use> |
| 10912 |
- <flag name="build-kernel">Build and install a kernel (recommended).</flag> |
| 10913 |
- <flag name="dtrace">Enable DTrace support.</flag> |
| 10914 |
- <flag name="zfs">Enable ZFS support.</flag> |
| 10915 |
- </use> |
| 10916 |
-</pkgmetadata> |
| 10917 |
|
| 10918 |
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest |
| 10919 |
deleted file mode 100644 |
| 10920 |
index 8992ddc..0000000 |
| 10921 |
--- a/sys-freebsd/freebsd-ubin/Manifest |
| 10922 |
+++ /dev/null |
| 10923 |
@@ -1,33 +0,0 @@ |
| 10924 |
-AUX freebsd-ubin-10.0-atf.patch 424 SHA256 31ac8807f4088b75ae4684316f18f3096363ee2d8bb1d5c47d9caab77e6cd5f5 SHA512 b343441f49d3fd41221766c7b54b8f831cf6e19f4400b6a0913e16476e32fd70603c28fc5a8d82eef54afc50c4a999d5151bdd96b243495bca319a0f69a6e860 WHIRLPOOL e4f2ab98d015c7656d3da2364e9dc9c6f675ac95fed05bbb886edf5efc79c843103ba9eaac13376cb9f5c5f02d37fed485a54db508ca350a13d5de2483403045 |
| 10925 |
-AUX freebsd-ubin-10.0-dtc-gcc46.patch 591 SHA256 0adcc784a7fa6a6d8bd867d39b46149c4b61c3751e1ce5eb0a50d0e07d927b60 SHA512 a47ae1540cf2d7f71b718dad84010f725312bc0308cc61b99ab3560a5a18c67c8a34b54d9b99c0974b0662519c20c43c81843fca10d252178f888a14a6990eae WHIRLPOOL 6ae4e254b78d026e634fc1f26c304fc3026b8ceb7a8f7746a5480f61dbd8676aad07d0571f57b31279df119fbace4e8bb2ef7d246cf5d78566905e056bbf4d77 |
| 10926 |
-AUX freebsd-ubin-10.0-kdump-ioctl.patch 1027 SHA256 7fe03c7e7cdbffdabf64557fa63eae0243a28be9025fc735393048ed2dca12c1 SHA512 6fda9d9ab4210d952277b112a5c4a2e75fcff3f63debde980ca791c6f6471038fda26d1e3ddf809384d95525e9ec9140f7b5af17dee8c11967e0b4bc9ea2b850 WHIRLPOOL 1ae5e229824a4371940ef7a0c9d8bae78aada8bcd73371a4479ced9013c55137bd4b153e296ee5873c8a9042607e86273754589e6a2a38519ba5ac78ee442740 |
| 10927 |
-AUX freebsd-ubin-10.0-mandoc.patch 375 SHA256 c4d14aabe0a39bc2c12ca87b6c83628ea1c46640044bbd6946f3e6af343348b6 SHA512 b2789a57ce9afd5b7fe2989f37d246b2034b1578314ac0f6e7c4af26e81f73d043ea3440edee7c30b82fc0ddf5a4592cc3c3c6871ed0eb5fc6932bdf97a88d68 WHIRLPOOL 8e9fa01e662376225c69b41890c1f518c23116ff105ec45c43958d5749b3e265af5dd799e2c2fed5c078e0ca42f8ac988dfe7acb401875c7a769cfe38b14c56a |
| 10928 |
-AUX freebsd-ubin-10.1-kdump-workaround.patch 415 SHA256 a2812aaacae36bfab6703f72fde31e705f9ebe952d1d394eb91e4e05d06c4c60 SHA512 9ee3e9a8c508f36326e24463b1bdfc5a511d6c994b8fb0da8bd1a0fa30b9eafe968c228825ad6b25849c47d800f17866e4667dc9ae8c76cff6f8181b37148d70 WHIRLPOOL 5f4f2ab4b72bae236d0c34c65404f351520869ea6a083590239f38ab0fe95f74108a4b7cbd7f84dfc5fb22f2140ded334999c492adb3fddc5dcd81ddeed8b6e5 |
| 10929 |
-AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863 |
| 10930 |
-AUX freebsd-ubin-10.2-talk-workaround.patch 349 SHA256 8882326b5048b2c2acef041c82f2830ad0eb68684c6773163c6beacae65b12d7 SHA512 5eb04f1769fd4e04a26b9ff69865a6188269d971b83b7e93a5c41def44c9152e5262a192c866e3949cb3aae3b8e0a13663b8e1a438e796b0b923d9171a3e6b27 WHIRLPOOL 3be00db5ef76a3bcf615038cad6a5bd36fdfd349be6b8938a9236fb0ed2a0df6a05b04d73343206905b88ddcbd3c2d1b39928a35f62838f719b28c368adc5770 |
| 10931 |
-AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae |
| 10932 |
-AUX freebsd-ubin-11.0-setXid.patch 3527 SHA256 cea92e6c95f14f77b20d7525e7a72e8b7b3870e9deb1ac571b978d30ba41effe SHA512 204ce8a36eae6435d9549de7c45e361715fd50f721ea44aba630fdfad482bf434e8ac34c1bab588b7af2e2c941931e2aeb4690d65904d617b65ecfa7c76c4211 WHIRLPOOL e3b0d02ec8305f2fa3a89fc828b54e9f96515347221e343f0c35fc8666dd68cfb245edca4b17c9313bc00ea12105459f8826cfa8c8d8f2a715505508dff1c0d9 |
| 10933 |
-AUX freebsd-ubin-6.0-bsdcmp.patch 413 SHA256 a0a99a602538d95ddae2fc4b823150ea58862def87c8196806a379233e3ddb2c SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50 WHIRLPOOL 7a23988970695ccdeaadfce96a0bf05e986736d0c93079cddf0101c0b17b7e5f3421e5da6c1e2b6e0c96ff025dd8d80effc392064ce9ff1cb2e0bce0e8d90b35 |
| 10934 |
-AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 SHA256 318406fa003c5188163e0dac551d4cc5fed7653cc3ff0f6baa64f23572de6d7b SHA512 65009d59ba9739627afb04f7abf5a55395d7585d2c9c201faf8f7b849ea462b61fee407accfe4460aa33a231d151c9d2aa29be7a0ccd71e969f5235a2635442d WHIRLPOOL f01e4257b06159c18f64960eb5d55a595f357bd0c6fd6974c6db942b6b0cbd6fff9ca7151cffd67bb8dec23d855975c7ab9c39cd28ba9dae098acd6773fb4c79 |
| 10935 |
-AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 SHA256 71f41de71568dd819e39c871dd5e570141f243dbabb23d855505c38bec4e9de9 SHA512 53f2decb5a695b8daa4db10ac4f72b5a1d4fa58bd151314211f0ce230de5247a64e360855cef10b9e0c195146a704acb7f4cec623501516dfb9dcce09946262e WHIRLPOOL 48d2be90273b6ce1a0b4701a77d5a10e7e26f9f595b54b35cc410d81266c104c67c1fd1d735b659d41e4c3e02261cc79a85f3fe61c45ce79e4dadd1cf17b877a |
| 10936 |
-AUX freebsd-ubin-8.0-bsdar.patch 556 SHA256 cb81663b4cbb91372b492f2d8c430c166fe4f425fc464a94bb08ea43e23f278d SHA512 46ac4dc366571be48fb6bd131dba49253a3f6e54f68c33bb5b4fede5143c3b96dc107fbd1c3159e15f3816d3b716238c0dc162c958798fbafb5074603c7da430 WHIRLPOOL 32c57b0ccb3b2256e1169da0f7b4d9a3a6300cf703e792ab7286255a12bbaca983bb65ea1c42f6115fc071ee923b5182401e1d14461bf5407269a17361ce003d |
| 10937 |
-AUX freebsd-ubin-8.0-xinstall.patch 1014 SHA256 124cd30b5f44425d0914c64fd8ae98242c9649e4eb0cb1f786839137532504d6 SHA512 a39843600497876287c13a10ca783041123631ef7a82501df323c6a118eb20d871fa6683b812eeebea220c4cfa1eba81450dc7de7ea08888229f326375ff285d WHIRLPOOL 94e16b120a39e5331fa5db7bcda4ba970c3c92049122e958f4ea378936bd384671955af700053d8ae89d6a0c118abae61751cc2e866f719f882559801c6db359 |
| 10938 |
-AUX freebsd-ubin-8.2-compress.patch 1658 SHA256 19485003b70669399b363c4579cecac7fe0b59e3127a13a2c2bc103526fe226c SHA512 9b94b608e4dffb27cec0e6994a06de710ff2d73125d18fad2c5bbe9cab3e1f626ba2ade0333cac9d72350e30b2746f1ccf096bb67b472d1b9b0b79da68bf43bc WHIRLPOOL de29a9917312d1b2f20bcf01cfc224df626113b7d6eea86e5c6fdc306d04a08042a452b1c03a30874f9da1d48f8a3a3718026c4305a4a0373df18d331fd57d6a |
| 10939 |
-AUX freebsd-ubin-9.0-fixmakefiles.patch 445 SHA256 88c90ea1e20afb56ae1b62c4e7ca9de8da8aa9b3726059a96e85beea13935d1c SHA512 588b0e7f58504ae338b714fb324b1525ed340b56e2e99a1ebaac2606799c9ff15b8c1a05e2ddaa5dfbdc7328684917de8753d99b0c8929c056d6eb6446aa9955 WHIRLPOOL 35445ccd0d4a63c5ac593157d55b0e08106d37cbab0a0b10a699e63872fd2a5e9bd53fe2c4a94dff7b1441fa27c141c171b6938ee51e7c696de95695938985a0 |
| 10940 |
-AUX freebsd-ubin-9.1-ar-libarchive3.patch 593 SHA256 92a37952790362f73b0c6a1000877e633e7a0055be8397184aa8ad7e15bfecee SHA512 ece840657b425a666af495332a00a57a4c9c353187ee98747651da4ba69227bd0a58dbbdc7af860d49e0d662c9eaca046ec2f087a86c5bf282530bb9cdcf7aaa WHIRLPOOL 4e25ddac55843e725903c28ed009b646ed63eef4b935ee03eb4a60c3fdeb02b158e018ff76adea6ca14a9a40268a1b7347f26f067d407ffb7329fb3c4641da5c |
| 10941 |
-AUX freebsd-ubin-9.1-bsdar.patch 656 SHA256 86834418e478bc21918d6f310fb422dbfd0aa0df1315bd4fbc0ddd7a8fc62868 SHA512 88fc86fdb0ee6f757cee9b6bd55226517e6b79946f0518904bedd8176230124b40b868dee30049daa7053ea0ebe7d242dc58778e3addae2612ffd53996303bac WHIRLPOOL b66fd0a613cd32f9037c739146e465fd2ddcc56f78a3fdffc67eec9b92b6f2f78d6948906a77c2418e2bae5d782ab70f9c4f473ee8e256f233b237f6a11ae08c |
| 10942 |
-AUX freebsd-ubin-9.1-grep.patch 549 SHA256 5ab5dafccdc0c64f07742698abe51a24ab0abe10aba7d4bd80afcf4b5a36066f SHA512 2ddec1a02064ee91a177edb78a964d37b5be14c6e92a78ba9ce0a902c40f673eb7a6449042e341dfb3f31be6bef1a19fdf735af0d32526c0891fe6d9cc060101 WHIRLPOOL 3742f0c0612d2158ce2e5afaea7fb15f3f9cbc95f702fd51ea30c0c97a5cccabdffd4b722d1cb1930b362a4d2256bce77d997a69f02304a4d187391c8f8e0734 |
| 10943 |
-AUX freebsd-ubin-9.1-kdump-ioctl.patch 1001 SHA256 03804b82087884efa28157b36781a746349f41164591b46b73785e0b53088e2a SHA512 aadf3a6d97c5822aa9ff0d1ad8a7bfb2d17fc3193851f864bcb847ef05fe5b7e2b852cb95aaf159194a12b26900697f089113ccb15854c8e3bdb43518de9adf8 WHIRLPOOL 904f1c9dee700cab16a6075216e85768c1a146064da10e865caa319850d400b96255f677df70b2ba1766d4d855b553ad58d74f7e139391bb841f7fc0ef39ebef |
| 10944 |
-AUX freebsd-ubin-9.1-minigzip.patch 336 SHA256 88ad33268fd33012d37ec3f0f915322a536a4868900aa7c19486226e96125723 SHA512 e25cb6b74b17ee3d999321701fcc5a90ab94abac8ea33a155847f99e7836f16203485618be3426e34a1a5895b7582f5f466f997986486637e52dbc0e6c225dd5 WHIRLPOOL 2fa652c4548eb5b305bafca4b788d9f19f1f52903b0e27cbf402e11bcd7ceb78bdf1dfabf79932b8e78b1bbf898308405ccc19b1ca21198446889c8360db24a7 |
| 10945 |
-AUX freebsd-ubin-lint-stdarg.patch 792 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6 SHA512 0f06547b0b90c65466c5c032efe6563dfd32ca56175fbad0885228310f6dc5f973d3adffe93bdb35d42b8af045ecdc23d1198fd8bad0c96c46512dbedbab3059 WHIRLPOOL 853d89f6f35c91718a30c8cbd2fed72a01c01dd03b3fab28c931fd80f71394122f4e5fe240df17b524dffb91829bc0148a605e797b88827d4f5e48730790fa57 |
| 10946 |
-AUX freebsd-ubin-setXid.patch 3723 SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d SHA512 9edaac765405e28b123fa40b708b1ab05af3e151726e6f2b75ab1c0fd17b6c2a428a58726da999f7a63e9550bdd3e0d274ce63517717137872a7e9c77a591501 WHIRLPOOL 36fff3ad1577981b157e4311226540ee9a0eca7f5d623e27b3fbc585bc5585158c21f27c2355ac773ff190817aee2056293d3a1c0306e7743ae72a3a49d1e670 |
| 10947 |
-AUX locate-updatedb-cron 122 SHA256 63cceb90a3abb02e806af6940542f12d397e7600df37f1b7305104f78694cce9 SHA512 c3127d2ebb837d7fd6edc640604ce31c1639c036703b1e923e84b79f9840e13e28327eb7a5d655546ade8efb9188b041434552bcd0b4b76308c0e66132ad7985 WHIRLPOOL a040f971f7406f2dc022aee9e6b4cbfd4bb37931afabcdb58dcbe82539500bf7ae7fdfdf8651113ae3cea5ffa73771bb57a2a0a0e749701563664ccbf87285ca |
| 10948 |
-AUX login.1.pamd 145 SHA256 c8b81b422104b58afa8b6bb478b1eda77f97c3037030ac09889b7c3bf3de9fcc SHA512 2308d818de388be2973b59fad5a21ffe5a9c9d302b47ccf1a148182ccaf082421c5a277acf0c85649874fd607a8da20222e7a05c15606ee36f6e74d0968a1397 WHIRLPOOL a562ee1210568bdf2339df413ec69eed066738d0d2929c8965f6bfc2b05d60075b23176ca8f744bee2c6a7cfa8448adf4e08a531d36477f78aac78da47f3209c |
| 10949 |
-AUX login.pamd 309 SHA256 4680e4682c95faeb879e4cf4cc83280e91ec53870a19fc7dd67079ff5eb97c38 SHA512 a5fc8fc6c1ca597f194f1fc801185bc69020c8055211d20b1712cc8c9c3cfd27b3eb2031823771d73c1c2814a0dee29bf14c32319c6831732246800256e38a26 WHIRLPOOL c8df5d4d0f1ad85e42762c30dfecb3bdf84c4593d98ef7a71ca31674c28400b5014c2bb543919cd3741bfcb642e2490dd7f4f9850e743d5c89e8bbbd7b23a2ba |
| 10950 |
-AUX passwd.1.pamd 154 SHA256 39706dd518995631a8eb6a48498685db9a777124bb84f217e2045f0162357081 SHA512 b89b339facf74c3fb2f68f38cb76d4104f8e497312140e76778ce4673f9a039afe22df78991e7625e1488e6dd1e679ca9cd9953dffb483db9b0bd106755b0a5f WHIRLPOOL cb683ae69af9fc5d1344c40a26e6518941d6ee241b11d2efb53b93ddabd69d9a2c53df8e33d4e68a20ceef4fef27372b5fb93eb653c461217091dd0c3872c0eb |
| 10951 |
-AUX passwd.pamd 247 SHA256 df5babb31578b5fd56629dac06656a981cffd2e1ef4987e075c0e95029d40399 SHA512 db179adff0d3211b9409cd4efdc09c14212192ab24549acd1d2ecd7788947117d58c991899750530f80fb87b66bc6a7e08a863d0f37f57105af23db86bf278ee WHIRLPOOL 287de39190e8e377503d4a494c5b114af6a6feaff06129832054c9685ced1f127f784fa2f8ddf9a31b0603ca8d999ae0856feb28c82e406a5b830ecc8b218c8b |
| 10952 |
-AUX su.1.pamd 321 SHA256 18ed54492632b231ca9074fe08aa5343a5dd7049834a7eda3aa45d42d313c779 SHA512 fa27233d99c70c3b968b5aff430cdbd55a3d795a1a4430143f863d3dae7bf7b6b1564d58f82431fe2e8e4a2b1bcc2f12714abf7d48ff75c08c1a65f22cd74d6c WHIRLPOOL 7b82c775ec138873b2754c101fa14c09e87bf052f2497b0bba12fee2cfa80f970b27041febb7fd22c3291977f942363ab558d52a92833fcd4cfdf7ece829c713 |
| 10953 |
-AUX su.pamd 311 SHA256 5090fbcd2807019255062cacf3816e2e28088c0084c6e9f34a3cceda31e08e27 SHA512 d7c7eaf776aace61f2a534e5a8c2f65879fe27311859e6e8bd309f1425693e4effe8867a1a7ecc3f1d5a478989139f1731c1863c4509da49318c3cead5c8b0dd WHIRLPOOL 055d4b0b9f0645a4ee33170f3a69de0f8733dc972330bb3182400cdae54711f82f85536aa5b6b8ccbd66f1d2ab547780fa0198e2134466f6fa5782ff4b02a77d |
| 10954 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 10955 |
-EBUILD freebsd-ubin-11.0.ebuild 6032 SHA256 a85fbd41cd09b62593bbf6a475d9d9cad3f7d003e3b6c0ae2ff561e9487dacbc SHA512 fbc50e301e6daea2103ba96527d43233b6aacbe4fe52ff096cfda9d82277756cfa07613319e1a687d7fcf3a72ddeedc49eeeca60b265b452857d30b3a19a446b WHIRLPOOL 742f34fbce53872d7f9b27d34e5327f13060e441f5433bb497b31fbc5f7f854ccec981662bb2a6d4071c1080ea9853746a8416781e9c46ee52944e92b206c1cd |
| 10956 |
-MISC metadata.xml 782 SHA256 9d530de89ea94bedcf5f2943f56417fd2a4942bac995425a485acf2ccd01f994 SHA512 50d638f761e118d9892e593dcea9d72805e3968d29cb3bbb1b95cf4eb6a4e3293a3c47b29415a4f9fa937dcccf2c2f09c2af10e62982a15069bad22162d70f3d WHIRLPOOL 8ce25849714014929d8b1b6b6e05a9e88e4671f5a3accb128e266a64994b390395b4d881018090ef778dde7afe6894e15a9047fa591b45bbd31df960cecdea37 |
| 10957 |
|
| 10958 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch |
| 10959 |
deleted file mode 100644 |
| 10960 |
index d758c48..0000000 |
| 10961 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch |
| 10962 |
+++ /dev/null |
| 10963 |
@@ -1,15 +0,0 @@ |
| 10964 |
-diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile |
| 10965 |
-index 4ebdc33..37ff8fa 100644 |
| 10966 |
---- a/usr.bin/atf/atf-sh/Makefile |
| 10967 |
-+++ b/usr.bin/atf/atf-sh/Makefile |
| 10968 |
-@@ -33,8 +33,8 @@ PROG_CXX= atf-sh |
| 10969 |
- SRCS= atf-sh.cpp |
| 10970 |
- MAN= atf-sh.1 atf-sh-api.3 |
| 10971 |
- |
| 10972 |
--CFLAGS+= -DHAVE_CONFIG_H |
| 10973 |
--CFLAGS+= -I${ATF} |
| 10974 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
| 10975 |
-+CXXFLAGS+= -I${ATF} |
| 10976 |
- |
| 10977 |
- DPADD+= ${LIBATF_C} ${LIBATF_CXX} |
| 10978 |
- LDADD+= -latf-c++ -latf-c |
| 10979 |
|
| 10980 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch |
| 10981 |
deleted file mode 100644 |
| 10982 |
index 1125238..0000000 |
| 10983 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch |
| 10984 |
+++ /dev/null |
| 10985 |
@@ -1,25 +0,0 @@ |
| 10986 |
-diff --git a/usr.bin/dtc/string.hh b/usr.bin/dtc/string.hh |
| 10987 |
-index 45bc4fd..6eaf8e4 100644 |
| 10988 |
---- a/usr.bin/dtc/string.hh |
| 10989 |
-+++ b/usr.bin/dtc/string.hh |
| 10990 |
-@@ -32,6 +32,8 @@ |
| 10991 |
- |
| 10992 |
- #ifndef _STRING_HH_ |
| 10993 |
- #define _STRING_HH_ |
| 10994 |
-+#include <cstdio> |
| 10995 |
-+#include <cstring> |
| 10996 |
- #include "input_buffer.hh" |
| 10997 |
- |
| 10998 |
- namespace dtc |
| 10999 |
-diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh |
| 11000 |
-index 7f2ec67..8e13b1c 100644 |
| 11001 |
---- a/usr.bin/dtc/util.hh |
| 11002 |
-+++ b/usr.bin/dtc/util.hh |
| 11003 |
-@@ -33,6 +33,7 @@ |
| 11004 |
- #ifndef _UTIL_HH_ |
| 11005 |
- #define _UTIL_HH_ |
| 11006 |
- |
| 11007 |
-+#include <stdint.h> |
| 11008 |
- #include <vector> |
| 11009 |
- |
| 11010 |
- // If we aren't using C++11, then just ignore static asserts. |
| 11011 |
|
| 11012 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch |
| 11013 |
deleted file mode 100644 |
| 11014 |
index e106852..0000000 |
| 11015 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch |
| 11016 |
+++ /dev/null |
| 11017 |
@@ -1,26 +0,0 @@ |
| 11018 |
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile |
| 11019 |
-index 38e9df6..5e831c6 100644 |
| 11020 |
---- a/usr.bin/kdump/Makefile |
| 11021 |
-+++ b/usr.bin/kdump/Makefile |
| 11022 |
-@@ -22,7 +22,7 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c |
| 11023 |
- |
| 11024 |
- ioctl.c: mkioctls |
| 11025 |
- env MACHINE=${MACHINE} CPP="${CPP}" \ |
| 11026 |
-- sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} |
| 11027 |
-+ sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../include > ${.TARGET} |
| 11028 |
- |
| 11029 |
- kdump_subr.h: mksubr |
| 11030 |
- sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ |
| 11031 |
-diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile |
| 11032 |
-index 7a49497..bc8b61f 100644 |
| 11033 |
---- a/usr.bin/truss/Makefile |
| 11034 |
-+++ b/usr.bin/truss/Makefile |
| 11035 |
-@@ -24,7 +24,7 @@ syscalls.h: syscalls.master |
| 11036 |
- |
| 11037 |
- ioctl.c: ${.CURDIR}/../kdump/mkioctls |
| 11038 |
- env MACHINE=${MACHINE} CPP="${CPP}" \ |
| 11039 |
-- /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET} |
| 11040 |
-+ /bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../include > ${.TARGET} |
| 11041 |
- |
| 11042 |
- .if ${MACHINE_CPUARCH} == "i386" |
| 11043 |
- SRCS+= i386-linux.c linux_syscalls.h |
| 11044 |
|
| 11045 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch |
| 11046 |
deleted file mode 100644 |
| 11047 |
index c5f7706..0000000 |
| 11048 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch |
| 11049 |
+++ /dev/null |
| 11050 |
@@ -1,13 +0,0 @@ |
| 11051 |
-diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile |
| 11052 |
-index 0995534..1bcb3e0 100644 |
| 11053 |
---- a/usr.bin/mandoc/Makefile |
| 11054 |
-+++ b/usr.bin/mandoc/Makefile |
| 11055 |
-@@ -1,7 +1,7 @@ |
| 11056 |
- # $FreeBSD$ |
| 11057 |
- |
| 11058 |
- MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml |
| 11059 |
--LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a |
| 11060 |
-+LIBMANDOC= ${.CURDIR}/../../lib/libmandoc/libmandoc.a |
| 11061 |
- .PATH: ${MDOCMLDIR} |
| 11062 |
- |
| 11063 |
- PROG= mandoc |
| 11064 |
|
| 11065 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch |
| 11066 |
deleted file mode 100644 |
| 11067 |
index 064647c..0000000 |
| 11068 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch |
| 11069 |
+++ /dev/null |
| 11070 |
@@ -1,13 +0,0 @@ |
| 11071 |
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile |
| 11072 |
-index cbf31d0..fa0d04d 100644 |
| 11073 |
---- a/usr.bin/kdump/Makefile |
| 11074 |
-+++ b/usr.bin/kdump/Makefile |
| 11075 |
-@@ -8,7 +8,7 @@ SFX= 32 |
| 11076 |
- .PATH: ${.CURDIR}/../ktrace |
| 11077 |
- |
| 11078 |
- PROG= kdump |
| 11079 |
--SRCS= kdump_subr.c kdump.c ioctl.c subr.c |
| 11080 |
-+SRCS= kdump_subr.h kdump_subr.c kdump.c ioctl.c subr.c |
| 11081 |
- DPSRCS= kdump_subr.h |
| 11082 |
- CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I. |
| 11083 |
- |
| 11084 |
|
| 11085 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch |
| 11086 |
deleted file mode 100644 |
| 11087 |
index 6064717..0000000 |
| 11088 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch |
| 11089 |
+++ /dev/null |
| 11090 |
@@ -1,13 +0,0 @@ |
| 11091 |
-diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c |
| 11092 |
-index af6562b..3121c81 100644 |
| 11093 |
---- a/usr.bin/mt/mt.c |
| 11094 |
-+++ b/usr.bin/mt/mt.c |
| 11095 |
-@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $" |
| 11096 |
- #include <unistd.h> |
| 11097 |
- #include <stdint.h> |
| 11098 |
- #include <errno.h> |
| 11099 |
--#include <bsdxml.h> |
| 11100 |
-+#include <expat.h> |
| 11101 |
- #include <mtlib.h> |
| 11102 |
- |
| 11103 |
- #include <cam/cam.h> |
| 11104 |
|
| 11105 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch |
| 11106 |
deleted file mode 100644 |
| 11107 |
index 3a65b37..0000000 |
| 11108 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch |
| 11109 |
+++ /dev/null |
| 11110 |
@@ -1,12 +0,0 @@ |
| 11111 |
-diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c |
| 11112 |
-index 4daad7a..1fb9105 100644 |
| 11113 |
---- a/usr.bin/talk/io.c |
| 11114 |
-+++ b/usr.bin/talk/io.c |
| 11115 |
-@@ -50,6 +50,7 @@ static const char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93"; |
| 11116 |
- #include <stdlib.h> |
| 11117 |
- #include <string.h> |
| 11118 |
- #include <unistd.h> |
| 11119 |
-+#include <wctype.h> |
| 11120 |
- #define _XOPEN_SOURCE_EXTENDED |
| 11121 |
- #include <curses.h> |
| 11122 |
- |
| 11123 |
|
| 11124 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch |
| 11125 |
deleted file mode 100644 |
| 11126 |
index c0ca444..0000000 |
| 11127 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch |
| 11128 |
+++ /dev/null |
| 11129 |
@@ -1,13 +0,0 @@ |
| 11130 |
-diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile |
| 11131 |
-index 6c6d8c2..22fec7a 100644 |
| 11132 |
---- a/usr.bin/bmake/Makefile |
| 11133 |
-+++ b/usr.bin/bmake/Makefile |
| 11134 |
-@@ -5,7 +5,7 @@ |
| 11135 |
- |
| 11136 |
- .sinclude "Makefile.inc" |
| 11137 |
- |
| 11138 |
--SRCTOP?= ${.CURDIR:H:H} |
| 11139 |
-+SRCTOP= ${.CURDIR:H:H} |
| 11140 |
- |
| 11141 |
- # look here first for config.h |
| 11142 |
- CFLAGS+= -I${.CURDIR} |
| 11143 |
|
| 11144 |
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 |
| 11145 |
deleted file mode 100644 |
| 11146 |
index 946cc5b..0000000 |
| 11147 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-11.0-setXid.patch |
| 11148 |
+++ /dev/null |
| 11149 |
@@ -1,147 +0,0 @@ |
| 11150 |
-diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile |
| 11151 |
-index d199a85..dc5cafd 100644 |
| 11152 |
---- a/usr.bin/at/Makefile |
| 11153 |
-+++ b/usr.bin/at/Makefile |
| 11154 |
-@@ -17,6 +17,8 @@ BINOWN= root |
| 11155 |
- BINMODE= 4555 |
| 11156 |
- CLEANFILES+= at.1 |
| 11157 |
- |
| 11158 |
-+LDFLAGS+=-Wl,-z,now |
| 11159 |
-+ |
| 11160 |
- at.1: at.man |
| 11161 |
- @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ |
| 11162 |
- sed -e \ |
| 11163 |
-diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile |
| 11164 |
-index 4427417..4f774a1 100644 |
| 11165 |
---- a/usr.bin/chpass/Makefile |
| 11166 |
-+++ b/usr.bin/chpass/Makefile |
| 11167 |
-@@ -17,6 +17,8 @@ CFLAGS+= -DYP |
| 11168 |
- #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE |
| 11169 |
- CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I. |
| 11170 |
- |
| 11171 |
-+LDFLAGS+=-Wl,-z,now |
| 11172 |
-+ |
| 11173 |
- LIBADD= crypt util |
| 11174 |
- .if ${MK_NIS} != "no" |
| 11175 |
- LIBADD+= ypclnt |
| 11176 |
-diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile |
| 11177 |
-index cd03a51..9a0fe6e 100644 |
| 11178 |
---- a/usr.bin/fstat/Makefile |
| 11179 |
-+++ b/usr.bin/fstat/Makefile |
| 11180 |
-@@ -9,3 +9,5 @@ LIBADD= procstat |
| 11181 |
- MAN1= fuser.1 fstat.1 |
| 11182 |
- |
| 11183 |
- .include <bsd.prog.mk> |
| 11184 |
-+LDFLAGS+=-Wl,-z,now |
| 11185 |
-+ |
| 11186 |
-diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile |
| 11187 |
-index 07321f7..ed2c786 100644 |
| 11188 |
---- a/usr.bin/lock/Makefile |
| 11189 |
-+++ b/usr.bin/lock/Makefile |
| 11190 |
-@@ -7,4 +7,6 @@ BINMODE=4555 |
| 11191 |
- |
| 11192 |
- LIBADD= crypt |
| 11193 |
- |
| 11194 |
-+LDFLAGS+=-Wl,-z,now |
| 11195 |
-+ |
| 11196 |
- .include <bsd.prog.mk> |
| 11197 |
-diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile |
| 11198 |
-index 3499575..62a7356 100644 |
| 11199 |
---- a/usr.bin/login/Makefile |
| 11200 |
-+++ b/usr.bin/login/Makefile |
| 11201 |
-@@ -16,6 +16,8 @@ CFLAGS+= -DUSE_BSM_AUDIT |
| 11202 |
- LIBADD+= bsm |
| 11203 |
- .endif |
| 11204 |
- |
| 11205 |
-+LDFLAGS+=-Wl,-z,now |
| 11206 |
-+ |
| 11207 |
- .if ${MK_SETUID_LOGIN} != "no" |
| 11208 |
- BINOWN= root |
| 11209 |
- BINMODE=4555 |
| 11210 |
-diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile |
| 11211 |
-index 52cc3c7..11ebb2f 100644 |
| 11212 |
---- a/usr.bin/netstat/Makefile |
| 11213 |
-+++ b/usr.bin/netstat/Makefile |
| 11214 |
-@@ -57,6 +57,8 @@ BINGRP= kmem |
| 11215 |
- BINMODE=2555 |
| 11216 |
- LIBADD= kvm memstat xo util |
| 11217 |
- |
| 11218 |
-+LDFLAGS+=-Wl,-z,now |
| 11219 |
-+ |
| 11220 |
- .if ${MK_NETGRAPH_SUPPORT} != "no" |
| 11221 |
- SRCS+= netgraph.c |
| 11222 |
- LIBADD+= netgraph |
| 11223 |
-diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile |
| 11224 |
-index 3114a92..5c41213 100644 |
| 11225 |
---- a/usr.bin/opieinfo/Makefile |
| 11226 |
-+++ b/usr.bin/opieinfo/Makefile |
| 11227 |
-@@ -12,6 +12,8 @@ WARNS?= 0 |
| 11228 |
- |
| 11229 |
- LIBADD= opie |
| 11230 |
- |
| 11231 |
-+LDFLAGS+=-Wl,-z,now |
| 11232 |
-+ |
| 11233 |
- BINOWN= root |
| 11234 |
- BINMODE=4555 |
| 11235 |
- PRECIOUSPROG= |
| 11236 |
-diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile |
| 11237 |
-index ae35b20..32ba59b 100644 |
| 11238 |
---- a/usr.bin/opiepasswd/Makefile |
| 11239 |
-+++ b/usr.bin/opiepasswd/Makefile |
| 11240 |
-@@ -12,6 +12,8 @@ WARNS?= 0 |
| 11241 |
- |
| 11242 |
- LIBADD= opie |
| 11243 |
- |
| 11244 |
-+LDFLAGS+=-Wl,-z,now |
| 11245 |
-+ |
| 11246 |
- BINOWN= root |
| 11247 |
- BINMODE=4555 |
| 11248 |
- PRECIOUSPROG= |
| 11249 |
-diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile |
| 11250 |
-index 758be2d..ebde1a6 100644 |
| 11251 |
---- a/usr.bin/passwd/Makefile |
| 11252 |
-+++ b/usr.bin/passwd/Makefile |
| 11253 |
-@@ -13,6 +13,8 @@ SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd |
| 11254 |
- MLINKS = passwd.1 yppasswd.1 |
| 11255 |
- .endif |
| 11256 |
- |
| 11257 |
-+LDFLAGS+=-Wl,-z,now |
| 11258 |
-+ |
| 11259 |
- beforeinstall: |
| 11260 |
- .for i in passwd yppasswd |
| 11261 |
- [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ |
| 11262 |
-diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile |
| 11263 |
-index b3dd829..26eaa63 100644 |
| 11264 |
---- a/usr.bin/su/Makefile |
| 11265 |
-+++ b/usr.bin/su/Makefile |
| 11266 |
-@@ -10,6 +10,8 @@ WARNS?= 5 |
| 11267 |
- LIBADD= util pam |
| 11268 |
- |
| 11269 |
- .if ${MK_AUDIT} != "no" |
| 11270 |
-+LDFLAGS+=-Wl,-z,now |
| 11271 |
-+ |
| 11272 |
- CFLAGS+= -DUSE_BSM_AUDIT |
| 11273 |
- LIBADD+= bsm |
| 11274 |
- .endif |
| 11275 |
-diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile |
| 11276 |
-index 0579add..571be8d 100644 |
| 11277 |
---- a/usr.bin/wall/Makefile |
| 11278 |
-+++ b/usr.bin/wall/Makefile |
| 11279 |
-@@ -6,4 +6,6 @@ SRCS= ttymsg.c wall.c |
| 11280 |
- BINGRP= tty |
| 11281 |
- BINMODE=2555 |
| 11282 |
- |
| 11283 |
-+LDFLAGS+=-Wl,-z,now |
| 11284 |
-+ |
| 11285 |
- .include <bsd.prog.mk> |
| 11286 |
-diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile |
| 11287 |
-index ba06110..ba6ce04 100644 |
| 11288 |
---- a/usr.bin/write/Makefile |
| 11289 |
-+++ b/usr.bin/write/Makefile |
| 11290 |
-@@ -5,4 +5,6 @@ PROG= write |
| 11291 |
- BINMODE=2555 |
| 11292 |
- BINGRP= tty |
| 11293 |
- |
| 11294 |
-+LDFLAGS+=-Wl,-z,now |
| 11295 |
-+ |
| 11296 |
- .include <bsd.prog.mk> |
| 11297 |
|
| 11298 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch |
| 11299 |
deleted file mode 100644 |
| 11300 |
index 1a85529..0000000 |
| 11301 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch |
| 11302 |
+++ /dev/null |
| 11303 |
@@ -1,13 +0,0 @@ |
| 11304 |
-Index: fbsd-6.0/usr.bin/cmp/Makefile |
| 11305 |
-=================================================================== |
| 11306 |
---- fbsd-6.0.orig/usr.bin/cmp/Makefile |
| 11307 |
-+++ fbsd-6.0/usr.bin/cmp/Makefile |
| 11308 |
-@@ -1,7 +1,7 @@ |
| 11309 |
- # @(#)Makefile 8.1 (Berkeley) 6/6/93 |
| 11310 |
- # $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6.14.1 2005/09/17 11:33:41 brian Exp $ |
| 11311 |
- |
| 11312 |
--PROG= cmp |
| 11313 |
-+PROG= bsdcmp |
| 11314 |
- SRCS= cmp.c link.c misc.c regular.c special.c |
| 11315 |
- |
| 11316 |
- .include <bsd.prog.mk> |
| 11317 |
|
| 11318 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch |
| 11319 |
deleted file mode 100644 |
| 11320 |
index b135a82..0000000 |
| 11321 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch |
| 11322 |
+++ /dev/null |
| 11323 |
@@ -1,35 +0,0 @@ |
| 11324 |
-Index: usr.bin/calendar/Makefile |
| 11325 |
-=================================================================== |
| 11326 |
---- usr.bin/calendar/Makefile.orig |
| 11327 |
-+++ usr.bin/calendar/Makefile |
| 11328 |
-@@ -10,6 +10,7 @@ FR_LINKS= fr_FR.ISO8859-15 |
| 11329 |
- TEXTMODE?= 444 |
| 11330 |
- |
| 11331 |
- beforeinstall: |
| 11332 |
-+ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar |
| 11333 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ |
| 11334 |
- ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar |
| 11335 |
- .for lang in ${INTER} |
| 11336 |
-Index: usr.bin/ee/Makefile |
| 11337 |
-=================================================================== |
| 11338 |
---- usr.bin/ee/Makefile.orig |
| 11339 |
-+++ usr.bin/ee/Makefile |
| 11340 |
-@@ -12,12 +12,12 @@ LDADD= -lncurses |
| 11341 |
- NLS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \ |
| 11342 |
- uk_UA.KOI8-U ru_RU.KOI8-R |
| 11343 |
- |
| 11344 |
--NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15 |
| 11345 |
--NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ |
| 11346 |
-- fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \ |
| 11347 |
-- fr_FR.ISO8859-15 |
| 11348 |
--NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ |
| 11349 |
-- de_CH.ISO8859-15 de_DE.ISO8859-15 |
| 11350 |
-+#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15 |
| 11351 |
-+#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ |
| 11352 |
-+# fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \ |
| 11353 |
-+# fr_FR.ISO8859-15 |
| 11354 |
-+#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ |
| 11355 |
-+# de_CH.ISO8859-15 de_DE.ISO8859-15 |
| 11356 |
- |
| 11357 |
- NLSSRCFILES=ee.msg |
| 11358 |
- .for lang in ${NLS} |
| 11359 |
|
| 11360 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch |
| 11361 |
deleted file mode 100644 |
| 11362 |
index a89cf52..0000000 |
| 11363 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch |
| 11364 |
+++ /dev/null |
| 11365 |
@@ -1,28 +0,0 @@ |
| 11366 |
-By default the mkioctl program that generates code for kdump does look for |
| 11367 |
-ioctls in the whole /usr/include tree, but this does break when xorg is merged. |
| 11368 |
-This patch allows to look for include files only in the source tree. |
| 11369 |
- |
| 11370 |
-Index: fbsd-6/usr.bin/kdump/Makefile |
| 11371 |
-=================================================================== |
| 11372 |
---- fbsd-6.orig/usr.bin/kdump/Makefile |
| 11373 |
-+++ fbsd-6/usr.bin/kdump/Makefile |
| 11374 |
-@@ -10,6 +10,6 @@ CFLAGS+= -I${.CURDIR}/../ktrace -I${.CUR |
| 11375 |
- CLEANFILES= ioctl.c |
| 11376 |
- |
| 11377 |
- ioctl.c: mkioctls |
| 11378 |
-- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} |
| 11379 |
-+ sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} |
| 11380 |
- |
| 11381 |
- .include <bsd.prog.mk> |
| 11382 |
-Index: fbsd-6/usr.bin/truss/Makefile |
| 11383 |
-=================================================================== |
| 11384 |
---- fbsd-6.orig/usr.bin/truss/Makefile |
| 11385 |
-+++ fbsd-6/usr.bin/truss/Makefile |
| 11386 |
-@@ -29,6 +29,6 @@ syscalls.h: syscalls.master |
| 11387 |
- ${.CURDIR}/i386.conf |
| 11388 |
- |
| 11389 |
- ioctl.c: ${.CURDIR}/../kdump/mkioctls |
| 11390 |
-- sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} |
| 11391 |
-+ sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET} |
| 11392 |
- |
| 11393 |
- .include <bsd.prog.mk> |
| 11394 |
|
| 11395 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch |
| 11396 |
deleted file mode 100644 |
| 11397 |
index c966b9b..0000000 |
| 11398 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch |
| 11399 |
+++ /dev/null |
| 11400 |
@@ -1,21 +0,0 @@ |
| 11401 |
---- usr.bin/ar/Makefile.old 2010-03-12 14:50:30 +0100 |
| 11402 |
-+++ usr.bin/ar/Makefile 2010-03-12 14:50:53 +0100 |
| 11403 |
-@@ -1,6 +1,6 @@ |
| 11404 |
- # $FreeBSD: src/usr.bin/ar/Makefile,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ |
| 11405 |
- |
| 11406 |
--PROG= ar |
| 11407 |
-+PROG= freebsd-ar |
| 11408 |
- SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h |
| 11409 |
- |
| 11410 |
- WARNS?= 5 |
| 11411 |
-@@ -10,8 +10,7 @@ |
| 11412 |
- |
| 11413 |
- CFLAGS+=-I. -I${.CURDIR} |
| 11414 |
- |
| 11415 |
--NO_SHARED?= yes |
| 11416 |
--LINKS= ${BINDIR}/ar ${BINDIR}/ranlib |
| 11417 |
--MLINKS= ar.1 ranlib.1 |
| 11418 |
-+LINKS= ${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib |
| 11419 |
-+MLINKS= freebsd-ar.1 freebsd-ranlib.1 |
| 11420 |
- |
| 11421 |
- .include <bsd.prog.mk> |
| 11422 |
|
| 11423 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch |
| 11424 |
deleted file mode 100644 |
| 11425 |
index e8f978a..0000000 |
| 11426 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch |
| 11427 |
+++ /dev/null |
| 11428 |
@@ -1,26 +0,0 @@ |
| 11429 |
-Parallel make installs often cause 2 concurrent install -d to fail |
| 11430 |
-while they are creating the path to the target dirs. |
| 11431 |
-This patch changes the failure to a warning so that a make -j6 install doesn't |
| 11432 |
-fails as often as it does on Gentoo/FreeBSD, if it uses /usr/bin/install. |
| 11433 |
- |
| 11434 |
---- usr.bin/xinstall/xinstall.c.orig |
| 11435 |
-+++ usr.bin/xinstall/xinstall.c |
| 11436 |
-@@ -748,9 +748,17 @@ |
| 11437 |
- ch = *p; |
| 11438 |
- *p = '\0'; |
| 11439 |
- if (stat(path, &sb)) { |
| 11440 |
-- if (errno != ENOENT || mkdir(path, 0755) < 0) { |
| 11441 |
-+ if (errno != ENOENT) { |
| 11442 |
- err(EX_OSERR, "mkdir %s", path); |
| 11443 |
- /* NOTREACHED */ |
| 11444 |
-+ } else if (mkdir(path, 0755) < 0) { |
| 11445 |
-+ /* Previous errno from stat() says that the directory didn't exist (ENOENT) |
| 11446 |
-+ * But if errno is now EEXIST, then we just hit a parallel make bug. |
| 11447 |
-+ */ |
| 11448 |
-+ if (errno == EEXIST) |
| 11449 |
-+ warn("mkdir: %s now exists!", path); /* let me know when this happens */ |
| 11450 |
-+ else |
| 11451 |
-+ err(EX_OSERR, "mkdir %s", path); |
| 11452 |
- } else if (verbose) |
| 11453 |
- (void)printf("install: mkdir %s\n", |
| 11454 |
- path); |
| 11455 |
|
| 11456 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch |
| 11457 |
deleted file mode 100644 |
| 11458 |
index 5bd1d55..0000000 |
| 11459 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch |
| 11460 |
+++ /dev/null |
| 11461 |
@@ -1,55 +0,0 @@ |
| 11462 |
-Index: usr.bin/compress/zopen.c |
| 11463 |
-=================================================================== |
| 11464 |
---- usr.bin/compress/zopen.c (revision 225020) |
| 11465 |
-+++ usr.bin/compress/zopen.c (working copy) |
| 11466 |
-@@ -486,7 +486,7 @@ zread(void *cookie, char *rbp, int num) |
| 11467 |
- block_compress = maxbits & BLOCK_MASK; |
| 11468 |
- maxbits &= BIT_MASK; |
| 11469 |
- maxmaxcode = 1L << maxbits; |
| 11470 |
-- if (maxbits > BITS) { |
| 11471 |
-+ if (maxbits > BITS || maxbits < 12) { |
| 11472 |
- errno = EFTYPE; |
| 11473 |
- return (-1); |
| 11474 |
- } |
| 11475 |
-@@ -513,17 +513,28 @@ zread(void *cookie, char *rbp, int num) |
| 11476 |
- for (code = 255; code >= 0; code--) |
| 11477 |
- tab_prefixof(code) = 0; |
| 11478 |
- clear_flg = 1; |
| 11479 |
-- free_ent = FIRST - 1; |
| 11480 |
-- if ((code = getcode(zs)) == -1) /* O, untimely death! */ |
| 11481 |
-- break; |
| 11482 |
-+ free_ent = FIRST; |
| 11483 |
-+ oldcode = -1; |
| 11484 |
-+ continue; |
| 11485 |
- } |
| 11486 |
- incode = code; |
| 11487 |
- |
| 11488 |
-- /* Special case for KwKwK string. */ |
| 11489 |
-+ /* Special case for kWkWk string. */ |
| 11490 |
- if (code >= free_ent) { |
| 11491 |
-+ if (code > free_ent || oldcode == -1) { |
| 11492 |
-+ /* Bad stream. */ |
| 11493 |
-+ errno = EINVAL; |
| 11494 |
-+ return (-1); |
| 11495 |
-+ } |
| 11496 |
- *stackp++ = finchar; |
| 11497 |
- code = oldcode; |
| 11498 |
- } |
| 11499 |
-+ /* |
| 11500 |
-+ * The above condition ensures that code < free_ent. |
| 11501 |
-+ * The construction of tab_prefixof in turn guarantees that |
| 11502 |
-+ * each iteration decreases code and therefore stack usage is |
| 11503 |
-+ * bound by 1 << BITS - 256. |
| 11504 |
-+ */ |
| 11505 |
- |
| 11506 |
- /* Generate output characters in reverse order. */ |
| 11507 |
- while (code >= 256) { |
| 11508 |
-@@ -540,7 +551,7 @@ middle: do { |
| 11509 |
- } while (stackp > de_stack); |
| 11510 |
- |
| 11511 |
- /* Generate the new entry. */ |
| 11512 |
-- if ((code = free_ent) < maxmaxcode) { |
| 11513 |
-+ if ((code = free_ent) < maxmaxcode && oldcode != -1) { |
| 11514 |
- tab_prefixof(code) = (u_short) oldcode; |
| 11515 |
- tab_suffixof(code) = finchar; |
| 11516 |
- free_ent = code + 1; |
| 11517 |
|
| 11518 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch |
| 11519 |
deleted file mode 100644 |
| 11520 |
index d34eb9e..0000000 |
| 11521 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch |
| 11522 |
+++ /dev/null |
| 11523 |
@@ -1,11 +0,0 @@ |
| 11524 |
-diff -uNr usr.bin.old/calendar/Makefile usr.bin/calendar/Makefile |
| 11525 |
---- usr.bin.old/calendar/Makefile 2011-11-02 18:22:09.000000000 +0000 |
| 11526 |
-+++ usr.bin/calendar/Makefile 2011-11-02 18:22:48.000000000 +0000 |
| 11527 |
-@@ -15,6 +15,7 @@ |
| 11528 |
- WARNS?= 7 |
| 11529 |
- |
| 11530 |
- beforeinstall: |
| 11531 |
-+ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar |
| 11532 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ |
| 11533 |
- ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar |
| 11534 |
- .for lang in ${INTER} |
| 11535 |
|
| 11536 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch |
| 11537 |
deleted file mode 100644 |
| 11538 |
index d4d89e1..0000000 |
| 11539 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch |
| 11540 |
+++ /dev/null |
| 11541 |
@@ -1,19 +0,0 @@ |
| 11542 |
-diff -Nur usr.bin.orig/ar/ar.c usr.bin/ar/ar.c |
| 11543 |
---- usr.bin.orig/ar/ar.c 2012-01-03 12:23:45.000000000 +0900 |
| 11544 |
-+++ usr.bin/ar/ar.c 2012-12-25 20:50:29.000000000 +0900 |
| 11545 |
-@@ -386,13 +386,13 @@ |
| 11546 |
- static void |
| 11547 |
- bsdar_version(void) |
| 11548 |
- { |
| 11549 |
-- (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version()); |
| 11550 |
-+ (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version_string()); |
| 11551 |
- exit(EX_OK); |
| 11552 |
- } |
| 11553 |
- |
| 11554 |
- static void |
| 11555 |
- ranlib_version(void) |
| 11556 |
- { |
| 11557 |
-- (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version()); |
| 11558 |
-+ (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version_string()); |
| 11559 |
- exit(EX_OK); |
| 11560 |
- } |
| 11561 |
|
| 11562 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch |
| 11563 |
deleted file mode 100644 |
| 11564 |
index a65185f..0000000 |
| 11565 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch |
| 11566 |
+++ /dev/null |
| 11567 |
@@ -1,25 +0,0 @@ |
| 11568 |
-diff -Nur work.orig/usr.bin/ar/Makefile work/usr.bin/ar/Makefile |
| 11569 |
---- work.orig/usr.bin/ar/Makefile 2012-07-16 03:59:48.000000000 +0900 |
| 11570 |
-+++ work/usr.bin/ar/Makefile 2012-07-16 04:02:38.000000000 +0900 |
| 11571 |
-@@ -2,7 +2,7 @@ |
| 11572 |
- |
| 11573 |
- .include <bsd.own.mk> |
| 11574 |
- |
| 11575 |
--PROG= ar |
| 11576 |
-+PROG= freebsd-ar |
| 11577 |
- SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h |
| 11578 |
- |
| 11579 |
- DPADD= ${LIBARCHIVE} ${LIBELF} |
| 11580 |
-@@ -10,10 +10,7 @@ |
| 11581 |
- |
| 11582 |
- CFLAGS+=-I. -I${.CURDIR} |
| 11583 |
- |
| 11584 |
--.if ${MK_SHARED_TOOLCHAIN} == "no" |
| 11585 |
--NO_SHARED?= yes |
| 11586 |
--.endif |
| 11587 |
--LINKS= ${BINDIR}/ar ${BINDIR}/ranlib |
| 11588 |
--MLINKS= ar.1 ranlib.1 |
| 11589 |
-+LINKS= ${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib |
| 11590 |
-+MLINKS= freebsd-ar.1 freebsd-ranlib.1 |
| 11591 |
- |
| 11592 |
- .include <bsd.prog.mk> |
| 11593 |
|
| 11594 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch |
| 11595 |
deleted file mode 100644 |
| 11596 |
index 06cc5d2..0000000 |
| 11597 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch |
| 11598 |
+++ /dev/null |
| 11599 |
@@ -1,17 +0,0 @@ |
| 11600 |
-diff -Nur work.orig/usr.bin/grep/Makefile work/usr.bin/grep/Makefile |
| 11601 |
---- work.orig/usr.bin/grep/Makefile 2012-07-16 04:59:01.000000000 +0900 |
| 11602 |
-+++ work/usr.bin/grep/Makefile 2012-07-16 05:00:15.000000000 +0900 |
| 11603 |
-@@ -40,13 +40,6 @@ |
| 11604 |
- grep.1 lzfgrep.1 |
| 11605 |
- .endif |
| 11606 |
- |
| 11607 |
--LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \ |
| 11608 |
-- ${BINDIR}/${PROG} ${BINDIR}/xzegrep \ |
| 11609 |
-- ${BINDIR}/${PROG} ${BINDIR}/xzfgrep \ |
| 11610 |
-- ${BINDIR}/${PROG} ${BINDIR}/lzgrep \ |
| 11611 |
-- ${BINDIR}/${PROG} ${BINDIR}/lzegrep \ |
| 11612 |
-- ${BINDIR}/${PROG} ${BINDIR}/lzfgrep |
| 11613 |
-- |
| 11614 |
- LDADD= -lz -llzma |
| 11615 |
- DPADD= ${LIBZ} ${LIBLZMA} |
| 11616 |
- |
| 11617 |
|
| 11618 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch |
| 11619 |
deleted file mode 100644 |
| 11620 |
index d98e599..0000000 |
| 11621 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch |
| 11622 |
+++ /dev/null |
| 11623 |
@@ -1,24 +0,0 @@ |
| 11624 |
-diff -Nur work.orig/usr.bin/kdump/Makefile work/usr.bin/kdump/Makefile |
| 11625 |
---- work.orig/usr.bin/kdump/Makefile 2012-07-12 13:24:01.000000000 +0900 |
| 11626 |
-+++ work/usr.bin/kdump/Makefile 2012-07-16 03:54:14.000000000 +0900 |
| 11627 |
-@@ -21,7 +21,7 @@ |
| 11628 |
- |
| 11629 |
- ioctl.c: mkioctls |
| 11630 |
- env CPP="${CPP}" \ |
| 11631 |
-- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} |
| 11632 |
-+ sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} |
| 11633 |
- |
| 11634 |
- kdump_subr.c: mksubr |
| 11635 |
- sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET} |
| 11636 |
-diff -Nur work.orig/usr.bin/truss/Makefile work/usr.bin/truss/Makefile |
| 11637 |
---- work.orig/usr.bin/truss/Makefile 2012-07-12 13:24:03.000000000 +0900 |
| 11638 |
-+++ work/usr.bin/truss/Makefile 2012-07-16 03:54:40.000000000 +0900 |
| 11639 |
-@@ -24,7 +24,7 @@ |
| 11640 |
- |
| 11641 |
- ioctl.c: ${.CURDIR}/../kdump/mkioctls |
| 11642 |
- env CPP="${CPP}" \ |
| 11643 |
-- sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} |
| 11644 |
-+ sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET} |
| 11645 |
- |
| 11646 |
- .if ${MACHINE_CPUARCH} == "i386" |
| 11647 |
- SRCS+= i386-linux.c linux_syscalls.h |
| 11648 |
|
| 11649 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch |
| 11650 |
deleted file mode 100644 |
| 11651 |
index a9c0622..0000000 |
| 11652 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch |
| 11653 |
+++ /dev/null |
| 11654 |
@@ -1,10 +0,0 @@ |
| 11655 |
-diff -Nur work.orig/usr.bin/minigzip/Makefile work/usr.bin/minigzip/Makefile |
| 11656 |
---- work.orig/usr.bin/minigzip/Makefile 2012-07-16 04:39:31.000000000 +0900 |
| 11657 |
-+++ work/usr.bin/minigzip/Makefile 2012-07-16 04:45:30.000000000 +0900 |
| 11658 |
-@@ -10,4 +10,6 @@ |
| 11659 |
- DPADD= ${LIBZ} |
| 11660 |
- LDADD= -lz |
| 11661 |
- |
| 11662 |
-+CFLAGS+= -I${.CURDIR}/../../lib/libz |
| 11663 |
-+ |
| 11664 |
- .include <bsd.prog.mk> |
| 11665 |
|
| 11666 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch |
| 11667 |
deleted file mode 100644 |
| 11668 |
index 9774724..0000000 |
| 11669 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch |
| 11670 |
+++ /dev/null |
| 11671 |
@@ -1,24 +0,0 @@ |
| 11672 |
-diff -ur usr.bin.orig/xlint/llib/llib-lposix usr.bin/xlint/llib/llib-lposix |
| 11673 |
---- usr.bin.orig/xlint/llib/llib-lposix 2005-04-29 17:30:03 +0000 |
| 11674 |
-+++ usr.bin/xlint/llib/llib-lposix 2005-05-03 14:12:26 +0000 |
| 11675 |
-@@ -42,7 +42,7 @@ |
| 11676 |
- #include <sys/utsname.h> |
| 11677 |
- #include <sys/times.h> |
| 11678 |
- #include <stdio.h> |
| 11679 |
--#include <stdarg.h> |
| 11680 |
-+#include <machine/stdarg.h> |
| 11681 |
- #include <stdlib.h> |
| 11682 |
- #include <unistd.h> |
| 11683 |
- #include <math.h> |
| 11684 |
-diff -ur usr.bin.orig/xlint/llib/llib-lstdc usr.bin/xlint/llib/llib-lstdc |
| 11685 |
---- usr.bin.orig/xlint/llib/llib-lstdc 2005-04-29 17:30:03 +0000 |
| 11686 |
-+++ usr.bin/xlint/llib/llib-lstdc 2005-05-03 14:12:35 +0000 |
| 11687 |
-@@ -44,7 +44,7 @@ |
| 11688 |
- #include <math.h> |
| 11689 |
- #include <setjmp.h> |
| 11690 |
- #include <signal.h> |
| 11691 |
--#include <stdarg.h> |
| 11692 |
-+#include <machine/stdarg.h> |
| 11693 |
- #include <stddef.h> |
| 11694 |
- #include <stdio.h> |
| 11695 |
- #include <stdlib.h> |
| 11696 |
|
| 11697 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch |
| 11698 |
deleted file mode 100644 |
| 11699 |
index 631ee4f..0000000 |
| 11700 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch |
| 11701 |
+++ /dev/null |
| 11702 |
@@ -1,129 +0,0 @@ |
| 11703 |
-diff -ur usr.bin.orig/at/Makefile usr.bin.setXid/at/Makefile |
| 11704 |
---- usr.bin.orig/at/Makefile Thu Apr 7 20:52:57 2005 |
| 11705 |
-+++ usr.bin.setXid/at/Makefile Thu Apr 7 21:21:02 2005 |
| 11706 |
-@@ -15,6 +15,8 @@ |
| 11707 |
- BINMODE= 4555 |
| 11708 |
- CLEANFILES+= at.1 |
| 11709 |
- |
| 11710 |
-+LDFLAGS+=-Wl,-z,now |
| 11711 |
-+ |
| 11712 |
- at.1: at.man |
| 11713 |
- @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ |
| 11714 |
- sed -e \ |
| 11715 |
-diff -ur usr.bin.orig/chpass/Makefile usr.bin.setXid/chpass/Makefile |
| 11716 |
---- usr.bin.orig/chpass/Makefile Thu Apr 7 20:52:57 2005 |
| 11717 |
-+++ usr.bin.setXid/chpass/Makefile Thu Apr 7 21:22:40 2005 |
| 11718 |
-@@ -15,6 +15,8 @@ |
| 11719 |
- #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE |
| 11720 |
- CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I. |
| 11721 |
- |
| 11722 |
-+LDFLAGS+=-Wl,-z,now |
| 11723 |
-+ |
| 11724 |
- DPADD= ${LIBCRYPT} ${LIBUTIL} |
| 11725 |
- LDADD= -lcrypt -lutil |
| 11726 |
- .if !defined(NO_NIS) |
| 11727 |
-diff -ur usr.bin.orig/fstat/Makefile usr.bin.setXid/fstat/Makefile |
| 11728 |
---- usr.bin.orig/fstat/Makefile Thu Apr 7 20:52:57 2005 |
| 11729 |
-+++ usr.bin.setXid/fstat/Makefile Thu Apr 7 21:24:35 2005 |
| 11730 |
-@@ -9,4 +9,6 @@ |
| 11731 |
- BINMODE=2555 |
| 11732 |
- WARNS?= 6 |
| 11733 |
- |
| 11734 |
-+LDFLAGS+=-Wl,-z,now |
| 11735 |
-+ |
| 11736 |
- .include <bsd.prog.mk> |
| 11737 |
-diff -ur usr.bin.orig/lock/Makefile usr.bin.setXid/lock/Makefile |
| 11738 |
---- usr.bin.orig/lock/Makefile Thu Apr 7 20:52:57 2005 |
| 11739 |
-+++ usr.bin.setXid/lock/Makefile Thu Apr 7 21:24:45 2005 |
| 11740 |
-@@ -7,4 +7,6 @@ |
| 11741 |
- DPADD= ${LIBCRYPT} |
| 11742 |
- LDADD= -lcrypt |
| 11743 |
- |
| 11744 |
-+LDFLAGS+=-Wl,-z,now |
| 11745 |
-+ |
| 11746 |
- .include <bsd.prog.mk> |
| 11747 |
-diff -ur usr.bin.orig/login/Makefile usr.bin.setXid/login/Makefile |
| 11748 |
---- usr.bin.orig/login/Makefile Thu Apr 7 20:52:57 2005 |
| 11749 |
-+++ usr.bin.setXid/login/Makefile Thu Apr 7 21:24:55 2005 |
| 11750 |
-@@ -13,4 +13,6 @@ |
| 11751 |
- INSTALLFLAGS=-fschg |
| 11752 |
- .endif |
| 11753 |
- |
| 11754 |
-+LDFLAGS+=-Wl,-z,now |
| 11755 |
-+ |
| 11756 |
- .include <bsd.prog.mk> |
| 11757 |
-diff -ur usr.bin.orig/netstat/Makefile usr.bin.setXid/netstat/Makefile |
| 11758 |
---- usr.bin.orig/netstat/Makefile Thu Apr 7 20:52:58 2005 |
| 11759 |
-+++ usr.bin.setXid/netstat/Makefile Thu Apr 7 21:25:08 2005 |
| 11760 |
-@@ -14,4 +14,6 @@ |
| 11761 |
- DPADD= ${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL} |
| 11762 |
- LDADD= -lkvm -lipx -lnetgraph -lutil |
| 11763 |
- |
| 11764 |
-+LDFLAGS+=-Wl,-z,now |
| 11765 |
-+ |
| 11766 |
- .include <bsd.prog.mk> |
| 11767 |
-diff -ur usr.bin.orig/opieinfo/Makefile usr.bin.setXid/opieinfo/Makefile |
| 11768 |
---- usr.bin.orig/opieinfo/Makefile Thu Apr 7 20:52:58 2005 |
| 11769 |
-+++ usr.bin.setXid/opieinfo/Makefile Thu Apr 7 21:25:20 2005 |
| 11770 |
-@@ -11,6 +11,8 @@ |
| 11771 |
- DPADD= ${LIBOPIE} ${LIBMD} |
| 11772 |
- LDADD= -lopie -lmd |
| 11773 |
- |
| 11774 |
-+LDFLAGS+=-Wl,-z,now |
| 11775 |
-+ |
| 11776 |
- BINOWN= root |
| 11777 |
- BINMODE=4555 |
| 11778 |
- INSTALLFLAGS=-fschg |
| 11779 |
-diff -ur usr.bin.orig/opiepasswd/Makefile usr.bin.setXid/opiepasswd/Makefile |
| 11780 |
---- usr.bin.orig/opiepasswd/Makefile Thu Apr 7 20:52:58 2005 |
| 11781 |
-+++ usr.bin.setXid/opiepasswd/Makefile Thu Apr 7 21:25:29 2005 |
| 11782 |
-@@ -11,6 +11,8 @@ |
| 11783 |
- DPADD= ${LIBOPIE} ${LIBMD} |
| 11784 |
- LDADD= -lopie -lmd |
| 11785 |
- |
| 11786 |
-+LDFLAGS+=-Wl,-z,now |
| 11787 |
-+ |
| 11788 |
- BINOWN= root |
| 11789 |
- BINMODE=4555 |
| 11790 |
- INSTALLFLAGS=-fschg |
| 11791 |
-diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile |
| 11792 |
---- usr.bin.orig/passwd/Makefile Thu Apr 7 20:52:58 2005 |
| 11793 |
-+++ usr.bin.setXid/passwd/Makefile Thu Apr 7 21:25:37 2005 |
| 11794 |
-@@ -10,6 +10,8 @@ |
| 11795 |
- MLINKS = passwd.1 yppasswd.1 |
| 11796 |
- WARNS ?= 4 |
| 11797 |
- |
| 11798 |
-+LDFLAGS+=-Wl,-z,now |
| 11799 |
-+ |
| 11800 |
- beforeinstall: |
| 11801 |
- .for i in passwd yppasswd |
| 11802 |
- [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ |
| 11803 |
---- usr.bin.orig/su/Makefile Thu Apr 7 20:52:58 2005 |
| 11804 |
-+++ usr.bin.setXid/su/Makefile Thu Apr 7 21:26:00 2005 |
| 11805 |
-@@ -10,4 +10,6 @@ |
| 11806 |
- BINMODE=4555 |
| 11807 |
- INSTALLFLAGS=-fschg |
| 11808 |
- |
| 11809 |
-+LDFLAGS+=-Wl,-z,now |
| 11810 |
-+ |
| 11811 |
- .include <bsd.prog.mk> |
| 11812 |
-diff -ur usr.bin.orig/wall/Makefile usr.bin.setXid/wall/Makefile |
| 11813 |
---- usr.bin.orig/wall/Makefile Thu Apr 7 20:52:59 2005 |
| 11814 |
-+++ usr.bin.setXid/wall/Makefile Thu Apr 7 21:26:07 2005 |
| 11815 |
-@@ -5,4 +5,6 @@ |
| 11816 |
- BINGRP= tty |
| 11817 |
- BINMODE=2555 |
| 11818 |
- |
| 11819 |
-+LDFLAGS+=-Wl,-z,now |
| 11820 |
-+ |
| 11821 |
- .include <bsd.prog.mk> |
| 11822 |
-diff -ur usr.bin.orig/write/Makefile usr.bin.setXid/write/Makefile |
| 11823 |
---- usr.bin.orig/write/Makefile Thu Apr 7 20:52:59 2005 |
| 11824 |
-+++ usr.bin.setXid/write/Makefile Thu Apr 7 21:26:13 2005 |
| 11825 |
-@@ -4,4 +4,6 @@ |
| 11826 |
- BINMODE=2555 |
| 11827 |
- BINGRP= tty |
| 11828 |
- |
| 11829 |
-+LDFLAGS+=-Wl,-z,now |
| 11830 |
-+ |
| 11831 |
- .include <bsd.prog.mk> |
| 11832 |
|
| 11833 |
diff --git a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron b/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron |
| 11834 |
deleted file mode 100644 |
| 11835 |
index 323f455..0000000 |
| 11836 |
--- a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron |
| 11837 |
+++ /dev/null |
| 11838 |
@@ -1,6 +0,0 @@ |
| 11839 |
-#! /bin/sh |
| 11840 |
- |
| 11841 |
-if [ -x /usr/libexec/locate.updatedb ] |
| 11842 |
-then |
| 11843 |
- echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody |
| 11844 |
-fi |
| 11845 |
|
| 11846 |
diff --git a/sys-freebsd/freebsd-ubin/files/login.1.pamd b/sys-freebsd/freebsd-ubin/files/login.1.pamd |
| 11847 |
deleted file mode 100644 |
| 11848 |
index 2c09584..0000000 |
| 11849 |
--- a/sys-freebsd/freebsd-ubin/files/login.1.pamd |
| 11850 |
+++ /dev/null |
| 11851 |
@@ -1,4 +0,0 @@ |
| 11852 |
-auth include system-local-login |
| 11853 |
-account include system-local-login |
| 11854 |
-session include system-local-login |
| 11855 |
-password include system-local-login |
| 11856 |
|
| 11857 |
diff --git a/sys-freebsd/freebsd-ubin/files/login.pamd b/sys-freebsd/freebsd-ubin/files/login.pamd |
| 11858 |
deleted file mode 100644 |
| 11859 |
index db1c74f..0000000 |
| 11860 |
--- a/sys-freebsd/freebsd-ubin/files/login.pamd |
| 11861 |
+++ /dev/null |
| 11862 |
@@ -1,20 +0,0 @@ |
| 11863 |
-# |
| 11864 |
-# $Id$ |
| 11865 |
-# |
| 11866 |
-# PAM configuration for the "login" service |
| 11867 |
-# |
| 11868 |
- |
| 11869 |
-# auth |
| 11870 |
-auth required pam_nologin.so no_warn |
| 11871 |
-auth sufficient pam_self.so no_warn |
| 11872 |
-auth include system |
| 11873 |
- |
| 11874 |
-# account |
| 11875 |
-account requisite pam_securetty.so |
| 11876 |
-account include system |
| 11877 |
- |
| 11878 |
-# session |
| 11879 |
-session include system |
| 11880 |
- |
| 11881 |
-# password |
| 11882 |
-password include system |
| 11883 |
|
| 11884 |
diff --git a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd b/sys-freebsd/freebsd-ubin/files/passwd.1.pamd |
| 11885 |
deleted file mode 100644 |
| 11886 |
index bab2eea..0000000 |
| 11887 |
--- a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd |
| 11888 |
+++ /dev/null |
| 11889 |
@@ -1,9 +0,0 @@ |
| 11890 |
-# |
| 11891 |
-# $Id$ |
| 11892 |
-# |
| 11893 |
-# PAM configuration for the "passwd" service |
| 11894 |
-# |
| 11895 |
- |
| 11896 |
-# passwd(1) does not use the auth, account or session services. |
| 11897 |
- |
| 11898 |
-password include system-auth |
| 11899 |
|
| 11900 |
diff --git a/sys-freebsd/freebsd-ubin/files/passwd.pamd b/sys-freebsd/freebsd-ubin/files/passwd.pamd |
| 11901 |
deleted file mode 100644 |
| 11902 |
index 44b7e71..0000000 |
| 11903 |
--- a/sys-freebsd/freebsd-ubin/files/passwd.pamd |
| 11904 |
+++ /dev/null |
| 11905 |
@@ -1,11 +0,0 @@ |
| 11906 |
-# |
| 11907 |
-# $Id$ |
| 11908 |
-# |
| 11909 |
-# PAM configuration for the "passwd" service |
| 11910 |
-# |
| 11911 |
- |
| 11912 |
-# passwd(1) does not use the auth, account or session services. |
| 11913 |
- |
| 11914 |
-# password |
| 11915 |
-#password requisite pam_passwdqc.so enforce=users |
| 11916 |
-password required pam_unix.so no_warn try_first_pass nullok |
| 11917 |
|
| 11918 |
diff --git a/sys-freebsd/freebsd-ubin/files/su.1.pamd b/sys-freebsd/freebsd-ubin/files/su.1.pamd |
| 11919 |
deleted file mode 100644 |
| 11920 |
index 72e2bd1..0000000 |
| 11921 |
--- a/sys-freebsd/freebsd-ubin/files/su.1.pamd |
| 11922 |
+++ /dev/null |
| 11923 |
@@ -1,17 +0,0 @@ |
| 11924 |
-# |
| 11925 |
-# $Id$ |
| 11926 |
-# |
| 11927 |
-# PAM configuration for the "su" service |
| 11928 |
-# |
| 11929 |
- |
| 11930 |
-# auth |
| 11931 |
-auth sufficient pam_rootok.so no_warn |
| 11932 |
-auth sufficient pam_self.so no_warn |
| 11933 |
-auth requisite pam_group.so no_warn group=wheel root_only fail_safe |
| 11934 |
-auth include system-auth |
| 11935 |
- |
| 11936 |
-# account |
| 11937 |
-account include system-auth |
| 11938 |
- |
| 11939 |
-# session |
| 11940 |
-session required pam_permit.so |
| 11941 |
|
| 11942 |
diff --git a/sys-freebsd/freebsd-ubin/files/su.pamd b/sys-freebsd/freebsd-ubin/files/su.pamd |
| 11943 |
deleted file mode 100644 |
| 11944 |
index 57019c5..0000000 |
| 11945 |
--- a/sys-freebsd/freebsd-ubin/files/su.pamd |
| 11946 |
+++ /dev/null |
| 11947 |
@@ -1,17 +0,0 @@ |
| 11948 |
-# |
| 11949 |
-# $Id$ |
| 11950 |
-# |
| 11951 |
-# PAM configuration for the "su" service |
| 11952 |
-# |
| 11953 |
- |
| 11954 |
-# auth |
| 11955 |
-auth sufficient pam_rootok.so no_warn |
| 11956 |
-auth sufficient pam_self.so no_warn |
| 11957 |
-auth requisite pam_group.so no_warn group=wheel root_only fail_safe |
| 11958 |
-auth include system |
| 11959 |
- |
| 11960 |
-# account |
| 11961 |
-account include system |
| 11962 |
- |
| 11963 |
-# session |
| 11964 |
-session required pam_permit.so |
| 11965 |
|
| 11966 |
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild |
| 11967 |
deleted file mode 100644 |
| 11968 |
index 537aad0..0000000 |
| 11969 |
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0.ebuild |
| 11970 |
+++ /dev/null |
| 11971 |
@@ -1,209 +0,0 @@ |
| 11972 |
-# Copyright 1999-2016 Gentoo Foundation |
| 11973 |
-# Distributed under the terms of the GNU General Public License v2 |
| 11974 |
-# $Id$ |
| 11975 |
- |
| 11976 |
-EAPI=5 |
| 11977 |
- |
| 11978 |
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build |
| 11979 |
- |
| 11980 |
-DESCRIPTION="FreeBSD's base system source for /usr/bin" |
| 11981 |
-SLOT="0" |
| 11982 |
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" |
| 11983 |
-LICENSE="BSD zfs? ( CDDL )" |
| 11984 |
- |
| 11985 |
-if [[ ${PV} != *9999* ]]; then |
| 11986 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 11987 |
- SRC_URI="${SRC_URI} |
| 11988 |
- $(freebsd_upstream_patches)" |
| 11989 |
-fi |
| 11990 |
- |
| 11991 |
-EXTRACTONLY=" |
| 11992 |
- usr.bin/ |
| 11993 |
- contrib/ |
| 11994 |
- lib/ |
| 11995 |
- etc/ |
| 11996 |
- bin/ |
| 11997 |
- include/ |
| 11998 |
-" |
| 11999 |
- |
| 12000 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}] |
| 12001 |
- ssl? ( dev-libs/openssl:0= ) |
| 12002 |
- kerberos? ( virtual/krb5 ) |
| 12003 |
- ar? ( >=app-arch/libarchive-3 ) |
| 12004 |
- virtual/pam |
| 12005 |
- sys-libs/zlib |
| 12006 |
- >=sys-libs/ncurses-5.9:0= |
| 12007 |
- !sys-process/fuser-bsd |
| 12008 |
- !dev-util/csup |
| 12009 |
- !dev-libs/libiconv |
| 12010 |
- !sys-freebsd/freebsd-contrib" |
| 12011 |
- |
| 12012 |
-DEPEND="${RDEPEND} |
| 12013 |
- sys-devel/flex |
| 12014 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
| 12015 |
- =sys-freebsd/freebsd-sbin-${RV}* |
| 12016 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
| 12017 |
- |
| 12018 |
-RDEPEND="${RDEPEND} |
| 12019 |
- >=sys-auth/pambase-20080219.1 |
| 12020 |
- sys-process/cronbase" |
| 12021 |
- |
| 12022 |
-S="${WORKDIR}/usr.bin" |
| 12023 |
- |
| 12024 |
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" |
| 12025 |
- "${FILESDIR}/${PN}-9.0-fixmakefiles.patch" |
| 12026 |
- "${FILESDIR}/${PN}-11.0-setXid.patch" |
| 12027 |
- "${FILESDIR}/${PN}-lint-stdarg.patch" |
| 12028 |
- "${FILESDIR}/${PN}-9.1-bsdar.patch" |
| 12029 |
- "${FILESDIR}/${PN}-9.1-minigzip.patch" |
| 12030 |
- "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" |
| 12031 |
- "${FILESDIR}/${PN}-10.2-talk-workaround.patch" |
| 12032 |
- "${FILESDIR}/${PN}-10.2-bsdxml.patch" ) |
| 12033 |
- |
| 12034 |
-# Here we remove some sources we don't need because they are already |
| 12035 |
-# provided by portage's packages or similar. In order: |
| 12036 |
-# - Archiving tools, provided by their own ebuilds |
| 12037 |
-# - ncurses stuff |
| 12038 |
-# - less stuff |
| 12039 |
-# - bind utils |
| 12040 |
-# - rsh stuff |
| 12041 |
-# - binutils gprof |
| 12042 |
-# - dc stuff |
| 12043 |
-# and the rest are misc utils we already provide somewhere else. |
| 12044 |
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio |
| 12045 |
- gzip gprof |
| 12046 |
- lzmainfo xz xzdec |
| 12047 |
- unzip |
| 12048 |
- tput tset tabs |
| 12049 |
- less lessecho lesskey |
| 12050 |
- hesinfo host |
| 12051 |
- rsh rlogin rusers rwho ruptime |
| 12052 |
- compile_et lex vi smbutil file vacation nc ftp telnet |
| 12053 |
- c99 c89 |
| 12054 |
- bc dc |
| 12055 |
- whois tftp man |
| 12056 |
- addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings" |
| 12057 |
- |
| 12058 |
-pkg_setup() { |
| 12059 |
- # Add the required source files. |
| 12060 |
- use zfs && EXTRACTONLY+="cddl/ " |
| 12061 |
- use build && EXTRACTONLY+="sys/ " |
| 12062 |
- |
| 12063 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 12064 |
- use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " |
| 12065 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
| 12066 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
| 12067 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " |
| 12068 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
| 12069 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
| 12070 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
| 12071 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
| 12072 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
| 12073 |
- mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= " |
| 12074 |
-} |
| 12075 |
- |
| 12076 |
-pkg_preinst() { |
| 12077 |
- # bison installs a /usr/bin/yacc symlink ... |
| 12078 |
- # we need to remove it to avoid triggering |
| 12079 |
- # collision-protect errors |
| 12080 |
- if [[ -L ${ROOT}/usr/bin/yacc ]] ; then |
| 12081 |
- rm -f "${ROOT}"/usr/bin/yacc |
| 12082 |
- fi |
| 12083 |
-} |
| 12084 |
- |
| 12085 |
-src_prepare() { |
| 12086 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
| 12087 |
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" |
| 12088 |
- fi |
| 12089 |
- |
| 12090 |
- # Rename manpage for renamed cmp |
| 12091 |
- mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die |
| 12092 |
- # Rename manpage for renamed ar |
| 12093 |
- mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die |
| 12094 |
- # Fix whereis(1) manpath search. |
| 12095 |
- sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" |
| 12096 |
- |
| 12097 |
- # Build a dynamic make |
| 12098 |
- sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die |
| 12099 |
- |
| 12100 |
- # Disable it here otherwise our patch wont apply |
| 12101 |
- use ar || dummy_mk ar |
| 12102 |
- |
| 12103 |
- # Preparing to build xlint |
| 12104 |
- export LINT=xlint |
| 12105 |
-} |
| 12106 |
- |
| 12107 |
-setup_multilib_vars() { |
| 12108 |
- if ! multilib_is_native_abi ; then |
| 12109 |
- cd "${WORKDIR}/usr.bin/ldd" || die |
| 12110 |
- export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" |
| 12111 |
- else |
| 12112 |
- cd "${S}" || die |
| 12113 |
- fi |
| 12114 |
- "$@" |
| 12115 |
-} |
| 12116 |
- |
| 12117 |
-src_compile() { |
| 12118 |
- # Preparing to build addr2line, elfcopy, m4 |
| 12119 |
- for dir in libelftc libpe libopenbsd ; do |
| 12120 |
- cd "${WORKDIR}/lib/${dir}" || die |
| 12121 |
- freebsd_src_compile -j1 |
| 12122 |
- done |
| 12123 |
- |
| 12124 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 12125 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 |
| 12126 |
-} |
| 12127 |
- |
| 12128 |
-src_install() { |
| 12129 |
- cd "${S}"/calendar/calendars || die |
| 12130 |
- for dir in $(find . -type d ! -name "." ) ; do |
| 12131 |
- dodir /usr/share/calendar/"$(basename ${dir})" |
| 12132 |
- done |
| 12133 |
- |
| 12134 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 12135 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
| 12136 |
- |
| 12137 |
- # baselayout requires these in /bin |
| 12138 |
- dodir /bin |
| 12139 |
- for bin in sed printf ; do |
| 12140 |
- mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" |
| 12141 |
- dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" |
| 12142 |
- done |
| 12143 |
- |
| 12144 |
- for pamdfile in login passwd su; do |
| 12145 |
- newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die |
| 12146 |
- done |
| 12147 |
- |
| 12148 |
- cd "${WORKDIR}/etc" || die |
| 12149 |
- insinto /etc |
| 12150 |
- doins remote phones opieaccess fbtab || die |
| 12151 |
- |
| 12152 |
- exeinto /etc/cron.daily |
| 12153 |
- newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die |
| 12154 |
- |
| 12155 |
- # tip requires /var/spool/lock/, bug #200700 |
| 12156 |
- keepdir /var/spool/lock |
| 12157 |
- |
| 12158 |
- # create locate database #472468 |
| 12159 |
- local f=/var/db/locate.database |
| 12160 |
- mkdir "${ED}${f%/*}" || die |
| 12161 |
- touch "${ED}${f}" || die |
| 12162 |
- fowners nobody:nobody ${f} |
| 12163 |
-} |
| 12164 |
- |
| 12165 |
-pkg_postinst() { |
| 12166 |
- # We need to ensure that login.conf.db is up-to-date. |
| 12167 |
- if [[ -e "${ROOT}"etc/login.conf ]] ; then |
| 12168 |
- einfo "Updating ${ROOT}etc/login.conf.db" |
| 12169 |
- "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf |
| 12170 |
- elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" |
| 12171 |
- fi |
| 12172 |
-} |
| 12173 |
- |
| 12174 |
-pkg_postrm() { |
| 12175 |
- # and if we uninstall yacc but keep bison, |
| 12176 |
- # lets restore the /usr/bin/yacc symlink |
| 12177 |
- if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then |
| 12178 |
- ln -s yacc.bison "${ROOT}"/usr/bin/yacc |
| 12179 |
- fi |
| 12180 |
-} |
| 12181 |
|
| 12182 |
diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml |
| 12183 |
deleted file mode 100644 |
| 12184 |
index a7fa78a..0000000 |
| 12185 |
--- a/sys-freebsd/freebsd-ubin/metadata.xml |
| 12186 |
+++ /dev/null |
| 12187 |
@@ -1,24 +0,0 @@ |
| 12188 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 12189 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 12190 |
-<pkgmetadata> |
| 12191 |
- <maintainer type="project"> |
| 12192 |
- <email>bsd@g.o</email> |
| 12193 |
- <name>BSD Project</name> |
| 12194 |
- </maintainer> |
| 12195 |
- <use> |
| 12196 |
- <flag name="audit"> |
| 12197 |
- Build auditing tools. |
| 12198 |
- </flag> |
| 12199 |
- <flag name="netware"> |
| 12200 |
- Build libraries and tools to work with NetWare protocols (IPX |
| 12201 |
- and NCP). |
| 12202 |
- </flag> |
| 12203 |
- <flag name="ar"> |
| 12204 |
- Build FreeBSD's ar and ranlib replacements based on libarchive. The |
| 12205 |
- toolchain will still use binutils' version but you can play with it. |
| 12206 |
- They have been renamed to freebsd-ar and freebsd-ranlib not to collide |
| 12207 |
- with binutils. |
| 12208 |
- </flag> |
| 12209 |
- <flag name="zfs">Enable ZFS support (for fstat actually).</flag> |
| 12210 |
- </use> |
| 12211 |
-</pkgmetadata> |
| 12212 |
|
| 12213 |
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest |
| 12214 |
deleted file mode 100644 |
| 12215 |
index 0236b14..0000000 |
| 12216 |
--- a/sys-freebsd/freebsd-usbin/Manifest |
| 12217 |
+++ /dev/null |
| 12218 |
@@ -1,33 +0,0 @@ |
| 12219 |
-AUX freebsd-usbin-10.0-bsdxml2expat.patch 835 SHA256 765ab05ef6d5d828d2cc54e78e0676dc2b6caac7193788524a7dd4cc5a983c8c SHA512 23bcfdc1657c1dd7fdb59c3717af5a5560c8f3c10d498aaae539e1779838a0a33cf247ae806c72c09d298fc9be3c02b5c3d1d9f1a879493c0e5d1aeb4dbf3509 WHIRLPOOL 2342438a26ef915f29d487aecedfd0920baa6c2130b3efd6fbd64d7a2bf81f74444e7409ceaceb29d4c5ad210af4cee0a4d98b0935131ff577a6103023f83f44 |
| 12220 |
-AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 SHA256 ddf45cbb311c6b1ba49617db48c54eac1f4d5279a40f038e64aef52732a04049 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd WHIRLPOOL fad08c17acc523e240a6ef9c0fbf79e12bd048d9bf4e688cad58ebd5f5b7ec69a39b8786e67f73c5baee4d606abae48a204b94a5b7753e25bc7d137e614a890b |
| 12221 |
-AUX freebsd-usbin-11.0-workaround.patch 374 SHA256 ecba0a19f110d07e76f1750441a62e22cfa00104bd9bae4cd3764fc07c9e9c6c SHA512 c9e8b493d99581dd7beac48def291843e31649a2962f720ed06ef095a128b039e8308662cfbbfcbecfbd0265132bb7a4df9d895ffe69aac09c129389ba5be518 WHIRLPOOL 44955062b41a72cc5671ca6b3911a0722860dae904ba9d0996d1c424b597ecedcbd8af053bfe017e1428b5ed857ef2be05d1836eafb6642a2e4747b4692cbdb5 |
| 12222 |
-AUX freebsd-usbin-7.0-nowrap.patch 1185 SHA256 a3c35cd997a22f4d212c3fe08d20fa7552b6de64527fee0166249ae76a3e49c8 SHA512 4374954aecddaf51acc8121b58ea28a4b411652c1deaea05cb600dac3d27a7e42bae1b2ad6f90ffc503d40f296ce627106545c8ad0f2dd23231d454e71f83fee WHIRLPOOL 7049020fc9383c374ca33b4b4ad5d8eb8b9f014922362fe67be1423da649c6ae2afbfeb6e8e0a13e5f77cc4b8f214b8e60d1ddb848a96213e65a2a77220db66b |
| 12223 |
-AUX freebsd-usbin-8.2-newsyslog.patch 400 SHA256 f13d5ea43531f42ff0cb42438b58875afce4046c650a7459fd2eac62dc11696e SHA512 f013a8911aaf1da759fae307276c482480d3938183f583d1c78c2711bf81e8cb9ebefa004112d4eb1fe7d9620527a49326e49186f0dfd9a9af9e0ff29d4aad56 WHIRLPOOL eb011fcc84e20873e8e86a0bbd101e4651c087b2f22716599bccd55b7ba28607520a450a2c98461ea7d78b2b52f233e6bfc4bf44cb11ec002ad7db631273ca24 |
| 12224 |
-AUX freebsd-usbin-9.0-libarchive.patch 409 SHA256 105ce2534fdcf17bdbda21154a4679aba76e75b541ae06f9783333f8b7acd30a SHA512 f30851631a7a181b12f7e749d0bf8d3ce1a93d9cfa74e0ae0b8a96d7278192bb5569f100d9c9bc423a7dc9d37dcbebdc69ac993ff11c6aa19f49eaf83bd3b4f1 WHIRLPOOL c1a5a32cb070ebbd94f4a6b30ca79d0b75525c4a04e52b565e60e94aa22b533e26d038f3757d2a4aee4e2893ed6a729482aee6a933fd1f34193bcff1ee05b3b6 |
| 12225 |
-AUX freebsd-usbin-9.0-newsyslog.patch 507 SHA256 d5f910655c66a3e766f227c25837347d11d796655d71480c3cf3526f4136d557 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae WHIRLPOOL 0551fde1581f3642535d1e34f2b111ed1404fc153ed14f4d7d4c75bc96715ed1eb3f218fc55fb2bb038616a929e106b8d8355f2de95447f7a93c09c515cdd511 |
| 12226 |
-AUX freebsd-usbin-9.1-bsdxml2expat.patch 431 SHA256 43f0ebe5406f6065d7dad45b4270f0645e7dc1d6db1bcdf1443e32aede9d7af6 SHA512 ef1e9be49796b50e8dd818ac1a6f363eaa54d767ac9477e3df09354df78dff887a31a3c793288f321b7976bd98de79821742550ee8e7f9fcf3b1a42cccbc68b0 WHIRLPOOL 17c14ef758cede73619f774710afd38862609da6302e0d2378e7b5124d38dd60c427218f140f67e1ea255a24f7eb6d900df1ad5835d23a135cef7cb5cc94bc73 |
| 12227 |
-AUX freebsd-usbin-9.1-kldxref.patch 756 SHA256 b9021def1c9e1a6ffcd66cc86e4086e75b3630e9d6ce40bd8c29b961bd0c570b SHA512 8d1e0c80a6698729bdf40e60ac0373ed76e4c394f7fc93e9ae78e9e8bb06d63c99d04dbb942e90cc9240fc429be7048c4fee22c3ce593b49be90c9df3fc549ec WHIRLPOOL ec37a7350499f5ad5225f3b41151d2b8b060e210cd441cac56e2d87471b08ef0e8cdcca6daad299988808b9c1083afcbbe4c281885a003bca95177b3de0e6c86 |
| 12228 |
-AUX freebsd-usbin-adduser.patch 428 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3 WHIRLPOOL 15a5a7e2c123a3103546134a27baad0a459758ec66bb0a7011684f367c7dd46435688f837d9d5fb5a9a51e95a58d6ce0e672c57a9dc2ef16a1e094a4b6e78931 |
| 12229 |
-AUX iscsid.initd 429 SHA256 b6b387111050dbca190ac0bd338de3c32ed8c1fd65121b0811fe01632431282e SHA512 49a90719aa0279e19899a2107113cad0784a2cf3b57a0c24ad08549fa4b44dcb1aceecd71027e363b8d2cbbe1b590480ef7806cb05d8b00c1830c2d77b8a8540 WHIRLPOOL ff71e62ac3ebaf749815856674702ac321c67f661609bd11bf702a2c62a800bed71f845942845fc508235d25f9b13c2682d84ff763d27806ecae55f4069dc97f |
| 12230 |
-AUX mountd.patch 542 SHA256 da895dabdb52c63d876c13605aa1ef446f8babb47100932b5b451155181a759f SHA512 c7a77ea1df0bd9c0a75b899a306aeb7fbee5ed4fb67a230d6348edbd238dc176267f19cd345f51b26ceef11b4657821ab752b333da5b03fc973bce3253e036e5 WHIRLPOOL a57f31ff146950d5aba5998dbd163f98321373dde5f731584c81bb841a8594422bb2ec44c63bd9e2742dbed3a03e200497948777a12b471d6dd7af9998578ad3 |
| 12231 |
-AUX moused.confd 713 SHA256 c85c4c59e7e23a3ac98c3a4beebbe452506bcb6614315810c0f79c7b2f335715 SHA512 247bd942e83a211f953b0bfae8f4cc7db517a1b53231557f652526b5440a173ec4e8b7e3207ad7c0765fa949c91c170edb4771329fa2d9921f60595cbdec0dd7 WHIRLPOOL 797dbaa3d90d1a3e62a0c4492207e0ef90612a44a972b590c42040d9aeb554d41ced104a61ea5e9f44d948c8bc88b144deb202af588eb06c7b59e5f5f0e1e9a9 |
| 12232 |
-AUX moused.initd 1670 SHA256 b5bb9d804e34303d1f29125db6be78a421af0fecc73190340b077312dc72cbc2 SHA512 e353ee859ec3657fb9357c8a72de34f36436b1b323e39652fec37612b11a56f59dbe3616d35edd30d50478b083ed2f14b144f14390c16a0a64d5916b4c73dc6e WHIRLPOOL 742bac13190f7a7a77289808560b6e7a04aecd5d2cb593857f997e519e1cdcccf20bc5f64a7514d639a9a4055fa896da30dfda147126f6fae12b00926e539a34 |
| 12233 |
-AUX nfs.confd 303 SHA256 5714e0cbcc45a077ab2348ee4fea521ce9f739927094dccb4b91817f1edaccb8 SHA512 4224c7f525e39b105b8d80caa7db0f3e0b07d6c521970b2aacfd707ef524262cbdb9ed8aa5151022d571a759151dd25a280fc765a38e67864b0c446ee9fd6b5a WHIRLPOOL 70bfff7d5288c692ed767c1e09d48db6c8546d90955a1957de87fd67cb42ed5b1efa0101cf2eea71e4702e1170eadeed9cc45937b742e51cee42c9edd00a1ee9 |
| 12234 |
-AUX nfs.initd 1424 SHA256 060a57ac9cb68d580405dcc7bc35b95aab3b97a0dea1f7c13a58dfa1fabb24a2 SHA512 1d85de665dfea1845189f2ad2e7205ab6185ce228f7140ccaafa22c84f8b9f0b4b4c5a26bd53895f1f2c4639bbeb8d5b76106d2e64851eb62f229028dc61cb5c WHIRLPOOL 1c5fee08af5cfd96153b98500f01c90123fcbc2c8e109d6b6e9c63bb5e4194eb004d03f80d9bf3f943050b37f3f9d84a72240784026024f679a174ca74c2a799 |
| 12235 |
-AUX nfsmount.initd 1481 SHA256 68f3dbd4c915e98440d601adfbf4d858fdc4d982e87967c0b509a53eda28d569 SHA512 7f298317a2aca491b539fbb52758702bae0f38f12925aa5fbd4a2ef11d39bb0060533deee845a68084a322cab24640ab76b2512a0597b7507ffe8aae23aba6fc WHIRLPOOL b051b733ee3c14933cf78d261a409d33879c32e48d197e2c101d7f5fd89d36b914b67c7b04cb9d2281a707a45a15621c799abfb743062a0e23530ab3eb682215 |
| 12236 |
-AUX nfsuserd.confd 153 SHA256 9575adaba684100f78ff1d60ca5e7b6f5be6fcda9e2d8fac2a1ab4aaf8944a59 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073 WHIRLPOOL 4e4aabc4c936c067d99133620a117d9c1fc539e23acfe9b15b4a7ebb57e3cb55b4ffab34b2af93fcfdf7fe81e4372e3afa38994ee999093aa1ec0a80c3c12175 |
| 12237 |
-AUX nfsuserd.initd 447 SHA256 34bf516e11f3b948f9df6d9833dbd18707c86238f3ee13bcf114587ebb8bf336 SHA512 e18cbd9efa3bf9e7283a9633bebfadfa9160b6eb668f48723bb9f1b37c5476b75b71b505046025a185a74d409ce09fd305257cdcb6e953c795ed1397fbe76323 WHIRLPOOL e77f07aaa3d9fdef566f206248c266a9d6f3e9aee3f5ca9e2c195ce9c35d4953d7152d47f95e6a3a5738b79afc3982140837837bb66d8b9e42c8e960d5d08d7a |
| 12238 |
-AUX powerd.confd 254 SHA256 39dc617f9aafc732762302120aa686ef8694591b0a2ec0cca79e7dc46ee9cfbc SHA512 c3e449561450e3579f93f5bda1c93f01a68ede2e9b6da56a7cb2f4eecf1313993fb4a384a2e65a1fd04e78b80732fab31349ee309368e28034f9467296cd1e0d WHIRLPOOL c1b07fd7ebf4231b9986850fdb41704b434c37f2b5f4b2d3517217f4195f38449bc0724d8fac736801f10cc67feabc6fa49d9ee86e793f05178f9328c9ae6acb |
| 12239 |
-AUX powerd.initd 661 SHA256 3690c8205247fa6f7a3dc17bb28ee2e8e382b266fb4dc1b59b36ff6742589840 SHA512 61be59ec99c82799bc10457e5ee3b4142d6372ecb7b49468b6acc81063a03e19a317d768f5c515e4ce1bdb296f2da59c895a065ea8d9572a31daa8886dedd052 WHIRLPOOL f8b08efc68dc853ff72ec23ba9b4bc4efd4aec89fd5180d73d7e4b6dd342550db6a1d9c2fa6b88852707f36a7fb9abe3496c7d7d4787c650b7177689eb5f65a4 |
| 12240 |
-AUX pw.conf 179 SHA256 0aa508e3911a80ccd1dc5005ec6f2e86e7c4fc5c99ca127f4d7e479d133c69ef SHA512 042b7c7805d891f453da58f607edb3174fddc8443d6995ebe833185ab313328c131bae87dbbc9db95bf69a9ee71548d350191b34a8b2bf41a56416aff03c3891 WHIRLPOOL 4edd4ba1aa0c2255fbd38dc9120a673d8e0b5a8fea50d95aa13c08df448c3fc584adfe8330cfce5bb5b06385d5855c2fed9beb210f8fb5f8e4d695bdedb6909c |
| 12241 |
-AUX rarpd.confd 155 SHA256 0c0f02cddf4ddfb2c2e01276f93f2d3470a75dc83e396209d6cbeff52e9b424b SHA512 95fb1b2ecc60f5cc434d949957dbd49a02afa7eee860e5b13fcc110c705560ea519f491e530de8fa9cbeb2577b9f0835ac98b762f6fa1c5cdb8292322821566d WHIRLPOOL 4641c548e2a5f0300138038032c472ffc12140ef7b4f1010166386a75fa1fb637ab8a735aeaa863b341b724970b0a45ba8ec0207d023846bfa09099b0fb98bd8 |
| 12242 |
-AUX rarpd.initd 754 SHA256 0c58add3ba88bd2a56cdaed7455aef5f33ed1cf89d401fa820d29893b21a035c SHA512 bccc40e34c19f885a274593c237e59c5c21e773ac91c5dc40d7344ef5e1d032b386976bf825f55598d8aa2b7e631b811fe352763932f075c340e5ca0a66dc781 WHIRLPOOL 214459c0d91f3bcf1afaec258c4ec27c583a174330935440ea94550e68f8415b59bf73545291136e63e76b0b1b386ee3f513ad67935fd7f78a45406eb3ae83be |
| 12243 |
-AUX rpc.lockd.initd 530 SHA256 56ddc340ce6d65292d17962fd475ded591fd80aeec312d9d2423dbae77bf170e SHA512 930c42b63a230f6f64ecdaec95f61e43b463abe109f926c298507fa3c6b090edba1f8dcc95046a0a5b8c0378d336fbf728f9db77b8b0822d0e2b36713fefc9e5 WHIRLPOOL dc5eb15dc4485cd2e24f69114521ea7b5e54e8ba3f48292137bc5ec91b9046255d7af9c3fec6a8597935b2d540933265de88e3cd45d9ea7660ea3c9c27a9a292 |
| 12244 |
-AUX rpc.statd.initd 520 SHA256 5f59ed36bc583821fb91431f6a3dce0094cfa8a90b2a93d76678d415f589f3ce SHA512 62c3bef69ca0619e3492050379a4c8b490305ab0ee7620143c31be7af414b1f1cbd79feaee345bd5e6bfdfa6c93bcce3cc9ff61a2f63e235a3807920e260cb7a WHIRLPOOL 737d7cad221b443929cd1f5cd7ec2b1a7d4dc3c091be5b871ca6b04bd57bccc7de49d4c7942baaa1b146c5a05034451d1977f6619fc1631eff582323bf7c0930 |
| 12245 |
-AUX rpcbind.initd 602 SHA256 dc1840f9456cf465770146f65c0969ec7da4b9ef3458f54d51c86c8a0f2cb15c SHA512 9ea0d631377275c763194875610acc6afb720068f8c57ec763cb99f7980f44572996b220659cad37a95c60e3847f17342da4282d2dbc4158d5ba7cbe3d56de86 WHIRLPOOL 4b888224d0ed5193f8574a43bb4622846e3fd4461178944e936e5a0e5361acd25a758ef41bb2fe880aaf417849f116931c0ee2426efd1edc62970f7178bdf7e9 |
| 12246 |
-AUX syscons.confd 348 SHA256 8d963ed1d6b63eed6b9f8bc1492c1e589458051e99f601e1ee0a8131890b0e70 SHA512 3dd50c0f223a93c0b0544fc9e85624fa78e045d2b6846242f431ea1ce4f121a33c1f3a0a2ef0763f45230dac0033d04c0d397e268f633d809e2466c269c22993 WHIRLPOOL a1ddfccb0aeb448e8d5086f9ba0554c0ff9fdd52003bf98bc2a1efbc7e2d835a79ea52886ac58e3818f9b5bc1d705658d2c8c1f05bad4bd7e5ef916ffe542451 |
| 12247 |
-AUX syscons.initd 1599 SHA256 e3637bc00a18ef3377c64123926a9079c57b8d113a338ac8306f4f1f7c585127 SHA512 5f4fb657f34584ebfd8f967724b840722f2efb918850fe41a9b734bb81f6c1ab2e9173c38a98c99668795cbc80976f06c37f44f9319bc71bb329ab28e9ab4a83 WHIRLPOOL ec9ad9d2069656dc4011fc237e3ac80149a2db0cc1345212a353991bf94c76f63396a26015508e722c23530c860258a1035cc4037e225c88179febd2e2e14f18 |
| 12248 |
-AUX syslogd.initd 457 SHA256 7e75bdcbc173c124d1991f8cab9cef86815e1685a2ffcf2fa6b8087216080443 SHA512 202402ab88c27ffce9dca28618435f4b7fdb54c37a41819c436d8d53f3b92c7063f3cb7d93f617007a2999f07e3a0cea55858b18f920da889d84fd526cad1c6b WHIRLPOOL da5646797d6ef2cba65ebf7a53b156d4c534ffdcd2938aba5d61187e6f87980728dbbc03731df2a3b2ea8350aaa93b9769f7d7324932315392005c42e71aa91c |
| 12249 |
-DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 |
| 12250 |
-EBUILD freebsd-usbin-11.0.ebuild 5423 SHA256 3052b08691e420ead531ec965826565921bcd7e1307ec712cc7697a935793e28 SHA512 732dd94b27ddd386abb900c14d55578051a5b26f9c7a6f263d87a8639d3c821e5a742e1b42d254b3c113abf0466b3d51a6056f7e248536d97bdfb661cd8c30c6 WHIRLPOOL 18a887dac4b7c487adbff5a88c9d582f720e63f68448a8a10fcdeb2731d1b61e032afcc908724bc31bddc0064357ebdcfe8d2461dd0bf7a2578187af296970d0 |
| 12251 |
-MISC metadata.xml 599 SHA256 3f2851ed1214525bc9fd9887db068c00324b466bc9f54342517f3101d34f2659 SHA512 afe1f9e8ccacac89bcd308b6476bba009035542f86d71f70f27df029ff20dda7ff7ff8c9510e6939d502a31750c6bf69de608440fb61b1d590d018446aa14f99 WHIRLPOOL 3514ef434513a233cd7e525442c9a4de763deb680c2d2a3e380a5d69f2f31e397a97c5e0d4512045c957c650777e8b66a803b0a6c008cf1e79f0c87d597f7ae5 |
| 12252 |
|
| 12253 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch |
| 12254 |
deleted file mode 100644 |
| 12255 |
index a84f96d..0000000 |
| 12256 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch |
| 12257 |
+++ /dev/null |
| 12258 |
@@ -1,24 +0,0 @@ |
| 12259 |
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c |
| 12260 |
---- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900 |
| 12261 |
-+++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900 |
| 12262 |
-@@ -60,7 +60,7 @@ |
| 12263 |
- #include <errno.h> |
| 12264 |
- #include <err.h> |
| 12265 |
- #include <ctype.h> |
| 12266 |
--#include <bsdxml.h> |
| 12267 |
-+#include <expat.h> |
| 12268 |
- #include <cam/scsi/scsi_all.h> |
| 12269 |
- #include <cam/scsi/scsi_message.h> |
| 12270 |
- #include <cam/ctl/ctl.h> |
| 12271 |
-diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c |
| 12272 |
---- work.orig/usr.sbin/ctld/kernel.c 2013-09-20 21:55:45.000000000 +0900 |
| 12273 |
-+++ work/usr.sbin/ctld/kernel.c 2013-09-20 22:01:17.000000000 +0900 |
| 12274 |
-@@ -45,7 +45,7 @@ |
| 12275 |
- #include <sys/sbuf.h> |
| 12276 |
- #include <sys/capability.h> |
| 12277 |
- #include <assert.h> |
| 12278 |
--#include <bsdxml.h> |
| 12279 |
-+#include <expat.h> |
| 12280 |
- #include <ctype.h> |
| 12281 |
- #include <errno.h> |
| 12282 |
- #include <fcntl.h> |
| 12283 |
|
| 12284 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch |
| 12285 |
deleted file mode 100644 |
| 12286 |
index 207b6ab..0000000 |
| 12287 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch |
| 12288 |
+++ /dev/null |
| 12289 |
@@ -1,13 +0,0 @@ |
| 12290 |
-diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c |
| 12291 |
-index 88c648e..edf9c8b 100644 |
| 12292 |
---- a/usr.sbin/camdd/camdd.c |
| 12293 |
-+++ b/usr.sbin/camdd/camdd.c |
| 12294 |
-@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: stable/10/usr.sbin/camdd/camdd.c 293409 2016-01-08 02:56:21Z |
| 12295 |
- #include <libutil.h> |
| 12296 |
- #include <pthread.h> |
| 12297 |
- #include <assert.h> |
| 12298 |
--#include <bsdxml.h> |
| 12299 |
-+#include <expat.h> |
| 12300 |
- |
| 12301 |
- #include <cam/cam.h> |
| 12302 |
- #include <cam/cam_debug.h> |
| 12303 |
|
| 12304 |
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 |
| 12305 |
deleted file mode 100644 |
| 12306 |
index 04ba75a..0000000 |
| 12307 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-11.0-workaround.patch |
| 12308 |
+++ /dev/null |
| 12309 |
@@ -1,13 +0,0 @@ |
| 12310 |
-diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile |
| 12311 |
-index 033002c..d198f10 100644 |
| 12312 |
---- a/usr.sbin/nmtree/Makefile |
| 12313 |
-+++ b/usr.sbin/nmtree/Makefile |
| 12314 |
-@@ -5,7 +5,7 @@ |
| 12315 |
- .PATH: ${.CURDIR}/../../contrib/mtree |
| 12316 |
- |
| 12317 |
- PROG= mtree |
| 12318 |
--MAN= mtree.5 mtree.8 |
| 12319 |
-+MAN= mtree.8 |
| 12320 |
- SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ |
| 12321 |
- only.c spec.c specspec.c verify.c |
| 12322 |
- |
| 12323 |
|
| 12324 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch |
| 12325 |
deleted file mode 100644 |
| 12326 |
index 9b11104..0000000 |
| 12327 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch |
| 12328 |
+++ /dev/null |
| 12329 |
@@ -1,45 +0,0 @@ |
| 12330 |
-diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile |
| 12331 |
---- usr.sbin.orig/rpcbind/Makefile 2007-04-21 12:02:30 +0000 |
| 12332 |
-+++ usr.sbin/rpcbind/Makefile 2007-04-21 12:05:32 +0000 |
| 12333 |
-@@ -8,13 +8,20 @@ |
| 12334 |
- SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \ |
| 12335 |
- rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c |
| 12336 |
- |
| 12337 |
--CFLAGS+= -DPORTMAP -DLIBWRAP |
| 12338 |
-+CFLAGS+= -DPORTMAP |
| 12339 |
- |
| 12340 |
- .if ${MK_INET6_SUPPORT} != "no" |
| 12341 |
- CFLAGS+= -DINET6 |
| 12342 |
- .endif |
| 12343 |
- |
| 12344 |
--DPADD= ${LIBWRAP} ${LIBUTIL} |
| 12345 |
--LDADD= -lwrap -lutil |
| 12346 |
-+DPADD= ${LIBUTIL} |
| 12347 |
-+LDADD= -lutil |
| 12348 |
-+ |
| 12349 |
-+.if !defined(NO_WRAP) |
| 12350 |
-+CFLAGS+= -DLIBWRAP |
| 12351 |
-+DPADD+= ${LIBWRAP} |
| 12352 |
-+LDADD+= -lwrap |
| 12353 |
-+.endif |
| 12354 |
-+ |
| 12355 |
- |
| 12356 |
- .include <bsd.prog.mk> |
| 12357 |
-diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile |
| 12358 |
---- usr.sbin.orig/ypserv/Makefile 2007-04-21 12:02:31 +0000 |
| 12359 |
-+++ usr.sbin/ypserv/Makefile 2007-04-21 12:06:53 +0000 |
| 12360 |
-@@ -8,10 +8,13 @@ |
| 12361 |
- SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ |
| 12362 |
- ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c |
| 12363 |
- |
| 12364 |
--CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I. |
| 12365 |
-+CFLAGS+= -DDB_CACHE -I. |
| 12366 |
- |
| 12367 |
-+.if !defined(NO_WRAP) |
| 12368 |
-+CFLAGS+= -DTCP_WRAPPER |
| 12369 |
- DPADD= ${LIBWRAP} |
| 12370 |
- LDADD= -lwrap |
| 12371 |
-+.endif |
| 12372 |
- |
| 12373 |
- CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h |
| 12374 |
- |
| 12375 |
|
| 12376 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch |
| 12377 |
deleted file mode 100644 |
| 12378 |
index a098391..0000000 |
| 12379 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch |
| 12380 |
+++ /dev/null |
| 12381 |
@@ -1,10 +0,0 @@ |
| 12382 |
---- usr.sbin/newsyslog/pathnames.h.orig 2001-07-30 18:17:17.000000000 +0300 |
| 12383 |
-+++ usr.sbin/newsyslog/pathnames.h 2009-09-11 08:32:57.508226240 +0300 |
| 12384 |
-@@ -24,5 +24,5 @@ |
| 12385 |
- |
| 12386 |
- #define _PATH_CONF "/etc/newsyslog.conf" |
| 12387 |
- #define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid" |
| 12388 |
--#define _PATH_BZIP2 "/usr/bin/bzip2" |
| 12389 |
--#define _PATH_GZIP "/usr/bin/gzip" |
| 12390 |
-+#define _PATH_BZIP2 "/bin/bzip2" |
| 12391 |
-+#define _PATH_GZIP "/bin/gzip" |
| 12392 |
|
| 12393 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch |
| 12394 |
deleted file mode 100644 |
| 12395 |
index bfe4794..0000000 |
| 12396 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch |
| 12397 |
+++ /dev/null |
| 12398 |
@@ -1,12 +0,0 @@ |
| 12399 |
---- usr.sbin/bsdinstall/distextract/distextract.c.old 2011-11-02 20:28:08.000000000 +0000 |
| 12400 |
-+++ usr.sbin/bsdinstall/distextract/distextract.c 2011-11-02 20:28:57.000000000 +0000 |
| 12401 |
-@@ -32,6 +32,9 @@ |
| 12402 |
- #include <limits.h> |
| 12403 |
- #include <archive.h> |
| 12404 |
- #include <dialog.h> |
| 12405 |
-+#ifndef archive_read_free |
| 12406 |
-+#define archive_read_free(x) archive_read_finish(x) |
| 12407 |
-+#endif |
| 12408 |
- |
| 12409 |
- static int extract_files(int nfiles, const char **files); |
| 12410 |
- |
| 12411 |
|
| 12412 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch |
| 12413 |
deleted file mode 100644 |
| 12414 |
index 1d83865..0000000 |
| 12415 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch |
| 12416 |
+++ /dev/null |
| 12417 |
@@ -1,12 +0,0 @@ |
| 12418 |
-diff -uNr usr.sbin/newsyslog.old/pathnames.h usr.sbin/newsyslog/pathnames.h |
| 12419 |
---- usr.sbin/newsyslog.old/pathnames.h 2011-11-02 20:12:37.000000000 +0000 |
| 12420 |
-+++ usr.sbin/newsyslog/pathnames.h 2011-11-02 20:12:50.000000000 +0000 |
| 12421 |
-@@ -24,6 +24,6 @@ |
| 12422 |
- |
| 12423 |
- #define _PATH_CONF "/etc/newsyslog.conf" |
| 12424 |
- #define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid" |
| 12425 |
--#define _PATH_BZIP2 "/usr/bin/bzip2" |
| 12426 |
--#define _PATH_GZIP "/usr/bin/gzip" |
| 12427 |
-+#define _PATH_BZIP2 "/bin/bzip2" |
| 12428 |
-+#define _PATH_GZIP "/bin/gzip" |
| 12429 |
- #define _PATH_XZ "/usr/bin/xz" |
| 12430 |
|
| 12431 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch |
| 12432 |
deleted file mode 100644 |
| 12433 |
index bddc0c7..0000000 |
| 12434 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch |
| 12435 |
+++ /dev/null |
| 12436 |
@@ -1,12 +0,0 @@ |
| 12437 |
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c |
| 12438 |
---- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900 |
| 12439 |
-+++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900 |
| 12440 |
-@@ -60,7 +60,7 @@ |
| 12441 |
- #include <errno.h> |
| 12442 |
- #include <err.h> |
| 12443 |
- #include <ctype.h> |
| 12444 |
--#include <bsdxml.h> |
| 12445 |
-+#include <expat.h> |
| 12446 |
- #include <cam/scsi/scsi_all.h> |
| 12447 |
- #include <cam/scsi/scsi_message.h> |
| 12448 |
- #include <cam/ctl/ctl.h> |
| 12449 |
|
| 12450 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch |
| 12451 |
deleted file mode 100644 |
| 12452 |
index 95bd665..0000000 |
| 12453 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch |
| 12454 |
+++ /dev/null |
| 12455 |
@@ -1,30 +0,0 @@ |
| 12456 |
-Index: usr.sbin/kldxref/kldxref.c |
| 12457 |
-=================================================================== |
| 12458 |
---- usr.sbin/kldxref/kldxref.c (revision 265111) |
| 12459 |
-+++ usr.sbin/kldxref/kldxref.c (working copy) |
| 12460 |
-@@ -274,6 +274,16 @@ usage(void) |
| 12461 |
- exit(1); |
| 12462 |
- } |
| 12463 |
- |
| 12464 |
-+static int |
| 12465 |
-+compare(const FTSENT *const *a, const FTSENT *const *b) |
| 12466 |
-+{ |
| 12467 |
-+ if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D) |
| 12468 |
-+ return 1; |
| 12469 |
-+ if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D) |
| 12470 |
-+ return -1; |
| 12471 |
-+ return strcmp((*a)->fts_name, (*b)->fts_name); |
| 12472 |
-+} |
| 12473 |
-+ |
| 12474 |
- int |
| 12475 |
- main(int argc, char *argv[]) |
| 12476 |
- { |
| 12477 |
-@@ -315,7 +325,7 @@ main(int argc, char *argv[]) |
| 12478 |
- err(1, "%s", argv[0]); |
| 12479 |
- } |
| 12480 |
- |
| 12481 |
-- ftsp = fts_open(argv, fts_options, 0); |
| 12482 |
-+ ftsp = fts_open(argv, fts_options, compare); |
| 12483 |
- if (ftsp == NULL) |
| 12484 |
- exit(1); |
| 12485 |
- |
| 12486 |
|
| 12487 |
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch |
| 12488 |
deleted file mode 100644 |
| 12489 |
index 39177b4..0000000 |
| 12490 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch |
| 12491 |
+++ /dev/null |
| 12492 |
@@ -1,20 +0,0 @@ |
| 12493 |
---- usr.sbin/adduser/adduser.sh.old 2006-10-01 13:41:16 +0000 |
| 12494 |
-+++ usr.sbin/adduser/adduser.sh 2006-10-01 13:41:38 +0000 |
| 12495 |
-@@ -809,7 +809,7 @@ |
| 12496 |
- NOHOME="/nonexistent" |
| 12497 |
- NOLOGIN="nologin" |
| 12498 |
- NOLOGIN_PATH="/usr/sbin/nologin" |
| 12499 |
--GREPCMD="/usr/bin/grep" |
| 12500 |
-+GREPCMD="/bin/grep" |
| 12501 |
- DATECMD="/bin/date" |
| 12502 |
- |
| 12503 |
- # Set default values |
| 12504 |
-@@ -823,7 +823,7 @@ |
| 12505 |
- uhome= |
| 12506 |
- upass= |
| 12507 |
- ushell= |
| 12508 |
--udotdir=/usr/share/skel |
| 12509 |
-+udotdir=/etc/skel |
| 12510 |
- ugroups= |
| 12511 |
- uexpire= |
| 12512 |
- upwexpire= |
| 12513 |
|
| 12514 |
diff --git a/sys-freebsd/freebsd-usbin/files/iscsid.initd b/sys-freebsd/freebsd-usbin/files/iscsid.initd |
| 12515 |
deleted file mode 100644 |
| 12516 |
index f16d00e..0000000 |
| 12517 |
--- a/sys-freebsd/freebsd-usbin/files/iscsid.initd |
| 12518 |
+++ /dev/null |
| 12519 |
@@ -1,20 +0,0 @@ |
| 12520 |
-#!/sbin/openrc-run |
| 12521 |
-# Copyright 1999-2015 Gentoo Foundation |
| 12522 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12523 |
- |
| 12524 |
-depend() { |
| 12525 |
- need net |
| 12526 |
-} |
| 12527 |
- |
| 12528 |
-start() { |
| 12529 |
- ebegin "Starting iscsid" |
| 12530 |
- start-stop-daemon --start --quiet --exec \ |
| 12531 |
- /usr/sbin/iscsid -- $iscsidopts |
| 12532 |
- eend $? "Error starting iscsid" |
| 12533 |
-} |
| 12534 |
- |
| 12535 |
-stop() { |
| 12536 |
- ebegin "Stopping iscsid" |
| 12537 |
- start-stop-daemon --stop --quiet --exec /usr/sbin/iscsid |
| 12538 |
- eend $? "Error stopping iscsid" |
| 12539 |
-} |
| 12540 |
|
| 12541 |
diff --git a/sys-freebsd/freebsd-usbin/files/mountd.patch b/sys-freebsd/freebsd-usbin/files/mountd.patch |
| 12542 |
deleted file mode 100644 |
| 12543 |
index 3cb9f03..0000000 |
| 12544 |
--- a/sys-freebsd/freebsd-usbin/files/mountd.patch |
| 12545 |
+++ /dev/null |
| 12546 |
@@ -1,15 +0,0 @@ |
| 12547 |
-http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc |
| 12548 |
- |
| 12549 |
-Index: usr.sbin/mountd/mountd.c |
| 12550 |
-=================================================================== |
| 12551 |
---- usr.sbin/mountd/mountd.c 20 Dec 2010 09:28:28 -0000 1.107 |
| 12552 |
-+++ usr.sbin/mountd/mountd.c 1 Mar 2011 11:47:16 -0000 1.108 |
| 12553 |
-@@ -2875,7 +2875,7 @@ makemask(struct sockaddr_storage *ssp, i |
| 12554 |
- |
| 12555 |
- for (i = 0; i < len; i++) { |
| 12556 |
- bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen; |
| 12557 |
-- *p++ = (1 << bits) - 1; |
| 12558 |
-+ *p++ = (u_char)~0 << (CHAR_BIT - bits); |
| 12559 |
- bitlen -= bits; |
| 12560 |
- } |
| 12561 |
- return 0; |
| 12562 |
|
| 12563 |
diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd |
| 12564 |
deleted file mode 100644 |
| 12565 |
index 4d64933..0000000 |
| 12566 |
--- a/sys-freebsd/freebsd-usbin/files/moused.confd |
| 12567 |
+++ /dev/null |
| 12568 |
@@ -1,20 +0,0 @@ |
| 12569 |
-# $Id$ |
| 12570 |
- |
| 12571 |
-# See the moused man page for available settings. |
| 12572 |
- |
| 12573 |
-# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports |
| 12574 |
-# Leave blank to try to autodetect it |
| 12575 |
-MOUSED_DEVICE="" |
| 12576 |
- |
| 12577 |
-# Any additional flags requires |
| 12578 |
-MOUSED_FLAGS="" |
| 12579 |
- |
| 12580 |
-# If 0xd0-0xd3 default range is occupied in your language code table, specify |
| 12581 |
-# alternative range start like MOUSECHAR_START="3", see vidcontrol(1) |
| 12582 |
-MOUSECHAR_START="" |
| 12583 |
- |
| 12584 |
-# You can also multiplex the init script for each device like so |
| 12585 |
-# ln -s moused /etc/init.d/moused.ums0 |
| 12586 |
-# This enables you to have a config file per mouse (forces MOUSED_DEVICE |
| 12587 |
-# to ums0 in this case) and control each mouse. |
| 12588 |
-# devd can also start and stop these mice, which laptop users will find handy. |
| 12589 |
|
| 12590 |
diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd |
| 12591 |
deleted file mode 100644 |
| 12592 |
index d7ca8e0..0000000 |
| 12593 |
--- a/sys-freebsd/freebsd-usbin/files/moused.initd |
| 12594 |
+++ /dev/null |
| 12595 |
@@ -1,66 +0,0 @@ |
| 12596 |
-#!/sbin/openrc-run |
| 12597 |
-# Copyright 1999-2005 Gentoo Foundation |
| 12598 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12599 |
-# $Id$ |
| 12600 |
- |
| 12601 |
-MOUSED_NAME=${SVCNAME##*.} |
| 12602 |
-if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then |
| 12603 |
- MOUSED_DEVICE=/dev/"${MOUSED_NAME}" |
| 12604 |
- MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid |
| 12605 |
-else |
| 12606 |
- MOUSED_NAME= |
| 12607 |
- MOUSED_PIDFILE=/var/run/moused.pid |
| 12608 |
-fi |
| 12609 |
- |
| 12610 |
-depend() { |
| 12611 |
- need localmount |
| 12612 |
-} |
| 12613 |
- |
| 12614 |
-start() { |
| 12615 |
- ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}" |
| 12616 |
- |
| 12617 |
- if [ -z ${MOUSED_DEVICE} ] ; then |
| 12618 |
- for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do |
| 12619 |
- if [ -e "${x}" ] && \ |
| 12620 |
- [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then |
| 12621 |
- MOUSED_DEVICE=${x} |
| 12622 |
- eindent |
| 12623 |
- einfo "Using mouse on ${MOUSED_DEVICE}" |
| 12624 |
- eoutdent |
| 12625 |
- break |
| 12626 |
- fi |
| 12627 |
- done |
| 12628 |
- fi |
| 12629 |
- |
| 12630 |
- if [ -z "${MOUSED_DEVICE}" ] ; then |
| 12631 |
- eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \ |
| 12632 |
- "and no mouse detected" |
| 12633 |
- return 1 |
| 12634 |
- fi |
| 12635 |
- |
| 12636 |
- local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}" |
| 12637 |
- start-stop-daemon --start --quiet --exec /usr/sbin/moused \ |
| 12638 |
- --pidfile "${MOUSED_PIDFILE}" \ |
| 12639 |
- -- ${opts} -I "${MOUSED_PIDFILE}" |
| 12640 |
- local retval=$? |
| 12641 |
- |
| 12642 |
- [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}" |
| 12643 |
- local ttyv= |
| 12644 |
- for ttyv in /dev/ttyv* ; do |
| 12645 |
- vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1 |
| 12646 |
- done |
| 12647 |
- |
| 12648 |
- eend ${retval} "Failed to start moused" |
| 12649 |
-} |
| 12650 |
- |
| 12651 |
-stop() { |
| 12652 |
- ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}" |
| 12653 |
- # Don't specify the binary as >1 instance of moused may be running |
| 12654 |
- # which is perfectly valid as we can be multiplexed. |
| 12655 |
- start-stop-daemon --stop --exec /usr/sbin/moused \ |
| 12656 |
- --pidfile "${MOUSED_PIDFILE}" |
| 12657 |
- eend $? "Failed to stop moused" |
| 12658 |
-} |
| 12659 |
- |
| 12660 |
-# vim: set ts=4 : |
| 12661 |
- |
| 12662 |
|
| 12663 |
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd |
| 12664 |
deleted file mode 100644 |
| 12665 |
index 844252f..0000000 |
| 12666 |
--- a/sys-freebsd/freebsd-usbin/files/nfs.confd |
| 12667 |
+++ /dev/null |
| 12668 |
@@ -1,10 +0,0 @@ |
| 12669 |
-# Config file for /etc/init.d/nfs |
| 12670 |
-# Options for nfsd (see man nfsd) |
| 12671 |
-# Example: 8 nfsd servers started: |
| 12672 |
-#nfsdopts="-n 8" |
| 12673 |
- |
| 12674 |
-# Options for mountd (see man mountd) |
| 12675 |
-# Example: allow non-root users to mount shares: |
| 12676 |
-#mountdopts="-n" |
| 12677 |
-# Specify t he exports file, this is the default: |
| 12678 |
-#exportsfile="/etc/exports" |
| 12679 |
|
| 12680 |
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd |
| 12681 |
deleted file mode 100644 |
| 12682 |
index 17974ca..0000000 |
| 12683 |
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd |
| 12684 |
+++ /dev/null |
| 12685 |
@@ -1,54 +0,0 @@ |
| 12686 |
-#!/sbin/openrc-run |
| 12687 |
-# Copyright 1999-2013 Gentoo Foundation |
| 12688 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12689 |
- |
| 12690 |
-#--------------------------------------------------------------------------- |
| 12691 |
-# This script starts/stops nfsd and mountd |
| 12692 |
-# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd |
| 12693 |
-# should be started from inetd on FreeBSD. |
| 12694 |
-#--------------------------------------------------------------------------- |
| 12695 |
- |
| 12696 |
-extra_started_commands="reload" |
| 12697 |
- |
| 12698 |
-# The binary locations |
| 12699 |
-nfsd=/usr/sbin/nfsd |
| 12700 |
-mountd=/usr/sbin/mountd |
| 12701 |
- |
| 12702 |
-depend() { |
| 12703 |
- use ypbind net rpc.lockd |
| 12704 |
- need rpcbind |
| 12705 |
- after quota |
| 12706 |
-} |
| 12707 |
- |
| 12708 |
-start() { |
| 12709 |
- ebegin "Starting NFS daemon" |
| 12710 |
- start-stop-daemon --start --quiet --exec \ |
| 12711 |
- $nfsd -- ${nfsdopts} |
| 12712 |
- eend $? "Error starting NFS daemon" |
| 12713 |
- |
| 12714 |
- # Start mountd |
| 12715 |
- ebegin "Starting NFS mountd" |
| 12716 |
- start-stop-daemon --start --quiet --exec \ |
| 12717 |
- $mountd -- ${mountdopts} ${exportsfile} |
| 12718 |
- eend $? "Error starting NFS mountd" |
| 12719 |
-} |
| 12720 |
- |
| 12721 |
-stop() { |
| 12722 |
- ebegin "Stopping NFS mountd" |
| 12723 |
- start-stop-daemon --stop --quiet --exec $mountd \ |
| 12724 |
- --pidfile /var/run/mountd.pid |
| 12725 |
- eend $? "Error stopping NFS mountd" |
| 12726 |
- |
| 12727 |
- ebegin "Stopping NFS daemon" |
| 12728 |
- start-stop-daemon --stop --signal USR1 --quiet \ |
| 12729 |
- --name nfsd --user root |
| 12730 |
- eend $? "Error stopping NFS daemon" |
| 12731 |
-} |
| 12732 |
- |
| 12733 |
-reload() { |
| 12734 |
- # Hangup signal to mountd reloads /etc/exports. |
| 12735 |
- ebegin "Reloading /etc/exports" |
| 12736 |
- start-stop-daemon --signal 1 --quiet --exec $mountd \ |
| 12737 |
- --pidfile /var/run/mountd.pid |
| 12738 |
- eend $? |
| 12739 |
-} |
| 12740 |
|
| 12741 |
diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd |
| 12742 |
deleted file mode 100644 |
| 12743 |
index 2fb4901..0000000 |
| 12744 |
--- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd |
| 12745 |
+++ /dev/null |
| 12746 |
@@ -1,63 +0,0 @@ |
| 12747 |
-#!/sbin/openrc-run |
| 12748 |
-# Copyright 1999-2004 Gentoo Foundation |
| 12749 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12750 |
-# $Id$ |
| 12751 |
- |
| 12752 |
-depend() { |
| 12753 |
- need net rpcbind |
| 12754 |
- use ypbind |
| 12755 |
-} |
| 12756 |
- |
| 12757 |
-start_statd() { |
| 12758 |
- # Don't start rpc.statd if already started by init.d/nfs |
| 12759 |
- killall -0 rpc.statd 2>/dev/null && return 0 |
| 12760 |
- ebegin "Starting NFS statd" |
| 12761 |
- rpc.statd |
| 12762 |
- eend $? "Error starting NFS statd" |
| 12763 |
-} |
| 12764 |
- |
| 12765 |
-stop_statd() { |
| 12766 |
- # Don't stop rpc.statd if it's in use by init.d/nfs |
| 12767 |
- killall -0 nfsd 2>/dev/null && return 0 |
| 12768 |
- # Make sure it's actually running |
| 12769 |
- killall -0 rpc.statd 2>/dev/null || return 0 |
| 12770 |
- # Okay, all tests passed, stop rpc.statd |
| 12771 |
- ebegin "Stopping NFS statd" |
| 12772 |
- killall rpc.statd |
| 12773 |
- eend $? "Error stopping NFS statd" |
| 12774 |
-} |
| 12775 |
- |
| 12776 |
-start_lockd() { |
| 12777 |
- # Don't start rpc.lockd if already started by init.d/nfs |
| 12778 |
- killall -0 rpc.lockd 2>/dev/null && return 0 |
| 12779 |
- ebegin "Starting NFS lockd" |
| 12780 |
- rpc.lockd |
| 12781 |
- eend $? "Error starting NFS lockd" |
| 12782 |
-} |
| 12783 |
- |
| 12784 |
-stop_lockd() { |
| 12785 |
- # Don't stop rpc.lockd if it's in use by init.d/nfs |
| 12786 |
- killall -0 nfsd 2>/dev/null && return 0 |
| 12787 |
- # Make sure it's actually running |
| 12788 |
- killall -0 rpc.lockd 2>/dev/null || return 0 |
| 12789 |
- # Okay, all tests passed, stop rpc.lockd |
| 12790 |
- ebegin "Stopping NFS lockd" |
| 12791 |
- killall rpc.lockd |
| 12792 |
- eend $? "Error stopping NFS lockd" |
| 12793 |
-} |
| 12794 |
- |
| 12795 |
-start() { |
| 12796 |
- start_statd |
| 12797 |
- start_lockd |
| 12798 |
- ebegin "Mounting NFS filesystems" |
| 12799 |
- mount -a -t nfs |
| 12800 |
- eend $? "Error mounting NFS filesystems" |
| 12801 |
-} |
| 12802 |
- |
| 12803 |
-stop() { |
| 12804 |
- ebegin "Unmounting NFS filesystems" |
| 12805 |
- umount -a -t nfs |
| 12806 |
- eend $? "Error unmounting NFS filesystems" |
| 12807 |
- stop_statd |
| 12808 |
- stop_lockd |
| 12809 |
-} |
| 12810 |
|
| 12811 |
diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd |
| 12812 |
deleted file mode 100644 |
| 12813 |
index f8f3ea1..0000000 |
| 12814 |
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd |
| 12815 |
+++ /dev/null |
| 12816 |
@@ -1,5 +0,0 @@ |
| 12817 |
-# Config file for /etc/init.d/nfsuserd |
| 12818 |
-# Options for nfsuserd (see man nfsuserd) |
| 12819 |
-# Example: set domain example.com: |
| 12820 |
-#nfsuserdopts="-domain example.com" |
| 12821 |
- |
| 12822 |
|
| 12823 |
diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd |
| 12824 |
deleted file mode 100644 |
| 12825 |
index d690074..0000000 |
| 12826 |
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd |
| 12827 |
+++ /dev/null |
| 12828 |
@@ -1,20 +0,0 @@ |
| 12829 |
-#!/sbin/openrc-run |
| 12830 |
-# Copyright 1999-2015 Gentoo Foundation |
| 12831 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12832 |
- |
| 12833 |
-depend() { |
| 12834 |
- need net nfs |
| 12835 |
-} |
| 12836 |
- |
| 12837 |
-start() { |
| 12838 |
- ebegin "Starting nfsuserd" |
| 12839 |
- start-stop-daemon --start --quiet --exec \ |
| 12840 |
- /usr/sbin/nfsuserd -- $nfsuserdopts |
| 12841 |
- eend $? "Error starting nfsuserd" |
| 12842 |
-} |
| 12843 |
- |
| 12844 |
-stop() { |
| 12845 |
- ebegin "Stopping nfsuserd" |
| 12846 |
- start-stop-daemon --stop --quiet --exec /usr/sbin/nfsuserd |
| 12847 |
- eend $? "Error stopping nfsuserd" |
| 12848 |
-} |
| 12849 |
|
| 12850 |
diff --git a/sys-freebsd/freebsd-usbin/files/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd |
| 12851 |
deleted file mode 100644 |
| 12852 |
index e5db5a1..0000000 |
| 12853 |
--- a/sys-freebsd/freebsd-usbin/files/powerd.confd |
| 12854 |
+++ /dev/null |
| 12855 |
@@ -1,14 +0,0 @@ |
| 12856 |
-# Copyright 2006 Gentoo Foundation |
| 12857 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12858 |
-# $Id$ |
| 12859 |
- |
| 12860 |
-# Mode allowed: maximum, minimum, adaptive |
| 12861 |
-# Default unless specified is adaptive |
| 12862 |
- |
| 12863 |
-AC_MODE="maximum" |
| 12864 |
- |
| 12865 |
-#BATTERY_MODE="minimum" |
| 12866 |
- |
| 12867 |
-POWERD_OPTS="" |
| 12868 |
- |
| 12869 |
- |
| 12870 |
|
| 12871 |
diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd |
| 12872 |
deleted file mode 100644 |
| 12873 |
index ff79f63..0000000 |
| 12874 |
--- a/sys-freebsd/freebsd-usbin/files/powerd.initd |
| 12875 |
+++ /dev/null |
| 12876 |
@@ -1,27 +0,0 @@ |
| 12877 |
-#!/sbin/openrc-run |
| 12878 |
-# Copyright 2006 Gentoo Foundation |
| 12879 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12880 |
-# $Id$ |
| 12881 |
- |
| 12882 |
-depend() { |
| 12883 |
- need localmount |
| 12884 |
-} |
| 12885 |
- |
| 12886 |
-start() { |
| 12887 |
- local args= |
| 12888 |
- [ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}" |
| 12889 |
- [ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}" |
| 12890 |
- |
| 12891 |
- ebegin "Starting Power Control Daemon" |
| 12892 |
- start-stop-daemon --start --exec /usr/sbin/powerd \ |
| 12893 |
- --pidfile /var/run/powerd.pid \ |
| 12894 |
- -- ${args} ${POWERD_OPTS} |
| 12895 |
- eend $? "Failed to start powerd" |
| 12896 |
-} |
| 12897 |
- |
| 12898 |
-stop() { |
| 12899 |
- ebegin "Stopping Power Control Daemon" |
| 12900 |
- start-stop-daemon --stop --exec /usr/sbin/powerd \ |
| 12901 |
- --pidfile /var/run/powerd.pid |
| 12902 |
- eend $? "Failed to stop powerd" |
| 12903 |
-} |
| 12904 |
|
| 12905 |
diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf |
| 12906 |
deleted file mode 100644 |
| 12907 |
index 29a246f..0000000 |
| 12908 |
--- a/sys-freebsd/freebsd-usbin/files/pw.conf |
| 12909 |
+++ /dev/null |
| 12910 |
@@ -1,5 +0,0 @@ |
| 12911 |
-# Change this to Gentoo's Default, instead of FreeBSD's default of |
| 12912 |
-# /usr/share/skel, so that bash and other packages installs the files on the |
| 12913 |
-# right place. |
| 12914 |
-skeleton /etc/skel |
| 12915 |
- |
| 12916 |
|
| 12917 |
diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.confd b/sys-freebsd/freebsd-usbin/files/rarpd.confd |
| 12918 |
deleted file mode 100644 |
| 12919 |
index b56fdd5..0000000 |
| 12920 |
--- a/sys-freebsd/freebsd-usbin/files/rarpd.confd |
| 12921 |
+++ /dev/null |
| 12922 |
@@ -1,7 +0,0 @@ |
| 12923 |
-# $Id$ |
| 12924 |
- |
| 12925 |
-# Configuration file for /etc/init.d/rarpd |
| 12926 |
- |
| 12927 |
-# To start rarpd only for a given interface, set the |
| 12928 |
-# following variable |
| 12929 |
-# RARPD_ONLY_INTERFACE="rl0" |
| 12930 |
|
| 12931 |
diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd |
| 12932 |
deleted file mode 100644 |
| 12933 |
index 3c2a3ff..0000000 |
| 12934 |
--- a/sys-freebsd/freebsd-usbin/files/rarpd.initd |
| 12935 |
+++ /dev/null |
| 12936 |
@@ -1,35 +0,0 @@ |
| 12937 |
-#!/sbin/openrc-run |
| 12938 |
-# Copyright 2006 Gentoo Foundation |
| 12939 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12940 |
-# $Id$ |
| 12941 |
- |
| 12942 |
-depend() { |
| 12943 |
- if [ -z "${RARPD_ONLY_INTERFACE}" ]; then |
| 12944 |
- need net |
| 12945 |
- else |
| 12946 |
- need net."${RARPD_ONLY_INTERFACE}" |
| 12947 |
- fi |
| 12948 |
-} |
| 12949 |
- |
| 12950 |
-start() { |
| 12951 |
- local rarpd_opts |
| 12952 |
- |
| 12953 |
- if [ -z "${RARPD_ONLY_INTERFACE}" ]; then |
| 12954 |
- rarpd_opts="${rarpd_opts} -a" |
| 12955 |
- else |
| 12956 |
- rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}" |
| 12957 |
- fi |
| 12958 |
- |
| 12959 |
- ebegin "Starting reverse ARP daemon" |
| 12960 |
- start-stop-daemon --start --background \ |
| 12961 |
- --pidfile /var/run/rarpd.pid --make-pidfile \ |
| 12962 |
- --exec /usr/sbin/rarpd -- -f ${rarpd_opts} |
| 12963 |
- eend $? |
| 12964 |
-} |
| 12965 |
- |
| 12966 |
-stop() { |
| 12967 |
- ebegin "Stopping reverse ARP daemon" |
| 12968 |
- start-stop-daemon --stop --pidfile /var/run/rarpd.pid \ |
| 12969 |
- --exec /usr/sbin/rarpd -- ${rarpd_opts} |
| 12970 |
- eend $? |
| 12971 |
-} |
| 12972 |
|
| 12973 |
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd |
| 12974 |
deleted file mode 100644 |
| 12975 |
index dd2fdbe..0000000 |
| 12976 |
--- a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd |
| 12977 |
+++ /dev/null |
| 12978 |
@@ -1,20 +0,0 @@ |
| 12979 |
-#!/sbin/openrc-run |
| 12980 |
-# Copyright 1999-2008 Gentoo Foundation |
| 12981 |
-# Distributed under the terms of the GNU General Public License v2 |
| 12982 |
- |
| 12983 |
-depend() { |
| 12984 |
- need net rpcbind rpc.statd |
| 12985 |
-} |
| 12986 |
- |
| 12987 |
-start() { |
| 12988 |
- ebegin "Starting NFS lockd" |
| 12989 |
- start-stop-daemon --start --quiet --exec \ |
| 12990 |
- /usr/sbin/rpc.lockd -- $rpclockdopts |
| 12991 |
- eend $? "Error starting NFS lockd" |
| 12992 |
-} |
| 12993 |
- |
| 12994 |
-stop() { |
| 12995 |
- ebegin "Stopping NFS lockd" |
| 12996 |
- start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd |
| 12997 |
- eend $? "Error stopping NFS lockd" |
| 12998 |
-} |
| 12999 |
|
| 13000 |
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd |
| 13001 |
deleted file mode 100644 |
| 13002 |
index 163af5a..0000000 |
| 13003 |
--- a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd |
| 13004 |
+++ /dev/null |
| 13005 |
@@ -1,20 +0,0 @@ |
| 13006 |
-#!/sbin/openrc-run |
| 13007 |
-# Copyright 1999-2008 Gentoo Foundation |
| 13008 |
-# Distributed under the terms of the GNU General Public License v2 |
| 13009 |
- |
| 13010 |
-depend() { |
| 13011 |
- need net rpcbind |
| 13012 |
-} |
| 13013 |
- |
| 13014 |
-start() { |
| 13015 |
- ebegin "Starting NFS statd" |
| 13016 |
- start-stop-daemon --start --quiet --exec \ |
| 13017 |
- /usr/sbin/rpc.statd -- $rpcstatdopts |
| 13018 |
- eend $? "Error starting NFS statd" |
| 13019 |
-} |
| 13020 |
- |
| 13021 |
-stop() { |
| 13022 |
- ebegin "Stopping NFS statd" |
| 13023 |
- start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd |
| 13024 |
- eend $? "Error stopping NFS statd" |
| 13025 |
-} |
| 13026 |
|
| 13027 |
diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd |
| 13028 |
deleted file mode 100644 |
| 13029 |
index 1ff98a5..0000000 |
| 13030 |
--- a/sys-freebsd/freebsd-usbin/files/rpcbind.initd |
| 13031 |
+++ /dev/null |
| 13032 |
@@ -1,30 +0,0 @@ |
| 13033 |
-#!/sbin/openrc-run |
| 13034 |
-# Copyright 1999-2005 Gentoo Foundation |
| 13035 |
-# Distributed under the terms of the GNU General Public License v2 |
| 13036 |
-# $Id$ |
| 13037 |
- |
| 13038 |
-depend() { |
| 13039 |
- need localmount |
| 13040 |
- use net |
| 13041 |
- before inetd |
| 13042 |
- before xinetd |
| 13043 |
-} |
| 13044 |
- |
| 13045 |
-start() { |
| 13046 |
- ebegin "Starting rpcbind" |
| 13047 |
- start-stop-daemon --start --exec /usr/sbin/rpcbind |
| 13048 |
- local ret=$? |
| 13049 |
- eend ${ret} |
| 13050 |
- |
| 13051 |
- # without, if a service depending on portmap is started too fast, |
| 13052 |
- # connecting to portmap will fail -- azarah |
| 13053 |
- # doing that for rpcbind, too -- flameeyes |
| 13054 |
- sleep 1 |
| 13055 |
- return ${ret} |
| 13056 |
-} |
| 13057 |
- |
| 13058 |
-stop() { |
| 13059 |
- ebegin "Stopping rpcbind" |
| 13060 |
- start-stop-daemon --stop --exec /usr/sbin/rpcbind |
| 13061 |
- eend $? |
| 13062 |
-} |
| 13063 |
|
| 13064 |
diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd |
| 13065 |
deleted file mode 100644 |
| 13066 |
index 7ba81ff..0000000 |
| 13067 |
--- a/sys-freebsd/freebsd-usbin/files/syscons.confd |
| 13068 |
+++ /dev/null |
| 13069 |
@@ -1,14 +0,0 @@ |
| 13070 |
-# $Id$ |
| 13071 |
-# Example syscons config file. This is the place to set things like keymap, etc. |
| 13072 |
- |
| 13073 |
-# Set the keymap to "uk.iso". |
| 13074 |
-#KEYMAP="uk.iso" |
| 13075 |
- |
| 13076 |
-# Set the keyboard rate to 250ms delay, and 34 repeat rate. |
| 13077 |
-#KEYRATE="250.34" |
| 13078 |
- |
| 13079 |
-# Change the behaviour of F-unction keys (see kbdcontrol(1)). |
| 13080 |
-#KEYCHANGE="10 'ssh myhost'" |
| 13081 |
- |
| 13082 |
-# See vidcontrol(1) -t |
| 13083 |
-#BLANKTIME="off" |
| 13084 |
|
| 13085 |
diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd |
| 13086 |
deleted file mode 100644 |
| 13087 |
index 5ab3075..0000000 |
| 13088 |
--- a/sys-freebsd/freebsd-usbin/files/syscons.initd |
| 13089 |
+++ /dev/null |
| 13090 |
@@ -1,78 +0,0 @@ |
| 13091 |
-#!/sbin/openrc-run |
| 13092 |
-# Copyright 1999-2006 Gentoo Foundation |
| 13093 |
-# Distributed under the terms of the GNU General Public License v2 |
| 13094 |
-# $Id$ |
| 13095 |
- |
| 13096 |
-depend() { |
| 13097 |
- need localmount |
| 13098 |
-} |
| 13099 |
- |
| 13100 |
-start() { |
| 13101 |
- ebegin "Configuring system console" |
| 13102 |
- |
| 13103 |
- if [ -n "${MODE}" ] ; then |
| 13104 |
- einfo "Setting mode to ${MODE}" |
| 13105 |
- vidcontrol "${MODE}" |
| 13106 |
- eend $? |
| 13107 |
- fi |
| 13108 |
- |
| 13109 |
- # XXX: This should handle serial consoles. |
| 13110 |
- |
| 13111 |
- # Set the keymap. |
| 13112 |
- if [ -n "${KEYMAP}" ]; then |
| 13113 |
- einfo "Setting keymap to" "${KEYMAP}" |
| 13114 |
- kbdcontrol -l ${KEYMAP} < /dev/console |
| 13115 |
- fi |
| 13116 |
- |
| 13117 |
- if [ -n "${KEYRATE}" ]; then |
| 13118 |
- einfo "Setting keyrate to" "${KEYRATE}" |
| 13119 |
- kbdcontrol -r ${KEYRATE} < /dev/console |
| 13120 |
- fi |
| 13121 |
- |
| 13122 |
- if [ -n "${KEYCHANGE}" ]; then |
| 13123 |
- einfo "Changing function keys..." |
| 13124 |
- eval set -- "${KEYCHANGE}" |
| 13125 |
- eindent |
| 13126 |
- while [ $# -gt 0 ] ; do |
| 13127 |
- veinfo "F$1 -> \`$2'" |
| 13128 |
- kbdcontrol -f "$1" "$2" < /dev/console |
| 13129 |
- shift ; shift |
| 13130 |
- done |
| 13131 |
- eoutdent |
| 13132 |
- fi |
| 13133 |
- |
| 13134 |
- if [ -n "${CURSOR}" ]; then |
| 13135 |
- einfo "Setting cursor" |
| 13136 |
- vidcontrol -c ${CURSOR} |
| 13137 |
- fi |
| 13138 |
- |
| 13139 |
- einfo "Setting custom fonts..." |
| 13140 |
- # Nothing to see here, move along... |
| 13141 |
- for v in FONT8x16 FONT8x14 FONT8x8; do |
| 13142 |
- f=$(eval \$"${v}") |
| 13143 |
- if [ -n "${f}" ]; then |
| 13144 |
- vidcontrol -f ${v##FONT} ${f} |
| 13145 |
- fi |
| 13146 |
- done |
| 13147 |
- |
| 13148 |
- if [ -n "${BLANKTIME}" ]; then |
| 13149 |
- einfo "Setting blanktime" |
| 13150 |
- vidcontrol -t ${BLANKTIME} |
| 13151 |
- fi |
| 13152 |
- |
| 13153 |
- if [ -n "${SAVER}" ]; then |
| 13154 |
- for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do |
| 13155 |
- kldunload ${i} |
| 13156 |
- done |
| 13157 |
- kldstat -v | grep -q _saver || kldload ${SAVER}_saver |
| 13158 |
- fi |
| 13159 |
- |
| 13160 |
- if [ -n "${KBDFLAGS}" ]; then |
| 13161 |
- einfo "Setting keyboard flags for all screens" |
| 13162 |
- for ttyv in /dev/ttyv*; do |
| 13163 |
- kbdcontrol ${KBDFLAGS} <${ttyv} >${ttyv} 2>&1 |
| 13164 |
- done |
| 13165 |
- fi |
| 13166 |
- |
| 13167 |
- eend 0 |
| 13168 |
-} |
| 13169 |
|
| 13170 |
diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd |
| 13171 |
deleted file mode 100644 |
| 13172 |
index 87c40cd..0000000 |
| 13173 |
--- a/sys-freebsd/freebsd-usbin/files/syslogd.initd |
| 13174 |
+++ /dev/null |
| 13175 |
@@ -1,25 +0,0 @@ |
| 13176 |
-#!/sbin/openrc-run |
| 13177 |
-# Copyright 1999-2005 Gentoo Foundation |
| 13178 |
-# Distributed under the terms of the GNU General Public License v2 |
| 13179 |
-# $Id$ |
| 13180 |
- |
| 13181 |
-depend() { |
| 13182 |
- provide logger |
| 13183 |
- need localmount |
| 13184 |
-} |
| 13185 |
- |
| 13186 |
-start() { |
| 13187 |
- ebegin "Starting System Logger" |
| 13188 |
- start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \ |
| 13189 |
- -- ${SYSLOGD_OPTS} |
| 13190 |
- eend $? |
| 13191 |
-} |
| 13192 |
- |
| 13193 |
-stop() { |
| 13194 |
- ebegin "Stopping System Logger" |
| 13195 |
- start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid |
| 13196 |
- eend $? |
| 13197 |
-} |
| 13198 |
- |
| 13199 |
- |
| 13200 |
- |
| 13201 |
|
| 13202 |
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild |
| 13203 |
deleted file mode 100644 |
| 13204 |
index 31ca603..0000000 |
| 13205 |
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild |
| 13206 |
+++ /dev/null |
| 13207 |
@@ -1,186 +0,0 @@ |
| 13208 |
-# Copyright 1999-2016 Gentoo Foundation |
| 13209 |
-# Distributed under the terms of the GNU General Public License v2 |
| 13210 |
-# $Id$ |
| 13211 |
- |
| 13212 |
-EAPI=5 |
| 13213 |
- |
| 13214 |
-inherit bsdmk freebsd flag-o-matic eutils |
| 13215 |
- |
| 13216 |
-DESCRIPTION="FreeBSD /usr/sbin tools" |
| 13217 |
-SLOT="0" |
| 13218 |
-LICENSE="BSD zfs? ( CDDL )" |
| 13219 |
- |
| 13220 |
-if [[ ${PV} != *9999* ]]; then |
| 13221 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 13222 |
- SRC_URI="${SRC_URI} |
| 13223 |
- $(freebsd_upstream_patches)" |
| 13224 |
-fi |
| 13225 |
- |
| 13226 |
-EXTRACTONLY=" |
| 13227 |
- usr.sbin/ |
| 13228 |
- contrib/ |
| 13229 |
- usr.bin/ |
| 13230 |
- lib/ |
| 13231 |
- sbin/ |
| 13232 |
- etc/ |
| 13233 |
- gnu/ |
| 13234 |
-" |
| 13235 |
- |
| 13236 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] |
| 13237 |
- =sys-freebsd/freebsd-libexec-${RV}* |
| 13238 |
- build? ( sys-apps/baselayout ) |
| 13239 |
- ssl? ( dev-libs/openssl:0 ) |
| 13240 |
- >=app-arch/libarchive-3 |
| 13241 |
- sys-apps/tcp-wrappers |
| 13242 |
- dev-util/dialog |
| 13243 |
- >=dev-libs/libedit-20120311.3.0-r1 |
| 13244 |
- net-libs/libpcap |
| 13245 |
- kerberos? ( app-crypt/heimdal )" |
| 13246 |
-DEPEND="${RDEPEND} |
| 13247 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
| 13248 |
- =sys-freebsd/freebsd-ubin-${RV}* |
| 13249 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) |
| 13250 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
| 13251 |
- sys-apps/texinfo |
| 13252 |
- sys-devel/flex" |
| 13253 |
- |
| 13254 |
-S="${WORKDIR}/usr.sbin" |
| 13255 |
- |
| 13256 |
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs" |
| 13257 |
- |
| 13258 |
-pkg_setup() { |
| 13259 |
- # Add the required source files. |
| 13260 |
- use nis && EXTRACTONLY+="libexec/ " |
| 13261 |
- use build && EXTRACTONLY+="sys/ include/ " |
| 13262 |
- use zfs && EXTRACTONLY+="cddl/ " |
| 13263 |
- |
| 13264 |
- # Release crunch is something like minimal. It seems to remove everything |
| 13265 |
- # which is not needed to work. |
| 13266 |
- use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " |
| 13267 |
- |
| 13268 |
- use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " |
| 13269 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 13270 |
- use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " |
| 13271 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
| 13272 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
| 13273 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
| 13274 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
| 13275 |
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " |
| 13276 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
| 13277 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
| 13278 |
- use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " |
| 13279 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= " |
| 13280 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
| 13281 |
- |
| 13282 |
- mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= " |
| 13283 |
- |
| 13284 |
- append-flags $(test-flags -fno-strict-aliasing) |
| 13285 |
-} |
| 13286 |
- |
| 13287 |
-PATCHES=( |
| 13288 |
- "${FILESDIR}/${PN}-adduser.patch" |
| 13289 |
- "${FILESDIR}/${PN}-9.0-newsyslog.patch" |
| 13290 |
- "${FILESDIR}/${PN}-10.0-bsdxml2expat.patch" |
| 13291 |
- "${FILESDIR}/${PN}-10.3-bsdxml2expat.patch" |
| 13292 |
- "${FILESDIR}/${PN}-11.0-workaround.patch" |
| 13293 |
- ) |
| 13294 |
- |
| 13295 |
-REMOVE_SUBDIRS=" |
| 13296 |
- tcpdchk tcpdmatch |
| 13297 |
- sendmail praliases editmap mailstats makemap |
| 13298 |
- pc-sysinstall cron mailwrapper ntp bsnmpd |
| 13299 |
- tcpdump ndp inetd |
| 13300 |
- wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase |
| 13301 |
- zic amd |
| 13302 |
- pkg freebsd-update service sysrc bsdinstall" |
| 13303 |
- |
| 13304 |
-src_prepare() { |
| 13305 |
- if ! use build; then |
| 13306 |
- [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" |
| 13307 |
- [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include" |
| 13308 |
- else |
| 13309 |
- dummy_mk mount_smbfs |
| 13310 |
- fi |
| 13311 |
-} |
| 13312 |
- |
| 13313 |
-src_compile() { |
| 13314 |
- # Preparing to build nmtree |
| 13315 |
- cd "${WORKDIR}/lib/libnetbsd" || die |
| 13316 |
- freebsd_src_compile |
| 13317 |
- |
| 13318 |
- cd "${S}" || die |
| 13319 |
- freebsd_src_compile |
| 13320 |
-} |
| 13321 |
- |
| 13322 |
-src_install() { |
| 13323 |
- # By creating these directories we avoid having to do a |
| 13324 |
- # more complex hack |
| 13325 |
- dodir /usr/share/doc |
| 13326 |
- dodir /sbin |
| 13327 |
- dodir /usr/libexec |
| 13328 |
- dodir /usr/bin |
| 13329 |
- |
| 13330 |
- # FILESDIR is used by some makefiles which will install files |
| 13331 |
- # in the wrong place, just put it in the doc directory. |
| 13332 |
- freebsd_src_install DOCDIR=/usr/share/doc/${PF} |
| 13333 |
- |
| 13334 |
- # Most of these now come from openrc. |
| 13335 |
- for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do |
| 13336 |
- newinitd "${FILESDIR}/"${util}.initd ${util} || die |
| 13337 |
- if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ |
| 13338 |
- newconfd "${FILESDIR}"/${util}.confd ${util} || die |
| 13339 |
- fi |
| 13340 |
- done |
| 13341 |
- |
| 13342 |
- for class in daily monthly weekly; do |
| 13343 |
- cat - > "${T}/periodic.${class}" <<EOS |
| 13344 |
-#!/bin/sh |
| 13345 |
-/usr/sbin/periodic ${class} |
| 13346 |
-EOS |
| 13347 |
- exeinto /etc/cron.${class} |
| 13348 |
- newexe "${T}/periodic.${class}" periodic |
| 13349 |
- done |
| 13350 |
- |
| 13351 |
- # Install the pw.conf file to let pw use Gentoo's skel location |
| 13352 |
- insinto /etc |
| 13353 |
- doins "${FILESDIR}/pw.conf" || die |
| 13354 |
- |
| 13355 |
- cd "${WORKDIR}/etc" || die |
| 13356 |
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die |
| 13357 |
- |
| 13358 |
- if use bluetooth; then |
| 13359 |
- insinto /etc/bluetooth |
| 13360 |
- doins bluetooth/* || die |
| 13361 |
- rm -f "${D}"/etc/bluetooth/Makefile |
| 13362 |
- fi |
| 13363 |
- |
| 13364 |
- cd "${S}"/ppp || die |
| 13365 |
- insinto /etc/ppp |
| 13366 |
- doins ppp.conf || die |
| 13367 |
- |
| 13368 |
- # Install the periodic stuff (needs probably to be ported in a more |
| 13369 |
- # gentooish way) |
| 13370 |
- cd "${WORKDIR}/etc/periodic" || die |
| 13371 |
- |
| 13372 |
- doperiodic daily daily/*.accounting |
| 13373 |
- doperiodic monthly monthly/*.accounting |
| 13374 |
-} |
| 13375 |
- |
| 13376 |
-pkg_postinst() { |
| 13377 |
- # We need to run pwd_mkdb if key files are not present |
| 13378 |
- # If they are, then there is no need to run pwd_mkdb |
| 13379 |
- if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then |
| 13380 |
- if [[ -e "${ROOT}etc/master.passwd" ]] ; then |
| 13381 |
- einfo "Generating passwd files from ${ROOT}etc/master.passwd" |
| 13382 |
- "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd" |
| 13383 |
- else |
| 13384 |
- eerror "${ROOT}etc/master.passwd does not exist!" |
| 13385 |
- eerror "You will no be able to log into your system!" |
| 13386 |
- fi |
| 13387 |
- fi |
| 13388 |
- |
| 13389 |
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \ |
| 13390 |
- debug.log slip.log ppp.log; do |
| 13391 |
- [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}" |
| 13392 |
- done |
| 13393 |
-} |
| 13394 |
|
| 13395 |
diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml |
| 13396 |
deleted file mode 100644 |
| 13397 |
index 45c930b..0000000 |
| 13398 |
--- a/sys-freebsd/freebsd-usbin/metadata.xml |
| 13399 |
+++ /dev/null |
| 13400 |
@@ -1,19 +0,0 @@ |
| 13401 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 13402 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 13403 |
-<pkgmetadata> |
| 13404 |
- <maintainer type="project"> |
| 13405 |
- <email>bsd@g.o</email> |
| 13406 |
- <name>BSD Project</name> |
| 13407 |
- </maintainer> |
| 13408 |
- <use> |
| 13409 |
- <flag name="floppy">Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag> |
| 13410 |
- <flag name="audit"> |
| 13411 |
- Build auditing tools. |
| 13412 |
- </flag> |
| 13413 |
- <flag name="netware"> |
| 13414 |
- Build libraries and tools to work with NetWare protocols (IPX |
| 13415 |
- and NCP). |
| 13416 |
- </flag> |
| 13417 |
- <flag name='zfs'>Enable ZFS support.</flag> |
| 13418 |
- </use> |
| 13419 |
-</pkgmetadata> |
Archives