From owner-dev-commits-ports-main@freebsd.org Tue May 11 12:54:29 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5B2B63710A; Tue, 11 May 2021 12:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FfdD54m1Qz3s9m; Tue, 11 May 2021 12:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92E6F18A07; Tue, 11 May 2021 12:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14BCsTfE075079; Tue, 11 May 2021 12:54:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14BCsT9t075078; Tue, 11 May 2021 12:54:29 GMT (envelope-from git) Date: Tue, 11 May 2021 12:54:29 GMT Message-Id: <202105111254.14BCsT9t075078@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: c8fe7cd180ef - main - devel/fossology-nomos-standalone: update to 3.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8fe7cd180efae46753e602c4e86f302631bcf3b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 12:54:30 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8fe7cd180efae46753e602c4e86f302631bcf3b commit c8fe7cd180efae46753e602c4e86f302631bcf3b Author: Dmitry Marakasov AuthorDate: 2021-05-11 11:22:49 +0000 Commit: Dmitry Marakasov CommitDate: 2021-05-11 12:52:28 +0000 devel/fossology-nomos-standalone: update to 3.10.0 --- devel/fossology-nomos-standalone/Makefile | 5 +---- devel/fossology-nomos-standalone/distinfo | 6 +++--- .../files/patch-src_nomos_agent_nomos.c | 15 +++++++++++++++ .../files/patch-src_nomos_agent_nomos.h | 18 ++++++++++++++++++ .../files/patch-src_nomos_agent_nomos__regex.h | 11 +++++++++++ .../files/patch-src_nomos_agent_nomos__utils.c | 12 ++++++++++++ .../files/patch-src_nomos_agent_nomos__utils.h | 13 +++++++++++++ 7 files changed, 73 insertions(+), 7 deletions(-) diff --git a/devel/fossology-nomos-standalone/Makefile b/devel/fossology-nomos-standalone/Makefile index c20471ea9ac3..eab6ce9b2c6e 100644 --- a/devel/fossology-nomos-standalone/Makefile +++ b/devel/fossology-nomos-standalone/Makefile @@ -1,5 +1,5 @@ PORTNAME= fossology -PORTVERSION= 3.9.0 +PORTVERSION= 3.10.0 CATEGORIES= devel PKGNAMESUFFIX= -nomos-standalone @@ -9,9 +9,6 @@ COMMENT= Standalone Nomos license scanner from fossology project LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_13= ld: error: duplicate symbol: dbErrString -BROKEN_FreeBSD_14= ld: error: duplicate symbol: dbErrString - BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libjson-c.so:devel/json-c diff --git a/devel/fossology-nomos-standalone/distinfo b/devel/fossology-nomos-standalone/distinfo index 34ee80cd2578..54ca4dadbb2f 100644 --- a/devel/fossology-nomos-standalone/distinfo +++ b/devel/fossology-nomos-standalone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607467946 -SHA256 (fossology-fossology-3.9.0_GH0.tar.gz) = cecb449e710b3b331fa2a5adf83648da6b94fdd12c97d45677694cb2295d0921 -SIZE (fossology-fossology-3.9.0_GH0.tar.gz) = 20751003 +TIMESTAMP = 1620670653 +SHA256 (fossology-fossology-3.10.0_GH0.tar.gz) = eb56e1c2cf426c817f3039308b9886dfdb3d4060b92e14cd29e5505093f066de +SIZE (fossology-fossology-3.10.0_GH0.tar.gz) = 20835469 diff --git a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.c b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.c new file mode 100644 index 000000000000..5ce6251692e9 --- /dev/null +++ b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.c @@ -0,0 +1,15 @@ +--- src/nomos/agent/nomos.c.orig 2021-05-07 09:49:07 UTC ++++ src/nomos/agent/nomos.c +@@ -33,6 +33,12 @@ + #include "nomos.h" + #include "nomos_utils.h" + ++char debugStr[myBUFSIZ]; ++char dbErrString[myBUFSIZ]; ++char saveLics[myBUFSIZ]; ++ ++size_t hashEntries; ++ + extern licText_t licText[]; /* Defined in _autodata.c */ + struct globals gl; + struct curScan cur; diff --git a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.h b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.h new file mode 100644 index 000000000000..c7c0564d2b5f --- /dev/null +++ b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.h @@ -0,0 +1,18 @@ +--- src/nomos/agent/nomos.h.orig 2021-05-07 09:49:07 UTC ++++ src/nomos/agent/nomos.h +@@ -156,11 +156,11 @@ + #define OPTS_JSON_OUTPUT 0x20 + #define OPTS_SCANNING_DIRECTORY 0x40 + +-char debugStr[myBUFSIZ]; ///< Debug string +-char dbErrString[myBUFSIZ]; ///< DB error string +-char saveLics[myBUFSIZ]; ///< License string ++extern char debugStr[myBUFSIZ]; ///< Debug string ++extern char dbErrString[myBUFSIZ]; ///< DB error string ++extern char saveLics[myBUFSIZ]; ///< License string + +-size_t hashEntries; ///< Hash entries ++extern size_t hashEntries; ///< Hash entries + + /** + Flags for program control diff --git a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__regex.h b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__regex.h new file mode 100644 index 000000000000..37cfd3f8475a --- /dev/null +++ b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__regex.h @@ -0,0 +1,11 @@ +--- src/nomos/agent/nomos_regex.h.orig 2021-05-07 09:49:07 UTC ++++ src/nomos/agent/nomos_regex.h +@@ -25,8 +25,6 @@ + #include "util.h" + #include "_autodefs.h" + +-regex_t regc[NFOOTPRINTS]; +- + void regexError(int ret, regex_t *regc, char *regex); + int endsIn(char *s, char *suffix); + int lineInFile(char *pathname, char *regex); diff --git a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.c b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.c new file mode 100644 index 000000000000..f4928e8dc0df --- /dev/null +++ b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.c @@ -0,0 +1,12 @@ +--- src/nomos/agent/nomos_utils.c.orig 2021-05-07 09:49:07 UTC ++++ src/nomos/agent/nomos_utils.c +@@ -23,6 +23,9 @@ + #include "nomos_utils.h" + #include "nomos.h" + ++sem_t* mutexJson; ///< Mutex to handle JSON writes ++gboolean* printcomma; ///< True to print comma while printing JSON object ++ + #define FUNCTION + + /** diff --git a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.h b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.h new file mode 100644 index 000000000000..593f57533d1f --- /dev/null +++ b/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.h @@ -0,0 +1,13 @@ +--- src/nomos/agent/nomos_utils.h.orig 2021-05-07 09:49:07 UTC ++++ src/nomos/agent/nomos_utils.h +@@ -35,8 +35,8 @@ + #define LICENSE_REF_TABLE "ONLY license_ref" + #define SEM_DEFAULT_VALUE 4 + +-sem_t* mutexJson; ///< Mutex to handle JSON writes +-gboolean* printcomma; ///< True to print comma while printing JSON object ++extern sem_t* mutexJson; ///< Mutex to handle JSON writes ++extern gboolean* printcomma; ///< True to print comma while printing JSON object + + + /** shortname cache very simple nonresizing hash table */