Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	cflowd.spec
@@ -9,6 +9,7 @@ Source1: configuration.ps.gz Patch0: %{name}-%{pkg_version}.patch Patch1: %{name}-%{pkg_version}-djp.patch +Patch2: %{name}-iostream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: flex gcc-c++ arts++-devel arts++ BuildRequires: ghostscript @@ -44,6 +45,7 @@ %setup -n %{name}-%{pkg_version} %patch0 -p1 %patch1 -p0 +%patch2 -p1 ##autoreconf -fi %configure --enable-shared=yes \ --with-artspp=%{_prefix} \
[-] [+]	Added	cflowd-2-1-b1-iostream.patch ^
@@ -0,0 +1,250 @@ +--- cflowd-2-1-b1/apps/cfdases/cfdases.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/cfdases/cfdases.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -51,7 +51,7 @@ + #include <time.h> + } + +-#include <iostream.h> ++#include <iostream> + #include <iomanip.h> + + #include "CflowdConfig.hh" +--- cflowd-2-1-b1/apps/cfdifmatrix/cfdifmatrix.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/cfdifmatrix/cfdifmatrix.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -51,7 +51,7 @@ + #include <time.h> + } + +-#include <iostream.h> ++#include <iostream> + #include <iomanip.h> + + #include "CflowdConfig.hh" +--- cflowd-2-1-b1/apps/cfdnets/cfdnets.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/cfdnets/cfdnets.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -51,7 +51,7 @@ + #include <time.h> + } + +-#include <iostream.h> ++#include <iostream> + #include <iomanip.h> + #include <string> + +--- cflowd-2-1-b1/apps/cfdnexthops/cfdnexthops.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/cfdnexthops/cfdnexthops.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -51,7 +51,7 @@ + #include <time.h> + } + +-#include <iostream.h> ++#include <iostream> + #include <iomanip.h> + #include <string> + +--- cflowd-2-1-b1/apps/cfdportmatrix/cfdportmatrix.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/cfdportmatrix/cfdportmatrix.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -51,7 +51,7 @@ + #include <time.h> + } + +-#include <iostream.h> ++#include <iostream> + #include <iomanip.h> + + #include "CflowdConfig.hh" +--- cflowd-2-1-b1/apps/cfdprotos/cfdprotos.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/cfdprotos/cfdprotos.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -52,7 +52,7 @@ + #include <time.h> + } + +-#include <iostream.h> ++#include <iostream> + #include <iomanip.h> + #include <string> + +--- cflowd-2-1-b1/apps/cfdtos/cfdtos.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/cfdtos/cfdtos.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -52,7 +52,7 @@ + #include <time.h> + } + +-#include <iostream.h> ++#include <iostream> + #include <iomanip.h> + #include <string> + +--- cflowd-2-1-b1/apps/dnswatch/dnswatch.cc.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/apps/dnswatch/dnswatch.cc 2008-08-30 22:49:55.000000000 +0200 +@@ -76,7 +76,7 @@ + #include <fstream.h> + #endif + +-#include <stdiostream.h> ++#include <stdiostream> + + #ifdef HAVE_IOMANIP + #include <iomanip> +--- cflowd-2-1-b1/classes/include/CflowdAsMatrix.hh.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/classes/include/CflowdAsMatrix.hh 2008-08-30 22:49:55.000000000 +0200 +@@ -49,7 +49,7 @@ + } + + #include <map> +-#include <iostream.h> ++#include <iostream> + + #include "CflowdAsMatrixKey.hh" + #include "CflowdAsMatrixTrafficCounter.hh" +--- cflowd-2-1-b1/classes/include/CflowdInterfaceMatrix.hh.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/classes/include/CflowdInterfaceMatrix.hh 2008-08-30 22:49:55.000000000 +0200 +@@ -49,7 +49,7 @@ + } + + #include <map> +-#include <iostream.h> ++#include <iostream> + + #include "CflowdInterfaceMatrixKey.hh" + #include "CflowdInterfaceMatrixTrafficCounter.hh" +--- cflowd-2-1-b1/classes/include/CflowdNetMatrix.hh.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/classes/include/CflowdNetMatrix.hh 2008-08-30 22:49:55.000000000 +0200 +@@ -49,7 +49,7 @@ + } + + #include <map> +-#include <iostream.h> ++#include <iostream> + + #include "CflowdNetMatrixKey.hh" + #include "CflowdNetMatrixTrafficCounter.hh" +--- cflowd-2-1-b1/classes/include/CflowdPortMatrix.hh.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/classes/include/CflowdPortMatrix.hh 2008-08-30 22:49:55.000000000 +0200 +@@ -50,7 +50,7 @@ + } + + #include <map> +-#include <iostream.h> ++#include <iostream> + + #include "CflowdPortMatrixKey.hh" + #include "CflowdPortMatrixTrafficCounter.hh" +--- cflowd-2-1-b1/classes/include/CflowdRawFlow.hh.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/classes/include/CflowdRawFlow.hh 2008-08-30 22:49:55.000000000 +0200 +@@ -57,7 +57,7 @@ + #include "caida_t.h" + } + +-#include <iostream.h> ++#include <iostream> + + #include "CflowdFlowPdu.h" + +--- cflowd-2-1-b1/snmp++/classes/include/snmp++/smival.h.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/snmp++/classes/include/snmp++/smival.h 2008-08-30 22:49:55.000000000 +0200 +@@ -46,7 +46,7 @@ + + //----[ includes ]----------------------------------------------------- + #include "smi.h" +-#include <iostream.h> // for debugging only ++#include <iostream> // for debugging only + + //----[ macros ]------------------------------------------------------- + +--- cflowd-2-1-b1/snmp++/classes/src/eventlist.cpp.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/snmp++/classes/src/eventlist.cpp 2008-08-30 22:49:55.000000000 +0200 +@@ -56,7 +56,7 @@ + char event_list_version[]="$Header: /caimis/cvs/cflowd/snmp++/classes/src/eventlist.cpp,v 1.3 2000/03/08 08:24:49 dwm Exp $"; + + // For debuggin cout's +-#include <iostream.h> ++#include <iostream> + + //-----[ includes ]---------------------------------------------------- + +--- cflowd-2-1-b1/snmp++/classes/src/ipresolv.cpp.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/snmp++/classes/src/ipresolv.cpp 2008-08-30 22:49:55.000000000 +0200 +@@ -30,7 +30,7 @@ + * 09/07/95 jdm Modify to work with SNMP++ IPAddress class... + -------------------------------------------------------------------/ + #include <stdio.h> +-#include <iostream.h> ++#include <iostream> + #include "snmp_pp.h" + + #ifdef __unix__ +--- cflowd-2-1-b1/snmp++/classes/src/msec.cpp.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/snmp++/classes/src/msec.cpp 2008-08-30 22:49:55.000000000 +0200 +@@ -21,7 +21,7 @@ + } + + // For debuggin cout's +-#include <iostream.h> ++#include <iostream> + #ifdef __unix__ + #include <string> + #endif +--- cflowd-2-1-b1/snmp++/classes/src/msgqueue.cpp.iostream 2008-08-30 22:47:43.000000000 +0200 ++++ cflowd-2-1-b1/snmp++/classes/src/msgqueue.cpp 2008-08-30 22:49:55.000000000 +0200 +@@ -55,7 +55,7 @@ + char msgqueue_version[]="#(@)$Header: /caimis/cvs/cflowd/snmp++/classes/src/msgqueue.cpp,v 1.2 1999/09/02 14:57:15 dwm Exp $"; + + // For debuggin cout's +-#include <iostream.h> ++#include <iostream> + + //-----[ includes ]---------------------------------------------------- + +--- cflowd-2-1-b1/snmp++/classes/src/notifyqueue.cpp.iostream 2008-08-30 22:47:43.000000000 +0200
[-] [+]	Added	create-patch2 ^
@@ -0,0 +1,19 @@ +#!/bin/bash + +if [ -z "$1" ] ; then + SOURCEDIR=cflowd-2-1-b1 +else + SOURCEDIR=$1 +fi + +ORIGFILES=`find ${SOURCEDIR} -name \*.iostream` + +for ORIG in ${ORIGFILES} ; do + + PATCHTARGET=`basename ${ORIG} .iostream` + PATCHPATH=`echo ${ORIG} \| awk -F${PATCHTARGET} '{print $1}'` + + diff -uNr ${ORIG} ${PATCHPATH}${PATCHTARGET} + +done +