rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Build with full read-only relocations (bug #996740).

Browse Source 
Resolves: rhbz#996740
This commit is contained in:
Tim Waugh 2013-08-15 12:48:49 +01:00
parent 4f3285485a
commit 79bffad690
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-full-relro.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.6.3/config-scripts/cups-compiler.m4.full-relro cups-1.6.3/config-scripts/cups-compiler.m4
--- cups-1.6.3/config-scripts/cups-compiler.m4.full-relro 2013-08-15 12:40:51.965747766 +0100
+++ cups-1.6.3/config-scripts/cups-compiler.m4 2013-08-15 12:42:15.083630332 +0100
@@ -171,7 +171,7 @@ if test -n "$GCC"; then
# The -z relro option is provided by the Linux linker command to
# make relocatable data read-only.
if test x$enable_relro = xyes; then
- RELROFLAGS="-Wl,-z,relro"
+ RELROFLAGS="-Wl,-z,relro,-z,now"
fi
;;
esac

8
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 1.6.3
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2
Group: System Environment/Daemons
Url: http://www.cups.org/
@ -64,6 +64,7 @@ Patch33: cups-no-gcry.patch
Patch34: cups-avahi-no-threaded.patch
Patch35: cups-gz-crc.patch
Patch36: cups-ipp-multifile.patch
Patch37: cups-full-relro.patch
Patch100: cups-lspp.patch
@ -251,6 +252,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch35 -p1 -b .gz-crc
# Fixes for jobs with multiple files and multiple formats.
%patch36 -p1 -b .ipp-multifile
# Full relro (bug #996740).
%patch37 -p1 -b .full-relro
%if %lspp
# LSPP support.
@ -637,6 +640,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Thu Aug 15 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-6
- Build with full read-only relocations (bug #996740).
* Tue Aug 6 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-5
- Fixes for jobs with multiple files and multiple formats.