Package: src:ipfm
Version: 0.11.5-4.2
Severity: wishlist
Tags: patch
Attached is the patch I used in the NMU I just uploaded to get rid of an
RC bug in my UDD dashboard list. I did a quick and direct NMU because
you are listed as having LowNMU threshold and I did the last upload of
this package in 2008. Most of the patch contain removal of generated
files now properly cleaned up.
--
Happy hacking
Petter Reinholdtsen
diff -Nru ipfm-0.11.5/debian/changelog ipfm-0.11.5/debian/changelog
--- ipfm-0.11.5/debian/changelog 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/debian/changelog 2016-06-27 13:59:36.000000000 +0200
@@ -1,3 +1,11 @@
+ipfm (0.11.5-4.2) unstable; urgency=low
+
+ * Non-maintainer upload to solve release goal and fix RC bug.
+ * Updated to debhelper compat level 9 (Closes: #817503).
+ * Move to 3.0 (quilt) source format.
+
+ -- Petter Reinholdtsen <p...@debian.org> Mon, 27 Jun 2016 13:59:27 +0200
+
ipfm (0.11.5-4.1) unstable; urgency=low
* Non-maintainer upload to solve release goal.
diff -Nru ipfm-0.11.5/debian/compat ipfm-0.11.5/debian/compat
--- ipfm-0.11.5/debian/compat 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/debian/compat 2016-06-27 13:46:51.000000000 +0200
@@ -1 +1 @@
-4
+9
diff -Nru ipfm-0.11.5/debian/conffiles ipfm-0.11.5/debian/conffiles
--- ipfm-0.11.5/debian/conffiles 2001-12-24 22:20:22.000000000 +0100
+++ ipfm-0.11.5/debian/conffiles 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-/etc/ipfm.conf
-/etc/init.d/ipfm
diff -Nru ipfm-0.11.5/debian/control ipfm-0.11.5/debian/control
--- ipfm-0.11.5/debian/control 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/debian/control 2016-06-27 13:54:17.000000000 +0200
@@ -2,12 +2,12 @@
Section: net
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+...@zoy.org>
-Build-Depends: libpcap-dev, bison, flex-old, debhelper (>= 4.0)
+Build-Depends: libpcap-dev, bison, flex-old, debhelper (>= 9.0)
Standards-Version: 3.6.1.1
Package: ipfm
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: a bandwidth analysis tool
IPFM counts how much data was sent and received by specified hosts through
an Internet link.
diff -Nru ipfm-0.11.5/debian/examples ipfm-0.11.5/debian/examples
--- ipfm-0.11.5/debian/examples 2001-12-24 22:20:22.000000000 +0100
+++ ipfm-0.11.5/debian/examples 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-ipfm.conf.sample
diff -Nru ipfm-0.11.5/debian/patches/deb-0.11.5-4.1.diff ipfm-0.11.5/debian/patches/deb-0.11.5-4.1.diff
--- ipfm-0.11.5/debian/patches/deb-0.11.5-4.1.diff 1970-01-01 01:00:00.000000000 +0100
+++ ipfm-0.11.5/debian/patches/deb-0.11.5-4.1.diff 2016-06-27 13:52:09.000000000 +0200
@@ -0,0 +1,134 @@
+Description: Changes to deb included in version 0.11.5-4.1
+ In versoin 0.11.5-4.2 the package was changed to source format
+ 3.0 (quilt) and this patch was created to store the source changes
+ included in the package before this point.
+Author: Petter Reinholdtsen <p...@hungry.com>
+Forwarded: ?
+Reviewed-By: Petter Reinholdtsen <p...@hungry.com>
+Last-Update: 2016-06-27
+
+--- ipfm-0.11.5.orig/doc/ipfm.conf.man
++++ ipfm-0.11.5/doc/ipfm.conf.man
+@@ -37,7 +37,7 @@ matching rule will be used, unless speci
+ uses local and global variables, so it can manage multiple logs (different
+ time delay, different hosts, different log filename ...) at the same time.
+
+-Global variables will be used for all logs and local variables will only be used in the log beeing defined.
++Global variables will be used for all logs and local variables will only be used in the log being defined.
+
+ .SH GLOBAL VARIABLES
+ .SS
+@@ -53,7 +53,7 @@ is the device on witch ipfm will log pac
+ .B Syntax :
+ [UTC|local]
+
+-This decides if IPFM will use UTC or local time in its outputs (log filename andthe timesamp inside the file). Default is local.
++This decides if IPFM will use UTC or local time in its outputs (log filename and the timestamp inside the file). Default is local.
+
+ Note that IPFM works internally with UTC, and that the dates entered in the config file are UTC (see AFTER Syntax).
+
+--- ipfm-0.11.5.orig/source/pcap.c
++++ ipfm-0.11.5/source/pcap.c
+@@ -128,29 +128,86 @@ int openpcap(char *device, int promisc)
+ }
+
+ /*
+- these offsets were taken from queso, written by
+- Jordi Murgo <sav...@apostols.org>
+- see http://apostols.org/projectz/queso/
++ these offsets were taken from libpcap source.
++ See file gencode.c for more information.
+ */
+ switch(datalink) {
++ case DLT_ARCNET:
++ offset = 6;
++ break;
+ case DLT_EN10MB:
+- offset = 14; break;
+- case DLT_NULL:
+- case DLT_PPP:
+- offset = 4; break;
++ offset = 14;
++ break;
+ case DLT_SLIP:
+- offset = 16; break;
+-#ifndef __OS_OPENBSD__
+- case DLT_RAW:
+- offset = 0; break;
++ offset = 16;
++ break;
+ case DLT_SLIP_BSDOS:
++ offset = 24;
++ break;
++ case DLT_NULL:
++ case DLT_LOOP:
++ offset = 4;
++ break;
++ case DLT_PPP:
++ case DLT_C_HDLC: /* BSD/OS Cisco HDLC */
++ case DLT_PPP_SERIAL: /* NetBSD sync/async serial PPP */
++ offset = 4;
++ break;
++#ifdef DLT_PPP_ETHER
++ case DLT_PPP_ETHER:
++ offset = 8;
++ break;
++#endif
+ case DLT_PPP_BSDOS:
+- offset = 24; break;
+-#endif /* __OS_OPENBSD__ */
+- case DLT_ATM_RFC1483:
+- offset = 8; break;
++ offset = 24;
++ break;
++ /*
++[RC, 2002/10/20] Commented out FDDI since there is a strange pad complication
++on NetBSD, DEC OSF/1 aka Digital Unix aka Tru64 Unix and Ultrix.
++If someone yells because she needs FDDI, we'll have a closer look...
++
++ case DLT_FDDI:
++ *
++ * FDDI doesn't really have a link-level type field.
++ * We set "off_linktype" to the offset of the LLC header.
++ *
++ * To check for Ethernet types, we assume that SSAP = SNAP
++ * is being used and pick out the encapsulated Ethernet type.
++ * XXX - should we generate code to check for SNAP?
++ *
++ offset = 21;
++#ifdef PCAP_FDDIPAD
++ offset += pcap_fddipad;
++#endif
++ break;
++ */
+ case DLT_IEEE802:
+- offset = 22; break;
++ break;
++ case DLT_IEEE802_11:
++ offset = 30;
++ break;
++#ifdef DLT_PRISM_HEADER
++ case DLT_PRISM_HEADER:
++ offset = 144+30;
++ break;
++#endif
++ case DLT_ATM_RFC1483:
++ offset = 8;
++ break;
++ case DLT_RAW:
++ offset = 0;
++ break;
++ case DLT_ATM_CLIP: /* Linux ATM defines this */
++ offset = 8;
++ break;
++ case DLT_LINUX_SLL: /* fake header for Linux cooked socket */
++ offset = 16;
++ break;
++#ifdef DLT_LTALK
++ case DLT_LTALK:
++ offset = 0;
++ break;
++#endif
+ default:
+ fprintf(stderr, "[pcap] Unknown datalink type : %d.", datalink);
+ return 0;
diff -Nru ipfm-0.11.5/debian/patches/series ipfm-0.11.5/debian/patches/series
--- ipfm-0.11.5/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ ipfm-0.11.5/debian/patches/series 2016-06-27 13:50:59.000000000 +0200
@@ -0,0 +1 @@
+deb-0.11.5-4.1.diff
diff -Nru ipfm-0.11.5/debian/postinst.debhelper ipfm-0.11.5/debian/postinst.debhelper
--- ipfm-0.11.5/debian/postinst.debhelper 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/debian/postinst.debhelper 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/ipfm" ]; then
- update-rc.d ipfm defaults >/dev/null
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d ipfm start || exit 0
- else
- /etc/init.d/ipfm start || exit 0
- fi
-fi
-# End automatically added section
diff -Nru ipfm-0.11.5/debian/postrm.debhelper ipfm-0.11.5/debian/postrm.debhelper
--- ipfm-0.11.5/debian/postrm.debhelper 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/debian/postrm.debhelper 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
- update-rc.d ipfm remove >/dev/null || exit 0
-fi
-# End automatically added section
diff -Nru ipfm-0.11.5/debian/prerm.debhelper ipfm-0.11.5/debian/prerm.debhelper
--- ipfm-0.11.5/debian/prerm.debhelper 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/debian/prerm.debhelper 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/ipfm" ]; then
- if [ -x /usr/sbin/invoke-rc.d ] ; then
- invoke-rc.d ipfm stop || exit 0
- else
- /etc/init.d/ipfm stop || exit 0
- fi
-fi
-# End automatically added section
diff -Nru ipfm-0.11.5/debian/source/format ipfm-0.11.5/debian/source/format
--- ipfm-0.11.5/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ ipfm-0.11.5/debian/source/format 2016-06-27 13:47:03.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru ipfm-0.11.5/debian/substvars ipfm-0.11.5/debian/substvars
--- ipfm-0.11.5/debian/substvars 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/debian/substvars 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libpcap0.7
diff -Nru ipfm-0.11.5/doc/ipfm.conf.man ipfm-0.11.5/doc/ipfm.conf.man
--- ipfm-0.11.5/doc/ipfm.conf.man 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/doc/ipfm.conf.man 2002-10-06 19:37:19.000000000 +0200
@@ -37,7 +37,7 @@
uses local and global variables, so it can manage multiple logs (different
time delay, different hosts, different log filename ...) at the same time.
-Global variables will be used for all logs and local variables will only be used in the log being defined.
+Global variables will be used for all logs and local variables will only be used in the log beeing defined.
.SH GLOBAL VARIABLES
.SS
@@ -53,7 +53,7 @@
.B Syntax :
[UTC|local]
-This decides if IPFM will use UTC or local time in its outputs (log filename and the timestamp inside the file). Default is local.
+This decides if IPFM will use UTC or local time in its outputs (log filename andthe timesamp inside the file). Default is local.
Note that IPFM works internally with UTC, and that the dates entered in the config file are UTC (see AFTER Syntax).
diff -Nru ipfm-0.11.5/source/pcap.c ipfm-0.11.5/source/pcap.c
--- ipfm-0.11.5/source/pcap.c 2016-06-27 14:01:23.000000000 +0200
+++ ipfm-0.11.5/source/pcap.c 2002-11-30 01:30:38.000000000 +0100
@@ -128,86 +128,29 @@
}
/*
- these offsets were taken from libpcap source.
- See file gencode.c for more information.
+ these offsets were taken from queso, written by
+ Jordi Murgo <sav...@apostols.org>
+ see http://apostols.org/projectz/queso/
*/
switch(datalink) {
- case DLT_ARCNET:
- offset = 6;
- break;
case DLT_EN10MB:
- offset = 14;
- break;
- case DLT_SLIP:
- offset = 16;
- break;
- case DLT_SLIP_BSDOS:
- offset = 24;
- break;
+ offset = 14; break;
case DLT_NULL:
- case DLT_LOOP:
- offset = 4;
- break;
case DLT_PPP:
- case DLT_C_HDLC: /* BSD/OS Cisco HDLC */
- case DLT_PPP_SERIAL: /* NetBSD sync/async serial PPP */
- offset = 4;
- break;
-#ifdef DLT_PPP_ETHER
- case DLT_PPP_ETHER:
- offset = 8;
- break;
-#endif
+ offset = 4; break;
+ case DLT_SLIP:
+ offset = 16; break;
+#ifndef __OS_OPENBSD__
+ case DLT_RAW:
+ offset = 0; break;
+ case DLT_SLIP_BSDOS:
case DLT_PPP_BSDOS:
- offset = 24;
- break;
- /*
-[RC, 2002/10/20] Commented out FDDI since there is a strange pad complication
-on NetBSD, DEC OSF/1 aka Digital Unix aka Tru64 Unix and Ultrix.
-If someone yells because she needs FDDI, we'll have a closer look...
-
- case DLT_FDDI:
- *
- * FDDI doesn't really have a link-level type field.
- * We set "off_linktype" to the offset of the LLC header.
- *
- * To check for Ethernet types, we assume that SSAP = SNAP
- * is being used and pick out the encapsulated Ethernet type.
- * XXX - should we generate code to check for SNAP?
- *
- offset = 21;
-#ifdef PCAP_FDDIPAD
- offset += pcap_fddipad;
-#endif
- break;
- */
- case DLT_IEEE802:
- break;
- case DLT_IEEE802_11:
- offset = 30;
- break;
-#ifdef DLT_PRISM_HEADER
- case DLT_PRISM_HEADER:
- offset = 144+30;
- break;
-#endif
+ offset = 24; break;
+#endif /* __OS_OPENBSD__ */
case DLT_ATM_RFC1483:
- offset = 8;
- break;
- case DLT_RAW:
- offset = 0;
- break;
- case DLT_ATM_CLIP: /* Linux ATM defines this */
- offset = 8;
- break;
- case DLT_LINUX_SLL: /* fake header for Linux cooked socket */
- offset = 16;
- break;
-#ifdef DLT_LTALK
- case DLT_LTALK:
- offset = 0;
- break;
-#endif
+ offset = 8; break;
+ case DLT_IEEE802:
+ offset = 22; break;
default:
fprintf(stderr, "[pcap] Unknown datalink type : %d.", datalink);
return 0;
