Update rules for netcat

repology · Nov 13, 2023 · 79ea353 · 79ea353
1 parent d1f3457
commit 79ea353
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/850.split-ambiguities/n.yaml b/850.split-ambiguities/n.yaml
@@ -2,10 +2,8 @@
 
 - { name: nail, verpat: "12\\.[0-9]+", setname: heirloom-mailx, addflavor: true }
 
-- { name: nc, wwwpart: openbsd, setname: netcat-openbsd }
-- { name: nc, ver: "0.7.1", setname: gnu-netcat, maintenance: true }
+- { name: nc, wwwpart: [openbsd,eternallybored], setname: netcat } # this is classified once more in the netcat block below
 - { name: nc, wwwpart: ncat, setname: ncat }
-- { name: nc, ruleset: [pld,slackware], setname: netcat-traditional }
 - { name: nc, addflag: unclassified }
 
 - { name: ndiff, wwwpart: nmap, setname: nmap, addflavor: ndiff }
@@ -42,9 +40,9 @@
 - { name: netcat, sourceforge: nc110, setname: netcat-nc110 }
 - { name: netcat, sourceforge: netcat, setname: gnu-netcat }
 - { name: netcat, wwwpart: duncan-roe, setname: netcat-openbsd-duncan-roe }
-- { name: netcat, wwwpat: "debian.*netcat-openbsd", setname: netcat-openbsd-debian }
-- { name: netcat, wwwpat: "openbsd.org.*nc.1", setname: netcat-openbsd }
-- { name: netcat, wwwpat: "openbsd.org.*usb.bin/nc", setname: netcat-openbsd }
+- { name: netcat, wwwpat: ".*debian.*netcat-openbsd", setname: netcat-openbsd-debian }
+- { name: netcat, wwwpat: ".*openbsd\\.org.*(nc\\.1|usr\\.bin/nc/)", setname: netcat-openbsd }
+- { name: netcat, wwwpart: eternallybored, setname: netcat-win32 }
 - { name: netcat, addflag: unclassified }
 
 - { name: netgen, wwwpart: netgen-mesher, setname: netgen-mesher }

diff --git a/900.version-fixes/n.yaml b/900.version-fixes/n.yaml
@@ -45,11 +45,11 @@
 - { name: netbeans,                    ver: "11.2.0.1",              ruleset: npackd,      incorrect: true }
 - { name: netbeans,                                                  ruleset: npackd,      untrusted: true } # accused of fake 11.2.0.1
 - { name: netboot,                     verpat: "20[0-9]{6}",                               snapshot: true }
+- { name: netcat-nc110,                verpat: ".*20[0-9]{6}",                             altver: true } # 1.10 vs 1.10.20180111
+- { name: netcat-nc110,                verpat: "110.*",                                    incorrect: true } # 1.10, not 110
 - { name: netcat-openbsd,              verpat: "20[0-9]{2}.*",                             snapshot: true } # pkgsrc garbage
 - { name: netcat-openbsd,              verpat: "[0-9]+\\.[0-9]{3}_.*",                     incorrect: true } # debian suffixes
 - { name: netcat-openbsd,              verlonger: 2,                 ruleset: chakra,      debianism: true }
-- { name: netcat-traditional,          verpat: ".*20[0-9]{6}",                             snapshot: true }
-- { name: netcat-traditional,          verpat: "110.*",                                    incorrect: true } # 1.10, not 110
 - { name: netdiscover,                 ver: "0.3",                   ruleset: [blackarch, mageia], incorrect: true }
 - { name: netdiscover,                 verpat: "(.*)pre(beta.*)",                          setver: $1$2 }
 - { name: netevent,                    ver: "20201018",                                    incorrect: true } # no commit with such date