Hello community,
here is the log from the commit of package php5-pear-Horde_Scheduler for openSUSE:Factory checked in at 2013-01-02 13:00:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Scheduler (Old)
and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Scheduler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5-pear-Horde_Scheduler", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5-pear-Horde_Scheduler/php5-pear-Horde_Scheduler.changes 2012-01-24 12:21:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Scheduler.new/php5-pear-Horde_Scheduler.changes 2013-01-02 13:00:28.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 20 23:05:48 UTC 2012 -
+
+- Version 2.0.0
+- [jan] Allow to autoload scheduler classes (Bug #10783).
+
+
+-------------------------------------------------------------------
Old:
----
Horde_Scheduler-1.0.1.tgz
New:
----
Horde_Scheduler-2.0.0.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5-pear-Horde_Scheduler.spec ++++++
--- /var/tmp/diff_new_pack.IMQ281/_old 2013-01-02 13:00:29.000000000 +0100
+++ /var/tmp/diff_new_pack.IMQ281/_new 2013-01-02 13:00:29.000000000 +0100
@@ -24,27 +24,29 @@
Group: Development/Libraries/PHP
Name: php5-pear-Horde_Scheduler
-Version: 1.0.1
+Version: 2.0.0
Release: 0
Source0: http://pear.horde.org/get/Horde_Scheduler-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://pear.horde.org/package/Horde_Scheduler
-BuildRequires: php5-pear >= 1.4.7
-BuildRequires: php5-pear-Horde_Core
-BuildRequires: php5-pear-Horde_Util
-BuildRequires: php5-pear-Horde_Vfs
+Requires: php >= 5.3.3
+BuildRequires: php >= 5.3.3
+BuildRequires: php-pear >= 1.7.0
+BuildRequires: php5-pear-Horde_Core >= 2.0.0
+BuildRequires: php5-pear-Horde_Util >= 2.0.0
+BuildRequires: php5-pear-Horde_Vfs >= 2.0.0
BuildRequires: php5-pear-channel-horde
Requires: php5-pear-channel-horde
BuildArch: noarch
%define pear_name Horde_Scheduler
%define pear_sname horde_scheduler
# Fix for renaming (package convention)
-Provides: php5-pear-%{pear_sname} = %{version}
-Provides: php-pear-%{pear_sname} = %{version}
Provides: pear-%{pear_sname} = %{version}
-Obsoletes: php5-pear-%{pear_sname} < %{version}
-Obsoletes: php-pear-%{pear_sname} < %{version}
+Provides: php-pear-%{pear_sname} = %{version}
+Provides: php5-pear-%{pear_sname} = %{version}
Obsoletes: pear-%{pear_sname} < %{version}
+Obsoletes: php-pear-%{pear_sname} < %{version}
+Obsoletes: php5-pear-%{pear_sname} < %{version}
%description
* First stable release for Horde 4.
++++++ Horde_Scheduler-1.0.1.tgz -> Horde_Scheduler-2.0.0.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scheduler-1.0.1/doc/Horde/Scheduler/COPYING new/Horde_Scheduler-1.0.1/doc/Horde/Scheduler/COPYING
--- old/Horde_Scheduler-1.0.1/doc/Horde/Scheduler/COPYING 2011-11-22 21:08:14.000000000 +0100
+++ new/Horde_Scheduler-1.0.1/doc/Horde/Scheduler/COPYING 1970-01-01 01:00:00.000000000 +0100
@@ -1,458 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-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 and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, 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 library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete 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 distribute a copy of this License along with the
-Library.
-
- 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 Library or any portion
-of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-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 Library, 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 Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you 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.
-
- If distribution of 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 satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be 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.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library 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.
-
- 9. 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 Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-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 with
-this License.
-
- 11. 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 Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library 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 Library.
-
-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.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library 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.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser 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 Library
-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 Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-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
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. 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 LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron/Date.php new/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron/Date.php
--- old/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron/Date.php 2011-11-22 21:08:14.000000000 +0100
+++ new/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron/Date.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,307 +0,0 @@
-
- * @author Chuck Hagenbuch
- * @package Scheduler
- */
-class Horde_Scheduler_Cron_Date
-{
- public $legalDays = array('MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT', 'SUN');
-
- public $sec;
- public $min;
- public $hour;
- public $day;
- public $month;
-
- public function __construct($raw)
- {
- $this->parse(Horde_String::upper($raw));
- }
-
- public function nowMatches()
- {
- return $this->scheduledAt(time());
- }
-
- public function scheduledAt($ts = null)
- {
- if ($ts === null) {
- $ts = time();
- }
- return ($this->monthMatches($ts) &&
- $this->monthMatches($ts) &&
- $this->dayMatches($ts) &&
- $this->hourMatches($ts) &&
- $this->minMatches($ts) &&
- $this->secMatches($ts));
- }
-
- public function monthMatches($ts)
- {
- if ($this->month == '*') {
- return true;
- }
-
- $currentmonth = '-' . date('n', $ts) . '-';
-
- return (bool)strpos($this->month, $currentmonth);
- }
-
- public function dayMatches($ts)
- {
- if (!empty($this->day['value']) && $this->day['value'] == '*') {
- return true;
- }
-
- $currentdaynum = '-' . date('j', $ts) . '-';
- $currentdaytxt = Horde_String::upper(date('D'));
-
- foreach ($this->day as $day) {
- if (@strpos($day['not'], $currentdaytxt) === false) {
- $v1 = (@strpos($day['value'], $currentdaynum) !== false);
- $v2 = (@strpos($day['and'], $currentdaytxt) !== false);
-
- if (!empty($day['and']) && ($v1 && $v2)) {
- return true;
- } elseif (empty($day['and']) && $v1) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public function hourMatches($ts)
- {
- if ($this->hour == '*') {
- return true;
- }
-
- $currenthour = '-' . date('G', $ts) . '-';
-
- return (strpos($this->hour, $currenthour) !== false);
- }
-
- public function minMatches($ts)
- {
- if ($this->min == '*') {
- return true;
- }
-
- $currentmin = '-' . intval(date('i', $ts)) . '-';
-
- return (strpos($this->min, $currentmin) !== false);
- }
-
- public function secMatches($ts)
- {
- if ($this->sec == '*') {
- return true;
- }
-
- $currentsec = '-' . intval(date('s', $ts)) . '-';
-
- return (strpos($this->sec, $currentsec) !== false);
- }
-
- public function parse($str)
- {
- $s = array();
-
- list($s['sec'], $s['min'], $s['hour'], $s['day'], $s['month']) = preg_split('|[\n\t ]+|', $str);
-
- foreach ($s as $k => $v) {
- if (strpos($v, '*') !== false) {
- $s[$k] = array('*');
- } elseif (!$this->generallyDecentSyntax($v)) {
- die("Illegal syntax in '$v'\n");
- } else {
- $s[$k] = explode(',', $s[$k]);
- }
- }
-
- if ($s['sec'][0] == '*') {
- $this->sec = '*';
- } else {
- for ($i = 0; $i < sizeof($s['sec']); $i++) {
- if ($this->isRange($s['sec'][$i])) {
- $s['sec'][$i] = $this->expandRange($this->rangeVals($s['sec'][$i]));
- }
- }
- $this->sec = '-' . join('-', $s['sec']) . '-';
- }
-
- if ($s['min'][0] == '*') {
- $this->min = '*';
- } else {
- for ($i = 0; $i < sizeof($s['min']); $i++) {
- if ($this->isRange($s['min'][$i])) {
- $s['min'][$i] = $this->expandRange($this->rangeVals($s['min'][$i]));
- }
- }
- $this->min = '-' . join('-', $s['min']) . '-';
- }
-
- if ($s['hour'][0] == '*') {
- $this->hour = '*';
- } else {
- for ($i = 0; $i < sizeof($s['hour']); $i++) {
- if ($this->isRange($s['hour'][$i])) {
- $s['hour'][$i] = $this->expandRange($this->rangeVals($s['hour'][$i]));
- }
- }
- $this->hour = '-' . join('-', $s['hour']) . '-';
- }
-
- if ($s['day'][0] == '*') {
- $this->day = '*';
- } else {
- for ($i = 0; $i < sizeof($s['day']); $i++) {
- $tmp = array();
- if (($char = $this->isCond($s['day'][$i])) !== false) {
- if ($char == '&') {
- list($tmp['value'], $tmp['and']) = explode($char, $s['day'][$i]);
- if ($this->isRange($tmp['and'])) {
- $tmp['and'] = $this->expandRange($this->rangeVals($tmp['and']));
- }
- } else {
- list($tmp['value'], $tmp['not']) = explode($char, $s['day'][$i]);
- if ($this->isRange($tmp['not'])) {
- $tmp['not'] = $this->expandRange($this->rangeVals($tmp['not']));
- }
- }
- } else {
- $tmp = array('value' => $s['day'][$i]);
- }
-
- $s['day'][$i] = $tmp;
-
- if ($this->isRange($s['day'][$i]['value'])) {
- $s['day'][$i]['value'] = $this->expandRange($this->rangeVals($s['day'][$i]['value']));
- }
- }
-
- $this->day = $s['day'];
- }
-
- if ($s['month'][0] == '*') {
- $this->month = '*';
- } else {
- for ($i = 0; $i < sizeof($s['month']); $i++) {
- if ($this->isRange($s['month'][$i])) {
- $s['month'][$i] = $this->expandRange($this->rangeVals($s['month'][$i]));
- }
- }
- $this->month = '-' . join('-', $s['month']) . '-';
- }
- }
-
- public function isCond($s)
- {
- if (strpos($s, '&') !== false) {
- return '&';
- } elseif (strpos($s, '!') !== false) {
- return '!';
- } else {
- return false;
- }
- }
-
- public function isRange($s)
- {
- return preg_match('/^\w+\-\w+/', $s);
- }
-
- public function isCondRange($s)
- {
- return ($this->isCond($s) && $this->isRange($s));
- }
-
- public function isCondVal($s)
- {
- return ($this->isCond($s) && !$this->isRange($s));
- }
-
- public function rangeVals($s)
- {
- return explode('-', $s);
- }
-
- public function expandRange($l, $h = '')
- {
- // Expand range from 1-5 -> '-1-2-3-4-5-'.
- if (is_array($l)) {
- $h = $l[1];
- $l = $l[0];
- }
-
- if ($this->isDigit($l)) {
- if (!$this->isDigit($h)) {
- die("Invalid value '$h' in range '$l-$h'");
- }
-
- // Currently there is no possible reason to need to do a
- // range beyond 0-59 for anything.
- if ($l < 0) {
- $l = 0;
- } elseif ($l > 59) {
- $l = 59;
- }
-
- if ($h < 0) {
- $h = 0;
- } elseif ($h > 59) {
- $h = 59;
- }
-
- if ($l > $h) {
- $tmp = $l;
- $l = $h;
- $h = $tmp;
- unset($tmp);
- }
-
- // For some reason range() doesn't work w/o the explicit
- // intval() calls.
- return '-' . join('-', range(intval($l), intval($h))) . '-';
- } else {
- // Invalid.
- die("Invalid value '$l' in range '$l-$h'");
- }
- }
-
- public function dayValue($s)
- {
- for ($i = 0; $i < count($this->legalDays); $i++) {
- if ($this->legalDays[$i] == $s) {
- return $i;
- }
- }
-
- return -1;
- }
-
- public function isDigit($s)
- {
- return preg_match('/^\d+$/', $s);
- }
-
- public function isAlpha($s)
- {
- return $this->isLegalDay($s);
- }
-
- public function isLegalDay($s)
- {
- return in_array($s, $this->legalDays);
- }
-
- public function generallyDecentSyntax($s)
- {
- return ($s == '*' ||
- preg_match('/^\d+(-\d+)?([!&][A-Z\*]+(-[A-Z\*]+)?)?(,\d+(-\d+)?([!&][A-Z\*]+(-[A-Z\*]+)?)?)*$/', $s));
- }
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron.php new/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron.php
--- old/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron.php 2011-11-22 21:08:14.000000000 +0100
+++ new/Horde_Scheduler-1.0.1/lib/Horde/Scheduler/Cron.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,126 +0,0 @@
-addTask('perl somescript.pl', '0 0,5,10,15,20,25,30,35,40,45,50,55 * * *');
- *
- * // Run this command midnight of the first Friday of odd numbered months.
- * $cron->addTask('php -q somescript.php', '0 0 0 1-7&Fri 1,3,5,7,9,11');
- *
- * // Also run this command midnight of the second Thursday and Saturday of the even numbered months.
- * $cron->addTask('php -q somescript.php', '0 0 0 8-15&Thu,8-15&Sat 2,4,6,8,10,12');
- *
- * $cron->run();
- *
- * @author Ryan Flynn
- * @author Chuck Hagenbuch
- * @package Scheduler
- */
-class Horde_Scheduler_Cron extends Horde_Scheduler
-{
- /**
- * TODO
- *
- * @var array
- */
- protected $_tasks = array();
-
- /**
- * Every time a task is added it will get a fresh uid even if
- * immediately removed.
- *
- * @var integer
- */
- var $_counter = 1;
-
- /**
- */
- public function addTask($cmd, $rules)
- {
- $ds = new Horde_Scheduler_Cron_Date($rules);
-
- $this->_counter++;
-
- $this->_tasks[] =
- array(
- 'uid' => $this->_counter,
- 'rules' => $ds,
- 'cmd' => $cmd
- );
-
- return $this->_counter;
- }
-
- /**
- */
- public function removeTask($uid)
- {
- $count = count($this->_tasks);
- for ($i = 0; $i < $count; $i++) {
- if ($this->_tasks['uid'] == $uid) {
- $found = $i;
- array_splice($this->_tasks, $i);
- return $i;
- }
- }
-
- return 0;
- }
-
- /**
- */
- public function run()
- {
- if (!count($this->_tasks)) {
- exit("horde-crond: Nothing to schedule; exiting.\n");
- }
-
- while (true) {
- $t = time();
-
- // Check each task.
- foreach ($this->_tasks as $task) {
- if ($task['rules']->nowMatches()) {
- $this->runcmd($task);
- }
- }
-
- // Wait until the next second.
- while (time() == $t) {
- $this->sleep(100000);
- }
- }
- }
-
- /**
- */
- public function runcmd(&$task)
- {
- Horde::logMessage('runcmd(): ' . $task['cmd'] . ' run by ' . $task['uid'], 'INFO');
- return shell_exec($task['cmd']);
- }
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Horde_Scheduler-1.0.1/lib/Horde/Scheduler.php new/Horde_Scheduler-1.0.1/lib/Horde/Scheduler.php
--- old/Horde_Scheduler-1.0.1/lib/Horde/Scheduler.php 2011-11-22 21:08:14.000000000 +0100
+++ new/Horde_Scheduler-1.0.1/lib/Horde/Scheduler.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,138 +0,0 @@
-_sleep = 'sleep';
- $this->_sleep_adj = 1000000;
- } else {
- $this->_sleep = 'usleep';
- $this->_sleep_adj = 1;
- }
- }
-
- /**
- * Main loop/action function.
- */
- public function run()
- {
- }
-
- /**
- * Preserve the internal state of the scheduler object that we are
- * passed, and save it to the Horde VFS backend. Horde_Scheduler
- * objects should define __sleep() and __wakeup() serialization
- * callbacks for anything that needs to be done at object
- * serialization or deserialization - handling database
- * connections, etc.
- *
- * @param string $id An id to uniquely identify this scheduler from
- * others of the same class.
- *
- * @return boolean Success result.
- */
- public function serialize($id = '')
- {
- try {
- $vfs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Vfs')->create();
- $vfs->writeData('.horde/scheduler', Horde_String::lower(get_class($this)) . $id, serialize($this), true);
- return true;
- } catch (Horde_Vfs_Exception $e) {
- Horde::logMessage($e, 'ERR');
- return false;
- }
- }
-
- /**
- * Restore a Horde_Scheduler object from the cache.
- *
- * @param string $class The name of the object to restore.
- * @param string $id An id to uniquely identify this
- * scheduler from others of the same class.
- * @param boolean $autosave Automatically store (serialize) the returned
- * object at script shutdown.
- *
- * @see Horde_Scheduler::serialize()
- */
- public function unserialize($class, $id = '', $autosave = true)
- {
- /* Need a lowercase version of the classname, and a default instance of
- * the scheduler object in case we can't retrieve one. */
- $scheduler = new $class;
-
- try {
- $vfs = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Vfs')->create();
- $data = $vfs->read('.horde/scheduler', $class . $id);
- if ($tmp = @unserialize($data)) {
- $scheduler = $tmp;
- }
- } catch (Horde_Vfs_Exception $e) {
- Horde::logMessage($e, 'ERR');
- }
-
- if ($autosave) {
- register_shutdown_function(array($scheduler, 'serialize'));
- }
-
- return $scheduler;
- }
-
- /**
- * Platform-independant sleep $msec microseconds.
- *
- * @param integer $msec Microseconds to sleep.
- */
- public function sleep($msec)
- {
- call_user_func($this->_sleep, $msec / $this->_sleep_adj);
- }
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.xml new/package.xml
--- old/package.xml 2011-11-22 21:08:14.000000000 +0100
+++ new/package.xml 2012-10-30 19:45:38.000000000 +0100
@@ -10,10 +10,10 @@
<email>chuck@horde.org</email>
<active>yes</active>
</lead>
- <date>2011-11-22</date>
- <time>21:08:14</time>
+ <date>2012-10-30</date>
+ <time>19:45:38</time>
<version>
- <release>1.0.1</release>
+ <release>2.0.0</release>
<api>1.0.0</api>
</version>
<stability>
@@ -22,7 +22,7 @@
</stability>
<license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
<notes>
-* [jan] Allow to autoload scheduler classes (Bug #10783).
+* First stable release for Horde 5.
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@@ -35,7 +35,7 @@
<dependencies>
<required>
<php>
- <min>5.2.0</min>
+ <min>5.3.0</min>
</php>
<pearinstaller>
<min>1.7.0</min>
@@ -43,23 +43,23 @@
<package>
<name>Horde_Core</name>
<channel>pear.horde.org</channel>
- <min>1.0.0beta1</min>
- <max>2.0.0</max>
- <exclude>2.0.0</exclude>
+ <min>2.0.0</min>
+ <max>3.0.0alpha1</max>
+ <exclude>3.0.0alpha1</exclude>
</package>
<package>
<name>Horde_Util</name>
<channel>pear.horde.org</channel>
- <min>1.0.0beta1</min>
- <max>2.0.0</max>
- <exclude>2.0.0</exclude>
+ <min>2.0.0</min>
+ <max>3.0.0alpha1</max>
+ <exclude>3.0.0alpha1</exclude>
</package>
<package>
<name>Horde_Vfs</name>
<channel>pear.horde.org</channel>
- <min>1.0.0beta1</min>
- <max>2.0.0</max>
- <exclude>2.0.0</exclude>
+ <min>2.0.0</min>
+ <max>3.0.0alpha1</max>
+ <exclude>3.0.0alpha1</exclude>
</package>
</required>
</dependencies>
@@ -134,5 +134,50 @@
* [jan] Allow to autoload scheduler classes (Bug #10783).
</notes>
</release>
+ <release>
+ <version>
+ <release>2.0.0alpha1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>alpha</release>
+ <api>stable</api>
+ </stability>
+ <date>2012-07-05</date>
+ <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+ <notes>
+* First alpha release for Horde 5.
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>2.0.0beta1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>stable</api>
+ </stability>
+ <date>2012-07-19</date>
+ <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+ <notes>
+* First beta release for Horde 5.
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>2.0.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <date>2012-10-30</date>
+ <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
+ <notes>
+* First stable release for Horde 5.
+ </notes>
+ </release>
</changelog>
</package>
N§²æìržyéZ)z{.±ç(húéì¹»®&Þ¢§²ë¢ž¢¶v+b¢v¥rŠjwlzf¢^ˬyÊ&+~
éi¢§²ë¢ž