Update packages file for version 30580

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

Makefile.common

@@ -143,6 +143,10 @@ pullrebase:
 			echo "No commits exist in remote. Continuing."; \
 			exit 0; \
 		fi; \
+		if [ "$$(git rev-list FETCH_HEAD | head -n 1)" = "$$(git rev-list HEAD | head -n 1)" ]; then \
+			echo "Current branch up-to-date. Continuing."; \
+			exit 0; \
+		fi; \
 		echo "Rebasing to origin/master"; \
 		if git status --porcelain | grep -q '^.[^?]'; \
 		then \
@@ -187,6 +191,7 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
 		git commit --amend --no-edit Change* ; \
 	fi
 	@$(MAKE) -s for-review.txt
+	diffstat for-review.txt
 	@printf "\n**\n"
 	@printf "** NOTICE: A patch with changes is available in the file for-review.txt\n"
 	@printf "** To recreate (e.g., after git commit --amend), run make for-review.txt\n"
@@ -373,6 +378,28 @@ repoadd: $(TOPLVL)/repo
 	$(MAKE) localrepocreate
 	$(call localrepoenable,${PM_CONF},${MOCK_CONF})
 
+#help repostage: Stages locally-built RPMs for this package to the local RPM
+#help directory. If this directory does not yet exist, it is created and
+#help enabled.
+repostage: $(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; \
+		ln -f $$r $(TOPLVL)/repo/; \
+	done
+
 #help repodel: Removes RPMs from the local RPM repository that were
 #help previously added by 'make repoadd' for this package.
 repodel:

Makefile.toplevel

@@ -233,6 +233,54 @@ autospecnew: preautospecnew-checks localreponotice
 			printf "** NOTICE: A patch with changes is available in the file $(TOPLVL)/packages/$(NAME)/for-review.txt\n"; \
 			printf "** Please look through this file and if you are unsure, please submit for code review with git send-email\n"; \
 			printf "**\n\n"; \
+		else \
+			echo "Autospec of $(NAME) failed."; \
+			exit 1; \
+		fi; \
+	else \
+		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \
+		exit 1; \
+	fi
+
+#help autospecnewgo: Creates a new autospec package with (dependencies)
+#help for a given URL=$(URL) with NAME=$(NAME). Several files used by
+#help autospec will be created in the help process.
+#help Use MOCK_OPTS environment varible to pass down arbitrary mock options
+#help to autospec.
+#help For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
+autospecnewgo: preautospecnew-checks localreponotice
+	@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
+		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
+		exit 1; \
+	fi
+	-$(MAKE) clone_$(NAME)
+	@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
+		echo "no remote repository found, creating new package repository and running autospec"; \
+		mkdir -p $(TOPLVL)/packages/$(NAME); \
+		( \
+			cd $(TOPLVL)/packages/$(NAME); \
+			git init; \
+			git remote add origin $(PKG_BASE_URL)/$(NAME); \
+			$(call gitoliteurl,packages/$(NAME)); \
+			$(call subjectprefix,$(NAME)); \
+		); \
+		printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' '$(value ARCHIVES)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
+		python3 $(TOPLVL)/projects/common/go-builder.py \
+			--target packages/$(NAME) \
+			--integrity \
+			--config "$(AUTOSPEC_CONF)" \
+			--name $(NAME) \
+			--archives $(ARCHIVES) \
+			--mock-config $(MOCK_CONFIG_VAL) \
+			--mock-opts "$(MOCK_OPTS)" \
+			$(URL); \
+		if [ $$? -eq 0 ]; then \
+			$(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \
+			$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
+			python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) show) > $(TOPLVL)/packages/$(NAME)/for-review.txt; \
+			python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) show); \
+		else \
+			exit 1; \
 		fi; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \

go-builder.py

@@ -0,0 +1,285 @@
+#!/usr/bin/env python3
+#
+# gowrap.py - part of autospec
+# Copyright (C) 2019 Intel Corporation
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import argparse
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+
+
+def parse_args():
+    """Parse commandline arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument("url", help="Location of package archive")
+    parser.add_argument("-t", "--target", dest="target", action="store",
+                        default=None,
+                        help="Target location to create or reuse")
+    parser.add_argument("-c", "--config", dest="config", action="store",
+                        default="/usr/share/defaults/autospec/autospec.conf",
+                        help="Set configuration file to use")
+    parser.add_argument("-n", "--name", action="store", dest="name", default="",
+                        help="Override the package name")
+    parser.add_argument("-i", "--integrity", action="store_true",
+                        default=False,
+                        help="Search for package signature from source URL and "
+                             "attempt to verify package")
+    parser.add_argument("-m", "--mock-config", action="store", default="clear",
+                        help="Value to pass with Mock's -r option. Defaults to "
+                             "\"clear\", meaning that Mock will use "
+                             "/etc/mock/clear.cfg.")
+    parser.add_argument("-o", "--mock-opts", action="store", default="",
+                        help="Arbitrary options to pass down to mock when "
+                        "building a package.")
+    parser.add_argument('-a', "--archives", action="store",
+                        dest="archives", default=[], nargs='*',
+                        help="tarball URLs for additional source archives and"
+                        " a location for the sources to be extacted to (e.g."
+                        " http://example.com/downloads/dependency.tar.gz"
+                        " /directory/relative/to/extract/root )")
+
+    return parser.parse_args()
+
+
+def missing_dependencies(name):
+    """Check if the build failed due to missing dependencies."""
+    root_log = os.path.join("packages", name, "results", "root.log")
+    if not os.path.exists(root_log):
+        return False
+    with open(root_log, "r") as lfile:
+        for line in lfile.readlines():
+            if "No matching package to install" in line:
+                return True
+    return False
+
+
+def already_built(name, version):
+    """Check if the package and version are already built."""
+    if not os.path.exists(os.path.join("packages", name, "rpms")):
+        return False
+    vpath = os.path.join("packages", name, "versions")
+    if not os.path.exists(vpath):
+        return False
+    with open(vpath, "r") as vfile:
+            if version not in [x.strip() for x in vfile.readlines()]:
+                return False
+    return True
+
+
+def build(path, args, name, url, version):
+    """Try and build a package."""
+    if version:
+        ver_arg = ["-v", version]
+    else:
+        ver_arg = []
+    if already_built(name, version):
+        return True
+    print(f"Trying to autospec {name} - {version}")
+
+    proc = subprocess.run(["python3",
+                           f"{path}/../autospec/autospec/autospec.py", url,
+                           "-c", args.config, "-t", f"packages/{name}",
+                           "-n", name, "-m", args.mock_config,
+                           "-o", args.mock_opts, "-i"] + ver_arg, capture_output=True)
+    if proc.returncode == 0:
+        subprocess.run(["make", "link-new-rpms", f"PKG_REPO_DIR=packages/{name}"],
+                       capture_output=True)
+    return proc.returncode == 0
+
+
+def parse_go_mod(path):
+    """Parse go.mod file for build requirements.
+
+    File content looks as follows:
+
+    module example.com/foo/bar
+
+    require (
+        github.com/BurntSushi/toml v0.3.1
+        git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999
+        github.com/inconshreveable/mousetrap v1.0.0 // indirect
+        "github.com/spf13/cobra" v0.0.3
+        github.com/spf13/pflag v1.0.3 // indirect
+    )
+
+    Need to handle all require lines including //indirect.
+    Skip requires that use .git for now. May need to be handled
+    differently.
+    """
+    reqs = []
+    with open(path, "r") as gfile:
+        dep_start = False
+        for line in gfile.readlines():
+            # Ideally the mod file is generated and the format is
+            # always correct but add a few defenses just in case
+            line = line.strip()
+            if line.startswith("//"):
+                # Skip comments
+                continue
+            if dep_start:
+                # End of the require section
+                if line.startswith(")"):
+                    break
+                req = line.split()[:2]
+                req[0] = req[0].replace('"', '')
+                if req[0].endswith(".git"):
+                    continue
+                reqs.append(req)
+                continue
+            if line.startswith("require ("):
+                dep_start = True
+    return reqs
+
+
+def get_dependencies(name):
+    """Return path to the go.mod file if it exists."""
+    command = None
+    path = None
+    pdir = os.path.join("packages", name)
+    reqs = []
+    for fname in os.listdir(pdir):
+        # Find the archive
+        if fname.endswith("zip"):
+            command = ["unzip", fname]
+        elif ".tar." in fname:
+            command = ["tar", "xf", fname]
+        else:
+            command = None
+
+        if command:
+            # Decompress archive
+            tdir = tempfile.mkdtemp()
+            tfile = os.path.join(tdir, fname)
+            shutil.copyfile(os.path.join(pdir, fname), tfile)
+            proc = subprocess.run(command, cwd=tdir, capture_output=True)
+            if not proc.returncode:
+                # inspect contents for a "go.sum" file
+                for root, _, files in os.walk(tdir):
+                    if "go.mod" in files:
+                        path = f"{name}.gomod"
+                        shutil.copyfile(os.path.join(root, "go.mod"), path)
+                        reqs += parse_go_mod(path)
+                        os.unlink(path)
+            shutil.rmtree(tdir)
+
+    return reqs
+
+
+def encode_requirements(requirement):
+    """Encode the project's module and version."""
+    # Default dependency base proxy url
+    base_url = "https://proxy.golang.org/"
+    # Encoding based on
+    # https://tip.golang.org/cmd/go/#hdr-Module_proxy_protocol
+    encoded_module = ""
+    for char in requirement[0]:
+        if char.isupper():
+            encoded_module += "!" + char.lower()
+        else:
+            encoded_module += char
+    encoded_version = ""
+    for char in requirement[1]:
+        if char.isupper():
+            encoded_version += "!" + char.lower()
+        else:
+            encoded_version += char
+    return (encoded_module, encoded_version)
+
+
+def initialize_package(name, url, version, path, args):
+    """Setup package and try to build it."""
+    if already_built(name, version):
+        return True
+    print(f"Trying to autospecnew {name} - {version}")
+
+    proc = subprocess.run(["make", "autospecnew", f"URL={url}", f"NAME={name}", f"SETVERSION={version}"], capture_output=True)
+    if f"{name} already exists at" in proc.stdout.decode("utf-8"):
+        return build(path, args, name, url, version)
+    return proc.returncode == 0
+
+
+def build_recursive(path, args, name, url, version=None, success=None):
+    """Try and recursively build packages."""
+    if not success:
+        # First package being built, common utilities already run
+        # so just use autospec directly
+        success = {}
+        ret = build(path, args, name, url, version)
+    else:
+        ret = initialize_package(name, url, version, path, args)
+
+    if ret:
+        # Completed so we are done!
+        return True
+
+    if not missing_dependencies(name):
+        # Failed but not due to missing dependencies, bail
+        print(f"Unknown error building {name} - {version}")
+        return False
+
+    reqs = get_dependencies(name)
+    if not reqs:
+        # Didn't try and add anything so don't need to build again
+        print(f"Build failed with no missing requirements: {name} - {version}")
+        return False
+
+    print(f"First attempt to build failed due to missing dependencies {name} - {version}\n")
+    for req in reqs:
+        ereq = encode_requirements(req)
+        rname = "go-" + req[0].replace("/", "-")
+        rurl = f"https://proxy.golang.org/{ereq[0]}/@v/list"
+        if (rname, req[1]) in success:
+            # Rebuild detected, figure out if it is okay or not
+            if success[(rname, req[1])]:
+                # Already succeeded building req short circuit success
+                continue
+            else:
+                # Encountered a build loop, bail out as this likely
+                # requires manual fixing
+                print(f"Detected build loop when building {rname} - {req[1]}")
+                return True
+        success[(rname, req[1])] = False
+        if not build_recursive(path, args, rname, rurl, req[1], success):
+            print(f"Failed to build dependency {rname} - {req[1]}")
+            return False
+
+        success[(rname, req[1])] = True
+        subprocess.run(["make", "repodel"], cwd=f"packages/{rname}", capture_output=True)
+        subprocess.run(["make", "repostage"], cwd=f"packages/{rname}", capture_output=True)
+
+    # Create the repo with the new packages added
+    subprocess.run(["make", "localrepocreate"], capture_output=True)
+    # Retry previously failed build assuming dependencies got added
+    print(f"Rebuilding after resolving dependencies {name} - {version}")
+    ret = build(path, args, name, url, version)
+    print("")
+
+    return ret
+
+
+def main():
+    """Start program execution."""
+    args = parse_args()
+    path = os.path.dirname(os.path.realpath(__file__))
+    return build_recursive(path, args, args.name, args.url)
+
+if __name__ == '__main__':
+    if not main():
+        sys.exit(-1)
+    print("\n\nBuild completed\n\n")

licenses-spdx

@@ -46,6 +46,7 @@ BSD-3-Clause-LBNL
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-Warranty
+BSD-3-Clause-Open-MPI
 BSD-4-Clause
 BSD-4-Clause-UC
 BSD-Protection
@@ -56,6 +57,7 @@ Barr
 Beerware
 BitTorrent-1.0
 BitTorrent-1.1
+BlueOak-1.0.0
 Borceux
 CATOSL-1.1
 CC-BY-1.0
@@ -88,6 +90,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.5
 CC-BY-SA-3.0
 CC-BY-SA-4.0
+CC-PDDC
 CC0-1.0
 CDDL-1.0
 CDDL-1.1
@@ -293,6 +296,7 @@ OpenSSL
 PDDL-1.0
 PHP-3.0
 PHP-3.01
+Parity-6.0.0
 Plexus
 PostgreSQL
 Python-2.0
@@ -311,12 +315,15 @@ SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
+SHL-0.5
+SHL-0.51
 SISSL
 SISSL-1.2
 SMLNJ
 SMPPL
 SNIA
 SPL-1.0
+SSPL-1.0
 SWL
 Saxpath
 Sendmail
@@ -365,6 +372,7 @@ Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
 Zlib
+blessing
 bzip2-1.0.5
 bzip2-1.0.6
 copyleft-next-0.3.0

packages

@@ -8,6 +8,7 @@ Cheetah
 CherryPy
 Coin
 ConfigArgParse
+CopyQ
 Counter
 Cura
 CuraEngine
@@ -22,6 +23,7 @@ FreeCAD
 FreeRDP
 GConf
 GitPython
+Gradio
 GtkD
 HeapDict
 ImageMagick
@@ -152,6 +154,8 @@ R-R.oo
 R-R.utils
 R-R2Cuba
 R-R2HTML
+R-R2WinBUGS
+R-R2jags
 R-R6
 R-RANN
 R-RColorBrewer
@@ -400,6 +404,7 @@ R-fpc
 R-fracdiff
 R-fs
 R-fst
+R-furrr
 R-futile.logger
 R-futile.options
 R-future
@@ -500,6 +505,7 @@ R-leaps
 R-lfe
 R-lhs
 R-libcoin
+R-linprog
 R-lintr
 R-listenv
 R-listviewer
@@ -544,6 +550,7 @@ R-minpack.lm
 R-minqa
 R-mirt
 R-misc3d
+R-miscF
 R-miscTools
 R-mitools
 R-mixtools
@@ -564,6 +571,7 @@ R-multcompView
 R-multicool
 R-multiwayvcov
 R-munsell
+R-mvnfast
 R-mvnormtest
 R-mvoutlier
 R-mvtnorm
@@ -1002,6 +1010,7 @@ appstream
 appstream-glib
 apr
 apr-util
+arandr
 arc-theme
 argcomplete
 argon2
@@ -1114,6 +1123,7 @@ boto
 boto3
 botocore
 bovo
+brasero
 breathe
 breeze
 breeze-gtk
@@ -1284,7 +1294,6 @@ compat-curl-gnutls-soname4
 compat-double-conversion-soname1
 compat-efivar-soname0
 compat-enchant-soname1
