.gear/95-ppp.rules | 1 + .gear/ppp.control | 17 + .gear/ppp.logrotate | 10 + .gear/ppp.pamd | 4 + .gear/ppp.spec | 631 +++++++++++++++++++++ .gear/ppp.tmpfiles | 4 + .gear/rules | 8 + .../tags/76c9e7130cb2aa9347c375faaba30d698fca87b8 | 17 + .gear/tags/list | 1 + .gear/upstream/remotes | 3 + chat/chat.8 | 2 +- etc.ppp/options | 3 + pppd/main.c | 4 +- pppd/options.c | 8 + pppd/pathnames.h | 4 +- pppd/plugins/radius/config.c | 12 +- 16 files changed, 720 insertions(+), 9 deletions(-) diff --git a/.gear/95-ppp.rules b/.gear/95-ppp.rules new file mode 100644 index 0000000..6521d7a --- /dev/null +++ b/.gear/95-ppp.rules @@ -0,0 +1 @@ +KERNEL=="ppp", MODE="0660", GROUP="uucp" diff --git a/.gear/ppp.control b/.gear/ppp.control new file mode 100644 index 0000000..a7b7e4e --- /dev/null +++ b/.gear/ppp.control @@ -0,0 +1,17 @@ +#!/bin/sh + +. /etc/control.d/functions + +BINARY='/usr/sbin/pppd' + +new_fmode restricted 700 root root +new_fmode traditional 711 root root +new_fmode uucp 4710 root uucp +new_fmode public 4711 root root + +new_help restricted "Only root can execute $BINARY" +new_help traditional "Any user can execute $BINARY without superuser privilege" +new_help uucp "Only uucp group can execute $BINARY with superuser privilege" +new_help public "Any user can execute $BINARY with superuser privilege" + +control_fmode "$BINARY" "$*" || exit 1 diff --git a/.gear/ppp.logrotate b/.gear/ppp.logrotate new file mode 100644 index 0000000..7a72979 --- /dev/null +++ b/.gear/ppp.logrotate @@ -0,0 +1,10 @@ +# Logrotate file for ppp RPM + +/var/log/ppp/connect-errors { + missingok + compress + notifempty + daily + rotate 5 + create 0600 root root +} diff --git a/.gear/ppp.pamd b/.gear/ppp.pamd new file mode 100644 index 0000000..b4d0f0e --- /dev/null +++ b/.gear/ppp.pamd @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth include common-login +account include common-login +session include common-login diff --git a/.gear/ppp.spec b/.gear/ppp.spec new file mode 100644 index 0000000..44316e8 --- /dev/null +++ b/.gear/ppp.spec @@ -0,0 +1,631 @@ +%define _unpackaged_files_terminate_build 1 +%def_disable static +%def_enable systemd +%def_enable cbcp +%def_enable microsoft-extensions +%def_enable multilink +%def_with atm +%def_with pam +%def_with pcap + +Name: ppp +Version: 2.5.0 +Release: alt1 + +Summary: The PPP daemon and documentation +License: BSD-3-Clause AND LGPL-2.1-or-later AND GPL-2.0-or-later +Group: Networking/Other + +Url: https://ppp.samba.org + +Source0: %name-%version.tar +Source2: ppp.pamd +Source4: ppp.control +Source5: ppp.logrotate +Source6: ppp.tmpfiles +Source7: 95-ppp.rules + +Patch1: %name-%version-%release.patch + +BuildRequires: libssl-devel perl-IPC-Signal perl-Proc-Daemon perl-Proc-WaitStat +%{?_with_pam:BuildRequires: libpam-devel} +%{?_with_pcap:BuildRequires: libpcap-devel} +%{?_with_atm:BuildRequires: libatm-devel} +%{?_enable_systemd:BuildRequires: libsystemd-devel} +Requires: ppp-common +Requires: kmod >= 14 +Requires: udev >= 204-alt2 + +%add_findprov_lib_path %_libdir/pppd/%version + +%package devel +Summary: Header files needed for building extra pppd plugins +Group: Development/C +Requires: %name = %version-%release + +%package radius +Summary: RADIUS authentication plugin for pppd +Group: System/Servers +Requires: %name = %version-%release + +%package pppoatm +Summary: PPP over ATM plugin for pppd +Group: System/Servers +Requires: %name = %version-%release + + +%package pppoe +Summary: PPP over ethernet plugin for pppd +Group: System/Servers +Requires: %name = %version-%release + +%description +The %name package contains the PPP (Point-to-Point Protocol) daemon +and documentation for PPP support. The PPP protocol provides a +method for transmitting datagrams over serial point-to-point links. + +The %name package should be installed if your machine need to support +the PPP protocol. + +%description devel +Header files needed for building extra pppd plugins. + +%description radius +The Remote Authentication Dial In User Service (RADIUS) plugin for pppd +permits pppd to perform PAP, CHAP, MS-CHAP and MS-CHAPv2 authentication +against a RADIUS server instead of the usual /etc/ppp/pap-secrets and +/etc/ppp/chap-secrets files. + +%description pppoatm +PPP over ATM plugin for pppd. + +%description pppoe +PPP over ethernet plugin for pppd. + +%prep +%setup +%patch1 -p1 + +#set the right paths in radiusclient.conf +sed -i -e "s|/usr/local/etc|%_sysconfdir|" \ + -e "s|/usr/local/sbin|%_sbindir|" pppd/plugins/radius/etc/radiusclient.conf +#set config dir to /etc/ppp/radius +sed -i -e "s|/etc/radiusclient|/etc/ppp/radius|g" \ + pppd/plugins/radius/{*.8,*.c,*.h} \ + pppd/plugins/radius/etc/* + + +%build +%autoreconf +%configure \ + %{subst_enable static} \ + %{subst_enable systemd} \ + %{subst_enable cbcp} \ + %{?_enable_microsoft_extensions:--enable-microsoft-extensions} \ + %{subst_enable multilink} \ + --runstatedir=/run \ + --localstatedir=%_var \ + --with-runtime-dir=/run/%name \ + --with-logfile-dir=%_logdir/%name \ + --with-system-ca-path=/var/lib/ssl/certs \ + %{subst_with atm} \ + %{subst_with pam} \ + %{subst_with pcap} \ + %nil + +%make_build + +%install +%makeinstall_std + +for f in `find scripts/ sample/ -type f`; do + chmod 644 "$f" + if grep -F -qs /usr/local/bin/ "$f"; then + subst -p 's|/usr/local/bin|%_bindir|g' "$f" + fi + if file -b "$f" |grep -F -qs 'shell script'; then + chmod a+x "$f" + fi +done + +install -pDm640 %SOURCE2 %buildroot%_sysconfdir/pam.d/%name + +mkdir -p %buildroot%_sysconfdir/%name/peers +mkdir -p %buildroot%_sysconfdir/%name/radius +cp -a pppd/plugins/radius/etc/* %buildroot%_sysconfdir/%name/radius/ + +install -pDm755 %SOURCE4 %buildroot%_controldir/%name + +mkdir -p %buildroot%_logdir/%name +touch %buildroot%_logdir/%name/connect-errors + +install -pDm644 %SOURCE6 %buildroot/%_tmpfilesdir/%name.conf +install -pDm644 %SOURCE7 %buildroot/%_udevrulesdir/95-%name.rules + +# Logrotate script +install -pDm644 %SOURCE5 %buildroot%_sysconfdir/logrotate.d/%name + +%pre +%pre_control %name + +%post +%post_control -s traditional %name + +%files +%attr(711,root,root) %_sbindir/* +%exclude %_sbindir/pppoe-discovery +%attr(700,root,root) %dir %_logdir/%name +%attr(755,root,root) %dir %_sysconfdir/%name +%attr(711,root,root) %dir %_sysconfdir/%name/peers +%attr(600,root,root) %config(noreplace) %_sysconfdir/%name/*-secrets +%attr(600,root,root) %config(noreplace) %_sysconfdir/%name/eaptls-* +%attr(600,root,root) %config(noreplace) %_sysconfdir/%name/openssl* +%attr(644,root,root) %config(noreplace) %_sysconfdir/%name/options +%config(noreplace) %_sysconfdir/logrotate.d/%name +%config(noreplace) %_sysconfdir/pam.d/%name +%_tmpfilesdir/%name.conf +%_udevrulesdir/95-%name.rules +%config %_controldir/%name +%_libdir/pppd +%exclude %_libdir/pppd/*/*.la +%_logdir/%name/* +%{?_with_atm:%exclude %_libdir/pppd/%version/pppoatm.so} +%exclude %_libdir/pppd/%version/pppoe.so +%exclude %_libdir/pppd/%version/rad* +%_man8dir/*.8* +%exclude %_man8dir/*rad* +%exclude %_man8dir/pppoe-discovery* +%doc PLUGINS SETUP FAQ README* scripts sample + +%files devel +%_includedir/pppd +%_pkgconfigdir/pppd.pc + +%if_with atm +%files pppoatm +%_libdir/pppd/%version/pppoatm.so +%endif + +%files pppoe +%_libdir/pppd/%version/pppoe.so +%attr(755,root,root) %_sbindir/pppoe-discovery +%_man8dir/pppoe-discovery* + +%files radius +%_libdir/pppd/%version/rad*.so +%_man8dir/*rad* +%config(noreplace) %_sysconfdir/%name/radius/ + +%changelog +* Fri Aug 04 2023 Alexey Shabalin 2.5.0-alt1 +- 2.5.0 +- new gear history without old patches +- drop dhcp plugin + +* Wed Apr 21 2021 Slava Aseev 2.4.8-alt3 +- fix FTBFS due to sys_errlist removal in glibc + +* Tue Mar 10 2020 Alexey Shabalin 2.4.8-alt2 +- delete -fstack-protector + +* Sat Mar 07 2020 Alexey Shabalin 2.4.8-alt1 +- 2.4.8 +- build with -fstack-protector from now on (mike@) +- Fixes: + + CVE-2020-8597 rhostname buffer overflow in the eap_request and eap_response functions + +* Tue Oct 02 2018 Alexey Shabalin 2.4.7-alt5 +- update to ppp-2.4.7-eaptls-mppe-1.101.patch +- backport patches from upstream master +- build with libsystemd for option up_sdnotify + +* Sun Jul 15 2018 Michael Shigorin 2.4.7-alt4 +- fixed ftbfs against current libcrypt with fedora patch (thx ldv@) +- fixed libatm knob + +* Mon Jan 29 2018 Gleb F-Malinovskiy 2.4.7-alt3 +- Fixed build with modern kernel headers. + +* Fri Jan 30 2015 Andriy Stepanov 2.4.7-alt2 +- Fix openl2tp socket path + +* Thu Jan 15 2015 Alexey Shabalin 2.4.7-alt1 +- 2.4.7 +- add udev rules for set GROUP=uucp (ALT #29457) + +* Wed Oct 09 2013 Alexey Shabalin 2.4.5-alt13 +- drop /lib/udev/devices/ppp + +* Tue Oct 08 2013 Alexey Shabalin 2.4.5-alt12 +- don't need create /dev/ppp with kmod >= 14 +- ppp-2.4.5-eaptls-mppe-0.993.patch + +* Thu Sep 06 2012 Mikhail Efremov 2.4.5-alt11 +- Enable IPv6 support (closes: #27707). + +* Wed Jun 13 2012 Alexey Shabalin 2.4.5-alt10 +- mv /etc/tmpfiles.d/ppp.conf -> /lib/tmpfiles.d/ppp.conf. +- update tmpfiles for create a character device /dev/ppp. + +* Sun May 22 2011 Alexey Shabalin 2.4.5-alt9 +- update upstream snapshot +- merge all git branches to patches/alt-all_patches +- add config for systemd-tmpfiles +- fix link with libcrypto radius plugin +- Debian patches: + + radius plugin enhancements + + fix segfault in update_db_entry() + + make sure that the linkpidfile is always created + + using rp-pppoe pppd exits with EXIT_OK after receiving a timeout waiting + + be sure to close /dev/ppp when reconnecting + + always create a new process group + +* Fri Mar 04 2011 Alexey Shabalin 2.4.5-alt8 +- add device to /lib/udev/devices/ppp for udev + +* Tue Nov 16 2010 Alexey Shabalin 2.4.5-alt7 +- upstream snapshot +- update eaptls patch to v0.99 +- fix build pppol2tp + +* Tue Oct 12 2010 Michael Shigorin 2.4.5-alt6 +- oops, synchrobumped release for pptpd +- devel subpackage made noarch + +* Tue Oct 12 2010 Michael Shigorin 2.4.5-alt5.1 +- rebuilt against openssl-1.0.0a + +* Tue Jun 29 2010 Alexey Shabalin 2.4.5-alt5 +- upstream snapshot cab58617fd9d328029fffabc788020264b4fa91f +- ppp.pamd: use common-login +- update eaptls patch to v0.98 +- fixes RH#560014 - SELinux is preventing /usr/sbin/pppd "read write" access on pppd2.tdb +- added pppoe-discovery(8) (ppp-2.4.5-manpg.patch from fedora) + +* Sat Jan 16 2010 Michael Shigorin 2.4.5-alt4 +- rebuilt + +* Wed Jan 13 2010 Michael Shigorin 2.4.5-alt3 +- re-added cbcp.h (#12368, thanks sem@ for spotting) + +* Wed Jan 13 2010 Michael Shigorin 2.4.5-alt2 +- reworked branching +- minor spec cleanup + +* Mon Dec 28 2009 Alexey Shabalin 2.4.5-alt1 +- 2.4.5 +- update eaptls patch to v0.95 +- drop broken patches + +* Fri May 15 2009 Michael Shigorin 2.4.4-alt12 +- fixed FTBFS with current libtool + +* Wed Oct 15 2008 Michael Shigorin 2.4.4-alt11 +- rebuilt for Sisyphus, thanks ender@ + +* Tue Oct 14 2008 Afanasov Dmitry 2.4.4-alt10.3 +- define aligned_u64 in pppoe.c to fix building + +* Thu May 15 2008 Michael Shigorin 2.4.4-alt10.2 +- include pppoe-discovery only in pppoe subpackage + +* Thu May 15 2008 Michael Shigorin 2.4.4-alt10.1 +- fix build + +* Sun Dec 09 2007 Denis Smirnov 2.4.4-alt10 +- rebuild + +* Sat Dec 08 2007 Michael Shigorin 2.4.4-alt9.9 +- added updated ppp-2.4.3-dontwriteetc.patch from Mandriva + as ppp-2.4.4-dontwriteetc.patch (#8386) + + NB: %_sysconfdir/%name/connect-errors and %_sysconfdir/%name/resolv.conf + now moved to %_var, symlinks are instead; if there was anything + valuable there, please backup *before* upgrading (shouldn't be) +- added logrotate script (from Mandriva thus RH) +- added updated ppp-2.4.2-minunit.patch (#9800) + as ppp-2.4.4-alt-minunit.patch + (modified to apply on top of current patchset) +- added updated ppp-2.4.4-alt-ipparam.patch (#10270) +- basic testing passed + +* Sat Dec 08 2007 Michael Shigorin 2.4.4-alt9.8 +- merged control facility from jinn@'s ppp-control + + facility renamed from pppd to %name + + pay attention to status renaming with new facility name: + "public" is now "traditional" (0711 root:root) + "legacy" is now "public" (4711 root:root) + + added "uucp" status (4710 root:uucp) + + default is "traditional" (corresponding to packaged permissions) + -- thanks ldv@ for comments on naming +- changed default %_sbindir/* permissions from 755 to 711 + so that default status is coherent +- added "nopredictor1" to default %_sysconfdir/%name/options (#4239) +- replaced patch9 (cleardefaultroute option implementation) + with patch51 ([no]replacedefaultroute from Debian) (#9256) + + NB: openSUSE patch from ppp-2.4.4-79 seems broken, + while almost the same one from ppp_2.4.4rel-9 in Debian + just works + + there's no mention of (now obsolete) custom cleardefaultroute + in etcnet scripts but there might be another ALT-specific + patches or configuration files where it might appear; please + file bugs against such packages and Cc: me too +- spec macro abuse cleanup +- basic testing passed + +* Sun Dec 02 2007 Denis Smirnov 2.4.4-alt9 +- Fix buffer overflow in radius plugin + +* Sat Sep 29 2007 Denis Smirnov 2.4.4-alt8 +- Rebuild + +* Thu Sep 27 2007 Michael Shigorin 2.4.4-alt7.1 +- updated patch18 as patch49 (see comments where it gets applied) +- added Packager: + +* Tue Aug 07 2007 Denis Smirnov 2.4.4-alt7 +- Rebuild + +* Tue Aug 07 2007 Vladimir V Kamarzin 2.4.4-alt6 +- Install cbcp.h (Closes: #12368) + +* Mon Jun 25 2007 Denis Smirnov 2.4.4-alt5 +- Add eaptls support (Michael A. Kangin) + +* Sat May 12 2007 Denis Smirnov 2.4.4-alt4 +- Patch for CBCP patch. Now CBCP server works and always accepts "no callback" + users (hiddenman@) +- Fixed CBCP patch by patch46. It shouldn't break chat now (hiddenman@) +- Build without patch15 (mppe+mppc) (hiddenman@) +- Completely disable commented patches (hiddenman@) + +* Sun Apr 29 2007 Denis Smirnov 2.4.4-alt3 +- Add reworked by Andrew Kornilov CBCP patch from ASP Linux (disabled) +- More correct mppe+mppc patch (by Andrew Kornilov) + +* Sun Apr 08 2007 Denis Smirnov 2.4.4-alt2 +- Add requires to ppp-common (#11382) + +* Sun Mar 25 2007 Denis Smirnov 2.4.4-alt1 +- Build 2.4.4 for Sisyphus + +* Mon Mar 19 2007 Alexey Shabalin 2.4.4-alt0.1 +- 2.4.4 (Sorry - normal changelog after ...) +- fix for #11110 (cbcp) + +* Sun Oct 15 2006 Denis Smirnov 2.4.2-alt7 +- Create linkpidfile when start pppd, not when connected (Valentin Lavrinenko) +- do not ignore SIGTERM before chat started (Valentin Lavrinenko) + +* Thu Jan 12 2006 ALT QA Team Robot 2.4.2-alt6.1.1 +- Rebuilt for new style PAM dependencies generated by rpm-build-4.0.4-alt55. + +* Sat Nov 05 2005 LAKostis 2.4.2-alt6.1 +- add missing requires for libradiusclient-devel. +- disable -static build by default. + +* Wed Mar 23 2005 Kachalov Anton 2.4.2-alt6 +- enable Radius plugin + +* Fri Mar 18 2005 Kachalov Anton 2.4.2-alt5 +- disable MPPE/MPPC patch +- disable Radius plugin + +* Sun Feb 13 2005 Kachalov Anton 2.4.2-alt4 +- added MPPE/MPPC support: by default, it's disabled + +* Thu Feb 10 2005 Kachalov Anton 2.4.2-alt3 +- x86_64 support (#6088) + +* Tue Jun 08 2004 Alexey Voinov 2.4.2-alt2 +- killmypg added. [fixes some race conditions in signal handlers] +- holdoffhack added [fix for #1589] + +* Fri May 28 2004 Alexey Voinov 2.4.2-alt1 +- new version (2.4.2) +- patches updated [note: README.cbcp from asp path has been dropped :(] +- asp-radius-chap patch has been merged into upstream +- optsigsegv patch added [fix for #1158] +- buildreqs updated + +* Wed Dec 03 2003 Dmitry V. Levin 2.4.1.20031003-alt2 +- Implemented cleardefaultroute option (#3319). +- Do not package .la files. + +* Wed Nov 12 2003 Dmitry V. Levin 2.4.1.20031003-alt1 +- Updated to cvs snapshot 20031003. +- Build the radius plugin with libradiusclient dynamically, + to avoid text relocations. +- Fixed the radius plugin to use new chap auth (ASP Linux). + +* Wed Oct 08 2003 Dmitry V. Levin 2.4.1.20030923-alt1 +- Updated to cvs snapshot 20030923. +- ppp-extra: fixed package dependencies. + +* Tue Oct 07 2003 Victor V Ismakaev 2.4.1.20030513-alt3 +- Build with radius support. +- Added experimental CBCP support (ASP Linux) and enabled it by default. + +* Thu Jul 17 2003 Alexey Voinov 2.4.1.20030513-alt2 +- fixed permissions for /etc/ppp/peers to 711 +- added opts patch (noauth and noipdefault into /etc/ppp/options) + +* Sat May 24 2003 Dmitry V. Levin 2.4.1.20030513-alt1 +- Updated to 2.4.2b3+ (snapshot 20030513). +- Rediffed patches, only five of them left. +- Packaged plugins. +- PAM configuration policy enforcement. +- Dropped pppgetpass. +- Packaged ppp-radius and radiusclient libraries (not enabled by default). + +* Thu Oct 24 2002 Konstantin Volckov 2.4.1-alt8 +- Rebuilt in new environment +- Changed pppd URL +- Changed version string +- Added devel package - it contains headers from pppd + +* Wed May 22 2002 Konstantin Volckov 2.4.1-alt7 +- Removed requires to glibc & pam & kernel - now it's bad requires... + +* Mon Jan 21 2002 Konstantin Volckov 2.4.1-alt6 +- Fixed permissions on %_sysconfdir/%name/callback-* - now it's 750. +- Fixed patch5 - atdt->atdp + +* Wed Jan 16 2002 Konstantin Volckov 2.4.1-alt5 +- Removed MPPE & CBCP builddefs - now these features compiled in standart + CBCP package +- Added some patches from ASP Linux + +* Tue Oct 16 2001 Konstantin Volckov 2.4.1-alt4 +- Changes to new /var/lock/serial scheme + +* Fri Aug 03 2001 Konstantin Volckov 2.4.1-alt3.2 +- Added MPPE support + +* Thu Aug 02 2001 Konstantin Volckov 2.4.1-alt3.1 +- Some fixes to CBCP patch +- Added DEBUG_CBCP define +- Fixed spec file + +* Wed Jul 04 2001 Konstantin Volckov 2.4.1-alt3 +- Fixed CBCP debug messages +- Added option to BUILD_CBCP +- Placed CBCP configs in right place +- Updated CBCP from Bolke de Bruin release +- Added noresolv patch +- Some spec cleanup +- Added pppgetpass program from contrib + +* Thu Jun 14 2001 Konstantin Volckov 2.4.1-alt2 +- Fixed CBCP_SUPPORT in Makefile + +* Mon May 28 2001 Konstantin Volckov 2.4.1-alt1 +- Updated 2 new version +- Fixed cbcp compiling + +* Fri Oct 13 2000 Dmitry V. Levin 2.4.0-ipl2mdk +- Updated pam configuration. + +* Wed Aug 9 2000 Dmitry V. Levin 2.4.0-ipl1mdk +- Updated to 2.4.0. + +* Thu Jul 13 2000 Dmitry V. Levin 2.4.0b2-ipl1mdk +- Updated to 2.4.0b2. +- Patched samples to avoid unnecessary dependencies. +- Added zlib patch from James Carlson + (see ftp://playground.sun.com/pub/carlsonj/zlib-bug.notes for details). +- Moved scripts and samples to separate package to split dependencies. + +* Mon Apr 03 2000 Dmitry V. Levin +- Added: noresolvconf option support. + +* Thu Mar 09 2000 Dmitry V. Levin +- Fixed check for pam_open_session result code + (by Leon Kanter ). +- Merge with Mandrake. + +* Sun Jan 02 2000 Dmitry V. Levin +- 2.3.11 + +* Thu Nov 11 1999 Dmitry V. Levin +- Merge with RH. + +* Sun Oct 17 1999 Dmitry V. Levin +- Fandra adaptions. + +* Mon Sep 20 1999 Axalon Bloodstone +- Fix %%post ?? + +* Mon Sep 20 1999 Axalon Bloodstone +- Fix %%post + +* Mon Sep 20 1999 Axalon Bloodstone +- -DCHAPMS +- -DUSE_PAM + +* Tue Sep 7 1999 Bernhard Rosenkraenzer +- Add /dev/ppp +- Add entries in /etc/conf.modules if they aren't there yet + +* Wed Aug 25 1999 Bernhard Rosenkraenzer +- 2.3.9 (required for kernel 2.3.14+) + +* Thu Jul 15 1999 Chmouel Boudjnah +- Removing unused stuff. +- Upgrade patch. +- 2.3.8. + +* Sat Jul 10 1999 Axalon Bloodstone +- Define the .pid to /var/run/ +- Glare @Chmouel + +* Fri Jul 09 1999 Chmouel Boudjnah +- Define the .pid to /var/run not to /etc/ (reported by Nikodemus Karlsson + ). + +* Wed May 05 1999 Bernhard Rosenkraenzer +- Mandrake adaptions +- handle RPM_OPT_FLAGS + +* Fri Apr 09 1999 Cristian Gafton +- force pppd use the glibc's logwtmp instead of implementing its own + +* Thu Apr 01 1999 Preston Brown +- version 2.3.7 bugfix release + +* Tue Mar 23 1999 Cristian Gafton +- version 2.3.6 + +* Mon Mar 22 1999 Michael Johnson +- auth patch + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 3) + +* Thu Jan 07 1999 Cristian Gafton +- build for glibc 2.1 + +* Fri Jun 5 1998 Jeff Johnson +- updated to 2.3.5. + +* Tue May 19 1998 Prospector System +- translations modified for de + +* Fri May 8 1998 Jakub Jelinek +- make it run with kernels 2.1.100 and above. + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Wed Mar 18 1998 Cristian Gafton +- requires glibc 2.0.6 or later + +* Wed Mar 18 1998 Michael K. Johnson +- updated PAM patch to not turn off wtmp/utmp/syslog logging. + +* Wed Jan 7 1998 Cristian Gafton +- added the /etc/pam.d config file +- updated PAM patch to include session support + +* Tue Jan 6 1998 Cristian Gafton +- updated to %name-2.3.3, build against glibc-2.0.6 - previous patches not + required any more. +- added buildroot +- fixed the PAM support, which was really, completely broken and against any + standards (session support is still not here... :-( ) +- we build against running kernel and pray that it will work +- added a samples patch; updated glibc patch + +* Thu Dec 18 1997 Erik Troan +- added a patch to use our own route.h, rather then glibc's (which has + alignment problems on Alpha's) -- I only applied this patch on the Alpha, + though it should be safe everywhere + +* Fri Oct 10 1997 Erik Troan +- turned off the execute bit for scripts in %prefix/doc + +* Fri Jul 18 1997 Erik Troan +- built against glibc + +* Tue Mar 25 1997 Erik Troan +- Integrated new patch from David Mosberger +- Improved description diff --git a/.gear/ppp.tmpfiles b/.gear/ppp.tmpfiles new file mode 100644 index 0000000..bc912fb --- /dev/null +++ b/.gear/ppp.tmpfiles @@ -0,0 +1,4 @@ +d /run/ppp 0755 root root - +f /run/ppp/resolv.conf 0644 root root - +L /etc/ppp/resolv.conf - - - - ../../run/ppp/resolv.conf +L /etc/ppp/connect-errors - - - - ../../var/log/ppp/connect-errors diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..4a1a2a3 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,8 @@ +spec: .gear/ppp.spec +tar: @name@-@version@:. +diff: @name@-@version@:. . +copy: .gear/*.control +copy: .gear/*.pamd +copy: .gear/*.logrotate +copy: .gear/*.tmpfiles +copy: .gear/*.rules diff --git a/.gear/tags/76c9e7130cb2aa9347c375faaba30d698fca87b8 b/.gear/tags/76c9e7130cb2aa9347c375faaba30d698fca87b8 new file mode 100644 index 0000000..373b72a --- /dev/null +++ b/.gear/tags/76c9e7130cb2aa9347c375faaba30d698fca87b8 @@ -0,0 +1,17 @@ +object 760ce18f82670eb81cc186fb792919339a2e2fbe +type commit +tag ppp-2.5.0 +tagger Paul Mackerras 1680573341 +0800 + +PPP version 2.5.0 +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEv0VLfXa2m9eKuaRpnZrqdyxjcZ8FAmQrg6MACgkQnZrqdyxj +cZ/heQgA6EGxeo4ekUDnf18X3JcW4HA0rPe8yM9GAGTwBaBwdX+tipeCDyzhUP3j +T+PXzbJwtuzQBQhQH02+uSL9lcceRyh6Z2I5oPoND+HM8Msp2EQ5azGqaIQY5FnM +OOThxCALJ9G8ovHf57Cx4IRcd+x1WBYdV8JDYG4POqNmRCaJm6hwm35t69KZEyLx +Jgs2Ln5v5YLnYSzYub9vKz36cMVTjR946KuDFEpY25dsz+8MWSSYd3BzuAKOxesT +1e6T8x9OGiPgJl9vCtkRzI37JtIBhMdD8nfA583dE5610hmbpFEcXKN4sv5/VhQJ +AT0AHuxCLeJU1LDam0Wnxi+uW+GWFg== +=j0oT +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..4c3d433 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +76c9e7130cb2aa9347c375faaba30d698fca87b8 ppp-2.5.0 diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 0000000..55d7402 --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = https://github.com/ppp-project/ppp.git + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/chat/chat.8 b/chat/chat.8 index 6d10836..78d6939 100644 --- a/chat/chat.8 +++ b/chat/chat.8 @@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the script to send strings to the user at the terminal via standard error. If \fBchat\fR is being run by pppd, and pppd is running as a daemon (detached from its controlling terminal), standard error will normally be redirected to the file -/etc/ppp/connect\-errors. +/var/log/ppp/connect\-errors. .LP \fBSAY\fR strings must be enclosed in single or double quotes. If carriage return and line feed are needed in the string to be output, diff --git a/etc.ppp/options b/etc.ppp/options index 4b67b6a..b1671cc 100644 --- a/etc.ppp/options +++ b/etc.ppp/options @@ -1 +1,4 @@ lock +noipdefault +noauth +replacedefaultroute diff --git a/pppd/main.c b/pppd/main.c index 4455199..c207d10 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -888,7 +888,7 @@ create_pidfile(int pid) { FILE *pidfile; - slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid", + slprintf(pidfilename, sizeof(pidfilename), "%s/%s.pid", PPP_PATH_VARRUN, ifname); if ((pidfile = fopen(pidfilename, "w")) != NULL) { fprintf(pidfile, "%d\n", pid); @@ -907,7 +907,7 @@ create_linkpidfile(int pid) if (linkname[0] == 0) return; ppp_script_setenv("LINKNAME", linkname, 1); - slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid", + slprintf(linkpidfile, sizeof(linkpidfile), "%s/ppp-%s.pid", PPP_PATH_VARRUN, linkname); if ((pidfile = fopen(linkpidfile, "w")) != NULL) { fprintf(pidfile, "%d\n", pid); diff --git a/pppd/options.c b/pppd/options.c index 42e39b8..4b3e93e 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -1842,6 +1842,10 @@ user_setenv(char **argv) /* The name never changes, so allocate it with the structure */ if (uep == NULL) { uep = malloc(sizeof (*uep) + (eqp-arg)); + if (uep == NULL) { + novm("environment variable"); + return 1; + } strncpy(uep->ue_name, arg, eqp-arg); uep->ue_name[eqp-arg] = '\0'; uep->ue_next = NULL; @@ -1911,6 +1915,10 @@ user_unsetenv(char **argv) /* The name never changes, so allocate it with the structure */ if (uep == NULL) { uep = malloc(sizeof (*uep) + strlen(arg)); + if (uep == NULL) { + novm("environment variable"); + return 1; + } strcpy(uep->ue_name, arg); uep->ue_next = NULL; insp = &userenv_list; diff --git a/pppd/pathnames.h b/pppd/pathnames.h index de2fb68..9886cc9 100644 --- a/pppd/pathnames.h +++ b/pppd/pathnames.h @@ -105,7 +105,7 @@ #define PPP_PATH_AUTHDOWN PPP_PATH_CONFDIR "/auth-down" #define PPP_PATH_TTYOPT PPP_PATH_CONFDIR "/options." #define PPP_PATH_PEERFILES PPP_PATH_CONFDIR "/peers/" -#define PPP_PATH_RESOLV PPP_PATH_CONFDIR "/resolv.conf" +#define PPP_PATH_RESOLV PPP_PATH_VARRUN "/resolv.conf" #define PPP_PATH_CONNERRS PPP_PATH_VARLOG "/connect-errors" @@ -120,7 +120,7 @@ #define PPP_PATH_PPPDB PPP_PATH_VARRUN "/pppd2.tdb" #ifdef __linux__ -#define PPP_PATH_LOCKDIR PPP_PATH_VARRUN "/lock" +#define PPP_PATH_LOCKDIR "/run/lock/serial" #else #ifdef SVR4 #define PPP_PATH_LOCKDIR LOCALSTATEDIR "/spool/locks" diff --git a/pppd/plugins/radius/config.c b/pppd/plugins/radius/config.c index 39744fc..e1a4814 100644 --- a/pppd/plugins/radius/config.c +++ b/pppd/plugins/radius/config.c @@ -235,24 +235,28 @@ int rc_read_config(char *filename) switch (option->type) { case OT_STR: - if (set_option_str(filename, line, option, p) < 0) + if (set_option_str(filename, line, option, p) < 0) { fclose(configfd); return (-1); + } break; case OT_INT: - if (set_option_int(filename, line, option, p) < 0) + if (set_option_int(filename, line, option, p) < 0) { fclose(configfd); return (-1); + } break; case OT_SRV: - if (set_option_srv(filename, line, option, p) < 0) + if (set_option_srv(filename, line, option, p) < 0) { fclose(configfd); return (-1); + } break; case OT_AUO: - if (set_option_auo(filename, line, option, p) < 0) + if (set_option_auo(filename, line, option, p) < 0) { fclose(configfd); return (-1); + } break; default: fatal("rc_read_config: impossible case branch!");