vars/build.vars, patches/*: adds geoip (HEAD) and OpenLiteSpeed v1.4.24 (preliminary commit.)

subr/pkg_autoconf.subr: try either of ${WORKDIR}/${PKG_SUBDIR}/{bootstrap,autogen.sh}.
subr/pkg_configure.subr: pass ${CXXFLAGS} as well as ${CFLAGS} during ./configure.
subr/pkg_setup_env.subr: fix ${PKG_SUBDIR} inference when ${PKG_FNAME} does not end w/ .tar*.

1 files changed, 11 insertions, 4 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 908105cf..553f8969 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -58,7 +58,7 @@ fi;
 : ${LOG_MSG_INFO_COLOUR:=93};
 : ${LOG_MSG_SUCC_COLOUR:=92};
 : ${LOG_MSG_WARN_COLOUR:=96};
-: ${PKG_BUILD_VARS:="BUILD_CMDLINE BUILD_DIR BUILD_STEPS BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA DISABLED ENV_VARS_EXTRA FNAME INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_BUILD NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE TARGET URL URL_FNAME URL_TYPE URLS_GIT VERSION"};
+: ${PKG_BUILD_VARS:="BUILD_CMDLINE BUILD_DIR BUILD_STEPS BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXXFLAGS_CONFIGURE_EXTRA DISABLED ENV_VARS_EXTRA FNAME INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_BUILD NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE TARGET URL URL_FNAME URL_TYPE URLS_GIT VERSION"};
 : ${TARBALL_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.};
 : ${TARBALL_SIGN_GPG_KEY:=};
 : ${TARBALL_CROSS_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}_cross.};
@@ -258,7 +258,7 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe
 LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
-apr apr_util bzip2 curl expat libz libffi gdbm pcre glib gzip libarchive libatomic_ops
+apr apr_util bzip2 curl expat libz libffi gdbm geoip pcre glib gzip libarchive libatomic_ops
 libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt libksba
 libxml2 lua ncurses ncursestw ncursesw npth sqlite3 xz";
 LIB_PACKAGES_PACKAGES_X11="
@@ -308,6 +308,8 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GDBM_SHA256SUM:=d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea};
 : ${PKG_GDBM_VERSION:=1.12};
 : ${PKG_GDBM_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_VERSION}.tar.gz};
+: ${PKG_GEOIP_URLS_GIT:="geoip-api-c=https://github.com/maxmind/geoip-api-c@master"};
+: ${PKG_GEOIP_SUBDIR:=geoip-api-c};
 : ${PKG_PCRE_SHA256SUM:=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7};
 : ${PKG_PCRE_VERSION:=8.39};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
@@ -499,8 +501,8 @@ LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LEAF_PACKAGES_PACKAGES="
 apk_tools bash bc bdwgc bind chicken clang_host coreutils cparser cron dash datamash diffutils
 dos2unix ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip
-irssi john ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openssh p7zip pacman
-patch perl procps_ng python3 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher
+irssi john ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openlitespeed openssh
+p7zip pacman patch perl procps_ng python3 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher
 tmux util_linux vim weechat wget which whois xeyes xwd zsh";
 LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
@@ -714,6 +716,11 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_NGINX_SUBDIR:=nginx-${PKG_NGINX_VERSION}};
 : ${PKG_NGINX_BUILD_DIR:=${PKG_NGINX_SUBDIR}};
 : ${PKG_NGINX_CONFIGURE_ARGS:="--prefix="};
+: ${PKG_OPENLITESPEED_SHA256SUM:=c2dd2a42a86994433e1f7e48f1a336201c4f7f79b204c837e56911fd60f08a1f};
+: ${PKG_OPENLITESPEED_VERSION:=1.4.24};
+: ${PKG_OPENLITESPEED_URL:=http://open.litespeedtech.com/packages/openlitespeed-${PKG_OPENLITESPEED_VERSION}.tgz};
+: ${PKG_OPENLITESPEED_CONFIGURE_ARGS_EXTRA:="--with-openssl=${PREFIX_NATIVE} --with-zlib=${PREFIX_NATIVE}"};
+: ${PKG_OPENLITESPEED_CXXFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"};
 : ${PKG_OPENSSH_SHA256SUM:=3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc};
 : ${PKG_OPENSSH_VERSION:=7.3p1};
 : ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz};