| Message ID | 20211012174838.1222576-1-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/4] package/nmap: bump to version 7.92 | expand |
On 12/10/2021 19:48, Adam Duskett wrote: > In addition: > - Remove upstream patch > - Update license hash to reflect license version bump from 0.92 to 0.93 > > Signed-off-by: Adam Duskett <aduskett@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/nmap/0002-ncat-unix-socket.patch | 30 ------------------------ > package/nmap/nmap.hash | 6 ++--- > package/nmap/nmap.mk | 2 +- > 3 files changed, 4 insertions(+), 34 deletions(-) > delete mode 100644 package/nmap/0002-ncat-unix-socket.patch > > diff --git a/package/nmap/0002-ncat-unix-socket.patch b/package/nmap/0002-ncat-unix-socket.patch > deleted file mode 100644 > index b6484ebeea..0000000000 > --- a/package/nmap/0002-ncat-unix-socket.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -ChangeLog: > - > -o [Ncat][GH#2154] Ncat no longer crashes when used with Unix domain sockets. > - > -Backported from: r38121 > - > -Signed-off-by: Alexey Neyman <stilor@att.net> > - > -Index: ncat/ncat_main.c > -=================================================================== > ---- a/ncat/ncat_main.c (revision 38120) > -+++ b/ncat/ncat_main.c (revision 38121) > -@@ -846,7 +846,7 @@ > - targetaddrs->addr.un.sun_family = AF_UNIX; > - strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path)); > - targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un); > -- o.target = argv[optind]; > -+ o.sslservername = o.target = argv[optind]; > - optind++; > - } else > - #endif > -@@ -865,7 +865,7 @@ > - targetaddrs->addr.vm.svm_cid = long_cid; > - > - targetaddrs->addrlen = sizeof(targetaddrs->addr.vm); > -- o.target = argv[optind]; > -+ o.sslservername = o.target = argv[optind]; > - optind++; > - } > - } else > diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash > index 8f69bbf613..dc379f30d4 100644 > --- a/package/nmap/nmap.hash > +++ b/package/nmap/nmap.hash > @@ -1,5 +1,5 @@ > -# From https://nmap.org/dist/sigs/nmap-7.91.tar.bz2.digest.txt (lowercase) > -sha256 18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300 nmap-7.91.tar.bz2 > +# From https://nmap.org/dist/sigs/nmap-7.92.tar.bz2.digest.txt (lowercase) > +sha256 a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1 nmap-7.92.tar.bz2 > > # Locally calculated > -sha256 8254a9bc733f3312c6dcfe0d5a129c29e96ecb8b33408c652a8c7beb2e25b471 LICENSE > +sha256 133794301a764dfe8a60e38601e56657b7113e0337b452189725bbbed58baea0 LICENSE > diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk > index 34cf61ff0b..f3994e9b38 100644 > --- a/package/nmap/nmap.mk > +++ b/package/nmap/nmap.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NMAP_VERSION = 7.91 > +NMAP_VERSION = 7.92 > NMAP_SITE = https://nmap.org/dist > NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 > NMAP_DEPENDENCIES = liblinear libpcap >
diff --git a/package/nmap/0002-ncat-unix-socket.patch b/package/nmap/0002-ncat-unix-socket.patch deleted file mode 100644 index b6484ebeea..0000000000 --- a/package/nmap/0002-ncat-unix-socket.patch +++ /dev/null @@ -1,30 +0,0 @@ -ChangeLog: - -o [Ncat][GH#2154] Ncat no longer crashes when used with Unix domain sockets. - -Backported from: r38121 - -Signed-off-by: Alexey Neyman <stilor@att.net> - -Index: ncat/ncat_main.c -=================================================================== ---- a/ncat/ncat_main.c (revision 38120) -+++ b/ncat/ncat_main.c (revision 38121) -@@ -846,7 +846,7 @@ - targetaddrs->addr.un.sun_family = AF_UNIX; - strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path)); - targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un); -- o.target = argv[optind]; -+ o.sslservername = o.target = argv[optind]; - optind++; - } else - #endif -@@ -865,7 +865,7 @@ - targetaddrs->addr.vm.svm_cid = long_cid; - - targetaddrs->addrlen = sizeof(targetaddrs->addr.vm); -- o.target = argv[optind]; -+ o.sslservername = o.target = argv[optind]; - optind++; - } - } else diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 8f69bbf613..dc379f30d4 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,5 +1,5 @@ -# From https://nmap.org/dist/sigs/nmap-7.91.tar.bz2.digest.txt (lowercase) -sha256 18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300 nmap-7.91.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.92.tar.bz2.digest.txt (lowercase) +sha256 a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1 nmap-7.92.tar.bz2 # Locally calculated -sha256 8254a9bc733f3312c6dcfe0d5a129c29e96ecb8b33408c652a8c7beb2e25b471 LICENSE +sha256 133794301a764dfe8a60e38601e56657b7113e0337b452189725bbbed58baea0 LICENSE diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 34cf61ff0b..f3994e9b38 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.91 +NMAP_VERSION = 7.92 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap
In addition: - Remove upstream patch - Update license hash to reflect license version bump from 0.92 to 0.93 Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/nmap/0002-ncat-unix-socket.patch | 30 ------------------------ package/nmap/nmap.hash | 6 ++--- package/nmap/nmap.mk | 2 +- 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/nmap/0002-ncat-unix-socket.patch