Merge pull request #1932 from craigcomstock/ENT-13016/master

ENT-13016 ENT-13164: Added Redhat 10 and Debian 13 platforms

Author: craigcomstock

build-scripts/detect-environment

@@ -129,7 +129,7 @@ detect_distribution() {
             # CentOS Linux release 7.6.1810 (Core)
             OS=centos
             ;;
-        "Red Hat Enterprise Linux "*)
+        "Red Hat Enterprise Linux "*|"Rocky Linux release "*)
             # Example output for RHEL:
             # Red Hat Enterprise Linux release 8.10 (Ootpa)
             OS=rhel

build-scripts/labels.txt

@@ -4,10 +4,14 @@ PACKAGES_HUB_x86_64_linux_debian_11
 PACKAGES_HUB_arm_64_linux_debian_11
 PACKAGES_HUB_x86_64_linux_debian_12
 PACKAGES_HUB_arm_64_linux_debian_12
+PACKAGES_HUB_x86_64_linux_debian_13
+PACKAGES_HUB_arm_64_linux_debian_13
 
 PACKAGES_HUB_x86_64_linux_redhat_7
 PACKAGES_HUB_x86_64_linux_redhat_8
 PACKAGES_HUB_x86_64_linux_redhat_9
+PACKAGES_HUB_x86_64_linux_redhat_10
+PACKAGES_HUB_arm_64_linux_redhat_10
 
 PACKAGES_HUB_x86_64_linux_ubuntu_20
 PACKAGES_HUB_x86_64_linux_ubuntu_22
@@ -19,10 +23,14 @@ PACKAGES_x86_64_linux_debian_11
 PACKAGES_arm_64_linux_debian_11
 PACKAGES_x86_64_linux_debian_12
 PACKAGES_arm_64_linux_debian_12
+PACKAGES_x86_64_linux_debian_13
+PACKAGES_arm_64_linux_debian_13
 
 PACKAGES_x86_64_linux_redhat_7
 PACKAGES_x86_64_linux_redhat_8
 PACKAGES_x86_64_linux_redhat_9
+PACKAGES_x86_64_linux_redhat_10
+PACKAGES_arm_64_linux_redhat_10
 
 PACKAGES_x86_64_linux_suse_12
 PACKAGES_x86_64_linux_suse_15

build-scripts/package

@@ -225,6 +225,8 @@ rpm | lpp)
     # eval is needed to preserve spaces in arguments within quotes
     # Example: --define 'with_expansion 1' needs to be passed as two args
     log_debug "Building RPM package with rpmbuild"
+    # rhel-10 rpmbuild is more picky about /var/cfengine/lib RPATH we need
+    export QA_RPATHS=2 # this is a set of bit flags, we just want 0x0002 here
     eval rpmbuild -bb \
         --define "'_topdir $BASEDIR/$PKG'" \
         --define "'buildprefix $BUILDPREFIX'" \

ci/setup-cfengine-build-host.sh

@@ -30,7 +30,7 @@ elif [ -f /etc/os-release ]; then
     fi
   fi
   if [ "$ID" = "ubuntu" ]; then
-    _version=$(echo "$VERSION_ID" | cut -d. -f1)
+    _version="$(echo "$VERSION_ID" | cut -d. -f1)"
     if [ "$_version" -lt "16" ]; then
       echo "Platform $ID $VERSION_ID is too old."
       exit 9

deps-packaging/apache/cfbuild-apache.spec

@@ -8,6 +8,7 @@ Release: 1
 Source0: httpd-%{apache_version}.tar.gz
 Source1: httpd.conf
 Patch0:  apachectl.patch
+Patch1: fixed-implicit-decl-gettid.patch
 License: MIT
 Group: Other
 Url: https://cfengine.com
@@ -21,7 +22,8 @@ AutoReqProv: no
 mkdir -p %{_builddir}
 %setup -q -n httpd-%{apache_version}
 
-%patch0 -p0
+%patch -P 0
+%patch -P 1 -p1
 
 CPPFLAGS=-I%{buildprefix}/include
 

