Merge branch '5.1.1'

perfsonar · Jun 28, 2024 · 20ff766 · 20ff766
2 parents 6b5153f + 4e684fa
commit 20ff766
Show file tree

Hide file tree

Showing 224 changed files with 1,520 additions and 129 deletions.
diff --git a/I2util/unibuild-packaging/rpm/I2util.spec b/I2util/unibuild-packaging/rpm/I2util.spec
@@ -1,4 +1,4 @@
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:           I2util

diff --git a/dublin-traceroute/unibuild-packaging/rpm/dublin-traceroute.spec b/dublin-traceroute/unibuild-packaging/rpm/dublin-traceroute.spec
@@ -26,6 +26,7 @@ Requires:	libpcap
 Requires:	libtins
 Requires:	jsoncpp
 Requires:	openssl
+Requires:	rpm-post-wrapper
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++ >= 4.9
@@ -71,8 +72,10 @@ rm -rf %{buildroot}
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 # Deferred from the build
 setcap cap_net_raw+ep %{_bindir}/%{name}
+POST-WRAPPER-EOF
 
 
 

diff --git a/httpd-firewall/unibuild-packaging/rpm/httpd-firewall.spec b/httpd-firewall/unibuild-packaging/rpm/httpd-firewall.spec
@@ -17,16 +17,20 @@ Group:		Unspecified
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	httpd
+Requires:	firewalld
+Requires:	rpm-post-wrapper
 
 
 %description
 Firewall configuration for allowing access to HTTPD
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 systemctl enable --now firewalld
 firewall-cmd -q --add-service=https --permanent
 systemctl reload-or-try-restart firewalld
+POST-WRAPPER-EOF
 
 
 

diff --git a/httpd-wsgi-socket/unibuild-packaging/rpm/httpd-wsgi-socket.spec b/httpd-wsgi-socket/unibuild-packaging/rpm/httpd-wsgi-socket.spec
@@ -17,6 +17,7 @@ Group:		Unspecified
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	mod_wsgi
+Requires:	rpm-post-wrapper
 
 %description
 WSGI socket configuration for Apache HTTPD
@@ -36,7 +37,9 @@ EOF
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 systemctl reload-or-try-restart httpd
+POST-WRAPPER-EOF
 
 
 

diff --git a/jq/unibuild-packaging/deb/rules b/jq/unibuild-packaging/deb/rules
@@ -12,7 +12,15 @@ endif
 get-orig-source:
 	uscan --force-download --rename --destdir .
 
-override_dh_auto_configure:
+
+# This target replaces the version script with one that doesn't get
+# the wrong answer by depending on git.
+_fix-version:
+	printf "#!/bin/sh -e\necho '%s.10+pscheduler-patches'\n" \
+		$$(./configure --version | head -1 | sed -e "s/^[^']*'//g; s/'.*\$$//g") \
+		> ./scripts/version
+
+override_dh_auto_configure: _fix-version
 	cd docs && rake manpage > ../jq.1
 	dh_auto_configure -- --disable-static --disable-fpectl --without-fpectl
 

diff --git a/owamp/unibuild-packaging/deb/changelog b/owamp/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+owamp (5.1.1~a1.0-1) perfsonar-5.1-snapshot; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Tue, 11 Jun 2024 18:29:04 +0200
+
 owamp (5.1.0~a1.0-1) perfsonar-5.1-snapshot; urgency=low
 
   * New upstream version.

diff --git a/owamp/unibuild-packaging/rpm/owamp.spec b/owamp/unibuild-packaging/rpm/owamp.spec
@@ -2,7 +2,7 @@
 # Adapted from the spec in the sources
 #
 
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name: owamp

diff --git a/postgresql-init/unibuild-packaging/rpm/postgresql-init.spec b/postgresql-init/unibuild-packaging/rpm/postgresql-init.spec
@@ -32,6 +32,7 @@ Requires:	postgresql-devel >= %{_pscheduler_postgresql_version}
 Requires:	postgresql-libs >= %{_pscheduler_postgresql_version}
 Requires:	postgresql-plpython3 >= %{_pscheduler_postgresql_version}
 Requires:	postgresql-server  >= %{_pscheduler_postgresql_version}
+Requires:	rpm-post-wrapper
 
 Requires:       pscheduler-rpm
 
