From de7baff5403326d79782eea22dddc76d9df0a2bd Mon Sep 17 00:00:00 2001
From: Vlad Glagolev
Date: Mon, 20 Apr 2020 18:44:16 +0000
Subject: python: => 2.7.18 [security]

(cherry picked from commit 598a88076dbd69bf5ac48b292d8c7d87d90a9c14)
---
 devel/python/DETAILS | 4 ++--
 devel/python/HISTORY | 4 ++++
 devel/python/INSTALL | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index f4f7de8aa4..38e016684e 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,6 +1,6 @@
            SPELL=python
-         VERSION=2.7.17
-  SECURITY_PATCH=7
+         VERSION=2.7.18
+  SECURITY_PATCH=8
           SOURCE=Python-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index b1d0ee0541..ca8a627174 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2020-04-20 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.7.18; SECURITY_PATCH++ (CVE-2019-18348)
+	* INSTALL: correct path check and fix linking
+
 2019-10-21 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 2.7.17
 
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index 71abc31b5e..d323281272 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -1,4 +1,4 @@
-cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+cp -dRv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
 
 if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then
   cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH"
-- 
cgit v1.2.3