开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 9

_service:tar_scm:nmap.spec Changed

_service:tar_scm:backport-remove-nse_pcrelib-from-build.patch Changed

@@ -6,35 +6,34 @@
 Conflict: NA
 Reference: https://github.com/nmap/nmap/commit/d131a096a869195be36ef7d4fa36739373346cb2
 ---
- Makefile.in          | 6 +++---
- mswin32/nmap.vcxproj | 2 --
- nse_main.cc          | 2 --
- nse_main.lua         | 2 +-
- nselib/unittest.lua  | 1 -
- 5 files changed, 4 insertions(+), 9 deletions(-)
+ Makefile.in         | 6 +++---
+ nse_main.cc         | 2 --
+ nse_main.lua        | 2 +-
+ nselib/unittest.lua | 1 -
+ 4 files changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index ccfceda..8c19056 100644
+index 2b13e86..a924301 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -88,9 +88,9 @@ UNINSTALLNDIFF=@UNINSTALLNDIFF@
  UNINSTALLNPING=@UNINSTALLNPING@
  
  ifneq (@NOLUA@,yes)
--NSE_SRC=nse_main.cc nse_utility.cc nse_nsock.cc nse_dnet.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_lpeg.cc
--NSE_HDRS=nse_main.h nse_utility.h nse_nsock.h nse_dnet.h nse_fs.h nse_nmaplib.h nse_debug.h nse_pcrelib.h nse_lpeg.h
--NSE_OBJS=nse_main.o nse_utility.o nse_nsock.o nse_dnet.o nse_fs.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_lpeg.o
-+NSE_SRC=nse_main.cc nse_utility.cc nse_nsock.cc nse_dnet.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_lpeg.cc
-+NSE_HDRS=nse_main.h nse_utility.h nse_nsock.h nse_dnet.h nse_fs.h nse_nmaplib.h nse_debug.h nse_lpeg.h
-+NSE_OBJS=nse_main.o nse_utility.o nse_nsock.o nse_dnet.o nse_fs.o nse_nmaplib.o nse_debug.o nse_lpeg.o
+-NSE_SRC=nse_main.cc nse_utility.cc nse_nsock.cc nse_db.cc nse_dnet.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_lpeg.cc
+-NSE_HDRS=nse_main.h nse_utility.h nse_nsock.h nse_db.h nse_dnet.h nse_fs.h nse_nmaplib.h nse_debug.h nse_pcrelib.h nse_lpeg.h
+-NSE_OBJS=nse_main.o nse_utility.o nse_nsock.o nse_db.o nse_dnet.o nse_fs.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_lpeg.o
++NSE_SRC=nse_main.cc nse_utility.cc nse_nsock.cc nse_db.cc nse_dnet.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_lpeg.cc
++NSE_HDRS=nse_main.h nse_utility.h nse_nsock.h nse_db.h nse_dnet.h nse_fs.h nse_nmaplib.h nse_debug.h nse_lpeg.h
++NSE_OBJS=nse_main.o nse_utility.o nse_nsock.o nse_db.o nse_dnet.o nse_fs.o nse_nmaplib.o nse_debug.o nse_lpeg.o
  ifneq (@OPENSSL_LIBS@,)
  NSE_SRC+=nse_openssl.cc nse_ssl_cert.cc
  NSE_HDRS+=nse_openssl.h nse_ssl_cert.h
 diff --git a/nse_main.cc b/nse_main.cc
-index 110291f..b946c7c 100644
+index d5d460e..2382688 100644
 --- a/nse_main.cc
 +++ b/nse_main.cc
-@@ -14,7 +14,6 @@
+@@ -15,7 +15,6 @@
  #include "nse_fs.h"
  #include "nse_nsock.h"
  #include "nse_nmaplib.h"
@@ -42,19 +41,19 @@
  #include "nse_openssl.h"
  #include "nse_debug.h"
  #include "nse_lpeg.h"
-@@ -557,7 +556,6 @@ static int panic (lua_State *L)
+@@ -562,7 +561,6 @@ static int panic (lua_State *L)
  static void set_nmap_libraries (lua_State *L)
  {
    static const luaL_Reg libs = {
 -    {NSE_PCRELIBNAME, luaopen_pcrelib},
      {NSE_NMAPLIBNAME, luaopen_nmap},
+     {NSE_DBLIBNAME, luaopen_db},
      {LFSLIBNAME, luaopen_lfs},
-     {LPEGLIBNAME, luaopen_lpeg},
 diff --git a/nse_main.lua b/nse_main.lua
-index af5f611..7fba46e 100644
+index 24c9d2a..596aba9 100644
 --- a/nse_main.lua
 +++ b/nse_main.lua
-@@ -285,7 +285,7 @@ local REQUIRE_ERROR = {};
+@@ -292,7 +292,7 @@ local REQUIRE_ERROR = {};
  rawset(stdnse, "silent_require", function (...)
    local status, mod = pcall(require, ...);
    if not status then
@@ -64,7 +63,7 @@
    else
      return mod;
 diff --git a/nselib/unittest.lua b/nselib/unittest.lua
-index ac90c31..d780b85 100644
+index b22de05..aaf5fce 100644
 --- a/nselib/unittest.lua
 +++ b/nselib/unittest.lua
 @@ -107,7 +107,6 @@ local libs = {
@@ -75,6 +74,3 @@
  "pgsql",
  "pop3",
  "pppoe",
--- 
-2.33.0
-

_service:tar_scm:backport-upgrade-libpcre-to-PCRE2-10.42.patch Changed

@@ -24,21 +24,21 @@
  delete mode 100644 nselib/pcre.luadoc
 
 diff --git a/checklibs.sh b/checklibs.sh
-index ff58326..6483358 100644
+index 2048e2a..26e9d8a 100644
 --- a/checklibs.sh
 +++ b/checklibs.sh
 @@ -11,13 +11,13 @@ trim_version() {
  }
  
  check_libpcre() {
--    PCRE_SOURCE="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"
+-    PCRE_SOURCE="https://sourceforge.net/projects/pcre/files/latest/download"
 +    PCRE_SOURCE="https://github.com/PCRE2Project/pcre2/releases/latest"
      PCRE_MAJOR=""
      PCRE_MINOR=""
 -    eval $(grep '^PCRE_MAJOR=' $NDIR/libpcre/configure)
 -    eval $(grep '^PCRE_MINOR=' $NDIR/libpcre/configure)
 -    PCRE_VERSION="$PCRE_MAJOR.$PCRE_MINOR"
--    PCRE_LATEST=$(curl -ls $PCRE_SOURCE | perl -lne 'if(/pcre-(\d+.\d+).tar.gz$/){print $1}' | newest)
+-    PCRE_LATEST=$(curl -s -I $PCRE_SOURCE | perl -lne 'if(/pcre-(\d+.\d+).zip/){print $1}' | newest)
 +    eval $(grep '^PCRE2_MAJOR=' $NDIR/libpcre/configure)
 +    eval $(grep '^PCRE2_MINOR=' $NDIR/libpcre/configure)
 +    PCRE_VERSION="$PCRE2_MAJOR.$PCRE2_MINOR"
@@ -47,7 +47,7 @@
          echo "Newer version of libpcre available"
          echo "  Current:" $PCRE_VERSION
 diff --git a/configure b/configure
-index f8e1358..26cb1f6 100755
+index d1d2f19..12764ee 100755
 --- a/configure
 +++ b/configure
 @@ -1451,8 +1451,8 @@ Optional Packages:
@@ -61,7 +61,7 @@
    --with-libpcre=included Always use the version included with Nmap
    --with-libz=DIR         Use specific copy of libz
    --with-libz=included    Always use version included with Nmap
-@@ -6421,58 +6421,19 @@ fi
+@@ -6437,58 +6437,19 @@ fi
  
  # If they didn't specify it, we try to find it
  if test $have_pcre != yes -a $requested_included_pcre != yes ; then
@@ -128,7 +128,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -6482,35 +6443,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6498,35 +6459,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -171,7 +171,7 @@
  fi
  
  
-@@ -6520,8 +6476,8 @@ fi
+@@ -6536,8 +6492,8 @@ fi
  if test $have_pcre != yes ; then
    subdirs="$subdirs libpcre"
  
@@ -182,7 +182,7 @@
    PCRE_BUILD="build-pcre"
    PCRE_CLEAN="clean-pcre"
    PCRE_DIST_CLEAN="distclean-pcre"
-@@ -6530,19 +6486,19 @@ $as_echo "#define PCRE_INCLUDED 1" >>confdefs.h
+@@ -6546,19 +6502,19 @@ $as_echo "#define PCRE_INCLUDED 1" >>confdefs.h
  
  else
  # We only need to check for and use this if we are NOT using included pcre
@@ -208,10 +208,10 @@
    PCRE_CLEAN=""
    PCRE_DIST_CLEAN=""
 diff --git a/configure.ac b/configure.ac
-index ac123af..6e695f3 100644
+index 7835d9b..c25fb04 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -507,7 +507,7 @@ LIBPCREDIR=libpcre
+@@ -510,7 +510,7 @@ LIBPCREDIR=libpcre
  
  # First we test whether they specified libpcre explicitly
  AC_ARG_WITH(libpcre,
@@ -220,7 +220,7 @@
  AC_HELP_STRING(--with-libpcre=included, Always use the version included with Nmap),
    case "$with_libpcre" in
    yes)
-@@ -525,27 +525,28 @@ AC_HELP_STRING(--with-libpcre=included, Always use the version included with
+@@ -528,27 +528,28 @@ AC_HELP_STRING(--with-libpcre=included, Always use the version included with
  
  # If they didn't specify it, we try to find it
  if test $have_pcre != yes -a $requested_included_pcre != yes ; then
@@ -260,10 +260,10 @@
    PCRE_CLEAN=""
    PCRE_DIST_CLEAN=""
 diff --git a/nmap.cc b/nmap.cc
-index f1b8bf9..62984a5 100644
+index e4c65e7..96f0230 100644
 --- a/nmap.cc
 +++ b/nmap.cc
-@@ -2764,10 +2764,12 @@ static void display_nmap_version() {
+@@ -2803,10 +2803,12 @@ static void display_nmap_version() {
    without.push_back("libz");
  #endif
  
@@ -279,10 +279,10 @@
  
  #ifdef WIN32
 diff --git a/nmap_config.h.in b/nmap_config.h.in
-index c9ac750..10fdda9 100644
+index 67dbeda..1dae65a 100644
 --- a/nmap_config.h.in
 +++ b/nmap_config.h.in
-@@ -105,8 +105,6 @@
+@@ -103,8 +103,6 @@
  
  #undef HAVE_TERMIOS_H
  
@@ -292,10 +292,10 @@
  
  #undef IN_ADDR_DEEPSTRUCT
 diff --git a/nping/nping_config.h.in b/nping/nping_config.h.in
-index 9d4ccb4..2e4377f 100644
+index 98638cb..9b6f971 100644
 --- a/nping/nping_config.h.in
 +++ b/nping/nping_config.h.in
-@@ -103,8 +103,6 @@
+@@ -101,8 +101,6 @@
  
  #undef HAVE_TERMIOS_H
  
@@ -867,10 +867,10 @@
 --- local n = regex:gmatch("string to be searched", match)
 -function pcre_obj:gmatch(string, func, n, ef)
 diff --git a/service_scan.cc b/service_scan.cc
-index 66e0d92..8b57d9a 100644
+index cf13d8b..473b3a6 100644
 --- a/service_scan.cc
 +++ b/service_scan.cc
-@@ -247,7 +247,7 @@ ServiceProbeMatch::ServiceProbeMatch() {
+@@ -250,7 +250,7 @@ ServiceProbeMatch::ServiceProbeMatch() {
    product_template = version_template = info_template = NULL;
    hostname_template = ostype_template = devicetype_template = NULL;
    regex_compiled = NULL;
@@ -879,10 +879,10 @@
    isInitialized = false;
    matchops_ignorecase = false;
    matchops_dotall = false;
-@@ -268,8 +268,21 @@ ServiceProbeMatch::~ServiceProbeMatch() {
+@@ -269,8 +269,21 @@ ServiceProbeMatch::~ServiceProbeMatch() {
+   if (devicetype_template) free(devicetype_template);
    for (it = cpe_templates.begin(); it != cpe_templates.end(); it++)
      free(*it);
-   matchstrlen = 0;
 -  if (regex_compiled) pcre_free(regex_compiled);
 -  if (regex_extra) pcre_free(regex_extra);
 +  if (regex_compiled)
@@ -901,12 +901,12 @@
 +    match_context=NULL;
 +  }
    isInitialized = false;
-   matchops_anchor = -1;
  }
-@@ -347,9 +360,9 @@ static bool next_template(const char **matchtext, char **modestr, char **tmplt,
- void ServiceProbeMatch::InitMatch(const char *matchtext, int lineno) {
-   const char *p;
-   char *modestr, *tmptemplate, *flags;
+ 
+@@ -350,9 +363,9 @@ void ServiceProbeMatch::InitMatch(const char *matchtext, int lineno) {
+   char *tmptemplate;
+   char modestr4;
+   char flags4;
 -  int pcre_compile_ops = 0;
 -  const char *pcre_errptr = NULL;
 -  int pcre_erroffset = 0;
@@ -916,7 +916,7 @@
    char **curr_tmp = NULL;
  
    if (isInitialized) fatal("Sorry ... %s does not yet support reinitializion", __func__);
-@@ -405,38 +418,40 @@ void ServiceProbeMatch::InitMatch(const char *matchtext, int lineno) {
+@@ -405,41 +418,42 @@ void ServiceProbeMatch::InitMatch(const char *matchtext, int lineno) {
  
    // Next we compile and study the regular expression to match
    if (matchops_ignorecase)
@@ -935,7 +935,7 @@
    if (regex_compiled == NULL)
 -    fatal("%s: illegal regexp on line %d of nmap-service-probes (at regexp offset %d): %s\n", __func__, lineno, pcre_erroffset, pcre_errptr);
 +    fatal("%s: illegal regexp on line %d of nmap-service-probes (at regexp offset %ld): %d\n", __func__, lineno, pcre2_erroffset, pcre2_errcode);
-
+ 
 -  // Now study the regexp for greater efficiency
 -  regex_extra = pcre_study(regex_compiled, 0
 -#ifdef PCRE_STUDY_EXTRA_NEEDED
@@ -977,16 +977,18 @@
 +  pcre2_set_recursion_limit(match_context, 10000);
  #endif
  
-   free(modestr);
-@@ -502,7 +517,6 @@ const struct MatchDetails *ServiceProbeMatch::testMatch(const u8 *buf, int bufle
+-

_service:tar_scm:nmap-7.92.tar.bz2 -> _service:tar_scm:nmap-7.94.tar.bz2 Changed