From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Jul 2013 12:43:18 +0000 (+0000)
Subject: libffi: Update to 3.0.13.
X-Git-Tag: pango~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d84ba2180617969e51a3ccf2066baa60ed0ae7ad;p=people%2Fstevee%2Fipfire-3.x.git

libffi: Update to 3.0.13.

Create compat package because of soname bump.
---

diff --git a/compat-libffi/compat-libffi.nm b/compat-libffi/compat-libffi.nm
new file mode 100644
index 000000000..6b1df2989
--- /dev/null
+++ b/compat-libffi/compat-libffi.nm
@@ -0,0 +1,48 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-libffi
+version    = 3.0.10
+release    = 1
+thisapp    = libffi-%{version}
+
+groups     = System/Libraries
+url        = http://sourceware.org/libffi
+license    = BSD
+summary    = A portable foreign function interface library.
+
+description
+	This package is for compatability to old versions only, and provides no
+	Development libraries.
+
+	The libffi library provides a portable, high level programming
+	interface to various calling conventions. This allows a programmer to
+	call any function specified by a call interface description at run time.
+end
+
+source_dl  = ftp://sourceware.org/pub/libffi/
+
+build
+	install_cmds
+		# Remove all development files, because nothing
+		# should link against this.
+		rm -rvf %{BUILDROOT}%{libdir}/pkgconfig
+		rm -rvf %{BUILDROOT}%{libdir}/libffi-%{version}
+		rm -rvf %{BUILDROOT}%{libdir}/*.so
+		rm -rvf %{BUILDROOT}%{mandir}
+	end
+end
+
+packages
+	package %{name}
+		obsoletes
+			libffi <= %{thisver}
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/libffi/libffi.nm b/libffi/libffi.nm
index 284af95b6..db6ba4f2f 100644
--- a/libffi/libffi.nm
+++ b/libffi/libffi.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libffi
-version    = 3.0.9
+version    = 3.0.13
 release    = 1
 
 groups     = System/Libraries
@@ -18,11 +18,10 @@ description
 	call any function specified by a call interface description at run time.
 end
 
-source_dl  =
+source_dl  = ftp://sourceware.org/pub/libffi/
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL
diff --git a/libffi/patches/libffi-3.0.13-fix-include-path.patch b/libffi/patches/libffi-3.0.13-fix-include-path.patch
new file mode 100644
index 000000000..4502333a7
--- /dev/null
+++ b/libffi/patches/libffi-3.0.13-fix-include-path.patch
@@ -0,0 +1,34 @@
+diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am
+--- libffi-3.0.13/include/Makefile.am.fixpath	2013-05-25 22:11:25.983889342 -0400
++++ libffi-3.0.13/include/Makefile.am	2013-05-25 22:12:12.337890037 -0400
+@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in
+--- libffi-3.0.13/include/Makefile.in.fixpath	2013-05-25 22:12:56.259890696 -0400
++++ libffi-3.0.13/include/Makefile.in	2013-05-25 22:13:12.101890934 -0400
+@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ DISTCLEANFILES = ffitarget.h
+ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+ all: all-am
+ 
+diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
+--- libffi-3.0.13/libffi.pc.in.fixpath	2013-05-25 22:14:21.037891968 -0400
++++ libffi-3.0.13/libffi.pc.in	2013-05-25 22:14:31.652892128 -0400
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces