Merge branch '5.1.0'

.gitignore

@@ -8,6 +8,9 @@
 .*.swp
 *~
 
+# Python by-products
+__pycache__
+
 # Ignore rpms, logs and other build artifacts
 unibuild-log
 unibuild-repo

I2util/unibuild-packaging/rpm/I2util.spec

@@ -0,0 +1,63 @@
+%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_relnum 1
+
+Name:           I2util
+Version:        %{perfsonar_auto_version}
+Release:        %{perfsonar_auto_relnum}%{?dist}
+Summary:        I2 Utility Library
+License:        ASL 2.0 
+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
+	* command-line parsing
+	* threading
+	* random number support
+	* hash table support
+
+The error logging and command-line parsing are taken from a utility library
+that is distributed with the "volsh" code from UCAR.
+
+http://www.scd.ucar.edu/vets/vg/Software/volsh
+
+
+%global debug_package %{nil}
+
+
+%prep
+%setup -q -n "%{name}"
+
+%build
+sh ./bootstrap.sh
+%configure
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+#%doc Changes LICENSE README
+%license LICENSE
+%doc README
+%{_bindir}/*
+%{_libdir}/libI2util.a
+%{_mandir}/man1/*
+%{_includedir}/*
+
+%changelog
+* Fri Aug 20 2010 Tom Throckmorton <throck@mcnc.org> 1.1-1
+- minor spec changes only
+
+* Fri Jan 11 2008 aaron@internet2.edu 1.0-1
+- Initial RPM

docs/README.md

@@ -0,0 +1,3 @@
+# pScheduler Documentation
+
+**This documentation is severely out-of-date and will be replaced in the future.***

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

@@ -28,9 +28,7 @@ Requires:	jsoncpp
 Requires:	openssl
 
 BuildRequires:  cmake
-#TODO: They really want this; EL7 doesn't have it.
-#BuildRequires:  gcc-c++ >= 4.9
-BuildRequires:  gcc-c++
+BuildRequires:  gcc-c++ >= 4.9
 BuildRequires:  libpcap-devel
 BuildRequires:  libtins-devel
 BuildRequires:  jsoncpp-devel

ethr/unibuild-packaging/deb/changelog

@@ -1,3 +1,10 @@
+ethr (0.2.1-4) perfsonar-5.1-staging; urgency=low
+
+  * Building on Ubuntu 20.
+  * Port to Debian 12 and Ubuntu 22.
+
+ -- Lætitia Delvaux <adelvaux@man.poznan.pl>  Tue, 23 Apr 2024 01:01:56 +0200 
+
 ethr (0.2.1-3) perfsonar-minor-staging; urgency=low
 
   * Rebuild with Unibuild

ethr/unibuild-packaging/rpm/ethr.spec

@@ -46,6 +46,8 @@ such as Windows, Linux and other Unix systems.
 export GOPATH="%{gopath}"
 export GOBIN="%{gobin}"
 export GOCACHE="%{gocache}"
+export GOFLAGS=-buildvcs=false
+
 
 mkdir -p "%{godir}" "%{gobin}"
 
@@ -60,13 +62,6 @@ cleanup()
 }
 trap cleanup EXIT
 
-%if 0%{?el7}
-## EL7 has problems with its git that cause module fetches not to work.
-## Use Golang's proxy to do it instead.
-#export GO111MODULE=on
-#export GOPROXY="https://proxy.golang.org"
-%endif
-
 go mod init microsoft.com/ethr
 go mod tidy -e
 go get ./...