-compat-exiv2-soname26
 compat-fuse-soname2
 compat-gdal-soname20
 compat-gegl
@@ -1302,7 +1311,7 @@ compat-icu4c-soname63
 compat-ilmbase-soname23
 compat-intel-gmmlib-soname1
 compat-ipset-soname10
-compat-ldc-soname84
+compat-iptables-soname0.1.0
 compat-libgit2-soname27
 compat-libical-soname2
 compat-libidn-soname11
@@ -1322,10 +1331,6 @@ compat-opencv-soname33
 compat-opencv-soname34
 compat-openexr-soname23
 compat-openssl-soname-10
-compat-poppler-soname78
-compat-poppler-soname82
-compat-poppler-soname83
-compat-poppler-soname86
 compat-proj-soname13
 compat-protobuf-soname14
 compat-protobuf-soname15
@@ -1517,6 +1522,7 @@ dmidecode
 dmlc-core
 dnf
 dnf-plugins-core
+dns-lexicon
 dnsmasq
 dnspython
 doc8
@@ -1545,6 +1551,7 @@ dpdk
 dracut
 dragon
 drkonqi
+dropwatch
 dssi
 dstat
 dtc
@@ -1617,6 +1624,7 @@ fastnumbers
 fcgi
 fcoe-utils
 fdm_materials
+fdupes
 feh
 fetchmail
 ffmpegthumbs
@@ -1648,6 +1656,7 @@ flatpak-builder
 fldigi
 flex
 flink-dep
+fllog
 flmsg
 flnet
 flrig
@@ -1697,7 +1706,9 @@ gdl
 gdm
 geany
 geany-plugins
+geary
 gedit
+geeqie
 gegl
 gensim
 geoclue
@@ -1749,8 +1760,10 @@ gnome-boxes
 gnome-calculator
 gnome-calendar
 gnome-characters
+gnome-clocks
 gnome-color-manager
 gnome-common
+gnome-contacts
 gnome-control-center
 gnome-desktop
 gnome-disk-utility
@@ -1923,6 +1936,7 @@ igt-gpu-tools
 ilmbase
 image
 imageio
+imagescan
 imagesize
 imapfilter
 imlib2
@@ -1952,6 +1966,7 @@ ipaddress
 ipcalc
 ipdb
 ipdbplugin
+ipe
 iperf
 ipmctl
 ipmitool
@@ -1983,6 +1998,7 @@ itsdangerous
 itstool
 iw
 ixion
+jack2
 jansson
 jaraco.functools
 jarn.viewdoc
@@ -2096,6 +2112,7 @@ keditbookmarks
 keepalived
 keepassxc
 kemoticons
+kerberos
 kernel-config
 kernel-config-checker
 kernel-install
@@ -2367,6 +2384,7 @@ libgnomekbd
 libgovirt
 libgpg-error
 libgphoto2
+libgpiod
 libgravatar
 libgsystem
 libgtop
@@ -2445,6 +2463,7 @@ libpeas
 libpfm
 libpinyin
 libpipeline
+libplacebo
 libpng
 libpsl
 libpthread-stubs
@@ -2557,7 +2576,6 @@ linux-libc-headers
 linux-lts2017
 linux-lts2018
 linux-mainline
-linux-networktest
 linux-oracle
 linux-preempt-rt
 linux-steam-integration
@@ -2605,10 +2623,13 @@ lxqt-runner
 lxqt-session
 lxqt-sudo
 lxqt-themes
+lynx
 lz4
 lzlib
 lzo
 lzop
+m17n-db
+m17n-lib
 m4
 mailcommon
 mailimporter
@@ -2622,7 +2643,6 @@ mariadb
 mash
 materia-theme
 matplotlib
-maven-dep
 mc
 mccabe
 mcelog
@@ -2659,6 +2679,7 @@ mkfontdir
 mkfontscale
 mkl-dnn
 mkosi
+mlocate
 mlt
 mobile-broadband-provider-info
 mock
@@ -2711,28 +2732,54 @@ musl
 mutagen
 mutt
 mutter
+mvn-HikariCP-java7
+mvn-JavaEWAH
+mvn-RoaringBitmap
+mvn-accessors-smart
+mvn-activation
 mvn-aether-core
+mvn-airbase
+mvn-aircompressor
 mvn-animal-sniffer
+mvn-ant
+mvn-ant-launcher
 mvn-antlr
 mvn-antlr4
 mvn-aopalliance
 mvn-apache
 mvn-apache-jar-resource-bundle
+mvn-apache-log4j-extras
 mvn-apache-rat
+mvn-arpack_combined_all
+mvn-arrow
 mvn-asm
 mvn-autolink
+mvn-automaton
 mvn-avalon-framework
+mvn-avro
 mvn-backport-util-concurrent
 mvn-beanshell
 mvn-biz.aQute.bndlib
 mvn-bndlib
+mvn-bonecp
+mvn-bouncycastle
+mvn-breeze-macros_2.11
+mvn-breeze_2.11
+mvn-breeze_2.12
 mvn-build-helper-maven-plugin
 mvn-buildnumber-maven-plugin
 mvn-byte-buddy
+mvn-calcite
+mvn-calcite-avatica
 mvn-cdi-api
+mvn-cglib
 mvn-checker-compat-qual
 mvn-checkstyle
+mvn-chill-java
+mvn-chill_2.11
+mvn-classutil_2.12
 mvn-classworlds
