Merge branch 'ppp-packaging-upstreamed-cve-fixes' into 'master'

Update to upstream. Drop outdated CVE-2015-3310.patch JB#50138 See merge request mer-core/ppp!4
sailfishos · Jun 5, 2020 · 26fb154 · 26fb154
2 parents 1313398 + e032fbb
commit 26fb154
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/ppp b/ppp
diff --git a/rpm/CVE-2015-3310.patch b/rpm/CVE-2015-3310.patch
diff --git a/rpm/ppp.spec b/rpm/ppp.spec
@@ -7,7 +7,6 @@ License:    BSD and GPLv2+ and LGPLv2+ and Public Domain
 URL:        https://ppp.samba.org/
 Source0:    https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz
 Patch0:     ppp-destdir.patch
-Patch1:     CVE-2015-3310.patch
 Requires:   openssl-libs
 BuildRequires:  coreutils
 BuildRequires:  sed
@@ -39,7 +38,6 @@ PPP libraries.
 %prep
 %setup -q -n %{name}-%{version}/%{name}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure --prefix=/usr