- updated to 1.4.0

Changed files:
    lms-PLD.patch -> 1.6
    lms-amd64.patch -> 1.3
    lms.init -> 1.2
    lms.sysconfig -> 1.2

diff --git a/lms-PLD.patch b/lms-PLD.patch
index d93f8a00d4845b23a590b48ca7e974d18e2d3b91..d9e639f9a59b68cca3ffd7e45aaca118a952f888 100644 (file)
--- a/lms-PLD.patch
+++ b/lms-PLD.patch
@@ -1,56 +1,65 @@
-2003-12-12 05:00    diff -url lms.orig/index.php lms/index.php    Page 1
-
-
---- lms.orig/index.php Fri Dec 12 04:58:02 2003
-+++ lms/index.php      Fri Dec 12 05:00:20 2003
-@@ -53,14 +53,14 @@
-                                                                       
- // Define directories and configuration vars
- 
--$_SYSTEM_DIR = (! $_CONFIG[directories]['sys_dir'] ? getcwd() : $_CONFIG[directories]['sys_dir']);
--$_BACKUP_DIR = (! $_CONFIG[directories]['backup_dir'] ? $_SYSTEM_DIR.'/backups' : $_CONFIG[directories]['backup_dir']);
-+$_SYSTEM_DIR = (! $_CONFIG[directories]['sys_dir'] ? '/usr/share/lms' : $_CONFIG[directories]['sys_dir']);
-+$_BACKUP_DIR = (! $_CONFIG[directories]['backup_dir'] ? '/var/lib/lms/backups' : $_CONFIG[directories]['backup_dir']);
- $_LIB_DIR = (! $_CONFIG[directories]['lib_dir'] ? $_SYSTEM_DIR.'/lib' : $_CONFIG[directories]['lib_dir']);
- $_MODULES_DIR = (! $_CONFIG[directories]['modules_dir'] ? $_SYSTEM_DIR.'/modules' : $_CONFIG[directories]['modules_dir']);
--$_SMARTY_DIR = (! $_CONFIG[directories]['smarty_dir'] ? (is_readable('/usr/share/php/smarty/libs/Smarty.class.php') ?  '/usr/share/php/smarty/libs' : $_LIB_DIR.'/Smarty' ) : $_CONFIG[directories]['smarty_dir']);
--$_SMARTY_COMPILE_DIR = (! $_CONFIG[directories]['smarty_compile_dir'] ? $_SYSTEM_DIR.'/templates_c' : $_CONFIG[directories]['smarty_compile_dir']);
--$_SMARTY_TEMPLATES_DIR = (! $_CONFIG[directories]['smarty_templates_dir'] ? $_SYSTEM_DIR.'/templates' : $_CONFIG[directories]['smarty_templates_dir']);
--$_ADODB_DIR = (! $_CONFIG[directories]['adodb_dir'] ? (is_readable('/usr/share/adodb/adodb.inc.php') ?  '/usr/share/adodb' : $_LIB_DIR.'/adodb' ) : $_CONFIG[directories]['adodb_dir']);
-+$_SMARTY_DIR = (! $_CONFIG[directories]['smarty_dir'] ? '/usr/share/pear/Smarty' : $_CONFIG[directories]['smarty_dir']);
-+$_SMARTY_COMPILE_DIR = (! $_CONFIG[directories]['smarty_compile_dir'] ? '/var/lib/lms/templates_c/' : $_CONFIG[directories]['smarty_compile_dir']);
-+$_SMARTY_TEMPLATES_DIR = (! $_CONFIG[directories]['smarty_templates_dir'] ? $_SYSTEM_DIR.'/templates/' : $_CONFIG[directories]['smarty_templates_dir']);
-+$_ADODB_DIR = (! $_CONFIG[directories]['adodb_dir'] ? '/usr/share/pear/adodb/' : $_CONFIG[directories]['adodb_dir']);
- $_TIMEOUT = (! $_CONFIG[phpui]['timeout'] ? 600 : $_CONFIG[phpui]['timeout']);
- $_FORCE_SSL = chkconfig($_CONFIG[phpui]['force_ssl']);
- 
-@@ -76,7 +76,7 @@
- 
- $_DBTYPE = (! $_CONFIG['database']['type'] ? 'mysql' : $_CONFIG['database']['type']);
- $_DBHOST = (! $_CONFIG['database']['host'] ? 'localhost' : $_CONFIG['database']['host']);
--$_DBUSER = (! $_CONFIG['database']['user'] ? 'root' : $_CONFIG['database']['user']);
-+$_DBUSER = (! $_CONFIG['database']['user'] ? 'mysql' : $_CONFIG['database']['user']);
- $_DBPASS = (! $_CONFIG['database']['password'] ? '' : $_CONFIG['database']['password']);
- $_DBNAME = (! $_CONFIG['database']['database'] ? 'lms' : $_CONFIG['database']['database']);
- 
-\fOnly in lms: index.php~
---- lms/sample/lms.ini~        Sun Aug  8 02:54:14 2004
-+++ lms/sample/lms.ini Sun Aug  8 02:54:14 2004
-@@ -166,7 +166,7 @@
+--- lms.orig/index.php 2004-09-18 21:26:55.000000000 +0200
++++ lms/index.php      2004-10-03 04:09:36.022502648 +0200
+@@ -98,13 +98,13 @@
+ }
+ 
+ // 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']['config_templates_dir'] = (! $_CONFIG['directories']['config_templates_dir'] ? $_CONFIG['directories']['sys_dir'].'/config_templates' : $_CONFIG['directories']['config_templates_dir']);
+-$_CONFIG['directories']['smarty_dir'] = (! $_CONFIG['directories']['smarty_dir'] ? (is_readable('/usr/share/php/smarty/libs/Smarty.class.php') ? '/usr/share/php/smarty/libs' : $_CONFIG['directories']['lib_dir'].'/Smarty') : $_CONFIG['directories']['smarty_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_dir'] = (! $_CONFIG['directories']['smarty_dir'] ? '/usr/share/pear/Smarty' : $_CONFIG['directories']['smarty_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']);
+ 
+ foreach(lms_parse_ini_file($_CONFIG['directories']['lib_dir'].'/config_defaults.ini', TRUE) as $section => $values)
+--- lms.orig/sample/lms.ini    2004-08-25 14:52:18.000000000 +0200
++++ lms/sample/lms.ini 2004-10-04 02:52:16.676497680 +0200
+@@ -25,7 +25,7 @@
+ ; ze wskazówkami w doc/INSTALL) bêdzie to 'lms'. Je¿eli chcesz u¿ywaæ
+ ; konta uprzywilejowanego, prawdopodobnie wpiszesz 'root' (MySQL na
+ ; wiêkszo¶ci *nixów), 'mysql' (na PLD) b±d¼ 'postgres' (PostgreSQL).
+-; Domy¶lnie: root
++; Domy¶lnie: mysql
+ 
+ ; user                        = mysql
+ 
+@@ -170,7 +170,7 @@
+ ; stara siê sam odnale¼æ w filesystemie u¿ywaj±c getcwd(), ale lepiej
+ ; by by³o gdyby mu powiedzieæ gdzie jest:
+ 
+-; sys_dir             = /var/www/htdocs/lms/
++; sys_dir             = /usr/share/lms/www/
+ 
+ ; Katalog z "modu³ami" LMS'a - kawa³kami kodu które szumnie kto¶ 
+ ; (czyli Baseciq) nazwa³ modu³ami. Domy¶lnie jest to podkatalog modules
+@@ -193,13 +193,13 @@
+ 
+ ; config_templates_dir        = /usr/share/lms/config_templates
+ 
+-; backup_dir          = /var/backup/lms/
++; backup_dir          = /var/lib/lms/backups/
+ 
+ ; Katalog z bibliotek± Smarty - domy¶lnie podkatalog Smarty w 
  ; lib_dir.
  ; http://smarty.php.net
  
 -; smarty_dir          = /usr/lib/php/Smarty
 +; smarty_dir          = /usr/share/pear/Smarty
  
