CVS commit: [pkgsrc-2017Q2] pkgsrc/devel/libffi

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sat Sep 16 16:17:03 UTC 2017

Modified Files:
        pkgsrc/devel/libffi [pkgsrc-2017Q2]: Makefile distinfo
        pkgsrc/devel/libffi/patches [pkgsrc-2017Q2]: patch-src_closures.c

Log Message:
Pullup ticket #5549 - requested by joerg
devel/libffi: bug fix for sparc

Revisions pulled up:
- devel/libffi/Makefile                                         1.33
- devel/libffi/distinfo                                         1.45
- devel/libffi/patches/patch-src_closures.c                     1.2

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Tue Sep  5 15:08:42 UTC 2017

   Modified Files:
        pkgsrc/devel/libffi: Makefile distinfo
        pkgsrc/devel/libffi/patches: patch-src_closures.c

   Log Message:
   Fix a glaring sign bug in the closure handling on NetBSD 8+. Fixes
   PR 52523 as Sparc seems to use more annoying instructions than x86 and
   ARM.

   Bump revision.

   To generate a diff of this commit:
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/libffi/Makefile
   cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/libffi/distinfo
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libffi/patches/patch-src_closures.c


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 pkgsrc/devel/libffi/Makefile
cvs rdiff -u -r1.44 -r1.44.2.1 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r1.1 -r1.1.2.1 pkgsrc/devel/libffi/patches/patch-src_closures.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libffi/Makefile
diff -u pkgsrc/devel/libffi/Makefile:1.32 pkgsrc/devel/libffi/Makefile:1.32.2.1
--- pkgsrc/devel/libffi/Makefile:1.32   Fri May 26 18:55:41 2017
+++ pkgsrc/devel/libffi/Makefile        Sat Sep 16 16:17:03 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2017/05/26 18:55:41 joerg Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2017/09/16 16:17:03 spz Exp $
 
 DISTNAME=      libffi-3.2.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ftp://sourceware.org/pub/libffi/
 

Index: pkgsrc/devel/libffi/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.44 pkgsrc/devel/libffi/distinfo:1.44.2.1
--- pkgsrc/devel/libffi/distinfo:1.44   Fri May 26 18:55:41 2017
+++ pkgsrc/devel/libffi/distinfo        Sat Sep 16 16:17:03 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2017/05/26 18:55:41 joerg Exp $
+$NetBSD: distinfo,v 1.44.2.1 2017/09/16 16:17:03 spz Exp $
 
 SHA1 (libffi-3.2.1.tar.gz) = 280c265b789e041c02e5c97815793dfc283fb1e6
 RMD160 (libffi-3.2.1.tar.gz) = 9b546a3d002380bec3f00d86fc47d730abf51dfd
@@ -13,6 +13,6 @@ SHA1 (patch-ag) = ae6a89f6b2be00c52139be
 SHA1 (patch-aj) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e
 SHA1 (patch-src_alpha_osf.S) = 50d564a1d88284f04f6896719fa3613e9b0be70b
 SHA1 (patch-src_arm_sysv.S) = 2c97e0d069a4df2e1f5b6604e54b2d02c92691e2
-SHA1 (patch-src_closures.c) = 04f27d89e0604b6358f809fea8692e8d8e476511
+SHA1 (patch-src_closures.c) = 72760ccd973c5f9b157f5db8da180861d748beb2
 SHA1 (patch-src_m88k_elfbsd.S) = 6572c7fa39c00096cb4a80bb88993ff1b4aaa8cc
 SHA1 (patch-src_x86_win32.S) = 8a41cbc7237d6a171605a66e91d8d92a57181569

Index: pkgsrc/devel/libffi/patches/patch-src_closures.c
diff -u pkgsrc/devel/libffi/patches/patch-src_closures.c:1.1 pkgsrc/devel/libffi/patches/patch-src_closures.c:1.1.2.1
--- pkgsrc/devel/libffi/patches/patch-src_closures.c:1.1        Fri May 26 18:55:41 2017
+++ pkgsrc/devel/libffi/patches/patch-src_closures.c    Sat Sep 16 16:17:03 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_closures.c,v 1.1 2017/05/26 18:55:41 joerg Exp $
+$NetBSD: patch-src_closures.c,v 1.1.2.1 2017/09/16 16:17:03 spz Exp $
 
 --- src/closures.c.orig        2017-05-22 23:16:12.516083134 +0000
 +++ src/closures.c
@@ -75,7 +75,7 @@ $NetBSD: patch-src_closures.c,v 1.1 2017
 +  void *codeseg, *dataseg;
 +  size_t rounded_size;
 +
-+  dataseg = ADD_TO_POINTER(ptr, overhead);
++  dataseg = ADD_TO_POINTER(ptr, -overhead);
 +  memcpy(&rounded_size, dataseg, sizeof(rounded_size));
 +  memcpy(&codeseg, ADD_TO_POINTER(dataseg, sizeof(size_t)), sizeof(void *));
 +  munmap(dataseg, rounded_size);