forked from Mirrors/openclonk
Remove the remaining remnants of OpenSSL usage
OpenSSL sure has many names - libssl, libcrypto, libeay32, possibly more.stable-5.2
Günther Brammer
parent
0367dabb63
commit
df0282fc72
|
|
@ -59,7 +59,6 @@ planet/MinSizeRel
|
|||
planet/clonk.dir
|
||||
planet/c4group.dir
|
||||
planet/ZERO_CHECK.dir
|
||||
planet/libeay32.dll
|
||||
planet/fmod.dll
|
||||
planet/cmake_install.cmake
|
||||
planet/clonk.sln
|
||||
|
|
@ -74,7 +73,6 @@ Debug
|
|||
clonk.dir
|
||||
c4group.dir
|
||||
ZERO_CHECK.dir
|
||||
libeay32.dll
|
||||
fmod.dll
|
||||
cmake_install.cmake
|
||||
clonk.sln
|
||||
|
|
|
|||
|
|
@ -684,7 +684,7 @@ c4script_LDADD = \
|
|||
lib.a \
|
||||
$(Z_LIBS)
|
||||
|
||||
dist_doc_DATA = planet/AUTHORS planet/COPYING licenses/LGPL.txt licenses/OpenSSL.txt Credits.txt
|
||||
dist_doc_DATA = planet/AUTHORS planet/COPYING licenses/LGPL.txt Credits.txt
|
||||
|
||||
c4groups = \
|
||||
Graphics.ocg \
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ following packages:
|
|||
make gcc g++
|
||||
cmake OR automake autoconf
|
||||
libc6-dev libx11-dev libxxf86vm-dev libxrandr-dev libxpm-dev libglew1.5-dev
|
||||
libgl1-mesa-dev libpng12-dev libssl-dev libsdl1.2-dev libsdl-mixer1.2-dev
|
||||
libgtk2.0-dev libjpeg62-dev zlib1g-dev libboost-dev
|
||||
libgl1-mesa-dev libpng12-dev libsdl1.2-dev libsdl-mixer1.2-dev libgtk2.0-dev
|
||||
libjpeg62-dev zlib1g-dev libboost-dev
|
||||
|
||||
To build on RPM-based Linux distributions (Red Hat, Fedora, Mandariva,
|
||||
SuSE etc.) you need the following packages:
|
||||
|
|
@ -16,8 +16,8 @@ SuSE etc.) you need the following packages:
|
|||
make gcc gcc-c++
|
||||
cmake OR automake autoconf
|
||||
libX11-devel libXxf86vm-devel libXrandr-devel libXpm-devel glew-devel
|
||||
mesa-libGL-devel libpng-devel openssl-devel SDL-devel SDL_mixer1.2-dev
|
||||
gtk2-devel libjpeg-devel zlib-devel boost-devel
|
||||
mesa-libGL-devel libpng-devel SDL-devel SDL_mixer1.2-dev gtk2-devel
|
||||
libjpeg-devel zlib-devel boost-devel
|
||||
|
||||
|
||||
Build using cmake
|
||||
|
|
|
|||
|
|
@ -345,7 +345,6 @@ fi
|
|||
|
||||
AC_SUBST(CLONK_LIBS)
|
||||
AC_SUBST(Z_LIBS)
|
||||
AC_SUBST(OPENSSL_LIBS)
|
||||
|
||||
# precompiled headers and -Wextra
|
||||
AC_MSG_CHECKING([whether we are using a GNU C++ compiler version 4.1 or newer])
|
||||
|
|
|
|||
|
|
@ -1,127 +0,0 @@
|
|||
|
||||
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@openssl.org.
|
||||
|
||||
OpenSSL License
|
||||
---------------
|
||||
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2002 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@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@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
Original SSLeay License
|
||||
-----------------------
|
||||
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@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@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@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@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.]
|
||||
*/
|
||||
|
||||
|
|
@ -27,7 +27,6 @@ covered by their respective licenses. List of libraries:
|
|||
zlib: Jean-loup Gailly, Mark Adler
|
||||
libpng: Glenn Randers-Pehrson
|
||||
jpeglib: Independent JPEG Group
|
||||
OpenSSL: The OpenSSL Project
|
||||
FMOD: Firelight Multimedia
|
||||
Freetype: The FreeType Project
|
||||
Allegro: Shawn Hargreaves
|
||||
|
|
|
|||
|
|
@ -97,7 +97,6 @@ Section
|
|||
File "${SRCDIR}\planet\AUTHORS"
|
||||
File "${SRCDIR}\planet\COPYING"
|
||||
File "${SRCDIR}\licenses\LGPL.txt"
|
||||
File "${SRCDIR}\licenses\OpenSSL.txt"
|
||||
File "${SRCDIR}\Credits.txt"
|
||||
|
||||
; Create user path (works for the installing user only... might also want to put an info.txt dummy in there...)
|
||||
|
|
@ -233,7 +232,7 @@ Section Uninstall
|
|||
Delete "$INSTDIR\AUTHORS"
|
||||
Delete "$INSTDIR\COPYING"
|
||||
Delete "$INSTDIR\LGPL.txt"
|
||||
Delete "$INSTDIR\OpenSSL.txt"
|
||||
Delete "$INSTDIR\OpenSSL.txt" ; For installations up to 5.2.x
|
||||
Delete "$INSTDIR\Credits.txt"
|
||||
|
||||
Delete "$INSTDIR\uninst.exe"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Removed, I think those should exist on every Mac Os system: z|png[0-9]*|crypto|iconv
|
||||
# Removed, I think those should exist on every Mac Os system: z|png[0-9]*|iconv
|
||||
LIBS_TO_BUNDLE=".*?/lib(jpeg|GLEW|llvm|SDL|SDL_mixer|freetype|ogg|vorbis|vorbisfile)\.[^ ]+\.dylib"
|
||||
|
||||
cd $TARGET_BUILD_DIR
|
||||
|
|
|
|||
Loading…
Reference in New Issue