/[smecontribs]/rpms/smeserver-zoneminder/contribs9/smeserver-zoneminder-1.0-bz10676-fix-sql-perms.patch
ViewVC logotype

Diff of /rpms/smeserver-zoneminder/contribs9/smeserver-zoneminder-1.0-bz10676-fix-sql-perms.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by jpp, Sat Dec 29 04:50:51 2018 UTC Revision 1.2 by jpp, Sat Dec 29 04:59:57 2018 UTC
# Line 1  Line 1 
1  diff -Nur smeserver-zoneminder-1.0.old/COPYING meserver-zoneminder-1.0/COPYING  diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30zoneminder
2  --- smeserver-zoneminder-1.0.old/COPYING        2000-08-02 20:01:00.000000000 -0400  --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30zoneminder  1969-12-31 19:00:00.000000000 -0500
3  +++ meserver-zoneminder-1.0/COPYING     1969-12-31 19:00:00.000000000 -0500  +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30zoneminder      2018-12-28 23:58:49.265000000 -0500
4  @@ -1,340 +0,0 @@  @@ -0,0 +1 @@
5  -                   GNU GENERAL PUBLIC LICENSE  +PERMS=0540
 -                      Version 2, June 1991  
 -  
 - Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
 -     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
 - Everyone is permitted to copy and distribute verbatim copies  
 - of this license document, but changing it is not allowed.  
 -  
 -                           Preamble  
 -  
 -  The licenses for most software are designed to take away your  
 -freedom to share and change it.  By contrast, the GNU General Public  
 -License is intended to guarantee your freedom to share and change free  
 -software--to make sure the software is free for all its users.  This  
 -General Public License applies to most of the Free Software  
 -Foundation's software and to any other program whose authors commit to  
 -using it.  (Some other Free Software Foundation software is covered by  
 -the GNU Library General Public License instead.)  You can apply it to  
 -your programs, too.  
 -  
 -  When we speak of free software, we are referring to freedom, not  
 -price.  Our General Public Licenses are designed to make sure that you  
 -have the freedom to distribute copies of free software (and charge for  
 -this service if you wish), that you receive source code or can get it  
 -if you want it, that you can change the software or use pieces of it  
 -in new free programs; and that you know you can do these things.  
 -  
 -  To protect your rights, we need to make restrictions that forbid  
 -anyone to deny you these rights or to ask you to surrender the rights.  
 -These restrictions translate to certain responsibilities for you if you  
 -distribute copies of the software, or if you modify it.  
 -  
 -  For example, if you distribute copies of such a program, whether  
 -gratis or for a fee, you must give the recipients all the rights that  
 -you have.  You must make sure that they, too, receive or can get the  
 -source code.  And you must show them these terms so they know their  
 -rights.  
 -  
 -  We protect your rights with two steps: (1) copyright the software, and  
 -(2) offer you this license which gives you legal permission to copy,  
 -distribute and/or modify the software.  
 -  
 -  Also, for each author's protection and ours, we want to make certain  
 -that everyone understands that there is no warranty for this free  
 -software.  If the software is modified by someone else and passed on, we  
 -want its recipients to know that what they have is not the original, so  
 -that any problems introduced by others will not reflect on the original  
 -authors' reputations.  
 -  
 -  Finally, any free program is threatened constantly by software  
 -patents.  We wish to avoid the danger that redistributors of a free  
 -program will individually obtain patent licenses, in effect making the  
 -program proprietary.  To prevent this, we have made it clear that any  
 -patent must be licensed for everyone's free use or not licensed at all.  
 -  
 -  The precise terms and conditions for copying, distribution and  
 -modification follow.  
 -  
 -                   GNU GENERAL PUBLIC LICENSE  
 -   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION  
 -  
 -  0. This License applies to any program or other work which contains  
 -a notice placed by the copyright holder saying it may be distributed  
 -under the terms of this General Public License.  The "Program", below,  
 -refers to any such program or work, and a "work based on the Program"  
 -means either the Program or any derivative work under copyright law:  
 -that is to say, a work containing the Program or a portion of it,  
 -either verbatim or with modifications and/or translated into another  
 -language.  (Hereinafter, translation is included without limitation in  
 -the term "modification".)  Each licensee is addressed as "you".  
 -  
 -Activities other than copying, distribution and modification are not  
 -covered by this License; they are outside its scope.  The act of  
 -running the Program is not restricted, and the output from the Program  
 -is covered only if its contents constitute a work based on the  
 -Program (independent of having been made by running the Program).  
 -Whether that is true depends on what the Program does.  
 -  
 -  1. You may copy and distribute verbatim copies of the Program's  
 -source code as you receive it, in any medium, provided that you  
 -conspicuously and appropriately publish on each copy an appropriate  
 -copyright notice and disclaimer of warranty; keep intact all the  
 -notices that refer to this License and to the absence of any warranty;  
 -and give any other recipients of the Program a copy of this License  
 -along with the Program.  
 -  
 -You may charge a fee for the physical act of transferring a copy, and  
 -you may at your option offer warranty protection in exchange for a fee.  
 -  
 -  2. You may modify your copy or copies of the Program or any portion  
 -of it, thus forming a work based on the Program, and copy and  
 -distribute such modifications or work under the terms of Section 1  
 -above, provided that you also meet all of these conditions:  
 -  
 -    a) You must cause the modified files to carry prominent notices  
 -    stating that you changed the files and the date of any change.  
 -  
 -    b) You must cause any work that you distribute or publish, that in  
 -    whole or in part contains or is derived from the Program or any  
 -    part thereof, to be licensed as a whole at no charge to all third  
 -    parties under the terms of this License.  
 -  
 -    c) If the modified program normally reads commands interactively  
 -    when run, you must cause it, when started running for such  
 -    interactive use in the most ordinary way, to print or display an  
 -    announcement including an appropriate copyright notice and a  
 -    notice that there is no warranty (or else, saying that you provide  
 -    a warranty) and that users may redistribute the program under  
 -    these conditions, and telling the user how to view a copy of this  
 -    License.  (Exception: if the Program itself is interactive but  
 -    does not normally print such an announcement, your work based on  
 -    the Program is not required to print an announcement.)  
 -  
 -These requirements apply to the modified work as a whole.  If  
 -identifiable sections of that work are not derived from the Program,  
 -and can be reasonably considered independent and separate works in  
 -themselves, then this License, and its terms, do not apply to those  
 -sections when you distribute them as separate works.  But when you  
 -distribute the same sections as part of a whole which is a work based  
 -on the Program, the distribution of the whole must be on the terms of  
 -this License, whose permissions for other licensees extend to the  
 -entire whole, and thus to each and every part regardless of who wrote it.  
 -  
 -Thus, it is not the intent of this section to claim rights or contest  
 -your rights to work written entirely by you; rather, the intent is to  
 -exercise the right to control the distribution of derivative or  
 -collective works based on the Program.  
 -  
 -In addition, mere aggregation of another work not based on the Program  
 -with the Program (or with a work based on the Program) on a volume of  
 -a storage or distribution medium does not bring the other work under  
 -the scope of this License.  
 -  
 -  3. You may copy and distribute the Program (or a work based on it,  
 -under Section 2) in object code or executable form under the terms of  
 -Sections 1 and 2 above provided that you also do one of the following:  
 -  
 -    a) Accompany it with the complete corresponding machine-readable  
 -    source code, which must be distributed under the terms of Sections  
 -    1 and 2 above on a medium customarily used for software interchange; or,  
 -  
 -    b) Accompany it with a written offer, valid for at least three  
 -    years, to give any third party, for a charge no more than your  
 -    cost of physically performing source distribution, a complete  
 -    machine-readable copy of the corresponding source code, to be  
 -    distributed under the terms of Sections 1 and 2 above on a medium  
 -    customarily used for software interchange; or,  
 -  
 -    c) Accompany it with the information you received as to the offer  
 -    to distribute corresponding source code.  (This alternative is  
 -    allowed only for noncommercial distribution and only if you  
 -    received the program in object code or executable form with such  
 -    an offer, in accord with Subsection b above.)  
 -  
 -The source code for a work means the preferred form of the work for  
 -making modifications to it.  For an executable work, complete source  
 -code means all the source code for all modules it contains, plus any  
 -associated interface definition files, plus the scripts used to  
 -control compilation and installation of the executable.  However, as a  
 -special exception, the source code distributed need not include  
 -anything that is normally distributed (in either source or binary  
 -form) with the major components (compiler, kernel, and so on) of the  
 -operating system on which the executable runs, unless that component  
 -itself accompanies the executable.  
 -  
 -If distribution of executable or object code is made by offering  
 -access to copy from a designated place, then offering equivalent  
 -access to copy the source code from the same place counts as  
 -distribution of the source code, even though third parties are not  
 -compelled to copy the source along with the object code.  
 -  
 -  4. You may not copy, modify, sublicense, or distribute the Program  
 -except as expressly provided under this License.  Any attempt  
 -otherwise to copy, modify, sublicense or distribute the Program is  
 -void, and will automatically terminate your rights under this License.  
 -However, parties who have received copies, or rights, from you under  
 -this License will not have their licenses terminated so long as such  
 -parties remain in full compliance.  
 -  
 -  5. You are not required to accept this License, since you have not  
 -signed it.  However, nothing else grants you permission to modify or  
 -distribute the Program or its derivative works.  These actions are  
 -prohibited by law if you do not accept this License.  Therefore, by  
 -modifying or distributing the Program (or any work based on the  
 -Program), you indicate your acceptance of this License to do so, and  
 -all its terms and conditions for copying, distributing or modifying  
 -the Program or works based on it.  
 -  
 -  6. Each time you redistribute the Program (or any work based on the  
 -Program), the recipient automatically receives a license from the  
 -original licensor to copy, distribute or modify the Program subject to  
 -these terms and conditions.  You may not impose any further  
 -restrictions on the recipients' exercise of the rights granted herein.  
 -You are not responsible for enforcing compliance by third parties to  
 -this License.  
 -  
 -  7. If, as a consequence of a court judgment or allegation of patent  
 -infringement or for any other reason (not limited to patent issues),  
 -conditions are imposed on you (whether by court order, agreement or  
 -otherwise) that contradict the conditions of this License, they do not  
 -excuse you from the conditions of this License.  If you cannot  
 -distribute so as to satisfy simultaneously your obligations under this  
 -License and any other pertinent obligations, then as a consequence you  
 -may not distribute the Program at all.  For example, if a patent  
 -license would not permit royalty-free redistribution of the Program by  
 -all those who receive copies directly or indirectly through you, then  
 -the only way you could satisfy both it and this License would be to  
 -refrain entirely from distribution of the Program.  
 -  
 -If any portion of this section is held invalid or unenforceable under  
 -any particular circumstance, the balance of the section is intended to  
 -apply and the section as a whole is intended to apply in other  
 -circumstances.  
 -  
 -It is not the purpose of this section to induce you to infringe any  
 -patents or other property right claims or to contest validity of any  
 -such claims; this section has the sole purpose of protecting the  
 -integrity of the free software distribution system, which is  
 -implemented by public license practices.  Many people have made  
 -generous contributions to the wide range of software distributed  
 -through that system in reliance on consistent application of that  
 -system; it is up to the author/donor to decide if he or she is willing  
 -to distribute software through any other system and a licensee cannot  
 -impose that choice.  
 -  
 -This section is intended to make thoroughly clear what is believed to  
 -be a consequence of the rest of this License.  
 -  
 -  8. If the distribution and/or use of the Program is restricted in  
 -certain countries either by patents or by copyrighted interfaces, the  
 -original copyright holder who places the Program under this License  
 -may add an explicit geographical distribution limitation excluding  
 -those countries, so that distribution is permitted only in or among  
 -countries not thus excluded.  In such case, this License incorporates  
 -the limitation as if written in the body of this License.  
 -  
 -  9. The Free Software Foundation may publish revised and/or new versions  
 -of the General Public License from time to time.  Such new versions will  
 -be similar in spirit to the present version, but may differ in detail to  
 -address new problems or concerns.  
 -  
 -Each version is given a distinguishing version number.  If the Program  
 -specifies a version number of this License which applies to it and "any  
 -later version", you have the option of following the terms and conditions  
 -either of that version or of any later version published by the Free  
 -Software Foundation.  If the Program does not specify a version number of  
 -this License, you may choose any version ever published by the Free Software  
 -Foundation.  
 -  
 -  10. If you wish to incorporate parts of the Program into other free  
 -programs whose distribution conditions are different, write to the author  
 -to ask for permission.  For software which is copyrighted by the Free  
 -Software Foundation, write to the Free Software Foundation; we sometimes  
 -make exceptions for this.  Our decision will be guided by the two goals  
 -of preserving the free status of all derivatives of our free software and  
 -of promoting the sharing and reuse of software generally.  
 -  
 -                           NO WARRANTY  
 -  
 -  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY  
 -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN  
 -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES  
 -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED  
 -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF  
 -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS  
 -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE  
 -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,  
 -REPAIR OR CORRECTION.  
 -  
 -  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING  
 -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR  
 -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,  
 -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING  
 -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED  
 -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY  
 -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER  
 -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE  
 -POSSIBILITY OF SUCH DAMAGES.  
 -  
 -                    END OF TERMS AND CONDITIONS  
 -  
 -           How to Apply These Terms to Your New Programs  
 -  
 -  If you develop a new program, and you want it to be of the greatest  
 -possible use to the public, the best way to achieve this is to make it  
 -free software which everyone can redistribute and change under these terms.  
 -  
 -  To do so, attach the following notices to the program.  It is safest  
 -to attach them to the start of each source file to most effectively  
 -convey the exclusion of warranty; and each file should have at least  
 -the "copyright" line and a pointer to where the full notice is found.  
 -  
 -    <one line to give the program's name and a brief idea of what it does.>  
 -    Copyright (C) 19yy  <name of author>  
 -  
 -    This program is free software; you can redistribute it and/or modify  
 -    it under the terms of the GNU General Public License as published by  
 -    the Free Software Foundation; either version 2 of the License, or  
 -    (at your option) any later version.  
 -  
 -    This program is distributed in the hope that it will be useful,  
 -    but WITHOUT ANY WARRANTY; without even the implied warranty of  
 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
 -    GNU General Public License for more details.  
 -  
 -    You should have received a copy of the GNU General Public License  
 -    along with this program; if not, write to the Free Software  
 -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
 -  
 -  
 -Also add information on how to contact you by electronic and paper mail.  
 -  
 -If the program is interactive, make it output a short notice like this  
 -when it starts in an interactive mode:  
 -  
 -    Gnomovision version 69, Copyright (C) 19yy name of author  
 -    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.  
 -    This is free software, and you are welcome to redistribute it  
 -    under certain conditions; type `show c' for details.  
 -  
 -The hypothetical commands `show w' and `show c' should show the appropriate  
 -parts of the General Public License.  Of course, the commands you use may  
 -be called something other than `show w' and `show c'; they could even be  
 -mouse-clicks or menu items--whatever suits your program.  
 -  
 -You should also get your employer (if you work as a programmer) or your  
 -school, if any, to sign a "copyright disclaimer" for the program, if  
 -necessary.  Here is a sample; alter the names:  
 -  
 -  Yoyodyne, Inc., hereby disclaims all copyright interest in the program  
 -  `Gnomovision' (which makes passes at compilers) written by James Hacker.  
 -  
 -  <signature of Ty Coon>, 1 April 1989  
 -  Ty Coon, President of Vice  
 -  
 -This General Public License does not permit incorporating your program into  
 -proprietary programs.  If your program is a subroutine library, you may  
 -consider it more useful to permit linking proprietary applications with the  
 -library.  If this is what you want to do, use the GNU Library General  
 -Public License instead of this License.  
 diff -Nur smeserver-zoneminder-1.0.old/createlinks meserver-zoneminder-1.0/createlinks  
 --- smeserver-zoneminder-1.0.old/createlinks    2018-12-28 23:22:43.537000000 -0500  
 +++ meserver-zoneminder-1.0/createlinks 1969-12-31 19:00:00.000000000 -0500  
 @@ -1,25 +0,0 @@  
 -#! /usr/bin/perl -w  
 -  
 -use esmith::Build::CreateLinks qw(:all);  
 -my $event;  
 -  
 -# Runlevel init links.  
 -service_link_enhanced("zoneminder", "S99", "7");  
 -  
 -  
 -  
 -# create zoneminder-update event  
 -$event="zoneminder-update";  
 -templates2events("/etc/e-smith/sql/init/30zoneminder", $event);  
 -templates2events("/etc/httpd/conf/httpd.conf", $event);  
 -templates2events("/etc/zm/zm.conf", $event);  
 -event_link("zoneminder", $event, "10");  
 -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");  
 -  
 -# add  expand zm.conf  
 -foreach my $event (qw(post-upgrade bootstrap-console-save console-save remoteaccess-update php-update webapps-update)){  
 -   templates2events("/etc/zm/zm.conf", $event);  
 -   event_link("zoneminder", $event, "10");  
 -}  
 -  
 -  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/db/accounts/zm/type meserver-zoneminder-1.0/root/etc/e-smith/db/accounts/zm/type  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/accounts/zm/type   2018-12-28 23:22:43.537000000 -0500  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/db/accounts/zm/type        1969-12-31 19:00:00.000000000 -0500  
 @@ -1 +0,0 @@  
 -url  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/defaults/zoneminder/status meserver-zoneminder-1.0/root/etc/e-smith/db/configuration/defaults/zoneminder/status  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/defaults/zoneminder/status   2007-08-11 03:06:50.000000000 -0400  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/db/configuration/defaults/zoneminder/status        1969-12-31 19:00:00.000000000 -0500  
 @@ -1 +0,0 @@  
 -enabled  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/defaults/zoneminder/type meserver-zoneminder-1.0/root/etc/e-smith/db/configuration/defaults/zoneminder/type  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/defaults/zoneminder/type     2007-08-11 03:07:05.000000000 -0400  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/db/configuration/defaults/zoneminder/type  1969-12-31 19:00:00.000000000 -0500  
 @@ -1 +0,0 @@  
 -service  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/migrate/zoneminder meserver-zoneminder-1.0/root/etc/e-smith/db/configuration/migrate/zoneminder  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/migrate/zoneminder   2018-12-28 23:22:43.538000000 -0500  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/db/configuration/migrate/zoneminder        1969-12-31 19:00:00.000000000 -0500  
 @@ -1,9 +0,0 @@  
 -{  
 -my $zoneminder = $DB->get('zoneminder') ||  $DB->new_record('zoneminder', {type => 'service'});  
 -  
 -my $dbpass = $zoneminder->prop('DbPassword') ||  
 -       $zoneminder->set_prop('DbPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`);  
 -  
 -my $managerpass =  $zoneminder->prop('ManagerPassword') ||  
 -        $zoneminder->set_prop('ManagerPassword', `/usr/bin/openssl rand -base64 10 | /usr/bin/tr -c -d '[:alnum:]'`);  
 -}  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/events/actions/zoneminder meserver-zoneminder-1.0/root/etc/e-smith/events/actions/zoneminder  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/events/actions/zoneminder     2018-12-28 23:22:43.538000000 -0500  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/events/actions/zoneminder  1969-12-31 19:00:00.000000000 -0500  
 @@ -1,16 +0,0 @@  
 -#!/bin/bash  
 -  
 -# check if inodb is enabled for up to SME9  
 -innodb=$(/sbin/e-smith/db configuration getprop mysqld InnoDB || echo "disabled")  
 -if [[ "$innodb" != "enabled" ]]; then  
 -        /sbin/e-smith/db configuration setprop mysqld InnoDB enabled  
 -        /sbin/e-smith/expand-template /etc/my.cnf  
 -        sv t /service/mysqld  
 -        sleep 8  
 -fi  
 -  
 -# restart mysql.init  
 -/sbin/service zoneminder stop   1>/dev/null  
 -/sbin/service mysql.init restart 1>/dev/null  
 -/sbin/service zoneminder start          1>/dev/null  
 -exit 0  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder   2018-12-28 23:22:43.538000000 -0500  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder        1969-12-31 19:00:00.000000000 -0500  
 @@ -1,63 +0,0 @@  
 -{  
 -  
 -my $dbname = $zoneminder{'DbName'} || 'zm';  
 -my $dbuser = $zoneminder{'DbUser'} || 'zm';  
 -my $dbpass = $zoneminder{'DbPassword'} || 'secret';  
 -my $ManagerPassword = $zoneminder{'ManagerPassword'} || 'admin';  
 -  
 -$OUT .= << "HERE";  
 -#! /bin/sh  
 -  
 -if [ ! -d /var/lib/mysql/$dbname ]; then  
 -    mysqladmin create $dbname  
 -  
 -    if [ -e /usr/share/zoneminder/db/zm_create.sql ]; then  
 -        mysql $dbname < /usr/share/zoneminder/db/zm_create.sql  
 -    else  
 -        echo "Error: file /usr/share/zoneminder/db/zm_create.sql doesn't exists"  
 -        exit 1  
 -    fi  
 -fi  
 -  
 -  
 -  
 -/usr/bin/mysql $dbname -e 'insert into Users VALUES (NULL,"admin",password("$ManagerPassword"),"",1,"View","Edit","Edit","Edit","Edit","Edit","Edit","","")  
 - ON DUPLICATE KEY UPDATE `Password` = password("$ManagerPassword");'  
 -  
 -/usr/bin/mysql <<EOF  
 -USE mysql;  
 -  
 -REPLACE INTO user (    
 -                     host,  
 -                     user,  
 -                     password)  
 -            VALUES (  
 -                     'localhost',  
 -                     '$dbuser',  
 -                     PASSWORD ('$dbpass'));  
 -  
 -  
 -REPLACE INTO db (    
 -                   host,  
 -                   db,  
 -                   user,  
 -                   select_priv, insert_priv, update_priv, delete_priv,  
 -                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,  
 -                   grant_priv, lock_tables_priv, references_priv)  
 -          VALUES (  
 -                   'localhost',  
 -                   '$dbname',  
 -                   '$dbuser',  
 -                   'Y', 'Y', 'Y', 'Y',  
 -                   'Y', 'Y', 'Y', 'Y', 'Y',  
 -                   'N', 'Y', 'Y');  
 -  
 -  
 -FLUSH PRIVILEGES;  
 -  
 -EOF  
 -  
 -  
 -HERE  
 -}  
 -  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder      2018-12-28 23:22:43.538000000 -0500  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder   1969-12-31 19:00:00.000000000 -0500  
 @@ -1,21 +0,0 @@  
 -  
 -Alias /zm "/usr/share/zoneminder/www"  
 -<Directory "/usr/share/zoneminder/www">  
 -    Options -Indexes MultiViews FollowSymLinks  
 -    AddType application/x-httpd-php .php  
 -    AllowOverride All  
 -    Order allow,deny  
 -    Allow from all  
 -    AuthName "Zoneminder"  
 -    AuthType Basic  
 -    AuthBasicProvider external  
 -    AuthExternal pwauth  
 -    require user admin  
 -</Directory>  
 -  
 -<Directory "/usr/libexec/zoneminder/cgi-bin">  
 -    AllowOverride All  
 -    Options ExecCGI FollowSymLinks  
 -    Order allow,deny  
 -    Allow from all  
 -</Directory>  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder 2018-12-28 23:22:43.541000000 -0500  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder      1969-12-31 19:00:00.000000000 -0500  
 @@ -1 +0,0 @@  
 -ScriptAlias /cgi-bin-zm /usr/libexec/zoneminder/cgi-bin  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/05header meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/05header  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/05header     2018-03-12 22:53:40.000000000 -0400  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/05header  1969-12-31 19:00:00.000000000 -0500  
 @@ -1,11 +0,0 @@  
 -# ==========================================================================  
 -#  
 -# ZoneMinder Base Configuration, $Date$, $Revision$  
 -#  
 -# ==========================================================================  
 -#  
 -# This file is generated by 'configure'. Care should be taken if manually  
 -# editing this file as an changes may be overwritten by subsequent configuration  
 -# or installations.  
 -#  
 -  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/10paths meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/10paths  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/10paths      2018-03-12 22:54:02.000000000 -0400  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/10paths   1969-12-31 19:00:00.000000000 -0500  
 @@ -1,19 +0,0 @@  
 -# Path to installed data directory, used mostly for finding DB upgrade scripts  
 -ZM_PATH_DATA=/usr/share/zoneminder  
 -  
 -# Path to ZoneMinder binaries  
 -ZM_PATH_BIN=/usr/bin  
 -  
 -# Path to ZoneMinder libraries (none at present, for future use)  
 -ZM_PATH_LIB=/usr/lib64  
 -  
 -# Path to ZoneMinder configuration (this file only at present)  
 -ZM_PATH_CONF=/etc/zm  
 -  
 -# Path to ZoneMinder web files  
 -ZM_PATH_WEB=/usr/share/zoneminder/www  
 -  
 -# Path to ZoneMinder cgi files  
 -ZM_PATH_CGI=/usr/libexec/zoneminder/cgi-bin  
 -  
 -  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/20apache meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/20apache  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/20apache     2018-03-12 22:54:44.000000000 -0400  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/20apache  1969-12-31 19:00:00.000000000 -0500  
 @@ -1,5 +0,0 @@  
 -# Username and group that web daemon (httpd/apache) runs as  
 -ZM_WEB_USER=www  
 -ZM_WEB_GROUP=www  
 -  
 -  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/30mysql meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/30mysql  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/30mysql      2018-03-12 23:22:19.000000000 -0400  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/30mysql   1969-12-31 19:00:00.000000000 -0500  
 @@ -1,30 +0,0 @@  
 -# ZoneMinder database type: so far only mysql is supported  
 -ZM_DB_TYPE=mysql  
 -  
 -# ZoneMinder database hostname or ip address and optionally port or unix socket  
 -# Acceptable formats include hostname[:port], ip_address[:port], or localhost:unix_socket  
 -{  
 -    my $zmhost= ${'zoneminder'}{'DbHost'} || "localhost";  
 -    $OUT = "ZM_DB_HOST=$zmhost";  
 -  
 -}  
 -  
 -# ZoneMinder database name  
 -{  
 -  
 -    my $zm= ${'zoneminder'}{'DbName'} || "zm";  
 -    $OUT = "ZM_DB_NAME=$zm";  
 -  
 -}  
 -# ZoneMinder database user  
 -{  
 -    my $zmuser= ${'zoneminder'}{'DbUser'} || "zm";  
 -    $OUT = "ZM_DB_USER=$zmuser";  
 -}  
 -  
 -# ZoneMinder database password  
 -{  
 -    my $zmpass= ${'zoneminder'}{'DbPassword'} || "";  
 -        $OUT = "ZM_DB_PASS=$zmpass"  
 -  
 -}  
 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/50multihost meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/50multihost  
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/zm/zm.conf/50multihost  2018-03-12 23:24:04.000000000 -0400  
 +++ meserver-zoneminder-1.0/root/etc/e-smith/templates/etc/zm/zm.conf/50multihost       1969-12-31 19:00:00.000000000 -0500  
 @@ -1,7 +0,0 @@  
 -# Do NOT set ZM_SERVER_HOST if you are not using Multi-Server  
 -# You have been warned  
 -#  
 -# The name specified here must have a corresponding entry  
 -# in the Servers tab under Options  
 -ZM_SERVER_HOST={${'freepbx'}{'ZM_SERVER_HOST'};}  
 -  

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed