16476497 Upgrade ModSecurity to version 2.7.2 s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 07 May 2013 00:46:12 -0700
branchs11-update
changeset 2599 1f79ee48ae83
parent 2598 632ab7e51cae
child 2600 9fb5ff186455
16476497 Upgrade ModSecurity to version 2.7.2 15802175 problem in UTILITY/APACHE
components/apache2-modules/mod_security2/Makefile
components/apache2-modules/mod_security2/apache-security.p5m
components/apache2-modules/mod_security2/patches/configure.in.patch
components/apache2-modules/mod_security2/patches/fix_lua.patch
components/apache2-modules/mod_security2/patches/security2-conf.patch
components/apache2-modules/mod_security2/patches/tests.patch
components/apache2-modules/mod_security2/security2.conf
components/apache2-modules/mod_security2/security2.license
--- a/components/apache2-modules/mod_security2/Makefile	Mon May 06 23:01:21 2013 -0700
+++ b/components/apache2-modules/mod_security2/Makefile	Tue May 07 00:46:12 2013 -0700
@@ -18,19 +18,20 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mod_security2
-COMPONENT_VERSION=	2.5.9
+COMPONENT_VERSION=	2.7.2
 COMPONENT_PROJECT_URL=	http://www.modsecurity.org/
 COMPONENT_SRC_NAME=	modsecurity-apache
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:02352221ea268f8ae9aae5b84507f51eba2a67c0f7d2efd5cc88e85f1f394056
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
+    sha256:2fa43264e3aa024d29869eada3171a2aba19fc05180860fd84c7a6ebfd1f2854
+COMPONENT_ARCHIVE_URL= \
+    $(COMPONENT_PROJECT_URL)tarball/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
 include ../../../make-rules/prep.mk
@@ -42,25 +43,17 @@
 APXS.32=	$(APACHE_USR_PREFIX)/bin/apxs
 APXS.64=	$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
 
-CONFIGURE_OPTIONS +=	LTFLAGS="--silent --tag=CC"
+CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS += LTFLAGS="--silent --tag=CC"
 CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS))
 CONFIGURE_OPTIONS += --with-apr=`$(APXS.$(BITS)) -q APR_CONFIG`
 CONFIGURE_OPTIONS += --with-apu=`$(APXS.$(BITS)) -q APU_CONFIG`
 
-# Need to get right version of C compiler and GNU sed first.
-PATH=$(SPRO_VROOT)/bin:/usr/gnu/bin:/usr/bin
-
-# Some patches need configure script re-creation.
-COMPONENT_PREP_ACTION = (cd $(@D)/apache2; autoconf)
-
-CONFIGURE_SCRIPT = $(SOURCE_DIR)/apache2/configure
-
-# Header files are missing during build without cloning.
-COMPONENT_PRE_BUILD_ACTION += ($(CLONEY) $(SOURCE_DIR)/apache2 $(@D));
+COMPONENT_TEST_ARGS += CFLAGS="$(CFLAGS) -DMSC_TEST"
 
 build: $(BUILD_32_and_64)
 
-test: $(NO_TESTS)
+test: $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/apache2-modules/mod_security2/apache-security.p5m	Mon May 06 23:01:21 2013 -0700
+++ b/components/apache2-modules/mod_security2/apache-security.p5m	Tue May 07 00:46:12 2013 -0700
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="Mod Security plugin for Apache Web Server Version 2.2"
 set name=com.oracle.info.description value="the Mod Security plugin for Apache Web Server V2.2"
+set name=com.oracle.info.tpno value=12876
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -36,7 +37,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
-license security2.license license="GPLv2"
+license LICENSE license="Apache v2.0"
 
 dir path=etc
 dir path=etc/apache2
@@ -47,6 +48,6 @@
 dir path=usr/apache2/2.2
 dir path=usr/apache2/2.2/libexec
 dir path=usr/apache2/2.2/libexec/$(MACH64)
