|
@@ -5,13 +5,18 @@
|
|
|
Summary: The PPP (Point-to-Point Protocol) daemon.
|
|
|
Summary(ja): PPP (Point-to-Point Protocol) デーモン
|
|
|
Name: ppp
|
|
|
-Version: 2.4.7
|
|
|
-Release: 4%{?_dist_release}
|
|
|
-License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
|
|
+Version: 2.4.8
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Group: System Environment/Daemons
|
|
|
-URL: http://www.samba.org/ppp
|
|
|
|
|
|
-Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+Packager: daisuke
|
|
|
+
|
|
|
+License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
|
|
+URL: https://github.com/paulusmack/ppp
|
|
|
+
|
|
|
+Source0: https://github.com/paulusmack/ppp/archive/ppp-%{version}.tar.gz
|
|
|
Source1: ppp-pam.conf
|
|
|
Source2: ppp-logrotate.conf
|
|
|
Source3: ppp-tmpfiles.conf
|
|
@@ -26,37 +31,34 @@ Source11: ifdown-ppp
|
|
|
Source12: ppp-watch.tar.xz
|
|
|
|
|
|
# Fedora-specific
|
|
|
-Patch0001: 0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
|
|
|
-Patch0002: 0002-build-sys-enable-PAM-support.patch
|
|
|
-Patch0003: 0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
|
|
|
-Patch0004: 0004-doc-add-configuration-samples.patch
|
|
|
-Patch0005: 0005-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
|
|
|
-Patch0006: 0006-scritps-use-change_resolv_conf-function.patch
|
|
|
-Patch0007: 0007-build-sys-don-t-strip-binaries-during-installation.patch
|
|
|
-Patch0008: 0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
|
|
|
-Patch0009: 0009-pppd-introduce-ipv6-accept-remote.patch
|
|
|
-Patch0010: 0010-build-sys-enable-CBCP.patch
|
|
|
-Patch0011: 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
|
|
|
-Patch0012: 0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch
|
|
|
-Patch0013: 0013-everywhere-O_CLOEXEC-harder.patch
|
|
|
-Patch0014: 0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
|
|
|
-Patch0015: 0015-pppd-move-pppd-database-to-var-run-ppp.patch
|
|
|
-Patch0016: 0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
|
|
|
-Patch0018: 0018-scritps-fix-ip-up.local-sample.patch
|
|
|
-Patch0019: 0019-sys-linux-rework-get_first_ethernet.patch
|
|
|
-Patch0020: 0020-pppd-put-lock-files-in-var-lock-ppp.patch
|
|
|
-Patch0021: 0021-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
|
|
|
-Patch0022: 0022-build-sys-compile-pppol2tp-with-multilink-support.patch
|
|
|
-Patch0023: 0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
|
|
|
-Patch0024: 0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
|
|
|
-Patch0025: 0025-pppd-install-pppd-binary-using-standard-perms-755.patch
|
|
|
-Patch0026: ppp-2.4.7-eaptls-mppe-1.102.patch
|
|
|
-Patch0028: 0028-pppoe-include-netinet-in.h-before-linux-in.h.patch
|
|
|
-
|
|
|
-# rhbz#1556132
|
|
|
-Patch0029: ppp-2.4.7-DES-openssl.patch
|
|
|
-# https://github.com/paulusmack/ppp/pull/95
|
|
|
-Patch0030: ppp-2.4.7-honor-ldflags.patch
|
|
|
+Patch0001: 0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
|
|
|
+Patch0002: ppp-2.4.8-build-sys-enable-PAM-support.patch
|
|
|
+Patch0003: ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
|
|
|
+Patch0004: 0004-doc-add-configuration-samples.patch
|
|
|
+Patch0005: ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
|
|
|
+Patch0006: 0006-scritps-use-change_resolv_conf-function.patch
|
|
|
+Patch0007: 0007-build-sys-don-t-strip-binaries-during-installation.patch
|
|
|
+Patch0008: 0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
|
|
|
+Patch0009: ppp-2.4.8-pppd-introduce-ipv6-accept-remote.patch
|
|
|
+Patch0010: 0010-build-sys-enable-CBCP.patch
|
|
|
+Patch0011: 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
|
|
|
+Patch0012: ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
|
|
|
+Patch0013: ppp-2.4.8-everywhere-O_CLOEXEC-harder.patch
|
|
|
+Patch0014: 0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
|
|
|
+Patch0015: 0015-pppd-move-pppd-database-to-var-run-ppp.patch
|
|
|
+Patch0016: 0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
|
|
|
+Patch0018: 0018-scritps-fix-ip-up.local-sample.patch
|
|
|
+Patch0019: ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch
|
|
|
+Patch0020: 0020-pppd-put-lock-files-in-var-lock-ppp.patch
|
|
|
+Patch0021: ppp-2.4.8-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
|
|
|
+Patch0022: ppp-2.4.8-build-sys-compile-pppol2tp-with-multilink-support.patch
|
|
|
+Patch0023: 0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
|
|
|
+Patch0024: 0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
|
|
|
+Patch0025: ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
|
|
|
+Patch0026: ppp-2.4.8-eaptls-mppe-1.102.patch
|
|
|
+
|
|
|
+Patch0032: ppp-2.4.8-CVE-2020-8597.patch
|
|
|
+
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: glib2-devel, libpcap >= 0.8.3, eudev-libudev-devel, openssl-devel, pam-devel
|
|
@@ -64,9 +66,6 @@ BuildRequires: glib2-devel, libpcap >= 0.8.3, eudev-libudev-devel, openssl-devel
|
|
|
Requires: glibc >= 2.0.6, pam >= 1.0
|
|
|
Requires(pre): shadow-utils
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
-Packager: daisuke
|
|
|
|
|
|
%description
|
|
|
The ppp package contains the PPP (Point-to-Point Protocol) daemon and
|
|
@@ -96,13 +95,13 @@ This package contains the header files for building plugins for ppp.
|
|
|
含まれています。
|
|
|
|
|
|
%prep
|
|
|
-%setup -q
|
|
|
+%setup -q -n ppp-ppp-%{version}
|
|
|
%autopatch -p1
|
|
|
|
|
|
tar -xJf %{SOURCE12}
|
|
|
|
|
|
%build
|
|
|
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall"
|
|
|
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
|
|
|
%configure
|
|
|
make %{?_smp_mflags}
|
|
|
make -C ppp-watch %{?_smp_mflags}
|
|
@@ -195,6 +194,10 @@ rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.8-1
|
|
|
+- new upstream release.
|
|
|
+- updated patches.
|
|
|
+
|
|
|
* Sun Nov 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.7-4
|
|
|
- rebuilt with openssl-1.1.1.
|
|
|
- dropped Patch17.
|