From: Valery Kartel <valery.kartel@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH] testing/litespeed: upgrade to 1.4.25
Date: Tue, 14 Mar 2017 20:13:26 +0200
Message-Id: <20170314181326.22017-1-valery.kartel@gmail.com>
Sender: droid@infogroup.kiev.ua
Precedence: list

---
 testing/litespeed/APKBUILD      | 17 +++++++++--------
 testing/litespeed/fix_php.patch | 28 ----------------------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/testing/litespeed/APKBUILD b/testing/litespeed/APKBUILD
index bc1b6295b0..21c5b5877f 100644
--- a/testing/litespeed/APKBUILD
+++ b/testing/litespeed/APKBUILD
@@ -1,17 +1,18 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=litespeed
-pkgver=1.4.24
-pkgrel=1
+pkgver=1.4.25
+pkgrel=0
 _pkgreal=open$pkgname
 _pkghome=var/lib/$pkgname
+_php=php7
 pkgdesc="High-performance, lightweight, open source HTTP server"
 url="https://open.litespeedtech.com"
 arch="all !aarch64"
 license="GPL3"
 pkgusers=litespeed
 pkggroups=litespeed
-depends="php7-$pkgname php7-bcmath php7-json php7-mcrypt php7-session"
+depends="$_php-$pkgname $_php-bcmath $_php-json $_php-mcrypt $_php-session"
 depends_dev=
 makedepends="linux-headers libressl-dev geoip-dev expat-dev pcre-dev zlib-dev"
 install="$pkgname.pre-install"
@@ -113,9 +114,9 @@ package() {
 	ln -s /var/log/$pkgname/Example "$pkgdir"/$_pkghome/Example/logs || return 1
 
 	# install backend
-	ln -s /usr/bin/lsphp7 "$pkgdir"/$_pkghome/fcgi-bin/lsphp7 || return 1
-	ln -s /etc/php7/php.ini "$pkgdir"/etc/$pkgname/php.ini || return 1
-	ln -s /etc/php7/php.ini "$pkgdir"/etc/$pkgname/admin/php.ini || return 1
+	ln -s /usr/bin/ls$_php "$pkgdir"/$_pkghome/fcgi-bin/ls$_php || return 1
+	ln -s /etc/$_php/php.ini "$pkgdir"/etc/$pkgname/php.ini || return 1
+	ln -s /etc/$_php/php.ini "$pkgdir"/etc/$pkgname/admin/php.ini || return 1
 }
 
 snmp() {
@@ -127,11 +128,11 @@ snmp() {
 		"$subpkgdir"/$_pkghome/add-ons
 }
 
-sha512sums="5f8434d2fef3b8c8b2dcdbfdefdd989edbf9cd08b14f41ac9e2bf18d959b9baf8585ceb94f0fd4fc284fd59378c31e451c6d6c144c3ad2f5cbab33abe73a26fc  openlitespeed-1.4.24.tgz
+sha512sums="0cb85ca3afbafdb05b2aa4ae80fb964ad91c9d51d764634f59b12070c30a46b816249861a7afa70b35fbb587014cf7e0a6228d9a34f5f42aed2a33c45eaeee89  openlitespeed-1.4.25.tgz
 2b0299246aaeb885122d8f939437f0e4701f6a79ea976f725ba8765d8b295c2797c0cac30e639d5eda665b9589710ee55acc4d03b078c4b9cc1e564994ccb9f5  litespeed.initd
 9dc0679aa27aa0efefe2ded2776a1269e4e565b5c49d074c40c2121bf5f1cbb8dfe286b97507ea9bdac539bdbb4960fe409ae7d1ed883085c44b592581f4931d  include.patch
 ead0ba0fabfb7d76a087f202d134bf86d909898e5d96e1330716c9288f21386d8b72f9caed34c095994a7ea328d7f8c9ae6d9e51a24e89b209099401ce09f2c5  install.patch
 2211e6c787700fc08eaee56f049c80690ef53d2b14cfcf17099ed0e5dfbd28b76a7b30f0c8814901e3c72bd4fc63732196b6fa0a8231cc10f86ba5130810b3d6  ls_lock.patch
-54a69f441a2d6e02aa3203cf15d14202df77d549a505a64cc296aa007dc49657b9fdaa2e3c4ecbd1aaca9b9ce4eb7899747cc751d9dd80aa9f92028361a9d3f6  fix_php.patch
+e203fede8b6791e9e8341bd5de843cc0de80c383c87bdd25ad772d70100bb434102cd100999829fee7e7d42c0099e715412115ce79c3060b6b3398237bc41bf5  fix_php.patch
 c7775836ee13b082e5c2ce011673b1a30b5ca83765d6d81ff1359110ba970808de6a87cd6d61fd688c9d2037451598154b429d70ad25094b9e9f10938aea00fd  thread.patch
 4566abaf19a8713c7199475d0f5d9c7dd61f9ae330acd02baf4096dddd8833dcb3a746f63ce19658afc9f3c4990663c736947dd90842eee542fd266ef1f30e7c  config.patch"
diff --git a/testing/litespeed/fix_php.patch b/testing/litespeed/fix_php.patch
index a9009ce196..9b0d1d0c8b 100644
--- a/testing/litespeed/fix_php.patch
+++ b/testing/litespeed/fix_php.patch
@@ -22,34 +22,6 @@
  
  /*--------------------------------
  assuming  following entry in /etc/snmp/snmpd.conf
---- a/dist/admin/html.open/login.php
-+++ b/dist/admin/html.open/login.php
-@@ -1,4 +1,4 @@
--<?
-+<?php
- 
- require_once('view/inc/global.php');
- 
-@@ -31,7 +31,9 @@
- });
- </script>
- 
--<? } ?>
-+<?php
-+}
-+?>
- 
- <div class="container">
- <div style="margin-top:50px"></div>
-@@ -40,7 +42,7 @@
- 							<form action="login.php"  id="login" method="post" class="smart-form client-form" novalidate="novalidate">
- 								<header><div class="text-center"><img src="/res/img/product_logo.gif" alt="LiteSpeed"></div></header>
- 								<fieldset>
--								<?
-+								<?php
- if ($msg != '') {
- 	echo "<section><div class=\"note\">$msg</div></section>";
- }
 --- a/dist/admin/html.open/lib/jCryption.php
 +++ b/dist/admin/html.open/lib/jCryption.php
 @@ -394,7 +394,7 @@
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---