Merge branch 'perfsonar:master' into layer2scan

I2util/unibuild-packaging/rpm/I2util.spec

@@ -1,4 +1,4 @@
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:           I2util
@@ -10,6 +10,10 @@ Group:          Development/Libraries
 Source0:        I2util.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc
+
 %description
 I2 Utility library. Currently contains:
 	* error logging

ethr/unibuild-packaging/rpm/ethr.spec

@@ -33,18 +33,32 @@ such as Windows, Linux and other Unix systems.
 %global debug_package %{nil}
 
 
-%define gopath $(pwd)/GOPATH
-%define gobin %{gopath}/bin
-%define gocache %{gopath}/.cache
+%define godir $(pwd)/GOPATH
+%define gopath %{godir}:/usr/lib/golang/src/vendor:/usr/lib/golang/pkg/linux_amd64/vendor
+%define gobin %{godir}/bin
+%define gocache %{godir}/.cache
 
 %prep
 %setup -q
 
-mkdir -p %{gopath} %{gobin}
 
-export GOPATH=%{gopath}
-export GOBIN=%{gobin}
-export GOCACHE=%{gocache}
+%build
+export GOPATH="%{gopath}"
+export GOBIN="%{gobin}"
+export GOCACHE="%{gocache}"
+
+mkdir -p "%{godir}" "%{gobin}"
+
+# Go leaves a bunch of directories read-only, which makes cleaning out
+# the workspace difficult.  Make sure that's cleaned up no matter
+# what.
+
+mkdir -p "%{godir}"
+cleanup()
+{
+    find "%{godir}" -type d | xargs chmod +w
+}
+trap cleanup EXIT
 
 %if 0%{?el7}
 ## EL7 has problems with its git that cause module fetches not to work.
@@ -57,17 +71,9 @@ go mod init microsoft.com/ethr
 go mod tidy -e
 go get ./...
 
-
-
-%build
-export GOPATH=%{gopath}
-export GOBIN=%{gobin}
-export GOCACHE=%{gocache}
-
 go build
 
 
-
 %install
 %{__mkdir_p} %{buildroot}/%{_bindir}
 install %{name} %{buildroot}/%{_bindir}/%{name}

owamp/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+owamp (5.0.2~a1.0-1) perfsonar-5.0-snapshot; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Wed, 31 May 2023 07:47:00 -0700
+
 owamp (5.0.1~a1.0-1) perfsonar-5.0-snapshot; urgency=low
 
   * New upstream version.

owamp/unibuild-packaging/rpm/owamp.spec

