From 78075ff137f0cda26c68a9c5ea7d73dc33488931 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 30 May 2003 20:25:52 +0000 Subject: [PATCH] - merged DEVEL Changed files: ppp.spec -> 1.96 --- ppp.spec | 117 +++++++++++++++++++++++++------------------------------ 1 file changed, 52 insertions(+), 65 deletions(-) diff --git a/ppp.spec b/ppp.spec index 85a6cdc..1969048 100644 --- a/ppp.spec +++ b/ppp.spec @@ -1,7 +1,7 @@ -# -# _with_pppoe - with PPPoE support (which requires kernel 2.4) # _with_pppoatm - with PPPoATM support (which requires kernel 2.4 and atm-devel) -# _without_cbcp - without CBCP (MS CallBack Configuration Protocol) +# TODO: +# - fix ppp over atm +%define snap 20020901 Summary: ppp daemon package for Linux Summary(de): ppp-Dämonpaket für Linux Summary(es): Servidor ppp para Linux @@ -10,39 +10,29 @@ Summary(pl): Demon PPP dla Linuksa Summary(pt_BR): Servidor ppp para Linux Summary(ru): äÅÍÏÎ ppp Summary(tr): PPP sunucu süreci -Summary(zh_CN): PPP ÅäÖú͹ÜÀíÈí¼þ°ü +Summary(zh_CN): PPP ÅäÖú͹ÜÀíÈí¼þ°ü. Name: ppp -Version: 2.4.1 -Release: 13 +Version: 2.4.2 +Release: 0.%{snap}.3 Epoch: 2 License: distributable Group: Networking/Daemons -Source0: ftp://ftp.samba.org/pub/ppp/%{name}-%{version}.tar.gz -# Source0-md5: fbc256801d5fcd8015039b149ae95eb0 +Source0: cvs://pserver.samba.org/ppp/%{name}-%{version}-%{snap}.tar.gz Source1: %{name}.pamd Source2: %{name}.pon Source3: %{name}.poff Source4: %{name}-non-english-man-pages.tar.bz2 -# Source4-md5: 3801b59005bef8f52856300fe3167a64 Source5: %{name}.logrotate Patch0: %{name}-make.patch Patch1: %{name}-expect.patch Patch2: %{name}-debian_scripts.patch Patch3: %{name}-static.patch -Patch4: %{name}-CBCP.patch -Patch5: %{name}-pam_session.patch -Patch6: %{name}-wtmp.patch -Patch7: %{name}-opt.patch -Patch8: http://www.shoshin.uwaterloo.ca/~mostrows/%{name}-2.4.1-%{name}oe.patch2 -Patch9: %{name}-opt-%{name}oe.patch #http://www.sfgoth.com/~mitch/linux/atm/pppoatm/pppoatm-pppd-vs-2.4.0b2+240600.diff.gz -Patch10: %{name}-%{name}oatm.patch -Patch11: %{name}-reap.patch -Patch12: %{name}-warnings.patch -Patch13: %{name}-zlib-sec.patch -Patch14: %{name}-pidfile-owner.patch -Patch15: %{name}-2.4.1-openssl-0.9.6-mppe-patch.gz -Patch16: %{name}-2.4.1-MSCHAPv2-fix.patch.gz +Patch4: %{name}-pppoatm.patch +Patch5: %{name}-pidfile-owner.patch +Patch6: %{name}-typos.patch +Patch7: %{name}-rp-pppoe-update.patch +Patch8: %{name}-rp-pppoe-macaddr.patch URL: http://www.samba.org/ppp/ BuildRequires: pam-devel %{?_with_pppoatm:BuildRequires: linux-atm-devel} @@ -89,57 +79,47 @@ Bu paket PPP deste sürümünun 2.2.11'dan daha yüksek olmasýný gerektirir. Öntanýmlý Red Hat çekirdeði PPP desteðini bir modül olarak içerir. (IPv6) -%package pppoatm -Summary: PPP Over ATM plugin -Summary(pl): Wtyczka PPP-po-ATM -Group: Networking/Daemons -Requires: %{name} = %{version} +%package plugin-devel +Summary: Stuff needed to build plugins for pppd +Summary(pl): Rzeczy potrzebne do budowania wtyczek dla pppd +Group: Development/Libraries +Requires: %{name} = %{version} -%description pppoatm -PPP Over ATM plugin. +%description plugin-devel +Development files needed to build plugins for pppd. -%description pppoatm -l pl -Wtyczka PPP-po-ATM. +%description plugin-devel -l pl +Pliki nag³ówkowe potrzebne do budowania wtyczek dla pppd. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{snap} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%{?_with_pppoatm:%patch4 -p1} %patch5 -p1 %patch6 -p1 -%{!?_with_pppoe:%patch7 -p1} -%{?_with_pppoe:%patch8 -p1} -%{?_with_pppoe:%patch9 -p1} -%{?_with_pppoatm:%patch10 -p1} -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 +%patch7 -p1 +%patch8 -p1 %build +find pppd/plugins/radius/radiusclient -exec touch "{}" ";" %configure -%{__make} OPT_FLAGS="%{rpmcflags}" \ - CC=%{__cc} \ - %{!?_without_cbcp:CBCP=1} - -%{?_with_pppoe:%{__make} OPT_FLAGS="%{rpmcflags}" CC=%{__cc} -C pppd/plugins/pppoe} +%{__make} \ + OPT_FLAGS="%{rpmcflags}" \ + CC=%{__cc} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man{1,8}} \ $RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,ppp/peers},/var/log} \ - $RPM_BUILD_ROOT/etc/logrotate.d + $RPM_BUILD_ROOT/etc/logrotate.d \ + $RPM_BUILD_ROOT/%{_includedir}/pppd %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{?_with_pppoe:install pppd/plugins/pppoe/pppoed $RPM_BUILD_ROOT%{_sbindir}} - install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pon install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poff install debian/plog $RPM_BUILD_ROOT%{_bindir} @@ -149,6 +129,9 @@ install debian/pap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp install debian/options $RPM_BUILD_ROOT%{_sysconfdir}/ppp install debian/options.ttyXX $RPM_BUILD_ROOT%{_sysconfdir}/ppp +install pppd/patchlevel.h $RPM_BUILD_ROOT/%{_includedir}/pppd +install pppd/pppd.h $RPM_BUILD_ROOT/%{_includedir}/pppd + bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/ppp @@ -161,23 +144,25 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %defattr(644,root,root,755) %doc README.linux debian/README.debian scripts -%doc debian/win95.ppp README.MSCHAP80 FAQ debian/ppp-2.3.0.STATIC.README -%doc README.MPPE +%doc debian/win95.ppp README.MSCHAP8* FAQ debian/ppp-2.3.0.STATIC.README +%doc README.MPPE README.pppoe README.cbcp README.pwfd TODO %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_sbindir}/chat -%attr(755,root,root) %{_sbindir}/pppstats -%attr(755,root,root) %{_sbindir}/pppd -%{?_with_pppoe:%attr(755,root,root) %{_sbindir}/pppoed} -%if %{?_with_pppoatm:1}%{!?_with_pppoatm:0}%{?_with_pppoe:1}%{!?_with_pppoe:0} +%attr(755,root,root) %{_sbindir}/ppp* %dir %{_libdir}/pppd -%dir %{_libdir}/pppd/%{version} -%endif -%{?_with_pppoatm:%attr(755,root,root) %{_libdir}/pppd/%{version}/minconn.so} -%{?_with_pppoatm:%attr(755,root,root) %{_libdir}/pppd/%{version}/passprompt.so} -%{?_with_pppoe:%attr(755,root,root) %{_libdir}/pppd/%{version}/pppoe.so} +%dir %{_libdir}/pppd/*.* +%attr(755,root,root) %{_libdir}/pppd/*.*/minconn.so +%attr(755,root,root) %{_libdir}/pppd/*.*/pass*.so +%attr(755,root,root) %{_libdir}/pppd/*.*/rp-pppoe.so +%attr(755,root,root) %{_libdir}/pppd/*.*/rad*.so +%{?_with_pppoatm:%attr(755,root,root) %{_libdir}/pppd/*.*/pppoatm.so} + %{_mandir}/man8/* %lang(fr) %{_mandir}/fr/man8/* %lang(ja) %{_mandir}/ja/man8/* @@ -192,6 +177,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/ppp/peers -%{?_with_pppoatm:%files pppoatm} -%{?_with_pppoatm:%defattr(644,root,root,755)} -%{?_with_pppoatm:%attr(755,root,root) %{_libdir}/pppd/%{version}/pppoatm.so} +%files plugin-devel +%defattr(644,root,root,755) +%dir %{_includedir}/pppd +%{_includedir}/pppd/pppd.h +%{_includedir}/pppd/patchlevel.h -- 2.44.0