- started update to 1.11.23

diff --git a/lms-PLD.patch b/lms-PLD.patch
index 4b62a311c0c964b200ed18c3b15c19d9222b80d8..a7c8fb2d48e4d20955b34f6c0827edd829ac5cf0 100644 (file)
--- a/lms-PLD.patch
+++ b/lms-PLD.patch
@@ -1,23 +1,23 @@
---- lms-orig/index.php 2011-03-18 09:59:23.000000000 +0100
-+++ lms/index.php      2011-03-20 15:11:25.781918286 +0100
-@@ -47,13 +47,13 @@
- $CONFIG = (array) parse_ini_file($CONFIG_FILE, true);
+--- lms-LMS_011123/index.php.orig      2020-10-14 21:12:31.427420702 +0200
++++ lms-LMS_011123/index.php   2020-10-14 21:21:05.207970647 +0200
+@@ -49,13 +49,13 @@
+ $CONFIG = (array) parse_ini_file(CONFIG_FILE, true);
  
  // Check for configuration vars and set default values
 -$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']);
 +$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']);
- $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']);
--$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'].'/documents' : $CONFIG['directories']['doc_dir']);
-+$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? '/var/lib/lms/documents': $CONFIG['directories']['doc_dir']);
- $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']);
--$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']);
+ $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'lib' : $CONFIG['directories']['lib_dir']);
+-$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'documents' : $CONFIG['directories']['doc_dir']);
++$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? '/var/lib/lms/documents' : $CONFIG['directories']['doc_dir']);
+ $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'modules' : $CONFIG['directories']['modules_dir']);
+-$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'backups' : $CONFIG['directories']['backup_dir']);
 +$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']);
