From 1f6f0a2b38645cdadbf992129b65d8e1e4967cc3b2c64c0e0a09943695f7acfb Mon Sep 17 00:00:00 2001
From: Paolo Perego <paolo.perego@suse.com>
Date: Tue, 31 Aug 2021 06:57:19 +0000
Subject: [PATCH] Accepting request 915151 from home:StevenK:branches:security

- Update fix_shebang.patch to switch Python scripts to calling
  /usr/bin/python3.
- Add Requires on python3 for full interpreter.

OBS-URL: https://build.opensuse.org/request/show/915151
OBS-URL: https://build.opensuse.org/package/show/security/sqlmap?expand=0&rev=4
---
 fix_shebang.patch | 43 ++++++++++++++++++++++++-------------------
 sqlmap.changes    |  7 +++++++
 sqlmap.spec       |  1 +
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/fix_shebang.patch b/fix_shebang.patch
index 041bff6..c31f484 100644
--- a/fix_shebang.patch
+++ b/fix_shebang.patch
@@ -8,48 +8,53 @@ Only in sqlmap-1.5.ori/extra/runcmd/src/runcmd: stdafx.cpp
 Only in sqlmap-1.5/extra/runcmd/src/runcmd: stdafx.cpp.txt
 Only in sqlmap-1.5.ori/extra/runcmd/src/runcmd: stdafx.h
 Only in sqlmap-1.5/extra/runcmd/src/runcmd: stdafx.h.txt
-diff --color -rub sqlmap-1.5.ori/extra/shutils/autocompletion.sh sqlmap-1.5/extra/shutils/autocompletion.sh
---- sqlmap-1.5.ori/extra/shutils/autocompletion.sh	2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/extra/shutils/autocompletion.sh	2021-07-01 17:19:46.749860716 +0200
+Index: sqlmap-1.5.7/extra/shutils/autocompletion.sh
+===================================================================
+--- sqlmap-1.5.7.orig/extra/shutils/autocompletion.sh
++++ sqlmap-1.5.7/extra/shutils/autocompletion.sh
 @@ -1,4 +1,4 @@
 -#/usr/bin/env bash
 +#!/usr/bin/bash
  
  # source ./extra/shutils/autocompletion.sh
  
-diff --color -rub sqlmap-1.5.ori/extra/shutils/duplicates.py sqlmap-1.5/extra/shutils/duplicates.py
---- sqlmap-1.5.ori/extra/shutils/duplicates.py	2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/extra/shutils/duplicates.py	2021-07-01 17:20:26.786475153 +0200
+Index: sqlmap-1.5.7/extra/shutils/duplicates.py
+===================================================================
+--- sqlmap-1.5.7.orig/extra/shutils/duplicates.py
++++ sqlmap-1.5.7/extra/shutils/duplicates.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
  
  # Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
  # See the file 'LICENSE' for copying permission
-diff --color -rub sqlmap-1.5.ori/sqlmapapi.py sqlmap-1.5/sqlmapapi.py
---- sqlmap-1.5.ori/sqlmapapi.py	2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/sqlmapapi.py	2021-07-01 17:23:26.465232679 +0200
+Index: sqlmap-1.5.7/sqlmapapi.py
+===================================================================
+--- sqlmap-1.5.7.orig/sqlmapapi.py
++++ sqlmap-1.5.7/sqlmapapi.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
  
  """
  Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
-diff --color -rub sqlmap-1.5.ori/sqlmap.py sqlmap-1.5/sqlmap.py
---- sqlmap-1.5.ori/sqlmap.py	2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/sqlmap.py	2021-07-01 17:23:41.313460555 +0200
+Index: sqlmap-1.5.7/sqlmap.py
+===================================================================
+--- sqlmap-1.5.7.orig/sqlmap.py
++++ sqlmap-1.5.7/sqlmap.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
  
  """
  Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
-diff --color -rub sqlmap-1.5.ori/thirdparty/identywaf/identYwaf.py sqlmap-1.5/thirdparty/identywaf/identYwaf.py
---- sqlmap-1.5.ori/thirdparty/identywaf/identYwaf.py	2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/thirdparty/identywaf/identYwaf.py	2021-07-01 17:20:49.558824640 +0200
+Index: sqlmap-1.5.7/thirdparty/identywaf/identYwaf.py
+===================================================================
+--- sqlmap-1.5.7.orig/thirdparty/identywaf/identYwaf.py
++++ sqlmap-1.5.7/thirdparty/identywaf/identYwaf.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
  
  """
  Copyright (c) 2019-2021 Miroslav Stampar (@stamparm), MIT
diff --git a/sqlmap.changes b/sqlmap.changes
index 9304ea6..f2c4ed3 100644
--- a/sqlmap.changes
+++ b/sqlmap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 31 05:16:54 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update fix_shebang.patch to switch Python scripts to calling
+  /usr/bin/python3.
+- Add Requires on python3 for full interpreter. 
+
 -------------------------------------------------------------------
 Thu Jul 15 07:21:22 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/sqlmap.spec b/sqlmap.spec
index 3f3917c..93fdb18 100644
--- a/sqlmap.spec
+++ b/sqlmap.spec
@@ -28,6 +28,7 @@ Patch0:         fix_shebang.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       python3
 BuildArch:      noarch
 
 %description