Fix "assignment discards qualifiers from pointer target type" warning caused by missi...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-lisp/cl-tclink/ChangeLog b/dev-lisp/cl-tclink/ChangeLog
index 31fe5405af8af8cbb4b2b1142d41485123cb80cb..dba952caa3c7afb0e7812b260adeffa8e0d9999c 100644 (file)
--- a/dev-lisp/cl-tclink/ChangeLog
+++ b/dev-lisp/cl-tclink/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/cl-tclink
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/ChangeLog,v 1.11 2010/07/13 11:20:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/ChangeLog,v 1.12 2010/07/13 11:25:29 ssuominen Exp $
+
+  13 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/3.3.1-openssl-1.patch, cl-tclink-3.3.1-r1.ebuild:
+  Fix "assignment discards qualifiers from pointer target type" warning
+  caused by missing const in SSL_METHOD usage with OpenSSL >= 1.0.0.
 
   13 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   +files/3.3.1-Makefile.patch, cl-tclink-3.3.1-r1.ebuild:

diff --git a/dev-lisp/cl-tclink/Manifest b/dev-lisp/cl-tclink/Manifest
index 0fd5c06dbec1bc87ddffa4a3c0f4c4379d755d1b..4193a1e5ff68c7edb08235a8fd70e020938fc258 100644 (file)
--- a/dev-lisp/cl-tclink/Manifest
+++ b/dev-lisp/cl-tclink/Manifest
@@ -1,7 +1,8 @@
 AUX 3.3.1-Makefile.patch 275 RMD160 d47a7dea0d24af5cda042a17b28441d7bc154937 SHA1 c8887aedb78c9add5e92c42aa4fc6c893ae011de SHA256 29ef141738e2c6e1a610b212d00003884b396f6312fec3fdca596926c9f7dc15
 AUX 3.3.1-gentoo.patch 1579 RMD160 97950603d690c4caf9706c7483d9f3136b6c2baf SHA1 b11045a8dc6d2d6072b90ef3f1fa6f2c6091aff6 SHA256 42e6a60f37fb2787f607b8ec8be1b7b3a5ae9186652f17439fdeb41cf6fb66c4
+AUX 3.3.1-openssl-1.patch 246 RMD160 162233002a2cea91e58accb8b0b2fdeb55bf5527 SHA1 522dc9de7d917db44fefc0fd1687f446a2b55db3 SHA256 2bb0926579238441c13244b6bafd86b694fd923cdbac922a1b3970b3cb08a6e7
 DIST cl-tclink_3.3.1-3.diff.gz 5248 RMD160 417f56fd7a609e226865f6d25768dbc9aa864610 SHA1 eabf14626201795bf543249c78084c2595805fe4 SHA256 e56c446617455b103332e2e1083a667b454f6209e8a6b7d06d28501758d97945
 DIST cl-tclink_3.3.1.orig.tar.gz 15880 RMD160 29380b610202693512f915036b8b6a7ab51284bc SHA1 18c63b0c760af920ffa976b911ec00bf5df1bb65 SHA256 21d6a7fd89a106d1d9bcc36fe7dcdd5142b33ba998a0a3bacd9efd5c61dd95b0
-EBUILD cl-tclink-3.3.1-r1.ebuild 1235 RMD160 53fc37dcc38c24d21b2a320c7760f72bdddf0a30 SHA1 34ba5d55e186e7f89eccd6cb2b8fde9f6f82cdbc SHA256 ad23fe3f137eb21714878f8cbf222ca0bcb457d48fa71206cab5979f676f6d17
-MISC ChangeLog 1660 RMD160 f10087b6245ccebfafcc7e63157e6a8220c54e00 SHA1 300c1cb0d36ce916dd322ed3b059f5fcb0abdadd SHA256 72fe9063815f5e4bccac1b64ef5b43c173e08f215df635ee149aaad350efd46c
+EBUILD cl-tclink-3.3.1-r1.ebuild 1245 RMD160 72a81e72c59d2384ce79e9f7d1648ba3fd94f1ac SHA1 22143f375e68fc128b46f368f4a7615ad88353e6 SHA256 2ac83ac1693eaa91928bd5806a15df124a3e62079c34f76d06dccf21df740efe
+MISC ChangeLog 1915 RMD160 5281927c2f86899eb8f81355833f94a4d5fec464 SHA1 c0bc9dd7a982240554c4cf9e9d29cee69f88d715 SHA256 fb83cb174934f4b3e4e6c1d41867e5ad6f9652db9579359b1813bdcd737060d6
 MISC metadata.xml 380 RMD160 aab886a7b638ab2090e659028449962d54cf79eb SHA1 5017b7b785a5d71baf63edb859634aa6703be4e9 SHA256 5e7231f33b18fb096bf4ccd288d8f89fcaaf87f17b35f422ddf52b321dffaf73

diff --git a/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild b/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild
index e3666884b2f41391be3bf6ce675dd2829718be2b..c3ef518ba1453bea3bc381849d5074f28777797d 100644 (file)
--- a/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild
+++ b/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild,v 1.10 2010/07/13 11:20:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild,v 1.11 2010/07/13 11:25:29 ssuominen Exp $
 
 inherit common-lisp eutils multilib toolchain-funcs
 
@@ -27,7 +27,7 @@ src_unpack() {
        unpack ${A}
        epatch ${PN}_${PV}-${DEB_PV}.diff
        cd "${S}"
-       epatch "${FILESDIR}"/${PV}-{gentoo,Makefile}.patch
+       epatch "${FILESDIR}"/${PV}-{gentoo,Makefile,openssl-1}.patch
 }
 
 src_compile() {

diff --git a/dev-lisp/cl-tclink/files/3.3.1-openssl-1.patch b/dev-lisp/cl-tclink/files/3.3.1-openssl-1.patch
new file mode 100644 (file)
index 0000000..19ef703
--- /dev/null
+++ b/dev-lisp/cl-tclink/files/3.3.1-openssl-1.patch
@@ -0,0 +1,14 @@
+--- libtclink/tclinkc.c
++++ libtclink/tclinkc.c
+@@ -78,7 +78,11 @@
+ 
+       /* SSL encryption */
+       X509 *tc_cert;
++      #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++      const SSL_METHOD *meth;
++      #else
+       SSL_METHOD *meth;
++      #endif
+       SSL_CTX *ctx;
+       SSL *ssl;
+