deps-packaging/leech/cfbuild-leech.spec

@@ -21,7 +21,6 @@ mkdir -p %{_builddir}
 ./configure --prefix=%{prefix} --enable-shared --disable-static
 
 rm -f ${RPM_BUILD_ROOT}%{prefix}/lib/libleech.a
-rm -f ${RPM_BUILD_ROOT}%{prefix}/lib/libleech.la
 
 %build
 
@@ -31,6 +30,7 @@ make
 rm -rf ${RPM_BUILD_ROOT}
 
 make install DESTDIR=${RPM_BUILD_ROOT}
+rm -f ${RPM_BUILD_ROOT}%{prefix}/lib/libleech.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +59,5 @@ CFEngine Build Automation -- leech -- development files
 %{prefix}/include/*.h
 
 %dir %{prefix}/lib
-%{prefix}/lib/*.la
 
 %changelog

deps-packaging/librsync/cfbuild-librsync.spec

@@ -53,7 +53,6 @@ touch -t 0001010102 ar-lib
 ./configure --prefix=%{prefix} --enable-shared --disable-static
 
 rm -f ${RPM_BUILD_ROOT}%{prefix}/lib/librsync.a
-rm -f ${RPM_BUILD_ROOT}%{prefix}/lib/librsync.la
 
 %build
 
@@ -63,6 +62,7 @@ make
 rm -rf ${RPM_BUILD_ROOT}
 
 make install DESTDIR=${RPM_BUILD_ROOT}
+rm -f ${RPM_BUILD_ROOT}%{prefix}/lib/librsync.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,7 +91,6 @@ CFEngine Build Automation -- librsync -- development files
 %{prefix}/include/*.h
 
 %dir %{prefix}/lib
-%{prefix}/lib/*.la
 %{prefix}/lib/pkgconfig
 
 %changelog

deps-packaging/libyaml/cfbuild-libyaml.spec

@@ -33,6 +33,7 @@ $MAKE
 %install
 rm -rf ${RPM_BUILD_ROOT}
 $MAKE DESTDIR=${RPM_BUILD_ROOT} install
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/libyaml.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,7 +66,6 @@ CFEngine Build Automation -- lmdb -- development files
 %dir %{prefix}/lib
 %{prefix}/lib/pkgconfig
 %{prefix}/lib/*.a
-%{prefix}/lib/*.la
 
 %changelog
 

deps-packaging/pkg-build-rpm

@@ -76,11 +76,15 @@ if [ $TARGET != native ]; then
   exit 42
 fi
 
+# deps packages may result in binaries without debug symbols even when debugsym=yes aka BUILD_TYPE=DEBUG
+# to avoid rpmbuild errors when this occurs, allow empties
+RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define '_empty_manifest_terminate_build 0'"
+
 case "$TESTS" in
   no)
-    RPMBUILD_OPTIONS="--define 'with_testsuite 0'";;
+    RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define 'with_testsuite 0'";;
   yes)
-    RPMBUILD_OPTIONS="--define 'with_testsuite 1'";;
+    RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define 'with_testsuite 1'";;
   *)
     fatal "Unknown tests option: $TESTS";;
 esac
@@ -112,6 +116,12 @@ fi
 # example cmd --define 'a b':
 #     - argv[1] = --define
 #     - argv[2] = a b
+
+# We have /var/cfengine/lib in RPATHS which should be OK
+# We asked in https://github.com/rpm-software-management/rpm/issues/3982, and it seems allowing this is OK
+# 0x0002 - contains an invalid RPATH - in our case /var/cfengine/lib is OK so allow it as an exception
+# Here we only want to specify this one flag: 0x0002. Sadly these scripts run on POSIX shell (especially e.g. aix71 runs as /bin/sh which is ksh) so no bitwise operators. Add them together manually to a decimal integer.
+export QA_RPATHS=2 # 0x0002 all by itself, no &(ands)
 eval rpmbuild -bb \
   --define "'_topdir $BASEDIR/$PKGNAME'" \
   --define "'version $VERSION'" \