From owner-svn-src-all@freebsd.org Tue Oct 9 18:35:46 2018 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 18C4910B7B31; Tue, 9 Oct 2018 18:35:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B9C71768DF; Tue, 9 Oct 2018 18:35:45 +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 AE53C15F3D; Tue, 9 Oct 2018 18:35:45 +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 w99IZjOT045372; Tue, 9 Oct 2018 18:35:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w99IZj50045370; Tue, 9 Oct 2018 18:35:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810091835.w99IZj50045370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Oct 2018 18:35:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339261 - in head: . usr.sbin/ntp/libntpevent X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: . usr.sbin/ntp/libntpevent X-SVN-Commit-Revision: 339261 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 09 Oct 2018 18:35:46 -0000 Author: emaste Date: Tue Oct 9 18:35:45 2018 New Revision: 339261 URL: https://svnweb.freebsd.org/changeset/base/339261 Log: Switch ntp's embedded libevent to 2.1.18 For OpenSSL 1.1.1 compatibility. In Makefile.inc1 add (to the existing similar cases) a hack to handle dependencies across the migration. Reviewed by: jhb Approved by: re (gjb) Sponsored by: The FreeBSD Foundation. Differential Revision: https://reviews.freebsd.org/D17481 Modified: head/Makefile.inc1 head/usr.sbin/ntp/libntpevent/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 9 17:44:25 2018 (r339260) +++ head/Makefile.inc1 Tue Oct 9 18:35:45 2018 (r339261) @@ -939,6 +939,13 @@ _cleanobj_fast_depend_hack: .PHONY ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \ fi .endfor +# 20181009 track migration from ntp's embedded libevent to updated one + @if [ -e "${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o" ] && \ + egrep -q 'contrib/ntp/sntp/libevent/bufferevent_openssl.c' \ + ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o ; then \ + echo "Removing stale libevent dependencies"; \ + rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \ + fi _worldtmp: .PHONY @echo Modified: head/usr.sbin/ntp/libntpevent/Makefile ============================================================================== --- head/usr.sbin/ntp/libntpevent/Makefile Tue Oct 9 17:44:25 2018 (r339260) +++ head/usr.sbin/ntp/libntpevent/Makefile Tue Oct 9 18:35:45 2018 (r339261) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent +.PATH: ${SRCTOP}/contrib/libevent LIB= ntpevent INTERNALLIB= @@ -26,7 +26,7 @@ NTP_ATOMIC=noatomic .endif CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ - -I${SRCTOP}/contrib/ntp/sntp/libevent/include \ + -I${SRCTOP}/contrib/libevent/include \ -I${.CURDIR}/ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H