diff --git a/net/ssldump/Makefile b/net/ssldump/Makefile index 0d3bacff414..ef482aa0d58 100644 --- a/net/ssldump/Makefile +++ b/net/ssldump/Makefile @@ -2,7 +2,7 @@ COMMENT= SSLv3/TLS network protocol analyzer GH_ACCOUNT= adulau GH_PROJECT= ssldump -GH_TAGNAME= v1.8 +GH_TAGNAME= v1.9 CATEGORIES= net # https://github.com/adulau/ssldump diff --git a/net/ssldump/distinfo b/net/ssldump/distinfo index 3e02792a596..b09c712f899 100644 --- a/net/ssldump/distinfo +++ b/net/ssldump/distinfo @@ -1,2 +1,2 @@ -SHA256 (ssldump-1.8.tar.gz) = +huxQDQ4VIfMY5+zLBKl2g+Pv+5GA/ThASIYSORucrM= -SIZE (ssldump-1.8.tar.gz) = 188219 +SHA256 (ssldump-1.9.tar.gz) = yBzljXm25u242JgiqFRx71HPp9Y62BLfb0cLXRT/bkg= +SIZE (ssldump-1.9.tar.gz) = 159474 diff --git a/net/ssldump/patches/patch-CMakeLists_txt b/net/ssldump/patches/patch-CMakeLists_txt deleted file mode 100644 index b53aa66cb7d..00000000000 --- a/net/ssldump/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -113,5 +113,5 @@ target_link_libraries(ssldump - set(CMAKE_INSTALL_PREFIX "/usr/local") - install(TARGETS ssldump DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) - --set(CMAKE_INSTALL_MANDIR "/usr/local/share/man") -+set(CMAKE_INSTALL_MANDIR "/usr/local/man") - install(FILES ssldump.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/net/ssldump/patches/patch-base_pcap-snoop_c_in b/net/ssldump/patches/patch-base_pcap-snoop_c_in index e67d3ec9b9d..b55ac01a3f9 100644 --- a/net/ssldump/patches/patch-base_pcap-snoop_c_in +++ b/net/ssldump/patches/patch-base_pcap-snoop_c_in @@ -1,21 +1,21 @@ Index: base/pcap-snoop.c.in --- base/pcap-snoop.c.in.orig +++ base/pcap-snoop.c.in -@@ -97,7 +97,7 @@ int conn_freq = 100; // Number of packets after which - // cleaning is performed - int conn_ttl = 100; // TTL of inactive connections in connection pool - struct timeval last_packet_seen_time = // Timestamp of the last packet of the -- (struct timeval) {0}; // last block of conn_freq packets seen -+ {0}; // last block of conn_freq packets seen +@@ -98,7 +98,7 @@ int conn_freq = 100; // Number of packets after which + // cleaning is performed + int conn_ttl = 100; // TTL of inactive connections in connection pool + struct timeval last_packet_seen_time = // Timestamp of the last packet of the +- (struct timeval){0}; // last block of conn_freq packets seen ++ {0}; // last block of conn_freq packets seen - logger_mod *logger=NULL; + logger_mod *logger = NULL; -@@ -435,7 +435,7 @@ int main(argc,argv) - - if(!file){ - if(!interface_name){ -- if(pcap_findalldevs(&interfaces,errbuf)==-1) { -+ if(pcap_findalldevs(&interfaces,errbuf)==-1 || interfaces == NULL) { - fprintf(stderr,"PCAP: %s\n",errbuf); - err_exit("Aborting",-1); - } +@@ -476,7 +476,7 @@ int main(int argc, char **argv) { + + if(!file) { + if(!interface_name) { +- if(pcap_findalldevs(&interfaces, errbuf) == -1) { ++ if(pcap_findalldevs(&interfaces, errbuf) == -1 || interfaces == NULL) { + fprintf(stderr, "PCAP: %s\n", errbuf); + err_exit("Aborting", -1); + } diff --git a/net/ssldump/patches/patch-pcap_logpkt_c b/net/ssldump/patches/patch-pcap_logpkt_c new file mode 100644 index 00000000000..ee54f6c0368 --- /dev/null +++ b/net/ssldump/patches/patch-pcap_logpkt_c @@ -0,0 +1,18 @@ +warning: 'memcpy' call operates on objects of type 'const uint32_t' (aka +'const unsigned int') while the size is based on a different type 'const +uint32_t *' (aka 'const unsigned int *') [-Wsizeof-pointer-memaccess] + +Index: pcap/logpkt.c +--- pcap/logpkt.c.orig ++++ pcap/logpkt.c +@@ -262,8 +262,8 @@ void logpkt_ctx_init(logpkt_ctx_t *ctx, + memcpy(ctx->dst_ether, dst_ether, ETHER_ADDR_LEN); + memcpy(&ctx->src_addr, src_addr, src_addr_len); + memcpy(&ctx->dst_addr, dst_addr, dst_addr_len); +- memcpy(&ctx->timestamp_sec, timestamp_sec, sizeof(timestamp_sec)); +- memcpy(&ctx->timestamp_usec, timestamp_usec, sizeof(timestamp_usec)); ++ memcpy(&ctx->timestamp_sec, timestamp_sec, sizeof(uint32_t)); ++ memcpy(&ctx->timestamp_usec, timestamp_usec, sizeof(uint32_t)); + ctx->src_seq = 0; + ctx->dst_seq = 0; + if(mtu) {