r15942 - in packages/trunk/warzone2100/debian: . patches
Markus Koschany
apo at moszumanska.debian.org
Mon Nov 28 20:24:49 UTC 2016
Author: apo
Date: 2016-11-28 20:24:49 +0000 (Mon, 28 Nov 2016)
New Revision: 15942
Added:
packages/trunk/warzone2100/debian/patches/openssl-1.1.patch
Modified:
packages/trunk/warzone2100/debian/changelog
packages/trunk/warzone2100/debian/compat
packages/trunk/warzone2100/debian/control
packages/trunk/warzone2100/debian/copyright
packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch
packages/trunk/warzone2100/debian/patches/series
packages/trunk/warzone2100/debian/patches/use-system-libraries.patch
packages/trunk/warzone2100/debian/rules
Log:
Release warzone2100 3.2.1-2
Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/changelog 2016-11-28 20:24:49 UTC (rev 15942)
@@ -1,3 +1,12 @@
+warzone2100 (3.2.1-2) unstable; urgency=medium
+
+ * Team upload.
+ * Add openssl-1.1.patch and fix FTBFS with OpenSSL 1.1. (Closes: #844870)
+ * Fix Lintian warning space-in-std-shortname-in-dep5-copyright.
+ * Really use compat level 10.
+
+ -- Markus Koschany <apo at debian.org> Mon, 28 Nov 2016 20:51:47 +0100
+
warzone2100 (3.2.1-1) unstable; urgency=medium
* Team upload.
@@ -14,6 +23,7 @@
[ Markus Koschany ]
* Add missing libssl-dev to Build-Depends.
* Disable the tests by overriding dh_auto_test and work around a FTBFS.
+ * Use compat level 10.
* d/rules: Pass --with-appdatadir option to dh_auto_configure.
* Add appdata.patch and install the missing appdata file.
* Remove libsdl1.2-dev from B-D.
Modified: packages/trunk/warzone2100/debian/compat
===================================================================
--- packages/trunk/warzone2100/debian/compat 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/compat 2016-11-28 20:24:49 UTC (rev 15942)
@@ -1 +1 @@
-9
+10
Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/control 2016-11-28 20:24:49 UTC (rev 15942)
@@ -10,7 +10,7 @@
automake1.11,
autotools-dev,
bison,
- debhelper (>= 9),
+ debhelper (>= 10),
dh-autoreconf,
docbook-xml,
docbook-xsl,
Modified: packages/trunk/warzone2100/debian/copyright
===================================================================
--- packages/trunk/warzone2100/debian/copyright 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/copyright 2016-11-28 20:24:49 UTC (rev 15942)
@@ -74,11 +74,11 @@
Files: 3rdparty/quesoglc/GL/glc.h
Copyright: 2002, 2004-2007, Bertrand Coconnier
1999-2001, Brian Paul
-License: LGPL-2.1+ and MIT-(Brian-Paul)
+License: LGPL-2.1+ and MIT-Brian-Paul
Files: 3rdparty/miniupnpc/*
Copyright: 2005-2010, Thomas Bernard
-License: BSD-3-clause-(miniupnpc)
+License: BSD-3-clause-miniupnpc
Files: */*_parser.cpp
*/*_parser.h
@@ -103,7 +103,7 @@
Files: install-sh
Copyright: 1994 X Consortium
-License: MIT-(X11)
+License: MIT-X11
Files: lib/exceptionhandler/include/*
lib/framework/gettext.h
@@ -131,7 +131,7 @@
Files: lib/sequence/sequence.cpp
Copyright: 2008-2013 Warzone 2100 Project
2002-2007 Xiph.org Foundation
-License: GPL-2+ and BSD-3-clause-(Xiph)
+License: GPL-2+ and BSD-3-clause-Xiph
Files: m4/*.m4
Copyright: 1995-2007, Free Software Foundation, Inc.
@@ -391,7 +391,7 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-License: BSD-3-clause-(miniupnpc)
+License: BSD-3-clause-miniupnpc
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
@@ -415,7 +415,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-License: BSD-3-clause-(Xiph)
+License: BSD-3-clause-Xiph
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -443,7 +443,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License: MIT-(Brian-Paul)
+License: MIT-Brian-Paul
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
@@ -461,7 +461,7 @@
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-License: MIT-(X11)
+License: MIT-X11
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
Added: packages/trunk/warzone2100/debian/patches/openssl-1.1.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/openssl-1.1.patch (rev 0)
+++ packages/trunk/warzone2100/debian/patches/openssl-1.1.patch 2016-11-28 20:24:49 UTC (rev 15942)
@@ -0,0 +1,66 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 28 Nov 2016 20:48:44 +0100
+Subject: openssl-1.1
+
+Fix FTBFS with OpenSSL 1.1.
+
+Debian-Bug: https://bugs.debian.org/844870
+Origin: https://github.com/Cyp/warzone2100/commit/d29cacac856882b153fa206c49091188af5d95aa.patch
+Origin: https://github.com/Cyp/warzone2100/commit/efe8bf60ec56565b96a26b041a965c925bc58c3b.patch
+---
+ lib/framework/crc.cpp | 6 ++++--
+ src/main.cpp | 6 ++++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/lib/framework/crc.cpp b/lib/framework/crc.cpp
+index c9b4559..32486ee 100644
+--- a/lib/framework/crc.cpp
++++ b/lib/framework/crc.cpp
+@@ -23,6 +23,8 @@
+ #include <openssl/sha.h>
+ #include <openssl/err.h>
+
++#include <functional>
++
+ #if defined(OPENSSL_NO_EC) || defined(OPENSSL_NO_ECDSA)
+ # define MATH_IS_ALCHEMY
+ #endif
+@@ -331,7 +333,7 @@ bool EcKey::verify(Sig const &sig, void const *data, size_t dataLen) const
+
+ EcKey::Key EcKey::toBytes(Privacy privacy) const
+ {
+- int (*toBytesFunc)(EC_KEY * key, unsigned char **out) = nullptr;
++ std::function<int (EC_KEY *key, unsigned char **out)> toBytesFunc = nullptr; // int (EC_KEY const? *key, unsigned char **out), "const" only on i2o_ECPublicKey in OpenSSL 1.1.0+
+ switch (privacy)
+ {
+ case Private: toBytesFunc = i2d_ECPrivateKey; break; // Note that the format for private keys is somewhat bloated, and even contains the public key which could be (efficiently) computed from the private key.
+@@ -358,7 +360,7 @@ EcKey::Key EcKey::toBytes(Privacy privacy) const
+
+ void EcKey::fromBytes(EcKey::Key const &key, EcKey::Privacy privacy)
+ {
+- EC_KEY *(*fromBytesFunc)(EC_KEY **key, unsigned char const **in, long len) = nullptr;
++ std::function<EC_KEY *(EC_KEY **key, unsigned char const **in, long len)> fromBytesFunc = nullptr; // EC_KEY *(EC_KEY **key, unsigned char const **in, long len)
+ switch (privacy)
+ {
+ case Private: fromBytesFunc = d2i_ECPrivateKey; break;
+diff --git a/src/main.cpp b/src/main.cpp
+index b17aeb6..55842be 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -1060,10 +1060,16 @@ int realmain(int argc, char *argv[])
+ const char **utfargv = (const char **)argv;
+ wzMain(argc, argv); // init Qt integration first
+
++#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
+ // The libcrypto startup stuff... May or may not actually be needed for anything at all.
+ ERR_load_crypto_strings(); // This is needed for descriptive error messages.
+ OpenSSL_add_all_algorithms(); // Don't actually use the EVP functions, so probably not needed.
+ OPENSSL_config(nullptr); // What does this actually do?
++#else
++ // The libcrypto startup stuff... May or may not actually be needed for anything at all.
++ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, nullptr);
++#endif
++
+ #ifdef WZ_OS_WIN
+ RAND_screen(); // Uses a screenshot as a random seed, on systems lacking /dev/random.
+ #endif
Modified: packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch 2016-11-28 20:24:49 UTC (rev 15942)
@@ -63,7 +63,7 @@
}
diff --git a/configure.ac b/configure.ac
-index 0700707..c588887 100644
+index 5d0da0a..45eea84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,19 @@ AC_PROG_CXX
Modified: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/patches/series 2016-11-28 20:24:49 UTC (rev 15942)
@@ -7,3 +7,4 @@
add-needed-const.patch
appdata.patch
quickstartguide.patch
+openssl-1.1.patch
Modified: packages/trunk/warzone2100/debian/patches/use-system-libraries.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/use-system-libraries.patch 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/patches/use-system-libraries.patch 2016-11-28 20:24:49 UTC (rev 15942)
@@ -25,7 +25,7 @@
lib/exceptionhandler \
lib/script \
diff --git a/configure.ac b/configure.ac
-index 8295e55..0700707 100644
+index 8295e55..5d0da0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,6 +399,12 @@ fi
Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules 2016-11-20 04:01:33 UTC (rev 15941)
+++ packages/trunk/warzone2100/debian/rules 2016-11-28 20:24:49 UTC (rev 15942)
@@ -5,7 +5,7 @@
export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
%:
- dh $@ --parallel --with autoreconf
+ dh $@
override_dh_autoreconf:
dh_autoreconf ./autogen.sh
More information about the Pkg-games-commits
mailing list