git.iko.soy/typeable/nixpkgs
on master help sign in
ntopng: Add patch needed to build with newer libpcap

Fixes build errors for the third-party mongoose module: ``` In file included from /nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43, from /build/ntopng-2.0/include/ntop_includes.h:93, from src/HTTPserver.cpp:22: /nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition #define INVALID_SOCKET -1 src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration typedef int SOCKET; ^~~~~~ ```

commitc4486a084f718b7813352d5a77d9b219ec44f99c authorClaudio Bley <cbley@exa-online.de> dateThu 19 Sep 2019, 09:02 (7 years ago) parentb9ba391
2 files changed+35
pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch+34 pkgs/tools/networking/ntopng/default.nix+1
pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patchnew file+34
@@ -0,0 +1,34 @@
1+From 9cb650ea96c0e5063775071cfdae072e92c553b8 Mon Sep 17 00:00:00 2001
2+From: emanuele-f <faranda@ntop.org>
3+Date: Tue, 18 Sep 2018 12:49:57 +0200
4+Subject: [PATCH] Compilation fix with new libpcap
5+
6+SOCKET and INVALID_SOCKET are now defined in pcap.h
7+---
8+ third-party/mongoose/mongoose.c | 4 ++++
9+ 1 file changed, 4 insertions(+)
10+
11+diff --git a/third-party/mongoose/mongoose.c b/third-party/mongoose/mongoose.c
12+index 6a61cea9b..634c142e3 100644
13+--- a/third-party/mongoose/mongoose.c
14++++ b/third-party/mongoose/mongoose.c
15+@@ -247,7 +247,9 @@ struct pollfd {
16+ #define mg_rename(x, y) rename(x, y)
17+ #define mg_sleep(x) usleep((x) * 1000)
18+ #define ERRNO errno
19++#ifndef INVALID_SOCKET
20+ #define INVALID_SOCKET (-1)
21++#endif
22+
23+ /* ntop */
24+ #if ((ULONG_MAX) == (UINT_MAX))
25+@@ -270,7 +272,9 @@ struct pollfd {
26+ #endif
27+
28+ //#define INT64_FMT PRId64
29++#ifndef SOCKET
30+ typedef int SOCKET;
31++#endif
32+ #define WINCDECL
33+
34+ #endif // End of Windows and UNIX specific includes
pkgs/tools/networking/ntopng/default.nix+1
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
2020 patches = [
2121 ./0001-Undo-weird-modification-of-data_dir.patch
2222 ./0002-Remove-requirement-to-have-writeable-callback-dir.patch
23+ ./0003-New-libpcap-defines-SOCKET.patch
2324 ];
2425
2526 buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy