SOURCES: ntop-am.patch, ntop-plugins_makefile.patch - updated

arekm arekm at pld-linux.org
Sat Nov 3 11:10:57 CET 2007 

Author: arekm                        Date: Sat Nov  3 10:10:57 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   ntop-am.patch (1.4 -> 1.5) , ntop-plugins_makefile.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/ntop-am.patch
diff -u SOURCES/ntop-am.patch:1.4 SOURCES/ntop-am.patch:1.5
--- SOURCES/ntop-am.patch:1.4	Mon Jan  2 14:47:31 2006
+++ SOURCES/ntop-am.patch	Sat Nov  3 11:10:52 2007
@@ -6,94 +6,18 @@
  #
 -bin_PROGRAMS   = ntop
 +sbin_PROGRAMS   = ntop
- EXTRA_PROGRAMS = ntops sntop
+ EXTRA_PROGRAMS = ntops
  bin_SCRIPTS    = 
  
---- ntop-3.2/configure.in~	2006-01-02 02:53:17.000000000 +0200
-+++ ntop-3.2/configure.in	2006-01-02 02:53:46.000000000 +0200
-@@ -234,7 +234,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- NTOPCONFIGDEBUG_SETTINGS([After ac stuff])
- 
 --- ntop-3.2/configure.in~	2006-01-02 02:54:22.000000000 +0200
 +++ ntop-3.2/configure.in	2006-01-02 02:58:04.000000000 +0200
 @@ -61,7 +61,7 @@
  HAS_ERROR=
  HAS_WARNING=
  
--NTOP_VERSION_EXTRA=" SourceForge .tgz"
+-NTOP_VERSION_EXTRA=""
 +NTOP_VERSION_EXTRA=" PLD Linux RPM"
  
  echo
  echo "Welcome to $PACKAGE_NAME, Version $PACKAGE_VERSION $NTOP_VERSION_EXTRA"
-diff -ur ntop-3.2/Makefile.am ntop-3.2.am/Makefile.am
---- ntop-3.2/Makefile.am	2006-01-02 12:32:14.000000000 +0200
-+++ ntop-3.2.am/Makefile.am	2006-01-02 12:28:11.000000000 +0200
-@@ -46,13 +46,6 @@
- CLEANFILES     = $(DISTCLEANFILES)
- INSTALLCLEANFILES = addressQueue.db dnsCache.db
- 
--#
--# Fake out the missing tests for the auto* tools
--#
--ACLOCAL = /bin/sh ./missing --run echo
--AUTOCONF = /bin/sh ./missing --run echo
--AUTOMAKE = /bin/sh ./missing --run echo
--AUTOHEADER = /bin/sh ./missing --run echo
- 
- # A list of all the files in the current directory which can be regenerated
- MAINTAINERCLEANFILES = COPYING Makefile.in aclocal.m4 config.guess \
-diff -ur ntop-3.2/configure.in ntop-3.2.am/configure.in
---- ntop-3.2/configure.in	2006-01-02 12:32:14.000000000 +0200
-+++ ntop-3.2.am/configure.in	2006-01-02 12:27:48.000000000 +0200
-@@ -1827,6 +1827,7 @@
-       AC_DEFINE(HAVE_ISINF,1,we have the isinf function)],[AC_MSG_RESULT(no)])])
- 
- dnl> XML dump (plugin)
-+AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
- AC_CHECK_HEADERS(glib.h glibconfig.h)
- AC_CHECK_HEADERS(gdome.h)
- 
-diff -u ntop-3.2/configure.in ntop-3.2.gdome/configure.in
---- ntop-3.2/configure.in	2006-01-02 15:42:02.000000000 +0200
-+++ ntop-3.2.gdome/configure.in	2006-01-02 14:45:38.000000000 +0200
-@@ -1827,9 +1827,21 @@
-       AC_DEFINE(HAVE_ISINF,1,we have the isinf function)],[AC_MSG_RESULT(no)])])
- 
- dnl> XML dump (plugin)
--AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
-+AM_PATH_GLIB_2_0(2.0.0, , AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
-+
-+CPPFLAGS_save="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
- AC_CHECK_HEADERS(glib.h glibconfig.h)
-+CPPFLAGS="$CPPFLAGS_save"
-+
-+PKG_CHECK_MODULES(GDOME, gdome2 >= 0.7.0,, AC_MSG_ERROR(could not find Gdome2))
-+AC_SUBST(GDOME_CFLAGS)
-+AC_SUBST(GDOME_LIBS)
-+
-+CPPFLAGS_save="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $GDOME_CFLAGS"
- AC_CHECK_HEADERS(gdome.h)
-+CPPFLAGS="$CPPFLAGS_save"
- 
- AC_TYPE_PID_T
- dnl> Autoconf2: AC_CHECK_TYPE(pid_t, int)
-diff -u ntop-3.2/plugins/Makefile.am ntop-3.2.gdome/plugins/Makefile.am
---- ntop-3.2/plugins/Makefile.am	2006-01-02 15:42:02.000000000 +0200
-+++ ntop-3.2.gdome/plugins/Makefile.am	2006-01-02 15:41:18.000000000 +0200
-@@ -84,7 +84,7 @@
- 
- libxmldumpPlugin_la_SOURCES = xmldumpPlugin.c
- libxmldumpPlugin_la_LDFLAGS = -shared -release @PACKAGE_VERSION@ @DYN_FLAGS@
--libxmldumpPlugin_la_CFLAGS = $(AM_CFLAGS)
-+libxmldumpPlugin_la_CFLAGS = $(AM_CFLAGS) $(GDOME_CFLAGS) $(GLIB_CFLAGS)
- 
- #
- # Dependencies to allow ntop loading plugins on-place
+

================================================================
Index: SOURCES/ntop-plugins_makefile.patch
diff -u SOURCES/ntop-plugins_makefile.patch:1.3 SOURCES/ntop-plugins_makefile.patch:1.4
--- SOURCES/ntop-plugins_makefile.patch:1.3	Mon Jan  2 02:05:20 2006
+++ SOURCES/ntop-plugins_makefile.patch	Sat Nov  3 11:10:52 2007
@@ -1,6 +1,6 @@
 --- ntop/plugins/Makefile.am	2004-11-11 10:12:52.000000000 +0000
 +++ ntop.new/plugins/Makefile.am	2005-01-01 21:09:57.376911224 +0000
-@@ -42,16 +42,6 @@
+@@ -42,16 +42,8 @@
  #
  # The meat for ntop
  #
@@ -9,20 +9,10 @@
 -                  lastSeenPlugin.so \
 -                  netflowPlugin.so \
 -                  pdaPlugin.so \
+-                  remotePlugin.so \
 -                  rrdPlugin.so \
--                  snmpPlugin.so \
--                  sflowPlugin.so \
--                  xmldumpPlugin.so
--
- lib_LTLIBRARIES = \
-                   libicmpPlugin.la \
-                   liblastSeenPlugin.la \
---- ntop-3.2/plugins/Makefile.am~	2006-01-02 02:11:46.000000000 +0200
-+++ ntop-3.2/plugins/Makefile.am	2006-01-02 02:47:33.000000000 +0200
-@@ -42,7 +42,7 @@
- #
- # The meat for ntop
- #
+-                  sflowPlugin.so
+ 
 -lib_LTLIBRARIES = \
 +plugin_LTLIBRARIES = \
                    libicmpPlugin.la \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ntop-am.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ntop-plugins_makefile.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list