+ ; W pld jest domy¶lnie tutaj: (nie zapomnij o "poldek -i Smarty");
+ ; smarty_dir      = /usr/share/pear/Smarty
+@@ -208,7 +208,7 @@
  ; Katalog kompilacji Smartyego. Miejsce gdzie Smarty psuje nasze
  ; templejty. Domy¶lnie to templates_c w katalogu sysdir.
-@@ -182,7 +182,7 @@
- ; podkatalog adodb w lib_dir.
- ; http://php.weblogs.com/ADOdb
- ;
--; adodb_dir           = /usr/lib/php/adodb
-+; adodb_dir           = /usr/share/pear/adodb
- 
- ; ---------------------------------------------------------------------------
- ; Konfiguracja skryptu do powiadamiania - lms-notify
+ 
+-; smarty_compile_dir  = /var/smarty/compile/lms
++; smarty_compile_dir  = /var/lib/lms/templates_c
+ 
+ ; Katalog z templejtami którymi karmimy Smartiego. Domy¶lnie to
+ ; podkatalog templates z sys_dir'a.

diff --git a/lms-amd64.patch b/lms-amd64.patch
new file mode 100644 (file)
index 0000000..15cf991
--- /dev/null
+++ b/lms-amd64.patch
@@ -0,0 +1,42 @@
+--- lms.orig/daemon/Makefile   2004-09-09 13:08:39.000000000 +0200
++++ lms/daemon/Makefile        2004-10-03 02:24:11.350998864 +0200
+@@ -1,6 +1,6 @@
+ 
+ LIBS = -lmysqlclient -ldl
+-LDFLAGS = -L/usr/lib
++LDFLAGS = -L/usr/lib64
+ CFLAGS = -I/usr/include -DUSE_MYSQL
+ INSTALLDIR = /usr/local/bin
+ 
+--- lms.orig/daemon/configure  2004-04-14 11:12:19.000000000 +0200
++++ lms/daemon/configure       2004-10-03 02:24:29.598224864 +0200
+@@ -3,7 +3,7 @@
+ # Initialize default variables
+ prefix="/usr/local/bin"
+ incdir="/usr/include"
+-libdir="/usr/lib"
++libdir="/usr/lib64"
+ with_mysql=yes
+ 
+ # Parse options *****************************************************************
+@@ -80,7 +80,7 @@
+   --with-sqlite               enables use of SQLite database (disabled)
+   --prefix=DIR                sets program and modules install location 
+                       (/usr/local/bin)
+-  --libdir=DIR                sets location of database library (/usr/lib)
++  --libdir=DIR                sets location of database library (/usr/lib64)
+   --incdir=DIR                sets location of database include files (/usr/include)
+ EOF
+               exit 0
+--- lms.orig/daemon/modules/ggnotify/Makefile.in       2004-08-25 15:37:35.000000000 +0200
++++ lms/daemon/modules/ggnotify/Makefile.in    2004-10-03 02:34:18.739661752 +0200
+@@ -1,7 +1,7 @@
+ # dla libgadu i ekg --------------
+-LDFLAGS += -L/usr/lib
++LDFLAGS += -L/usr/lib64
+ CFLAGS += -I/usr/src/ekg/lib
+-LIBS += /usr/lib/libgadu.so
++LIBS += /usr/lib64/libgadu.so
+ # --------------------------------
+ 
+ SOURCES = ggnotify.c

