Looks good to me - thank you for keeping IPFire a tidy place.

Acked-by: Peter Müller peter.mueller@ipfire.org

• Build worked without libevent without problems
• Nothing shows up as dependent on the libevent (legacy) libraries
• Lots of dependencies on the the libevent2 libraries

Signed-off-by: Adolf Belka adolf.belka@ipfire.org

config/rootfiles/common/libevent | 24 ---------- lfs/libevent | 78 -------------------------------- make.sh | 1 - 3 files changed, 103 deletions(-) delete mode 100644 config/rootfiles/common/libevent delete mode 100644 lfs/libevent

diff --git a/config/rootfiles/common/libevent b/config/rootfiles/common/libevent deleted file mode 100644 index 77bbade2e..000000000 --- a/config/rootfiles/common/libevent +++ /dev/null @@ -1,24 +0,0 @@ -#usr/bin/event_rpcgen.py -#usr/include/evdns.h -#usr/include/event-config.h -#usr/include/event.h -#usr/include/evhttp.h -#usr/include/evrpc.h -#usr/include/evutil.h -usr/lib/libevent-1.4.so.2 -usr/lib/libevent-1.4.so.2.2.0 -#usr/lib/libevent.a -#usr/lib/libevent.la -#usr/lib/libevent.so -usr/lib/libevent_core-1.4.so.2 -usr/lib/libevent_core-1.4.so.2.2.0 -#usr/lib/libevent_core.a -#usr/lib/libevent_core.la -#usr/lib/libevent_core.so -usr/lib/libevent_extra-1.4.so.2 -usr/lib/libevent_extra-1.4.so.2.2.0 -#usr/lib/libevent_extra.a -#usr/lib/libevent_extra.la -#usr/lib/libevent_extra.so -#usr/share/man/man3/evdns.3 -#usr/share/man/man3/event.3 diff --git a/lfs/libevent b/lfs/libevent deleted file mode 100644 index 7a043a6ed..000000000 --- a/lfs/libevent +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -###############################################################################

-############################################################################### -# Definitions -###############################################################################

-include Config

-VER = 1.4.14b-stable

-THISAPP = libevent-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)

-############################################################################### -# Top-level Rules -###############################################################################

-objects = $(DL_FILE)

-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = e4d5c6ff7b479544bf583b8e40c3273237f6d3e0acd07b73b6aebeaac670198d1f9ad269429afc985a488f7ce14343788d7d9bcb78de617d8781bed09de48856

-install : $(TARGET)

-check : $(patsubst %,$(DIR_CHK)/%,$(objects))

-download :$(patsubst %,$(DIR_DL)/%,$(objects))

-b2 : $(subst %,%_BLAKE2,$(objects))

-############################################################################### -# Downloading, checking, b2sum -###############################################################################

-$(patsubst %,$(DIR_CHK)/%,$(objects)) :

• @$(CHECK)

-$(patsubst %,$(DIR_DL)/%,$(objects)) :

• @$(LOAD)

-$(subst %,%_BLAKE2,$(objects)) :

• @$(B2SUM)

-############################################################################### -# Installation Details -###############################################################################

-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

• @$(PREBUILD)
• @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
• $(UPDATE_AUTOMAKE)
• cd $(DIR_APP) && ./configure --prefix=/usr
• cd $(DIR_APP) && make $(MAKETUNING)
• cd $(DIR_APP) && make install
• @rm -rf $(DIR_APP)
• @$(POSTBUILD)

diff --git a/make.sh b/make.sh index 95e6e89db..47a7c6fa5 100755 --- a/make.sh +++ b/make.sh @@ -1204,7 +1204,6 @@ buildipfire() { lfsmake2 nettle lfsmake2 json-c lfsmake2 libconfig

• lfsmake2 libevent lfsmake2 libevent2 lfsmake2 expat lfsmake2 apr