rpms/libguestfs/EL-5 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch, NONE, 1.1 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch, 1.1, 1.2 libguestfs.spec, 1.76, 1.77
Richard W.M. Jones
rjones at fedoraproject.org
Thu Oct 29 18:38:10 UTC 2009
- Previous message (by thread): rpms/perl-Test-CPAN-Meta/F-12 .cvsignore, 1.4, 1.5 perl-Test-CPAN-Meta.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message (by thread): rpms/tcl-trf/F-10 trf2.1.4-noripemd.patch, NONE, 1.1 sources, 1.2, 1.3 tcl-trf.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rjones
Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24057
Modified Files:
0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
libguestfs.spec
Added Files:
0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
Log Message:
Another upstream fix required for endianness handling.
0002-RHEL-5-Also-add-le-16-64-toh-functions.patch:
hivex.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
--- NEW FILE 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch ---
>From d707ecc55ac2de267608435bdc1052176aecff46 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Thu, 29 Oct 2009 18:36:12 +0000
Subject: [PATCH 2/2] RHEL 5: Also add le{16,64}toh functions
---
hivex/hivex.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/hivex/hivex.c b/hivex/hivex.c
index 85d6c7b..a0a730c 100644
--- a/hivex/hivex.c
+++ b/hivex/hivex.c
@@ -45,9 +45,15 @@
#ifndef be64toh
#define be64toh(x) __bswap_64 (x)
#endif
+#ifndef le16toh
+#define le32toh(x) (x)
+#endif
#ifndef le32toh
#define le32toh(x) (x)
#endif
+#ifndef le64toh
+#define le32toh(x) (x)
+#endif
#else
#ifndef be32toh
#define be32toh(x) (x)
@@ -55,9 +61,15 @@
#ifndef be64toh
#define be64toh(x) (x)
#endif
+#ifndef le16toh
+#define le16toh(x) __bswap_16 (x)
+#endif
#ifndef le32toh
#define le32toh(x) __bswap_32 (x)
#endif
+#ifndef le64toh
+#define le64toh(x) __bswap_64 (x)
+#endif
#endif
#include "hivex.h"
--
1.6.5.rc2
0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch:
configure.ac | 2 +-
hivex/hivex.c | 31 ++++++++++++++++++++++++++++++-
hivex/hivexget.c | 2 ++
hivex/hivexml.c | 3 ++-
4 files changed, 35 insertions(+), 3 deletions(-)
Index: 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch 29 Oct 2009 17:57:57 -0000 1.1
+++ 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch 29 Oct 2009 18:38:09 -0000 1.2
@@ -1,7 +1,7 @@
From a4e27cdf4d3b831792dd20d796dc98a5bc684290 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Thu, 29 Oct 2009 17:54:48 +0000
-Subject: [PATCH] RHEL 5: Detect endianness functions and supply them.
+Subject: [PATCH 1/2] RHEL 5: Detect endianness functions and supply them.
---
configure.ac | 2 +-
Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- libguestfs.spec 29 Oct 2009 18:23:40 -0000 1.76
+++ libguestfs.spec 29 Oct 2009 18:38:10 -0000 1.77
@@ -5,15 +5,16 @@ Summary: Access and modify virtual m
Name: libguestfs
Epoch: 1
Version: 1.0.75
-Release: 1%{?dist}.4
+Release: 1%{?dist}.5
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-# Next two lines should be removed in 1.0.76:
+# Next lines should be removed in 1.0.76:
Patch0: 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
+Patch1: 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
BuildRequires: autoconf, automake, libtool, gettext-devel
# Currently fails on PPC because:
@@ -325,6 +326,7 @@ Requires: jpackage-utils
# Remove this in 1.0.76:
%patch0 -p1
+%patch1 -p1
mv inspector/Makefile.am inspector/Makefile.am.orig
echo 'docdir = ${datadir}/doc/${PACKAGE}' > inspector/Makefile.am
cat inspector/Makefile.am.orig >> inspector/Makefile.am
@@ -575,7 +577,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.4
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.5
- New upstream release 1.0.75.
- New library: libhivex.
- New tools: virt-win-reg, hivexml, hivexget.
- Previous message (by thread): rpms/perl-Test-CPAN-Meta/F-12 .cvsignore, 1.4, 1.5 perl-Test-CPAN-Meta.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message (by thread): rpms/tcl-trf/F-10 trf2.1.4-noripemd.patch, NONE, 1.1 sources, 1.2, 1.3 tcl-trf.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list