From 893a804c957ea73c6060aa4964d5175432588f2d Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 26 Jan 2020 18:07:46 +0100 Subject: [PATCH 1/6] apr: add PKG_LICENSE_FILES and PKG_CPE_ID Signed-off-by: Sebastian Kemper --- libs/apr/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/apr/Makefile b/libs/apr/Makefile index b07ae5800..281df24e1 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -18,6 +18,9 @@ PKG_HASH:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105 PKG_MAINTAINER:=Thomas Heil , \ Sebastian Kemper PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=LICENSE + +PKG_CPE_ID:=cpe:/a:apache:apr PKG_BUILD_PARALLEL:=1 From 12037b3f29f72be080c6f23498e2a38d89d01232 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 26 Jan 2020 18:22:20 +0100 Subject: [PATCH 2/6] apr: clean up the Makefile - sort configure variables - clean up installation defines (use macros, improve sed scripts, remove gratuitous slashes & whitespaces) Signed-off-by: Sebastian Kemper --- libs/apr/Makefile | 53 ++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 281df24e1..edc8bc061 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -44,44 +44,41 @@ CONFIGURE_ARGS += \ # XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure CONFIGURE_VARS += \ + ac_cv_func_pthread_mutexattr_setpshared=yes \ + ac_cv_func_sem_open=yes \ ac_cv_sizeof_struct_iovec=1 \ ac_cv_struct_rlimit=yes \ - ac_cv_func_sem_open=yes \ - ac_cv_func_pthread_mutexattr_setpshared=yes \ + apr_cv_accept4=yes \ + apr_cv_dup3=yes \ + apr_cv_epoll=yes \ + apr_cv_epoll_create1=yes \ + apr_cv_mutex_recursive=yes \ apr_cv_mutex_robust_shared=yes \ - apr_cv_tcp_nodelay_with_cork=yes \ - apr_cv_sock_cloexec=yes \ apr_cv_process_shared_works=yes \ - apr_cv_mutex_recursive=yes \ - apr_cv_epoll_create1=yes \ - apr_cv_epoll=yes \ - apr_cv_dup3=yes \ - apr_cv_accept4=yes + apr_cv_sock_cloexec=yes \ + apr_cv_tcp_nodelay_with_cork=yes define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 - $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ - $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ - $(1)/usr/include/apr-1/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \ - $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \ - $(1)/usr/lib/pkgconfig/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \ - $(1)/usr/share/build-1/ - $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(1)/usr/bin/apr-1-config - $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config - $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apr-1-config - $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apr-1-config - $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config - $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config - $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \ + $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ + $(1)/usr/bin + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ + $(1)/usr/include/apr-1 + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \ + $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1 + $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \ + $(1)/usr/bin/apr-1-config + $(SED) '/^datadir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config + $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \ + $(1)/usr/share/build-1/apr_rules.mk endef define Package/libapr/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib endef $(eval $(call BuildPackage,libapr)) From 193c3913b6a1c8d273cb86e2598848fc8b3920b6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 26 Jan 2020 18:50:04 +0100 Subject: [PATCH 3/6] apr: clean up the patches + enable LFS - removes 001-autoconf-compat.patch: Looks like this was meant as a workaround for a libtool issue. But it doesn't appear to be needed anymore. - removes 101-fix_apr_time_now.patch: Mentioned in https://dev.openwrt.org/ticket/9287, meant as a fix, but issue was fixed differently in the end (by activating LFS). - removes 201-upgrade-and-fix-1.5.1.patch: This is a cross-compile fix. This patch gets replaced by 001-cross-compile.patch from buildroot project. The latter was sent upstream by buildroot and is in line with the patch used by OpenWrt for the apache package. - adds 002-sys-param-h.patch: Fix PATH_MAX detection by including sys/param.h if available. Also from buildroot. Additionally configure variables found in buildroot package are added. These also enable LFS support. This was previously done (in OpenWrt) by defining _LARGEFILE64_SOURCE in TARGET_CPPFLAGS. But the configure variable is cleaner (and easier to follow). Signed-off-by: Sebastian Kemper --- libs/apr/Makefile | 9 ++- libs/apr/patches/001-autoconf-compat.patch | 26 --------- libs/apr/patches/001-cross-compile.patch | 56 +++++++++++++++++++ libs/apr/patches/002-sys-param-h.patch | 37 ++++++++++++ libs/apr/patches/101-fix_apr_time_now.patch | 13 ----- .../patches/201-upgrade-and-fix-1.5.1.patch | 51 ----------------- ...ze-doesn-t-match-in-glibc-when-cross.patch | 13 ++--- 7 files changed, 104 insertions(+), 101 deletions(-) delete mode 100644 libs/apr/patches/001-autoconf-compat.patch create mode 100644 libs/apr/patches/001-cross-compile.patch create mode 100644 libs/apr/patches/002-sys-param-h.patch delete mode 100644 libs/apr/patches/101-fix_apr_time_now.patch delete mode 100644 libs/apr/patches/201-upgrade-and-fix-1.5.1.patch diff --git a/libs/apr/Makefile b/libs/apr/Makefile index edc8bc061..31b55d679 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr PKG_VERSION:=1.6.5 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/apr/ @@ -17,6 +17,7 @@ PKG_HASH:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105 PKG_MAINTAINER:=Thomas Heil , \ Sebastian Kemper + PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -44,8 +45,11 @@ CONFIGURE_ARGS += \ # XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure CONFIGURE_VARS += \ + ac_cv_file__dev_zero=yes \ ac_cv_func_pthread_mutexattr_setpshared=yes \ ac_cv_func_sem_open=yes \ + ac_cv_func_setpgrp_void=yes \ + ac_cv_o_nonblock_inherited=no \ ac_cv_sizeof_struct_iovec=1 \ ac_cv_struct_rlimit=yes \ apr_cv_accept4=yes \ @@ -56,7 +60,8 @@ CONFIGURE_VARS += \ apr_cv_mutex_robust_shared=yes \ apr_cv_process_shared_works=yes \ apr_cv_sock_cloexec=yes \ - apr_cv_tcp_nodelay_with_cork=yes + apr_cv_tcp_nodelay_with_cork=yes \ + apr_cv_use_lfs64=yes define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \ diff --git a/libs/apr/patches/001-autoconf-compat.patch b/libs/apr/patches/001-autoconf-compat.patch deleted file mode 100644 index acc94fc3f..000000000 --- a/libs/apr/patches/001-autoconf-compat.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: apr-1.5.2/Makefile.in -=================================================================== ---- apr-1.5.2.orig/Makefile.in -+++ apr-1.5.2/Makefile.in -@@ -3,6 +3,7 @@ srcdir=@srcdir@ - VPATH=@srcdir@ - top_srcdir=@apr_srcdir@ - top_blddir=@apr_builddir@ -+top_builddir=@top_builddir@ - - # - # APR (Apache Portable Runtime) library Makefile. -Index: apr-1.5.2/configure.in -=================================================================== ---- apr-1.5.2.orig/configure.in -+++ apr-1.5.2/configure.in -@@ -245,9 +245,6 @@ case $host in - gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c - ;; - *) -- if test "x$LTFLAGS" = "x"; then -- LTFLAGS='--silent' -- fi - if test "$experimental_libtool" = "yes"; then - # Use a custom-made libtool replacement - echo "using jlibtool" diff --git a/libs/apr/patches/001-cross-compile.patch b/libs/apr/patches/001-cross-compile.patch new file mode 100644 index 000000000..984517530 --- /dev/null +++ b/libs/apr/patches/001-cross-compile.patch @@ -0,0 +1,56 @@ +Fix cross-compilation + +Patch was backported from Apache httpd: +http://svn.apache.org/viewvc?view=revision&revision=1327907 +http://svn.apache.org/viewvc?view=revision&revision=1328390 +http://svn.apache.org/viewvc?view=revision&revision=1328714 + +Patch submitted upstream: +https://issues.apache.org/bugzilla/show_bug.cgi?id=57058 + +Signed-off-by: Bernd Kuhls + +--- a/configure.in ++++ b/configure.in +@@ -118,6 +118,16 @@ AC_CANONICAL_SYSTEM + echo "Configuring APR library" + echo "Platform: $host" + ++dnl In case of cross compilation we set CC_FOR_BUILD to cc unless ++dnl we got already CC_FOR_BUILD from environment. ++if test "x${build_alias}" != "x${host_alias}"; then ++ if test "x${CC_FOR_BUILD}" = "x"; then ++ CC_FOR_BUILD=cc ++ fi ++fi ++AC_SUBST(CC_FOR_BUILD) ++AC_SUBST(CFLAGS_FOR_BUILD) ++ + dnl Some initial steps for configuration. We setup the default directory + dnl and which files are to be configured. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -8,6 +8,8 @@ top_blddir=@apr_builddir@ + # APR (Apache Portable Runtime) library Makefile. + # + CPP = @CPP@ ++CC_FOR_BUILD = @CC_FOR_BUILD@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ + + # get substituted into some targets + APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ +@@ -137,8 +139,13 @@ tools/gen_test_char.lo: tools/gen_test_c + $(APR_MKDIR) tools + $(LT_COMPILE) + ++ifdef CC_FOR_BUILD ++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< ++else + tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) + $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) ++endif + + include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ + $(APR_MKDIR) include/private diff --git a/libs/apr/patches/002-sys-param-h.patch b/libs/apr/patches/002-sys-param-h.patch new file mode 100644 index 000000000..4f2bbe811 --- /dev/null +++ b/libs/apr/patches/002-sys-param-h.patch @@ -0,0 +1,37 @@ +Fix PATH_MAX detection by including sys/param.h if available + +Patch sent upstream: +https://bz.apache.org/bugzilla/show_bug.cgi?id=63782 + +Signed-off-by: Bernd Kuhls + +--- a/configure.in ++++ b/configure.in +@@ -1593,6 +1593,7 @@ AC_SUBST(stdlibh) + AC_SUBST(stringh) + AC_SUBST(stringsh) + AC_SUBST(sys_ioctlh) ++AC_SUBST(sys_paramh) + AC_SUBST(sys_sendfileh) + AC_SUBST(sys_signalh) + AC_SUBST(sys_socketh) +--- a/include/apr.h.in ++++ b/include/apr.h.in +@@ -94,6 +94,7 @@ + #define APR_HAVE_STRING_H @stringh@ + #define APR_HAVE_STRINGS_H @stringsh@ + #define APR_HAVE_SYS_IOCTL_H @sys_ioctlh@ ++#define APR_HAVE_SYS_PARAM_H @sys_paramh@ + #define APR_HAVE_SYS_SENDFILE_H @sys_sendfileh@ + #define APR_HAVE_SYS_SIGNAL_H @sys_signalh@ + #define APR_HAVE_SYS_SOCKET_H @sys_socketh@ +@@ -201,6 +202,9 @@ + #ifdef __cplusplus + extern "C" { + #endif ++#if APR_HAVE_SYS_PARAM_H ++#include ++#endif + + /** + * @addtogroup apr_platform diff --git a/libs/apr/patches/101-fix_apr_time_now.patch b/libs/apr/patches/101-fix_apr_time_now.patch deleted file mode 100644 index 6ad14a37c..000000000 --- a/libs/apr/patches/101-fix_apr_time_now.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://dev.openwrt.org/ticket/9287 - ---- a/time/unix/time.c -+++ b/time/unix/time.c -@@ -75,7 +75,7 @@ APR_DECLARE(apr_time_t) apr_time_now(voi - { - struct timeval tv; - gettimeofday(&tv, NULL); -- return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec; -+ return tv.tv_sec * (apr_time_t)APR_USEC_PER_SEC + (apr_time_t)tv.tv_usec; - } - - static void explode_time(apr_time_exp_t *xt, apr_time_t t, diff --git a/libs/apr/patches/201-upgrade-and-fix-1.5.1.patch b/libs/apr/patches/201-upgrade-and-fix-1.5.1.patch deleted file mode 100644 index b4e5ab75b..000000000 --- a/libs/apr/patches/201-upgrade-and-fix-1.5.1.patch +++ /dev/null @@ -1,51 +0,0 @@ -Makefile.in: fix cross compiling failed - -The tools/gen_test_char was invoked at build time, -and it didn't work for the cross compiling, so we -compile it with $BUILDCC. - -Remove the 'tools' dir creation, it always existed. -And it caused gen_test_char unexpected rebuilt at -do_install time. - -Upstream-Status: inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - Makefile.in | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -Index: apr-1.5.2/Makefile.in -=================================================================== ---- apr-1.5.2.orig/Makefile.in -+++ apr-1.5.2/Makefile.in -@@ -20,7 +20,7 @@ INCDIR=./include - OSDIR=$(top_srcdir)/include/arch/@OSDIR@ - DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ - INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_blddir)/include/private -- -+BUILDCC=gcc - # - # Macros for target determination - # -@@ -47,7 +47,6 @@ LT_VERSION = @LT_VERSION@ - - CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ - build/apr_rules.out tools/gen_test_char@EXEEXT@ \ -- tools/gen_test_char.o tools/gen_test_char.lo \ - include/private/apr_escape_test_char.h - DISTCLEAN_TARGETS = config.cache config.log config.status \ - include/apr.h include/arch/unix/apr_private.h \ -@@ -138,9 +137,9 @@ tools/gen_test_char.lo: tools/gen_test_c - $(APR_MKDIR) tools - $(LT_COMPILE) - --tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) -- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -- -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c -+ $(BUILDCC) $(CFLAGS_FOR_BUILD) $< -o $@ -+ - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private - tools/gen_test_char@EXEEXT@ > $@ diff --git a/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch index d1b234f26..2c7e02065 100644 --- a/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ b/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch @@ -33,11 +33,9 @@ Upstream-Status: Pending configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/configure.in b/configure.in -index 3b10422..a227e72 100644 --- a/configure.in +++ b/configure.in -@@ -1771,7 +1771,7 @@ else +@@ -1785,7 +1785,7 @@ else socklen_t_value="int" fi @@ -46,7 +44,7 @@ index 3b10422..a227e72 100644 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1840,7 +1840,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) +@@ -1854,7 +1854,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) @@ -55,7 +53,7 @@ index 3b10422..a227e72 100644 AC_MSG_CHECKING([which format to use for apr_ssize_t]) if test -n "$ssize_t_fmt"; then -@@ -1857,7 +1857,7 @@ fi +@@ -1871,7 +1871,7 @@ fi ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" @@ -64,7 +62,7 @@ index 3b10422..a227e72 100644 AC_MSG_CHECKING([which format to use for apr_size_t]) if test -n "$size_t_fmt"; then -@@ -1874,7 +1874,7 @@ fi +@@ -1888,7 +1888,7 @@ fi size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" @@ -73,6 +71,3 @@ index 3b10422..a227e72 100644 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then # Enable LFS --- -1.8.3.1 - From a62c0e599b52307e0896e15164ae1558a81be930 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 26 Jan 2020 18:59:42 +0100 Subject: [PATCH 4/6] apr-util: clean up Makefile and remove patch - removes 001-automake-compat.patch: Looks like this was meant as a workaround for a libtool issue. But it doesn't appear to be needed anymore. - cleans up installation defines (uses macros, cleans up sed scripts, removes gratuitous slashes & whitespaces) Signed-off-by: Sebastian Kemper --- libs/apr-util/Makefile | 32 ++++++++----------- .../patches/001-automake-compat.patch | 21 ------------ 2 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 libs/apr-util/patches/001-automake-compat.patch diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index d0efff1a4..2b4f25b55 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr-util PKG_VERSION:=1.6.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/apr/ @@ -127,30 +127,26 @@ $$(eval $$(call BuildPackage,libaprutil-$(subst _,-,$(1)))) endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib $(1)/usr/lib/pkgconfig/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \ - $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ - $(1)/usr/include/apr-1/ + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \ + $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* $(1)/usr/include/apr-1 ifneq ($(CONFIG_PACKAGE_libaprutil-crypto-openssl)$(CONFIG_PACKAGE_libaprutil-dbd-pgsql)$(CONFIG_PACKAGE_libaprutil-dbd-sqlite3)$(CONFIG_PACKAGE_libaprutil-ldap),) $(INSTALL_DIR) $(1)/usr/lib/apr-util-1 - $(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_*{la,a,so*} \ - $(1)/usr/lib/apr-util-1 + $(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_*{la,a,so*} \ + $(1)/usr/lib/apr-util-1 endif - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \ - $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ - $(1)/usr/lib/pkgconfig/ - $(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(1)/usr/bin/apu-1-config - $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config - $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apu-1-config - $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config - $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \ + $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ + $(1)/usr/lib/pkgconfig + $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \ + $(1)/usr/bin/apu-1-config endef define Package/libaprutil/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib endef $(eval $(call BuildPackage,libaprutil)) diff --git a/libs/apr-util/patches/001-automake-compat.patch b/libs/apr-util/patches/001-automake-compat.patch deleted file mode 100644 index 20c4cf2b9..000000000 --- a/libs/apr-util/patches/001-automake-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -8,6 +8,7 @@ APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VER - APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@ - - srcdir = @srcdir@ -+top_builddir = @top_builddir@ - VPATH = @srcdir@ - - INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ ---- a/configure.in -+++ b/configure.in -@@ -41,6 +41,8 @@ AC_SUBST(APU_CONFIG_LOCATION) - AC_CANONICAL_SYSTEM - - AC_PROG_INSTALL -+AC_PROG_LIBTOOL -+LT_INIT - - # Use -no-install or -no-fast-install to link the test - # programs on all platforms but Darwin, where it would cause From e94a08298e81b97d43e63e05cca167d778ff8d58 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 26 Jan 2020 19:06:06 +0100 Subject: [PATCH 5/6] apache: rename bin from httpd to apache2 This way there's no need to worry about overwriting another httpd binary or symlink from another package, for example busyboxes httpd. The init script is also renamed to apache2 for consistency. Signed-off-by: Sebastian Kemper --- net/apache/Makefile | 13 +++++++------ net/apache/files/{apache.init => apache2.init} | 0 2 files changed, 7 insertions(+), 6 deletions(-) rename net/apache/files/{apache.init => apache2.init} (100%) diff --git a/net/apache/Makefile b/net/apache/Makefile index 81ae2e5e8..12094629c 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -78,7 +78,7 @@ This package contains the Apache web server and utility programs. endef define Package/apache/conffiles -/etc/apache2/httpd.conf +/etc/apache2/apache2.conf /etc/apache2/extra/httpd-autoindex.conf /etc/apache2/extra/httpd-dav.conf /etc/apache2/extra/httpd-default.conf @@ -93,7 +93,7 @@ define Package/apache/conffiles /etc/apache2/extra/proxy-html.conf /etc/apache2/magic /etc/apache2/mime.types -/etc/init.d/apache +/etc/init.d/apache2 endef define Package/apache-ab @@ -198,6 +198,7 @@ CONFIGURE_ARGS+= \ --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-mpm=prefork \ --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ + --with-program-name=apache2 \ --with-ssl ifneq ($(CONFIG_PACKAGE_apache-mod-deflate),) @@ -297,10 +298,10 @@ define Package/apache/install $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/apache2/extra/* \ $(1)/etc/apache2/extra $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/etc/apache2/{httpd.conf,magic,mime.types} \ - $(1)/etc/apache2 + $(PKG_INSTALL_DIR)/etc/apache2/{apache2.conf,magic,mime.types} \ + $(1)/etc/apache2 $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/apache.init $(1)/etc/init.d/apache + $(INSTALL_BIN) ./files/apache2.init $(1)/etc/init.d/apache2 $(INSTALL_DIR) $(1)/usr/lib/apache2 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/apache2/*.so \ $(1)/usr/lib/apache2 @@ -316,7 +317,7 @@ define Package/apache/install $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/bin/{dbmmanage,htdbm,htdigest,htpasswd,httxt2dbm,logresolve} \ $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{apachectl,httpd} \ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{apachectl,apache2} \ $(1)/usr/sbin endef diff --git a/net/apache/files/apache.init b/net/apache/files/apache2.init similarity index 100% rename from net/apache/files/apache.init rename to net/apache/files/apache2.init From 6bd63d24f0d147ca891332fe408eb279c9117dc3 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 26 Jan 2020 19:09:34 +0100 Subject: [PATCH 6/6] apache: don't load session_crypto mod by default In OpenWrt this module is available, but not part of the main package. This commit disables the LoadModule directive for this module. Otherwise following the installation of the main apache package the start of the server would fail (due to the absence of this particular module). Signed-off-by: Sebastian Kemper --- net/apache/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/apache/Makefile b/net/apache/Makefile index 12094629c..ad83aa716 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apache PKG_VERSION:=2.4.41 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_NAME:=httpd PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 @@ -297,6 +297,8 @@ define Package/apache/install $(INSTALL_DIR) $(1)/etc/apache2/extra $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/apache2/extra/* \ $(1)/etc/apache2/extra + $(SED) '/^LoadModule session_crypto_module/s/^/#/' \ + $(PKG_INSTALL_DIR)/etc/apache2/apache2.conf $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/etc/apache2/{apache2.conf,magic,mime.types} \ $(1)/etc/apache2