@@ -51,6 +52,7 @@ and makes sure it runs at boot.
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 
 # Note that if any of this fails, the install doesn't.  This is an
 # problem inherent in RPM that the developers won't fix.
@@ -76,6 +78,7 @@ systemctl start postgresql
 
 # Set up run at boot
 systemctl enable postgresql
+POST-WRAPPER-EOF
 
 
 %files

diff --git a/pscheduler-account/unibuild-packaging/deb/changelog b/pscheduler-account/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+pscheduler-account (5.1.1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 28 Jun 2024 10:50:45 -0400
+
 pscheduler-account (5.1.0) perfsonar-5.1; urgency=low
 
   * New upstream version.

diff --git a/pscheduler-account/unibuild-packaging/rpm/pscheduler-account.spec b/pscheduler-account/unibuild-packaging/rpm/pscheduler-account.spec
@@ -2,7 +2,7 @@
 # RPM Spec for PostgreSQL Initializer
 #
 
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-account
@@ -20,6 +20,8 @@ Group:		Unspecified
 
 Provides:	%{name} = %{version}-%{release}
 
+Requires:	rpm-post-wrapper
+
 BuildRequires:	pscheduler-rpm
 Requires: shadow-utils
 Requires(post): shadow-utils
@@ -47,6 +49,7 @@ EOF
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 
 if [ $1 -eq 1 ]  # One instance, new install
 then
@@ -87,6 +90,7 @@ chage \
     --inactive -1 \
     --maxdays 99999 \
     '%{user}'
+POST-WRAPPER-EOF
 
 
 

diff --git a/pscheduler-archiver-bitbucket/bitbucket/unibuild-packaging/deb/changelog b/pscheduler-archiver-bitbucket/bitbucket/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+pscheduler-archiver-bitbucket (5.1.1-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 28 Jun 2024 10:50:48 -0400
+
 pscheduler-archiver-bitbucket (5.1.0-1) perfsonar-5.1; urgency=low
 
   * New upstream version.

diff --git a/...er-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec b/...er-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec
@@ -3,7 +3,7 @@
 #
 
 %define short	bitbucket
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}
@@ -22,6 +22,7 @@ Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
 Requires:	%{_pscheduler_python}-pscheduler
+Requires:	rpm-post-wrapper
 
 BuildRequires:	pscheduler-rpm
 
@@ -45,7 +46,9 @@ make \
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 pscheduler internal warmboot
+POST-WRAPPER-EOF
 
 %postun
 pscheduler internal warmboot

diff --git a/pscheduler-archiver-esmond/esmond/unibuild-packaging/deb/changelog b/pscheduler-archiver-esmond/esmond/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+pscheduler-archiver-esmond (5.1.1-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 28 Jun 2024 10:50:39 -0400
+
 pscheduler-archiver-esmond (5.1.0-1) perfsonar-5.1; urgency=low
 
   * New upstream version.

diff --git a/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec b/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec
@@ -3,7 +3,7 @@
 #
 
 %define short	esmond
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-esmond
@@ -26,6 +26,7 @@ Requires:	%{_pscheduler_python}-memcached
 Requires:	memcached
 Requires(post):	memcached
 Requires:		chkconfig
+Requires:	rpm-post-wrapper
 
 BuildRequires:	pscheduler-rpm
 BuildRequires:  %{_pscheduler_python}-pscheduler
@@ -51,13 +52,15 @@ make \
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 pscheduler internal warmboot
 
 #Only start memcached on new install so people have ability to disable if they so desire
 if [ "$1" = "1" ]; then
     /sbin/chkconfig memcached on
     /sbin/service memcached start
 fi
+POST-WRAPPER-EOF
 
 
 

diff --git a/pscheduler-archiver-failer/failer/unibuild-packaging/deb/changelog b/pscheduler-archiver-failer/failer/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+pscheduler-archiver-failer (5.1.1-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 28 Jun 2024 10:50:50 -0400
+
 pscheduler-archiver-failer (5.1.0-1) perfsonar-5.1; urgency=low
 
   * New upstream version.

diff --git a/pscheduler-archiver-failer/failer/unibuild-packaging/rpm/pscheduler-archiver-failer.spec b/pscheduler-archiver-failer/failer/unibuild-packaging/rpm/pscheduler-archiver-failer.spec
@@ -3,7 +3,7 @@
 #
 
 %define short	failer
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}
@@ -22,6 +22,7 @@ Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
 Requires:	%{_pscheduler_python}-pscheduler
+Requires:	rpm-post-wrapper
 
 BuildRequires:	pscheduler-rpm
 
@@ -46,7 +47,9 @@ make \
 
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 pscheduler internal warmboot
+POST-WRAPPER-EOF
 
 %postun
 pscheduler internal warmboot

diff --git a/pscheduler-archiver-http/http/unibuild-packaging/deb/changelog b/pscheduler-archiver-http/http/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+pscheduler-archiver-http (5.1.1-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 28 Jun 2024 10:50:50 -0400
+
 pscheduler-archiver-http (5.1.0-1) perfsonar-5.1; urgency=low
 
   * New upstream version.

diff --git a/pscheduler-archiver-http/http/unibuild-packaging/rpm/pscheduler-archiver-http.spec b/pscheduler-archiver-http/http/unibuild-packaging/rpm/pscheduler-archiver-http.spec
@@ -3,7 +3,7 @@
 #
 
 %define short	http
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}
@@ -22,6 +22,7 @@ Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6.1
 Requires:	%{_pscheduler_python}-pscheduler >= 1.3.7.1
+Requires:	rpm-post-wrapper
 
 BuildRequires:	pscheduler-rpm
 
@@ -45,7 +46,9 @@ make \
      install
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 pscheduler internal warmboot
+POST-WRAPPER-EOF
 
 %postun
 pscheduler internal warmboot

diff --git a/pscheduler-archiver-kafka/kafka/unibuild-packaging/deb/changelog b/pscheduler-archiver-kafka/kafka/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+pscheduler-archiver-kafka (5.1.1-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 28 Jun 2024 10:50:46 -0400
+
 pscheduler-archiver-kafka (5.1.0-1) perfsonar-5.1; urgency=low
 
   * New upstream version.

diff --git a/pscheduler-archiver-kafka/kafka/unibuild-packaging/rpm/pscheduler-archiver-kafka.spec b/pscheduler-archiver-kafka/kafka/unibuild-packaging/rpm/pscheduler-archiver-kafka.spec
@@ -3,7 +3,7 @@
 #
 
 %define short	kafka
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}
@@ -22,6 +22,7 @@ Provides:	%{name} = %{version}-%{release}
 Requires:	pscheduler-server >= 1.0.2
 Requires:       %{_pscheduler_python}-kafka
 Requires:       %{_pscheduler_python}-pscheduler
+Requires:	rpm-post-wrapper
 
 BuildRequires:	pscheduler-rpm
 
@@ -45,7 +46,9 @@ make \
      install
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 pscheduler internal warmboot
+POST-WRAPPER-EOF
 
 %postun
 pscheduler internal warmboot

diff --git a/pscheduler-archiver-postgresql/postgresql/unibuild-packaging/deb/changelog b/pscheduler-archiver-postgresql/postgresql/unibuild-packaging/deb/changelog
@@ -1,3 +1,9 @@
+pscheduler-archiver-postgresql (5.1.1-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Fri, 28 Jun 2024 10:50:47 -0400
+
 pscheduler-archiver-postgresql (5.1.0-1) perfsonar-5.1; urgency=low
 
   * New upstream version.

diff --git a/...archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec b/...archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec
@@ -3,7 +3,7 @@
 #
 
 %define short	postgresql
-%define perfsonar_auto_version 5.1.0
+%define perfsonar_auto_version 5.1.1
 %define perfsonar_auto_relnum 1
 
 Name:		pscheduler-archiver-%{short}
@@ -21,6 +21,7 @@ Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.0.2
 Requires:	%{_pscheduler_python}-psycopg2 >= 2.6.1
+Requires:	rpm-post-wrapper
 
 BuildRequires:	pscheduler-rpm
 
@@ -44,7 +45,9 @@ make \
      install
 
 %post
+rpm-post-wrapper '%{name}' "$@" <<'POST-WRAPPER-EOF'
 pscheduler internal warmboot
+POST-WRAPPER-EOF
 
 %postun
 pscheduler internal warmboot