b19456
vars/build.vars, patches/*: adds geoip (HEAD) and OpenLiteSpeed v1.4.24 (preliminary commit.)
@@ -0,0 +1,11 @@
|
|
1
|
+
--- geoip-api-c/bootstrap.orig 2017-02-11 15:15:17.545489844 +0000
|
2
|
+
+++ geoip-api-c/bootstrap 2017-02-11 15:17:36.181821782 +0000
|
3
|
+
|
4
|
+
|
5
|
+
# make sure to use the installed libtool
|
6
|
+
rm -f ltmain.sh
|
7
|
+
-autoreconf -fiv
|
8
|
+
+autoreconf -iv
|
9
|
+
|
10
|
+
###################################################
|
11
|
+
# the steps below may help with outdated toolsets
|
@@ -0,0 +1,94 @@
|
|
1
|
+
--- openlitespeed-1.4.24/configure.orig 2016-12-02 19:52:25.745807731 +0000
|
2
|
+
+++ openlitespeed-1.4.24/configure 2017-02-11 15:09:26.176648560 +0000
|
3
|
+
|
4
|
+
|
5
|
+
|
6
|
+
if test "$OPENLSWS_BSSL" = no ; then
|
7
|
+
- if test "$OSNAME" = Darwin ; then
|
8
|
+
- usedynossl=yes
|
9
|
+
- CPPFLAGS="$CPPFLAGS -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg "
|
10
|
+
- else
|
11
|
+
- usedynossl=no
|
12
|
+
- CPPFLAGS="$CPPFLAGS -I../../ssl/include -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg "
|
13
|
+
- echo "Will build latest stable openssl libraries for you, this may take several minutes ..."
|
14
|
+
- OSSL=`. $srcdir/dlossl.sh`
|
15
|
+
- echo "Finsihed building openssl."
|
16
|
+
- fi
|
17
|
+
+ usedynossl=yes
|
18
|
+
+ CPPFLAGS="$CPPFLAGS -I../../src -I../../include "
|
19
|
+
echo "Openssl: use_dyn_ossl = $usedynossl"
|
20
|
+
else
|
21
|
+
#### Not provide location, use default location, will not copy files
|
22
|
+
|
23
|
+
fi
|
24
|
+
|
25
|
+
|
26
|
+
-ZLIB_HOME=/usr/local
|
27
|
+
-if test ! -f "${ZLIB_HOME}/include/zlib.h"
|
28
|
+
-then
|
29
|
+
- ZLIB_HOME=/usr
|
30
|
+
-fi
|
31
|
+
-
|
32
|
+
#
|
33
|
+
# Locate zlib, if wanted
|
34
|
+
#
|
35
|
+
|
36
|
+
|
37
|
+
|
38
|
+
|
39
|
+
-if test "$OSNAME" = Darwin ; then
|
40
|
+
|
41
|
+
|
42
|
+
# Check whether --with-openssl was given.
|
43
|
+
|
44
|
+
|
45
|
+
|
46
|
+
|
47
|
+
-fi
|
48
|
+
-
|
49
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lib pcre" >&5
|
50
|
+
$as_echo_n "checking lib pcre... " >&6; }
|
51
|
+
PCRE_LDFLAGS=
|
52
|
+
--- openlitespeed-1.4.24/src/util/gsendfile.h.orig 2016-12-02 19:51:11.000000000 +0000
|
53
|
+
+++ openlitespeed-1.4.24/src/util/gsendfile.h 2017-02-11 15:37:19.976655229 +0000
|
54
|
+
|
55
|
+
#endif
|
56
|
+
|
57
|
+
#if defined(linux) || defined(__linux) || defined(__linux__) || \
|
58
|
+
- defined(__gnu_linux__)
|
59
|
+
+ defined(__gnu_linux__) || defined(__midipix__)
|
60
|
+
#include <sys/sendfile.h>
|
61
|
+
#define gsendfile ::sendfile
|
62
|
+
#endif
|
63
|
+
--- openlitespeed-1.4.24/src/util/pcutil.h.orig 2016-12-02 19:51:11.000000000 +0000
|
64
|
+
+++ openlitespeed-1.4.24/src/util/pcutil.h 2017-02-11 15:39:02.736901419 +0000
|
65
|
+
|
66
|
+
#ifndef PCUTIL_H
|
67
|
+
#define PCUTIL_H
|
68
|
+
|
69
|
+
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
|
70
|
+
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
|
71
|
+
#include <sched.h>
|
72
|
+
# define SET_AFFINITY(pid, size, mask) sched_setaffinity(0, size, mask)
|
73
|
+
# define GET_AFFINITY(pid, size, mask) sched_getaffinity(0, size, mask)
|
74
|
+
--- openlitespeed-1.4.24/src/main/lshttpdmain.cpp.orig 2016-12-02 19:51:11.000000000 +0000
|
75
|
+
+++ openlitespeed-1.4.24/src/main/lshttpdmain.cpp 2017-02-11 15:50:52.882605886 +0000
|
76
|
+
|
77
|
+
#include <util/stringlist.h>
|
78
|
+
#include <util/signalutil.h>
|
79
|
+
#include <util/vmembuf.h>
|
80
|
+
+#ifndef __midipix__
|
81
|
+
#include <sys/sysctl.h>
|
82
|
+
+#endif
|
83
|
+
|
84
|
+
#include <extensions/cgi/cgidworker.h>
|
85
|
+
#include <extensions/registry/extappregistry.h>
|
86
|
+
|
87
|
+
#ifdef LSWS_NO_SET_AFFINITY
|
88
|
+
return 2;
|
89
|
+
#else
|
90
|
+
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
|
91
|
+
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__)
|
92
|
+
return sysconf(_SC_NPROCESSORS_ONLN);
|
93
|
+
#else
|
94
|
+
int nm[2];
|
@@ -15,22 +15,26 @@ pkg_autoconf() {
|
|
15
15
|
-exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;;
|
16
16
|
if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" ]\
|
17
17
|
&& [ ! -e "${WORKDIR}/${PKG_SUBDIR}/configure" ]; then
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
18
|
+
for __ in bootstrap autogen.sh ""; do
|
19
|
+
if [ -z "${__}" ]; then
|
20
|
+
(build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && autoconf)\
|
21
|
+
|| exit 1 && break;
|
22
|
+
elif [ -e "${WORKDIR}/${PKG_SUBDIR}/${__}" ]; then
|
23
|
+
for ___ in "${WORKDIR}/${PKG_SUBDIR}/build-aux" "${WORKDIR}/${PKG_SUBDIR}"; do
|
24
|
+
if [ -e "${___}" ]; then
|
25
|
+
echo install -m 0700 \
|
26
|
+
"${MIDIPIX_BUILD_PWD}/etc/config.sub" \
|
27
|
+
"${___}/config.sub";
|
28
|
+
install -m 0700 \
|
29
|
+
"${MIDIPIX_BUILD_PWD}/etc/config.sub" \
|
30
|
+
"${___}/config.sub";
|
31
|
+
break;
|
32
|
+
fi;
|
33
|
+
done;
|
34
|
+
(build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && "${SHELL}" "${__}")\
|
35
|
+
|| exit 1 && break;
|
36
|
+
fi;
|
37
|
+
done;
|
34
38
|
fi;
|
35
39
|
for __ in ${PKG_BUILD_DIR} ${PKG_CONFIG_CACHE_EXTRA}; do
|
36
40
|
build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${WORKDIR}/${__}/";
|
@@ -9,8 +9,8 @@ pkg_configure() {
|
|
9
9
|
PKG_CONFIGURE="${WORKDIR}/${PKG_SUBDIR}/configure";
|
10
10
|
fi;
|
11
11
|
if [ -x "${PKG_CONFIGURE}" ]; then
|
12
|
-
export CFLAGS_FOR_BUILD="${HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT}";
|
13
12
|
CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
|
13
|
+
CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \
|
14
14
|
LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \
|
15
15
|
${PKG_CONFIGURE} \
|
16
16
|
${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG};
|
@@ -22,7 +22,7 @@ pkg_setup_env() {
|
|
22
22
|
else
|
23
23
|
[ -n "${PKG_ENV_VARS_EXTRA}" ] && set_env_vars_with_sep : "${PKG_ENV_VARS_EXTRA}";
|
24
24
|
[ -z "${PKG_FNAME}" ] && PKG_FNAME="${PKG_URL##*/}";
|
25
|
-
[ -z "${PKG_SUBDIR}" ] && PKG_SUBDIR="${PKG_FNAME%%.
|
25
|
+
[ -z "${PKG_SUBDIR}" ] && PKG_SUBDIR="${PKG_FNAME%%.t*}";
|
26
26
|
[ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}";
|
27
27
|
[ -z "${MIDIPIX_BUILD_PWD}" ] && MIDIPIX_BUILD_PWD="$(pwd)";
|
28
28
|
if [ -z "${PKG_BUILD_DIR}" ]; then
|
@@ -58,7 +58,7 @@ fi;
|
|
58
58
|
: ${LOG_MSG_INFO_COLOUR:=93};
|
59
59
|
: ${LOG_MSG_SUCC_COLOUR:=92};
|
60
60
|
: ${LOG_MSG_WARN_COLOUR:=96};
|
61
|
-
_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"};
BUILD
|
61
|
+
_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"};
BUILD
|
62
62
|
: ${TARBALL_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.};
|
63
63
|
: ${TARBALL_SIGN_GPG_KEY:=};
|
64
64
|
: ${TARBALL_CROSS_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}_cross.};
|
@@ -258,7 +258,7 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe
|
|
258
258
|
LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
|
259
259
|
LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
|
260
260
|
LIB_PACKAGES_PACKAGES_LEAVES="
|
261
|
-
apr apr_util bzip2 curl expat libz libffi gdbm pcre glib gzip libarchive libatomic_ops
|
261
|
+
apr apr_util bzip2 curl expat libz libffi gdbm geoip pcre glib gzip libarchive libatomic_ops
|
262
262
|
libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt libksba
|
263
263
|
libxml2 lua ncurses ncursestw ncursesw npth sqlite3 xz";
|
264
264
|
LIB_PACKAGES_PACKAGES_X11="
|
@@ -308,6 +308,8 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
|
|
308
308
|
: ${PKG_GDBM_SHA256SUM:=d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea};
|
309
309
|
: ${PKG_GDBM_VERSION:=1.12};
|
310
310
|
: ${PKG_GDBM_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_VERSION}.tar.gz};
|
311
|
+
: ${PKG_GEOIP_URLS_GIT:="geoip-api-c=https://github.com/maxmind/geoip-api-c@master"};
|
312
|
+
: ${PKG_GEOIP_SUBDIR:=geoip-api-c};
|
311
313
|
: ${PKG_PCRE_SHA256SUM:=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7};
|
312
314
|
: ${PKG_PCRE_VERSION:=8.39};
|
313
315
|
: ${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}";
|
|
499
501
|
LEAF_PACKAGES_PACKAGES="
|
500
502
|
apk_tools bash bc bdwgc bind chicken clang_host coreutils cparser cron dash datamash diffutils
|
501
503
|
dos2unix ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip
|
502
|
-
irssi john ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openssh
|
503
|
-
patch perl procps_ng python3 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher
|
504
|
+
irssi john ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openlitespeed openssh
|
505
|
+
p7zip pacman patch perl procps_ng python3 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher
|
504
506
|
tmux util_linux vim weechat wget which whois xeyes xwd zsh";
|
505
507
|
LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
|
506
508
|
: ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
|
@@ -714,6 +716,11 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
|
|
714
716
|
: ${PKG_NGINX_SUBDIR:=nginx-${PKG_NGINX_VERSION}};
|
715
717
|
: ${PKG_NGINX_BUILD_DIR:=${PKG_NGINX_SUBDIR}};
|
716
718
|
: ${PKG_NGINX_CONFIGURE_ARGS:="--prefix="};
|
719
|
+
: ${PKG_OPENLITESPEED_SHA256SUM:=c2dd2a42a86994433e1f7e48f1a336201c4f7f79b204c837e56911fd60f08a1f};
|
720
|
+
: ${PKG_OPENLITESPEED_VERSION:=1.4.24};
|
721
|
+
: ${PKG_OPENLITESPEED_URL:=http://open.litespeedtech.com/packages/openlitespeed-${PKG_OPENLITESPEED_VERSION}.tgz};
|
722
|
+
_NATIVE}"};
--with-zlib=${PREFIX
|
723
|
+
: ${PKG_OPENLITESPEED_CXXFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"};
|
717
724
|
: ${PKG_OPENSSH_SHA256SUM:=3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc};
|
718
725
|
: ${PKG_OPENSSH_VERSION:=7.3p1};
|
719
726
|
: ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz};
|