feat(atarashi): Add Atarashi to FOSSology

.gitignore

@@ -27,6 +27,8 @@ install/defconf/Db.conf
 install/defconf/fossology.conf
 install/fo-postinstall
 src/adj2nest/agent/adj2nest
+src/atarashi/agent/atarashiWrapper
+src/atarashi/agent_tests/Functional/atarashiWrapper
 src/buckets/agent/buckets
 src/cli/cp2foss
 src/cli/cp2foss.1
@@ -48,6 +50,7 @@ src/cli/testupdate2.php
 src/cli/fo_import_licenses
 src/cli/fo_usergroup
 src/cli/fossupload_status
+src/cli/exportLicenseRefUsingSPDX
 src/copyright/agent/copyright
 src/copyright/agent/keyword
 src/copyright/agent_tests/Functional/copyright
@@ -105,6 +108,9 @@ src/nomos/agent_tests/Functional/nomos-Xunit.xml
 src/nomos/agent_tests/Functional/nomos-regression-test.html
 src/nomos/agent_tests/Functional/report.d
 src/nomos/agent_tests/Unit/test_nomos
+src/ojo/agent/ojo
+src/ojo/agent_tests/Functional/ojo
+src/ojo/agent_tests/Unit/test_ojo
 src/pkgagent/agent/pkgagent
 src/scheduler/agent/defconf/init.d/fossology
 src/scheduler/agent/fo_cli

.travis.yml

@@ -22,6 +22,8 @@ addons:
       - genisoimage
       - libboost-program-options-dev
       - libboost-regex-dev
+      - libboost-system-dev
+      - libboost-filesystem-dev
       - libglib2.0-dev
       - libcppunit-dev
       - libcunit1-dev

Dockerfile

@@ -29,6 +29,7 @@ COPY ./src/copyright/mod_deps ./src/copyright/
 COPY ./src/delagent/mod_deps ./src/delagent/
 COPY ./src/mimetype/mod_deps ./src/mimetype/
 COPY ./src/nomos/mod_deps ./src/nomos/
+COPY ./src/ojo/mod_deps ./src/ojo/
 COPY ./src/pkgagent/mod_deps ./src/pkgagent/
 COPY ./src/scheduler/mod_deps ./src/scheduler/
 COPY ./src/ununpack/mod_deps ./src/ununpack/

Vagrantfile

@@ -57,6 +57,8 @@ sudo a2enconf fossology.conf
 sudo /fossology/install/scripts/php-conf-fix.sh --overwrite
 
 sudo /etc/init.d/apache2 restart
+
+sudo systemctl daemon-reload
 SCRIPT
 
 Vagrant.configure("2") do |config|

debian/changelog

@@ -1,3 +1,17 @@
+fossology (3.6.0~rc2-1) unstable; urgency=low
+
+  * New upstream release
+  * https://github.com/fossology/fossology/releases/tag/3.6.0-rc2 for details
+
+ -- Anupam Ghosh <anupam.ghosh@siemens.com>  Sat, 24 Aug 2019 14:09:58 +0530
+
+fossology (3.6.0~rc1-1) unstable; urgency=low
+
+  * New upstream release
+  * https://github.com/fossology/fossology/releases/tag/3.6.0-rc1 for details
+
+ -- Michael C. Jaeger <michael.c.jaeger@siemens.com>  Mon, 12 Aug 2019 12:00:00 +0100
+
 fossology (3.5.0-1) unstable; urgency=low
 
   * New upstream release
@@ -25,7 +39,7 @@ fossology (3.4.0-1) unstable; urgency=low
   * https://github.com/fossology/fossology/releases/tag/3.4.0 for details
 
  -- Michael C. Jaeger <michael.c.jaeger@siemens.com>  Sun, 29 Nov 2018 12:00:00 +0100
- 
+
 fossology (3.4.0~rc2-1) unstable; urgency=low
 
   * New upstream release
@@ -112,7 +126,7 @@ fossology (2.5.0-1) unstable; urgency=low
   * New upstream release
 
  -- larainema <larainema@localhost.localdomain>  Tue, 08 Apr 2014 15:35:55 +0800
- 
+
 fossology (2.4.0-1) unstable; urgency=low
 
   * New upstream release
@@ -123,38 +137,38 @@ fossology (2.3.0-1) unstable; urgency=low
 
   * New upstream release
 
- -- larainema <larainema@localhost.localdomain>  Web, 25 Sep 2013 15:35:55 +0800
+ -- larainema <larainema@localhost.localdomain>  Wed, 25 Sep 2013 15:35:55 +0800
 
 fossology (2.2.0-1) unstable; urgency=low
 
   * New upstream release
 
  -- larainema <larainema@localhost.localdomain>  Fri, 28 Jun 2013 15:35:55 +0800
