[xl2tpd/f18: 5/5] Merge branch 'master' into f18

[Paul Wouters]

commit 2372db6e7f06a5ae76bfb6f005d817cc18a187f8
Merge: 1dfa64a 10d9b5b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 1 18:04:12 2013 -0400

    Merge branch 'master' into f18

 xl2tpd-1.3.1-Makefile       |   21 ++
 xl2tpd-1.3.1-md5-fips.patch |  453 +++++++++++++++++++++++++++++++++++++++++++
 xl2tpd.spec                 |   21 ++-
 3 files changed, 491 insertions(+), 4 deletions(-)
---
diff --cc xl2tpd.spec
index 66869ff,52045e3..e406b41
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@@ -119,10 -129,16 +129,13 @@@ install -p -D -m755 -d %{buildroot}%{_l
  %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
  
  %changelog
- * Mon Apr 01 2013 Paul Wouters <pwouters at redhat.com> - 1.3.1-12
+ * Mon Apr 01 2013 Paul Wouters <pwouters at redhat.com> - 1.3.1-13
  - rhbz#929447 - Fix ipparam so ipv6-up does not fail (Michal Bruncko)
  - rhbz#850372 - Introduce new systemd-rpm macros in xl2tpd spec file
+ - Use relro,pie for compiling
+ - rhbz#947209 - Use openssl's MD5 function instead of private copy
+   (so FIPS restrictions work)
  
 -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-11
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
  * Thu Jul 19 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-10
  - Updated comments in config files on how to authenticate against
    a Windows PDC / Active Directory