[xl2tpd/f17: 1/2] * Tue Jul 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-9 - Rename non-existing openswan.servic

[Paul Wouters]

commit 2ed22cf46f6357e1d4e41f7e124114c32a9e1d07
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jul 2 22:34:10 2012 -0400

    * Tue Jul 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-9
    - Rename non-existing openswan.service to ipsec.service (rhbz#836783)
    - Start after ipsec.service, but do not require it
    - Require kernel-modules-extra for l2tp_ppp.ko (rhbz#832149)
    - Don't try to change pty mode (rhbz#834861)

 xl2tpd-1.3.1-pty.patch |   19 +++++++++++++++++++
 xl2tpd.spec            |    9 ++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/xl2tpd-1.3.1-pty.patch b/xl2tpd-1.3.1-pty.patch
new file mode 100644
index 0000000..2679873
--- /dev/null
+++ b/xl2tpd-1.3.1-pty.patch
@@ -0,0 +1,19 @@
+diff -aur xl2tpd-1.3.1-orig/pty.c xl2tpd-1.3.1/pty.c
+--- xl2tpd-1.3.1-orig/pty.c	2011-10-06 15:22:05.000000000 -0400
++++ xl2tpd-1.3.1/pty.c	2012-06-25 23:45:51.241543911 -0400
+@@ -87,6 +87,7 @@
+ 	return -EINVAL;
+     }
+ 
++#if 0 /* not needed, triggers SElinux block */
+     /* change the onwership */
+     if (grantpt(fd))
+     {
+@@ -95,6 +96,7 @@
+ 	close(fd);
+ 	return -EINVAL;
+     }
++#endif
+ 
+     if (unlockpt(fd))
+     {
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 3fc0c6a..8501597 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -12,6 +12,7 @@ Patch1: xl2tpd-1.3.1-Wunused.patch
 Patch2: xl2tpd-bz80693.patch
 Patch3: xl2tpd-1.3.1-kernelmode.patch
 Patch4: xl2tpd-1.3.1-conf.patch
+Patch5: xl2tpd-1.3.1-pty.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ppp >= 2.4.5-18, kernel-modules-extra
 BuildRequires: libpcap-devel
@@ -52,6 +53,7 @@ It was de-facto maintained by Jacco de Leeuw <jacco2 at dds.nl> in 2002 and 2003.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 rm linux/include/linux/if_pppol2tp.h 
 
 %build
@@ -119,9 +121,10 @@ fi
 
 %changelog
 * Tue Jul 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-9
-- Remove non-existing openswan.service dependancy
-- Start after ipsec.service, but do not require it (rhbz#836783)
-- Require kernel-modules-extra (rhbz#832149)
+- Rename non-existing openswan.service to ipsec.service (rhbz#836783)
+- Start after ipsec.service, but do not require it 
+- Require kernel-modules-extra for l2tp_ppp.ko (rhbz#832149)
+- Don't try to change pty mode (rhbz#834861)
 
 * Fri Jun 15 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-7
 - Moved modprobe code from daemon to initscript/systemd