Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
|
6dff8baf7d | |
|
dfcb4f6b00 | |
|
64691ab2d1 |
|
@ -3,3 +3,5 @@
|
|||
/hivex-*.tar.gz
|
||||
/hivex-1.3.14.tar.gz.sig
|
||||
/hivex-1.3.15.tar.gz.sig
|
||||
/hivex-1.3.16.tar.gz.sig
|
||||
/hivex-1.3.17.tar.gz.sig
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
From be51757920b56a77e2e63247f9a8409ce994d33c Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
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
|
||||
|
19
hivex.spec
19
hivex.spec
|
@ -9,8 +9,8 @@
|
|||
%global verify_tarball_signature 1
|
||||
|
||||
Name: hivex
|
||||
Version: 1.3.15
|
||||
Release: 11%{?dist}
|
||||
Version: 1.3.17
|
||||
Release: 1%{?dist}
|
||||
Summary: Read and write Windows Registry binary hive files
|
||||
|
||||
License: LGPLv2
|
||||
|
@ -26,11 +26,6 @@ Source1: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz.s
|
|||
Source2: libguestfs.keyring
|
||||
%endif
|
||||
|
||||
# Upstream patch to fix injection of LDFLAGS.
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1548536
|
||||
Patch1: 0001-ocaml-Link-the-C-bindings-with-LDFLAGS-RHBZ-1548536.patch
|
||||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: perl-generators
|
||||
|
@ -201,9 +196,6 @@ gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
|||
%setup -q
|
||||
%autopatch -p1
|
||||
|
||||
# Because the patch touches Makefile.am, rerun autotools.
|
||||
autoreconf -i -f
|
||||
|
||||
# Build Python 3 bindings in a separate subdirectory. We have to
|
||||
# build everything twice unfortunately.
|
||||
copy="$(mktemp -d)"
|
||||
|
@ -327,6 +319,13 @@ popd
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 22 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.17-1
|
||||
- New upstream version 1.3.17.
|
||||
- Fixes regression of RHBZ#1145056.
|
||||
|
||||
* Thu Jan 17 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3.16-1
|
||||
- New upstream version 1.3.16.
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.15-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
|||
SHA512 (hivex-1.3.15.tar.gz) = 7ce4fd6842c7545a41dc4c4268db5f0629d618a17f29a68dda6990a0dd4530cdf0e0c654f00104274c57e792aa4bcf712bcac1c76e2fd2dbce9aeae1e5751517
|
||||
SHA512 (hivex-1.3.15.tar.gz.sig) = 9cd0231f9d0293657aeec398c6b601800c7d61925340504c338a04339d7fa6d534f5b0cdf40bb3f94d7cd8fddeba29f049a9946163e5b0fc0186f07f48646802
|
||||
SHA512 (hivex-1.3.17.tar.gz) = 901ab327656c0d93dba4d6a005bdd15ef41660b1edd173613b0960d817eb6b5697a590267b7b4f06f3898ba8fcda2b718792fd288559ce7900e8a10b078eba36
|
||||
SHA512 (hivex-1.3.17.tar.gz.sig) = 35f14c20f5c760e292bd05eeb5ea34bcc9e6a2f23d2ea79621c9d43af366cefcbc709a9bee437560fe5c486266b33f1eedde7432c2445822d4b07174b914addc
|
||||
|
|
Loading…
Reference in New Issue