Accepting request 226897 from home:aeneas_jaissle:branches:network
New upstream release 2.4.6 OBS-URL: https://build.opensuse.org/request/show/226897 OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=22
This commit is contained in:
Lars Vogdt
committed by
Git OBS Bridge
Git OBS Bridge
parent
8645b29a31
commit
8c5154bcc1
88
ppp.spec
88
ppp.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ppp
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -20,14 +20,14 @@ Name: ppp
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: linux-atm-devel
|
||||
BuildRequires: pam-devel
|
||||
Url: http://www.samba.org/ppp/
|
||||
Version: 2.4.5
|
||||
Url: http://ppp.samba.org/
|
||||
Version: 2.4.6
|
||||
Release: 0
|
||||
Summary: The Point to Point Protocol for Linux
|
||||
License: BSD-3-Clause and LGPL-2.1+ and GPL-2.0+
|
||||
Group: Productivity/Networking/PPP
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: ftp://ftp.samba.org:/pub/ppp/ppp-%{version}.tar.bz2
|
||||
Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
|
||||
# config for pam
|
||||
Source1: ppp.pamd
|
||||
# templates for secrets
|
||||
@@ -44,13 +44,11 @@ Source11: ppp-peers
|
||||
Source12: pptp-peers
|
||||
Source13: pppoe-discovery.8.gz
|
||||
# Makefile changes
|
||||
Patch0: ppp-2.4.3-make.diff
|
||||
# force pppd use the glibc's logwtmp instead of implementing its own
|
||||
Patch1: ppp-2.4.2-logwtmp.diff
|
||||
Patch0: ppp-2.4.6-make.diff
|
||||
# replacedefaultroute option
|
||||
Patch2: ppp-2.4.2-cifdefroute.diff
|
||||
# misc tiny stuff
|
||||
Patch3: ppp-2.4.2-misc.diff
|
||||
Patch3: ppp-2.4.6-misc.diff
|
||||
# more log output for smpppd
|
||||
Patch4: ppp-2.4.2-smpppd.diff
|
||||
# allow higher serial speeds
|
||||
@@ -58,20 +56,18 @@ Patch5: ppp-2.4.1-higher-speeds.diff
|
||||
# fixed use of libpcap including dial on demand
|
||||
Patch6: ppp-2.4.3-filter.diff
|
||||
# option to rename ppp interface
|
||||
Patch8: ppp-2.4.2-ifname.diff
|
||||
Patch8: ppp-2.4.6-ifname.diff
|
||||
# Don't use __P from glibc (pppd uses it wrong)
|
||||
Patch9: ppp-2.4.2-__P.diff
|
||||
Patch10: ppp-2.4.3-pppoatm.diff
|
||||
Patch12: ppp-2.4.2-pie.patch
|
||||
Patch13: ppp-2.4.3-demand-fix.diff
|
||||
Patch14: ppp-2.4.3-fork-fix.diff
|
||||
Patch17: ppp-2.4.3-strip.diff
|
||||
Patch18: ppp-2.4.3-winbind-setuidfix.patch
|
||||
Patch19: ppp-2.4.4-strncatfix.patch
|
||||
Patch21: ppp-2.4.4-lib64.patch
|
||||
Patch21: ppp-2.4.6-lib64.patch
|
||||
Patch22: ppp-2.4.4-var_run_resolv_conf.patch
|
||||
Patch23: ppp-send-padt.patch
|
||||
Patch24: ppp-terminate-correct.patch
|
||||
|
||||
%description
|
||||
The ppp package contains the PPP (Point-to-Point Protocol) daemon,
|
||||
@@ -93,7 +89,6 @@ plugins for the pppd.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
@@ -103,7 +98,6 @@ plugins for the pppd.
|
||||
%patch9
|
||||
%patch10 -p1
|
||||
%patch12 -p1
|
||||
%patch13
|
||||
%patch14
|
||||
%patch17
|
||||
%patch18
|
||||
@@ -113,7 +107,6 @@ plugins for the pppd.
|
||||
%endif
|
||||
%patch22
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
sed -i -e '1s/local\///' scripts/secure-card
|
||||
find scripts -type f | xargs chmod a-x
|
||||
|
||||
@@ -122,52 +115,49 @@ find scripts -type f | xargs chmod a-x
|
||||
rm -f include/linux/if_pppol2tp.h
|
||||
export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP"
|
||||
./configure --prefix=/usr
|
||||
make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y
|
||||
make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y HAVE_LOGWTMP=y
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}%_prefix
|
||||
install -d -m 750 %{buildroot}/etc/ppp
|
||||
install -m 644 %{S:5} %{buildroot}/etc/ppp/options
|
||||
install -m 644 %{S:6} %{buildroot}/etc/ppp/filters
|
||||
install -m 600 %{S:2} %{buildroot}/etc/ppp/pap-secrets
|
||||
install -m 600 %{S:3} %{buildroot}/etc/ppp/chap-secrets
|
||||
install -d 755 %{buildroot}/etc/ppp/peers
|
||||
install -m 644 %{S:8} %{buildroot}/etc/ppp/peers/pppoe
|
||||
install -m 644 %{S:9} %{buildroot}/etc/ppp/peers/pppoe-rp
|
||||
install -d -m 750 %{buildroot}%{_sysconfdir}/ppp
|
||||
install -m 644 %{S:5} %{buildroot}%{_sysconfdir}/ppp/options
|
||||
install -m 644 %{S:6} %{buildroot}%{_sysconfdir}/ppp/filters
|
||||
install -m 600 %{S:2} %{buildroot}%{_sysconfdir}/ppp/pap-secrets
|
||||
install -m 600 %{S:3} %{buildroot}%{_sysconfdir}/ppp/chap-secrets
|
||||
install -d 755 %{buildroot}%{_sysconfdir}/ppp/peers
|
||||
install -m 644 %{S:8} %{buildroot}%{_sysconfdir}/ppp/peers/pppoe
|
||||
install -m 644 %{S:9} %{buildroot}%{_sysconfdir}/ppp/peers/pppoe-rp
|
||||
%ifnarch mips s390 s390x
|
||||
install -m 644 %{S:10} %{buildroot}/etc/ppp/peers/pppoatm
|
||||
install -m 644 %{S:10} %{buildroot}%{_sysconfdir}/ppp/peers/pppoatm
|
||||
%endif
|
||||
install -m 644 %{S:11} %{buildroot}/etc/ppp/peers/ppp
|
||||
install -m 644 %{S:12} %{buildroot}/etc/ppp/peers/pptp
|
||||
install -d 755 %{buildroot}/etc/pam.d
|
||||
install -m 644 %{S:1} %{buildroot}/etc/pam.d/ppp
|
||||
install -m 644 %{S:13} %{buildroot}/%{_mandir}/man8/pppoe-discovery.8.gz
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
install -m 644 %{S:11} %{buildroot}%{_sysconfdir}/ppp/peers/ppp
|
||||
install -m 644 %{S:12} %{buildroot}%{_sysconfdir}/ppp/peers/pptp
|
||||
install -d 755 %{buildroot}%{_sysconfdir}/pam.d
|
||||
install -m 644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/ppp
|
||||
install -m 644 %{S:13} %{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz
|
||||
|
||||
%files
|
||||
%defattr (-, root, root)
|
||||
%dir /etc/ppp/peers
|
||||
%config(noreplace) /etc/ppp/options
|
||||
%config(noreplace) /etc/ppp/filters
|
||||
%config(noreplace) /etc/ppp/pap-secrets
|
||||
%config(noreplace) /etc/ppp/chap-secrets
|
||||
%config(noreplace) /etc/ppp/peers/*
|
||||
%config(noreplace) /etc/pam.d/ppp
|
||||
%dir %{_sysconfdir}/ppp/peers
|
||||
%config(noreplace) %{_sysconfdir}/ppp/options
|
||||
%config(noreplace) %{_sysconfdir}/ppp/filters
|
||||
%config(noreplace) %{_sysconfdir}/ppp/pap-secrets
|
||||
%config(noreplace) %{_sysconfdir}/ppp/chap-secrets
|
||||
%config(noreplace) %{_sysconfdir}/ppp/peers/*
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/ppp
|
||||
%doc FAQ README* SETUP scripts PLUGINS
|
||||
%doc %{_mandir}/*/*
|
||||
%attr (-, root, dialout) /usr/sbin/pppd
|
||||
/usr/sbin/chat
|
||||
/usr/sbin/pppdump
|
||||
/usr/sbin/pppstats
|
||||
/usr/sbin/pppoe-discovery
|
||||
%dir %_libdir/pppd
|
||||
%dir %_libdir/pppd/2.4.5
|
||||
%attr(0755,root,root) %_libdir/pppd/2.4.5/*.so
|
||||
%attr (-, root, dialout) %{_sbindir}/pppd
|
||||
%{_sbindir}/chat
|
||||
%{_sbindir}/pppdump
|
||||
%{_sbindir}/pppstats
|
||||
%{_sbindir}/pppoe-discovery
|
||||
%dir %{_libdir}/pppd
|
||||
%dir %{_libdir}/pppd/%{version}
|
||||
%attr(0755,root,root) %{_libdir}/pppd/%{version}/*.so
|
||||
|
||||
%files devel
|
||||
%defattr (-, root, root)
|
||||
/usr/include/pppd
|
||||
%{_includedir}/pppd
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user