rpms/wpa_supplicant
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use hardened build macros

Browse Source
This commit is contained in:
Dan Williams 2013-05-07 15:51:51 -05:00
parent 22b8be3d0f
commit 155fa6a6d1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wpa_supplicant.spec
View File

@ -1,11 +1,13 @@
%define rcver %{nil} %define rcver %{nil}
%define snapshot %{nil} %define snapshot %{nil}
%global _hardened_build 1
Summary: WPA/WPA2/IEEE 802.1X Supplicant Summary: WPA/WPA2/IEEE 802.1X Supplicant
Name: wpa_supplicant Name: wpa_supplicant
Epoch: 1 Epoch: 1
Version: 2.0 Version: 2.0
Release: 1%{?dist} Release: 2%{?dist}
License: BSD License: BSD
Group: System Environment/Base Group: System Environment/Base
Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@ -108,6 +110,7 @@ pushd wpa_supplicant
cp %{SOURCE1} .config cp %{SOURCE1} .config
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
LDFLAGS="${LDFLAGS:-%optflags}" ; export LDFLAGS ;
# yes, BINDIR=_sbindir # yes, BINDIR=_sbindir
BINDIR="%{_sbindir}" ; export BINDIR ; BINDIR="%{_sbindir}" ; export BINDIR ;
LIBDIR="%{_libdir}" ; export LIBDIR ; LIBDIR="%{_libdir}" ; export LIBDIR ;
@ -158,7 +161,15 @@ chmod -R 0644 %{name}/examples/*.py
patch -p1 -b --suffix .wimax < %{PATCH100} patch -p1 -b --suffix .wimax < %{PATCH100}
pushd wpa_supplicant pushd wpa_supplicant
make clean make clean
make -C ../src/eap_peer
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
LDFLAGS="${LDFLAGS:-%optflags}" ; export LDFLAGS ;
# yes, BINDIR=_sbindir
BINDIR="%{_sbindir}" ; export BINDIR ;
LIBDIR="%{_libdir}" ; export LIBDIR ;
make V=1 -C ../src/eap_peer
make DESTDIR=%{buildroot} LIB=%{_lib} -C ../src/eap_peer install make DESTDIR=%{buildroot} LIB=%{_lib} -C ../src/eap_peer install
sed -i -e 's|libdir=/usr/lib|libdir=%{_libdir}|g' %{buildroot}/%{_libdir}/pkgconfig/*.pc sed -i -e 's|libdir=/usr/lib|libdir=%{_libdir}|g' %{buildroot}/%{_libdir}/pkgconfig/*.pc
popd popd
@ -229,6 +240,9 @@ fi
%postun -n libeap -p /sbin/ldconfig %postun -n libeap -p /sbin/ldconfig
%changelog %changelog
* Tue May 7 2013 Dan Williams <dcbw@redhat.com> - 1:2.0-2
- Use hardened build macros and ensure they apply to libeap too
* Mon May 6 2013 Dan Williams <dcbw@redhat.com> - 1:2.0-1 * Mon May 6 2013 Dan Williams <dcbw@redhat.com> - 1:2.0-1
- Update to 2.0 - Update to 2.0
- Be less aggressive when roaming due to signal strength changes (rh #837402) - Be less aggressive when roaming due to signal strength changes (rh #837402)