Commit 66e17822 authored by Nico Golde's avatar Nico Golde Committed by Joao Eriberto Mota Filho

Imported Debian patch 1.0.1-6

parent f7fefd6f
This diff is collapsed.
The changes to the upstream source of this Debian package are managed by the
patch management system 'dpatch'. See the dpatch documentation at
/usr/share/doc/dpatch/README.source.gz for further information on how to
patch management system 'quilt'. See the dpatch documentation at
/usr/share/doc/quilt/README.source for further information on how to
comfortably create new patches or edit existing ones.
-- Nico Golde, 1 October 2009
-- Nico Golde, 17 October 2010
tcpxtract (1.0.1-6) unstable; urgency=low
* Bump policy version, no changes needed.
* Switch from dpatch to quilt.
- Adapted README.source.
* Switch to dpkg-source 3.0 (quilt) format
* Add patch by Chow Loong Jin to prevent segfaults due to missing
null initilizations (Closes: #599746).
-- Nico Golde <nion@debian.org> Sun, 17 Oct 2010 18:26:09 +0200
tcpxtract (1.0.1-5) unstable; urgency=low
* Bump policy version, no changes needed.
......@@ -8,7 +19,7 @@ tcpxtract (1.0.1-5) unstable; urgency=low
* dh_clean -l => dh_prep (dh_clean -k deprecated).
* Add README.source dummy ;)
-- Nico Golde <nion@debian.org> Thu, 01 Oct 2009 19:04:12 +0200
-- Nico Golde <nion@debian.org> Sun, 17 Oct 2010 18:07:01 +0200
tcpxtract (1.0.1-4) unstable; urgency=low
......
......@@ -2,8 +2,8 @@ Source: tcpxtract
Section: net
Priority: optional
Maintainer: Nico Golde <nion@debian.org>
Build-Depends: debhelper (>= 7.0.0), autotools-dev, libpcap0.8-dev, flex, dpatch
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 7.0.0), autotools-dev, libpcap0.8-dev, flex, quilt
Standards-Version: 3.9.1
Homepage: http://tcpxtract.sf.net
Package: tcpxtract
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_fixmanpage.dpatch by Nico Golde <nion@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix hypens and remove the info notice, as there is no info page
@DPATCH@
diff -urNad tcpxtract-1.0.1~/tcpxtract.1 tcpxtract-1.0.1/tcpxtract.1
--- tcpxtract-1.0.1~/tcpxtract.1 2005-10-06 03:53:57.000000000 +0200
+++ tcpxtract-1.0.1/tcpxtract.1 2009-10-01 19:04:07.000000000 +0200
......
01_fixmanpage.patch
tcpxtract-fix-segfault.patch
--- tcpxtract-1.0.1/sessionlist.c 2005-10-04 22:50:03.000000000 +0800
+++ tcpxtract-1.0.1-new/sessionlist.c 2010-10-11 03:14:18.071445668 +0800
@@ -62,6 +62,10 @@
(*last_slist)->prev = slist_ptr;
(*last_slist)->next = NULL;
(*last_slist)->srchptr_list = NULL;
+ (*last_slist)->extract_list = NULL;
+ (*last_slist)->recording = 0;
+ (*last_slist)->last_recvd = 0;
+ (*last_slist)->last_seqnum = 0;
return *last_slist;
}
--- tcpxtract-1.0.1/tcpxtract.c 2005-10-06 09:44:39.000000000 +0800
+++ tcpxtract-1.0.1-new/tcpxtract.c 2010-10-11 03:03:52.741420701 +0800
@@ -237,7 +237,7 @@
{
int c;
char *capfname = NULL; /* Capture file for input */
- char *dev; /* Sniffing devise */
+ char *dev = NULL; /* Sniffing devise */
char errbuf[PCAP_ERRBUF_SIZE]; /* Error buffer */
struct bpf_program filter; /* hold compiled program */
@@ -283,7 +283,7 @@
break;
case 'o':
if (optarg[strlen(optarg) - 1] != '/') {
- output_prefix = emalloc(strlen(optarg) + 1);
+ output_prefix = emalloc(strlen(optarg) + 2);
strcpy(output_prefix, optarg);
output_prefix[strlen(optarg)] = '/';
output_prefix[strlen(optarg) + 1] = '\0';
......@@ -7,7 +7,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS += -DDEFAULT_CONFIG_FILE=\\\"/etc/tcpxtract.conf\\\" -Wall -g -Wl,-z,defs
include /usr/share/dpatch/dpatch.make
include /usr/share/quilt/quilt.make
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
......@@ -33,9 +33,9 @@ clean: unpatch
dh_testroot
rm -f build-stamp config.guess
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
# cp -f /usr/share/misc/config.sub config.sub
#endif
[ ! -f Makefile ] || $(MAKE) distclean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment