[xl2tpd: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/xl2tpd

[Paul Wouters]

commit 6b76eb00db34536bf7fbe70626f0c82ff475af9a
Merge: 5a2f89a 24be306
Author: Paul Wouters <paul at xelerance.com>
Date:   Thu Oct 6 15:36:37 2011 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xl2tpd
    
    Conflicts:
    	sources

 .gitignore  |    6 ++++--
 sources     |    3 ++-
 xl2tpd.spec |   27 +++++++++++++++++++++++----
 3 files changed, 29 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 3d8193b,821402a..b276d35
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,6 +1,5 @@@
  xl2tpd-1.1.06.tar.gz
  xl2tpd-1.1.07.tar.gz
--xl2tpd.init
  xl2tpd-1.1.08.tar.gz
  xl2tpd-1.1.09.tar.gz
  xl2tpd-1.1.11.tar.gz
@@@ -8,4 -8,6 +7,7 @@@ xl2tpd-1.1.12.tar.g
  xl2tpd-1.2.0.tar.gz
  xl2tpd-1.2.4.tar.gz
  xl2tpd-1.2.5.tar.gz
--/xl2tpd-1.2.7.tar.gz
 -/xl2tpd-1.2.8.tar.gz
 -/xl2tpd-1.3.0.tar.gz
++xl2tpd-1.2.7.tar.gz
++xl2tpd-1.2.8.tar.gz
++xl2tpd-1.3.0.tar.gz
++xl2tpd-1.3.1.tar.gz
diff --cc sources
index 7c8670a,ddbee21..696a55b
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,2 @@@
- cd13732664905194565ea7f07546876b  xl2tpd-1.2.7.tar.gz
 -8748ac5e2f5289963d9a908eede546b5  xl2tpd-1.2.8.tar.gz
+ 28264284552c442b24cf421755a2bb48  xl2tpd-1.3.0.tar.gz
++cf61576fef5c2d6c68279a408ec1f0d5  xl2tpd-1.3.1.tar.gz
diff --cc xl2tpd.spec
index 777ff01,470c441..1c6c40f
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
  Name: xl2tpd
- Version: 1.2.7
- Release: 2%{?dist}
 -Version: 1.3.0
++Version: 1.3.1
+ Release: 1%{?dist}
  # No version specified.
  License: GPL+
  Url: http://www.xelerance.com/software/xl2tpd/
@@@ -88,9 -90,22 +90,26 @@@ f
  %config(noreplace) %{_sysconfdir}/xl2tpd/*
  %config(noreplace) %{_sysconfdir}/ppp/*
  %attr(0755,root,root)  %{_initrddir}/xl2tpd
--%dir %{_localstatedir}/run/xl2tpd
++%ghost %dir %{_localstatedir}/run/xl2tpd
+ %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
  
  %changelog
++* Thu Oct 06 2011 Paul Wouters <paul at xelerance.com> - 1.3.1-1
++- Upgraded to 1.3.1
++- Use ghost for /var/run files
++
+ * Sat Jul 23 2011 Paul Wouters <paul at xelerance.com> - 1.3.0-1
+ - Upgraded to 1.3.0 with better NetworkManager support
+ - Compiled without DEBUG per default to gain more performance
+ - Added xl2tpd-control
+ 
+ * Wed Feb 23 2011 Paul Wouters <paul at xelerance.com> - 1.2.8-1
+ - Updated to 1.2.8
+ - Add ghosting for l2tp pipe (bz#656725)
+ 
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Nov 30 2010 Paul Wouters <paul at xelerance.com> - 1.2.7-2
  - fix md5 of init script in sources