+mvn-clirr-maven-plugin
 mvn-codehaus-jackson
 mvn-commons-beanutils
 mvn-commons-chain
@@ -2740,52 +2787,125 @@ mvn-commons-cli
 mvn-commons-codec
 mvn-commons-collections
 mvn-commons-compress
+mvn-commons-configuration
+mvn-commons-configuration2
+mvn-commons-crypto
+mvn-commons-csv
+mvn-commons-daemon
+mvn-commons-dbcp
 mvn-commons-digester
+mvn-commons-exec
 mvn-commons-httpclient
 mvn-commons-io
 mvn-commons-jxpath
 mvn-commons-lang
 mvn-commons-lang3
 mvn-commons-logging
+mvn-commons-math
+mvn-commons-math3
+mvn-commons-net
 mvn-commons-parent
+mvn-commons-pool
+mvn-commons-text
 mvn-commons-validator
+mvn-compiler-interface
+mvn-compress-lzf
+mvn-cssparser
+mvn-curator
+mvn-datanucleus-api-jdo
+mvn-datanucleus-core
+mvn-datanucleus-rdbms
 mvn-decentxml
+mvn-derby
+mvn-dnsjava
 mvn-dom4j
 mvn-doxia
 mvn-doxia-sitetools
 mvn-doxia-tools
+mvn-ehcache
+mvn-eigenbase-properties
 mvn-enforcer
 mvn-error_prone_annotations
+mvn-exec-maven-plugin
 mvn-extra-enforcer-rules
+mvn-fastutil
 mvn-file-management
+mvn-flatbuffers
 mvn-flexmark-java
+mvn-fst
+mvn-generex
 mvn-genesis
+mvn-geronimo-jcache_1.0_spec
 mvn-google
 mvn-google-collections
+mvn-grizzled-scala_2.12
+mvn-gson
 mvn-guava
 mvn-guice
+mvn-guice-servlet
+mvn-h2database
+mvn-hadoop
 mvn-hamcrest
+mvn-hive
+mvn-hk2
+mvn-hppc
+mvn-htmlunit
+mvn-htmlunit-core-js
+mvn-htrace
 mvn-httpcomponents-client
 mvn-httpcomponents-core
+mvn-httpcomponents-parent
+mvn-hydromatic-parent
 mvn-icu4j
+mvn-incremental-compiler
+mvn-ivy
 mvn-j2objc-annotations
 mvn-jackrabbit
 mvn-jackson-annotations
+mvn-jackson-bom
 mvn-jackson-core
 mvn-jackson-databind
+mvn-jackson-dataformat-yaml
+mvn-jackson-jaxrs-providers
+mvn-jackson-module-jaxb-annotations
+mvn-jackson-module-paranamer
+mvn-jackson-module-scala_2.11
+mvn-jackson-module-scala_2.12
+mvn-jackson-modules-base
+mvn-jackson-parent
+mvn-janino
 mvn-jansi
 mvn-java-boot-classpath-detector
+mvn-java-util
+mvn-javassist
 mvn-javax-servlet
+mvn-javax.annotation-api
 mvn-javax.inject
+mvn-javax.servlet-api
+mvn-javax.ws.rs-api
+mvn-javolution
+mvn-jaxb-api
 mvn-jaxb-impl
+mvn-jcip-annotations
+mvn-jdependency
+mvn-jdo-api
 mvn-jdom
+mvn-jdom2
+mvn-jersey
 mvn-jersey-apache-client4
-mvn-jersey-core
 mvn-jersey-json
+mvn-jettison
 mvn-jetty
 mvn-jetty-parent
-mvn-jetty-util
+mvn-jline
+mvn-jmock
 mvn-jna
+mvn-jniloader
+mvn-joda-time
+mvn-jodd
+mvn-jopt-simple
+mvn-jpam
+mvn-jpmml-model
 mvn-jsch
 mvn-jsch.agentproxy.connector-factory
 mvn-jsch.agentproxy.core
@@ -2794,27 +2914,66 @@ mvn-jsch.agentproxy.sshagent
 mvn-jsch.agentproxy.svnkit-trilead-ssh2
 mvn-jsch.agentproxy.usocket-jna
 mvn-jsch.agentproxy.usocket-nc
+mvn-json
+mvn-json-io
+mvn-json-smart
+mvn-json4s
+mvn-json4s_2.11
 mvn-jsoup
+mvn-jsp-api
 mvn-jsr250-api
 mvn-jsr305
-mvn-jsr311-api
+mvn-jsr311
+mvn-jta
+mvn-jtidy
+mvn-jtransforms
 mvn-junit
+mvn-junit-interface
+mvn-kafka-clients
+mvn-kafka_2.12
+mvn-kerby
+mvn-kryo
+mvn-kubernetes-client
 mvn-kxml2
+mvn-leveldbjni
 mvn-log4j
 mvn-logback-classic
 mvn-logback-core
 mvn-logkit
+mvn-lz4-java
+mvn-machinist_2.11
+mvn-machinist_2.12
+mvn-macro-compat_2.11
+mvn-macro-compat_2.12
 mvn-maven
 mvn-maven-aether-provider
+mvn-maven-antrun-plugin
 mvn-maven-archiver
 mvn-maven-artifact
 mvn-maven-artifact-manager