- $CONFIG['directories']['config_templates_dir'] = (!isset($CONFIG['directories']['config_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/config_templates' : $CONFIG['directories']['config_templates_dir']);
--$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? $CONFIG['directories']['sys_dir'].'/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
-+$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
- $CONFIG['directories']['smarty_templates_dir'] = (!isset($CONFIG['directories']['smarty_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/templates' : $CONFIG['directories']['smarty_templates_dir']);
- 
- define('SYS_DIR', $CONFIG['directories']['sys_dir']);
+ $CONFIG['directories']['config_templates_dir'] = (!isset($CONFIG['directories']['config_templates_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'config_templates' : $CONFIG['directories']['config_templates_dir']);
+-$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'templates_c' : $CONFIG['directories']['smarty_compile_dir']);
++$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? '/var/lib/lms/templaces_c' : $CONFIG['directories']['smarty_compile_dir']);
+ $CONFIG['directories']['smarty_templates_dir'] = (!isset($CONFIG['directories']['smarty_templates_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'templates' : $CONFIG['directories']['smarty_templates_dir']);
+ $CONFIG['directories']['plugin_dir'] = (!isset($CONFIG['directories']['plugin_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'plugins' : $CONFIG['directories']['plugin_dir']);
+ $CONFIG['directories']['plugins_dir'] = $CONFIG['directories']['plugin_dir'];
 --- lms-orig/sample/lms.ini    2009-04-08 13:59:42.000000000 +0200
 +++ lms/sample/lms.ini 2011-03-20 15:11:25.785251771 +0100
 @@ -228,7 +228,7 @@
@@ -59,60 +59,37 @@
  
  [mail]
  
---- lms-orig/contrib/customer/index.php        2011-03-18 09:59:23.000000000 +0100
-+++ lms/contrib/customer/index.php     2011-03-20 15:12:00.340164058 +0100
-@@ -36,11 +36,11 @@
+--- lms-LMS_011123/contrib/customer/index.php.orig     2020-10-14 21:21:28.771176328 +0200
++++ lms-LMS_011123/contrib/customer/index.php  2020-10-14 21:25:03.180014775 +0200
+@@ -46,11 +46,11 @@
  $CONFIG = (array) parse_ini_file($CONFIG_FILE, true);
  
  // Check for configuration vars and set default values
--$CONFIG['directories']['sys_dir'] = (! $CONFIG['directories']['sys_dir'] ? getcwd() : $CONFIG['directories']['sys_dir']);
--$CONFIG['directories']['backup_dir'] = (! $CONFIG['directories']['backup_dir'] ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']);
-+$CONFIG['directories']['sys_dir'] = (! $CONFIG['directories']['sys_dir'] ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']);
-+$CONFIG['directories']['backup_dir'] = (! $CONFIG['directories']['backup_dir'] ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']);
- $CONFIG['directories']['lib_dir'] = (! $CONFIG['directories']['lib_dir'] ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']);
- $CONFIG['directories']['modules_dir'] = (! $CONFIG['directories']['modules_dir'] ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']);
--$CONFIG['directories']['smarty_compile_dir'] = (! $CONFIG['directories']['smarty_compile_dir'] ? $CONFIG['directories']['sys_dir'].'/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
-+$CONFIG['directories']['smarty_compile_dir'] = (! $CONFIG['directories']['smarty_compile_dir'] ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
- $CONFIG['directories']['smarty_templates_dir'] = (! $CONFIG['directories']['smarty_templates_dir'] ? $CONFIG['directories']['sys_dir'].'/templates' : $CONFIG['directories']['smarty_templates_dir']);
- 
- define('SYS_DIR', $CONFIG['directories']['sys_dir']);
-@@ -74,7 +74,7 @@
- 
- // Initialize templates engine
- 
--require_once(LIB_DIR.'/Smarty/Smarty.class.php');
-+require_once(LIB_DIR.'/Smarty/Smarty.class.php');
- 
- $SMARTY = new Smarty;
- 
-@@ -98,7 +98,7 @@
- $SMARTY->assign_by_ref('LANGDEFS', $LANGDEFS);
- $SMARTY->assign_by_ref('_ui_language', $LMS->ui_lang);
- $SMARTY->assign_by_ref('_language', $LMS->lang);
--$SMARTY->template_dir = getcwd();
-+$SMARTY->template_dir = getcwd();
- $SMARTY->compile_dir = SMARTY_COMPILE_DIR;
- @include('locale/'.$LMS->ui_lang.'/strings.php');
+-$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']);
+-$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'backups' : $CONFIG['directories']['backup_dir']);
++$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']);
++$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']);
+ $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'lib' : $CONFIG['directories']['lib_dir']);
+ $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'modules' : $CONFIG['directories']['modules_dir']);
+-$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'templates_c' : $CONFIG['directories']['smarty_compile_dir']);
++$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
+ $CONFIG['directories']['smarty_templates_dir'] = (!isset($CONFIG['directories']['smarty_templates_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'templates' : $CONFIG['directories']['smarty_templates_dir']);
+ $CONFIG['directories']['plugin_dir'] = (!isset($CONFIG['directories']['plugin_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'plugins' : $CONFIG['directories']['plugin_dir']);
+ $CONFIG['directories']['plugins_dir'] = $CONFIG['directories']['plugin_dir'];
+--- lms-LMS_011123/userpanel/index.php.orig    2020-10-14 21:21:28.771176328 +0200
++++ lms-LMS_011123/userpanel/index.php 2020-10-14 21:30:34.258221170 +0200
+@@ -51,11 +51,11 @@
+ $CONFIG = (array) parse_ini_file($CONFIG_FILE, true);
  
---- lms-orig/userpanel/index.php       2011-03-18 09:59:24.000000000 +0100
-+++ lms/userpanel/index.php    2011-03-20 15:11:25.788585257 +0100
-@@ -45,8 +45,8 @@
-       $CONFIG['directories']['sys_dir'] = $CONFIG['directories']['sys_dir'];
- $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']);
- $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']);
+ // Check for configuration vars and set default values
+-$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']);
++$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? '/usr/share/lms/userpanel' : $CONFIG['directories']['sys_dir']);
+ $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'lib' : $CONFIG['directories']['lib_dir']);
 -$CONFIG['directories']['userpanel_dir'] = (!isset($CONFIG['directories']['userpanel_dir']) ? getcwd() : $CONFIG['directories']['userpanel_dir']);
--$CONFIG['directories']['smarty_compile_dir'] = $CONFIG['directories']['userpanel_dir'].'/templates_c';
-+$CONFIG['directories']['userpanel_dir'] = (!isset($CONFIG['directories']['userpanel_dir']) ? '/usr/share/lms/userpanel'  : $CONFIG['directories']['userpanel_dir']);
++$CONFIG['directories']['userpanel_dir'] = (!isset($CONFIG['directories']['userpanel_dir']) ? '/usr/share/lms/userpanel' : $CONFIG['directories']['userpanel_dir']);
+ $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'modules' : $CONFIG['directories']['modules_dir']);
+-$CONFIG['directories']['smarty_compile_dir'] = $CONFIG['directories']['userpanel_dir'] . DIRECTORY_SEPARATOR . 'templates_c';
 +$CONFIG['directories']['smarty_compile_dir'] = '/var/lib/lms/userpanel/templates_c';
- 
- define('USERPANEL_DIR', $CONFIG['directories']['userpanel_dir']);
- define('USERPANEL_LIB_DIR', USERPANEL_DIR.'/lib/');
-@@ -77,7 +77,7 @@
- 
- // Initialize templates engine (must be before locale settings)
- 
--require_once(LIB_DIR.'/Smarty/Smarty.class.php');
-+require_once('/usr/share/php/Smarty/Smarty.class.php');
- 
- $SMARTY = new Smarty;
- 
+ $CONFIG['directories']['plugin_dir'] = (!isset($CONFIG['directories']['plugin_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'plugins' : $CONFIG['directories']['plugin_dir']);
+ $CONFIG['directories']['plugins_dir'] = $CONFIG['directories']['plugin_dir'];
+ $CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'] . DIRECTORY_SEPARATOR . 'documents' : $CONFIG['directories']['doc_dir']);

diff --git a/lms.spec b/lms.spec
index 9454c02d38ff72339744adb917db59a5fced67d5..3d2d27c1bb0ff2a38a5bd55a85718cef5e5eeac3 100644 (file)
--- a/lms.spec
+++ b/lms.spec
@@ -8,36 +8,35 @@
 %bcond_with    lmsd_debug      # with lmsd debugging
 
 %define                lmsver          1.11
-%define                lmssubver       13
+%define                lmssubver       23
 Summary:       LAN Managment System
 Summary(pl.UTF-8):     System Zarządzania Siecią Lokalną
 Name:          lms
 Version:       %{lmsver}.%{lmssubver}
-Release:       11
+Release:       1
 License:       GPL v2
 Group:         Networking/Utilities
 Source0:       http://www.lms.org.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5: 294899358ae2585a4030580d79a06ee8
+# Source0-md5: 708712da52e9817cb94e54779b6f3c1a
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-apache.conf
 Source4:       %{name}-httpd.conf
 Patch0:                %{name}-PLD.patch
-Patch1:                %{name}-amd64.patch
 Patch2:                %{name}-smarty.patch
 Patch3:                build.patch
 URL:           http://www.lms.org.pl/
 BuildRequires: bison
 BuildRequires: flex
 %{?with_lmsd:BuildRequires:    libgadu-devel}
-%{?with_lmsd:BuildRequires:    mysql-devel}
+%{?with_lmsd:BuildRequires:    mysql-devel >= 5}
 BuildRequires: net-snmp-devel
-%{?with_lmsd:BuildRequires:    postgresql-devel >= 8.2}
+%{?with_lmsd:BuildRequires:    postgresql-devel >= 8.4}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.461
 BuildRequires: yacc
 %{?with_lmsd:Requires(post,preun):     /sbin/chkconfig}
-Requires:      Smarty >= 2.6.18-2
+Requires:      php-Smarty >= 3.1.29
 Requires:      php(gd)
 Requires:      php(iconv)
 Requires:      php(mbstring)
@@ -47,7 +46,7 @@ Requires:     php(posix)
 Requires:      webapps
 Requires:      webserver(access)
 Requires:      webserver(alias)
-Requires:      webserver(php)
+Requires:      webserver(php) >= 5.2
 Conflicts:     apache-base < 2.4.0-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -182,11 +181,8 @@ zgłaszanie błędów oraz awarii do Helpdesku, wydruk faktur oraz
 formularza przelewu.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-LMS_011123
 %patch0 -p1
-%if "%{_lib}" == "lib64"
-%patch1 -p1
-%endif
 %patch2 -p1
 %patch3 -p1
 
@@ -204,20 +200,24 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 %{__rm}
 %build
 %if %{with lmsd}
 cd daemon
-
-./configure --with-mysql %{?with_lmsd_debug:--enable-debug0 --enable-debug1}
-%{__make} \
-       CC='%{__cc}' \
-       CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL -DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
-mv lmsd lmsd-mysql
-
-./configure --with-pgsql %{?with_lmsd_debug:--enable-debug0 --enable-debug1}
-%{__make} lmsd \
-       CC='%{__cc}' \
-       CFLAGS='%{rpmcflags} -fPIC -DUSE_PGSQL -DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
-mv lmsd lmsd-pgsql
-
-CFLAGS="%{rpmcflags}" %{__make} -j1 -C modules/parser \
+%configure \
+       --with-mysql \
+       %{?with_lmsd_debug:--enable-debug0 --enable-debug1}
+%{__make}
+#      CC='%{__cc}' \
+#      CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL -DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
+%{__mv} lmsd lmsd-mysql
+
+%configure \
+       --with-pgsql \
+       %{?with_lmsd_debug:--enable-debug0 --enable-debug1}
+%{__make} lmsd
+#      CC='%{__cc}' \
+#      CFLAGS='%{rpmcflags} -fPIC -DUSE_PGSQL -DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
+%{__mv} lmsd lmsd-pgsql
+
+CFLAGS="%{rpmcflags}" \
+%{__make} -j1 -C modules/parser \
        CC='%{__cc}'
 
 cd ..