Date: Wed, 18 Aug 2021 13:22:29 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5602ff61ef4f - main - devel/fossology-nomos-standalone: update to 3.11.0 Message-ID: <202108181322.17IDMTB3070347@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=5602ff61ef4f1418452696d16c12871eff697b1d commit 5602ff61ef4f1418452696d16c12871eff697b1d Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-08-17 20:01:08 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2021-08-18 13:17:18 +0000 devel/fossology-nomos-standalone: update to 3.11.0 --- devel/fossology-nomos-standalone/Makefile | 3 +-- 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, 4 insertions(+), 74 deletions(-) diff --git a/devel/fossology-nomos-standalone/Makefile b/devel/fossology-nomos-standalone/Makefile index 549a53d46637..280780289684 100644 --- a/devel/fossology-nomos-standalone/Makefile +++ b/devel/fossology-nomos-standalone/Makefile @@ -1,6 +1,5 @@ PORTNAME= fossology -PORTVERSION= 3.10.0 -PORTREVISION= 1 +PORTVERSION= 3.11.0 CATEGORIES= devel PKGNAMESUFFIX= -nomos-standalone diff --git a/devel/fossology-nomos-standalone/distinfo b/devel/fossology-nomos-standalone/distinfo index 54ca4dadbb2f..ee687d68a5b7 100644 --- a/devel/fossology-nomos-standalone/distinfo +++ b/devel/fossology-nomos-standalone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620670653 -SHA256 (fossology-fossology-3.10.0_GH0.tar.gz) = eb56e1c2cf426c817f3039308b9886dfdb3d4060b92e14cd29e5505093f066de -SIZE (fossology-fossology-3.10.0_GH0.tar.gz) = 20835469 +TIMESTAMP = 1629215142 +SHA256 (fossology-fossology-3.11.0_GH0.tar.gz) = f894abc51389da657b22ef45518261955fe4c16a1118d75883c35c7c5f96e7e9 +SIZE (fossology-fossology-3.11.0_GH0.tar.gz) = 22268025 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 deleted file mode 100644 index 5ce6251692e9..000000000000 --- a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.c +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index c7c0564d2b5f..000000000000 --- a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos.h +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 37cfd3f8475a..000000000000 --- a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__regex.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index f4928e8dc0df..000000000000 --- a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 593f57533d1f..000000000000 --- a/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_nomos__utils.h +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108181322.17IDMTB3070347>