#1 Move from python2 to python3 fixes rhbz#1737877
Closed 7 months ago by jtaylor. Opened a year ago by jmlich.
rpms/ jmlich/suricata master  into  master

@@ -0,0 +1,25 @@ 

+ --- ./configure.ac.python3	2019-04-30 09:14:35.000000000 +0200

+ +++ ./configure.ac	2019-08-15 10:30:03.541093773 +0200

+ @@ -81,21 +81,21 @@

+          echo

+          echo "   ERROR! pkg-config not found, go get it  "

+          echo "   http://pkg-config.freedesktop.org/wiki/ "

+          echo "   or install from your distribution       "

+          echo

+          exit 1

+      fi

+  

+      AC_ARG_ENABLE(python,

+             AS_HELP_STRING([--enable-python], [Enable python]),[enable_python=$enableval],[enable_python=yes])

+ -    AC_PATH_PROGS(HAVE_PYTHON, python python2 python2.7, "no")

+ +    AC_PATH_PROGS(HAVE_PYTHON, python3 python python2 python2.7, "no")

+      if test "x$enable_python" = "xno" ; then

+          echo

+          echo "   Warning! python disabled, you will not be      "

+          echo "   able to install suricatasc unix socket client   "

+          echo

+          enable_python="no"

+      fi

+      if test "$HAVE_PYTHON" = "no"; then

+          echo

+          echo "   Warning! python not found, you will not be     "

file modified
+11 -6
@@ -1,7 +1,7 @@ 

  Summary: Intrusion Detection System

  Name: suricata

  Version: 4.1.4

- Release: 4%{?dist}

+ Release: 5%{?dist}

  License: GPLv2

  URL: https://suricata-ids.org/

  Source0: https://www.openinfosecfoundation.org/download/%{name}-%{version}.tar.gz
@@ -17,16 +17,17 @@ 

  # include it via sys/socket.h in a future release. This is temporary

  # and should not be needed on other kernel/glibc combos.

  Patch3: suricata-4.1.4-socket.patch

+ Patch4: suricata-python3-configura.patch

  

  BuildRequires: gcc

  BuildRequires: gcc-c++

  BuildRequires: rust cargo

- BuildRequires: libyaml-devel python2-pyyaml

+ BuildRequires: libyaml-devel python3-pyyaml

  BuildRequires: libnfnetlink-devel libnetfilter_queue-devel libnet-devel

  BuildRequires: zlib-devel pcre-devel libcap-ng-devel

  BuildRequires: lz4-devel libpcap-devel

  BuildRequires: nspr-devel nss-devel nss-softokn-devel file-devel

- BuildRequires: jansson-devel GeoIP-devel python2-devel lua-devel

+ BuildRequires: jansson-devel GeoIP-devel python3-devel lua-devel

  BuildRequires: autoconf automake libtool

  BuildRequires: systemd

  BuildRequires: hiredis-devel
@@ -60,6 +61,7 @@ 

  %patch1 -p1

  %patch2 -p1

  %patch3 -p1

+ %patch4 -p1 -b .python3

  

  autoreconf -fv --install

  
@@ -132,9 +134,9 @@ 

  %{_bindir}/suricatactl

  %{_bindir}/suricata-update

  %{_libdir}/libhtp*

- %{python2_sitelib}/suricatasc/*

- %{python2_sitelib}/suricata/*

- %{python2_sitelib}/*egg-info

+ %{python3_sitelib}/suricatasc/*

+ %{python3_sitelib}/suricata/*

+ %{python3_sitelib}/*egg-info

  %config(noreplace) %attr(0640,suricata,suricata) %{_sysconfdir}/%{name}/suricata.yaml

  %config(noreplace) %attr(0640,suricata,suricata) %{_sysconfdir}/%{name}/*.config

  %config(noreplace) %attr(0640,suricata,suricata) %{_sysconfdir}/%{name}/rules/*.rules
@@ -150,6 +152,9 @@ 

  %{_datadir}/%{name}/rules

  

  %changelog

+ * Thu Aug 15 2019 Jozef Mlich <jmlich83@gmail.com> 4.1.4-5

+ - Move from python2 to python3 fixes rhbz#1737877

+ 

  * Thu Aug 01 2019 Steve Grubb <sgrubb@redhat.com> 4.1.4-4

  - Fix FTBFS bz 1736727

  

Move from python2 to python3 fixes rhbz#1737877

From the koji-ci build it seems that the suricata RPM no longer depends on Python 2.

Suricata no longer depends on python 2, thanks for the PR though!

Pull-Request has been closed by jtaylor

7 months ago