diff --git a/ppp.spec b/ppp.spec index 2e16960..484c52f 100644 --- a/ppp.spec +++ b/ppp.spec @@ -45,9 +45,10 @@ Patch0026: ppp-2.4.9-configure-cflags-allow-commas.patch BuildRequires: autoconf BuildRequires: libtool BuildRequires: atm-devel -BuildRequires: pcap-devel +BuildRequires: pkgconfig(libpcap) BuildRequires: pkgconfig(openssl3.3) #BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libsasl2) BuildRequires: pam-devel #BuildRequires: openssl-devel BuildRequires: pkgconfig(systemd) @@ -91,7 +92,7 @@ the PPP protocol. %{_mandir}/man8/ppp-watch.8* %{_libdir}/pppd/%{version}/minconn.so %{_libdir}/pppd/%{version}/openl2tp.so -%{_libdir}/pppd/%{version}/passprompt.so +#{_libdir}/pppd/%{version}/passprompt.so %{_libdir}/pppd/%{version}/passwordfd.so %{_libdir}/pppd/%{version}/pppol2tp.so %{_libdir}/pppd/%{version}/winbind.so @@ -99,17 +100,28 @@ the PPP protocol. %ghost %dir %{_rundir}/lock/ppp %dir %{_sysconfdir}/logrotate.d %attr(700, root, root) %dir %{_localstatedir}/log/ppp -%config(noreplace) %{_sysconfdir}/ppp/eaptls-client -%config(noreplace) %{_sysconfdir}/ppp/eaptls-server -%config(noreplace) %{_sysconfdir}/ppp/chap-secrets -%config(noreplace) %{_sysconfdir}/ppp/options -%config(noreplace) %{_sysconfdir}/ppp/pap-secrets +#config(noreplace) %{_sysconfdir}/ppp/eaptls-client +#config(noreplace) %{_sysconfdir}/ppp/eaptls-server +#config(noreplace) %{_sysconfdir}/ppp/chap-secrets +#config(noreplace) %{_sysconfdir}/ppp/options +#config(noreplace) %{_sysconfdir}/ppp/pap-secrets %config(noreplace) %{_sysconfdir}/pam.d/ppp %config(noreplace) %{_sysconfdir}/logrotate.d/ppp %{_tmpfilesdir}/ppp.conf %{_sysconfdir}/sysconfig/network-scripts/ifdown-ppp %{_sysconfdir}/sysconfig/network-scripts/ifup-ppp +%config(noreplace) %{_sysconfdir}/ppp/chap-secrets.example +%config(noreplace) %{_sysconfdir}/ppp/eaptls-client.example +%config(noreplace) %{_sysconfdir}/ppp/eaptls-server.example +%config(noreplace) %{_sysconfdir}/ppp/openssl.cnf.example +%config(noreplace) %{_sysconfdir}/ppp/options.example +%config(noreplace) %{_sysconfdir}/ppp/pap-secrets.example + + + + + # scripts pon/poff/plog %{_sbindir}/pon %{_sbindir}/poff @@ -131,7 +143,7 @@ PPP over ATM plugin for %{name}. %files devel %doc README* %{_includedir}/pppd/* -#{_libdir}/pkgconfig/pppd.pc +%{_libdir}/pkgconfig/pppd.pc #---------------------------------------------------------------------------- @@ -160,7 +172,7 @@ PPP over ethernet plugin for %{name}. %files pppoe %doc README %{_libdir}/pppd/%{version}/pppoe.so -%{_libdir}/pppd/%{version}/rp-pppoe.so +#{_libdir}/pppd/%{version}/rp-pppoe.so %{_sbindir}/pppoe-discovery #---------------------------------------------------------------------------- @@ -189,6 +201,9 @@ Radius plugin for %{name}. tar -xJf %{SOURCE12} %build +export OPENSSL_DIR=/opt/openssl3.3 + + ./autogen.sh %configure \ --prefix=%{_prefix} \ @@ -204,6 +219,7 @@ tar -xJf %{SOURCE12} --enable-ipv6-support \ --enable-plugins \ --enable-eaptls \ + --enable-multilink \ --enable-openssl-engine \ OPENSSL_LDFLAGS="-L/opt/openssl3.3/%{_lib}" @@ -223,7 +239,9 @@ tar -xJf %{SOURCE12} %install #makeinstall -make INSTROOT=%{buildroot} install install-etcppp +#make INSTROOT=%{buildroot} install install-etcppp +%makeinstall + find scripts -type f | xargs chmod a-x %make ROOT=%{buildroot} -C ppp-watch install # create log files dir