diff --git a/.cvsignore b/.cvsignore index f6d567c..3c131ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libguestfs-1.0.81.tar.gz +libguestfs-1.0.82.tar.gz diff --git a/0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch b/0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch deleted file mode 100644 index d996c76..0000000 --- a/0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dab98a0e52b9bb9930048b94d637a2fdb218fc45 Mon Sep 17 00:00:00 2001 -From: Richard Jones -Date: Thu, 28 Jan 2010 09:59:08 +0000 -Subject: [PATCH] supermin: Add special case for libgcc_s-*.so.N - -Because this file contains the GCC version and a date, it frequently -changes on the host. Create a special case so that this file is -matched using a wildcard for the version/date part of the name. ---- - appliance/supermin-split.sh.in | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in -index 7b83afb..c710dc3 100755 ---- a/appliance/supermin-split.sh.in -+++ b/appliance/supermin-split.sh.in -@@ -78,6 +78,10 @@ for path in $(find -not -name fakeroot.log); do - elif [[ "$file" =~ '^libbfd-.*\.so$' ]]; then - echo "$dir/libbfd-*.so" >&6 - -+ # Special case for libgcc_s--.so.N -+ elif [[ "$file" =~ '^libgcc_s-.*\.so\.([0-9]+)$' ]]; then -+ echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6 -+ - # libfoo-1.2.3.so - elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so$' ]]; then - echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6 --- -1.6.5.2 - diff --git a/libguestfs-1.0.81-more-unreadable-files.patch b/libguestfs-1.0.81-more-unreadable-files.patch deleted file mode 100644 index 8885af2..0000000 --- a/libguestfs-1.0.81-more-unreadable-files.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/appliance/make.sh.in b/appliance/make.sh.in -index b3cbe92..677e995 100755 ---- a/appliance/make.sh.in -+++ b/appliance/make.sh.in -@@ -98,6 +98,23 @@ if [ "@DIST@" = "REDHAT" ]; then - /usr/sbin/tcpd \ - /lib/dbus-1/dbus-daemon-launch-helper \ - /lib64/dbus-1/dbus-daemon-launch-helper \ -+ /etc/passwd- \ -+ /etc/group- \ -+ /etc/gshadow \ -+ /etc/gshadow- \ -+ /etc/shadow \ -+ /etc/shadow- \ -+ /etc/securetty \ -+ /etc/sysconfig/iptables-config \ -+ /etc/default/useradd \ -+ /etc/security/opasswd \ -+ /etc/libaudit.conf \ -+ /var/log/tallylog \ -+ /var/log/maillog \ -+ /var/log/secure \ -+ /var/log/spooler \ -+ /var/log/messages \ -+ /var/log/btmp \ - $(cd initramfs && echo usr/sbin/glibc_post_upgrade.*) - - # Kernel modules take up nearly half of the image. Only include ones diff --git a/libguestfs.spec b/libguestfs.spec index 484250b..d98c56c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -4,8 +4,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.0.81 -Release: 8%{?dist} +Version: 1.0.82 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -15,14 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Disable FUSE tests, not supported in Koji at the moment. Patch0: libguestfs-1.0.79-no-fuse-test.patch -# Backport special handling of libgcc_s dependency. -# http://git.annexia.org/?p=libguestfs.git;a=commit;h=dab98a0e52b9bb9930048b94d637a2fdb218fc45 -Patch1: 0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch - -# Backport unreadable files patch from RHEL 6 / upstream: -# http://git.annexia.org/?p=libguestfs.git;a=commitdiff;h=3c398c8928d3860ca9e3c413046b6f38318bb6ef -Patch2: libguestfs-1.0.81-more-unreadable-files.patch - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -342,8 +334,6 @@ Requires: jpackage-utils %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 mkdir -p daemon/m4 @@ -619,6 +609,21 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 28 2010 Richard W.M. Jones - 1.0.82-1 +- New upstream version 1.0.82. This includes the two patches + we were carrying, so those are now removed. +- This release fixes: + RHBZ#559498 (Oriya translation). + RHBZ#559480 (Punjabi translation). + RHBZ#558593 (Should prevent corruption by multilib). + RHBZ#559237 (Telugu translation). + RHBZ#557655 (Use xstrtol/xstrtoll to parse integers in guestfish). + RHBZ#557195 (Missing crc kernel modules for recent Linux). +- In addition this contains numerous fixes to the hivex library + for parsing Windows Registry files, making hivex* and virt-win-reg + more robust. +- New API call 'filesize'. + * Thu Jan 28 2010 Richard W.M. Jones - 1.0.81-8 - Backport special handling of libgcc_s.so. - Backport unreadable files patch from RHEL 6 / upstream. diff --git a/sources b/sources index 2d40c32..3fcc596 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9fda4e497fadd3c24e0e4792313bc228 libguestfs-1.0.81.tar.gz +fe858d6a067b8fcb51c0464c86252cfa libguestfs-1.0.82.tar.gz