<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d9875da84084b719f43c805d887a071f9cde61e2">https://github.com/macports/macports-ports/commit/d9875da84084b719f43c805d887a071f9cde61e2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d9875da8408 nbtscan: update to 1.7.2
</span>d9875da8408 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d9875da84084b719f43c805d887a071f9cde61e2
</span>Author: Allan Que <allan.que@gmail.com>
AuthorDate: Sat Jul 2 22:19:39 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> nbtscan: update to 1.7.2
</span>---
security/nbtscan/Portfile | 30 +-
.../debian-patches-04_fix_compiler_warnings.diff | 330 ---------------------
.../files/debian-patches-05_fix_off_by_one.diff | 21 --
3 files changed, 9 insertions(+), 372 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/nbtscan/Portfile b/security/nbtscan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f35dda21fdc..c9f2765fe24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/nbtscan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/nbtscan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,16 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name nbtscan
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup resurrecting-open-source-projects nbtscan 1.7.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories security
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description NBTscan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Scan networks for NetBIOS name information
</span>
long_description \
NBTscan is a program for scanning IP networks for NetBIOS \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,24 +20,10 @@ long_description \
</span> address, NetBIOS computer name, logged-in user name and MAC \
address.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.inetcat.net/software/nbtscan.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.inetcat.net/software/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-${version}a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 85bb085077c380b82a6ff73e0de0c154 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 4041d8f6b592fa310b8d3c79c56a2d3263dba82f\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5130d9e6decd3346859281f45f8a179aa0286a42
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles debian-patches-04_fix_compiler_warnings.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debian-patches-05_fix_off_by_one.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.type gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target nbtscan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3169e8f281079c87f56864ec3cb1cef28323719c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2a234f44d4b28eb689161d480625197d0056375c4311fb0520faa687eebd6e56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29773
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args BINDIR=${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/nbtscan/files/debian-patches-04_fix_compiler_warnings.diff b/security/nbtscan/files/debian-patches-04_fix_compiler_warnings.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 341b46d8671..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/nbtscan/files/debian-patches-04_fix_compiler_warnings.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,330 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNad nbtscan-1.5.1~/list.c nbtscan-1.5.1/list.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nbtscan-1.5.1~/list.c 2008-05-08 14:10:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nbtscan-1.5.1/list.c 2008-05-08 14:12:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(item1==NULL) return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(item1->content == item2->content) return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(item1->content > item2->content) return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(item1->content < item2->content) return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int insert(struct list* lst, unsigned long content) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,11 +95,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int in_list(struct list* lst, unsigned long content) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct list_item *temp_item, *item;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int cmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- item = new_list_item(content);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(lst->head==NULL) return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNad nbtscan-1.5.1~/nbtscan.c nbtscan-1.5.1/nbtscan.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nbtscan-1.5.1~/nbtscan.c 2008-05-08 14:10:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nbtscan-1.5.1/nbtscan.c 2008-05-08 14:12:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <getopt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if HAVE_STDINT_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +18,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int quiet=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--print_banner() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char* getnbservicename(my_uint8_t service, int unique, char* name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct nb_host_info* parse_response(char* buff, int buffsize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int in_list(struct list* lst, unsigned long content);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void print_banner(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("\nNBTscan version 1.5.1. Copyright (C) 1999-2003 Alla Bezroutchko.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("This is a free software and it comes with absolutely no warranty.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("You can use, distribute and modify it under terms of GNU GPL.\n\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,13 +84,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int print_header() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void print_header(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%-17s%-17s%-10s%-17s%-17s\n", "IP address", "NetBIOS Name",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Server", "User", "MAC address");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("------------------------------------------------------------------------------\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned char service; /* 16th byte of NetBIOS name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char name[16];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,7 +124,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(hostinfo->footer) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf("Adapter address: %02x-%02x-%02x-%02x-%02x-%02x\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printf("Adapter address: %02x:%02x:%02x:%02x:%02x:%02x\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[0], hostinfo->footer->adapter_address[1],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[2], hostinfo->footer->adapter_address[3],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[4], hostinfo->footer->adapter_address[5]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -150,7 +157,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i, unique;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my_uint8_t service; /* 16th byte of NetBIOS name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char name[16];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char* sname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!sf) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("\nNetBIOS Name Table for Host %s:\n\n", inet_ntoa(addr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +195,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(hostinfo->footer) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(sf) printf("%s%sMAC%s", inet_ntoa(addr), sf, sf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else printf("\nAdapter address: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf("%02x-%02x-%02x-%02x-%02x-%02x\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printf("%02x:%02x:%02x:%02x:%02x:%02x\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[0], hostinfo->footer->adapter_address[1],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[2], hostinfo->footer->adapter_address[3],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[4], hostinfo->footer->adapter_address[5]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,7 +244,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%-17s", user_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(hostinfo->footer) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf("%02x-%02x-%02x-%02x-%02x-%02x\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printf("%02x:%02x:%02x:%02x:%02x:%02x\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[0], hostinfo->footer->adapter_address[1],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[2], hostinfo->footer->adapter_address[3],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hostinfo->footer->adapter_address[4], hostinfo->footer->adapter_address[5]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -251,11 +257,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Print hostinfo in /etc/hosts or lmhosts format */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If l is true adds #PRE to each line of output (for lmhosts) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int l_print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, int l) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void l_print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, int l) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned char service; /* 16th byte of NetBIOS name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char comp_name[16];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int is_server=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int unique;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int first_name=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct nb_host_info* hostinfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd_set* fdsr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd_set* fdsw;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int sel, size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct list* scanned;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my_uint32_t rtt_base; /* Base time (seconds) for round trip time calculations */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float rtt; /* most recent measured RTT, seconds */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,27 +391,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(dump && lmhosts) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Cannot be used with both dump (-d) and lmhosts (-l) options.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- usage;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ usage();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(dump && etc_hosts) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Cannot be used with both dump (-d) and /etc/hosts (-e) options.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- usage;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ usage();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(verbose && lmhosts){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Cannot be used with both verbose (-v) and lmhosts (-l) options.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- usage;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ usage();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(verbose && etc_hosts){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Cannot be used with both verbose (-v) and /etc/hosts (-e) options.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- usage;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ usage();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(lmhosts && etc_hosts){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Cannot be used with both lmhosts (-l) and /etc/hosts (-e) options.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- usage;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ usage();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -476,8 +481,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FD_SET(sock, fdsw);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* timeout is in milliseconds */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- select_timeout.tv_sec = timeout / 1000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- select_timeout.tv_usec = (timeout % 1000) * 1000; /* Microseconds */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ select_timeout.tv_sec = 60; /* Default 1 min to survive ARP timeouts */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ select_timeout.tv_usec = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addr_size = sizeof(struct sockaddr_in);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNad nbtscan-1.5.1~/range.c nbtscan-1.5.1/range.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nbtscan-1.5.1~/range.c 2008-05-08 14:10:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nbtscan-1.5.1/range.c 2008-05-08 14:12:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,14 +35,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Returns 1 on success, 0 on failure */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int is_range1(char* string, struct ip_range* range) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* separator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unsigned long mask;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int mask;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* ip;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((ip = (char *)malloc(strlen(string)+1))==NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err_die("Malloc failed", quiet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strlen(string)>19) return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(separator=(char*)strchr(string,'/')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if((separator=(char*)strchr(string,'/'))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- separator++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mask=atoi(separator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(mask<=0 || mask>32) return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err_die("Malloc failed", quiet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcpy(ip,string);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(separator = (char*)strchr(ip,'-')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if((separator = (char*)strchr(ip,'-'))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *separator=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- separator++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- last_octet = atoi(separator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -124,7 +124,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int print_range(const struct ip_range* range) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void print_range(const struct ip_range* range) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct in_addr *addr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((addr = (struct in_addr*)malloc(sizeof(struct in_addr)))==NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNad nbtscan-1.5.1~/range.h nbtscan-1.5.1/range.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nbtscan-1.5.1~/range.h 2008-05-08 14:10:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nbtscan-1.5.1/range.h 2008-05-08 14:12:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Returns 1 on success, 0 on failure */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int is_range2(char* string, struct ip_range* range);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int print_range(const struct ip_range* range);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void print_range(const struct ip_range* range);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* RANGE_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNad nbtscan-1.5.1~/statusq.c nbtscan-1.5.1/statusq.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nbtscan-1.5.1~/statusq.c 2008-05-08 14:10:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nbtscan-1.5.1/statusq.c 2008-05-08 14:12:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This file contains a portion of code from Samba package, *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* which contains the following license: *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/ which contains the following license: *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Unix SMB/Netbios implementation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version 1.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stddef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "errors.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int quiet;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end of code from Samba */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct nbname_request request;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct sockaddr_in dest_sockaddr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (struct sockaddr *)&dest_sockaddr, sizeof(dest_sockaddr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(status==-1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(errmsg, 80, "%s\tSendto failed", inet_ntoa(dest_addr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err_print(errmsg, quiet); return(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_print(errmsg, quiet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -329,41 +330,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nb_service_t services[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"__MSBROWSE__", 0x01, 0, "Master Browser",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"INet~Services", 0x1C, 0, "IIS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"IS~", 0x00, 1, "IIS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x00, 1, "Workstation Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x01, 1, "Messenger Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x03, 1, "Messenger Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x06, 1, "RAS Server Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x1F, 1, "NetDDE Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x20, 1, "File Server Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x21, 1, "RAS Client Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x22, 1, "Microsoft Exchange Interchange(MSMail Connector)",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x23, 1, "Microsoft Exchange Store",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x24, 1, "Microsoft Exchange Directory",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x30, 1, "Modem Sharing Server Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x31, 1, "Modem Sharing Client Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x43, 1, "SMS Clients Remote Control",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x44, 1, "SMS Administrators Remote Control Tool",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x45, 1, "SMS Clients Remote Chat",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x46, 1, "SMS Clients Remote Transfer",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x4C, 1, "DEC Pathworks TCPIP service on Windows NT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x52, 1, "DEC Pathworks TCPIP service on Windows NT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x87, 1, "Microsoft Exchange MTA",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x6A, 1, "Microsoft Exchange IMC",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0xBE, 1, "Network Monitor Agent",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0xBF, 1, "Network Monitor Application",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x03, 1, "Messenger Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x00, 0, "Domain Name",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x1B, 1, "Domain Master Browser",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x1C, 0, "Domain Controllers",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x1D, 1, "Master Browser",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x1E, 0, "Browser Service Elections",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"", 0x2B, 1, "Lotus Notes Server Service",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"IRISMULTICAST", 0x2F, 0, "Lotus Notes",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"IRISNAMESERVER", 0x33, 0, "Lotus Notes",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--"Forte_$ND800ZA", 0x20, 1, "DCA IrmaLan Gateway Server Service"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"__MSBROWSE__", 0x01, 0, "Master Browser"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"INet~Services", 0x1C, 0, "IIS"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"IS~", 0x00, 1, "IIS"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x00, 1, "Workstation Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x01, 1, "Messenger Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x03, 1, "Messenger Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x06, 1, "RAS Server Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x1F, 1, "NetDDE Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x20, 1, "File Server Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x21, 1, "RAS Client Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x22, 1, "Microsoft Exchange Interchange(MSMail Connector)"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x23, 1, "Microsoft Exchange Store"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x24, 1, "Microsoft Exchange Directory"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x30, 1, "Modem Sharing Server Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x31, 1, "Modem Sharing Client Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x43, 1, "SMS Clients Remote Control"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x44, 1, "SMS Administrators Remote Control Tool"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x45, 1, "SMS Clients Remote Chat"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x46, 1, "SMS Clients Remote Transfer"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x4C, 1, "DEC Pathworks TCPIP service on Windows NT"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x52, 1, "DEC Pathworks TCPIP service on Windows NT"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x87, 1, "Microsoft Exchange MTA"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x6A, 1, "Microsoft Exchange IMC"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0xBE, 1, "Network Monitor Agent"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0xBF, 1, "Network Monitor Application"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x03, 1, "Messenger Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x00, 0, "Domain Name"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x1B, 1, "Domain Master Browser"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x1C, 0, "Domain Controllers"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x1D, 1, "Master Browser"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x1E, 0, "Browser Service Elections"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"", 0x2B, 1, "Lotus Notes Server Service"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"IRISMULTICAST", 0x2F, 0, "Lotus Notes"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"IRISNAMESERVER", 0x33, 0, "Lotus Notes"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{"Forte_$ND800ZA", 0x20, 1, "DCA IrmaLan Gateway Server Service"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* getnbservicename(my_uint8_t service, int unique, char* name) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/nbtscan/files/debian-patches-05_fix_off_by_one.diff b/security/nbtscan/files/debian-patches-05_fix_off_by_one.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 98d8507fb6c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/nbtscan/files/debian-patches-05_fix_off_by_one.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urNad nbtscan-1.5.1~/nbtscan.c nbtscan-1.5.1/nbtscan.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nbtscan-1.5.1~/nbtscan.c 2003-06-06 14:14:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nbtscan-1.5.1/nbtscan.c 2008-05-09 14:38:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,7 +111,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(i=0; i< hostinfo->header->number_of_names; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- service = hostinfo->names[i].ascii_name[15];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strncpy(name, hostinfo->names[i].ascii_name, 15);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- name[16]=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ name[15]=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%-17s Service: 0x%02x Flags: 0x%04x\n", name, service, hostinfo->names[i].rr_flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,7 +164,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(i=0; i< hostinfo->header->number_of_names; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- service = hostinfo->names[i].ascii_name[15];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strncpy(name, hostinfo->names[i].ascii_name, 15);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- name[16]=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ name[15]=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unique = !(hostinfo->names[i].rr_flags & 0x0080);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(sf) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%s%s%s%s", inet_ntoa(addr), sf, name, sf);
</span></pre><pre style='margin:0'>
</pre>