Can this be applied before long? Does anyone actually
need this date/CR stuff in there? Comments? Thanks.
Run before patching:
for i in \
fastbit/fastbit.c \
fastbit/fbquery.h \
nDPI/src/include/ipq_api.h \
nDPI/src/lib/linux_compat.h \
; do
tr -d '\015' < $i > 1
mv -f 1 $i
done
--- configure.in.orig 2012-02-17 11:03:59.000000000 -0500
+++ configure.in
@@ -715,7 +715,6 @@
/bin/rm -f version.c
echo $PACKAGE_VERSION | sed -e 's/.*/char * version = "&";/' > version.c
./config.guess | sed -e 's/.*/char * osName = "&";/' >> version.c
-date +"%D %r" | sed -e 's/.*/char * buildDate = "&";/' >> version.c
if test ".${HAS_WARNING}" = ".yes"; then
echo "*"
--- fastbit/fbindex.cpp.orig 2012-02-17 11:03:59.000000000 -0500
+++ fastbit/fbindex.cpp
@@ -60,7 +60,7 @@
static void show_version ()
{
printf ("\n");
- printf ("Welcome to fbindex v.%s - Built on %s\n", FBINDEX_VERSION,
FBINDEX_RELEASE);
+ printf ("Welcome to fbindex v.%s.\n", FBINDEX_VERSION);
printf ("Copyright (C) 2009-2010 Luca Deri <[email protected]>\n");
printf (" Valeria Lorenzetti
<[email protected]>\n");
printf ("\n");
--- fastbit/fbmerge.cpp.orig 2012-02-17 11:03:59.000000000 -0500
+++ fastbit/fbmerge.cpp
@@ -50,7 +50,7 @@
static void show_version ()
{
printf ("\n");
- printf ("Welcome to fbmerge v.%s - Built on %s\n", FBMERGE_VERSION,
FBMERGE_RELEASE);
+ printf ("Welcome to fbmerge v.%s.\n", FBMERGE_VERSION);
printf ("Copyright (C) 2009-10 Luca Deri <[email protected]>\n");
printf (" Valeria Lorenzetti <[email protected]>\n");
printf ("\n");
--- fastbit/fbquery.cpp.orig 2012-02-17 11:03:59.000000000 -0500
+++ fastbit/fbquery.cpp
@@ -101,7 +101,7 @@
static void show_version ()
{
printf ("\n");
- printf ("Welcome to fbquery v.%s - Built on %s\n", FBQUERY_VERSION,
FBQUERY_RELEASE);
+ printf ("Welcome to fbquery v.%s.\n", FBQUERY_VERSION);
printf ("Copyright (C) 2009-10 Luca Deri <[email protected]>\n");
printf (" Valeria Lorenzetti <[email protected]>\n");
printf ("\n");
--- fastbit/fbquery.h.orig
+++ fastbit/fbquery.h
@@ -51,11 +51,6 @@
#include "capi.h"
- /* Version info */
-#define FBQUERY_VERSION "1.4.4"
-#define FBQUERY_RELEASE __DATE__
-
-
#define CSV_SEPARATOR "|"
#define XMLTAG_RESULT "Result"
#define XMLTAG_ROW "Row"
--- nprobe.c.orig 2012-02-17 11:03:59.000000000 -0500
+++ nprobe.c
@@ -1071,11 +1071,10 @@
"Copyright 2002-12 by Luca Deri <[email protected]>\n",
version, nprobe_revision, osName,
#ifdef HAVE_PF_RING
- "with native PF_RING acceleration.\n",
+ "with native PF_RING acceleration.\n");
#else
- "",
+ "");
#endif
- buildDate);
#if defined(HAVE_LICENSE) || defined(WIN32)
printf("\nSystemID: %s\n", (sysId = getSystemId()));
--- nprobe.h.orig 2012-02-17 11:03:59.000000000 -0500
+++ nprobe.h
@@ -1059,7 +1059,7 @@
/* *************************** */
/* version.c */
-extern char *version, *osName, *buildDate;
+extern char *version, *osName;
/* **************************************************************** */
_______________________________________________
Ntop-misc mailing list
[email protected]
http://listgateway.unipi.it/mailman/listinfo/ntop-misc