+mvn-maven-artifact-transfer
+mvn-maven-assembly-plugin
 mvn-maven-builder-support
 mvn-maven-bundle-plugin
+mvn-maven-checkstyle-plugin
+mvn-maven-clean-plugin
+mvn-maven-common-artifact-filters
 mvn-maven-compat
+mvn-maven-compiler-plugin
 mvn-maven-core
+mvn-maven-dependency-plugin
+mvn-maven-deploy-plugin
+mvn-maven-docck-plugin
 mvn-maven-embedder
 mvn-maven-error-diagnostics
+mvn-maven-filtering
+mvn-maven-gpg-plugin
+mvn-maven-help-plugin
+mvn-maven-install-plugin
+mvn-maven-invoker
+mvn-maven-invoker-plugin
+mvn-maven-jar-plugin
+mvn-maven-javadoc-plugin
 mvn-maven-model
 mvn-maven-model-builder
 mvn-maven-monitor
@@ -2825,40 +2984,72 @@ mvn-maven-plugin-parameter-documenter
 mvn-maven-plugin-registry
 mvn-maven-plugin-testing
 mvn-maven-plugin-tools
+mvn-maven-plugins
 mvn-maven-profile
 mvn-maven-project
+mvn-maven-project-info-reports-plugin
+mvn-maven-release
 mvn-maven-reporting-api
 mvn-maven-reporting-exec
 mvn-maven-reporting-impl
 mvn-maven-repository-metadata
 mvn-maven-resolver
 mvn-maven-resolver-provider
+mvn-maven-resources-plugin
 mvn-maven-scm
 mvn-maven-scm-provider-svnjava
+mvn-maven-scm-publish-plugin
 mvn-maven-settings
+mvn-maven-settings-builder
+mvn-maven-shade-plugin
 mvn-maven-shared
+mvn-maven-shared-utils
+mvn-maven-site-plugin
 mvn-maven-slf4j-provider
+mvn-maven-source-plugin
 mvn-maven-surefire
 mvn-maven-toolchain
+mvn-maven-war-plugin
+mvn-mesos
+mvn-metrics
+mvn-minlog
+mvn-mockito
 mvn-mockito-core
 mvn-modello
 mvn-mojo-parent
 mvn-mojo-signature
+mvn-mssql-jdbc
 mvn-mvnplugins
+mvn-mysql-connector-java
 mvn-nekohtml
+mvn-netlib-java
+mvn-netty
 mvn-nexus-maven-plugins
 mvn-nexus-public
+mvn-nimbus-jose-jwt
 mvn-objenesis
+mvn-okhttp
+mvn-okio
+mvn-opencsv
 mvn-openhtmltopdf-parent
+mvn-orc
 mvn-org.apache.felix.bundlerepository
 mvn-org.eclipse.sisu.inject
 mvn-org.eclipse.sisu.plexus
 mvn-org.osgi.compendium
 mvn-org.osgi.core
 mvn-oro
+mvn-osgi-resource-locator
 mvn-oss-parents
 mvn-ow2
+mvn-paranamer
+mvn-parboiled
+mvn-parquet-format
+mvn-parquet-mr
 mvn-pdfbox
+mvn-pegdown
+mvn-pgjdbc
+mvn-pgjdbc-parent-poms
 mvn-plexus
 mvn-plexus-archiver
 mvn-plexus-build-api
@@ -2876,37 +3067,86 @@ mvn-plexus-resources
 mvn-plexus-utils
 mvn-plexus-velocity
 mvn-protobuf-java
+mvn-py4j
+mvn-pyrolite
 mvn-qdox
+mvn-re2j
+mvn-sac
+mvn-sbt-interface
+mvn-scala-compiler
+mvn-scala-library
+mvn-scala-logging
+mvn-scala-maven-plugin
+mvn-scala-parser-combinators_2.12
+mvn-scala-reflect
+mvn-scala-xml_2.12
+mvn-scalacheck
+mvn-scalactic_2.12
+mvn-scalastyle-maven-plugin
+mvn-scalatest-maven-plugin
+mvn-scalatest_2.12
+mvn-scopt_2.12
+mvn-selenium
 mvn-sequence-library
 mvn-servlet-api
+mvn-shapeless_2.11
+mvn-shapeless_2.12
 mvn-siesta
 mvn-sisu
+mvn-sisu-guice
 mvn-sisu-maven-plugin
 mvn-slf4j
 mvn-snakeyaml
 mvn-snappy
+mvn-snappy-java
 mvn-sonatype-aether
 mvn-sonatype-plexus-sec-dispatcher
 mvn-spice-zapper
+mvn-spire_2.11
+mvn-spire_2.12
 mvn-sqljet
 mvn-sslext
+mvn-stax-api
+mvn-stax2-api
+mvn-stream-lib
+mvn-stringtemplate
+mvn-stringtemplate4
 mvn-struts
+mvn-super-csv
 mvn-svnkit
+mvn-test-interface
+mvn-thrift
+mvn-treelayout
 mvn-trilead-ssh2
 mvn-tycho
+mvn-univocity-parsers
+mvn-unused
 mvn-validation-api
 mvn-velocity
 mvn-velocity-tools
 mvn-wagon
+mvn-webbit
 mvn-weld-api
 mvn-weld-parent
+mvn-woodstox-core
+mvn-xalan
 mvn-xbean
 mvn-xercesImpl
 mvn-xercesMinimal
 mvn-xml-apis
+mvn-xmlenc
+mvn-xmlpull
 mvn-xmlunit
 mvn-xmlunit-core
+mvn-xpp3_min
+mvn-xstream
 mvn-xz
+mvn-yetus
+mvn-zinc
+mvn-zjsonpatch
+mvn-zkclient
+mvn-zookeeper
+mvn-zstd-jni
 mxnet
 mycroft-core
 mypaint-brushes
@@ -3023,8 +3263,8 @@ opencv
 openexr
 openjade
 openjdk
-openjdk10
 openjdk11
+openjdk12
 openjdk9
 openldap
 openmpi
@@ -3151,6 +3391,7 @@ perl-AnyEvent-CacheDNS
 perl-Apache-Htpasswd
 perl-Apache-Session
 perl-App-cpanminus
+perl-AppConfig
 perl-Archive-Cpio
 perl-Archive-Extract
 perl-Archive-Tar-Wrapper
@@ -3162,6 +3403,7 @@ perl-Audio-FLAC-Header
 perl-Audio-Musepack
 perl-Audio-Scan
 perl-Audio-Wav
+perl-Authen-NTLM
 perl-Authen-SASL
 perl-B-Hooks-EndOfScope
 perl-B-Hooks-OP-Check
@@ -3217,6 +3459,7 @@ perl-Class-Singleton
 perl-Class-Std
 perl-Class-Std-Fast
 perl-Class-Tiny
+perl-Class-Trigger
 perl-Class-Unload
 perl-Class-XSAccessor
 perl-Clipboard
@@ -3233,8 +3476,10 @@ perl-Config-Std
 perl-Config-Tiny
 perl-Context-Preserve
 perl-Convert-ASN1
+perl-Convert-Bencode
 perl-Convert-Binary-C
 perl-Cookie-Baker
+perl-Coro
 perl-Cpanel-JSON-XS
 perl-Crypt-DH-GMP
 perl-Crypt-Eksblowfish
@@ -3310,6 +3555,7 @@ perl-Digest-CRC
 perl-Digest-HMAC
 perl-Digest-JHash
 perl-Digest-MD5
+perl-Digest-SHA1
 perl-Digest-SHA3
 perl-Dist-CheckConflicts
 perl-Domain-PublicSuffix
@@ -3385,6 +3631,7 @@ perl-Geo-Distance
 perl-Geo-IP
 perl-Geo-IPfree
 perl-Getopt-Euclid
+perl-Getopt-Long-Descriptive
 perl-Getopt-Tabular
 perl-Git-Version-Compare
 perl-Glib
@@ -3452,6 +3699,7 @@ perl-Importer
 perl-Inline
 perl-Inline-C
 perl-JSON
+perl-JSON-Any
 perl-JSON-MaybeXS
 perl-JSON-RPC
 perl-JSON-XS
@@ -3538,12 +3786,17 @@ perl-MooX-Role-Parameterized
 perl-Moose
 perl-MooseX-Role-Parameterized
 perl-MooseX-Role-WithOverloading
+perl-MooseX-Types
+perl-MooseX-Types-JSON
+perl-MooseX-Types-LoadableClass
+perl-MooseX-Types-Path-Class
 perl-Mozilla-CA
 perl-Net-Bluetooth
 perl-Net-CIDR-Lite
 perl-Net-DBus
 perl-Net-DNS
 perl-Net-DNS-Resolver-Programmable
+perl-Net-Daemon
 perl-Net-HTTP
 perl-Net-IDN-Encode
 perl-Net-INET6Glue
@@ -3556,6 +3809,7 @@ perl-Net-OpenID-Consumer
 perl-Net-OpenSSH
 perl-Net-SFTP-Foreign
 perl-Net-SMTP-SSL
+perl-Net-SSH2
 perl-Net-SSLeay
 perl-Net-Server
 perl-Net-UPnP
@@ -3565,7 +3819,9 @@ perl-Number-Bytes-Human
 perl-Number-Compare
 perl-Number-Format
 perl-Number-WithError
+perl-Object-Accessor
 perl-Object-Signature
+perl-PDF-API2
 perl-PDF-Table
 perl-PDF-Writer
 perl-POD2-Base
@@ -3599,6 +3855,7 @@ perl-PerlIO-eol
 perl-PerlIO-gzip
 perl-PerlIO-utf8_strict
 perl-PerlIO-via-Timeout
+perl-PlRPC
 perl-Pod-Constants
 perl-Pod-Coverage
 perl-Pod-LaTeX
@@ -3640,6 +3897,7 @@ perl-Specio
 perl-Spiffy
 perl-Statistics-Basic
 perl-Statistics-CaseResampling
+perl-Stream-Buffered
 perl-String-Approx
 perl-String-CamelCase
 perl-String-Escape
@@ -3649,6 +3907,7 @@ perl-String-Random
 perl-String-Similarity
 perl-Struct-Dumb
 perl-Sub-Exporter
+perl-Sub-Exporter-ForMethods
 perl-Sub-Exporter-Progressive
 perl-Sub-Identify
 perl-Sub-Info
@@ -3664,8 +3923,10 @@ perl-Sys-Mmap
 perl-Sys-SigAction
 perl-Sys-Statistics-Linux
 perl-System-Command
+perl-TAP-Formatter-HTML
 perl-TAP-Harness-Archive
 perl-Taint-Util
