This commit is contained in:
Sergey Zhemoytel 2024-06-15 11:25:26 +00:00
parent 0dca358579
commit 813c3f12e3
2 changed files with 37 additions and 30 deletions

View file

@ -1,5 +1,5 @@
sources: sources:
2.4.9.tar.gz: 4241f65a5f8e1efb3874b9c7887d38ae4d05d112 2.4.9.tar.gz: 4241f65a5f8e1efb3874b9c7887d38ae4d05d112
ppp-2.5.0.tar.gz: 014f13c3e9da059b263facb8095759dfb4f58fef ppp-2.4.9.tar.gz: 4241f65a5f8e1efb3874b9c7887d38ae4d05d112
ppp-812e8e5c87da4fd84ae7bc5b6a18c85106188eb3.tar.gz: e02a8894045702adeecf995a0ee16d7f1e734261 ppp-812e8e5c87da4fd84ae7bc5b6a18c85106188eb3.tar.gz: e02a8894045702adeecf995a0ee16d7f1e734261
ppp-watch.tar.xz: 74b6db205dc46fc179a2a3bc3d726ddfeb03c801 ppp-watch.tar.xz: 74b6db205dc46fc179a2a3bc3d726ddfeb03c801

View file

@ -5,12 +5,12 @@
Summary: The PPP daemon and documentation Summary: The PPP daemon and documentation
Name: ppp Name: ppp
Version: 2.5.0 Version: 2.4.9
Release: 1 Release: 1
License: BSD License: BSD
Group: System/Servers Group: System/Servers
URL: https://github.com/ppp-project/ppp URL: https://github.com/ppp-project/ppp
Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Source1000: %{name}.rpmlintrc Source1000: %{name}.rpmlintrc
Source1: ppp-pam.conf Source1: ppp-pam.conf
Source2: ppp-logrotate.conf Source2: ppp-logrotate.conf
@ -81,7 +81,7 @@ the PPP protocol.
%{_sysconfdir}/ppp/ip-down.ipv6to4 %{_sysconfdir}/ppp/ip-down.ipv6to4
%{_sysconfdir}/ppp/ipv6-up %{_sysconfdir}/ppp/ipv6-up
%{_sysconfdir}/ppp/ipv6-down %{_sysconfdir}/ppp/ipv6-down
%{_sysconfdir}/ppp/openssl.cnf #{_sysconfdir}/ppp/openssl.cnf
%{_mandir}/man8/chat.8* %{_mandir}/man8/chat.8*
%{_mandir}/man8/pppd.8* %{_mandir}/man8/pppd.8*
%{_mandir}/man8/pppdump.8* %{_mandir}/man8/pppdump.8*
@ -130,7 +130,7 @@ PPP over ATM plugin for %{name}.
%files devel %files devel
%doc README* %doc README*
%{_includedir}/pppd/* %{_includedir}/pppd/*
%{_libdir}/pkgconfig/pppd.pc #{_libdir}/pkgconfig/pppd.pc
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -181,41 +181,48 @@ Radius plugin for %{name}.
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%prep %prep
%setup -qn %{name}-%{name}-%{version} %setup -q
#autopatch -p1 #autopatch -p1
#apply_patches %apply_patches
tar -xJf %{SOURCE12} tar -xJf %{SOURCE12}
%build %build
./autogen.sh \ #/autogen.sh
--prefix=%{_prefix} \ #configure \
--exec-prefix=%{_prefix} \ # --prefix=%{_prefix} \
--libdir=%{_libdir} \ # --exec-prefix=%{_prefix} \
--with-plugin-dir=\$\{prefix\}/%{_lib}/pppd/%{version} \ # --libdir=%{_libdir} \
--with-runtime-dir=\$\{localstatedir\}/run/pppd \ # --with-plugin-dir=\$\{prefix\}/%{_lib}/pppd/%{version} \
--enable-systemd \ # --with-runtime-dir=\$\{localstatedir\}/run/pppd \
--enable-cbcp \ # --enable-systemd \
--enable-ipxcp \ # --enable-cbcp \
--enable-mslanman \ # --enable-ipxcp \
--enable-microsoft-extensions \ # --enable-mslanman \
--enable-ipv6-support \ # --enable-microsoft-extensions \
--enable-plugins \ # --enable-ipv6-support \
--enable-eaptls \ # --enable-plugins \
--enable-openssl-engine \ # --enable-eaptls \
OPENSSL_LDFLAGS="-L%{_libdir}" # --enable-openssl-engine \
# OPENSSL_LDFLAGS="-L%{_libdir}"
#configure #configure
#--cflags="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing" #--cflags="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
#make_build LDFLAGS="%{ldflags} -pie" #make_build LDFLAGS="%{ldflags} -pie"
%make #
%make_build -C ppp-watch LDFLAGS="%{ldflags} -pie" #make_build -C ppp-watch LDFLAGS="%{ldflags} -pie"
#make #make
%configure --cflags="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
%make_build LDFLAGS="%{ldflags} -pie"
%make_build -C ppp-watch LDFLAGS="%{ldflags} -pie"
%install %install
%makeinstall #makeinstall
#make INSTROOT=%{buildroot} install install-etcppp make INSTROOT=%{buildroot} install install-etcppp
find scripts -type f | xargs chmod a-x find scripts -type f | xargs chmod a-x
%make ROOT=%{buildroot} -C ppp-watch install %make ROOT=%{buildroot} -C ppp-watch install
# create log files dir # create log files dir
@ -252,7 +259,7 @@ install -Dm0755 scripts/plog %{buildroot}%{_sbindir}/plog
find %{buildroot} -type f -name "*.a" -exec rm -rf {} \; find %{buildroot} -type f -name "*.a" -exec rm -rf {} \;
# create symlink rp-pppoe.so # create symlink rp-pppoe.so
pushd %{buildroot}%{_libdir}/pppd/%{version} #pushd %{buildroot}%{_libdir}/pppd/%{version}
ln -s pppoe.so rp-pppoe.so #ln -s pppoe.so rp-pppoe.so
popd #popd