@@ -2,7 +2,7 @@
 # Adapted from the spec in the sources
 #
 
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name: owamp
@@ -153,7 +153,16 @@ mv selinux/*.pp %{buildroot}/usr/share/selinux/packages/
 rm -rf %{buildroot}/usr/lib/perfsonar/selinux
 
 %check
-make check
+
+# TODO: This fails in Docker containers because the server doesn't
+# start.  The makes in the %build block do, too, but it ignores them.
+
+if fgrep -q /machine.slice/ /proc/1/cgroup
+then
+    printf "\nWarning: Not running check step in container\n\n"
+else
+    make check
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT 

paris-traceroute/unibuild-packaging/deb/patches/series

@@ -1,2 +1,3 @@
-00-buffer-size
+paris-traceroute-00-mda-bounds.patch
+paris-traceroute-01-buffer-overrun.patch
 01-version

paris-traceroute/unibuild-packaging/paris-traceroute-00-mda-bounds.patch

@@ -0,0 +1,12 @@
+diff -rupN paris-traceroute-1.0-orig/libparistraceroute/algorithms/mda/interface.h paris-traceroute-1.0/libparistraceroute/algorithms/mda/interface.h
+--- paris-traceroute-1.0-orig/libparistraceroute/algorithms/mda/interface.h	2016-04-21 13:58:33.000000000 +0000
++++ paris-traceroute-1.0/libparistraceroute/algorithms/mda/interface.h	2023-05-08 16:57:49.159112849 +0000
+@@ -111,7 +111,7 @@ void mda_flow_dump(const mda_interface_t
+  *    the corresponding FQDN.
+  */
+
+-void mda_link_dump(const mda_interface_t ** link, bool do_resolv);
++void mda_link_dump(const mda_interface_t * link[2], bool do_resolv);
+
+ /**
+  * \brief Callback used by lattice_dump

paris-traceroute/unibuild-packaging/paris-traceroute-01-buffer-overrun.patch

@@ -0,0 +1,12 @@
+diff -rupN paris-traceroute-1.0-orig/libparistraceroute/whois.c paris-traceroute-1.0/libparistraceroute/whois.c
+--- paris-traceroute-1.0-orig/libparistraceroute/whois.c	2016-04-21 13:58:33.000000000 +0000
++++ paris-traceroute-1.0/libparistraceroute/whois.c	2023-05-08 17:06:50.538561263 +0000
+@@ -85,7 +85,7 @@ bool whois_query(
+     int    family = server_address->family;
+     size_t len = 0;
+
+-    buffer[BUFFER_SIZE] = '\0';
++    buffer[BUFFER_SIZE - 1] = '\0';
+
+     if (queried_address->family != AF_INET && queried_address->family != AF_INET6) {
+         fprintf(stderr, "whois_query: queried address family not supported (family = %d)\n", queried_address->family);

paris-traceroute/unibuild-packaging/rpm/paris-traceroute.spec

@@ -19,6 +19,10 @@ Url:		http://www.paris-traceroute.net
 
 Source:		%{short}-%{version}.tar.gz
 
+Patch0:		paris-traceroute-00-mda-bounds.patch
+Patch1:         paris-traceroute-01-buffer-overrun.patch
+
+
 BuildRequires:  autoconf
 BuildRequires:  gcc
 BuildRequires:  libtool
@@ -33,6 +37,8 @@ A smarter traceroute
 
 %prep
 %setup -q -n %{short}-%{version}
+%patch0 -p1
+%patch1 -p1
 ./autogen.sh
 ./configure --prefix=%{_prefix}
 

postgresql-systemd-fix/Makefile

@@ -0,0 +1,7 @@
+#
+# Makefile for Any Package
+#
+
+AUTO_TARBALL := 1
+
+include unibuild/unibuild.make

postgresql-systemd-fix/postgresql-systemd-fix/unibuild-packaging/rpm/postgresql-systemd-fix.spec

@@ -0,0 +1,33 @@
+#
+# RPM Spec for postgresql-systemd-fix
+#
+
+Name:		postgresql-systemd-fix
+Version:	1.0
+Release:	1%{?dist}
+
+Summary:	Fix a problem with PostgreSQL stopping on EL8
+
+BuildArch:	noarch
+License:	Apache 2.0
+Group:		Unspecified
+Vendor:		perfSONAR Development Team
+URL:		http://www.perfsonar.net
+
+Source0:	%{name}-%{version}.tar.gz
+
+Provides:	%{name} = %{version}-%{release}
+
+Requires:	postgresql-server
+
+%description
+This packages fixes a problem with stopping PostgreSQL on EL8 systems
+under systemd.  See
+https://github.com/perfsonar/pscheduler/issues/1335 for details.
+
+
+%post
+sed -i -e 's/^TimeoutSec=.*$/TimeoutSec=10/' /usr/lib/systemd/system/postgresql.service
+systemctl daemon-reload
+
+%files

pscheduler-account/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-account (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:16 -0700
+
 pscheduler-account (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-account/unibuild-packaging/rpm/pscheduler-account.spec

@@ -2,7 +2,7 @@
 # RPM Spec for PostgreSQL Initializer
 #
 
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-account

pscheduler-archiver-bitbucket/bitbucket/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-bitbucket (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:17 -0700
+
 pscheduler-archiver-bitbucket (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	bitbucket
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}

pscheduler-archiver-esmond/esmond/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-esmond (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:15 -0700
+
 pscheduler-archiver-esmond (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	esmond
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-esmond

pscheduler-archiver-failer/failer/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-failer (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:18 -0700
+
 pscheduler-archiver-failer (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-failer/failer/unibuild-packaging/rpm/pscheduler-archiver-failer.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	failer
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}

pscheduler-archiver-http/http/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-http (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:18 -0700
+
 pscheduler-archiver-http (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-http/http/unibuild-packaging/rpm/pscheduler-archiver-http.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	http
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}

pscheduler-archiver-kafka/kafka/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-kafka (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:17 -0700
+
 pscheduler-archiver-kafka (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-kafka/kafka/unibuild-packaging/rpm/pscheduler-archiver-kafka.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	kafka
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}

pscheduler-archiver-postgresql/postgresql/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-postgresql (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:17 -0700
+
 pscheduler-archiver-postgresql (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	postgresql
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}

pscheduler-archiver-rabbitmq/rabbitmq/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-rabbitmq (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:18 -0700
+
 pscheduler-archiver-rabbitmq (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	rabbitmq
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}

pscheduler-archiver-snmptrap/snmptrap/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-snmptrap (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:15 -0700
+
 pscheduler-archiver-snmptrap (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.

pscheduler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec

@@ -3,7 +3,7 @@
 #
 
 %define short	snmptrap
-%define perfsonar_auto_version 5.0.1
+%define perfsonar_auto_version 5.0.2
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}

pscheduler-archiver-syslog/syslog/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+pscheduler-archiver-syslog (5.0.2-1) perfsonar-5.0; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 02 Jun 2023 08:59:18 -0700
+
 pscheduler-archiver-syslog (5.0.1-1) perfsonar-5.0; urgency=low
 
   * New upstream version.