include patches to fix FTBFS
Sascha Steinbiss
4 years ago
|
0 |
pktanon (2~git20160407.0.2bde4f2+dfsg-6) unstable; urgency=medium
|
|
1 |
|
|
2 |
[ Peter Michael Green ]
|
|
3 |
* Move <pcap.h> include outside namespace.
|
|
4 |
* Clean up some stuff left behind by testsuite.
|
|
5 |
* Disable testsuite, it doesn't get run on the autobuilders anyway,
|
|
6 |
so it just acts as a trap for people building manually.
|
|
7 |
|
|
8 |
-- Sascha Steinbiss <satta@debian.org> Fri, 01 Nov 2019 08:18:43 +0100
|
|
9 |
|
| 0 | 10 |
pktanon (2~git20160407.0.2bde4f2+dfsg-5) unstable; urgency=medium
|
| 1 | 11 |
|
| 2 | 12 |
* Use debhelper 12.
|
|
0 |
Description: Move #include <pcap.h> outside namespace
|
|
1 |
Utils.h includes pcap.h from within the pktannon namespace, this causes system
|
|
2 |
structures to be incorrectly placed in the pktanon namespace breaking stuff
|
|
3 |
later. This patch moves the include outside of the namespace.
|
|
4 |
Author: Peter Michael Green <plugwash@debian.org>
|
|
5 |
|
|
6 |
--- pktanon-2~git20160407.0.2bde4f2+dfsg.orig/src/Utils.h
|
|
7 |
+++ pktanon-2~git20160407.0.2bde4f2+dfsg/src/Utils.h
|
|
8 |
@@ -13,6 +13,11 @@
|
|
9 |
#include <PktAnon.h>
|
|
10 |
// #include <transformations/ErrorCodes.h>
|
|
11 |
|
|
12 |
+# ifdef HAVE_LIBPCAP
|
|
13 |
+
|
|
14 |
+# include <pcap.h>
|
|
15 |
+# endif
|
|
16 |
+
|
|
17 |
namespace pktanon
|
|
18 |
{
|
|
19 |
|
|
20 |
@@ -35,8 +40,6 @@ inline void transform_packet ( PCAP_REC_
|
|
21 |
|
|
22 |
# ifdef HAVE_LIBPCAP
|
|
23 |
|
|
24 |
-# include <pcap.h>
|
|
25 |
-
|
|
26 |
inline void transform_packet ( struct pcap_pkthdr* pkt_header, const uint8_t* original_packet, uint8_t* transformed_packet, Stats& stats )
|
|
27 |
{
|
|
28 |
auto new_pkt_len = PktAnon::transform_packet ( original_packet, transformed_packet, pkt_header->caplen );
|
| 0 | 0 |
rename-enums.patch
|
| 1 | 1 |
0001-remove-CryptoPan.patch
|
| 2 | 2 |
0002-add-support-for-xerces-c-3.2.patch
|
|
3 |
0004-include-pcap.h-outside-namespace.patch
|
| 19 | 19 |
override_dh_auto_clean:
|
| 20 | 20 |
dh_auto_clean
|
| 21 | 21 |
rm -rf $(MANPAGES)
|
|
22 |
rm -f tests/pktanon-runtime/trace.pcap.gz tests/transformations/out.pcap tests/dejagnu_logs/*.sum tests/dejagnu_logs/*.log
|
| 22 | 23 |
|
| 23 | 24 |
override_dh_installman: $(MANPAGES)
|
| 24 | 25 |
dh_installman
|
|
| 26 | 27 |
override_dh_auto_install:
|
| 27 | 28 |
dh_auto_install
|
| 28 | 29 |
rm -rfv debian/pktanon/usr/lib
|
|
30 |
|
|
31 |
override_dh_auto_test:
|
|
32 |
echo testsuite disabled.
|