summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog99
-rw-r--r--debian/control2
-rw-r--r--debian/patches/00list0
-rwxr-xr-xdebian/patches/10-fix_udp_support.dpatch48
-rwxr-xr-xdebian/rules26
5 files changed, 108 insertions, 67 deletions
diff --git a/debian/changelog b/debian/changelog
index b3f5b58..6b1f481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,102 @@
+conntrack (0.9.14-2+vyatta13) unstable; urgency=low
+
+ * new branch
+
+ -- Deepti Kulkarni <deepti@vyatta.com> Thu, 07 Jul 2011 20:52:06 -0700
+
+conntrack (0.9.14-2+vyatta12) unstable; urgency=low
+
+ * new branch
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Tue, 28 Dec 2010 20:41:51 +0000
+
+conntrack (0.9.14-2+vyatta11) unstable; urgency=low
+
+ * UNRELEASED
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Thu, 02 Sep 2010 18:25:52 -0700
+
+conntrack (0.9.14-2+vyatta10) unstable; urgency=low
+
+ * remove debian patching from build
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Tue, 31 Aug 2010 15:58:54 -0700
+
+conntrack (0.9.14-2+vyatta9) unstable; urgency=low
+
+ * UNRELEASED
+
+ -- An-Cheng Huang <ancheng@vyatta.com> Thu, 22 Jul 2010 17:20:32 -0700
+
+conntrack (0.9.14-2+vyatta8) unstable; urgency=low
+
+ * conntrackd: replace cyptic 'mfrm' with 'malformed' in '-s'
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Fri, 09 Jul 2010 10:35:04 -0700
+
+conntrack (0.9.14-2+vyatta7) unstable; urgency=low
+
+ * Enforce strict logic for NetlinkBufferSize,
+ NetlinkBufferSizeMaxGrowth clauses
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Wed, 07 Jul 2010 12:01:52 -0700
+
+conntrack (0.9.14-2+vyatta6) unstable; urgency=low
+
+ * update error message for max netlink socket size reached
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Thu, 01 Jul 2010 10:40:06 -0700
+
+conntrack (0.9.14-2+vyatta5) unstable; urgency=low
+
+ [ Mohit Mehta ]
+ * Revert "fix `conntrack -L --src-nat --dst-nat`"
+
+ [ Pablo Neira Ayuso ]
+ * conntrack: fix `conntrack -L -n -g` (second try)
+ * conntrack: fix `conntrack -L -n -g` filter using AND, not OR logic
+
+ [ Mohit Mehta ]
+ * update dh_gencontrol for dev build
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Tue, 22 Jun 2010 11:53:55 -0700
+
+conntrack (0.9.14-2+vyatta4) unstable; urgency=low
+
+ [ Pablo Neira Ayuso ]
+ * fix `conntrack -L --src-nat --dst-nat`
+
+ [ Mohit Mehta ]
+ * fix `conntrackd -i -x`
+
+ [ Pablo Neira Ayuso ]
+ * This patch move the ports addition to the layer 4 functions, instead
+
+ [ Mohit Mehta ]
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Tue, 15 Jun 2010 12:23:35 -0700
+
+conntrack (0.9.14-2+vyatta3) unstable; urgency=low
+
+ * add missing m4 files
+ * update .gitignore
+ * remove generated files, apply debian patch 10-fix_udp_support.dpatch
+ * remove files for applied patch
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Mon, 14 Jun 2010 20:34:06 -0700
+
+conntrack (0.9.14-2+vyatta2) unstable; urgency=low
+
+ * UNRELEASED
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Mon, 14 Jun 2010 16:07:51 -0700
+
+conntrack (0.9.14-2+vyatta1) unstable; urgency=low
+
+ * vyatta conntrack-tools
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com> Mon, 14 Jun 2010 16:05:05 -0700
+
conntrack (1:0.9.14-2) unstable; urgency=low
* Integrate lost NMU from Stefan Fritsch. Thanks Stefan
diff --git a/debian/control b/debian/control
index 67fa7ea..6b78fea 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Alexander Wirt <formorer@debian.org>
Homepage: http://conntrack-tools.netfilter.org/
Build-Depends: debhelper (>= 5), libnfnetlink-dev (>= 1.0.0),
- libnetfilter-conntrack-dev (>= 0.0.101), bison, flex, dpatch
+ libnetfilter-conntrack-dev (>= 0.0.101), bison, flex
Standards-Version: 3.8.4
Package: conntrack
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e69de29..0000000
--- a/debian/patches/00list
+++ /dev/null
diff --git a/debian/patches/10-fix_udp_support.dpatch b/debian/patches/10-fix_udp_support.dpatch
deleted file mode 100755
index 4eed834..0000000
--- a/debian/patches/10-fix_udp_support.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix_udp_support.dpatch by Pablo Neira Ayuso <pablo@netfilter.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: conntrackd: fix UDP filtering in configuration file
-## DP: picked from the conntrack mailinglist
-
-@DPATCH@
-diff -urNad conntrack-0.9.14~/doc/sync/ftfw/conntrackd.conf conntrack-0.9.14/doc/sync/ftfw/conntrackd.conf
---- conntrack-0.9.14~/doc/sync/ftfw/conntrackd.conf 2009-12-23 18:14:01.000000000 +0100
-+++ conntrack-0.9.14/doc/sync/ftfw/conntrackd.conf 2010-02-12 16:23:53.000000000 +0100
-@@ -357,6 +357,7 @@
- TCP
- SCTP
- DCCP
-+ # UDP
- # ICMP # This requires a Linux kernel >= 2.6.31
- }
-
-diff -urNad conntrack-0.9.14~/src/read_config_yy.y conntrack-0.9.14/src/read_config_yy.y
---- conntrack-0.9.14~/src/read_config_yy.y 2009-12-23 19:45:51.000000000 +0100
-+++ conntrack-0.9.14/src/read_config_yy.y 2010-02-12 16:23:53.000000000 +0100
-@@ -1221,6 +1221,25 @@
- pent->p_proto);
- };
-
-+filter_protocol_item : T_UDP
-+{
-+ struct protoent *pent;
-+
-+ pent = getprotobyname("udp");
-+ if (pent == NULL) {
-+ print_err(CTD_CFG_WARN, "getprotobyname() cannot find "
-+ "protocol `udp' in /etc/protocols");
-+ break;
-+ }
-+ ct_filter_add_proto(STATE(us_filter), pent->p_proto);
-+
-+ __kernel_filter_start();
-+
-+ nfct_filter_add_attr_u32(STATE(filter),
-+ NFCT_FILTER_L4PROTO,
-+ pent->p_proto);
-+};
-+
- filter_item : T_ADDRESS T_ACCEPT '{' filter_address_list '}'
- {
- ct_filter_set_logic(STATE(us_filter),
diff --git a/debian/rules b/debian/rules
index 8fe7d91..80d328a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ endif
CFLAGS += -DYY_NO_INPUT
build: debian/stamp-build
-debian/stamp-build: patch
+debian/stamp-build:
dh_testdir
# ./configure
@@ -32,7 +32,7 @@ debian/stamp-build: patch
touch $@
-clean: clean1 unpatch
+clean: clean1
clean1:
dh_testdir
dh_testroot
@@ -53,20 +53,6 @@ debian/stamp-install: debian/stamp-build
touch $@
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-# You can do more things with dpatch, like having patches only applied on
-# a special architecture - see the non-dh version of the sample for this!
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-
# Build architecture-independent files here.
binary-indep:
@@ -86,7 +72,11 @@ binary-arch: build install
dh_fixperms -a
dh_installdeb -a
dh_shlibdeps -a
- dh_gencontrol -a
+ if [ -f "../.VYATTA_DEV_BUILD" ]; then \
+ dh_gencontrol -- -v999.dev; \
+ else \
+ dh_gencontrol; \
+ fi
dh_md5sums -a
dh_builddeb -a
@@ -94,5 +84,5 @@ source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+.PHONY: build clean binary-indep binary-arch binary install \
clean1
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-02 14:00:28 +0000