diff --git a/0001-ocaml-Link-the-C-bindings-with-LDFLAGS-RHBZ-1548536.patch b/0001-ocaml-Link-the-C-bindings-with-LDFLAGS-RHBZ-1548536.patch deleted file mode 100644 index 04fe19f..0000000 --- a/0001-ocaml-Link-the-C-bindings-with-LDFLAGS-RHBZ-1548536.patch +++ /dev/null @@ -1,48 +0,0 @@ -From be51757920b56a77e2e63247f9a8409ce994d33c Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 26 Feb 2018 12:38:12 +0000 -Subject: [PATCH] ocaml: Link the C bindings with LDFLAGS (RHBZ#1548536). - -Use the ocamlmklib -ldopt flag to pass the general $(LDFLAGS) when -calling gcc to link dllmlhivex.so. We were already passing $(CFLAGS) -when building the object file. - -When building using Fedora's standard hardening flags this gives: - -ocamlmklib -o mlhivex hivex_c.o hivex.cmo \ - -verbose -ldopt '-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld' \ - -L../lib/.libs -lhivex -+ gcc -shared -o ./dllmlhivex.so hivex_c.o -Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L../lib/.libs -lhivex -+ ar rc ./libmlhivex.a hivex_c.o; ranlib ./libmlhivex.a -+ /usr/bin/ocamlc -a -o mlhivex.cma hivex.cmo -dllib -lmlhivex -cclib -lmlhivex -cclib -L../lib/.libs -cclib -lhivex - -This also works if $(LDFLAGS) is empty, because ocamlmklib ignores --ldopt ''. ---- - ocaml/Makefile.am | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am -index 61db095..85655b6 100644 ---- a/ocaml/Makefile.am -+++ b/ocaml/Makefile.am -@@ -41,10 +41,14 @@ OBJS = hivex_c.o hivex.cmo - XOBJS = $(OBJS:.cmo=.cmx) - - mlhivex.cma: $(OBJS) -- $(OCAMLMKLIB) -o mlhivex $^ -L$(top_builddir)/lib/.libs -lhivex -+ $(OCAMLMKLIB) -o mlhivex $^ \ -+ -ldopt '$(LDFLAGS)' \ -+ -L$(top_builddir)/lib/.libs -lhivex - - mlhivex.cmxa: $(XOBJS) -- $(OCAMLMKLIB) -o mlhivex $^ -L$(top_builddir)/lib/.libs -lhivex -+ $(OCAMLMKLIB) -o mlhivex $^ \ -+ -ldopt '$(LDFLAGS)' \ -+ -L$(top_builddir)/lib/.libs -lhivex - - hivex_c.o: hivex_c.c - $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $< --- -2.13.2 - diff --git a/README.md b/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/hivex-1.3.15.tar.gz b/hivex-1.3.15.tar.gz deleted file mode 100644 index d7d61fb..0000000 Binary files a/hivex-1.3.15.tar.gz and /dev/null differ diff --git a/hivex-1.3.15.tar.gz.sig b/hivex-1.3.15.tar.gz.sig deleted file mode 100644 index 17e6317..0000000 --- a/hivex-1.3.15.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJalDSOAAoJEJFzj3Pht2igdNYP/2R2+SkPNutZfQpUZfiKD/vQ -RRAQjePYncUjNUc2WgX7LXmJN1z9WfKRzUGqQG7sD/B7BnecBtEOP4Dyw5PpjgBQ -ae4ErdeU6uFv5xSiprnYErfGJrhYSBfDKilDjrdO7J4AlTlVVlgfeb7C5TopER81 -brVJ7iXuF6rbZmQP3c0D3GWdez3Nw719e6MmdM9FFGQQS8hg9vZlNYQPyiFEQx1U -nNjSMaoft+OWYEQp56arjPOLj4JiIcIH9B/HLu8Tcl4FEogTCVyMsodyEFXzfBUm -21UfIn/RNEXjI8DJ/k7kh35uWEwv8hb/0YszGAWNpSt+rrdx9+decjNdNI2DZs65 -XEcuboWN7UOZJf2p+8f78QVcbwNPRjpnfGZaVLYJYNON3y/lyvhrA8je5FOzsyVA -4G6BwU3ythoS2NTK3Q76I7UdMDvz6vydgsLAruVVtMX5x1M7fXoplRxi1nkRjCvQ -Qgmo0L/rwwDUitRmlRyyJqZK7j+lMlltuZAck9XCUtd72VRAUj4f56I8Xo2wwT0Y -ioFer6o02K18pjhGLikV4ujUUKAkC1lAK1QhsEsp7y2isOe1mA3ptcGrz4rElcaH -f78Yr7b28Gl9HSGg98uhYEwWVCl5fUwXhDUQVVNutDRPKI479O390uGG7ZNZTghS -Lv/P/Uz1ijp+m8Hi5WsX -=gmjv ------END PGP SIGNATURE----- diff --git a/hivex-1.3.17.tar.gz b/hivex-1.3.17.tar.gz new file mode 100644 index 0000000..5499491 Binary files /dev/null and b/hivex-1.3.17.tar.gz differ diff --git a/hivex-1.3.17.tar.gz.sig b/hivex-1.3.17.tar.gz.sig new file mode 100644 index 0000000..9fedfc2 --- /dev/null +++ b/hivex-1.3.17.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAlxHnNsRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKCbkxAAortQKeA7TDTeiTk3dwI/tQ+4VVqe90lt +L/xWnDtR6ZH5DZ4FgcJbaKx9PCBtaQxyFBjA5qcrEClK8fTfm3NGNPQuSX4YDN83 +3jJx2uOtM7Io5hpFrXeWC22m77dqQKeU0r1oblJtf1kK1SEef6HL44flCtGr+HlM +37nwm29ToSl5Ksp9XvBqT5smQVuUPjqwcm+4jYUR88SnFmkTpneZYYTstDbqzvUm +RT089O/q+4JLh6egfyA66wXTfzhsqe3HRZtG7pPhe+j/HBIfYmAigEi4Cm/6pFrc +vNJAZ9KJ50no69A2jZ86Dfy4/4nwjYc/aDZ0vIZ4Fairj+LzTxQwfQeYk1BCqb2z +XNNRl3pUDkrk3jrAPnxqR2z/2qsEgoSrVDEQlhVUZ1n/WOTqxst1F0YHOeHHWun5 +O1d2nV8i1A8JAysHx77smKscpKtu4jcymr4SmqXYSG90BvuqxJgpPsX6rln38DKX +qA3Zj7wKkqOTBbX+JInBwMcWOzzAO38hQkQjuOG71CQ6CKVGdnovp4OHDcwsmkp4 +KbCjnXgIl5DOxCrnVaWtPV5Zy6smst982fG0zPD/m42Dz7+Tb4O1np8zfLH9C4Dx +CdD3otIo0XOJM50Bvu9Oqn/SP8j8nDqMZtiCg+gXBRyVdl37EGqtwd/2bt7TRWSV +xmddKuLdf6Q= +=+f/m +-----END PGP SIGNATURE----- diff --git a/hivex.spec b/hivex.spec index 3389712..2aa6e0c 100644 --- a/hivex.spec +++ b/hivex.spec @@ -5,8 +5,8 @@ %endif Name: hivex -Version: 1.3.15 -Release: 12 +Version: 1.3.17 +Release: 2 Summary: Windows Registry "hive" extraction library License: LGPLv2 URL: http://libguestfs.org/ @@ -15,10 +15,7 @@ Source0: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz Source1: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz.sig Source2: libguestfs.keyring -Patch1: 0001-ocaml-Link-the-C-bindings-with-LDFLAGS-RHBZ-1548536.patch - -BuildRequires: autoconf, automake, libtool, gettext-devel, perl-interpreter, perl-devel, perl-generators, perl, perl-podlators -BuildRequires: perl(bytes), perl(Carp), perl(Encode), perl(ExtUtils::MakeMaker), perl(Exporter), perl(IO::Scalar), perl(IO::Stringy), perl(strict), perl(Test::More), perl(utf8), perl(vars), perl(warnings), perl(XSLoader), perl(Test::Pod) >= 1.00, perl(Test::Pod::Coverage) >= 1.00 +BuildRequires: perl-interpreter, perl, perl-podlators, perl-devel, perl-generators, perl(bytes), perl(Carp), perl(Encode), perl(ExtUtils::MakeMaker), perl(Exporter), perl(IO::Scalar), perl(IO::Stringy), perl(strict), perl(Test::More), perl(utf8), perl(vars), perl(warnings), perl(XSLoader), perl(Test::Pod) >= 1.00, perl(Test::Pod::Coverage) >= 1.00 %if %{with ocaml} BuildRequires: ocaml @@ -29,6 +26,7 @@ BuildRequires: python2-devel, python-unversioned-command, python3-devel, ruby-d Provides: bundled(gnulib) + %description Hivex is a library for extracting the contents of Windows Registry "hive" files. It is designed to be secure against buggy or malicious registry files. @@ -44,6 +42,7 @@ If you just want to export or modify the Registry of a Windows virtual machine, Hivex is also comes with language bindings for OCaml, Perl, Python and Ruby. + %package devel Summary: Development package for %{name} Requires: %{name} = %{version}-%{release} @@ -52,7 +51,6 @@ Requires: pkgconfig Provides: %{name}-devel Obsoletes: %{name}-devel - %description devel Development tools and libraries for %{name} are included in %{name}-devel. @@ -65,12 +63,11 @@ Development tools and libraries for %{name} are included in %{name}-devel. Summary: Provide OCaml bindings for %{name} Requires: %{name} = %{version}-%{release} - %description -n ocaml-%{name} OCaml bindings for %{name} are included in ocaml-%{name}. -This is for toplevel and scripting access only. To compile OCaml -programs which use %{name} you will also need ocaml-%{name}-devel. +Only for toplevel and scripting access. To compile OCaml +programs which use %{name} you will also need ocaml-%{name}-devel package. %package -n ocaml-%{name}-devel @@ -78,7 +75,6 @@ Summary: Development package for %{name} OCaml bindings Requires: ocaml-%{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} - %description -n ocaml-%{name}-devel Development libraries required to use the OCaml bindings for %{name} are in ocaml-%{name}-devel. %endif @@ -89,7 +85,6 @@ Summary: Provide perl bindings for %{name} Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - %description -n perl-%{name} Perl bindings for %{name} are included in perl-%{name}. @@ -128,10 +123,9 @@ Ruby bindings for %{name} are included ruby-%{name}. tmphome="$(mktemp -d)" && gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup -p1 -n %{name}-%{version} -autoreconf -i -f - copy="$(mktemp -d)" && cp -a . "$copy" && mv "$copy" python3 + %build %configure \ %if !%{with ocaml} @@ -147,32 +141,20 @@ cd python3 %make_build V=1 INSTALLDIRS=vendor cd .. + %install cd python3 %make_install DESTDIR=$RPM_BUILD_ROOT INSTALLDIRS=vendor cd .. %make_install DESTDIR=$RPM_BUILD_ROOT INSTALLDIRS=vendor -#rm $RPM_BUILD_ROOT%{_libdir}/libhivex.la - -# Remove unwanted Perl files: -# find $RPM_BUILD_ROOT -name perllocal.pod -delete -# find $RPM_BUILD_ROOT -name .packlist -delete -# find $RPM_BUILD_ROOT -name '*.bs' -delete - -# Remove unwanted Python files: -# rm $RPM_BUILD_ROOT%{python2_sitearch}/libhivexmod.la -# rm $RPM_BUILD_ROOT%{python3_sitearch}/libhivexmod.la - %find_lang %{name} %check make check -cd python3 -make check -cd .. +cd python3 && make check && cd .. %files -f %{name}.lang @@ -185,11 +167,15 @@ cd .. %exclude %{_libdir}/perl5/perllocal.pod %exclude %{python2_sitearch}/libhivexmod.la %exclude %{python3_sitearch}/libhivexmod.la +%{_mandir}/man1/hivexget.1* +%{_mandir}/man1/hivexml.1* +%{_mandir}/man1/hivexsh.1* %files devel %doc LICENSE %{_libdir}/libhivex.so +%{_mandir}/man3/hivex.3* %{_includedir}/hivex.h %{_libdir}/pkgconfig/hivex.pc %{_libdir}/libhivex.a @@ -247,5 +233,5 @@ cd .. %changelog -* Sat Nov 30 2019 jiaxiya - 1.3.15-12 +* Sat Nov 30 2019 jiaxiya - 1.3.17-2 - Package init