Attachment 886134 Details for Bug 1087496 – Use system libtomcrypt instead of bundled one

[patch] Use system libtomcrypt instead of bundled one

Use-system-libtomcrypt-instead-of-bundled-one.patch (text/plain), 2.33 KB, created by Ville Skyttä on 2014-04-14 13:12:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-04-14 13:12:39 UTC

Size: 2.33 KB

patch

obsolete

>From 9a51f3c4e875e069a45716e8d9e27169242b474a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Mon, 14 Apr 2014 16:11:58 +0300
>Subject: [PATCH] Use system libtomcrypt instead of bundled one
>
>---
> bitfrost-1.0.19-system-tomcrypt.patch | 19 +++++++++++++++++++
> bitfrost.spec                         | 10 ++++++++--
> 2 files changed, 27 insertions(+), 2 deletions(-)
> create mode 100644 bitfrost-1.0.19-system-tomcrypt.patch
>
>diff --git a/bitfrost-1.0.19-system-tomcrypt.patch b/bitfrost-1.0.19-system-tomcrypt.patch
>new file mode 100644
>index 0000000..b95e99b
>--- /dev/null
>+++ b/bitfrost-1.0.19-system-tomcrypt.patch
>@@ -0,0 +1,19 @@
>+diff --git a/Makefile b/Makefile
>+index c318877..7077975 100644
>+--- a/Makefile
>++++ b/Makefile
>+@@ -5,11 +5,11 @@ CFLAGS=$(OPTFLAGS)
>+ 
>+ all: bitfrost/util/pysign.so bitfrost/util/pyverify.so
>+ 
>+-bitfrost/util/py%.so: py%.o libtomcrypt.a libtfm.a
>+-	gcc $(CFLAGS) -shared $^ -o $@
>++bitfrost/util/py%.so: py%.o
>++	gcc $(CFLAGS) -shared $(shell pkg-config --libs libtomcrypt) $^ -o $@
>+ 
>+ %.o: %.c
>+-	gcc $(CFLAGS) -c -fPIC $(PY_INCLUDES) -Ilibtomcrypt/src/headers $<
>++	gcc $(CFLAGS) -c -fPIC $(PY_INCLUDES) $(shell pkg-config --cflags libtomcrypt) $<
>+ 
>+ %.c: %.pyx
>+ 	pyrexc -o $@ $<
>diff --git a/bitfrost.spec b/bitfrost.spec
>index 019a4e2..d40a00d 100644
>--- a/bitfrost.spec
>+++ b/bitfrost.spec
>@@ -2,15 +2,16 @@
> 
> Name:		bitfrost
> Version:	1.0.19
>-Release:	2%{?dist}
>+Release:	3%{?dist}
> Summary:	OLPC bitfrost security modules
> 
> Group:		System Environment/Base
> License:	LGPLv2+ and GPLv2+ and Public Domain
> URL:		http://wiki.laptop.org/go/Bitfrost
> Source0:	http://dev.laptop.org/pub/source/bitfrost/%{name}-%{version}.tar.bz2
>+Patch0:		%{name}-1.0.19-system-tomcrypt.patch
> 
>-BuildRequires:	python-devel, Pyrex
>+BuildRequires:	python-devel, Pyrex, libtomcrypt-devel
> 
> 
> %description
>@@ -31,6 +32,8 @@ Bitfrost python modules which interact with Sugar components.
> 
> %prep
> %setup -q
>+%patch0 -p1
>+rm -r libtomcrypt tomsfastmath
> 
> 
> %build
>@@ -67,6 +70,9 @@ make OPTFLAGS="$RPM_OPT_FLAGS"
> 
> 
> %changelog
>+* Mon Apr 14 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.0.19-3
>+- Use system libtomcrypt instead of bundled one
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.19-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.9.0

Actions: View | Diff

Attachments on bug 1087496: 886134