From patchwork Tue Sep 5 03:19:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Apolinarski X-Patchwork-Id: 1400 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 1EE8161C3B for ; Mon, 4 Sep 2017 19:19:54 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id B14C1284E; Mon, 4 Sep 2017 19:19:53 +0200 (CEST) Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com [IPv6:2a00:1450:400c:c09::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPS id 9F4242845 for ; Mon, 4 Sep 2017 19:19:50 +0200 (CEST) Received: by mail-wm0-x236.google.com with SMTP id 137so17001263wmj.1 for ; Mon, 04 Sep 2017 10:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A6G2TWEIPWdMOADvyNXJnJtsUyOoLx8q7iSSO1vSBJk=; b=XdxkbXOq60VCqeEk5ALafx2R5+tkDhBR/aUdHrsDyiQCYnFjiBwPWwoU9fM6btuCAI 7D76Sx0IYFUhp/7haWf3MOLADAyNmSohy5GMzqeQId2LLZlOHleaRX9JDh9082yq4RFN WKSBaw247dG6aOiAd7HVhtZ1XjAlXo/cJtTJvJYOtTS8q2HXUOGhCXQ2tDYNK7z/hcCO YjBIYlczqUpDMI6wPxgM/gTO9me9ekvnZXpkQOt/ss6eDUCmEZkSk1RMcR407E8Sro5J LBQhVWMwkt91+CzHVPUKUhxI3Mfmc+C++yyki5hjVVw5VqrGMHBjqqCVVjdDe0gVm0Kl FqoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A6G2TWEIPWdMOADvyNXJnJtsUyOoLx8q7iSSO1vSBJk=; b=sy6HJGw/ab0+6f8ipC3Q8xFo+9EUfWE0LyYxbCyk62360LCIZ+dXC0kI7gsg8BK1YH IZTgyHPYvdujVEVWqVD0uewzgw2gu8/sUqBEoyrhI5tEXU/3qj8CTkjB6utwSzBTfYyP yHf4L9kR6j4ItQPEizw5+KptyjEnS4lCKsJXlZob2u20ZJHq1kJoLhs9q9EH0K9ylaDw QP9/rskoqi5186FRJuiJaNh++2e3/4CgP485AJi9l64dcRuLiTObFwx+1ge0w2ItTamT BcU3WeTWjH1gD9f/jeYkOYQE6io4q2Rvo1zJrhOylNThaOGQQ4zPvYs1tzVjUvkTjvV8 PAIg== X-Gm-Message-State: AHPjjUhHZkWyEjP5MYC152FAgxVUCZNWr5x0+a8OQgeJbh7Ia5QEtk2u 5vJlzZh7D8XtuXOm7qs= X-Google-Smtp-Source: ADKCNb620ca+VWkaZKuYuK5e2ShsOaUkKOlXjNXjdlUDVpajQMgKSaKa2nsIySuqihlUntzMkMXFNQ== X-Received: by 10.28.71.25 with SMTP id u25mr769614wma.126.1504545588948; Mon, 04 Sep 2017 10:19:48 -0700 (PDT) Received: from gentoo-modula.duisburg.apolinarski.de (x4e308d86.dyn.telefonica.de. [78.48.141.134]) by smtp.gmail.com with ESMTPSA id w16sm6495267wmw.2.2017.09.04.10.19.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Sep 2017 10:19:48 -0700 (PDT) From: Wolfgang Apolinarski To: development@lists.ipfire.org Subject: [PATCH v3 1/2] apr and aprutil: Added as requirement for apache 2.4 Date: Mon, 4 Sep 2017 19:19:35 +0200 Message-Id: <20170904171935.2939-1-wolfgang.apolinarski@googlemail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170823192447.3477-1-wolfgang.apolinarski@googlemail.com> References: <20170823192447.3477-1-wolfgang.apolinarski@googlemail.com> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wolfgang Apolinarski Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - APR 1.6.2 is a requirement for building apache httpd 2.4 - APR-Util 1.6.0 is a requirement for building apache httpd 2.4 --- config/rootfiles/common/apache2 | 17 --------- config/rootfiles/common/apr | 57 ++++++++++++++++++++++++++++ config/rootfiles/common/aprutil | 47 +++++++++++++++++++++++ lfs/apache2 | 2 +- lfs/apr | 82 ++++++++++++++++++++++++++++++++++++++++ lfs/aprutil | 84 +++++++++++++++++++++++++++++++++++++++++ make.sh | 2 + 7 files changed, 273 insertions(+), 18 deletions(-) create mode 100644 config/rootfiles/common/apr create mode 100644 config/rootfiles/common/aprutil create mode 100644 lfs/apr create mode 100644 lfs/aprutil diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 7e33a155e..0f4939c00 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1341,23 +1341,6 @@ usr/lib/apache/mod_userdir.so usr/lib/apache/mod_usertrack.so usr/lib/apache/mod_version.so usr/lib/apache/mod_vhost_alias.so -#usr/lib/apr-util-1 -usr/lib/apr-util-1/apr_dbd_sqlite3-1.so -#usr/lib/apr-util-1/apr_dbd_sqlite3.a -#usr/lib/apr-util-1/apr_dbd_sqlite3.la -usr/lib/apr-util-1/apr_dbd_sqlite3.so -#usr/lib/apr.exp -#usr/lib/aprutil.exp -#usr/lib/libapr-1.a -#usr/lib/libapr-1.la -usr/lib/libapr-1.so -usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.5.1 -#usr/lib/libaprutil-1.a -#usr/lib/libaprutil-1.la -usr/lib/libaprutil-1.so -usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.5.3 #usr/lib/pkgconfig/apr-1.pc #usr/lib/pkgconfig/apr-util-1.pc #usr/sbin/ab diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr new file mode 100644 index 000000000..c71ee01cc --- /dev/null +++ b/config/rootfiles/common/apr @@ -0,0 +1,57 @@ +usr/bin/apr-1-config +#usr/include/apr-1 +#usr/include/apr-1/apr.h +#usr/include/apr-1/apr_allocator.h +#usr/include/apr-1/apr_atomic.h +#usr/include/apr-1/apr_cstr.h +#usr/include/apr-1/apr_dso.h +#usr/include/apr-1/apr_env.h +#usr/include/apr-1/apr_errno.h +#usr/include/apr-1/apr_escape.h +#usr/include/apr-1/apr_file_info.h +#usr/include/apr-1/apr_file_io.h +#usr/include/apr-1/apr_fnmatch.h +#usr/include/apr-1/apr_general.h +#usr/include/apr-1/apr_getopt.h +#usr/include/apr-1/apr_global_mutex.h +#usr/include/apr-1/apr_hash.h +#usr/include/apr-1/apr_inherit.h +#usr/include/apr-1/apr_lib.h +#usr/include/apr-1/apr_mmap.h +#usr/include/apr-1/apr_network_io.h +#usr/include/apr-1/apr_perms_set.h +#usr/include/apr-1/apr_poll.h +#usr/include/apr-1/apr_pools.h +#usr/include/apr-1/apr_portable.h +#usr/include/apr-1/apr_proc_mutex.h +#usr/include/apr-1/apr_random.h +#usr/include/apr-1/apr_ring.h +#usr/include/apr-1/apr_shm.h +#usr/include/apr-1/apr_signal.h +#usr/include/apr-1/apr_skiplist.h +#usr/include/apr-1/apr_strings.h +#usr/include/apr-1/apr_support.h +#usr/include/apr-1/apr_tables.h +#usr/include/apr-1/apr_thread_cond.h +#usr/include/apr-1/apr_thread_mutex.h +#usr/include/apr-1/apr_thread_proc.h +#usr/include/apr-1/apr_thread_rwlock.h +#usr/include/apr-1/apr_time.h +#usr/include/apr-1/apr_user.h +#usr/include/apr-1/apr_version.h +#usr/include/apr-1/apr_want.h +#usr/lib/apr.exp +#usr/lib/libapr-1.la +#usr/lib/libapr-1.so +usr/lib/libapr-1.so.0 +usr/lib/libapr-1.so.0.6.2 +#usr/lib/pkgconfig/apr-1.pc +#usr/share/apr-1 +#usr/share/apr-1/build +#usr/share/apr-1/build/apr_common.m4 +#usr/share/apr-1/build/apr_rules.mk +#usr/share/apr-1/build/find_apr.m4 +#usr/share/apr-1/build/libtool +#usr/share/apr-1/build/make_exports.awk +#usr/share/apr-1/build/make_var_export.awk +#usr/share/apr-1/build/mkdir.sh diff --git a/config/rootfiles/common/aprutil b/config/rootfiles/common/aprutil new file mode 100644 index 000000000..e9cf3e0da --- /dev/null +++ b/config/rootfiles/common/aprutil @@ -0,0 +1,47 @@ +usr/bin/apu-1-config +#usr/include/apr-1/apr_anylock.h +#usr/include/apr-1/apr_base64.h +#usr/include/apr-1/apr_buckets.h +#usr/include/apr-1/apr_crypto.h +#usr/include/apr-1/apr_date.h +#usr/include/apr-1/apr_dbd.h +#usr/include/apr-1/apr_dbm.h +#usr/include/apr-1/apr_hooks.h +#usr/include/apr-1/apr_ldap.h +#usr/include/apr-1/apr_ldap_init.h +#usr/include/apr-1/apr_ldap_option.h +#usr/include/apr-1/apr_ldap_rebind.h +#usr/include/apr-1/apr_ldap_url.h +#usr/include/apr-1/apr_md4.h +#usr/include/apr-1/apr_md5.h +#usr/include/apr-1/apr_memcache.h +#usr/include/apr-1/apr_optional.h +#usr/include/apr-1/apr_optional_hooks.h +#usr/include/apr-1/apr_queue.h +#usr/include/apr-1/apr_redis.h +#usr/include/apr-1/apr_reslist.h +#usr/include/apr-1/apr_rmm.h +#usr/include/apr-1/apr_sdbm.h +#usr/include/apr-1/apr_sha1.h +#usr/include/apr-1/apr_siphash.h +#usr/include/apr-1/apr_strmatch.h +#usr/include/apr-1/apr_thread_pool.h +#usr/include/apr-1/apr_uri.h +#usr/include/apr-1/apr_uuid.h +#usr/include/apr-1/apr_xlate.h +#usr/include/apr-1/apr_xml.h +#usr/include/apr-1/apu.h +#usr/include/apr-1/apu_errno.h +#usr/include/apr-1/apu_version.h +#usr/include/apr-1/apu_want.h +#usr/include/apr-1/expat.h +#usr/lib/apr-util-1 +usr/lib/apr-util-1/apr_crypto_openssl-1.so +#usr/lib/apr-util-1/apr_crypto_openssl.la +usr/lib/apr-util-1/apr_crypto_openssl.so +#usr/lib/aprutil.exp +#usr/lib/libaprutil-1.la +#usr/lib/libaprutil-1.so +usr/lib/libaprutil-1.so.0 +usr/lib/libaprutil-1.so.0.6.0 +#usr/lib/pkgconfig/apr-util-1.pc diff --git a/lfs/apache2 b/lfs/apache2 index 57c344718..6c71a08cf 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -103,7 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) echo "" >> $(DIR_APP)/config.layout cd $(DIR_APP) && ./configure --enable-layout=IPFire \ - --enable-ssl --enable-mods-shared=all --enable-proxy + --enable-ssl --enable-mods-shared=all --enable-proxy --with-apr=/usr --with-apr-util=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install chown -v root:root /usr/lib/apache/httpd.exp \ diff --git a/lfs/apr b/lfs/apr new file mode 100644 index 000000000..6f667cffc --- /dev/null +++ b/lfs/apr @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 IPFire Team # +# # +# 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 . # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.6.2 + +THISAPP = apr-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = e81a851967c79b5ce9bfbc909e4bf735 + +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 jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure --prefix=/usr \ + --disable-static --with-installbuilddir=/usr/share/apr-1/build + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/aprutil b/lfs/aprutil new file mode 100644 index 000000000..c2f808422 --- /dev/null +++ b/lfs/aprutil @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 IPFire Team # +# # +# 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 . # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.6.0 + +THISAPP = apr-util-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +DEPS = "apr" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 069a9a980776acab05212c5f37ef8368 + +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 jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-apr=/usr --with-gdbm=/usr --with-openssl=/usr --with-crypto --with-expat=/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 8e2889fc3..3ea8cf4cd 100755 --- a/make.sh +++ b/make.sh @@ -497,6 +497,8 @@ buildipfire() { lfsmake2 libevent2 lfsmake2 libevent2-compat lfsmake2 expat + lfsmake2 apr + lfsmake2 aprutil lfsmake2 unbound lfsmake2 gnutls lfsmake2 bind