|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
--- openlitespeed-1.4.24/configure.orig 2016-12-02 19:52:25.745807731 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+++ openlitespeed-1.4.24/configure 2017-02-11 15:09:26.176648560 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -15863,16 +15863,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
if test "$OPENLSWS_BSSL" = no ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- if test "$OSNAME" = Darwin ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- usedynossl=yes
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- CPPFLAGS="$CPPFLAGS -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg "
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- usedynossl=no
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- CPPFLAGS="$CPPFLAGS -I../../ssl/include -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg "
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- echo "Will build latest stable openssl libraries for you, this may take several minutes ..."
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- OSSL=`. $srcdir/dlossl.sh`
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- echo "Finsihed building openssl."
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+ usedynossl=yes
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+ CPPFLAGS="$CPPFLAGS -I../../src -I../../include "
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
echo "Openssl: use_dyn_ossl = $usedynossl"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#### Not provide location, use default location, will not copy files
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -15982,12 +15974,6 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-ZLIB_HOME=/usr/local
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-if test ! -f "${ZLIB_HOME}/include/zlib.h"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- ZLIB_HOME=/usr
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
# Locate zlib, if wanted
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -16131,7 +16117,6 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-if test "$OSNAME" = Darwin ; then
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
# Check whether --with-openssl was given.
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -16259,8 +16244,6 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lib pcre" >&5
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
$as_echo_n "checking lib pcre... " >&6; }
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
PCRE_LDFLAGS=
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
--- openlitespeed-1.4.24/src/util/gsendfile.h.orig 2016-12-02 19:51:11.000000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+++ openlitespeed-1.4.24/src/util/gsendfile.h 2017-02-11 15:37:19.976655229 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -83,7 +83,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#if defined(linux) || defined(__linux) || defined(__linux__) || \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
- defined(__gnu_linux__)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+ defined(__gnu_linux__) || defined(__midipix__)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <sys/sendfile.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#define gsendfile ::sendfile
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
--- openlitespeed-1.4.24/src/util/pcutil.h.orig 2016-12-02 19:51:11.000000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+++ openlitespeed-1.4.24/src/util/pcutil.h 2017-02-11 15:39:02.736901419 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -18,7 +18,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#ifndef PCUTIL_H
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#define PCUTIL_H
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <sched.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
# define SET_AFFINITY(pid, size, mask) sched_setaffinity(0, size, mask)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
# define GET_AFFINITY(pid, size, mask) sched_getaffinity(0, size, mask)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
--- openlitespeed-1.4.24/src/main/lshttpdmain.cpp.orig 2016-12-02 19:51:11.000000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+++ openlitespeed-1.4.24/src/main/lshttpdmain.cpp 2017-02-11 15:50:52.882605886 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -45,7 +45,9 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <util/stringlist.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <util/signalutil.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <util/vmembuf.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+#ifndef __midipix__
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <sys/sysctl.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <extensions/cgi/cgidworker.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#include <extensions/registry/extappregistry.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
@@ -1428,7 +1430,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#ifdef LSWS_NO_SET_AFFINITY
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
return 2;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
return sysconf(_SC_NPROCESSORS_ONLN);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
#else
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
b19456 |
int nm[2];
|