diff --git a/README.md b/README.md index f4b54cf..b0d9578 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,5 @@ The ppp 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 ppp package should be installed if your machine needs to support the PPP protocol. diff --git a/ppp.spec b/ppp.spec index 21e0e2f..a7a9960 100644 --- a/ppp.spec +++ b/ppp.spec @@ -1,14 +1,14 @@ %define dialout_groupid 10 Name: ppp -Version: 2.4.9 +Version: 2.5.0 Release: 1mamba Summary: Point to Point Protocol Group: System/Servers Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.samba.org/ppp +URL: https://ppp.samba.org/ Source0: https://download.samba.org/pub/ppp/ppp-%{version}.tar.gz Source1: ppp-options-atm Source2: ppp-options @@ -27,17 +27,17 @@ Patch4: ppp-2.4.5-enable_pam.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libatm-devel +BuildRequires: libopenssl-devel +BuildRequires: libpam-devel BuildRequires: libpcap-devel -BuildRequires: pam-devel ## AUTOBUILDREQ-END BuildRequires: libpcap-devel >= 1.2 BuildRequires: libatm-devel >= 2.4.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The ppp 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 ppp package should be installed if your machine needs to support the PPP protocol. %package devel @@ -48,8 +48,7 @@ Requires: %{name} = %{version}-%{release} %description devel The ppp 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. - -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. %debug_package @@ -58,23 +57,25 @@ This package contains static libraries and header files need for development. #%patch1 -p1 #%patch2 -p1 -b .CVE_2006_2194 #%patch3 -p1 -%patch4 -p1 +#%patch 4 -p1 -rm -f include/linux/if_pppol2tp.h +#rm -f include/linux/if_pppol2tp.h -%ifarch x86_64 aarch64 -sed -i "s|/lib/pppd|/%{_lib}/pppd|" pppd/pathnames.h pppd/plugins/Makefile.linux pppd/plugins/*/Makefile.linux -%endif +#%ifarch x86_64 aarch64 +#sed -i "s|/lib/pppd|/%{_lib}/pppd|" pppd/pathnames.h pppd/plugins/Makefile.linux pppd/plugins/*/Makefile.linux +#%endif %build -%configure +%configure \ + --with-pam + # --prefix=%{_prefix} + %make CC=%{_target_platform}-gcc %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall \ - DESTDIR=%{buildroot}%{_prefix} +%makeinstall install -D -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/ppp/options-atm install -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/ppp/options @@ -102,8 +103,8 @@ install -d %{buildroot}%{_sysconfdir}/ppp/peers #install -D -m 0644 %{S:9} \ # %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged/adsl.menu -install -d -m0755 %{buildroot}%{_sysconfdir}/modprobe.d/ -cat > %{buildroot}%{_sysconfdir}/modprobe.d/ppp.conf << _EOF +install -d -m0755 %{buildroot}%{_modprobedir} +cat > %{buildroot}%{_modprobedir}/ppp.conf << _EOF alias ppp0 ppp_generic _EOF @@ -135,7 +136,7 @@ exit 0 %config(noreplace) %attr(0664,root,dialout) %{_sysconfdir}/ppp/openssl.cnf %config %{_sysconfdir}/ppp/ip-* %config %{_sysconfdir}/ppp/ipv6-* -%{_sysconfdir}/modprobe.d/ppp.conf +%{_modprobedir}/ppp.conf %attr(4550,root,dialout) %{_sbindir}/pppd %{_sbindir}/pppstats %{_sbindir}/pppdump @@ -153,9 +154,14 @@ exit 0 %files devel %defattr(-,root,root) -%{_includedir}/pppd +%dir %{_includedir}/pppd +%{_includedir}/pppd/* +%{_libdir}/pkgconfig/pppd.pc %changelog +* Fri May 12 2023 Automatic Build System 2.5.0-1mamba +- automatic version update by autodist + * Fri Jan 15 2021 Automatic Build System 2.4.9-1mamba - automatic version update by autodist