From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Mon, 17 Apr 2017 12:25:59 +0000 (+0200)
Subject: libevent2-compat: newpackage
X-Git-Tag: v2.19-core111~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac69a292a8b41224b31e7dd8c0335e3d9b604129;p=people%2Fstevee%2Fipfire-2.x.git

libevent2-compat: newpackage

Keeps older packages that have been linked
against this version of libevent2 working.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/libevent2-compat b/config/rootfiles/common/libevent2-compat
new file mode 100644
index 0000000000..edeb449e23
--- /dev/null
+++ b/config/rootfiles/common/libevent2-compat
@@ -0,0 +1,10 @@
+usr/lib/libevent-2.0.so.5
+usr/lib/libevent-2.0.so.5.1.9
+usr/lib/libevent_core-2.0.so.5
+usr/lib/libevent_core-2.0.so.5.1.9
+usr/lib/libevent_extra-2.0.so.5
+usr/lib/libevent_extra-2.0.so.5.1.9
+usr/lib/libevent_openssl-2.0.so.5
+usr/lib/libevent_openssl-2.0.so.5.1.9
+usr/lib/libevent_pthreads-2.0.so.5
+usr/lib/libevent_pthreads-2.0.so.5.1.9
diff --git a/lfs/libevent2-compat b/lfs/libevent2-compat
new file mode 100644
index 0000000000..954b7dd755
--- /dev/null
+++ b/lfs/libevent2-compat
@@ -0,0 +1,95 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.de>                      #
+#                                                                             #
+# 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        = 2.0.22-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)_MD5 = c4c56f986aa985677ca1db89630a2e11
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--disable-static
+
+	cd $(DIR_APP) && make $(MAKETUNING)
+
+	cd $(DIR_APP) && install -m 755 .libs/libevent-2.0.so.5.1.9 /usr/lib
+	ln -svf libevent-2.0.so.5.1.9 /usr/lib/libevent-2.0.so.5
+
+	cd $(DIR_APP) && install -m 755 .libs/libevent_core-2.0.so.5.1.9 /usr/lib
+	ln -svf libevent_core-2.0.so.5.1.9 /usr/lib/libevent_core-2.0.so.5
+
+	cd $(DIR_APP) && install -m 755 .libs/libevent_extra-2.0.so.5.1.9 /usr/lib
+	ln -svf libevent_extra-2.0.so.5.1.9 /usr/lib/libevent_extra-2.0.so.5
+
+	cd $(DIR_APP) && install -m 755 .libs/libevent_openssl-2.0.so.5.1.9 /usr/lib
+	ln -svf libevent_openssl-2.0.so.5.1.9 /usr/lib/libevent_openssl-2.0.so.5
+
+	cd $(DIR_APP) && install -m 755 .libs/libevent_pthreads-2.0.so.5.1.9 /usr/lib
+	ln -svf libevent_pthreads-2.0.so.5.1.9 /usr/lib/libevent_pthreads-2.0.so.5
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 7fe25b5c02..a87f706ff5 100755
--- a/make.sh
+++ b/make.sh
@@ -491,6 +491,7 @@ buildipfire() {
   ipfiremake nettle
   ipfiremake libevent
   ipfiremake libevent2
+  ipfiremake libevent2-compat
   ipfiremake expat
   ipfiremake unbound
   ipfiremake gnutls