public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH 1/2] apr and aprutil: Added as requirement for Apache 2.4
@ 2017-04-22 15:03 Wolfgang Apolinarski
  2017-04-22 15:03 ` [PATCH 2/2] Update to Apache 2.4.25 Wolfgang Apolinarski
  0 siblings, 1 reply; 7+ messages in thread
From: Wolfgang Apolinarski @ 2017-04-22 15:03 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 13102 bytes --]

- APR is a requirement for building Apache httpd 2.4
- APR-Util is a requirement for building Apache httpd 2.4
---
 config/rootfiles/common/apache2 |  8 ++--
 config/rootfiles/common/apr     | 53 ++++++++++++++++++++++++++
 config/rootfiles/common/aprutil | 50 ++++++++++++++++++++++++
 lfs/apr                         | 84 +++++++++++++++++++++++++++++++++++++++++
 lfs/aprutil                     | 84 +++++++++++++++++++++++++++++++++++++++++
 make.sh                         |  2 +
 6 files changed, 277 insertions(+), 4 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 7e33a15..360f5ae 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1342,22 +1342,22 @@ 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-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-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/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/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 0000000..c0b574a
--- /dev/null
+++ b/config/rootfiles/common/apr
@@ -0,0 +1,53 @@
+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_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_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.5.2
+#usr/lib/pkgconfig/apr-1.pc
+#usr/share/apr-1
+#usr/share/apr-1/build
+#usr/share/apr-1/build/apr_rules.mk
+#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 0000000..c764d88
--- /dev/null
+++ b/config/rootfiles/common/aprutil
@@ -0,0 +1,50 @@
+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_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_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.5.4
+#usr/lib/libexpat.a
+#usr/lib/libexpat.la
+#usr/lib/libexpat.so
+#usr/lib/libexpat.so.0
+#usr/lib/libexpat.so.0.5.0
+#usr/lib/pkgconfig/apr-util-1.pc
diff --git a/lfs/apr b/lfs/apr
new file mode 100644
index 0000000..330354a
--- /dev/null
+++ b/lfs/apr
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2014   IPFire Team  <info(a)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.5.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 = 4e9769f3349fe11fc0a5e1b224c236aa
+
+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) && sed -i "/seems to be moved/s/^/#/" build/ltmain.sh
+
+	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 0000000..6b133ad
--- /dev/null
+++ b/lfs/aprutil
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2014   IPFire Team  <info(a)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.5.4
+
+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 = 2202b18f269ad606d70e1864857ed93c
+
+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
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 61483eb..15dd4b9 100755
--- a/make.sh
+++ b/make.sh
@@ -354,6 +354,7 @@ buildbase() {
     lfsmake2 bzip2
     lfsmake2 pcre
     lfsmake2 pcre-compat
+    lfsmake2 apr
     lfsmake2 bash
     lfsmake2 diffutils
     lfsmake2 e2fsprogs
@@ -492,6 +493,7 @@ buildipfire() {
   ipfiremake libevent
   ipfiremake libevent2
   ipfiremake expat
+  ipfiremake aprutil
   ipfiremake unbound
   ipfiremake gnutls
   ipfiremake bind
-- 
2.7.3


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] Update to apache 2.4.25
@ 2017-05-18 19:28 Wolfgang Apolinarski
  0 siblings, 0 replies; 7+ messages in thread
From: Wolfgang Apolinarski @ 2017-05-18 19:28 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

Hi!

> this looks good and I think it is ready to be merged unless anybody
> else has any objections.
> 
> I do have one question tho: Do we need to enable all these new modules
> there? The point is that fewer modules would give us less attack
> surface.
> 

The modules added by me are:
> > +LoadModule socache_shmcb_module /usr/lib/apache/mod_socache_shmcb.so
This module is a memory-based cache provider for the SSLSessionCache.

> > +LoadModule unixd_module /usr/lib/apache/mod_unixd.so
This module is needed, because of the Group and User directive that change the user/group of Apache after startup (in uid.conf).

> > +LoadModule authn_core_module /usr/lib/apache/mod_authn_core.so
This module provides common authentication methods (AuthType, AuthName).

> > +LoadModule authz_core_module /usr/lib/apache/mod_authz_core.so
This module provides the Require-directive.

>From the existing modules, it is possible to deactivate:
auth_digest_module - I never saw anyone using digest authentication (basic is the one that is commonly chosen)
autoindex_module - Since we are not using the fancy indexing features of apache

Do we actually need the php5 module? ;-)
The web interface does not need it, but apparently a lot of packages need it...

Additionally, cgi was substituted with cgid.

Best regards,
Wolfgang


^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-05-18 19:28 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-22 15:03 [PATCH 1/2] apr and aprutil: Added as requirement for Apache 2.4 Wolfgang Apolinarski
2017-04-22 15:03 ` [PATCH 2/2] Update to Apache 2.4.25 Wolfgang Apolinarski
2017-04-24  9:16   ` Michael Tremer
2017-05-17 18:14   ` [PATCH v2 1/2] apr and aprutil: Added as requirement for apache 2.4 Wolfgang Apolinarski
2017-05-17 18:14     ` [PATCH v2 2/2] Update to apache 2.4.25 Wolfgang Apolinarski
2017-05-18 17:38       ` Michael Tremer
2017-05-18 19:28 Wolfgang Apolinarski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox