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