[gentoo-commits] gentoo-x86 commit in net-analyzer/ntop/files: ntop-5.0.1-includes.patch ntop-5.0.1-INCS.patch

[gentoo-commits] gentoo-x86 commit in net-analyzer/ntop/files: ntop-5.0.1-includes.patch ntop-5.0.1-INCS.patch

[Jeroen Roovers (jer)]

jer         14/07/16 14:15:45

  Added:                ntop-5.0.1-includes.patch ntop-5.0.1-INCS.patch
  Log:
  Fix missing includes for standard functions. Stop running autotools in src_install(). Use python-config --includes, not --cflags. Do not "clean up" INCS (INCLUDES).
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.1                  net-analyzer/ntop/files/ntop-5.0.1-includes.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-includes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-includes.patch?rev=1.1&content-type=text/plain

Index: ntop-5.0.1-includes.patch
===================================================================
--- a/nDPI/src/lib/protocols/netflow.c
+++ b/nDPI/src/lib/protocols/netflow.c
@@ -19,6 +19,7 @@
 
 
 #include "ipq_utils.h"
+#include <time.h> /* time() */
 
 #ifdef NTOP_PROTOCOL_NETFLOW
 
--- a/nDPI/src/lib/protocols/ssl.c
+++ b/nDPI/src/lib/protocols/ssl.c
@@ -22,6 +22,7 @@
 
 
 #include "ipq_utils.h"
+#include <ctype.h> /* isalpha() isdigit() ... */
 
 #ifdef IPOQUE_PROTOCOL_SSL
 



1.1                  net-analyzer/ntop/files/ntop-5.0.1-INCS.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-INCS.patch?rev=1.1&content-type=text/plain

Index: ntop-5.0.1-INCS.patch
===================================================================
--- a/configure
+++ b/configure
@@ -18983,7 +18983,7 @@
     else
         LIBS="${LIBS} ${PYTHON_LIBS}"
 
-            PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
+            PYTHON_INCS=`$PYTHON_CONFIG --includes | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
 
     INCS="${INCS} ${PYTHON_INCS}"
 
@@ -19335,15 +19335,6 @@
         for(i=NF; i>0; i--) { \
             if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
         } \
-        for(i=1; i<=NF; i++) { \
-            if (i in out) { printf("%s ", out[i]) } \
-        } \
-        print "" \
-    }'`
-    INCS=`echo ${INCS} | ${ac_cv_prog_AWK} '{ \
-        for(i=NF; i>0; i--) { \
-            if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
-        } \
         for(i=1; i<=NF; i++) { \
             if (i in out) { printf("%s ", out[i]) } \
         } \