rpms/hivex
6
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream version 1.3.8.

Browse Source 
- Fixes handling of keys which use ri-records, for both reading and
  writing (RHBZ#717583, RHBZ#987463).
- Remove upstream patch.
- Rebase dirs patch against new upstream sources.
- Rebase ruby patch against new upstream sources.
- Modernize the RPM spec file.
- Fix .gitignore.
This commit is contained in:
Richard W.M. Jones 2013-07-25 23:20:21 +01:00
parent 57d5459f31
commit 843c9dc66e
8 changed files with 59 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitignore vendored
View File

@ -1,14 +1,3 @@
hivex-1.2.2.tar.gz /.build-*
/hivex-1.2.3.tar.gz /clog
/hivex-1.2.4.tar.gz /hivex-*.tar.gz
/hivex-1.2.5.tar.gz
/hivex-1.2.6.tar.gz
/hivex-1.2.7.tar.gz
/hivex-1.2.8.tar.gz
/hivex-1.3.0.tar.gz
/hivex-1.3.1.tar.gz
/hivex-1.3.2.tar.gz
/hivex-1.3.3.tar.gz
/hivex-1.3.5.tar.gz
/hivex-1.3.6.tar.gz
/hivex-1.3.7.tar.gz

53
0001-ruby-Use-updated-rake-package-names-but-allow-fallba.patch
View File

@ -1,53 +0,0 @@
From 8d093bd981135453e2bdb22a98fc552f81b71f52 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 15 Feb 2013 11:03:27 +0000
Subject: [PATCH] ruby: Use updated rake package names, but allow fallback to
the old names.
---
ruby/Rakefile.in | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index 4cb2d67..204e37c 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -17,9 +17,24 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
require 'rake/clean'
-require 'rake/rdoctask'
require 'rake/testtask'
-require 'rake/gempackagetask'
+
+# Used to be rake/rdoctask. Now it's rdoc/task.
+begin
+ require 'rdoc/task'
+rescue
+ require 'rake/rdoctask'
+end
+
+# Used to be rake/gempackagetask. Now it's rubygems/package_task. Also
+# we need to use the appropriate class name below.
+begin
+ require 'rubygems/package_task'
+ gempackagetask='Gem::PackageTask'
+rescue
+ require 'rake/gempackagetask'
+ gempackagetask='Rake::GemPackageTask'
+end
PKG_NAME='@PACKAGE_NAME@'
PKG_VERSION='@PACKAGE_VERSION@'
@@ -108,7 +123,7 @@ Ruby bindings for hivex.
EOF
end
-Rake::GemPackageTask.new(SPEC) do |pkg|
+eval(gempackagetask).new(SPEC) do |pkg|
pkg.need_tar = true
pkg.need_zip = true
end
--
1.8.1.2

24
hivex-1.2.3-dirs.patch
View File

@ -1,24 +0,0 @@
diff -up hivex-1.2.3/perl/Makefile.am.dirs hivex-1.2.3/perl/Makefile.am
--- hivex-1.2.3/perl/Makefile.am.dirs 2010-11-19 12:44:02.177644892 -0500
+++ hivex-1.2.3/perl/Makefile.am 2010-11-19 12:44:17.137516124 -0500
@@ -40,7 +40,7 @@ $(TESTS): src_deps all
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/lib/.libs
-INSTALLDIRS = site
+INSTALLDIRS = vendor
all: Makefile-pl src_deps
$(MAKE) -f Makefile-pl
diff -up hivex-1.2.3/perl/Makefile.in.dirs hivex-1.2.3/perl/Makefile.in
--- hivex-1.2.3/perl/Makefile.in.dirs 2010-11-19 12:44:08.577393593 -0500
+++ hivex-1.2.3/perl/Makefile.in 2010-11-19 12:44:32.717483099 -0500
@@ -740,7 +740,7 @@ EXTRA_DIST = \
@HAVE_PERL_TRUE@TESTS_ENVIRONMENT = \
@HAVE_PERL_TRUE@ LD_LIBRARY_PATH=$(top_builddir)/lib/.libs
-@HAVE_PERL_TRUE@INSTALLDIRS = site
+@HAVE_PERL_TRUE@INSTALLDIRS = vendor
all: all-am
.SUFFIXES:

12
hivex-1.3.8-dirs.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ur hivex-1.3.8.old/perl/Makefile.am hivex-1.3.8/perl/Makefile.am
--- hivex-1.3.8.old/perl/Makefile.am 2013-07-25 15:09:00.000000000 +0100
+++ hivex-1.3.8/perl/Makefile.am 2013-07-25 23:14:10.952149773 +0100
@@ -43,7 +43,7 @@
TESTS_ENVIRONMENT = ../run
-INSTALLDIRS = site
+INSTALLDIRS = vendor
all: Makefile-pl src_deps
$(MAKE) -f Makefile-pl

57
hivex.spec
View File

@ -6,15 +6,21 @@
%endif %endif
Name: hivex Name: hivex
Version: 1.3.7 Version: 1.3.8
Release: 8%{?dist} Release: 1%{?dist}
Summary: Read and write Windows Registry binary hive files Summary: Read and write Windows Registry binary hive files
Group: Development/Libraries
License: LGPLv2 License: LGPLv2
URL: http://libguestfs.org/ URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz Source0: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Fix Perl directory install path.
Patch0: %{name}-1.3.8-dirs.patch
# Use VENDOR*DIR instead of SITE*DIR (not yet upstream).
Patch2: ruby-vendor-not-site.patch
BuildRequires: autoconf, automake, libtool, gettext-devel
BuildRequires: perl BuildRequires: perl
BuildRequires: perl-Test-Simple BuildRequires: perl-Test-Simple
@ -38,16 +44,6 @@ BuildRequires: libxml2-devel
# the old version of libguestfs that included this library: # the old version of libguestfs that included this library:
Conflicts: libguestfs <= 1:1.0.84 Conflicts: libguestfs <= 1:1.0.84
# Fix Perl directory install path.
Patch0: %{name}-1.2.3-dirs.patch
# Use VENDOR*DIR instead of SITE*DIR (not yet upstream).
Patch2: ruby-1.9-vendor-not-site.patch
BuildRequires: autoconf, automake, libtool, gettext-devel
# Fix for newest Ruby (upstream since 2013-02-15).
Patch3: 0001-ruby-Use-updated-rake-package-names-but-allow-fallba.patch
# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions # https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
Provides: bundled(gnulib) Provides: bundled(gnulib)
@ -85,7 +81,6 @@ For Ruby bindings, see 'ruby-hivex'.
%package devel %package devel
Summary: Development tools and libraries for %{name} Summary: Development tools and libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
@ -97,7 +92,6 @@ for %{name}.
%package static %package static
Summary: Statically linked library for %{name} Summary: Statically linked library for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -109,7 +103,6 @@ for %{name}.
%if %{with ocaml} %if %{with ocaml}
%package -n ocaml-%{name} %package -n ocaml-%{name}
Summary: OCaml bindings for %{name} Summary: OCaml bindings for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -122,7 +115,6 @@ programs which use %{name} you will also need ocaml-%{name}-devel.
%package -n ocaml-%{name}-devel %package -n ocaml-%{name}-devel
Summary: OCaml bindings for %{name} Summary: OCaml bindings for %{name}
Group: Development/Libraries
Requires: ocaml-%{name} = %{version}-%{release} Requires: ocaml-%{name} = %{version}-%{release}
@ -134,7 +126,6 @@ required to use the OCaml bindings for %{name}.
%package -n perl-%{name} %package -n perl-%{name}
Summary: Perl bindings for %{name} Summary: Perl bindings for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@ -145,7 +136,6 @@ perl-%{name} contains Perl bindings for %{name}.
%package -n python-%{name} %package -n python-%{name}
Summary: Python bindings for %{name} Summary: Python bindings for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@ -157,7 +147,6 @@ python-%{name} contains Python bindings for %{name}.
%package -n ruby-%{name} %package -n ruby-%{name}
Summary: Ruby bindings for %{name} Summary: Ruby bindings for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: ruby(release) = 2.0.0 Requires: ruby(release) = 2.0.0
Requires: ruby Requires: ruby
@ -172,7 +161,6 @@ ruby-%{name} contains Ruby bindings for %{name}.
%patch0 -p1 -b .dirs %patch0 -p1 -b .dirs
%patch2 -p1 -b .rubyvendor %patch2 -p1 -b .rubyvendor
%patch3 -p1 -b .rubyrake
autoreconf -i autoreconf -i
@ -194,7 +182,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*hivex*
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Remove unwanted libtool *.la file: # Remove unwanted libtool *.la file:
@ -211,17 +198,12 @@ rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.la
%find_lang %{name} %find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-)
%doc README LICENSE %doc README LICENSE
%{_bindir}/hivexget %{_bindir}/hivexget
%{_bindir}/hivexml %{_bindir}/hivexml
@ -235,7 +217,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root,-)
%doc LICENSE %doc LICENSE
%{_libdir}/libhivex.so %{_libdir}/libhivex.so
%{_mandir}/man3/hivex.3* %{_mandir}/man3/hivex.3*
@ -244,14 +225,12 @@ rm -rf $RPM_BUILD_ROOT
%files static %files static
%defattr(-,root,root,-)
%doc LICENSE %doc LICENSE
%{_libdir}/libhivex.a %{_libdir}/libhivex.a
%if %{with ocaml} %if %{with ocaml}
%files -n ocaml-%{name} %files -n ocaml-%{name}
%defattr(-,root,root,-)
%doc README %doc README
%{_libdir}/ocaml/hivex %{_libdir}/ocaml/hivex
%exclude %{_libdir}/ocaml/hivex/*.a %exclude %{_libdir}/ocaml/hivex/*.a
@ -263,7 +242,6 @@ rm -rf $RPM_BUILD_ROOT
%files -n ocaml-%{name}-devel %files -n ocaml-%{name}-devel
%defattr(-,root,root,-)
%{_libdir}/ocaml/hivex/*.a %{_libdir}/ocaml/hivex/*.a
%{_libdir}/ocaml/hivex/*.cmxa %{_libdir}/ocaml/hivex/*.cmxa
%{_libdir}/ocaml/hivex/*.cmx %{_libdir}/ocaml/hivex/*.cmx
@ -272,14 +250,12 @@ rm -rf $RPM_BUILD_ROOT
%files -n perl-%{name} %files -n perl-%{name}
%defattr(-,root,root,-)
%{perl_vendorarch}/* %{perl_vendorarch}/*
%{_mandir}/man3/Win::Hivex.3pm* %{_mandir}/man3/Win::Hivex.3pm*
%{_mandir}/man3/Win::Hivex::Regedit.3pm* %{_mandir}/man3/Win::Hivex::Regedit.3pm*
%files -n python-%{name} %files -n python-%{name}
%defattr(-,root,root,-)
%{python_sitearch}/*.py %{python_sitearch}/*.py
%{python_sitearch}/*.pyc %{python_sitearch}/*.pyc
%{python_sitearch}/*.pyo %{python_sitearch}/*.pyo
@ -287,13 +263,22 @@ rm -rf $RPM_BUILD_ROOT
%files -n ruby-%{name} %files -n ruby-%{name}
%defattr(-,root,root,-)
%doc ruby/doc/site/* %doc ruby/doc/site/*
%{ruby_vendorlibdir}/hivex.rb %{ruby_vendorlibdir}/hivex.rb
%{ruby_vendorarchdir}/_hivex.so %{ruby_vendorarchdir}/_hivex.so
%changelog %changelog
* Thu Jul 25 2013 Richard W.M. Jones <rjones@redhat.com> - 1.3.8-1
- New upstream version 1.3.8.
- Fixes handling of keys which use ri-records, for both reading and
writing (RHBZ#717583, RHBZ#987463).
- Remove upstream patch.
- Rebase dirs patch against new upstream sources.
- Rebase ruby patch against new upstream sources.
- Modernize the RPM spec file.
- Fix .gitignore.
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.3.7-8 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.3.7-8
- Perl 5.18 rebuild - Perl 5.18 rebuild
@ -304,7 +289,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Feb 15 2013 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-6 * Fri Feb 15 2013 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-6
- Fix for latest Ruby in Rawhide. Fixes build failure identified - Fix for latest Ruby in Rawhide. Fixes build failure identified
by mass rebuild yesterday. by mass rebuild yesterday.
- Don't ignore error from running autoreconf. - Do not ignore error from running autoreconf.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.7-3 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

22
ruby-1.9-vendor-not-site.patch
View File

@ -1,22 +0,0 @@
--- hivex-1.3.3/ruby/Makefile.am.old 2012-02-08 10:57:43.447667670 +0000
+++ hivex-1.3.3/ruby/Makefile.am 2012-02-08 10:58:29.024440505 +0000
@@ -47,13 +47,13 @@
$(RAKE) build
$(RAKE) rdoc
-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
+RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
install:
- $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
- $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
- $(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_SITELIB)
- $(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_SITEARCH)
+ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
+ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
+ $(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_VENDORLIB)
+ $(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_VENDORARCH)
endif

22
ruby-vendor-not-site.patch Normal file
View File

@ -0,0 +1,22 @@
--- hivex-1.3.8.old/ruby/Makefile.am 2013-07-25 15:09:00.000000000 +0100
+++ hivex-1.3.8/ruby/Makefile.am 2013-07-25 23:17:05.888067146 +0100
@@ -45,13 +45,13 @@
$(RAKE) build
$(RAKE) rdoc
-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
+RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
+RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
install:
- $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
- $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
- $(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_SITELIB)
- $(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_SITEARCH)
+ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
+ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
+ $(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_VENDORLIB)
+ $(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_VENDORARCH)
endif

2
sources
View File

@ -1 +1 @@
61c1fbc8ec47633523da72ce51fc1b24 hivex-1.3.7.tar.gz 6ac6f5d082ee5cd14a02ca9982cc26d7 hivex-1.3.8.tar.gz