rpms/coq/F-9 coq.spec,1.3,1.4 import.log,1.3,1.4
Alan Dunn
amdunn at fedoraproject.org
Wed Sep 10 17:14:51 UTC 2008
Author: amdunn
Update of /cvs/pkgs/rpms/coq/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32413/F-9
Modified Files:
coq.spec import.log
Log Message:
Fix prelink issues that prevent binaries from working and implement execstack fix.
Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-9/coq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coq.spec 6 Aug 2008 01:48:31 -0000 1.3
+++ coq.spec 10 Sep 2008 17:14:20 -0000 1.4
@@ -25,7 +25,7 @@
Name: coq
Version: 8.1pl3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Coq proof management system
Group: Applications/Engineering
@@ -49,11 +49,12 @@
Patch4: makefile-parser.patch
Patch5: parser-man.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs
+BuildRequires: ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink
%if 0%{?fedora} < 9
BuildRequires: tetex, tetex-latex
# There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8
+# bz# 458467
ExcludeArch: ppc64
%else
BuildRequires: texlive-latex, texlive-texmf
@@ -215,6 +216,11 @@
# Fix permissions in the documentation
chmod -R a+rX refman stdlib
+# Clear any execstack permissions that ELF binaries may have
+for f in bin/*; do
+file $f | grep "ELF" && execstack -c $f
+done
+
%install
rm -rf %{buildroot}
@@ -242,6 +248,21 @@
%endif
mv RecTutorial.v %{buildroot}%{tutorialcodedir}
+# Make sure that prelink does not foul up our bytecode executables by
+# stripping them with a cron job. This is done in install to ensure
+# that exactly the files that are eventually installed are in the
+# list, not all of the files in the bin directory of the build
+
+%define prelinkfilename %{name}-prelink.conf
+cd %{buildroot}%{_bindir}
+for f in *; do
+file $f | grep "not stripped" | sed -e 's/:.*//' -e 's!^!-b %{_bindir}/!' >> %{prelinkfilename}
+done
+
+%define prelinkconfdir %{_sysconfdir}/prelink.conf.d
+mkdir -p %{buildroot}%{prelinkconfdir}
+mv %{prelinkfilename} %{buildroot}%{prelinkconfdir}
+
%clean
rm -rf %{buildroot}
@@ -256,10 +277,10 @@
%{_datadir}/coq
%{_bindir}/coq*
%{_bindir}/gallina
-%{_bindir}/coq-parser
-%if %{opt}
-%{_bindir}/coq-parser.opt
-%endif
+# %%{_bindir}/coq-parser
+# %%if %%{opt}
+# %%{_bindir}/coq-parser.opt
+# %%endif
# Exclude ide files to put in a separate package
%exclude %{_bindir}/coqide*
%exclude %{_datadir}/coq/ide
@@ -267,6 +288,10 @@
%exclude %{_datadir}/coq/*.cmxa
%endif
%{tex_dir}/coq*
+# We DO want to replace any such file with this name - it will only be
+# for Coq, and we want to correctly reflect the set of files that
+# needs to be blacklisted from prelink with this new install
+%config %{prelinkconfdir}/%{prelinkfilename}
%files coqide
%defattr(-,root,root,-)
@@ -300,6 +325,9 @@
%doc README.coq-emacs
%changelog
+* Tue Sep 09 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-4
+- Added creation of prelink blacklist for any bytecode files.
+- Fixed execstack status for binaries.
* Tue Aug 05 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-3
- Changed parser to coq-parser to avoid name conflict with
coda-client.
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log 6 Aug 2008 01:48:31 -0000 1.3
+++ import.log 10 Sep 2008 17:14:20 -0000 1.4
@@ -1,3 +1,4 @@
coq-8_1pl3-1_fc9:F-9:coq-8.1pl3-1.fc9.src.rpm:1216234547
coq-8_1pl3-2_fc9:F-9:coq-8.1pl3-2.fc9.src.rpm:1216551707
coq-8_1pl3-3_fc9:F-9:coq-8.1pl3-3.fc9.src.rpm:1217987203
+coq-8_1pl3-4_fc9:F-9:coq-8.1pl3-4.fc9.src.rpm:1221066514
More information about the fedora-extras-commits
mailing list