+perl-Template-Toolkit
 perl-Term-ProgressBar
 perl-Term-ReadKey
 perl-Term-ReadLine-Gnu
@@ -3692,6 +3953,7 @@ perl-Test-LeakTrace
 perl-Test-LectroTest
 perl-Test-LongString
 perl-Test-Manifest
+perl-Test-Memory-Cycle
 perl-Test-MockModule
 perl-Test-MockTime
 perl-Test-More-UTF8
@@ -3736,6 +3998,7 @@ perl-Text-Levenshtein-Damerau
 perl-Text-Markdown
 perl-Text-PDF
 perl-Text-Quoted
+perl-Text-RecordParser
 perl-Text-Reform
 perl-Text-Roman
 perl-Text-TabularDisplay
@@ -3769,6 +4032,7 @@ perl-UUID-Tiny
 perl-Unicode-LineBreak
 perl-Unicode-Map
 perl-Variable-Magic
+perl-WWW-Form-UrlEncoded
 perl-WWW-Form-UrlEncoded-XS
 perl-WWW-RobotRules
 perl-X11-IdleTime
@@ -3799,6 +4063,7 @@ perl-YAML
 perl-YAML-LibYAML
 perl-YAML-Syck
 perl-YAML-Tiny
+perl-accessors
 perl-aliased
 perl-autobox
 perl-autovivification
@@ -3823,12 +4088,72 @@ phonon
 phonon-vlc
 phoronix-test-suite
 php
+php-APCu
+php-Bitset
+php-Molten
+php-PDO_SQLANYWHERE
+php-SeasClick
+php-SeasLog
+php-Xdebug
+php-Yaf
+php-ahocorasick
+php-apfd
+php-ast
+php-componere
+php-crypto
+php-datadog_trace
+php-dbase
+php-dio
+php-ds
+php-eio
+php-env
+php-ev
+php-gRPC
+php-gender
+php-geospatial
+php-gnupg
+php-hprose
+php-hrtime
+php-igbinary
 php-imagick
+php-inotify
+php-jsmin
+php-json_post
+php-jsond
+php-krb5
+php-lua
+php-lzf
 php-mailparse
+php-mongodb
+php-msgpack
+php-oauth
+php-opencensus
+php-parle
+php-pcov
+php-pcs
+php-proctitle
+php-propro
+php-protobuf
+php-psr
+php-radius
+php-raphf
 php-redis
+php-scrypt
+php-stackdriver_debugger
+php-stomp
+php-svm
+php-sync
+php-taint
+php-timecop
 php-timezonedb
-php-xdebug
+php-trader
+php-uopz
+php-vld
+php-xattr
+php-xlswriter
+php-xxtea
 php-yaml
+php-yar
 php-zip
 pickleshare
 picmi
@@ -3866,6 +4191,7 @@ ply
 plzip
 pm-graph
 pmdk
+po4a
 polkit
 polkit-kde-agent
 polkit-qt
@@ -3949,7 +4275,6 @@ pygtk
 pygtkglext
 pyhs100
 pyinotify
-pykerberos
 pykwalify
 pylama
 pyliblzma
@@ -4029,6 +4354,7 @@ python-polib
 python-rpm-legacypython
 python-saharaclient
 python-senlinclient
+python-slip
 python-slugify
 python-subunit
 python-swiftclient
@@ -4058,7 +4384,6 @@ qbittorrent
 qca-qt5
 qemu
 qemu-guest-additions
-qemu-lite
 qgit
 qhull
 qml-box2d
@@ -4139,6 +4464,7 @@ repoze.lru
 repoze.sphinx.autointerface
 repoze.who
 requests
+requests-file
 requests-kerberos
 requests-mock
 requests-ntlm
@@ -4311,6 +4637,7 @@ stow
 strace
 stress-ng
 stunnel
+su-exec
 subunit
 subunit2sql
 subversion
@@ -4406,6 +4733,7 @@ tinyrpc
 tinyxml2
 tiptop
 tk
+tldextract
 tmux
 todoist
 tokyocabinet
@@ -4626,6 +4954,7 @@ yasm
 yelp
 yelp-tools
 yelp-xsl
+ytnef
 yum
 yum-metadata-parser
 zVMCloudConnector
@@ -4640,7 +4969,6 @@ zip
 zipp
 zlib
 znc
-zoneminder
 zookeeper-dep
 zope.component
 zope.configuration

patchfilter.py

@@ -265,6 +265,7 @@ def main():
     zap_line_in_file_start(".spec", "%description dev")
     zap_line_in_file_start(".spec", "%description license")
     zap_line_in_file_start(".spec", "%package doc")
+    zap_line_in_file_start(".spec", "cp -a ")
  
     zap_line_in_file_start("b/Makefile", "URL =")
     zap_line_in_file_start("b/Makefile", "PKG_NAME :=")

user-setup.sh

@@ -145,9 +145,9 @@ if [ "$USE_KOJI" ]; then
   cp "$CLIENTCA" ~/.koji/clientca.crt
   cp "$SERVERCA" ~/.koji/serverca.crt
 
-  if [ ! -f /etc/koji.conf ]; then
+  if [ ! -f ~/.koji/config ]; then
     echo "Setting up koji config . . ."
-    sudo cp projects/common/conf/koji.conf /etc
+    cp -f projects/common/conf/koji.conf ~/.koji/config
   fi
 fi