[trafficserver] - Harden build with PIE flags, ref bz#955127.
Jan-Frode Myklebust
janfrode at fedoraproject.org
Mon Jun 3 08:44:46 UTC 2013
commit 43a3a2345f535f9811c5c918da3027555acb5462
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date: Mon Jun 3 10:43:54 2013 +0200
- Harden build with PIE flags, ref bz#955127.
trafficserver.spec | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/trafficserver.spec b/trafficserver.spec
index 78cc43e..5412d41 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
Summary: Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
Name: trafficserver
Version: 3.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: ASL 2.0
Group: System Environment/Daemons
Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -41,7 +41,7 @@ caching proxy server.
%build
./configure --enable-layout=Gentoo --libdir=%{_libdir}/trafficserver --with-tcl=%{_libdir} --with-user=ats --with-group=ats
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
%install
echo $RPM_BUILD_ROOT
@@ -59,7 +59,7 @@ $RPM_BUILD_ROOT/usr/share/man/man1/ts-disable.1
mv $RPM_BUILD_ROOT/usr/share/man/man1/exit.1 \
$RPM_BUILD_ROOT/usr/share/man/man1/ts-exit.1
cat <<EOF > README.fedora
-The man-pages for enable, disable and exit was renamed to ts-enable,
+The man-pages for enable, disable and exit was renamed to ts-enable,
ts-disable and ts-exit to avoid conflicts with other man-pages.
EOF
@@ -93,7 +93,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_filter.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/regex_remap.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/stats_over_http.la
-#
+#
perl -pi -e 's/^CONFIG.*proxy.config.proxy_name STRING.*$/CONFIG proxy.config.proxy_name STRING FIXME.example.com/' \
$RPM_BUILD_ROOT/etc/trafficserver/records.config
perl -pi -e 's/^CONFIG.*proxy.config.ssl.server.cert.path.*$/CONFIG proxy.config.ssl.server.cert.path STRING \/etc\/pki\/tls\/certs\//' \
@@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, ats, ats, -)
-%doc README CHANGES NOTICE README.fedora LICENSE
+%doc README CHANGES NOTICE README.fedora LICENSE
%attr(0644, root, root) /usr/share/man/man1/*
%attr(0755,root,root) /usr/bin/traffic*
%attr(0755,root,root) %dir %{_libdir}/trafficserver
@@ -188,8 +188,8 @@ header files, and Apache httpd style module build system.
%attr(0644,root,root) %{_libdir}/trafficserver/*.so
%changelog
-* Sat Jan 26 2013 Jan-Frode Myklebust <janfrode at tanso.net> - 3.2.4-2
-- Update to 3.2.4 final.
+* Mon Jun 3 2013 Jan-Frode Myklebust <janfrode at tanso.net> - 3.2.4-3
+- Harden build with PIE flags, ref bz#955127.
* Sat Jan 19 2013 Jan-Frode Myklebust <janfrode at tanso.net> - 3.2.4-1
- Update to 3.2.4 release candiate
More information about the scm-commits
mailing list