diff --git a/SPECS-EXTENDED/dbus-x11/dbus-x11.spec b/SPECS-EXTENDED/dbus-x11/dbus-x11.spec index 06b8f2e122..b781bb5fa8 100644 --- a/SPECS-EXTENDED/dbus-x11/dbus-x11.spec +++ b/SPECS-EXTENDED/dbus-x11/dbus-x11.spec @@ -1,6 +1,6 @@ Summary: DBus for systemd Name: dbus-x11 -Version: 1.13.6 +Version: 1.14.0 Release: 1%{?dist} License: GPLv2+ OR AFL Vendor: Microsoft Corporation @@ -29,6 +29,9 @@ until the Mariner dbus package is built with x11 libraries. %files %changelog +* Tue Mar 15 2022 Pawel Winogrodzki - 1.14.0-1 +- Updating version to be in-sync with "dbus". + * Tue Jun 01 2021 Thomas Crain - 1.13.6-1 - Original version for CBL-Mariner - License verified diff --git a/SPECS-EXTENDED/lksctp-tools/lksctp-tools-1.0.18-autoconf_2_70.patch b/SPECS-EXTENDED/lksctp-tools/lksctp-tools-1.0.18-autoconf_2_70.patch new file mode 100644 index 0000000000..fa7b4195d9 --- /dev/null +++ b/SPECS-EXTENDED/lksctp-tools/lksctp-tools-1.0.18-autoconf_2_70.patch @@ -0,0 +1,82 @@ +From d6d7130f0a2e3b81880fca29966e42c1b2be40a7 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 8 Jan 2021 22:22:52 +0000 +Subject: [PATCH] m4/sctp.m4: make conpatible to autoconf-2.70 + +On recently released `autoconf-2.70` generated `./configure` +fails as: + +``` +$ ./configure +... +checking for struct sctp_event_subscribe.sctp_stream_reset_event... yes +checking for gcc options needed to detect all undeclared functions... none needed +./configure: line 16464: syntax error: unexpected end of file +``` + +This happens becuase new autoconf generates less whitespace: + +``` +{ +if ... +... +fi} +``` + +It requires at least whitespace between `fi` and `}`. + +As input already has newlines the change just drops extra `{}`. + +Tested on `autoconf-2.69` and `autoconf-2.70`. + +Signed-off-by: Sergei Trofimovich +Signed-off-by: Marcelo Ricardo Leitner +--- + m4/sctp.m4 | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/m4/sctp.m4 b/m4/sctp.m4 +index 6593517..94527a6 100644 +--- a/m4/sctp.m4 ++++ b/m4/sctp.m4 +@@ -6,7 +6,7 @@ + + # Macros to assist on probing kernel features + # Probes if a type is defined +-AC_DEFUN([LKSCTP_CHECK_TYPE], [{ ++AC_DEFUN([LKSCTP_CHECK_TYPE], [ + AC_CHECK_TYPE([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -22,10 +22,10 @@ AC_CHECK_TYPE([$1], + #ifdef HAVE_LINUX_SCTP_H + # include + #endif +-])}]) ++])]) + + # Probes if a struct has a given member +-AC_DEFUN([LKSCTP_CHECK_MEMBER], [{ ++AC_DEFUN([LKSCTP_CHECK_MEMBER], [ + AC_CHECK_MEMBER([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -41,10 +41,10 @@ AC_CHECK_MEMBER([$1], + #ifdef HAVE_LINUX_SCTP_H + # include + #endif +-])}]) ++])]) + + # Probes if a declaration is present +-AC_DEFUN([LKSCTP_CHECK_DECL], [{ ++AC_DEFUN([LKSCTP_CHECK_DECL], [ + AC_CHECK_DECL([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -60,4 +60,4 @@ AC_CHECK_DECL([$1], + #ifdef HAVE_LINUX_SCTP_H + # include + #endif +-])}]) ++])]) diff --git a/SPECS-EXTENDED/lksctp-tools/lksctp-tools-symver.patch b/SPECS-EXTENDED/lksctp-tools/lksctp-tools-symver.patch new file mode 100644 index 0000000000..25ead689d5 --- /dev/null +++ b/SPECS-EXTENDED/lksctp-tools/lksctp-tools-symver.patch @@ -0,0 +1,85 @@ +diff --git a/configure.ac b/configure.ac +index 5de5c76..d3e31c3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -130,4 +130,12 @@ AC_ARG_ENABLE(tests, + [enable_tests=yes]) + AM_CONDITIONAL(BUILD_TESTS, [test $enable_tests != no]) + ++# GCC tries to be "helpful" and only issue a warning for unrecognized ++# attributes. So we compile the test with Werror, so that if the ++# attribute is not recognized the compilation fails ++AC_LANG(C) ++AC_LANG_WERROR ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[__attribute__ ((symver ("foo@foo_1"))) void frob (void) { }]])], ++ [AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], [1], [Checking for symver attribute])], []) ++ + AC_OUTPUT +diff --git a/src/lib/connectx.c b/src/lib/connectx.c +index 5f4552b..2a21e3a 100644 +--- a/src/lib/connectx.c ++++ b/src/lib/connectx.c +@@ -26,6 +26,18 @@ + #include + #include + #include ++#include "config.h" ++ ++#define __SYMPFX(pfx, sym) #pfx sym ++#define _SYMPFX(pfx, sym) __SYMPFX(pfx, sym) ++#define SYMPFX(sym) _SYMPFX(__USER_LABEL_PREFIX__, #sym) ++ ++#if HAVE_ATTRIBUTE_SYMVER ++#define SYMVER(name, name2) __attribute__ ((symver (SYMPFX(name2)))) ++#else ++#define SYMVER(name, name2) __asm__(".symver " SYMPFX(name) "," SYMPFX(name2)); ++#endif ++ + + /* Support the sctp_connectx() interface. + * +@@ -64,6 +76,7 @@ static int __connectx_addrsize(const struct sockaddr *addrs, + } + + ++SYMVER(__sctp_connectx, sctp_connectx@) + int __sctp_connectx(int fd, struct sockaddr *addrs, int addrcnt) + { + int addrs_size = __connectx_addrsize(addrs, addrcnt); +@@ -75,6 +88,7 @@ int __sctp_connectx(int fd, struct sockaddr *addrs, int addrcnt) + addrs_size); + } + ++SYMVER(sctp_connectx_orig, sctp_connectx@VERS_1) + extern int sctp_connectx_orig (int) + __attribute ((alias ("__sctp_connectx"))); + +@@ -114,6 +128,7 @@ static int __connectx(int fd, struct sockaddr *addrs, socklen_t addrs_size, + addrs, addrs_size); + } + ++SYMVER(sctp_connectx2, sctp_connectx@VERS_2) + int sctp_connectx2(int fd, struct sockaddr *addrs, int addrcnt, + sctp_assoc_t *id) + { +@@ -125,6 +140,7 @@ int sctp_connectx2(int fd, struct sockaddr *addrs, int addrcnt, + return __connectx(fd, addrs, addrs_size, id); + } + ++SYMVER(sctp_connectx3, sctp_connectx@@VERS_3) + int sctp_connectx3(int fd, struct sockaddr *addrs, int addrcnt, + sctp_assoc_t *id) + { +@@ -179,12 +195,3 @@ int sctp_connectx3(int fd, struct sockaddr *addrs, int addrcnt, + return __connectx(fd, addrs, addrs_size, id); + } + +-#define __SYMPFX(pfx, sym) #pfx sym +-#define _SYMPFX(pfx, sym) __SYMPFX(pfx, sym) +-#define SYMPFX(sym) _SYMPFX(__USER_LABEL_PREFIX__, #sym) +-#define SYMVER(name, name2) __asm__(".symver " SYMPFX(name) "," SYMPFX(name2)) +- +-SYMVER(__sctp_connectx, sctp_connectx@); +-SYMVER(sctp_connectx_orig, sctp_connectx@VERS_1); +-SYMVER(sctp_connectx2, sctp_connectx@VERS_2); +-SYMVER(sctp_connectx3, sctp_connectx@@VERS_3); diff --git a/SPECS-EXTENDED/lksctp-tools/lksctp-tools.spec b/SPECS-EXTENDED/lksctp-tools/lksctp-tools.spec index 470c0d92c0..66e6bed4e8 100644 --- a/SPECS-EXTENDED/lksctp-tools/lksctp-tools.spec +++ b/SPECS-EXTENDED/lksctp-tools/lksctp-tools.spec @@ -3,9 +3,9 @@ Distribution: Mariner Name: lksctp-tools Summary: User-space access to Linux Kernel SCTP Version: 1.0.18 -Release: 5%{?dist} +Release: 6%{?dist} # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification -License: GPLv2 and GPLv2+ and LGPLv2 and MIT +License: GPLv2 and LGPLv2+ Group: System Environment/Libraries URL: http://lksctp.sourceforge.net @@ -17,7 +17,9 @@ Patch3: lksctp-tools-1.0.18-build-fix-netinet-sctp.h-not-to-be-installed.patch Patch4: lksctp-tools-1.0.18-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch Patch5: lksctp-tools-1.0.18-build-fix-probing-for-HAVE_SCTP_SENDV.patch Patch6: lksctp-tools-1.0.18-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch -BuildRequires: libtool, automake, autoconf +Patch7: lksctp-tools-symver.patch +Patch8: lksctp-tools-1.0.18-autoconf_2_70.patch +BuildRequires: libtool, automake, autoconf, make %description This is the lksctp-tools package for Linux Kernel SCTP (Stream Control @@ -58,6 +60,8 @@ Drafts). %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build [ ! -x ./configure ] && sh bootstrap @@ -66,20 +70,19 @@ Drafts). sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%make_build %install rm -f doc/rfc2960.txt doc/states.txt -make install DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p" +%make_install find $RPM_BUILD_ROOT -type f -name "*.la" -delete -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%doc AUTHORS ChangeLog COPYING* README +%license COPYING* +%doc AUTHORS ChangeLog README %{_bindir}/* %{_libdir}/libsctp.so.1* %dir %{_libdir}/lksctp-tools/ @@ -98,6 +101,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete %doc doc/*.txt %changelog +* Tue Mar 15 2022 Pawel Winogrodzki - 1.0.18-6 +- License verified. +- Applying patch for "autoconf" version 2.70+. Using Fedora 36 spec (license: MIT) for guidance. + * Fri Oct 15 2021 Pawel Winogrodzki - 1.0.18-5 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/mod_auth_mellon/mod_auth_mellon.spec b/SPECS-EXTENDED/mod_auth_mellon/mod_auth_mellon.spec index 59cf8cd285..79ff06ca93 100644 --- a/SPECS-EXTENDED/mod_auth_mellon/mod_auth_mellon.spec +++ b/SPECS-EXTENDED/mod_auth_mellon/mod_auth_mellon.spec @@ -5,7 +5,7 @@ Distribution: Mariner Summary: A SAML 2.0 authentication module for the Apache Httpd Server Name: mod_auth_mellon Version: 0.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/latchset/mod_auth_mellon/releases/download/v0_16_0/mod_auth_mellon-0.16.0.tar.gz Source1: auth_mellon.conf Source2: 10-auth_mellon.conf @@ -20,6 +20,7 @@ BuildRequires: httpd-devel BuildRequires: lasso-devel >= 2.5.1-13 BuildRequires: openssl-devel BuildRequires: xmlsec1-devel +BuildRequires: systemd-rpm-macros %if %{with user_guide} BuildRequires: rubygem-asciidoctor @@ -98,11 +99,7 @@ in the doc directory for instructions on using the diagnostics build. %{_httpd_moddir}/%{name}-diagnostics.so %files -%if 0%{?rhel} && 0%{?rhel} < 7 -%doc COPYING -%else %license COPYING -%endif %doc README.md NEWS ECP.rst %doc %{_pkgdocdir}/README.redhat.rst %if %{with user_guide} @@ -116,6 +113,10 @@ in the doc directory for instructions on using the diagnostics build. %dir /run/%{name}/ %changelog +* Tue Mar 15 2022 Pawel Winogrodzki - 0.16.0-3 +- Adding missing BR on 'systemd-rpm-macros'. +- License verified. + * Wed Sep 01 2021 Pawel Winogrodzki - 0.16.0-2 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Making user guide build conditional. diff --git a/SPECS-EXTENDED/mod_fcgid/mod_fcgid.spec b/SPECS-EXTENDED/mod_fcgid/mod_fcgid.spec index fe91c59d1f..24aa3aa578 100644 --- a/SPECS-EXTENDED/mod_fcgid/mod_fcgid.spec +++ b/SPECS-EXTENDED/mod_fcgid/mod_fcgid.spec @@ -8,7 +8,7 @@ Distribution: Mariner Name: mod_fcgid Version: 2.3.9 -Release: 20%{?dist} +Release: 21%{?dist} Summary: FastCGI interface module for Apache 2 License: ASL 2.0 URL: http://httpd.apache.org/mod_fcgid/ @@ -25,6 +25,7 @@ BuildRequires: httpd-devel >= 2.0 BuildRequires: make BuildRequires: pkgconfig BuildRequires: sed +BuildRequires: systemd-rpm-macros Requires: httpd-mmn # %%systemd_units needed for ownership of %%{_tmpfilesdir} %if %{rundir_tmpfs} @@ -75,11 +76,7 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/mod_fcgid.conf %endif %files -%if 0%{?_licensedir:1} %license LICENSE-FCGID -%else -%doc LICENSE-FCGID -%endif %doc README.RPM README.SELinux # mod_fcgid.html.en is explicitly encoded as ISO-8859-1 %doc CHANGES-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID @@ -96,6 +93,10 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/mod_fcgid.conf %dir %attr(0775,root,apache) %{rundir}/mod_fcgid/ %changelog +* Tue Mar 15 2022 Pawel Winogrodzki - 2.3.9-21 +- Adding missing BR on 'systemd-rpm-macros'. +- License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 2.3.9-20 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/screen/screen.spec b/SPECS-EXTENDED/screen/screen.spec index f92549e61e..0cf64f8f6c 100644 --- a/SPECS-EXTENDED/screen/screen.spec +++ b/SPECS-EXTENDED/screen/screen.spec @@ -6,7 +6,7 @@ Distribution: Mariner Summary: A screen manager that supports multiple logins on one terminal Name: screen Version: 4.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/screen Requires(pre): /usr/sbin/groupadd @@ -39,7 +39,7 @@ support multiple logins on one terminal. %autosetup -p1 %build -./autogen.sh +autoreconf -i %configure \ --enable-pam \ @@ -117,6 +117,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %endif %changelog +* Tue Mar 15 2022 Pawel Winogrodzki - 4.8.0-4 +- Using "autoreconf -i" to fix build issues. +- License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 4.8.0-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS/autoconf/autoconf.spec b/SPECS/autoconf/autoconf.spec index 4cc252865b..9ca73c8a6e 100644 --- a/SPECS/autoconf/autoconf.spec +++ b/SPECS/autoconf/autoconf.spec @@ -1,7 +1,7 @@ Summary: The package automatically configure source code Name: autoconf Version: 2.71 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -10,6 +10,11 @@ URL: https://www.gnu.org/software/autoconf/ Source0: https://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz BuildRequires: m4 BuildRequires: perl + +# Dependency on "gtk-doc" regardless of the project's need to build documentation introduced in 2.70. +# Still an open issue as of 15th of March 2022: https://savannah.gnu.org/support/?110503. +Requires: gtk-doc + Requires: m4 Requires: perl-libs BuildArch: noarch @@ -42,41 +47,44 @@ make -k check %{?_smp_mflags} TESTSUITEFLAGS="1-37 39-500" %{_datarootdir}/autoconf/* %changelog -* Mon Nov 22 2021 Andrew Phelps 2.71-1 -- Update to version 2.71 -- License verified -- Remove unneeded autoconf-make-check.patch +* Tue Mar 15 2022 Pawel Winogrodzki - 2.71-2 +- Adding run-time dependency on "gtk-doc". -* Fri Mar 26 2021 Thomas Crain 2.69-11 -- Merge the following releases from 1.0 to dev branch -- anphel@microsoft.com, 2.69-10: Fix check tests +* Mon Nov 22 2021 Andrew Phelps - 2.71-1 +- Update to version 2.71 +- License verified +- Remove unneeded autoconf-make-check.patch -* Mon Oct 12 2020 Joe Schmitt 2.69-10 -- Use new perl package names. +* Fri Mar 26 2021 Thomas Crain - 2.69-11 +- Merge the following releases from 1.0 to dev branch +- anphel@microsoft.com, 2.69-10: Fix check tests -* Sat May 09 2020 Nick Samson 2.69-9 -- Added %%license line automatically +* Mon Oct 12 2020 Joe Schmitt - 2.69-10 +- Use new perl package names. -* Tue Sep 03 2019 Mateusz Malisz 2.69-8 -- Initial CBL-Mariner import from Photon (license: Apache2). +* Sat May 09 2020 Nick Samson - 2.69-9 +- Added %%license line automatically -* Wed Oct 17 2018 Dweep Advani 2.69-7 -- Build section is changed to used %configure +* Tue Sep 03 2019 Mateusz Malisz - 2.69-8 +- Initial CBL-Mariner import from Photon (license: Apache2). -* Tue Apr 25 2017 Priyesh Padmavilasom 2.69-6 -- Fix arch +* Wed Oct 17 2018 Dweep Advani - 2.69-7 +- Build section is changed to used %configure -* Tue Dec 6 2016 Dheeraj Shetty 2.69-5 -- Fixed Bug 1718089 make check failure +* Tue Apr 25 2017 Priyesh Padmavilasom - 2.69-6 +- Fix arch -* Tue May 24 2016 Priyesh Padmavilasom 2.69-4 -- GA - Bump release of all rpms +* Tue Dec 6 2016 Dheeraj Shetty - 2.69-5 +- Fixed Bug 1718089 make check failure -* Fri Jun 5 2015 Divya Thaluru 2.69-3 -- Adding m4 package to build and run time required package +* Tue May 24 2016 Priyesh Padmavilasom - 2.69-4 +- GA - Bump release of all rpms -* Wed Jun 3 2015 Divya Thaluru 2.69-2 -- Adding perl packages to required packages +* Fri Jun 5 2015 Divya Thaluru - 2.69-3 +- Adding m4 package to build and run time required package -* Wed Nov 5 2014 Divya Thaluru 2.69-1 -- Initial build. First version \ No newline at end of file +* Wed Jun 3 2015 Divya Thaluru - 2.69-2 +- Adding perl packages to required packages + +* Wed Nov 5 2014 Divya Thaluru - 2.69-1 +- Initial build. First version \ No newline at end of file diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 481975a700..a7f5f2af89 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -161,7 +161,8 @@ perl-threads-shared-1.61-465.cm2.aarch64.rpm perl-vars-1.05-465.cm2.noarch.rpm perl-5.32.0-465.cm2.aarch64.rpm texinfo-6.8-1.cm2.aarch64.rpm -autoconf-2.71-1.cm2.noarch.rpm +gtk-doc-1.33.2-1.cm2.noarch.rpm +autoconf-2.71-2.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm openssl-1.1.1k-11.cm2.aarch64.rpm openssl-debuginfo-1.1.1k-11.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 3f60be6682..cd818dea52 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -161,7 +161,8 @@ perl-threads-shared-1.61-465.cm2.x86_64.rpm perl-vars-1.05-465.cm2.noarch.rpm perl-5.32.0-465.cm2.x86_64.rpm texinfo-6.8-1.cm2.x86_64.rpm -autoconf-2.71-1.cm2.noarch.rpm +gtk-doc-1.33.2-1.cm2.noarch.rpm +autoconf-2.71-2.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm openssl-1.1.1k-11.cm2.x86_64.rpm openssl-devel-1.1.1k-11.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index eb29bcc0be..eb38b09adb 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -6,7 +6,7 @@ audit-3.0.6-4.cm2.aarch64.rpm audit-debuginfo-3.0.6-4.cm2.aarch64.rpm audit-devel-3.0.6-4.cm2.aarch64.rpm audit-libs-3.0.6-4.cm2.aarch64.rpm -autoconf-2.71-1.cm2.noarch.rpm +autoconf-2.71-2.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm bash-5.1.8-1.cm2.aarch64.rpm bash-debuginfo-5.1.8-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 81162d11d6..8a5e23888d 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -6,7 +6,7 @@ audit-3.0.6-4.cm2.x86_64.rpm audit-debuginfo-3.0.6-4.cm2.x86_64.rpm audit-devel-3.0.6-4.cm2.x86_64.rpm audit-libs-3.0.6-4.cm2.x86_64.rpm -autoconf-2.71-1.cm2.noarch.rpm +autoconf-2.71-2.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm bash-5.1.8-1.cm2.x86_64.rpm bash-debuginfo-5.1.8-1.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/update_manifests.sh b/toolkit/resources/manifests/package/update_manifests.sh index ad9c8ed40b..0488961807 100755 --- a/toolkit/resources/manifests/package/update_manifests.sh +++ b/toolkit/resources/manifests/package/update_manifests.sh @@ -251,6 +251,7 @@ generate_pkggen_core () { grep "^gdbm-" $TmpPkgGen grep "^perl-" $TmpPkgGen grep "^texinfo-" $TmpPkgGen + grep "^gtk-doc-" $TmpPkgGen grep "^autoconf-" $TmpPkgGen grep "^automake-" $TmpPkgGen grep "^openssl-" $TmpPkgGen diff --git a/toolkit/scripts/check_entangled_specs.py b/toolkit/scripts/check_entangled_specs.py index 74b0c48b2e..22dd242538 100755 --- a/toolkit/scripts/check_entangled_specs.py +++ b/toolkit/scripts/check_entangled_specs.py @@ -32,6 +32,10 @@ version_matching_groups = [ frozenset([ "SPECS/hyperv-daemons/hyperv-daemons.spec", "SPECS/kernel/kernel.spec" + ]), + frozenset([ + "SPECS/dbus/dbus.spec", + "SPECS-EXTENDED/dbus-x11/dbus-x11.spec" ]) ]