From owner-svn-src-all@freebsd.org Mon Feb 25 18:22:22 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40C25151183C; Mon, 25 Feb 2019 18:22:22 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DB64871A9E; Mon, 25 Feb 2019 18:22:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A369720CA1; Mon, 25 Feb 2019 18:22:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1PIMLDD018500; Mon, 25 Feb 2019 18:22:21 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1PIMKGS018495; Mon, 25 Feb 2019 18:22:20 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201902251822.x1PIMKGS018495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 25 Feb 2019 18:22:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r344530 - in head: . lib/libifconfig share/mk sys/sys X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: . lib/libifconfig share/mk sys/sys X-SVN-Commit-Revision: 344530 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DB64871A9E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2019 18:22:22 -0000 Author: emaste Date: Mon Feb 25 18:22:20 2019 New Revision: 344530 URL: https://svnweb.freebsd.org/changeset/base/344530 Log: Make libifconfig INTERNALLIB Instead of PRIVATELIB + NO_PIC. This avoids the need for the wlandebug PIE special case added in r344211, and provides a stronger guarantee against 3rd party software coming to depend on the API or ABI. If / when we declare the API/ABI to be stable we can make it a normal library. Discussed with: bapt Sponsored by: The FreeBSD Foundation Modified: head/ObsoleteFiles.inc head/lib/libifconfig/Makefile head/share/mk/bsd.libnames.mk head/share/mk/src.libnames.mk head/sys/sys/capability.h Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Feb 25 18:11:59 2019 (r344529) +++ head/ObsoleteFiles.inc Mon Feb 25 18:22:20 2019 (r344530) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20190222: libifconfig made INTERNALLIB +OLD_FILES+=/usr/lib/libprivateifconfig.a +OLD_FILES+=/usr/lib/libprivateifconfig_p.a # 20190131: pfil(9) changed OLD_FILES+=usr/share/man/man9/pfil_hook_get.9 OLD_FILES+=usr/share/man/man9/pfil_rlock.9 Modified: head/lib/libifconfig/Makefile ============================================================================== --- head/lib/libifconfig/Makefile Mon Feb 25 18:11:59 2019 (r344529) +++ head/lib/libifconfig/Makefile Mon Feb 25 18:22:20 2019 (r344530) @@ -2,9 +2,7 @@ PACKAGE= lib${LIB} LIB= ifconfig -PRIVATELIB= true -# Don't build shared library, for now. -NO_PIC= +INTERNALLIB= true SHLIBDIR?= /lib SHLIB_MAJOR= 1 Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Mon Feb 25 18:11:59 2019 (r344529) +++ head/share/mk/bsd.libnames.mk Mon Feb 25 18:22:20 2019 (r344530) @@ -80,7 +80,6 @@ LIBIBMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibmad.a LIBIBNETDISC?= ${LIBDESTDIR}${LIBDIR_BASE}/libibnetdisc.a LIBIBUMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibumad.a LIBIBVERBS?= ${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a -LIBIFCONFIG?= ${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a LIBIPSEC?= ${LIBDESTDIR}${LIBDIR_BASE}/libipsec.a LIBIPT?= ${LIBDESTDIR}${LIBDIR_BASE}/libipt.a LIBJAIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libjail.a Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Mon Feb 25 18:11:59 2019 (r344529) +++ head/share/mk/src.libnames.mk Mon Feb 25 18:22:20 2019 (r344530) @@ -20,7 +20,6 @@ _PRIVATELIBS= \ event \ heimipcc \ heimipcs \ - ifconfig \ ldns \ sqlite3 \ ssh \ @@ -35,6 +34,7 @@ _INTERNALLIBS= \ cron \ elftc \ fifolog \ + ifconfig \ ipf \ lpr \ netbsd \ @@ -449,6 +449,9 @@ LIBVERS?= ${LIBVERSDIR}/libvers${PIE_SUFFIX}.a LIBSLDIR= ${OBJTOP}/kerberos5/lib/libsl LIBSL?= ${LIBSLDIR}/libsl${PIE_SUFFIX}.a + +LIBIFCONFIGDIR= ${OBJTOP}/lib/libifconfig +LIBIFCONFIG?= ${LIBIFCONFIGDIR}/libifconfig${PIE_SUFFIX}.a LIBIPFDIR= ${OBJTOP}/sbin/ipf/libipf LIBIPF?= ${LIBIPFDIR}/libipf${PIE_SUFFIX}.a Modified: head/sys/sys/capability.h ============================================================================== --- head/sys/sys/capability.h Mon Feb 25 18:11:59 2019 (r344529) +++ head/sys/sys/capability.h Mon Feb 25 18:22:20 2019 (r344530) @@ -35,13 +35,13 @@ * Historically, the key userspace and kernel Capsicum definitions were found * in this file. However, it conflicted with POSIX.1e's capability.h, so has * been renamed capsicum.h. The file remains for backwards compatibility - * reasons as a nested include. It is expected to be removed before - * FreeBSD 13. + * reasons as a nested include. It will be removed on March 31, 2019 and will + * not be in FreeBSD 13. */ #ifndef _SYS_CAPABILITY_H_ #define _SYS_CAPABILITY_H_ -#warning this file includes which is deprecated +#warning this file includes , to be removed on March 31, 2019. #include #endif /* !_SYS_CAPABILITY_H_ */