Update packages file for version 24740

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Refresh SPDX license list to latest (version 3.2)
2026-06-16 19:16:00 +00:00 · 2018-08-30 12:02:35 +00:00 · 2018-08-29 17:19:34 -07:00 · 2018-08-29 16:10:18 -07:00 · 2018-08-29 14:28:31 -07:00 · 2018-08-29 18:02:48 +00:00
5 changed files with 184 additions and 90 deletions
@@ -17,5 +17,9 @@ update:
 	curl -f -o packages ${BASE_URL}/source/package-sources
 	cut -f1 packages | LC_ALL=C sort > packages.new && mv packages.new packages

+.PHONY: spdx
 spdx:
-	curl -s spdx.org/licenses/ | sed '0,/<tbody>/d;/<\/tbody>/q;s/<tr>/\f/g;s/$$/,/g;s/<[^>]*>//g' | awk 'BEGIN{RS="\f";FS=","} {print $$4}' | sed '/^$$/d;s/^[ ]*//' > spdx
+	JSON=$$(mktemp); \
+	trap "rm $$JSON" EXIT; \
+	curl -f -S -s https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json > $$JSON || exit 1; \
+	jq -r '.licenses[] | .licenseId' < $$JSON | LC_COLLATE=C sort > licenses-spdx
@@ -45,7 +45,7 @@ upstream:
 #help or that it is in the exceptions list.
 spdxcheck: $(SPECFILE)
 	@for LICENSE in `rpmspec -D '_vendor clr' --srpm -q --queryformat '%{LICENSE}\n' $(SPECFILE)`; do \
-		if ! grep -q "^$$LICENSE$$" $(TOPLVL)/projects/common/licenses-spdx && ! grep -q "$$LICENSE$$" $(TOPLVL)/projects/common/licenses-exceptions; then FAIL=yes; echo "ERROR: License '$$LICENSE' is not an allowed SPDX license ID"; fi; \
+		if ! grep -qx "$$LICENSE" $(TOPLVL)/projects/common/licenses-{spdx,exceptions,extra}; then FAIL=yes; echo "ERROR: License '$$LICENSE' is not an allowed SPDX license ID"; fi; \
 	done; test -z "$$FAIL"

 #help cvecheck: Checks
@@ -0,0 +1,7 @@
+# This file contains SPDX license identifiers that are not defined in the
+# latest version of SPDX but still needed (or possibly needed) for Clear Linux
+# packages.
+GFDL-1.3+
+MIT-Opengroup
+WXwindows
+w3c
@@ -1,56 +1,63 @@
+0BSD
 AAL
-Abstyles
-Adobe-2006
-Adobe-Glyph
 ADSL
 AFL-1.1
 AFL-1.2
 AFL-2.0
 AFL-2.1
 AFL-3.0
-Afmparse
 AGPL-1.0
+AGPL-1.0-only
+AGPL-1.0-or-later
 AGPL-3.0
-Aladdin
+AGPL-3.0-only
+AGPL-3.0-or-later
 AMDPLPA
 AML
 AMPAS
 ANTLR-PD
-Apache-1.0
-Apache-1.1
-Apache-2.0
 APAFML
 APL-1.0
 APSL-1.0
 APSL-1.1
 APSL-1.2
 APSL-2.0
+Abstyles
+Adobe-2006
+Adobe-Glyph
+Afmparse
+Aladdin
+Apache-1.0
+Apache-1.1
+Apache-2.0
 Artistic-1.0
-Artistic-1.0-cl8
 Artistic-1.0-Perl
+Artistic-1.0-cl8
 Artistic-2.0
+BSD-1-Clause
+BSD-2-Clause
+BSD-2-Clause-FreeBSD
+BSD-2-Clause-NetBSD
+BSD-2-Clause-Patent
+BSD-3-Clause
+BSD-3-Clause-Attribution
+BSD-3-Clause-Clear
+BSD-3-Clause-LBNL
+BSD-3-Clause-No-Nuclear-License
+BSD-3-Clause-No-Nuclear-License-2014
+BSD-3-Clause-No-Nuclear-Warranty
+BSD-4-Clause
+BSD-4-Clause-UC
+BSD-Protection
+BSD-Source-Code
+BSL-1.0
 Bahyph
 Barr
 Beerware
 BitTorrent-1.0
 BitTorrent-1.1
 Borceux
-BSD-2-Clause
-BSD-2-Clause-FreeBSD
-BSD-2-Clause-NetBSD
-BSD-3-Clause
-BSD-3-Clause-Attribution
-BSD-3-Clause-Clear
-BSD-3-Clause-LBNL
-BSD-4-Clause
-BSD-4-Clause-UC
-BSD-Protection
-BSL-1.0
-bzip2-1.0.5
-bzip2-1.0.6
-Caldera
 CATOSL-1.1
-CC0-1.0
 CC-BY-1.0
 CC-BY-2.0
 CC-BY-2.5
@@ -81,96 +88,117 @@ CC-BY-SA-2.0
 CC-BY-SA-2.5
 CC-BY-SA-3.0
 CC-BY-SA-4.0
+CC0-1.0
 CDDL-1.0
 CDDL-1.1
+CDLA-Permissive-1.0
+CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
 CECILL-2.0
+CECILL-2.1
 CECILL-B
 CECILL-C
-ClArtistic
+CNRI-Jython
 CNRI-Python
 CNRI-Python-GPL-Compatible
-Condor-1.1
 CPAL-1.0
 CPL-1.0
 CPOL-1.02
-Crossword
 CUA-OPL-1.0
+Caldera
+ClArtistic
+Condor-1.1
+Crossword
+CrystalStacker
 Cube
 D-FSL-1.0
-diffmark
 DOC
-Dotseqn
 DSDP
-dvipdfm
+Dotseqn
 ECL-1.0
 ECL-2.0
-eCos-2.0
 EFL-1.0
 EFL-2.0
-eGenix
-Entessa
 EPL-1.0
-ErlPL-1.1
+EPL-2.0
 EUDatagrid
 EUPL-1.0
 EUPL-1.1
+EUPL-1.2
+Entessa
+ErlPL-1.1
 Eurosym
-Fair
-Frameworx-1.0
-FreeImage
+FSFAP
 FSFUL
 FSFULLR
 FTL
+Fair
+Frameworx-1.0
+FreeImage
 GFDL-1.1
+GFDL-1.1-only
+GFDL-1.1-or-later
 GFDL-1.2
+GFDL-1.2-only
+GFDL-1.2-or-later
 GFDL-1.3
-GFDL-1.3+
-Giftware
+GFDL-1.3-only
+GFDL-1.3-or-later
 GL2PS
-Glide
-Glulxe
-gnuplot
 GPL-1.0
 GPL-1.0+
+GPL-1.0-only
+GPL-1.0-or-later
 GPL-2.0
 GPL-2.0+
+GPL-2.0-only
+GPL-2.0-or-later
+GPL-2.0-with-GCC-exception
 GPL-2.0-with-autoconf-exception
 GPL-2.0-with-bison-exception
 GPL-2.0-with-classpath-exception
 GPL-2.0-with-font-exception
-GPL-2.0-with-GCC-exception
 GPL-3.0
 GPL-3.0+
-GPL-3.0-with-autoconf-exception
+GPL-3.0-only
+GPL-3.0-or-later
 GPL-3.0-with-GCC-exception
-gSOAP-1.3b
-HaskellReport
+GPL-3.0-with-autoconf-exception
+Giftware
+Glide
+Glulxe
 HPND
+HaskellReport
 IBM-pibs
 ICU
 IJG
-ImageMagick
-iMatix
-Imlib2
-Intel
-Intel-ACPI
 IPA
 IPL-1.0
 ISC
-JasPer-2.0
+ImageMagick
+Imlib2
+Info-ZIP
+Intel
+Intel-ACPI
+Interbase-1.0
 JSON
-Latex2e
-Leptonica
+JasPer-2.0
+LAL-1.2
+LAL-1.3
 LGPL-2.0
 LGPL-2.0+
+LGPL-2.0-only
+LGPL-2.0-or-later
 LGPL-2.1
 LGPL-2.1+
+LGPL-2.1-only
+LGPL-2.1-or-later
 LGPL-3.0
 LGPL-3.0+
-Libpng
-libtiff
+LGPL-3.0-only
+LGPL-3.0-or-later
+LGPLLR
 LPL-1.0
 LPL-1.02
 LPPL-1.0
@@ -178,17 +206,20 @@ LPPL-1.1
 LPPL-1.2
 LPPL-1.3a
 LPPL-1.3c
-MakeIndex
-MirOS
+Latex2e
+Leptonica
+LiLiQ-P-1.1
+LiLiQ-R-1.1
+LiLiQ-Rplus-1.1
+Libpng
+Linux-OpenIB
 MIT
-MIT-advertising
+MIT-0
 MIT-CMU
+MIT-advertising
 MIT-enna
 MIT-feh
-MIT-Opengroup
 MITNFA
-Motosoto
-mpich2
 MPL-1.0
 MPL-1.1
 MPL-2.0
@@ -196,26 +227,33 @@ MPL-2.0-no-copyleft-exception
 MS-PL
 MS-RL
 MTLL
+MakeIndex
+MirOS
+Motosoto
 Multics
 Mup
 NASA-1.3
-Naumen
 NBPL-1.0
 NCSA
-NetCDF
-Newsletr
 NGPL
+NLOD-1.0
 NLPL
-Nokia
 NOSL
-Noweb
 NPL-1.0
 NPL-1.1
 NPOSL-3.0
 NRL
 NTP
+Naumen
+Net-SNMP
+NetCDF
+Newsletr
+Nokia
+Noweb
 Nunit
+OCCT-PL
 OCLC-2.0
+ODC-By-1.0
 ODbL-1.0
 OFL-1.0
 OFL-1.1
@@ -237,77 +275,102 @@ OLDAP-2.6
 OLDAP-2.7
 OLDAP-2.8
 OML
-OpenSSL
 OPL-1.0
+OSET-PL-2.1
 OSL-1.0
 OSL-1.1
 OSL-2.0
 OSL-2.1
 OSL-3.0
+OpenSSL
 PDDL-1.0
 PHP-3.0
 PHP-3.01
 Plexus
 PostgreSQL
-psfrag
-psutils
 Python-2.0
-Qhull
 QPL-1.0
-Rdisc
+Qhull
 RHeCos-1.1
 RPL-1.1
 RPL-1.5
 RPSL-1.0
+RSA-MD
 RSCPL
+Rdisc
 Ruby
-Saxpath
 SAX-PD
 SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
-SimPL-2.0
 SISSL
 SISSL-1.2
-Sleepycat
 SMLNJ
+SMPPL
 SNIA
 SPL-1.0
+SWL
+Saxpath
+Sendmail
+SimPL-2.0
+Sleepycat
+Spencer-86
+Spencer-94
+Spencer-99
 StandardML-NJ
 SugarCRM-1.1.3
-SWL
 TCL
+TCP-wrappers
 TMate
 TORQUE-1.1
 TOSL
+TU-Berlin-1.0
+TU-Berlin-2.0
+UPL-1.0
+Unicode-DFS-2015
+Unicode-DFS-2016
 Unicode-TOU
 Unlicense
-Vim
 VOSTROM
 VSL-1.0
+Vim
 W3C
 W3C-19980720
+W3C-20150513
+WTFPL
 Watcom-1.0
 Wsuipa
-WTFPL
-WXwindows
 X11
-Xerox
 XFree86-1.1
-xinetd
-Xnet
-xpp
 XSkat
+Xerox
+Xnet
 YPL-1.0
 YPL-1.1
+ZPL-1.1
+ZPL-2.0
+ZPL-2.1
 Zed
 Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
 Zlib
+bzip2-1.0.5
+bzip2-1.0.6
+curl
+diffmark
+dvipdfm
+eCos-2.0
+eGenix
+gSOAP-1.3b
+gnuplot
+iMatix
+libtiff
+mpich2
+psfrag
+psutils
+wxWindows
+xinetd
+xpp
 zlib-acknowledgement
-ZPL-1.1
-ZPL-2.0
-ZPL-2.1
-w3c
@@ -1159,6 +1159,7 @@ diffoscope
 diffstat
 diffutils
 digikam
+direwolf
 discover
 dist-pam-configs
 distro
@@ -1298,6 +1299,7 @@ gawk
 gc
 gcab
 gcc
+gcompris-qt
 gcr
 gcs-oauth2-boto-plugin
 gdal
@@ -2336,6 +2338,7 @@ perl-Canary-Stability
 perl-Capture-Tiny
 perl-Carp-Assert
 perl-Carp-Assert-More
+perl-Carp-Clan
 perl-Class-Accessor
 perl-Class-Accessor-Chained
 perl-Class-Accessor-Grouped
@@ -2348,6 +2351,8 @@ perl-Class-Data-Accessor
 perl-Class-Data-Inheritable
 perl-Class-ErrorHandler
 perl-Class-Inspector
+perl-Class-Load
+perl-Class-Load-XS
 perl-Class-Method-Modifiers
 perl-Class-MethodMaker
 perl-Class-Mix
@@ -2382,6 +2387,7 @@ perl-Curses
 perl-DBD-SQLite
 perl-DBD-SQLite2
 perl-DBI
+perl-DBIx-Class
 perl-DBIx-Connector
 perl-DBIx-ContextualFetch
 perl-DBIx-DBSchema
@@ -2451,6 +2457,7 @@ perl-Eval-Closure
 perl-Event
 perl-Event-RPC
 perl-Exception-Class
+perl-Exporter-Declare
 perl-Exporter-Easy
 perl-Exporter-Lite
 perl-Exporter-Tiny
@@ -2460,6 +2467,7 @@ perl-ExtUtils-Helpers
 perl-ExtUtils-InstallPaths
 perl-FCGI-ProcManager
 perl-Feed-Find
+perl-Fennec-Lite
 perl-File-BaseDir
 perl-File-Copy-Link
 perl-File-Copy-Recursive
@@ -2587,6 +2595,7 @@ perl-Locale-Maketext-Lexicon
 perl-Locale-Msgfmt
 perl-Log-Agent
 perl-Log-Any
+perl-Log-Contextual
 perl-Log-Dispatch
 perl-Log-Dispatch-Array
 perl-Log-Log4perl
@@ -2616,6 +2625,7 @@ perl-Math-Spline
 perl-Math-Utils
 perl-Math-Vec
 perl-Memoize-ExpireLRU
+perl-Meta-Builder
 perl-Mock-Config
 perl-Modern-Perl
 perl-Module-Build
@@ -2628,6 +2638,7 @@ perl-Module-Install
 perl-Module-List
 perl-Module-Pluggable
 perl-Module-Runtime
+perl-Module-Runtime-Conflicts
 perl-Module-ScanDeps
 perl-Module-Starter
 perl-Module-Util
@@ -2635,6 +2646,9 @@ perl-Module-Versions-Report
 perl-Mojolicious
 perl-Mojolicious-Plugin-AssetPack
 perl-Moo
+perl-Moose
+perl-MooseX-Role-Parameterized
+perl-MooseX-Role-WithOverloading
 perl-Mozilla-CA
 perl-Net-CIDR-Lite
 perl-Net-DNS
@@ -2663,6 +2677,7 @@ perl-PDF-Writer
 perl-POD2-Base
 perl-POSIX-strftime-Compiler
 perl-Package-Constants
+perl-Package-DeprecationManager
 perl-Package-New
 perl-Package-Stash
 perl-Package-Stash-XS
@@ -2752,6 +2767,7 @@ perl-System-Command
 perl-TAP-Harness-Archive
 perl-Taint-Util
 perl-Term-ProgressBar
+perl-Term-ReadKey
 perl-Term-ReadLine-Gnu
 perl-Term-ReadPassword
 perl-Term-Shell
@@ -2759,10 +2775,11 @@ perl-Term-ShellUI
 perl-Term-Size-Perl
 perl-Term-Table
 perl-Term-UI
-perl-TermReadKey
 perl-Test-Assertions
+perl-Test-CleanNameSpaces
 perl-Test-Compile
 perl-Test-Deep
+perl-Test-Differences
 perl-Test-Exception
 perl-Test-FailWarnings
 perl-Test-Fatal
@@ -2864,6 +2881,7 @@ perl-XML-XPathEngine
 perl-YAML-LibYAML
 perl-YAML-Syck
 perl-YAML-Tiny
+perl-aliased
 perl-autobox
 perl-autovivification
 perl-boolean
@@ -3084,6 +3102,7 @@ qtvirtualkeyboard
 qtwayland
 qtwebchannel
 qtwebengine
+qtwebkit
 qtwebsockets
 qtx11extras
 qtxmlpatterns
@@ -3423,6 +3442,7 @@ xf86-video-amdgpu
 xf86-video-ati
 xf86-video-fbdev
 xf86-video-nouveau
+xf86-video-qxl
 xf86-video-vboxvideo
 xf86-video-vesa
 xfburn
Author	SHA1	Message	Date
clrbuilder	ceeee94f0c	Update packages file for version 24740 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-08-30 12:02:35 +00:00
Patrick McCarty	852b6e83c9	Refresh SPDX license list to latest (version 3.2) Make the SPDX puller code more robust by reading from JSON sources rather than parsing HTML. Also, keep all deprecated license identifiers for now, since they are still present in the spdx list. Four identifiers were removed since the last refresh, but we are keeping them for backwards compatibility. The removed license IDs now reside in the licenses-extra file. At Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-08-29 17:19:34 -07:00
Patrick McCarty	ae9f0610d6	Sort SPDX license list with LC_COLLATE=C Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-08-29 16:10:18 -07:00
Auke Kok	fa65110479	Adding 2 new spdx identifiers	2018-08-29 14:28:31 -07:00
clrbuilder	4259e8dbf0	Update packages file for version 24730 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-08-29 18:02:48 +00:00