diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2017-08-26 19:48:55 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-08-28 06:32:17 +0000 |
| commit | b4dc428b069d192ff5d9bf0f008fc5ff1bce20da (patch) | |
| tree | 68de6c2e338521059f2d9386b049a1107443b98a /testing/litespeed | |
| parent | 71038f0019450e04407d876b780f09139cee90d5 (diff) | |
| download | aports-b4dc428b069d192ff5d9bf0f008fc5ff1bce20da.tar.bz2 aports-b4dc428b069d192ff5d9bf0f008fc5ff1bce20da.tar.xz | |
testing/litespeed: upgrade to 1.4.27
Diffstat (limited to 'testing/litespeed')
| -rw-r--r-- | testing/litespeed/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/litespeed/config.patch | 41 | ||||
| -rw-r--r-- | testing/litespeed/fix_php.patch | 47 | ||||
| -rw-r--r-- | testing/litespeed/include.patch | 22 |
4 files changed, 16 insertions, 106 deletions
diff --git a/testing/litespeed/APKBUILD b/testing/litespeed/APKBUILD index a961f55dea..c3c4976c37 100644 --- a/testing/litespeed/APKBUILD +++ b/testing/litespeed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Valery Kartel <valery.kartel@gmail.com> pkgname=litespeed -pkgver=1.4.25 +pkgver=1.4.27 pkgrel=0 _pkgreal=open$pkgname _pkghome=var/lib/$pkgname @@ -22,9 +22,7 @@ source="http://open.litespeedtech.com/packages/$_pkgreal-$pkgver.tgz include.patch install.patch ls_lock.patch - fix_php.patch thread.patch - config.patch " builddir="$srcdir/$_pkgreal-$pkgver" @@ -128,11 +126,9 @@ snmp() { "$subpkgdir"/$_pkghome/add-ons } -sha512sums="0cb85ca3afbafdb05b2aa4ae80fb964ad91c9d51d764634f59b12070c30a46b816249861a7afa70b35fbb587014cf7e0a6228d9a34f5f42aed2a33c45eaeee89 openlitespeed-1.4.25.tgz +sha512sums="ee31a178efc2b130529310d7ba78cd489758b57f44b427bdc075a5b6bd40d5a1678754158fcfd72b965b51a67a62a1f8e363f3f636b5f83e3303f231d3edbc11 openlitespeed-1.4.27.tgz 2b0299246aaeb885122d8f939437f0e4701f6a79ea976f725ba8765d8b295c2797c0cac30e639d5eda665b9589710ee55acc4d03b078c4b9cc1e564994ccb9f5 litespeed.initd -9dc0679aa27aa0efefe2ded2776a1269e4e565b5c49d074c40c2121bf5f1cbb8dfe286b97507ea9bdac539bdbb4960fe409ae7d1ed883085c44b592581f4931d include.patch +827425bb9f2e5daea8ef69f79747785a56c09a33837c381a961f798d1110f89629324531c028e0010a51aa0639ba5c6be81b80b10779a23ae7f1f84dd7b0b596 include.patch ead0ba0fabfb7d76a087f202d134bf86d909898e5d96e1330716c9288f21386d8b72f9caed34c095994a7ea328d7f8c9ae6d9e51a24e89b209099401ce09f2c5 install.patch 2211e6c787700fc08eaee56f049c80690ef53d2b14cfcf17099ed0e5dfbd28b76a7b30f0c8814901e3c72bd4fc63732196b6fa0a8231cc10f86ba5130810b3d6 ls_lock.patch -e203fede8b6791e9e8341bd5de843cc0de80c383c87bdd25ad772d70100bb434102cd100999829fee7e7d42c0099e715412115ce79c3060b6b3398237bc41bf5 fix_php.patch -c7775836ee13b082e5c2ce011673b1a30b5ca83765d6d81ff1359110ba970808de6a87cd6d61fd688c9d2037451598154b429d70ad25094b9e9f10938aea00fd thread.patch -4566abaf19a8713c7199475d0f5d9c7dd61f9ae330acd02baf4096dddd8833dcb3a746f63ce19658afc9f3c4990663c736947dd90842eee542fd266ef1f30e7c config.patch" +c7775836ee13b082e5c2ce011673b1a30b5ca83765d6d81ff1359110ba970808de6a87cd6d61fd688c9d2037451598154b429d70ad25094b9e9f10938aea00fd thread.patch" diff --git a/testing/litespeed/config.patch b/testing/litespeed/config.patch deleted file mode 100644 index 427b055ab9..0000000000 --- a/testing/litespeed/config.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/dist/conf/httpd_config.conf.in -+++ b/dist/conf/httpd_config.conf.in -@@ -20,7 +20,7 @@ - indexFiles index.html, index.php - - errorlog $SERVER_ROOT/logs/error.log { -- logLevel DEBUG -+ logLevel INFO - debugLevel 0 - rollingSize 10M - enableStderrLog 1 -@@ -115,9 +115,9 @@ - deny - } - --extProcessor lsphp5{ -+extProcessor lsphp7{ - type lsapi -- address uds://tmp/lshttpd/lsphp.sock -+ address uds://tmp/lshttpd/lsphp7.sock - maxConns 35 - env PHP_LSAPI_MAX_REQUESTS=500 - env PHP_LSAPI_CHILDREN=35 -@@ -127,7 +127,7 @@ - pcKeepAliveTimeout - respBuffer 0 - autoStart 1 -- path $SERVER_ROOT/fcgi-bin/lsphp5 -+ path $SERVER_ROOT/fcgi-bin/lsphp7 - backlog 100 - instances 1 - priority 0 -@@ -138,7 +138,7 @@ - } - - scriptHandler{ -- add lsapi:lsphp5 php -+ add lsapi:lsphp7 php - } - - railsDefaults{ diff --git a/testing/litespeed/fix_php.patch b/testing/litespeed/fix_php.patch deleted file mode 100644 index 9b0d1d0c8b..0000000000 --- a/testing/litespeed/fix_php.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/dist/add-ons/snmp_monitoring/class.litespeed_snmp_bridge.php -+++ b/dist/add-ons/snmp_monitoring/class.litespeed_snmp_bridge.php -@@ -1,4 +1,4 @@ --<? -+<?php - - /*---------------------------------------- - LiteSpeed_Stats to SNMP bridge. Relay stats to SNMPD. ---- a/dist/add-ons/snmp_monitoring/class.litespeed_stats.php -+++ b/dist/add-ons/snmp_monitoring/class.litespeed_stats.php -@@ -1,4 +1,4 @@ --<? -+<?php - - /*---------------------------------------- - LiteSpeed_Stats class and subclasses. Parse Real-Time data for LiteSpeed Products ---- a/dist/add-ons/snmp_monitoring/sample.php -+++ b/dist/add-ons/snmp_monitoring/sample.php -@@ -1,4 +1,4 @@ --<? -+<?php - - /*-------------------------------- - assuming following entry in /etc/snmp/snmpd.conf ---- a/dist/admin/html.open/lib/jCryption.php -+++ b/dist/admin/html.open/lib/jCryption.php -@@ -394,7 +394,7 @@ - $bits_n = $bits_cnt % 8; - do { - $str = ''; -- mt_srand($this->_makeSeed()); -+ mt_srand((int)$this->_makeSeed()); - for ($i = 0; $i < $bytes_n; $i++) { - $str .= chr(sha1(mt_rand() * microtime()) & 0xff); - } ---- a/dist/admin/html.open/lib/ows/RealTimeStats.php -+++ b/dist/admin/html.open/lib/ows/RealTimeStats.php -@@ -224,6 +224,9 @@ - $filter = UIBase::GrabGoodInput("request", "vh_filter", "string") ; - $sort = UIBase::GrabGoodInput("request", "vh_sort", "int") ; - -+ $sortDesc1 = array(); -+ $sortAsc2 = array(); -+ - $vhosts = array() ; - $m = array() ; - $found = preg_match_all("/REQ_RATE \[(.+)\]: REQ_PROCESSING: ([0-9]+), REQ_PER_SEC: ([0-9\.]+), TOT_REQS: ([0-9]+)/i", $this->_rawdata, $m) ; diff --git a/testing/litespeed/include.patch b/testing/litespeed/include.patch index 49938c2e1e..29d055753d 100644 --- a/testing/litespeed/include.patch +++ b/testing/litespeed/include.patch @@ -1,20 +1,22 @@ ---- a/src/util/pcutil.cpp -+++ b/src/util/pcutil.cpp -@@ -21,6 +21,7 @@ - #include <ctype.h> - #include <stdlib.h> - #include <unistd.h> -+#include <string.h> +--- a/src/main/httpserver.cpp ++++ b/src/main/httpserver.cpp +@@ -127,7 +127,7 @@ - #ifdef __linux - #include <sched.h> + #if defined(__FreeBSD__ ) || defined(__NetBSD__) || defined(__OpenBSD__) \ + || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +-#include <sys/sysctl.h> ++#include <linux/sysctl.h> + #endif + + #define FILEMODE 0644 --- a/src/main/lshttpdmain.cpp +++ b/src/main/lshttpdmain.cpp -@@ -45,7 +45,6 @@ +@@ -46,7 +46,7 @@ #include <util/stringlist.h> #include <util/signalutil.h> #include <util/vmembuf.h> -#include <sys/sysctl.h> ++#include <linux/sysctl.h> #include <extensions/cgi/cgidworker.h> #include <extensions/registry/extappregistry.h> |