-#
+# TODO:
+# - check mppc patch
+# - check if %{_libdir}/pppd/%{version} path is needed, if not drop the symlink
+
# Conditional build:
%bcond_without pppoatm # without PPPoATM plugin (which requires kernel 2.4 and atm-devel)
+%bcond_without srp # without SRP support
#
Summary: ppp daemon package for Linux
-Summary(de): ppp-Dämonpaket für Linux
-Summary(es): Servidor ppp para Linux
-Summary(fr): Paquetage du démon ppp pour Linux
-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(de.UTF-8): ppp-Dämonpaket für Linux
+Summary(es.UTF-8): Servidor ppp para Linux
+Summary(fr.UTF-8): Paquetage du démon ppp pour Linux
+Summary(pl.UTF-8): Demon PPP dla Linuksa
+Summary(pt_BR.UTF-8): Servidor ppp para Linux
+Summary(ru.UTF-8): Демон ppp
+Summary(tr.UTF-8): PPP sunucu süreci
+Summary(zh_CN.UTF-8): PPP 配置和管理软件包
Name: ppp
-Version: 2.4.2
-Release: 5
+Version: 2.4.6
+Release: 1
Epoch: 3
License: distributable
Group: Networking/Daemons
-Source0: ftp://ftp.samba.org/pub/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: 362bcf218fba8afbb9afbee7471e5dac
+Source0: ftp://ftp.samba.org/pub/ppp/%{name}-%{version}.tar.gz
+# Source0-md5: 3434d2cc9327167a0723aaaa8670083b
Source1: %{name}.pamd
Source2: %{name}.pon
Source3: %{name}.poff
Patch1: %{name}-expect.patch
Patch2: %{name}-debian_scripts.patch
Patch3: %{name}-static.patch
-#http://www.sfgoth.com/~mitch/linux/atm/pppoatm/pppoatm-pppd-vs-2.4.0b2+240600.diff.gz
-Patch4: %{name}-pppoatm.patch
-Patch5: %{name}-pidfile-owner.patch
-Patch6: %{name}-rp-pppoe-update.patch
-Patch7: %{name}-rp-pppoe-macaddr.patch
-Patch8: %{name}-radius.patch
-Patch9: %{name}-pcap.patch
-URL: http://www.samba.org/ppp/
-BuildRequires: autoconf
-BuildRequires: automake
+Patch4: %{name}-pidfile-owner.patch
+Patch6: %{name}-rp-pppoe-macaddr.patch
+#Patch7: http://public.planetmirror.com/pub/mppe/pppd-2.4.2-chapms-strip-domain.patch.gz
+Patch7: pppd-2.4.2-chapms-strip-domain.patch
+Patch8: %{name}-openssl.patch
+Patch9: %{name}-lib64.patch
+#Patch10: http://mppe-mppc.alphacron.de/%{name}-2.4.3-mppe-mppc-1.1.patch.gz
+Patch10: %{name}-2.4.3-mppe-mppc-1.1.patch
+Patch11: %{name}-ifpppstatsreq.patch
+URL: http://ppp.samba.org/
BuildRequires: libpcap-devel >= 2:0.8.1
-BuildRequires: libtool
%{?with_pppoatm:BuildRequires: linux-atm-devel}
+# <linux/if_pppol2tp.h>
+BuildRequires: linux-libc-headers >= 7:2.6.23
+BuildRequires: openssl-devel
BuildRequires: pam-devel
+%{?with_srp:BuildRequires: srp-devel}
Requires: pam >= 0.77.3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
default kernels include PPP support as a module. This version supports
IPv6, too.
-%description -l de
-Dies ist der Dämon und die Dokumentation für PPP-Support. Erfordert
-einen Kernel höher als 2.2.11, der mit PPP-Support gebaut ist. Die
-Standard- Red-Hat-Kernel schließen PPP-Support als Modul ein. (IPv6)
-
-%description -l es
-Este es el servidor y la documentación para soporte PPP. Requiere un
-kernel superior al 2.0. Los kernels padrón de la Conectiva incluyen
-soporte PPP como módulo.
-
-%description -l fr
-Ceci est le démon et la documentation pour le support PPP. Cela
-réclame un noyau supérieur au 2.2.11 et construit avec le support PPP.
-Le noyau par défaut de Red Hat contient le support PPP sous forme de
-module. (IPv6)
-
-%description -l pl
-Pakiet zawiera demona i dokumentacjê umo¿liwiaj±c± korzystanie z
-protoko³u PPP. Wymaga j±dra 2.2.11 - lub pó¼niejszego - z wkompilowan±
-obs³ug± protoko³u PPP. Standardowe j±dro z dystrybucji zawiera
-wsparcie dla PPP skompilowane jako modu³. (IPv6)
-
-%description -l pt_BR
-Este é o servidor e a documentação para suporte PPP. Ele requer um
-kernel superior ao 2.0. Os kernels-padrão da Conectiva incluem suporte
-PPP como módulo.
-
-%description -l ru
-äÅÍÏÎ, ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÄÌÑ ÐÏÄÄÅÒÖËÉ PPP.
-
-%description -l tr
-Bu paket PPP desteði için belgeler ve sunucu sürecini içerir. Çekirdek
-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)
+%description -l de.UTF-8
+Dies ist der Dämon und die Dokumentation für PPP-Support. Erfordert
+einen Kernel höher als 2.2.11, der mit PPP-Support gebaut ist. Die
+Standard-Kernel schließen PPP-Support als Modul ein. (IPv6)
+
+%description -l es.UTF-8
+Este es el servidor y la documentación para soporte PPP. Requiere un
+kernel superior al 2.0.
+
+%description -l fr.UTF-8
+Ceci est le démon et la documentation pour le support PPP. Cela
+réclame un noyau supérieur au 2.2.11 et construit avec le support PPP.
+
+%description -l pl.UTF-8
+Pakiet zawiera demona i dokumentację umożliwiającą korzystanie z
+protokołu PPP. Wymaga jądra 2.2.11 - lub późniejszego - z wkompilowaną
+obsługą protokołu PPP. Standardowe jądro z dystrybucji zawiera
+wsparcie dla PPP skompilowane jako moduł. (IPv6)
+
+%description -l pt_BR.UTF-8
+Este é o servidor e a documentação para suporte PPP. Ele requer um
+kernel superior ao 2.0.
+
+%description -l ru.UTF-8
+Демон, конфигурационные файлы и документация для поддержки PPP.
+
+%description -l tr.UTF-8
+Bu paket PPP desteği için belgeler ve sunucu sürecini içerir. Çekirdek
+sürümünun 2.2.11'dan daha yüksek olmasını gerektirir.
%package plugin-devel
Summary: Stuff needed to build plugins for pppd
-Summary(pl): Rzeczy potrzebne do budowania wtyczek dla pppd
+Summary(pl.UTF-8): Rzeczy potrzebne do budowania wtyczek dla pppd
Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}
+# doesn't require base but enforce new version
+Conflicts: %{name} < %{epoch}:%{version}-%{release}
%description plugin-devel
Development files needed to build plugins for pppd.
-%description plugin-devel -l pl
-Pliki nag³ówkowe potrzebne do budowania wtyczek dla pppd.
+%description plugin-devel -l pl.UTF-8
+Pliki nagłówkowe potrzebne do budowania wtyczek dla pppd.
%package plugin-pppoatm
Summary: PPPoATM plugin for pppd
-Summary(pl): Wtyczka PPPoATM dla pppd
+Summary(pl.UTF-8): Wtyczka PPPoATM dla pppd
Group: Libraries
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description plugin-pppoatm
PPPoATM plugin for pppd.
-%description plugin-pppoatm -l pl
+%description plugin-pppoatm -l pl.UTF-8
Wtyczka PPPoATM dla pppd.
%prep
-%setup -q
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%{?with_pppoatm:%patch4 -p1}
-%patch5 -p1
+%patch4 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%if "%{_lib}" == "lib64"
%patch9 -p1
+%endif
+%patch10 -p1
+%patch11 -p1
+
+# use headers from llh instead of older supplied by ppp, incompatible with current llh
+%{__rm} include/linux/*.h
%build
-cd pppd/plugins/radius/radiusclient
-# cannot use system radiusclient 0.3.2 - this version is modified
-# (contains some extensions which made it incompatible with original)
-# lt must be rebuilt (old libtool didn't use PIC on ppc-linux)
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
-cd ../../../..
# note: not autoconf configure
%configure
%{__make} \
- OPT_FLAGS="%{rpmcflags}" \
- CC=%{__cc}
+ %{?with_pppoatm:HAVE_LIBATM=y} \
+ USE_PAM=y \
+ %{?with_srp:USE_SRP=y} \
+ OPT_FLAGS="%{rpmcflags} %{rpmcppflags}" \
+ COPTS="%{rpmcflags} %{rpmcppflags}" \
+ OPTLDFLAGS="%{rpmldflags}" \
+ 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
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/ppp/peers,/var/log} \
+ $RPM_BUILD_ROOT/etc/{pam.d,logrotate.d}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ %{?with_pppoatm:HAVE_LIBATM=y} \
+ %{?with_srp:USE_SRP=y} \
+ DESTDIR=$RPM_BUILD_ROOT%{_prefix}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pon
-install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poff
-install debian/plog $RPM_BUILD_ROOT%{_bindir}
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pon
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poff
+install -p debian/plog $RPM_BUILD_ROOT%{_bindir}
-install etc.ppp/chap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
-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
+cp -p etc.ppp/chap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
+cp -p debian/pap-secrets $RPM_BUILD_ROOT%{_sysconfdir}/ppp
+cp -p debian/options $RPM_BUILD_ROOT%{_sysconfdir}/ppp
+cp -p debian/options.ttyXX $RPM_BUILD_ROOT%{_sysconfdir}/ppp
bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.ppp-non-english-man-pages
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/ppp
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/ppp
> $RPM_BUILD_ROOT/var/log/ppp.log
rm -f scripts/README
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp
cd $RPM_BUILD_ROOT%{_libdir}/pppd
-ln -s %{version}* plugins
+v=$(echo %{version}*)
+mv $v plugins
+# not sure which path used, keep the old path for compat
+ln -s plugins $v
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%pretrans
+# %{version} used to be directory
+if [ -d %{_libdir}/pppd/%{version} -a ! -L %{_libdir}/pppd/%{version} ]; then
+ set -e
+ rm -f %{_libdir}/pppd/plugins
+ mv %{_libdir}/pppd/{%{version},plugins}
+ ln -sn plugins %{_libdir}/pppd/%{version}
+fi
%files
%defattr(644,root,root,755)
%doc README.linux debian/README.debian scripts
%doc debian/win95.ppp README.MSCHAP8* FAQ debian/ppp-2.3.0.STATIC.README
-%doc README.MPPE README.pppoe README.cbcp README.pwfd
-%attr(755,root,root) %{_bindir}/*
+%doc README.MPPE README.pppoe README.cbcp README.pwfd
+%attr(755,root,root) %{_bindir}/plog
+%attr(755,root,root) %{_bindir}/poff
+%attr(755,root,root) %{_bindir}/pon
%attr(755,root,root) %{_sbindir}/chat
-%attr(755,root,root) %{_sbindir}/ppp*
+%attr(755,root,root) %{_sbindir}/pppd
+%attr(755,root,root) %{_sbindir}/pppdump
+%attr(755,root,root) %{_sbindir}/pppoe-discovery
+%attr(755,root,root) %{_sbindir}/pppstats
+%{?with_srp:%attr(755,root,root) %{_sbindir}/srp-entry}
%dir %{_libdir}/pppd
-%dir %{_libdir}/pppd/*.*
-%{_libdir}/pppd/plugins
-%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
-
-%{_mandir}/man8/*
+%dir %{_libdir}/pppd/plugins
+%attr(755,root,root) %{_libdir}/pppd/plugins/minconn.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/openl2tp.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/pppol2tp.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/passprompt.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/passwordfd.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/rp-pppoe.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/radattr.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/radius.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/radrealms.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/winbind.so
+
+# TODO: legacy, try to drop
+%{_libdir}/pppd/%{version}
+
+%{_mandir}/man8/chat.8*
+%{_mandir}/man8/pppd.8*
+%{_mandir}/man8/pppd-radattr.8*
+%{_mandir}/man8/pppd-radius.8*
+%{_mandir}/man8/pppdump.8*
+%{_mandir}/man8/pppstats.8*
%lang(fr) %{_mandir}/fr/man8/*
%lang(ja) %{_mandir}/ja/man8/*
%lang(ko) %{_mandir}/ko/man8/*
%lang(pl) %{_mandir}/pl/man8/*
-%attr(600,root,root) %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ppp/*-secrets
-%attr(644,root,root) %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ppp/options*
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/ppp
-%attr(640,root,root) /etc/logrotate.d/ppp
-%attr(640,root,root) %ghost /var/log/ppp.log
-
+%attr(600,root,root) %config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ppp/chap-secrets
+%attr(600,root,root) %config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ppp/pap-secrets
+%config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ppp/options
+%config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ppp/options.ttyXX
%dir %{_sysconfdir}/ppp/peers
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/ppp
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ppp
+%attr(640,root,root) %ghost /var/log/ppp.log
%files plugin-devel
%defattr(644,root,root,755)
-%dir %{_includedir}/pppd
-%{_includedir}/pppd/pppd.h
-%{_includedir}/pppd/patchlevel.h
+%{_includedir}/pppd
%if %{with pppoatm}
%files plugin-pppoatm
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/pppd/*.*/pppoatm.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/pppoatm.so
%endif
projects / packages / ppp.git / blobdiff