- 
+
 fossology (2.1.0-1) unstable; urgency=low
 
   * New upstream release
 
- -- madong <madong@bl480c1>  Thu, 01 Nov 2012 15:35:55 +0800
+ -- madong <madong@bl480c1.localdomain>  Thu, 01 Nov 2012 15:35:55 +0800
 
 fossology (2.0.0-1) unstable; urgency=low
 
   * New upstream release
   * New package structure
 
- -- madong <madong@bl480c1>  Fri, 08 Jun 2012 15:35:55 +0800
+ -- madong <madong@bl480c1.localdomain>  Fri, 08 Jun 2012 15:35:55 +0800
 
 fossology (2.0.0~rc3-1) unstable; urgency=low
 
   * Release candidate 3 for v2.0
 
- -- madong <madong@bl480c-1>  Fri, 01 Jun 2012 15:22:47 +0800
+ -- madong <madong@bl480c-1.localdomain>  Fri, 01 Jun 2012 15:22:47 +0800
 
 fossology (2.0.0~rc1-1) unstable; urgency=low
 
   * The first release candidate for v2.0
 
- -- madong <madong@bl480c-1>  Wed, 02 May 2012 15:22:47 +0800
+ -- madong <madong@bl480c-1.localdomain>  Wed, 02 May 2012 15:22:47 +0800
 
 fossology (1.4.1-1) unstable; urgency=low
 
@@ -172,7 +186,7 @@ fossology (1.4.0-1) unstable; urgency=low
   * authentication using Siteminder
   * Multiple file upload from URL
   * Bugs fix
-  
+
  -- Mark Donohoe <markd@localhost.localdomain>  Thu, 05 May 2011 17:55:09 -0700
 
 fossology (1.3.0-1) unstable; urgency=low
@@ -184,7 +198,7 @@ fossology (1.3.0-1) unstable; urgency=low
   * Fixed a cp2foss authentication bug
   * fixed unpack defects and made some improvements
 
- -- Mark Donohoe <markd@steezy>  Fri, 07 Jan 2011 10:35:08 -0800
+ -- Mark Donohoe <markd@steezy.localdomain>  Fri, 07 Jan 2011 10:35:08 -0800
 
 fossology (1.2.1~SVNBUILD-1) unstable; urgency=low
 

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -1,14 +1,18 @@
 Source: fossology
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: Michael Jaeger <michael.c.jaeger@siemens.com>
-Build-Depends: debhelper, libglib2.0-dev, libmagic-dev, libxml2-dev, libmxml-dev, libtext-template-perl, librpm-dev, subversion, rpm, libpcre3-dev, libssl-dev, postgresql-server-dev-all, libboost-regex-dev, libboost-program-options-dev, libjsoncpp-dev, libjson-c-dev, php5-cli|php7.0-cli|php7.2-cli, php-mbstring|php5, php-zip|php5, php-xml|php5
+Build-Depends: debhelper (>=9~), libglib2.0-dev, libmagic-dev, libxml2-dev,
+ libmxml-dev, libtext-template-perl, librpm-dev, subversion, rpm, libpcre3-dev,
+ libssl-dev, postgresql-server-dev-all, libboost-regex-dev,
+ libboost-program-options-dev, libjsoncpp-dev, libjson-c-dev,
+ php5-cli|php7.0-cli|php7.2-cli, php-mbstring|php5, php-zip|php5, php-xml|php5, libboost-system-dev, libboost-filesystem-dev
 Standards-Version: 3.9.1
-Homepage: http://fossology.org
+Homepage: https://fossology.org
 
 Package: fossology-dev
 Architecture: any
-Depends: php5-cli|php7.0-cli|php7.2-cli
+Depends: php5-cli|php7.0-cli|php7.2-cli, ${misc:Depends}
 Description: architecture for analyzing software, development utils
  The FOSSology project is a web based framework that allows you to
  upload software to be picked apart and then analyzed by software agents
@@ -20,8 +24,12 @@ Description: architecture for analyzing software, development utils
 
 Package: fossology
 Architecture: any
-Depends: fossology-web, fossology-scheduler, fossology-ununpack, fossology-copyright, fossology-buckets, fossology-mimetype, fossology-delagent, fossology-wgetagent, ${misc:Depends}
-Recommends: fossology-monk, fossology-monkbulk, fossology-decider, fossology-readmeoss, fossology-spdx2, fossology-reportimport, fossology-reuser, fossology-ninka
+Depends: fossology-web, fossology-scheduler, fossology-ununpack,
+ fossology-copyright, fossology-buckets, fossology-mimetype,
+ fossology-delagent, fossology-wgetagent, ${misc:Depends}
+Recommends: fossology-monk, fossology-monkbulk, fossology-decider,
+ fossology-readmeoss, fossology-spdx2, fossology-reportimport,
+ fossology-reuser, fossology-ninka
 Conflicts: fossology-db (<= 1.4.1), fossology-common (<= 1.4.1)
 Description: open and modular architecture for analyzing software
  The FOSSology project is a web based framework that allows you to
@@ -37,7 +45,10 @@ Description: open and modular architecture for analyzing software
 
 Package: fossology-common
 Architecture: any
-Depends: php5-pgsql|php7.0-pgsql|php7.2-pgsql, php-pear, php5-cli|php7.0-cli|php7.2-cli, php5-json|php7.0-json|php7.2-json, php-mbstring|php5, php-zip|php5, php-xml|php5, ${shlibs:Depends}, ${misc:Depends}
+Depends: php5-pgsql|php7.0-pgsql|php7.2-pgsql, php-pear,
+ php5-cli|php7.0-cli|php7.2-cli, php5-json|php7.0-json|php7.2-json,
+ php-mbstring|php5, php-zip|php5, php-xml|php5, ${shlibs:Depends},
+ ${misc:Depends}
 Description: architecture for analyzing software, common files
  The FOSSology project is a web based framework that allows you to
  upload software to be picked apart and then analyzed by software agents
@@ -46,11 +57,14 @@ Description: architecture for analyzing software, common files
  type identification.
  .
  This package contains the resources needed by all of the other
- fossology components. This includes admin tools for maintainance.
+ fossology components. This includes admin tools for maintenance.
 
 Package: fossology-web
 Architecture: any
-Depends: fossology-common, fossology-db, fossology-decider, apache2, libapache2-mod-php5|libapache2-mod-php7.0|libapache2-mod-php7.2, ${misc:Depends}
+Depends: fossology-common, fossology-decider, apache2,
+ libapache2-mod-php5|libapache2-mod-php7.0|libapache2-mod-php7.2,
+ ${misc:Depends}
+Recommends: fossology-db
 Description: architecture for analyzing software, web interface
  The FOSSology project is a web based framework that allows you to
  upload software to be picked apart and then analyzed by software agents
@@ -62,7 +76,8 @@ Description: architecture for analyzing software, web interface
 
 Package: fossology-scheduler
 Architecture: any
-Depends: fossology-common, ${shlibs:Depends}, ${misc:Depends}, heirloom-mailx | s-nail
+Depends: fossology-common, heirloom-mailx | s-nail, ${shlibs:Depends},
+ ${misc:Depends}
 Conflicts: fossology-scheduler-single
 Description: architecture for analyzing software, scheduler
  The FOSSology project is a web based framework that allows you to
@@ -92,7 +107,9 @@ Description: architecture for analyzing software, database
 
 Package: fossology-ununpack
 Architecture: any
-Depends: fossology-common, binutils, bzip2, cabextract, cpio, sleuthkit, genisoimage, poppler-utils, rpm, upx-ucl, unrar-free, unzip, p7zip-full, p7zip, ${shlibs:Depends}, ${misc:Depends}
+Depends: fossology-common, binutils, bzip2, cabextract, cpio, sleuthkit,
+ genisoimage, poppler-utils, rpm, upx-ucl, unrar-free, unzip, p7zip-full,
+ p7zip, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: fossology-agents-single
 Description: architecture for analyzing software, ununpack and adj2nest
  The FOSSology project is a web based framework that allows you to
@@ -101,7 +118,8 @@ Description: architecture for analyzing software, ununpack and adj2nest
  Existing agents include license analysis, metadata extraction, and MIME
  type identification.
  .
- This package contains the ununpack and adj2nest agent programs and their resources.
+ This package contains the ununpack and adj2nest agent programs and their
+ resources.
 
 Package: fossology-copyright
 Architecture: any
@@ -177,7 +195,8 @@ Description: architecture for analyzing software, delagent
 
 Package: fossology-wgetagent
 Architecture: any
-Depends: fossology-common, wget, subversion, git, ${shlibs:Depends}, ${misc:Depends}
+Depends: fossology-common, wget, subversion, git, ${shlibs:Depends},
+ ${misc:Depends}
 Replaces: fossology-wgetagent (<= 2.2.0)
 Description: architecture for analyzing software, wget_agent
  The FOSSology project is a web based framework that allows you to
@@ -236,6 +255,18 @@ Description: architecture for analyzing software, ninka
  .
  This package contains the ninka wrapper agent programs and their resources.
 
+Package: fossology-ojo
+Architecture: any
+Depends: fossology-common, ${shlibs:Depends}, ${misc:Depends}
+Description: architecture for analyzing software, ojo
+ The FOSSology project is a web based framework that allows you to
+ upload software to be picked apart and then analyzed by software agents
+ which produce results that are then browsable via the web interface.
+ Existing agents include license analysis, metadata extraction, and MIME
+ type identification.
+ .
+ This package contains the ojo agent programs and their resources.
+
 Package: fossology-decider
 Architecture: any
 Depends: fossology-common, ${misc:Depends}

