diff --git a/0001-remove-console.log.patch b/0001-remove-console.log.patch new file mode 100644 index 0000000000000000000000000000000000000000..2893c4c30b0a931d785c0620b7ece1b60afc0dba --- /dev/null +++ b/0001-remove-console.log.patch @@ -0,0 +1,30 @@ +From d5c9cc2a176fabf8c5992c00b6ce7a41964e4321 Mon Sep 17 00:00:00 2001 +From: Nate Smith +Date: Wed, 25 Sep 2019 14:53:46 -0700 +Subject: [PATCH] remove console.log + +--- + lib/App.server.js | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/App.server.js b/lib/App.server.js +index 73cba07..315ce0b 100644 +--- a/lib/App.server.js ++++ b/lib/App.server.js +@@ -287,13 +287,12 @@ function watchOnce(filenames, callback) { + var watcher = chokidar.watch(filenames); + var closed = false; + watcher.on('change', function() { +- console.log('CHANGE') + if (closed) return; + closed = true; + // HACK: chokidar 3.1.1 crashes when you synchronously call close + // in the change event. Delaying appears to prevent the crash + process.nextTick(function() { +- watcher.close() ++ watcher.close(); + }); + callback(); + }); +-- + diff --git a/derby.spec b/derby.spec index dedde62f6356017ed7e2e200f24b54a5d9e964ed..f39edfa59baad4f2f11359d610edf625a163223f 100644 --- a/derby.spec +++ b/derby.spec @@ -1,6 +1,6 @@ Name: derby Version: 10.14.2.0 -Release: 1 +Release: 2 Summary: Relational database implemented entirely in Java License: ASL 2.0 URL: http://db.apache.org/derby/ @@ -10,6 +10,7 @@ Source2: derby.service Patch1: derby-javacc.patch Patch2: derby-lucene.patch Patch3: CVE-2022-46337.patch +Patch4: 0001-remove-console.log.patch BuildRequires: apache-parent javapackages-local glassfish-servlet-api jakarta-oro javacc BuildRequires: json_simple lucene4 junit ant systemd @@ -39,6 +40,7 @@ pushd db-derby-%{version}-src %patch1 -p0 %patch2 -p0 %patch3 -p1 +%patch4 -p1 sed -i -e '/Class-Path/d' build.xml sed -e 's/initjars,set-doclint,install_packagelists/initjars,set-doclint/' \ -e '/ - 10.14.2.0-2 +- remove console.log + * Fri Dec 1 2023 dillon chen - 10.14.2.0-1 - Update to 10.14.2.0 for fix CVE-2023-48284(patch from debian)