Check in 1.7.4

LSQUICCOMMIT

@@ -1 +1 @@
-7483dee0749c024a32a2675408de34246ea6d792
+692a91022d93293415722c0cedf36dc3825021e4

build.sh

@@ -19,7 +19,7 @@
 
 ###    Author: [email protected] (David Shue)
 
-VERSION=1.0.0
+VERSION=1.0.1
 moduledir="modreqparser modinspector uploadprogress "
 OS=`uname`
 ISLINUX=no
@@ -28,7 +28,7 @@ VERSIONNUMBER=
 if [ "${OS}" = "FreeBSD" ] ; then
     APP_MGRS="pkg"
 elif [ "${OS}" = "Linux" ] ; then
-    APP_MGRS="yum apt apt-get zypper"
+    APP_MGRS="yum apt apt-get zypper apk"
 elif [ "${OS}" = "Darwin" ] ; then
     APP_MGRS="port brew"
 else
@@ -79,7 +79,12 @@ getVersionNumber()
 
 installCmake()
 {
-    ${APP_MGR_CMD} -y install git cmake
+    if [ "${APP_MGR_CMD}" = "apk" ] ; then
+        ${APP_MGR_CMD} add --update git cmake
+    else
+        ${APP_MGR_CMD} -y install git cmake
+    fi
+
     if [ $? = 0 ] ; then
         CMAKEVER=`cmake --version | grep version | awk  '{print $3}'`
         getVersionNumber $CMAKEVER
@@ -108,7 +113,12 @@ installCmake()
 
 installgo()
 {
-    ${APP_MGR_CMD} -y install golang-go
+    if [ "${APP_MGR_CMD}" = "apk" ] ; then
+        ${APP_MGR_CMD} add --update go
+    else
+        ${APP_MGR_CMD} -y install golang-go
+    fi
+
     if [ $? = 0 ] ; then
         echo go installed.
     else
@@ -283,14 +293,28 @@ prepareLinux()
         apt-get -y install libexpat-dev
 
         installCmake
-        apt-get -y install git libtool 
+        apt-get -y install git libtool ca-certificates
         apt-get -y install autotools-dev
         apt-get -y install autoreconf
         apt-get -y install autoheader 
         apt-get -y install automake 
         installgo
 
-
+    elif [ -f /etc/alpine-release ] ; then
+        OSTYPE=ALPINE
+        ${APP_MGR_CMD} add make
+        ${APP_MGR_CMD} add gcc g++
+        ${APP_MGR_CMD} add patch
+        installCmake
+        ${APP_MGR_CMD} add git libtool linux-headers bsd-compat-headers curl
+        ${APP_MGR_CMD} add automake autoconf
+        ${APP_MGR_CMD} add build-base expat-dev zlib-dev
+        installgo
+        sed -i -e "s/u_int32_t/uint32_t/g" $(grep -rl u_int32_t src/)
+        sed -i -e "s/u_int64_t/uint64_t/g" $(grep -rl u_int64_t src/)
+        sed -i -e "s/u_int8_t/uint8_t/g" $(grep -rl u_int8_t src/)
+        sed -i -e "s@<sys/sysctl.h>@<linux/sysctl.h>@g" $(grep -rl "<sys/sysctl.h>" src/)
+        sed -i -e "s/PTHREAD_MUTEX_ADAPTIVE_NP/PTHREAD_MUTEX_NORMAL/g" src/lsr/ls_lock.c    
 
     else 
         echo May not support your platform, but we can do a try to install some tools.
@@ -299,7 +323,7 @@ prepareLinux()
         ${APP_MGR_CMD} -y install clang 
         ${APP_MGR_CMD} -y install patch 
         installCmake
-        ${APP_MGR_CMD} -y install git libtool 
+        ${APP_MGR_CMD} -y install git libtool ca-certificates
         ${APP_MGR_CMD} -y install autotools-dev
         ${APP_MGR_CMD} -y install autoreconf
         ${APP_MGR_CMD} -y install autoheader 
@@ -408,6 +432,9 @@ updateSrcCMakelistfile()
         sed -i -e "s/-Wl,--no-whole-archive//g"  src/CMakeLists.txt
     fi
 
+    if [ "${OSTYPE}" = "ALPINE" ] ; then
+        sed -i -e "s/c_nonshared//g"  src/CMakeLists.txt
+    fi
 }
 
 updateModuleCMakelistfile()
@@ -428,9 +455,11 @@ updateModuleCMakelistfile()
         echo "add_subdirectory(modsecurity-ls)" >> src/modules/CMakeLists.txt
     fi
 
+    #For linux but not alpine, add pagespeed module
     if [ "${ISLINUX}" = "yes" ] ; then
-        echo "add_subdirectory(pagespeed)" >> src/modules/CMakeLists.txt
-
+        if [ ! "${OSTYPE}" = "ALPINE" ] ; then
+            echo "add_subdirectory(pagespeed)" >> src/modules/CMakeLists.txt
+        fi
     fi
 
 
@@ -539,8 +568,8 @@ mkdir thirdparty/lib64
 cd thirdparty/script/
 
 
- 
-sed -i -e "s/unittest-cpp/ /g" ./build_ols.sh
+#Remove  unittest-cpp and add bcrypt
+sed -i -e "s/unittest-cpp/bcrypt/g" ./build_ols.sh
 
 if [ "${ISLINUX}" != "yes" ] ; then
     sed -i -e "s/psol/ /g"  ./build_ols.sh

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for openlitespeed 1.7.3.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.7.4.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='openlitespeed 1.7.3'
+PACKAGE_VERSION='1.7.4'
+PACKAGE_STRING='openlitespeed 1.7.4'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures openlitespeed 1.7.3 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.7.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1480,7 +1480,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.7.3:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.7.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1641,7 +1641,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.7.3
+openlitespeed configure 1.7.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2315,7 +2315,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openlitespeed $as_me 1.7.3, which was
+It was created by openlitespeed $as_me 1.7.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3181,7 +3181,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.7.3'
+ VERSION='1.7.4'
 
 
 # Some tools Automake needs.
@@ -19623,7 +19623,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by openlitespeed $as_me 1.7.3, which was
+This file was extended by openlitespeed $as_me 1.7.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19690,7 +19690,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-openlitespeed config.status 1.7.3
+openlitespeed config.status 1.7.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -7,7 +7,7 @@ m4_include(ax_check_libudns.m4)
 m4_include(ax_check_ip2location.m4)
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([openlitespeed],[1.7.3],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.7.4],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define subdir-objects])
 
 AC_CONFIG_HEADERS(src/config.h:src/config.h.in)