[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, debian, updated. f89fb2c00b1a2606035e5cd0e35b4ebe99f049ac
Javier Fernandez-Sanguino
jfs at debian.org
Wed Aug 29 12:57:37 UTC 2012
The following commit has been merged in the debian branch:
commit d164ac7129d44085d31e31ac7f8ccd6567d13c09
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date: Sat Aug 25 19:11:54 2012 +0200
Add a patch to add the proper OpenSSL license exception to the OSSEC source code
diff --git a/debian/patches/00-openSSL-license-exception.patch b/debian/patches/00-openSSL-license-exception.patch
new file mode 100644
index 0000000..1e432a8
--- /dev/null
+++ b/debian/patches/00-openSSL-license-exception.patch
@@ -0,0 +1,314 @@
+Index: pkg-ossec/LICENSE
+===================================================================
+--- pkg-ossec.orig/LICENSE 2012-08-25 18:58:52.000000000 +0200
++++ pkg-ossec/LICENSE 2012-08-25 18:58:59.000000000 +0200
+@@ -5,6 +5,17 @@
+ it under the terms of the GNU General Public License (version 2) as
+ published by the FSF - Free Software Foundation.
+
++ In addition, certain source files in this program permit linking with the
++ OpenSSL library (http://www.openssl.org), which otherwise wouldn't be allowed
++ under the GPL. For purposes of identifying OpenSSL, most source files giving
++ this permission limit it to versions of OpenSSL having a license identical to
++ that listed in this file (see section "OpenSSL LICENSE" below). It is not
++ necessary for the copyright years to match between this file and the OpenSSL
++ version in question. However, note that because this file is an extension of
++ the license statements of these source files, this file may not be changed
++ except with permission from all copyright holders of source files in this
++ program which reference this file.
++
+ Note that this license applies to the source code, as well as
+ decoders, rules and any other data file included with OSSEC (unless
+ otherwise specified).
+@@ -32,7 +43,8 @@
+ OSSEC HIDS 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 Version 3 below for more details.
++
++ See the GNU General Public License Version 2 below for more details.
+
+ -----------------------------------------------------------------------------
+
+@@ -317,3 +329,134 @@
+
+ END OF TERMS AND CONDITIONS
+
++
++-------------------------------------------------------------------------------
++
++OpenSSL License
++---------------
++
++ LICENSE ISSUES
++ ==============
++
++ The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
++ the OpenSSL License and the original SSLeay license apply to the toolkit.
++ See below for the actual license texts. Actually both licenses are BSD-style
++ Open Source licenses. In case of any license issues related to OpenSSL
++ please contact openssl-core at openssl.org.
++
++ OpenSSL License
++ ---------------
++
++/* ====================================================================
++ * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in
++ * the documentation and/or other materials provided with the
++ * distribution.
++ *
++ * 3. All advertising materials mentioning features or use of this
++ * software must display the following acknowledgment:
++ * "This product includes software developed by the OpenSSL Project
++ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
++ *
++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
++ * endorse or promote products derived from this software without
++ * prior written permission. For written permission, please contact
++ * openssl-core at openssl.org.
++ *
++ * 5. Products derived from this software may not be called "OpenSSL"
++ * nor may "OpenSSL" appear in their names without prior written
++ * permission of the OpenSSL Project.
++ *
++ * 6. Redistributions of any form whatsoever must retain the following
++ * acknowledgment:
++ * "This product includes software developed by the OpenSSL Project
++ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
++ * OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ====================================================================
++ *
++ * This product includes cryptographic software written by Eric Young
++ * (eay at cryptsoft.com). This product includes software written by Tim
++ * Hudson (tjh at cryptsoft.com).
++ *
++ */
++
++ Original SSLeay License
++ -----------------------
++
++/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
++ * All rights reserved.
++ *
++ * This package is an SSL implementation written
++ * by Eric Young (eay at cryptsoft.com).
++ * The implementation was written so as to conform with Netscapes SSL.
++ *
++ * This library is free for commercial and non-commercial use as long as
++ * the following conditions are aheared to. The following conditions
++ * apply to all code found in this distribution, be it the RC4, RSA,
++ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
++ * included with this distribution is covered by the same copyright terms
++ * except that the holder is Tim Hudson (tjh at cryptsoft.com).
++ *
++ * Copyright remains Eric Young's, and as such any Copyright notices in
++ * the code are not to be removed.
++ * If this package is used in a product, Eric Young should be given attribution
++ * as the author of the parts of the library used.
++ * This can be in the form of a textual message at program startup or
++ * in documentation (online or textual) provided with the package.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. All advertising materials mentioning features or use of this software
++ * must display the following acknowledgement:
++ * "This product includes cryptographic software written by
++ * Eric Young (eay at cryptsoft.com)"
++ * The word 'cryptographic' can be left out if the rouines from the library
++ * being used are not cryptographic related :-).
++ * 4. If you include any Windows specific code (or a derivative thereof) from
++ * the apps directory (application code) you must include an acknowledgement:
++ * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
++ *
++ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ * The licence and distribution terms for any publically available version or
++ * derivative of this code cannot be changed. i.e. this code cannot simply be
++ * copied and put under another distribution licence
++ * [including the GNU Public Licence.]
++ */
+Index: pkg-ossec/src/os_auth/ssl.c
+===================================================================
+--- pkg-ossec.orig/src/os_auth/ssl.c 2012-08-25 19:03:52.000000000 +0200
++++ pkg-ossec/src/os_auth/ssl.c 2012-08-25 19:05:22.000000000 +0200
+@@ -7,6 +7,21 @@
+ * and/or modify it under the terms of the GNU General Public
+ * License (version 2) as published by the FSF - Free Software
+ * Foundation
++ *
++ * In addition, as a special exception, the copyright holders give
++ * permission to link the code of portions of this program with the
++ * OpenSSL library under certain conditions as described in each
++ * individual source file, and distribute linked combinations
++ * including the two.
++ *
++ * You must obey the GNU General Public License in all respects
++ * for all of the code used other than OpenSSL. If you modify
++ * file(s) with this exception, you may extend this exception to your
++ * version of the file(s), but you are not obligated to do so. If you
++ * do not wish to do so, delete this exception statement from your
++ * version. If you delete this exception statement from all source
++ * files in the program, then also delete it here.
++ *
+ */
+
+
+Index: pkg-ossec/src/os_auth/auth.h
+===================================================================
+--- pkg-ossec.orig/src/os_auth/auth.h 2012-08-25 19:07:47.000000000 +0200
++++ pkg-ossec/src/os_auth/auth.h 2012-08-25 19:08:02.000000000 +0200
+@@ -7,6 +7,21 @@
+ * and/or modify it under the terms of the GNU General Public
+ * License (version 2) as published by the FSF - Free Software
+ * Foundation
++ *
++ * In addition, as a special exception, the copyright holders give
++ * permission to link the code of portions of this program with the
++ * OpenSSL library under certain conditions as described in each
++ * individual source file, and distribute linked combinations
++ * including the two.
++ *
++ * You must obey the GNU General Public License in all respects
++ * for all of the code used other than OpenSSL. If you modify
++ * file(s) with this exception, you may extend this exception to your
++ * version of the file(s), but you are not obligated to do so. If you
++ * do not wish to do so, delete this exception statement from your
++ * version. If you delete this exception statement from all source
++ * files in the program, then also delete it here.
++ *
+ */
+
+
+Index: pkg-ossec/src/os_auth/main-client.c
+===================================================================
+--- pkg-ossec.orig/src/os_auth/main-client.c 2012-08-25 19:08:31.000000000 +0200
++++ pkg-ossec/src/os_auth/main-client.c 2012-08-25 19:08:49.000000000 +0200
+@@ -7,6 +7,21 @@
+ * and/or modify it under the terms of the GNU General Public
+ * License (version 2) as published by the FSF - Free Software
+ * Foundation
++ *
++ * In addition, as a special exception, the copyright holders give
++ * permission to link the code of portions of this program with the
++ * OpenSSL library under certain conditions as described in each
++ * individual source file, and distribute linked combinations
++ * including the two.
++ *
++ * You must obey the GNU General Public License in all respects
++ * for all of the code used other than OpenSSL. If you modify
++ * file(s) with this exception, you may extend this exception to your
++ * version of the file(s), but you are not obligated to do so. If you
++ * do not wish to do so, delete this exception statement from your
++ * version. If you delete this exception statement from all source
++ * files in the program, then also delete it here.
++ *
+ */
+
+ #include "shared.h"
+Index: pkg-ossec/src/os_auth/main-server.c
+===================================================================
+--- pkg-ossec.orig/src/os_auth/main-server.c 2012-08-25 19:07:23.000000000 +0200
++++ pkg-ossec/src/os_auth/main-server.c 2012-08-25 19:07:29.000000000 +0200
+@@ -7,6 +7,21 @@
+ * and/or modify it under the terms of the GNU General Public
+ * License (version 2) as published by the FSF - Free Software
+ * Foundation
++ *
++ * In addition, as a special exception, the copyright holders give
++ * permission to link the code of portions of this program with the
++ * OpenSSL library under certain conditions as described in each
++ * individual source file, and distribute linked combinations
++ * including the two.
++ *
++ * You must obey the GNU General Public License in all respects
++ * for all of the code used other than OpenSSL. If you modify
++ * file(s) with this exception, you may extend this exception to your
++ * version of the file(s), but you are not obligated to do so. If you
++ * do not wish to do so, delete this exception statement from your
++ * version. If you delete this exception statement from all source
++ * files in the program, then also delete it here.
++ *
+ */
+
+
+Index: pkg-ossec/src/os_auth/ssl-test.c
+===================================================================
+--- pkg-ossec.orig/src/os_auth/ssl-test.c 2012-08-25 19:06:11.000000000 +0200
++++ pkg-ossec/src/os_auth/ssl-test.c 2012-08-25 19:06:39.000000000 +0200
+@@ -1,3 +1,38 @@
++/*
++ *
++ * Copyright (C) 2011 Trend Micro Inc. All rights reserved.
++ *
++ * OSSEC HIDS is a free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License (version 2) as
++ * published by the FSF - Free Software Foundation.
++ *
++ * Note that this license applies to the source code, as well as
++ * decoders, rules and any other data file included with OSSEC (unless
++ * otherwise specified).
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
++ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
++ * NON-INFRINGEMENT. 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, see <http://www.gnu.org/licenses/>.
++ *
++ * In addition, as a special exception, the copyright holders give
++ * permission to link the code of portions of this program with the
++ * OpenSSL library under certain conditions as described in each
++ * individual source file, and distribute linked combinations
++ * including the two.
++ *
++ * You must obey the GNU General Public License in all respects
++ * for all of the code used other than OpenSSL. If you modify
++ * file(s) with this exception, you may extend this exception to your
++ * version of the file(s), but you are not obligated to do so. If you
++ * do not wish to do so, delete this exception statement from your
++ * version. If you delete this exception statement from all source
++ * files in the program, then also delete it here.
++ *
++ */
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
--
Git repository for pkg-ossec
More information about the Pkg-ossec-devel
mailing list