rpms/xl2tpd/EL-5 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 xl2tpd.spec, 1.9, 1.10

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/xl2tpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25939

Modified Files:
	.cvsignore sources xl2tpd.spec 
Log Message:
* Sat Jan 09 2010 Paul Wouters <paul at xelerance.com> - 1.2.5-1
- Upgraded to 1.2.5. (fixes interop with two Windows machines behind same NAT)
- Fix mix space/tab in spec file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xl2tpd/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Jul 2007 17:26:06 -0000	1.5
+++ .cvsignore	26 Jan 2010 01:24:23 -0000	1.6
@@ -2,3 +2,4 @@ xl2tpd-1.1.06.tar.gz
 xl2tpd-1.1.08.tar.gz
 xl2tpd-1.1.09.tar.gz
 xl2tpd-1.1.11.tar.gz
+xl2tpd-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xl2tpd/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 May 2009 19:19:00 -0000	1.6
+++ sources	26 Jan 2010 01:24:23 -0000	1.7
@@ -1 +1 @@
-d94fc8a13596f12a561240dfcea9f977  xl2tpd-1.2.4.tar.gz
+40404ea230edd9ebdd0d53f07c832520  xl2tpd-1.2.5.tar.gz


Index: xl2tpd.spec
===================================================================
RCS file: /cvs/extras/rpms/xl2tpd/EL-5/xl2tpd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xl2tpd.spec	6 May 2009 19:20:29 -0000	1.9
+++ xl2tpd.spec	26 Jan 2010 01:24:23 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.2.4
-Release: 2%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
@@ -56,21 +56,21 @@ rm -rf %{buildroot}
 # if we migrate from l2tpd to xl2tpd, copy the configs
 if [ -f /etc/l2tpd/l2tpd.conf ]
 then
-	echo "Old /etc/l2tpd configuration found, migrating to /etc/xl2tpd"
-	mv /etc/xl2tpd/xl2tpd.conf /etc/xl2tpd/xl2tpd.conf.rpmsave
-	cat /etc/l2tpd/l2tpd.conf | sed "s/options.l2tpd/options.xl2tpd/" > /etc/xl2tpd/xl2tpd.conf
-	mv /etc/ppp/options.xl2tpd /etc/ppp/options.xl2tpd.rpmsave
-	mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd
-	mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave
-	cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets
-	
+        echo "Old /etc/l2tpd configuration found, migrating to /etc/xl2tpd"
+        mv /etc/xl2tpd/xl2tpd.conf /etc/xl2tpd/xl2tpd.conf.rpmsave
+        cat /etc/l2tpd/l2tpd.conf | sed "s/options.l2tpd/options.xl2tpd/" > /etc/xl2tpd/xl2tpd.conf
+        mv /etc/ppp/options.xl2tpd /etc/ppp/options.xl2tpd.rpmsave
+        mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd
+        mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave
+        cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets
+
 fi
 
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service xl2tpd stop > /dev/null 2>&1
-	/sbin/chkconfig --del xl2tpd
+
+
 fi
 
 %postun
@@ -92,6 +92,10 @@ fi
 %dir %{_localstatedir}/run/xl2tpd
 
 %changelog
+* Sat Jan 09 2010 Paul Wouters <paul at xelerance.com> - 1.2.5-1
+- Upgraded to 1.2.5. (fixes interop with two Windows machines behind same NAT)
+- Fix mix space/tab in spec file
+
 * Wed May 06 2009 Paul Wouters <paul at xelerance.com> - 1.2.4-2
 - bump verson