CVS commit: pkgsrc/net/ruby-recog

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Sep 23 15:57:32 UTC 2018

Modified Files:
        pkgsrc/net/ruby-recog: Makefile PLIST distinfo

Log Message:
net/ruby-recog: update to 2.1.23

v2.1.23 (2018/09/20)

* use yaml for remapping; remove json transpose code (#177)

  - use yaml for remapping; remove json transpose code
  - temporarily revert cpe change on win2k3

* TELNET: Initial commit (#178)

* Add better support for Array networks/ArrayOS

v.2.1.22 - 2018.09.04

* New fingerprint coverage: apache_modules.xml #174

  - Adds support for performing version detection of Apache modules in HTTP
    Server headers.
  - Client software calling Recog is expected to split an Apache banner based
    on spaces and toss the individual values at Recog.
  - This is a first pass, more work will be required to fully flesh this out.

* Improved coverage: http_servers.xml #175

  - Leveraging Project Sonar data from 2018.08.13 has resulted in significant
    (multiple millions) improvement of fingerprinting against that data set.
  - hw.* values added where possible

* Minor FTP tweaks

v.2.1.22 - 2018.08.29

* New capability: CPE 2.3 data #172

  - Added preliminary support for returning CPE 2.3 information via a new
    fingerprint param named service.cpe23 which can be literal strings or
    interpolated values.

    Example:

    <param pos="0" name="service.cpe23" value="cpe:/a:vmware:zimbra_desktop:1"/>

    or

    <param pos="0" name="service.cpe23" value="cpe:/a:vmware:zimbra_desktop:{service.version}"/>

  - Software, other than Ruby Recog, that leverage the XML directly will need
    to support interpolating the values in order to fully utilize this
    capability.
  - Future changes to enhance this capability and make creating interpolated
    results easier are expected in the near future.
  - See PR #172 for more details

* Misc fingerprint updates and changes, some of which were to support CPE
  changes.

  - Changed the use of 'F5 Labs' to 'F5' in multiple files #171
  - Change certain Cisco PIX fingerprints from 'service.' to 'os.' #170

v.2.1.20 - 2018.06.27

* Compatibility: Adjustments to the regex of multiple fingerprints to remove
  negative lookaheads and other contructs that Golang doesn't support. #162

v.2.1.19 - 2018.04.16

* Improved coverage: xml/smtp_banners.xml #160

  - Note: Due to effort to cleanup description lines (remove duplicates,
    remove multilines, provide context, standardize format) almost every value
    for <description> has changed. This will impact the value returned as
    matched with tools such as DAP.
  - Project Sonar SMTP survey data was used to enhance and improve the
    coverage. Full details and metrics can be found in #160
  - Improved the accuracy and/or flexibility of multiple fingerprints.
  - Changed ALL instances of flags="REG_ICASE" to an inline flag (?i:) in
    order to make the regex compatible with more languages.
  - Implemented fingerprint examples for those fingerprints where examples
    could be found.
  - This sometimes resulted in removing fingerprints that were actually
    duplicates or trivially different.
  - Reworked description values so as to remove examples and ensure that this
    field is unique within the file as the value of description serves as an
    identifier when processing fingerprints. Multiline descriptions were
    reduced to single line where possible. Many descriptions were modified.
  - Fixed multiple instances where captures where under/over capturing. For
    example, some fingerprints would have captured the examples but the
    examples were missing leading or ending spaces. Other fingerprints were
    over-broad in what they would capture leading to fall positives or
    misidentification.
  - Fixed multiple instances where the portion of the version banner that was
    captured was different between two products in the same family.
  - Removed various real and example hostnames from examples and standardized
    on 'foo.bar'
  - Corrected system.time.format so as to match timestamp provided by service
  - Reworked date regex for multiple matches to remove inadvertent requirement
    for two digit day value when the banner included a single digit day.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ruby-recog/Makefile \
    pkgsrc/net/ruby-recog/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ruby-recog/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ruby-recog/Makefile
diff -u pkgsrc/net/ruby-recog/Makefile:1.2 pkgsrc/net/ruby-recog/Makefile:1.3
--- pkgsrc/net/ruby-recog/Makefile:1.2  Wed Mar 21 11:40:16 2018
+++ pkgsrc/net/ruby-recog/Makefile      Sun Sep 23 15:57:32 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/03/21 11:40:16 taca Exp $
+# $NetBSD: Makefile,v 1.3 2018/09/23 15:57:32 taca Exp $
 
-DISTNAME=      recog-2.1.18
+DISTNAME=      recog-2.1.23
 CATEGORIES=    net
 
 MAINTAINER=    minskim%NetBSD.org@localhost
@@ -9,8 +9,12 @@ COMMENT=       Framework to send network probe
 LICENSE=       2-clause-bsd
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-nokogiri-[0-9]*:../../textproc/ruby-nokogiri
+DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
 RUBYGEM_OPTIONS+=      --format-executable
 
+REPLACE_PYTHON=        update_cpes.py
+
 .include "../../lang/ruby/gem.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ruby-recog/distinfo
diff -u pkgsrc/net/ruby-recog/distinfo:1.2 pkgsrc/net/ruby-recog/distinfo:1.3
--- pkgsrc/net/ruby-recog/distinfo:1.2  Wed Mar 21 11:40:16 2018
+++ pkgsrc/net/ruby-recog/distinfo      Sun Sep 23 15:57:32 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/03/21 11:40:16 taca Exp $
+$NetBSD: distinfo,v 1.3 2018/09/23 15:57:32 taca Exp $
 
-SHA1 (recog-2.1.18.gem) = afe271c5a7f718f6da4d8a32ca66a16c1985c816
-RMD160 (recog-2.1.18.gem) = 10ff36834cbac769e2f8f19caeaace282b4630cf
-SHA512 (recog-2.1.18.gem) = bbae08a3076626bbe5a44ee06bedb2660b0f790d0fff1f914bc81825496d9a6c1d846adac04bc6be7f7f3a2b4e075c6fe9d33511435b37ca9211fcd0010b9dd9
-Size (recog-2.1.18.gem) = 226304 bytes
+SHA1 (recog-2.1.23.gem) = d884b20061d93daa9573138029ac87c160be25a7
+RMD160 (recog-2.1.23.gem) = 0cc8a2e48f86579480fadbc4090547c158876731
+SHA512 (recog-2.1.23.gem) = a0600cf32146970b56459e77f7063057a44e005dc7669cbc1320252ba547cbeff13143b3f846c0c804cb3567afa0a92085a4cc79b342492e243d5a7832e45c20
+Size (recog-2.1.23.gem) = 222720 bytes

Index: pkgsrc/net/ruby-recog/PLIST
diff -u pkgsrc/net/ruby-recog/PLIST:1.1 pkgsrc/net/ruby-recog/PLIST:1.2
--- pkgsrc/net/ruby-recog/PLIST:1.1     Sat Sep 16 21:45:00 2017
+++ pkgsrc/net/ruby-recog/PLIST Sun Sep 23 15:57:32 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/16 21:45:00 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/09/23 15:57:32 taca Exp $
 bin/recog_export${RUBY_SUFFIX}
 bin/recog_match${RUBY_SUFFIX}
 bin/recog_verify${RUBY_SUFFIX}
@@ -16,6 +16,7 @@ ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/bin/recog_export
 ${GEM_LIBDIR}/bin/recog_match
 ${GEM_LIBDIR}/bin/recog_verify
+${GEM_LIBDIR}/cpe-remap.yaml
 ${GEM_LIBDIR}/features/data/failing_banners_fingerprints.xml
 ${GEM_LIBDIR}/features/data/matching_banners_fingerprints.xml
 ${GEM_LIBDIR}/features/data/multiple_banners_fingerprints.xml
@@ -60,6 +61,8 @@ ${GEM_LIBDIR}/spec/lib/recog/match_repor
 ${GEM_LIBDIR}/spec/lib/recog/nizer_spec.rb
 ${GEM_LIBDIR}/spec/lib/recog/verify_reporter_spec.rb
 ${GEM_LIBDIR}/spec/spec_helper.rb
+${GEM_LIBDIR}/update_cpes.py
+${GEM_LIBDIR}/xml/apache_modules.xml
 ${GEM_LIBDIR}/xml/apache_os.xml
 ${GEM_LIBDIR}/xml/architecture.xml
 ${GEM_LIBDIR}/xml/dns_versionbind.xml
@@ -100,6 +103,7 @@ ${GEM_LIBDIR}/xml/smtp_vrfy.xml
 ${GEM_LIBDIR}/xml/snmp_sysdescr.xml
 ${GEM_LIBDIR}/xml/snmp_sysobjid.xml
 ${GEM_LIBDIR}/xml/ssh_banners.xml
+${GEM_LIBDIR}/xml/telnet_banners.xml
 ${GEM_LIBDIR}/xml/upnp_banners.xml
 ${GEM_LIBDIR}/xml/x11_banners.xml
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec