Update packages file for version 24810

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile

@@ -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

Makefile.common

@@ -12,9 +12,9 @@ SHELL  = /bin/bash
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 
 SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || rpmspec -D '_vendor clr' --srpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' $(SPECFILE))
-SRPMFILE = results/srpm/$(SRPMVERS).src.rpm
+SRPMFILE = results/$(SRPMVERS).src.rpm
 
-LATEST_RPMS = $(shell [ ! -s results/logs/build.log ] || for r in `egrep 'Wrote.*/RPMS/.*.rpm' results/logs/build.log |  sed 's/.*\///;s/.*debuginfo/debuginfo\/&/'` ; do echo "results/$$r"; done)
+LATEST_RPMS = $(wildcard rpms/*.rpm)
 RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
@@ -28,22 +28,24 @@ __missingsources := $(filter-out $(wildcard ${__allsources}), ${__allsources})
 endif
 
 $(SPECFILE):
-	@echo Error: $(SPECFILE) is missing. Please run \`make autospec\` to try and auto
-	@echo Error: generate one for you.
-	@exit 1
+	@[[ -f "$@" ]] || (\
+	  echo Error: $@ is missing. Please run \`make autospec\` to try and auto;\
+	  echo Error: generate one for you.;\
+	  exit 1 )
 
 upstream:
-	@echo Error: The \"upstream\" file is missing. Try running \`make autospec\` to
-	@echo Error: auto generate one for you. If you are not using autospec to
-	@echo Error: generate a spec file, specify the proper "Source*" entries in the
-	@echo Error: spec header, and try running \`make generateupstream\`.
-	@exit 1
+	@[[ -f "$@" ]] || (\
+	  echo Error: The \"$@\" file is missing. Try running \`make autospec\` to;\
+	  echo Error: auto generate one for you. If you are not using autospec to;\
+	  echo Error: generate a spec file, specify the proper "Source*" entries in the;\
+	  echo Error: spec header, and try running \`make generateupstream\`.;\
+	  exit 1 )
 
 #help spdxcheck: Checks that the package license is a valid SPDX license,
 #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
@@ -91,24 +93,20 @@ prebuild-checks:
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options.
 build: prebuild-checks configemail $(SPECFILE) upstream $(SRPMFILE)
 	$(MOCK) $(SRPMFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
-	mkdir -p results/logs results/debuginfo
-	mv results/*.log results/logs
-	-mv results/*-debuginfo*.rpm results/debuginfo/
-	@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
-	@perl $(TOPLVL)/projects/common/count.pl results/logs/build.log &> testresults
+	$(MAKE) link-new-rpms PKG_REPO_DIR="."
+	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
+	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
 	@$(MAKE) checkblacklist
 
 #help build-nocheck: Same as 'make build', but do not run the package's test suite.
 build-nocheck: configemail $(SPECFILE) upstream $(SRPMFILE)
 	$(MOCK) $(SRPMFILE) --nocheck --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
-	mkdir -p results/logs results/debuginfo
-	mv results/*.log results/logs
-	-mv results/*-debuginfo*.rpm results/debuginfo/
-	@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
-	@perl $(TOPLVL)/projects/common/count.pl results/logs/build.log &> testresults
+	$(MAKE) link-new-rpms PKG_REPO_DIR="."
+	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
+	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
 	@$(MAKE) checkblacklist
 
-fmvpatches: results/logs/build.log
+fmvpatches: results/build.log
 	@perl $(TOPLVL)/projects/common/fmvpatches.pl $(PKG_NAME)
 
 #help rootshell: Puts you in a root shell at the top of your build root.
@@ -121,9 +119,11 @@ shell:
 
 # Always rebuild the source rpm
 .PHONY: $(SRPMFILE)
-$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
+$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice clean-old-content
 	@$(MAKE) spdxcheck
-	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/srpm/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	mv results/root.log results/srpm-root.log
+	mv results/build.log results/srpm-build.log
 
 # Do a git fetch and a git rebase to apply local commits on top of latest
 # commits from the remote. A git fetch/rebase is used rather than a git pull so
@@ -160,8 +160,7 @@ pullrebase:
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options
 #help to autospec.
 #help For more information, see the project at https://github.com/clearlinux/autospec
-autospec: pullrebase localreponotice
-	rm -f results/srpm/*src.rpm
+autospec: pullrebase localreponotice clean-old-content
 	@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
 		exit 1; \
@@ -178,6 +177,7 @@ autospec: pullrebase localreponotice
 		$${SETVERSION:+ --version $${SETVERSION}} \
 		${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
 		$(firstword $(NEWURL) $(URL));
+	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
 	@if [ -e update_changelog.sh ] && [ -z "$$SKIP_GIT" ] ; then \
@@ -327,7 +327,7 @@ rekoji-nowait:
 	$(MAKE) KOJI_NOWAIT="--nowait --background" rekoji
 
 logcheck:
-	@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
+	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 
 $(TOPLVL)/repo:
 	@echo "Creating local RPM repository $(TOPLVL)/repo"
@@ -337,19 +337,24 @@ $(TOPLVL)/repo:
 #help repoadd: Adds locally-built RPMs for this package to the local RPM
 #help repository. If this repository does not yet exist, it is created and
 #help enabled.
-repoadd: results/logs/build.log $(TOPLVL)/repo
-	@if [ -z "`grep '^Wrote: .*$(shell basename $(SRPMFILE))$$' results/logs/build.log`" ]; then \
-		echo "You have not yet succesfully built this release yet"; exit 1; \
-	fi
-	@if [ -f .repo-index ]; then \
+repoadd: $(TOPLVL)/repo
+	@if [ -z "${LATEST_RPMS}" ]; then \
+		echo "No rpms found in rpms/ directory."; \
+		exit 1; \
+	fi; \
+	if [ -f .repo-index ]; then \
 		echo "Cleaning old rpms:"; \
 		for r in `cat .repo-index`; do \
 			echo "-$$r"; \
 			rm -f $(TOPLVL)/repo/$$r; \
 		done; \
 		rm .repo-index; \
-	fi
-	for r in $(LATEST_RPMS); do echo "+$$r"; echo $$(basename $$r) >> .repo-index; cp $$r $(TOPLVL)/repo; done
+	fi; \
+	for r in ${LATEST_RPMS}; do \
+		echo "+$$r"; \
+		echo $$(basename $$r) >> .repo-index; \
+		ln -f $$r $(TOPLVL)/repo/; \
+	done
 	$(MAKE) localrepocreate
 	$(call localrepoenable,${PM_CONF},${MOCK_CONF})
 
@@ -430,3 +435,6 @@ drop-abandoned: $(SPECFILE)
 
 # Define site local common targets in a separate makefile
 -include $(TOPLVL)/projects/common/Makefile.common.site_local
+
+# Include optional extended makefiles from individual package repos
+-include Makefile.custom

Makefile.shared

@@ -138,6 +138,30 @@ localreponotice:
 		[ -f $(TOPLVL)/repo/opt-in-build ] || sleep 3; \
 	fi >&2
 
+.PHONY: clean-old-rpms clean-old-logs clean-old-content
+clean-old-rpms:
+	rm -rf ./rpms
+	rm -f ./results/*.rpm
+
+clean-old-logs:
+	rm -f ./results/*.log
+
+clean-old-content: clean-old-rpms clean-old-logs
+
+.PHONY: require-pkg-repo-dir link-new-rpms
+require-pkg-repo-dir:
+	@if [ -z ${PKG_REPO_DIR} ]; then \
+		echo "Please specify PKG_REPO_DIR to indicate package repo location."; \
+		exit 1; \
+	fi
+
+link-new-rpms: require-pkg-repo-dir
+	mkdir -p ${PKG_REPO_DIR}/rpms
+	rm -f ${PKG_REPO_DIR}/rpms/*.rpm
+	find ${PKG_REPO_DIR}/results -maxdepth 1 -name '*.rpm' -exec ln {} ${PKG_REPO_DIR}/rpms/ \;
+	rm -f ${PKG_REPO_DIR}/rpms/*.src.rpm
+
+
 .PHONY: help
 ##### Code
 # Make sure that HELPSPACE has exactly HELPLEN spaces in it

Makefile.toplevel

@@ -136,11 +136,11 @@ clean-pkgs-dir: $(PACKAGES_FILE)
 	done
 	@echo "packages directory cleaned";
 
-clean_PKGS = $(addprefix clean_,$(PKGS))
+clean_PKGS = $(addprefix clean_,$(PKGS_LOCAL))
 #help clean: Run 'make clean' for every package.
 clean: $(clean_PKGS)
 
-proper_PKGS = $(addprefix proper_,$(PKGS))
+proper_PKGS = $(addprefix proper_,$(PKGS_LOCAL))
 #help proper: Run 'make proper' for every package, and purge the local
 #help repo and image.
 proper: $(proper_PKGS)
@@ -154,34 +154,34 @@ proper: $(proper_PKGS)
 
 $(clean_PKGS):
 	@echo "cleaning $(patsubst clean_%,%,$@)"
-	-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
+	-@$(MAKE) -s -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
 
 $(proper_PKGS):
-	-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst proper_%,%,$@)) proper
+	-@$(MAKE) -s -C $(addprefix packages/,$(patsubst proper_%,%,$@)) proper
 
 #help status: Runs git status for all package repos, thus displaying untracked
 #help and unstaged files in addition to staged files.
-status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
-	@for p in projects/common $(addprefix packages/,$(PKGS)); do \
+status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
+	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
 	if [ -d "$$p/.git" ] &&  [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
 	done
 
 #help diff: Runs git diff for all package repos and displays the output using
 #help diffstat. Requires that diffstat is installed.
-diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
-	@for p in projects/common $(addprefix packages/,$(PKGS)); do \
+diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
+	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
 		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in: $$p"; git diff |diffstat -p1)) ;\
 	done
 
 #help versions: Displays the version of each package in the ./packages tree.
-versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
-	@for p in $(addprefix packages/,$(PKGS)); do \
+versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
+	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
 		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}\n' *.spec | head -n1; fi) ;\
 	done
 
 #help releases: Like 'make versions', but also displays the release number.
-releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
-	@for p in $(addprefix packages/,$(PKGS)); do \
+releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
+	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
 		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' *.spec | head -n1; fi) ;\
 	done
 
@@ -224,6 +224,7 @@ autospecnew: localreponotice
 			$${SETVERSION:+ --version $${SETVERSION}} \
 			${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
 			$(URL); \
+		[ $$? -eq 0 ] && $(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \

README.md

@@ -102,6 +102,10 @@ $ echo missing-build-req >> buildreq_add
 $ make autospec
 ```
 
+Please see https://github.com/clearlinux/autospec#common-files for 
+documention on buildreq_add and the other files autospec uses during the
+build process.
+
 ### Bump the release number for a package
 
 If you simply need to increment a package's release number and rebuild the
@@ -112,6 +116,16 @@ $ make bump
 $ make build
 ```
 
+### Update the release version for a package
+
+If you have an update release version for a package, you can change the url
+for the new release in the package/example-pkg/Makefile.  After modifying the
+new url, run `make autospec` again to fetch the new package and rebuild.
+
+```
+$ make autospec
+```
+
 ## Other topics
 
 ### Customizing the mock config

conf/clear.cfg

@@ -6,6 +6,8 @@ config_opts['dist'] = 'clear'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s  %(user)s'
 config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['root_cache_opts']['compress_program'] = 'zstd -5'
+config_opts['plugin_conf']['root_cache_opts']['extension'] = '.zst'
 config_opts['releasever'] = 'clear'
 config_opts['package_manager'] = 'dnf'
 config_opts['chrootgroup'] = 'mockbuild'

licenses-extra

@@ -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

licenses-spdx

@@ -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