rpms/libguestfs/EL-5 0003-Fix-misspelling-in-previous-commit.patch, NONE, 1.1 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch, 1.2, 1.3 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch, 1.1, 1.2 libguestfs.spec, 1.77, 1.78
Richard W.M. Jones
rjones at fedoraproject.org
Thu Oct 29 18:49:13 UTC 2009
Author: rjones
Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27968
Modified Files:
0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
libguestfs.spec
Added Files:
0003-Fix-misspelling-in-previous-commit.patch
Log Message:
Another upstream fix required for endianness handling.
0003-Fix-misspelling-in-previous-commit.patch:
hivex.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE 0003-Fix-misspelling-in-previous-commit.patch ---
>From 43a8e107ce8ad6eac99da82366bdf63b401e3d31 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Thu, 29 Oct 2009 18:46:46 +0000
Subject: [PATCH 3/3] Fix misspelling in previous commit.
---
hivex/hivex.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hivex/hivex.c b/hivex/hivex.c
index a0a730c..b522ccf 100644
--- a/hivex/hivex.c
+++ b/hivex/hivex.c
@@ -46,13 +46,13 @@
#define be64toh(x) __bswap_64 (x)
#endif
#ifndef le16toh
-#define le32toh(x) (x)
+#define le16toh(x) (x)
#endif
#ifndef le32toh
#define le32toh(x) (x)
#endif
#ifndef le64toh
-#define le32toh(x) (x)
+#define le64toh(x) (x)
#endif
#else
#ifndef be32toh
--
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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch 29 Oct 2009 18:38:09 -0000 1.2
+++ 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch 29 Oct 2009 18:49:13 -0000 1.3
@@ -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 1/2] RHEL 5: Detect endianness functions and supply them.
+Subject: [PATCH 1/3] RHEL 5: Detect endianness functions and supply them.
---
configure.ac | 2 +-
0002-RHEL-5-Also-add-le-16-64-toh-functions.patch:
hivex.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
Index: 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/0002-RHEL-5-Also-add-le-16-64-toh-functions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch 29 Oct 2009 18:38:10 -0000 1.1
+++ 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch 29 Oct 2009 18:49:13 -0000 1.2
@@ -1,7 +1,7 @@
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
+Subject: [PATCH 2/3] RHEL 5: Also add le{16,64}toh functions
---
hivex/hivex.c | 12 ++++++++++++
Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- libguestfs.spec 29 Oct 2009 18:38:10 -0000 1.77
+++ libguestfs.spec 29 Oct 2009 18:49:13 -0000 1.78
@@ -5,7 +5,7 @@ Summary: Access and modify virtual m
Name: libguestfs
Epoch: 1
Version: 1.0.75
-Release: 1%{?dist}.5
+Release: 1%{?dist}.6
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{versi
# 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
+Patch2: 0003-Fix-misspelling-in-previous-commit.patch
BuildRequires: autoconf, automake, libtool, gettext-devel
# Currently fails on PPC because:
@@ -327,6 +328,7 @@ Requires: jpackage-utils
# Remove this in 1.0.76:
%patch0 -p1
%patch1 -p1
+%patch2 -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
@@ -577,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.5
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.6
- New upstream release 1.0.75.
- New library: libhivex.
- New tools: virt-win-reg, hivexml, hivexget.
More information about the fedora-extras-commits
mailing list