debian/fossology-common.README.Debian

@@ -34,7 +34,7 @@ INSTALL.multi document and then
     to all of the other agent/scheduler/web machines.
  g) on all the agent machines mount each of the other agents at
     $REPO/<hostname>
- i) install agent pacakges (e.g.fossology-ununpack)
+ i) install agent packages (e.g.fossology-ununpack)
 3) On each of the web machine(s):
  a) install fossology-common
  b) edit /etc/fossology/Db.conf and point it at the database machine
@@ -70,7 +70,7 @@ All of these will be dependent on the goals of your local system and
 can't be reasonably automated, so you'll have to do them by hand.
 
 After you have installed the packages and done the above adjustments,
-you can point your web browser at at the new install
+you can point your web browser at the new install
   http://yourhostname/repo/
 and start using FOSSology!
 

debian/fossology-scheduler.lintian-overrides

@@ -0,0 +1,2 @@
+# We use #DEBHELPER# to generate the update-rc and invoke-rc calls
+fossology-scheduler: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/fossology

debian/fossology-scheduler/usr/share/lintian/overrides/fossology-scheduler

@@ -0,0 +1,2 @@
+# We use #DEBHELPER# to generate the update-rc and invoke-rc calls
+fossology-scheduler: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/fossology

debian/rules

@@ -156,6 +156,10 @@ endif
            PREFIX=/usr SYSCONFDIR=/etc/fossology LOCALSTATEDIR=/var \
            -C src/ninka install
 
+	$(MAKE) DESTDIR=$(CURDIR)/debian/fossology-ojo \
+           PREFIX=/usr SYSCONFDIR=/etc/fossology LOCALSTATEDIR=/var \
+           -C src/ojo install
+
 	$(MAKE) DESTDIR=$(CURDIR)/debian/fossology-decider \
            PREFIX=/usr SYSCONFDIR=/etc/fossology LOCALSTATEDIR=/var \
            -C src/decider install
@@ -187,7 +191,7 @@ endif
 	mkdir -p $(CURDIR)/debian/fossology-dev/usr/share/fossology/
 	tar czf $(CURDIR)/debian/fossology-dev/usr/share/fossology/php-vendor.tar.gz -C $(CURDIR)/debian/fossology-common/usr/share/fossology vendor
 
-	dh_install -s
+	dh_install -a
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -231,7 +235,7 @@ binary-indep: build-indep install-indep
 
 # Build architecture dependant packages using the common target.
 binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure

debian/source/lintian-overrides

@@ -0,0 +1,20 @@
+# Test files
+fossology source: * *test* *
+
+# Long lines in minified javascript files in source files
+fossology source: source-is-missing src/www/ui/scripts/jquery-ui.js *
+fossology source: source-is-missing src/www/ui/scripts/jquery.validate.js *
+fossology source: insane-line-length-in-source-file debian/missing-sources/jquery-3.3.1.js *
+fossology source: insane-line-length-in-source-file debian/missing-sources/jquery.dataTables.js *
+fossology source: insane-line-length-in-source-file debian/missing-sources/jquery.plainmodal.js *
+fossology source: insane-line-length-in-source-file debian/missing-sources/select2.full.js *
+fossology source: insane-line-length-in-source-file src/www/ui/scripts/jquery-ui.js *
+fossology source: insane-line-length-in-source-file src/www/ui/scripts/jquery.validate.js *
+
+# File contains license text which is imported in the DB.
+# This does not license the file under that license.
+fossology source: license-problem-bad-php-license install/db/licenseRef.json
+fossology source: license-problem-gfdl-invariants install/db/licenseRef.json *
+fossology source: license-problem-json-evil install/db/licenseRef.json
+fossology source: license-problem-php-license install/db/licenseRef.json
+

debian/upstream/metadata

@@ -0,0 +1,7 @@
+Name: fossology
+Repository: https://github.com/fossology/fossology/
+Bug-Database: https://github.com/fossology/fossology/issues
+Bug-Submit: https://github.com/fossology/fossology/issues/new/choose
+Changelog: https://raw.githubusercontent.com/fossology/fossology/master/CHANGELOG.md
+Contact: fossology@fossology.org
+Documentation: https://fossology.github.io/

debian/watch

@@ -0,0 +1,3 @@
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/<project>-$1\.tar\.gz/ \
+  https://github.com/fossology/fossology/tags .*/(\d+\.\d+.\d+)\.tar\.gz

install/INSTALL

@@ -1,3 +1,3 @@
 FOSSology Installation Documentation
 
-This has been moved to http://www.fossology.org/projects/fossology/wiki/SysConfigSrc
+This has been moved to https://github.com/fossology/fossology/wiki/Install-from-Source