-file security2.conf path=etc/apache2/2.2/samples-conf.d/security2.conf
-file build/$(MACH32)/.libs/mod_security2.so path=usr/apache2/2.2/libexec/mod_security2.so
-file build/$(MACH64)/.libs/mod_security2.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_security2.so
+file modsecurity.conf-recommended path=etc/apache2/2.2/samples-conf.d/security2.conf
+file build/$(MACH32)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/mod_security2.so
+file build/$(MACH64)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_security2.so
--- a/components/apache2-modules/mod_security2/patches/configure.in.patch	Mon May 06 23:01:21 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- modsecurity-apache_2.5.9/apache2/configure.in.orig	Fri May  6 03:57:25 2011
-+++ modsecurity-apache_2.5.9/apache2/configure.in	Fri May  6 03:59:43 2011
[email protected]@ -302,9 +302,9 @@
- ### Build *EXTRA_CFLAGS vars
- 
- if test -n "$debug_mem"; then
--  EXTRA_CFLAGS="-O0 -g -Wall"
-+  EXTRA_CFLAGS="-O0 -g"
- else
--  EXTRA_CFLAGS="-O2 -g -Wall $strict_compile"
-+  EXTRA_CFLAGS="-O2 -g $strict_compile"
- fi
- MODSEC_EXTRA_CFLAGS="$debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api"
- 
[email protected]@ -311,11 +311,11 @@
- APXS_WRAPPER=build/apxs-wrapper
- APXS_EXTRA_CFLAGS=""
- for f in $EXTRA_CFLAGS; do
--    APXS_EXTRA_CFLAGS="$APXS_EXTRA_CFLAGS -Wc,$f"
-+    APXS_EXTRA_CFLAGS="$APXS_EXTRA_CFLAGS"
- done;
- MODSEC_APXS_EXTRA_CFLAGS=""
- for f in $MODSEC_EXTRA_CFLAGS; do
--    MODSEC_APXS_EXTRA_CFLAGS="$MODSEC_APXS_EXTRA_CFLAGS -Wc,$f"
-+    MODSEC_APXS_EXTRA_CFLAGS="$MODSEC_APXS_EXTRA_CFLAGS"
- done;
- 
- ### Substitute the vars
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_security2/patches/fix_lua.patch	Tue May 07 00:46:12 2013 -0700
@@ -0,0 +1,84 @@
+https://github.com/SpiderLabs/ModSecurity/commit/452177c437cdefeb6e8b773b5865af356a1c9e2d.patch
+
+From 452177c437cdefeb6e8b773b5865af356a1c9e2d Mon Sep 17 00:00:00 2001
+From: Breno Silva <[email protected]>
+Date: Wed, 30 Jan 2013 22:04:21 -0400
+Subject: [PATCH] ModSecurity: fixed compiling with lua 5.2
+
+---
+ apache2/mod_security2.c |    4 ++++
+ apache2/msc_lua.c       |   17 +++++++++++++++++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c
+index 6b41088..849ca9d 100644
+--- a/apache2/mod_security2.c
++++ b/apache2/mod_security2.c
[email protected]@ -440,7 +440,11 @@ static modsec_rec *create_tx_context(request_rec *r) {
+ 
+ #if defined(WITH_LUA)
+     #ifdef CACHE_LUA
++#if LUA_VERSION_NUM > 501
++    msr->L = luaL_newstate();
++#else
+     msr->L = lua_open();
++#endif
+     luaL_openlibs(msr->L);
+     #endif
+ #endif
+diff --git a/apache2/msc_lua.c b/apache2/msc_lua.c
+index 4abf7e5..6450e77 100644
+--- a/apache2/msc_lua.c
++++ b/apache2/msc_lua.c
[email protected]@ -94,7 +94,11 @@ char *lua_compile(msc_script **script, const char *filename, apr_pool_t *pool) {
+     msc_lua_dumpw_t dump;
+ 
+     /* Initialise state. */
++#if LUA_VERSION_NUM > 501
++    L = luaL_newstate();
++#else
+     L = lua_open();
++#endif
+     luaL_openlibs(L);
+ 
+     /* Find script. */
[email protected]@ -158,7 +162,11 @@ static apr_array_header_t *resolve_tfns(lua_State *L, int idx, modsec_rec *msr,
+     if (lua_isuserdata(L, idx) || lua_isnoneornil(L, idx)) { /* No second parameter */
+         return tfn_arr;
+     } else if (lua_istable(L, idx)) { /* Is the second parameter an array? */
++#if LUA_VERSION_NUM > 501
++        int i, n = lua_rawlen(L, idx);
++#else
+         int i, n = lua_objlen(L, idx);
++#endif
+ 
+         for(i = 1; i <= n; i++) {
+             lua_rawgeti(L, idx, i);
[email protected]@ -415,7 +423,11 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul
+         lua_pop(L, rc);
+ #else
+     /* Create new state. */
++#if LUA_VERSION_NUM > 501
++    L = luaL_newstate();
++#else
+     L = lua_open();
++#endif
+     luaL_openlibs(L);
+ #endif
+ 
[email protected]@ -433,7 +445,12 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul
+     }
+ 
+     /* Register functions. */
++#if LUA_VERSION_NUM > 501
++    luaL_setfuncs(L,mylib,0);
++    lua_setglobal(L,"m");
++#else
+     luaL_register(L, "m", mylib);
++#endif
+ 
+     rc = lua_restore(L, script);
+     if (rc) {
+-- 
+1.7.10
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_security2/patches/security2-conf.patch	Tue May 07 00:46:12 2013 -0700
@@ -0,0 +1,71 @@
+Customize conf file for Solaris.
+
+--- modsecurity-apache_2.7.2/modsecurity.conf-recommended
++++ modsecurity-apache_2.7.2/modsecurity.conf-recommended
[email protected]@ -1,3 +1,13 @@
++
++<IfDefine 64bit>
++LoadModule security2_module libexec/64/mod_security2.so
++</IfDefine>
++<IfDefine !64bit>
++LoadModule security2_module libexec/mod_security2.so
++</IfDefine>
++
++<IfModule mod_security2.c>
++
+ # -- Rule engine initialization ----------------------------------------------
+ 
+ # Enable ModSecurity, attaching it to every transaction. Use detection
[email protected]@ -129,13 +139,13 @@
+ # This default setting is chosen due to all systems have /tmp available however, 
+ # this is less than ideal. It is recommended that you specify a location that's private.
+ #
+-SecTmpDir /tmp/
++SecTmpDir /var/apache2/2.2/modsec/tmp/
+ 
+ # The location where ModSecurity will keep its persistent data.  This default setting 
+ # is chosen due to all systems have /tmp available however, it
+ # too should be updated to a place that other users can't access.
+ #
+-SecDataDir /tmp/
++SecDataDir /var/apache2/2.2/modsec/tmp/
+ 
+ 
+ # -- File uploads handling configuration -------------------------------------
[email protected]@ -144,7 +154,7 @@
+ # location must be private to ModSecurity. You don't want other users on
+ # the server to access the files, do you?
+ #
+-#SecUploadDir /opt/modsecurity/var/upload/
++#SecUploadDir /var/apache2/2.2/modsec/upload/
+ 
+ # By default, only keep the files that were determined to be unusual
+ # in some way (by an external inspection script). For this to work you
[email protected]@ -164,7 +174,7 @@
+ # The default debug log configuration is to duplicate the error, warning
+ # and notice messages from the error log.
+ #
+-#SecDebugLog /opt/modsecurity/var/log/debug.log
++#SecDebugLog /var/apache2/2.2/logs/modsec_debug.log
+ #SecDebugLogLevel 3
+ 
+ 
[email protected]@ -184,10 +194,10 @@
+ # assumes that you will use the audit log only ocassionally.
+ #
+ SecAuditLogType Serial
+-SecAuditLog /var/log/modsec_audit.log
++SecAuditLog /var/apache2/2.2/logs/modsec_audit.log
+ 
+ # Specify the path for concurrent audit logging.
+-#SecAuditLogStorageDir /opt/modsecurity/var/audit/
++#SecAuditLogStorageDir /var/apache2/2.2/modsec/audit/
+ 
+ 
+ # -- Miscellaneous -----------------------------------------------------------
[email protected]@ -211,3 +221,5 @@
+ #
+ #SecUnicodeCodePage 20127
+ #SecUnicodeMapFile unicode.mapping
++
++</IfModule>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_security2/patches/tests.patch	Tue May 07 00:46:12 2013 -0700
@@ -0,0 +1,26 @@
+Allows to run test suite when it's configured and build outside of
+source directory.
+
+--- modsecurity-apache_2.7.2/tests/run-unit-tests.pl.in	Tue Jan 22 18:47:08 2013
++++ modsecurity-apache_2.7.2/tests/run-unit-tests.pl.in	Wed Mar 13 08:23:44 2013
[email protected]@ -16,7 +16,7 @@
+ my @TYPES = qw(tfn op action);
+ my $TEST = "./msc_test";
+ my $SCRIPT = basename($0);
+-my $SCRIPTDIR = dirname($0);
++my $SCRIPTDIR = "@[email protected]";
+ my $PASSED = 0;
+ my $TOTAL = 0;
+ my $DEBUG = $ENV{MSC_TEST_DEBUG} || 0;
[email protected]@ -85,7 +85,10 @@
+             $param = escape($t{output});
+         }
+         elsif ($t{type} eq "op") {
+-            $param = escape($t{param});
++            $param = escape($t{param}); 
++            if ($t{name} eq "pmFromFile") {
++                $param = "$SCRIPTDIR/$param";
++            }
+         }
+         elsif ($t{type} eq "action") {
+             $param = escape($t{param});
--- a/components/apache2-modules/mod_security2/security2.conf	Mon May 06 23:01:21 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-
-<IfDefine 64bit>
-LoadModule security2_module libexec/64/mod_security2.so
-</IfDefine>
-<IfDefine !64bit>
-LoadModule security2_module libexec/mod_security2.so
-</IfDefine>
-
-<IfModule mod_security2.c>
-
-# Basic configuration options
-SecRuleEngine On
-SecRequestBodyAccess On
-SecResponseBodyAccess Off
-
-# Handling of file uploads
-# TODO Choose a folder private to Apache.
-# SecUploadDir /opt/apache-frontend/tmp/
-SecUploadKeepFiles Off
-
-# Debug log
-SecDebugLog /var/apache2/2.2/logs/modsec_debug.log
-SecDebugLogLevel 0
-
-# Serial audit log
-SecAuditEngine RelevantOnly
-SecAuditLogRelevantStatus ^5
-SecAuditLogParts ABIFHZ
-SecAuditLogType Serial
-SecAuditLog /var/apache2/2.2/logs/modsec_audit.log
-
-# Maximum request body size we will
-# accept for buffering
-SecRequestBodyLimit 131072
-
-# Store up to 128 KB in memory
-SecRequestBodyInMemoryLimit 131072
-
-# Buffer response bodies of up to
-# 512 KB in length
-SecResponseBodyLimit 524288
-
-# Verify that we've correctly processed the request body.
-# As a rule of thumb, when failing to process a request body
-# you should reject the request when deployed in blocking mode
-# or log a high-severity alert when deployed in detection-only mode.
-SecRule REQBODY_PROCESSOR_ERROR "[email protected] 0" "phase:2,t:none,log,deny,msg:'Failed to parse request body.',severity:2"
-
-# By default be strict with what we accept in the multipart/form-data
-# request body. If the rule below proves to be too strict for your
-# environment consider changing it to detection-only. You are encouraged
-# _not_ to remove it altogether.
-SecRule MULTIPART_STRICT_ERROR "[email protected] 0" "phase:2,t:none,log,deny,msg:'Multipart request body failed strict validation: PE %{REQBODY_PROCESSOR_ERROR}, BQ %{MULTIPART_BOUNDARY_QUOTED}, BW %{MULTIPART_BOUNDARY_WHITESPACE}, DB %{MULTIPART_DATA_BEFORE}, DA %{MULTIPART_DATA_AFTER}, HF %{MULTIPART_HEADER_FOLDING}, LF %{MULTIPART_LF_LINE}, SM %{MULTIPART_SEMICOLON_MISSING}'"
-
-# Did we see anything that might be a boundary?
-SecRule MULTIPART_UNMATCHED_BOUNDARY "[email protected] 0" "phase:2,t:none,log,deny,msg:'Multipart parser detected a possible unmatched boundary.'"
-
-SecRule REQUEST_URI "sfw" "deny"
-</IfModule>
--- a/components/apache2-modules/mod_security2/security2.license	Mon May 06 23:01:21 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       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
-