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

Conflicts:
	sources
epel9
Paul Wouters 13 years ago
commit 6b76eb00db

6
.gitignore vendored

@ -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 +7,7 @@ xl2tpd-1.1.12.tar.gz
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.7.tar.gz
xl2tpd-1.2.8.tar.gz
xl2tpd-1.3.0.tar.gz
xl2tpd-1.3.1.tar.gz

@ -1 +1,2 @@
cd13732664905194565ea7f07546876b xl2tpd-1.2.7.tar.gz
28264284552c442b24cf421755a2bb48 xl2tpd-1.3.0.tar.gz
cf61576fef5c2d6c68279a408ec1f0d5 xl2tpd-1.3.1.tar.gz

@ -1,7 +1,7 @@
Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
Name: xl2tpd
Version: 1.2.7
Release: 2%{?dist}
Version: 1.3.1
Release: 1%{?dist}
# No version specified.
License: GPL+
Url: http://www.xelerance.com/software/xl2tpd/
@ -47,7 +47,8 @@ It was de-facto maintained by Jacco de Leeuw <jacco2@dds.nl> 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}
@ -82,15 +83,33 @@ 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
%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@xelerance.com> - 1.3.1-1
- Upgraded to 1.3.1
- Use ghost for /var/run files
* Sat Jul 23 2011 Paul Wouters <paul@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@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@lists.fedoraproject.org> - 1.2.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Tue Nov 30 2010 Paul Wouters <paul@xelerance.com> - 1.2.7-2
- fix md5 of init script in sources

Loading…
Cancel
Save