diff --git a/lms.init b/lms.init
index 8c507e9e75dfeb3ade5cfef0fbb70d6bfe074237..5dbf166e3c0422690e514c462b7535b92e9b6366 100644 (file)
--- a/lms.init
+++ b/lms.init
@@ -1,6 +1,6 @@
-#!/bin/sha
+#!/bin/sh
 #
-# Startup script for lms (almsd)
+# Startup script for LMS (almsd)
 #
 # Adam Nowotny <domelu@pld-linux.org>
 #
@@ -15,6 +15,9 @@
 # Get network config
 . /etc/sysconfig/network
 
+# Get service config
+[ -f /etc/sysconfig/lms ] && . /etc/sysconfig/lms
+
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
@@ -25,31 +28,28 @@ else
        exit 0
 fi
 
-# Get service config
-if [ -f /etc/sysconfig/lms ]; then
-       . /etc/sysconfig/lms
-fi
+[ -z "$ALMSD_DATABASE_TYPE" ] && ALMSD_DATABASE_TYPE="mysql"
 
 RETVAL=0
 case "$1" in
   start)
-       if [ ! -f /var/lock/subsys/lms ]; then
-               msg_starting lms
-               daemon "almsd-$ALMSD_DATABASE_TYPE -b > /dev/null 2>&1 &"
+       if [ ! -f /var/lock/subsys/almsd ]; then
+               msg_starting almsd
+               daemon almsd-$ALMSD_DATABASE_TYPE -b
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lms
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/almsd
        else
-               msg_already_running lms
+               msg_already_running almsd
        fi
        ;;
   stop)
-       if [ -f /var/lock/subsys/lms ]; then
-               msg_stopping lms
+       if [ -f /var/lock/subsys/almsd ]; then
+               msg_stopping almsd
                killproc almsd-$ALMSD_DATABASE_TYPE
                sleep 1
-               rm -f /var/lock/subsys/lms >/dev/null 2>&1
+               rm -f /var/lock/subsys/almsd >/dev/null 2>&1
        else
-               msg_not_running lms
+               msg_not_running almsd
        fi
        ;;
   restart)
@@ -57,6 +57,10 @@ case "$1" in
        $0 start
        exit $?
        ;;
+  status)
+       status almsd-$ALMSD_DATABASE_TYPE
+       exit $?
+       ;;                        
   *)
        msg_usage "$0 {start|stop|restart}"
        exit 3

diff --git a/lms.sysconfig b/lms.sysconfig
index 6cf55e286a3a968148007e45f243ab0b43c0acc6..adc6b35e0966a1e217f4314f4a0938f7bc60f08f 100644 (file)
--- a/lms.sysconfig
+++ b/lms.sysconfig
@@ -1,3 +1,2 @@
-# almsd database type
-ALMSD_DATABASE_TYPE="mysql"
-# ALMSD_DATABASE_TYPE="pgsql"
+# almsd database type (mysql or pgsql)
+# ALMSD_DATABASE_TYPE="mysql"