svn commit: r361607 - in head: . etc/mtree lib lib/libevent lib/libevent1 share/mk usr.sbin/ftp-proxy usr.sbin/ypldap
Ed Maste
emaste at FreeBSD.org
Thu May 28 22:05:52 UTC 2020
Author: emaste
Date: Thu May 28 22:05:50 2020
New Revision: 361607
URL: https://svnweb.freebsd.org/changeset/base/361607
Log:
rename in-tree libevent v1 to libevent1
r316063 installed pf's embedded libevent as a private lib, with headers
in /usr/include/private/event. Unfortunately we also have a copy of
libevent v2 included in ntp, which needed to be updated for compatibility
with OpenSSL 1.1.
As unadorned 'libevent' generally refers to libevent v2, be explicit that
this one is libevent v1.
Reviewed by: vangyzen (earlier)
Differential Revision: https://reviews.freebsd.org/D17275
Added:
head/lib/libevent1/
- copied from r361606, head/lib/libevent/
Deleted:
head/lib/libevent/
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.usr.dist
head/lib/Makefile
head/lib/libevent1/Makefile
head/share/mk/src.libnames.mk
head/usr.sbin/ftp-proxy/Makefile
head/usr.sbin/ypldap/Makefile
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Thu May 28 22:05:33 2020 (r361606)
+++ head/ObsoleteFiles.inc Thu May 28 22:05:50 2020 (r361607)
@@ -36,6 +36,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20200528: libevent renamed libevent1
+OLD_FILES+=usr/include/private/event/event.h
+OLD_DIRS+=usr/include/private/event
+
# 20200523: new clang import which bumps version from 10.0.0 to 10.0.1.s
OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/algorithm
OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/complex
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Thu May 28 22:05:33 2020 (r361606)
+++ head/etc/mtree/BSD.usr.dist Thu May 28 22:05:50 2020 (r361607)
@@ -11,7 +11,7 @@
private
bsdstat
..
- event
+ event1
..
gmock
internal
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Thu May 28 22:05:33 2020 (r361606)
+++ head/lib/Makefile Thu May 28 22:05:50 2020 (r361607)
@@ -48,7 +48,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libdwarf \
libedit \
libelftc \
- libevent \
+ libevent1 \
libexecinfo \
libexpat \
libfetch \
Modified: head/lib/libevent1/Makefile
==============================================================================
--- head/lib/libevent/Makefile Thu May 28 22:05:33 2020 (r361606)
+++ head/lib/libevent1/Makefile Thu May 28 22:05:50 2020 (r361607)
@@ -5,7 +5,7 @@ PACKAGE=lib${LIB}
.include <src.opts.mk>
-LIB= event
+LIB= event1
SHLIB_MAJOR= 1
PRIVATELIB=
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Thu May 28 22:05:33 2020 (r361606)
+++ head/share/mk/src.libnames.mk Thu May 28 22:05:50 2020 (r361607)
@@ -18,7 +18,7 @@ _PRIVATELIBS= \
auditd \
bsdstat \
devdctl \
- event \
+ event1 \
gmock \
gtest \
gmock_main \
Modified: head/usr.sbin/ftp-proxy/Makefile
==============================================================================
--- head/usr.sbin/ftp-proxy/Makefile Thu May 28 22:05:33 2020 (r361606)
+++ head/usr.sbin/ftp-proxy/Makefile Thu May 28 22:05:50 2020 (r361607)
@@ -9,7 +9,7 @@ SRCS= ftp-proxy.c filter.c
CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
-LIBADD= event
+LIBADD= event1
WARNS?= 3
Modified: head/usr.sbin/ypldap/Makefile
==============================================================================
--- head/usr.sbin/ypldap/Makefile Thu May 28 22:05:33 2020 (r361606)
+++ head/usr.sbin/ypldap/Makefile Thu May 28 22:05:50 2020 (r361607)
@@ -9,7 +9,7 @@ SRCS= parse.y ypldap.c log.c \
MAN= ypldap.8 ypldap.conf.5
-LIBADD= openbsd event util rpcsvc
+LIBADD= openbsd event1 util rpcsvc
CFLAGS+=-I${.CURDIR}
CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
More information about the svn-src-head
mailing list