commit e2e14319063a2dc5b77066193ed0121a15cbd966
Author: Elan Ruusamäe <[email protected]>
Date: Tue Aug 16 13:16:04 2016 +0300
up to 0.10.0
config.patch | 33 +++++++++++++++++++++------------
stikked.spec | 4 ++--
system-geshi.patch | 6 +++---
system-phpqrcode.patch | 6 +++---
4 files changed, 29 insertions(+), 20 deletions(-)
---
diff --git a/stikked.spec b/stikked.spec
index f562e9f..f1f2d05 100644
--- a/stikked.spec
+++ b/stikked.spec
@@ -10,12 +10,12 @@
%define php_min_version 5.2.4
Summary: Stikked is an Open-Source PHP Pastebin
Name: stikked
-Version: 0.9.0
+Version: 0.10.0
Release: 0.2
License: CC0
Group: Applications/WWW
Source0:
https://github.com/claudehohl/Stikked/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 60501ac5bf778144304a794118688ae9
+# Source0-md5: aa7701166c13a88c5aa41416b6dc9acf
Source1: apache.conf
Source2: lighttpd.conf
Patch0: config.patch
diff --git a/config.patch b/config.patch
index fe2d70e..5ab66a4 100644
--- a/config.patch
+++ b/config.patch
@@ -1,5 +1,5 @@
---- Stikked-0.8.6/config/stikked.php 2013-11-18 22:52:43.000000000 +0200
-+++ Stikked-0.8.6/config/stikked.php 2014-03-15 20:04:57.000000000 +0200
+--- Stikked-0.10.0/config/stikked.php~ 2015-09-30 15:25:59.000000000 +0300
++++ Stikked-0.10.0/config/stikked.php 2016-08-16 13:07:37.524958709 +0300
@@ -15,10 +15,10 @@
* The database structure will be created automatically
*
@@ -11,16 +11,25 @@
-$config['db_password'] = 'stikked';
+$config['db_username'] = 'mysql';
+$config['db_password'] = '';
+ //$config['db_driver'] = 'sqlite';
/**
- * Table prefix
---- Stikked-0.8.6/htdocs/index.php~ 2014-03-29 00:09:43.000000000 +0200
-+++ Stikked-0.8.6/htdocs/index.php 2014-03-29 00:10:49.236802420 +0200
-@@ -38,7 +38,6 @@
-
- case 'testing':
- case 'production':
-- error_reporting(0);
- break;
+--- Stikked-0.10.0/htdocs/index.php~ 2016-08-16 13:07:05.000000000 +0300
++++ Stikked-0.10.0/htdocs/index.php 2016-08-16 13:09:35.977792314 +0300
+@@ -53,7 +53,7 @@
+ *
+ * NOTE: If you change these, also change the error_reporting() code below
+ */
+- define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] :
'development');
++ define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] :
'production');
+
+ /*
+ *---------------------------------------------------------------
+@@ -72,7 +72,6 @@
- default:
+ case 'testing':
+ case 'production':
+- ini_set('display_errors', 0);
+ if (version_compare(PHP_VERSION, '5.3', '>='))
+ {
+ error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED &
~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
diff --git a/system-geshi.patch b/system-geshi.patch
index 6a0512a..8d57d93 100644
--- a/system-geshi.patch
+++ b/system-geshi.patch
@@ -1,11 +1,11 @@
---- Stikked-0.8.6/./htdocs/application/libraries/process.php~ 2014-03-29
13:29:38.000000000 +0200
-+++ Stikked-0.8.6/./htdocs/application/libraries/process.php 2014-03-29
13:31:04.566011897 +0200
+--- Stikked-0.10.0/./htdocs/application/libraries/Process.php~ 2016-08-16
13:10:05.000000000 +0300
++++ Stikked-0.10.0/./htdocs/application/libraries/Process.php 2016-08-16
13:10:32.597406734 +0300
@@ -9,7 +9,7 @@
*
*/
-include_once('geshi/geshi.php');
-+require_once 'geshi.php';
++require_once '/usr/share/php/geshi.php';
/**
* Source code processing class / Geshi Wrapper
diff --git a/system-phpqrcode.patch b/system-phpqrcode.patch
index c38fc2d..186b65d 100644
--- a/system-phpqrcode.patch
+++ b/system-phpqrcode.patch
@@ -1,10 +1,10 @@
---- Stikked-0.9.0/./htdocs/themes/default/views/view/qr.php~ 2014-10-08
23:20:57.572987805 +0300
-+++ Stikked-0.9.0/./htdocs/themes/default/views/view/qr.php 2014-10-09
13:10:54.636364691 +0300
+--- Stikked-0.10.0/./htdocs/themes/default/views/view/qr.php~ 2016-08-16
13:10:51.000000000 +0300
++++ Stikked-0.10.0/./htdocs/themes/default/views/view/qr.php 2016-08-16
13:11:10.406041808 +0300
@@ -4,7 +4,7 @@
* Function list:
* Classes list:
*/
--require_once ('./application/libraries/phpqrcode/qrlib.php');
+-require_once (APPPATH.'/libraries/phpqrcode/qrlib.php');
+require_once '/usr/share/php/phpqrcode/phpqrcode.php';
$qrurl = $url;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/stikked.git/commitdiff/e2e14319063a2dc5b77066193ed0121a15cbd966
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
