From 1d4a4ab82fb5eef048ace46f550667741558d260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Thu, 1 Dec 2016 08:03:27 +0100
Subject: Fix const correctness in hv_func.h
---
...5.22.2-Fix-const-correctness-in-hv_func.h.patch | 126 +++++++++++++++++++++
perl.spec | 7 ++
2 files changed, 133 insertions(+)
create mode 100644 perl-5.22.2-Fix-const-correctness-in-hv_func.h.patch
diff --git a/perl-5.22.2-Fix-const-correctness-in-hv_func.h.patch
b/perl-5.22.2-Fix-const-correctness-in-hv_func.h.patch
new file mode 100644
index 0000000..696b7b3
--- /dev/null
+++ b/perl-5.22.2-Fix-const-correctness-in-hv_func.h.patch
@@ -0,0 +1,126 @@
+From fb211db6cbcf25bbdeaa39b6685fae7228c92b3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Thu, 24 Nov 2016 16:34:09 +0100
+Subject: [PATCH] Fix const correctness in hv_func.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building an XS code with -Wcast-qual yielded warnings about discarding
+const qualifiers from pointer targets like:
+
+$ printf '#include "EXTERN.h"\n#include "perl.h"\n' | gcc -Wcast-qual
-I/usr/lib64/perl5/CORE -c -x c -
+In file included from /usr/lib64/perl5/CORE/hv.h:629:0,
+ from /usr/lib64/perl5/CORE/perl.h:3740,
+ from <stdin>:2:
+/usr/lib64/perl5/CORE/hv_func.h: In function ‘S_perl_hash_siphash_2_4’:
+/usr/lib64/perl5/CORE/hv_func.h:213:17: warning: cast discards ‘const’
qualifier from pointer target type [-Wcast-qual]
+ U64TYPE k0 = ((U64TYPE*)seed)[0];
+ ^
+
+Petr Písař: Ported to 5.22.2.
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ hv_func.h | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/hv_func.h b/hv_func.h
+index 49a677e..e64d21f 100644
+--- a/hv_func.h
++++ b/hv_func.h
+@@ -118,7 +118,7 @@
+
+ #if (BYTEORDER == 0x1234 || BYTEORDER == 0x12345678) && U32SIZE == 4
+ /* CPU endian matches murmurhash algorithm, so read 32-bit word directly */
+- #define U8TO32_LE(ptr) (*((U32*)(ptr)))
++ #define U8TO32_LE(ptr) (*((const U32*)(ptr)))
+ #elif BYTEORDER == 0x4321 || BYTEORDER == 0x87654321
+ /* TODO: Add additional cases below where a compiler provided bswap32 is
available */
+ #if defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3))
+@@ -210,8 +210,8 @@ S_perl_hash_siphash_2_4(const unsigned char * const seed,
const unsigned char *i
+ U64TYPE v3 = UINT64_C(0x7465646279746573);
+
+ U64TYPE b;
+- U64TYPE k0 = ((U64TYPE*)seed)[0];
+- U64TYPE k1 = ((U64TYPE*)seed)[1];
++ U64TYPE k0 = ((const U64TYPE*)seed)[0];
++ U64TYPE k1 = ((const U64TYPE*)seed)[1];
+ U64TYPE m;
+ const int left = inlen & 7;
+ const U8 *end = in + inlen - left;
+@@ -269,7 +269,7 @@ S_perl_hash_siphash_2_4(const unsigned char * const seed,
const unsigned char *i
+
+ PERL_STATIC_INLINE U32
+ S_perl_hash_superfast(const unsigned char * const seed, const unsigned char
*str, STRLEN len) {
+- U32 hash = *((U32*)seed) + (U32)len;
++ U32 hash = *((const U32*)seed) + (U32)len;
+ U32 tmp;
+ int rem= len & 3;
+ len >>= 2;
+@@ -373,7 +373,7 @@ S_perl_hash_superfast(const unsigned char * const seed,
const unsigned char *str
+ /* now we create the hash function */
+ PERL_STATIC_INLINE U32
+ S_perl_hash_murmur3(const unsigned char * const seed, const unsigned char
*ptr, STRLEN len) {
+- U32 h1 = *((U32*)seed);
++ U32 h1 = *((const U32*)seed);
+ U32 k1;
+ U32 carry = 0;
+
+@@ -467,7 +467,7 @@ S_perl_hash_murmur3(const unsigned char * const seed,
const unsigned char *ptr,
+ PERL_STATIC_INLINE U32
+ S_perl_hash_djb2(const unsigned char * const seed, const unsigned char *str,
const STRLEN len) {
+ const unsigned char * const end = (const unsigned char *)str + len;
+- U32 hash = *((U32*)seed) + (U32)len;
++ U32 hash = *((const U32*)seed) + (U32)len;
+ while (str < end) {
+ hash = ((hash << 5) + hash) + *str++;
+ }
+@@ -477,7 +477,7 @@ S_perl_hash_djb2(const unsigned char * const seed, const
unsigned char *str, con
+ PERL_STATIC_INLINE U32
+ S_perl_hash_sdbm(const unsigned char * const seed, const unsigned char *str,
const STRLEN len) {
+ const unsigned char * const end = (const unsigned char *)str + len;
+- U32 hash = *((U32*)seed) + (U32)len;
++ U32 hash = *((const U32*)seed) + (U32)len;
+ while (str < end) {
+ hash = (hash << 6) + (hash << 16) - hash + *str++;
+ }
+@@ -503,7 +503,7 @@ S_perl_hash_sdbm(const unsigned char * const seed, const
unsigned char *str, con
+ PERL_STATIC_INLINE U32
+ S_perl_hash_one_at_a_time(const unsigned char * const seed, const unsigned
char *str, const STRLEN len) {
+ const unsigned char * const end = (const unsigned char *)str + len;
+- U32 hash = *((U32*)seed) + (U32)len;
++ U32 hash = *((const U32*)seed) + (U32)len;
+ while (str < end) {
+ hash += *str++;
+ hash += (hash << 10);
+@@ -518,7 +518,7 @@ S_perl_hash_one_at_a_time(const unsigned char * const
seed, const unsigned char
+ PERL_STATIC_INLINE U32
+ S_perl_hash_one_at_a_time_hard(const unsigned char * const seed, const
unsigned char *str, const STRLEN len) {
+ const unsigned char * const end = (const unsigned char *)str + len;
+- U32 hash = *((U32*)seed) + (U32)len;
++ U32 hash = *((const U32*)seed) + (U32)len;
+
+ while (str < end) {
+ hash += (hash << 10);
+@@ -553,7 +553,7 @@ S_perl_hash_one_at_a_time_hard(const unsigned char * const
seed, const unsigned
+ PERL_STATIC_INLINE U32
+ S_perl_hash_old_one_at_a_time(const unsigned char * const seed, const
unsigned char *str, const STRLEN len) {
+ const unsigned char * const end = (const unsigned char *)str + len;
+- U32 hash = *((U32*)seed);
++ U32 hash = *((const U32*)seed);
+ while (str < end) {
+ hash += *str++;
+ hash += (hash << 10);
+@@ -581,7 +581,7 @@ S_perl_hash_murmur_hash_64a (const unsigned char * const
seed, const unsigned ch
+ {
+ const U64TYPE m = 0xc6a4a7935bd1e995;
+ const int r = 47;
+- U64TYPE h = *((U64TYPE*)seed) ^ len;
++ U64TYPE h = *((const U64TYPE*)seed) ^ len;
+ const U64TYPE * data = (const U64TYPE *)str;
+ const U64TYPE * end = data + (len/8);
+ const unsigned char * data2;
+--
+2.7.4
+
diff --git a/perl.spec b/perl.spec
index 29270fb..ce30f2e 100644
--- a/perl.spec
+++ b/perl.spec
@@ -153,6 +153,10 @@ Patch48: perl-5.25.7-Fix-Storable-segfaults.patch
# Fix assigning split() return values to an array, in upstream after 5.25.7
Patch49:
perl-5.24.0-split-was-leaving-PL_sv_undef-in-unused-ary-slots.patch
+# Fix const correctness in hv_func.h, bug #1242980, RT#130169,
+# in upstream after 5.25.7
+Patch50: perl-5.22.2-Fix-const-correctness-in-hv_func.h.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200:
perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -2446,6 +2450,7 @@ Perl extension for Version Objects
%patch47 -p1
%patch48 -p1
%patch49 -p1
+%patch50 -p1
%patch200 -p1
%patch201 -p1
@@ -2487,6 +2492,7 @@ perl -x patchlevel.h \
'Fedora Patch47: Fix stack handling when calling chdir without an argument
(RT#129130)' \
'Fedora Patch48: Fix crash in Storable when deserializing malformed code
reference (RT#68348, RT#130098)' \
'Fedora Patch49: Fix assigning split() return values to an array' \
+ 'Fedora Patch50: Fix const correctness in hv_func.h (RT#130169)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on
Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -4744,6 +4750,7 @@ popd
(RT#68348, RT#130098)
- Tighten dependencies between architecture specific sub-packages to ISA
- Fix assigning split() return values to an array
+- Fix const correctness in hv_func.h (bug #1242980)
* Wed Nov 09 2016 Petr Pisar <ppi...@redhat.com> - 4:5.22.2-364
- Tie perl-Errno release to interpreter build because of kernel version check
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl.git/commit/?h=f24&id=1d4a4ab82fb5eef048ace46f550667741558d260
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
