From 71fca9d8caef4bd69d9913efc0680ccf74c68f29 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:20:23 -0600 Subject: [PATCH 1/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xl2tpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xl2tpd.spec b/xl2tpd.spec index 777ff01..f6528c7 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.2.7 -Release: 2%{?dist} +Release: 3%{?dist} # No version specified. License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ @@ -91,6 +91,9 @@ fi %dir %{_localstatedir}/run/xl2tpd %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Nov 30 2010 Paul Wouters - 1.2.7-2 - fix md5 of init script in sources From 3d6729fe5d3b944e1a04bf87551e48e5baa621b0 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Wed, 23 Feb 2011 00:04:46 -0500 Subject: [PATCH 2/7] Added %ghost for /var/run/xl2tpd/l2tp-control --- xl2tpd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xl2tpd.spec b/xl2tpd.spec index 777ff01..4468c90 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -89,6 +89,7 @@ fi %config(noreplace) %{_sysconfdir}/ppp/* %attr(0755,root,root) %{_initrddir}/xl2tpd %dir %{_localstatedir}/run/xl2tpd +%ghost %{_localstatedir}/run/xl2tpd/l2tp-control %changelog * Tue Nov 30 2010 Paul Wouters - 1.2.7-2 From 3ad4da4a1f9a101865b28bc24aae1999f628626e Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Wed, 23 Feb 2011 00:10:49 -0500 Subject: [PATCH 3/7] set file perms for %ghost file --- xl2tpd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xl2tpd.spec b/xl2tpd.spec index 45e9df6..b32a39e 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -89,7 +89,7 @@ fi %config(noreplace) %{_sysconfdir}/ppp/* %attr(0755,root,root) %{_initrddir}/xl2tpd %dir %{_localstatedir}/run/xl2tpd -%ghost %{_localstatedir}/run/xl2tpd/l2tp-control +%ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control %changelog * Mon Feb 07 2011 Fedora Release Engineering - 1.2.7-3 From 9b714872c47f160d51600fd16f626a58e750a85d Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Wed, 23 Feb 2011 00:20:35 -0500 Subject: [PATCH 4/7] * Wed Feb 23 2011 Paul Wouters - 1.2.8-1 - Updated to 1.2.8 - Add ghosting for l2tp pipe (bz#656725) --- .gitignore | 1 + sources | 3 +-- xl2tpd.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3d8193b..a5d847c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ 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 diff --git a/sources b/sources index fba6767..1f27e48 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -167f3e8621562c78dc66f07fe62e0638 xl2tpd.init -cd13732664905194565ea7f07546876b xl2tpd-1.2.7.tar.gz +8748ac5e2f5289963d9a908eede546b5 xl2tpd-1.2.8.tar.gz diff --git a/xl2tpd.spec b/xl2tpd.spec index b32a39e..4f88cfc 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.2.7 -Release: 3%{?dist} +Version: 1.2.8 +Release: 1%{?dist} # No version specified. License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ @@ -92,6 +92,10 @@ fi %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control %changelog +* Wed Feb 23 2011 Paul Wouters - 1.2.8-1 +- Updated to 1.2.8 +- Add ghosting for l2tp pipe (bz#656725) + * Mon Feb 07 2011 Fedora Release Engineering - 1.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From b779b0cf4fa3a4a6e170ef719bf1aab27fe1406e Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sat, 23 Jul 2011 20:19:39 -0400 Subject: [PATCH 5/7] * Sat Jul 23 2011 Paul Wouters - 1.3.0-1 - Upgraded to 1.3.0 with better NetworkManager support - Compiled without DEBUG per default to gain more performance --- .gitignore | 1 + sources | 1 + xl2tpd.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a5d847c..821402a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ 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 diff --git a/sources b/sources index 1f27e48..ddbee21 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 8748ac5e2f5289963d9a908eede546b5 xl2tpd-1.2.8.tar.gz +28264284552c442b24cf421755a2bb48 xl2tpd-1.3.0.tar.gz diff --git a/xl2tpd.spec b/xl2tpd.spec index 4f88cfc..e63b0e8 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -1,6 +1,6 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd -Version: 1.2.8 +Version: 1.3.0 Release: 1%{?dist} # No version specified. License: GPL+ @@ -47,7 +47,8 @@ It was de-facto maintained by Jacco de Leeuw in 2002 and 2003. %setup -q %build -make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH" +#make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH" +make DFLAGS="$RPM_OPT_FLAGS -g %install rm -rf %{buildroot} @@ -92,6 +93,10 @@ fi %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control %changelog +* Sat Jul 23 2011 Paul Wouters - 1.3.0-1 +- Upgraded to 1.3.0 with better NetworkManager support +- Compiled without DEBUG per default to gain more performance + * Wed Feb 23 2011 Paul Wouters - 1.2.8-1 - Updated to 1.2.8 - Add ghosting for l2tp pipe (bz#656725) From 25106e0255cd6d26cc256f4d0a7ba3a56bf5023c Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sat, 23 Jul 2011 21:38:12 -0400 Subject: [PATCH 6/7] fix quote typo --- xl2tpd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xl2tpd.spec b/xl2tpd.spec index e63b0e8..fbcee7f 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -48,7 +48,7 @@ It was de-facto maintained by Jacco de Leeuw in 2002 and 2003. %build #make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH" -make DFLAGS="$RPM_OPT_FLAGS -g +make DFLAGS="$RPM_OPT_FLAGS -g " %install rm -rf %{buildroot} From 24be306bc8baeb1169e745c3698017ebcbdffd6b Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sat, 23 Jul 2011 21:58:30 -0400 Subject: [PATCH 7/7] Add the new xl2tpd-control binary. --- xl2tpd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xl2tpd.spec b/xl2tpd.spec index fbcee7f..470c441 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -83,6 +83,7 @@ fi %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt %doc doc/README.patents examples/chapsecrets.sample %{_sbindir}/xl2tpd +%{_sbindir}/xl2tpd-control %{_bindir}/pfc %{_mandir}/*/* %dir %{_sysconfdir}/xl2tpd @@ -96,6 +97,7 @@ fi * Sat Jul 23 2011 Paul Wouters - 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 - 1.2.8-1 - Updated to 1.2.8