diff --git a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver index 07f4d9b2851..396150a78e6 100644 --- a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver +++ b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver @@ -10,9 +10,6 @@ ARG USER @INCLUDE_MAIN_RUN_INSTRUCTION@ -# workaround till binaries rename is merged -RUN [ -f /usr/bin/virt-cdi-apiserver ] && mv -f /usr/bin/virt-cdi-apiserver /usr/bin/cdi-apiserver - #simple smoke test RUN ls /usr/bin/cdi-apiserver diff --git a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-controller b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-controller index 6ef8982d23d..715872d27f2 100644 --- a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-controller +++ b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-controller @@ -10,9 +10,6 @@ ARG USER @INCLUDE_MAIN_RUN_INSTRUCTION@ -# workaround till binaries rename is merged -RUN [ -f /usr/bin/virt-cdi-controller ] && mv -f /usr/bin/virt-cdi-controller /usr/bin/cdi-controller - #simple smoke test RUN ls /usr/bin/cdi-controller diff --git a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-importer b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-importer index 929b8f8d5e4..b0fb1649105 100644 --- a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-importer +++ b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-importer @@ -10,9 +10,6 @@ ARG USER @INCLUDE_MAIN_RUN_INSTRUCTION@ -# workaround till binaries rename is merged -RUN [ -f /usr/bin/virt-cdi-importer ] && mv -f /usr/bin/virt-cdi-importer /usr/bin/cdi-importer - #simple smoke test RUN ls /usr/bin/cdi-importer diff --git a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-operator b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-operator index 3e4ae28dc06..25251f85017 100644 --- a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-operator +++ b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-operator @@ -10,9 +10,6 @@ ARG USER @INCLUDE_MAIN_RUN_INSTRUCTION@ -# workaround till binaries rename is merged -RUN [ -f /usr/bin/virt-cdi-operator ] && mv -f /usr/bin/virt-cdi-operator /usr/bin/cdi-operator - #simple smoke test RUN ls /usr/bin/cdi-operator diff --git a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy index 64803ae6483..e418214a6ea 100644 --- a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy +++ b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy @@ -10,9 +10,6 @@ ARG USER @INCLUDE_MAIN_RUN_INSTRUCTION@ -# workaround till binaries rename is merged -RUN [ -f /usr/bin/virt-cdi-uploadproxy ] && mv -f /usr/bin/virt-cdi-uploadproxy /usr/bin/cdi-uploadproxy - #simple smoke test RUN ls /usr/bin/cdi-uploadproxy diff --git a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver index cfdb28f80e7..ecf48ece048 100644 --- a/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver +++ b/.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver @@ -10,9 +10,6 @@ ARG USER @INCLUDE_MAIN_RUN_INSTRUCTION@ -# workaround till binaries rename is merged -RUN [ -f /usr/bin/virt-cdi-uploadserver ] && mv -f /usr/bin/virt-cdi-uploadserver /usr/bin/cdi-uploadserver - #simple smoke test RUN ls /usr/bin/cdi-uploadserver diff --git a/.pipelines/containerSourceData/scripts/BuildNvidiaDriverContainers.sh b/.pipelines/containerSourceData/scripts/BuildNvidiaDriverContainers.sh index 6ebf949be71..916c0218862 100644 --- a/.pipelines/containerSourceData/scripts/BuildNvidiaDriverContainers.sh +++ b/.pipelines/containerSourceData/scripts/BuildNvidiaDriverContainers.sh @@ -167,7 +167,7 @@ function get_component_name_and_version { COMPONENT="$IMAGE" echo "Component name -> $COMPONENT" - COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE* | rev | cut -d '.' -f 2- | rev) + COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE-[0-9]* | rev | cut -d '.' -f 2- | rev) echo "Component Version -> $COMPONENT_VERSION" } diff --git a/SPECS-EXTENDED/LibRaw/CVE-2020-15503.patch b/SPECS-EXTENDED/LibRaw/CVE-2020-15503.patch deleted file mode 100644 index eae0baf1a7f..00000000000 --- a/SPECS-EXTENDED/LibRaw/CVE-2020-15503.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -urNp LibRaw-0.19.5.orig/libraw/libraw_const.h LibRaw-0.19.5/libraw/libraw_const.h ---- LibRaw-0.19.5.orig/libraw/libraw_const.h 2020-08-10 18:32:18.669459968 +0200 -+++ LibRaw-0.19.5/libraw/libraw_const.h 2020-08-10 18:48:10.462282067 +0200 -@@ -24,6 +24,12 @@ it under the terms of the one of two lic - #define LIBRAW_MAX_ALLOC_MB 2048L - #endif - -+/* limit thumbnail size, default is 512Mb*/ -+#ifndef LIBRAW_MAX_THUMBNAIL_MB -+#define LIBRAW_MAX_THUMBNAIL_MB 512L -+#endif -+ -+ - /* Change to non-zero to allow (broken) CRW (and other) files metadata - loop prevention */ - #ifndef LIBRAW_METADATA_LOOP_PREVENTION -diff -urNp LibRaw-0.19.5.orig/src/libraw_cxx.cpp LibRaw-0.19.5/src/libraw_cxx.cpp ---- LibRaw-0.19.5.orig/src/libraw_cxx.cpp 2020-08-10 18:32:18.672459987 +0200 -+++ LibRaw-0.19.5/src/libraw_cxx.cpp 2020-08-10 18:49:18.616688826 +0200 -@@ -3712,6 +3712,21 @@ libraw_processed_image_t *LibRaw::dcraw_ - return NULL; - } - -+ if (T.tlength < 64u) -+ { -+ if (errcode) -+ *errcode = EINVAL; -+ return NULL; -+ } -+ -+ if (INT64(T.tlength) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) -+ { -+ if (errcode) -+ *errcode = LIBRAW_TOO_BIG; -+ return NULL; -+ } -+ -+ - if (T.tformat == LIBRAW_THUMBNAIL_BITMAP) - { - libraw_processed_image_t *ret = (libraw_processed_image_t *)::malloc(sizeof(libraw_processed_image_t) + T.tlength); -@@ -3976,6 +3991,12 @@ void LibRaw::kodak_thumb_loader() - if (ID.toffset + est_datasize > ID.input->size() + THUMB_READ_BEYOND) - throw LIBRAW_EXCEPTION_IO_EOF; - -+ if(INT64(T.theight) * INT64(T.twidth) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) -+ throw LIBRAW_EXCEPTION_IO_CORRUPT; -+ -+ if (INT64(T.theight) * INT64(T.twidth) < 64ULL) -+ throw LIBRAW_EXCEPTION_IO_CORRUPT; -+ - // some kodak cameras - ushort s_height = S.height, s_width = S.width, s_iwidth = S.iwidth, s_iheight = S.iheight; - ushort s_flags = libraw_internal_data.unpacker_data.load_flags; -@@ -4237,6 +4258,25 @@ int LibRaw::unpack_thumb(void) - CHECK_ORDER_LOW(LIBRAW_PROGRESS_IDENTIFY); - CHECK_ORDER_BIT(LIBRAW_PROGRESS_THUMB_LOAD); - -+#define THUMB_SIZE_CHECKT(A) \ -+ do { \ -+ if (INT64(A) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ -+ if (INT64(A) > 0 && INT64(A) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ -+ } while (0) -+ -+#define THUMB_SIZE_CHECKTNZ(A) \ -+ do { \ -+ if (INT64(A) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ -+ if (INT64(A) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ -+ } while (0) -+ -+ -+#define THUMB_SIZE_CHECKWH(W,H) \ -+ do { \ -+ if (INT64(W)*INT64(H) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ -+ if (INT64(W)*INT64(H) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ -+ } while (0) -+ - try - { - if (!libraw_internal_data.internal_data.input) -@@ -4267,6 +4307,7 @@ int LibRaw::unpack_thumb(void) - - if (INT64(ID.toffset) + tsize > ID.input->size() + THUMB_READ_BEYOND) - throw LIBRAW_EXCEPTION_IO_EOF; -+ THUMB_SIZE_CHECKT(tsize); - } - else - { -@@ -4280,6 +4321,7 @@ int LibRaw::unpack_thumb(void) - ID.input->seek(ID.toffset, SEEK_SET); - if (write_thumb == &LibRaw::jpeg_thumb) - { -+ THUMB_SIZE_CHECKTNZ(T.tlength); - if (T.thumb) - free(T.thumb); - T.thumb = (char *)malloc(T.tlength); -@@ -4326,6 +4368,7 @@ int LibRaw::unpack_thumb(void) - { - if (t_bytesps > 1) - throw LIBRAW_EXCEPTION_IO_CORRUPT; // 8-bit thumb, but parsed for more bits -+ THUMB_SIZE_CHECKWH(T.twidth, T.theight); - int t_length = T.twidth * T.theight * t_colors; - - if (T.tlength && T.tlength < t_length) // try to find tiff ifd with needed offset -@@ -4351,8 +4394,12 @@ int LibRaw::unpack_thumb(void) - T.tcolors = 1; - } - T.tlength = total_size; -+ THUMB_SIZE_CHECKTNZ(T.tlength); - if (T.thumb) - free(T.thumb); -+ -+ THUMB_SIZE_CHECKTNZ(T.tlength); -+ - T.thumb = (char *)malloc(T.tlength); - merror(T.thumb, "ppm_thumb()"); - -@@ -4400,10 +4447,15 @@ int LibRaw::unpack_thumb(void) - if (t_bytesps > 2) - throw LIBRAW_EXCEPTION_IO_CORRUPT; // 16-bit thumb, but parsed for more bits - int o_bps = (imgdata.params.raw_processing_options & LIBRAW_PROCESSING_USE_PPM16_THUMBS) ? 2 : 1; -+ THUMB_SIZE_CHECKWH(T.twidth, T.theight); - int o_length = T.twidth * T.theight * t_colors * o_bps; - int i_length = T.twidth * T.theight * t_colors * 2; - if (!T.tlength) - T.tlength = o_length; -+ THUMB_SIZE_CHECKTNZ(o_length); -+ THUMB_SIZE_CHECKTNZ(i_length); -+ THUMB_SIZE_CHECKTNZ(T.tlength); -+ - ushort *t_thumb = (ushort *)calloc(i_length, 1); - ID.input->read(t_thumb, 1, i_length); - if ((libraw_internal_data.unpacker_data.order == 0x4949) == (ntohs(0x1234) == 0x1234)) diff --git a/SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch b/SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch deleted file mode 100644 index 7cabd6b4202..00000000000 --- a/SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- libraw.pc.in~ 2014-01-17 07:38:31.000000000 -0600 -+++ libraw.pc.in 2014-02-20 14:18:20.559279964 -0600 -@@ -7,5 +7,6 @@ - Description: Raw image decoder library (non-thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ -+Libs: -L${libdir} -lraw@PC_OPENMP@ -+Libs.private: -lstdc++ - Cflags: -I${includedir}/libraw ---- libraw_r.pc.in~ 2014-01-17 07:38:31.000000000 -0600 -+++ libraw_r.pc.in 2014-02-20 14:20:35.740276947 -0600 -@@ -7,5 +7,6 @@ - Description: Raw image decoder library (thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ -+Libs: -L${libdir} -lraw_r@PC_OPENMP@ -+Libs.private: -lstdc++ - Cflags: -I${includedir}/libraw ---- libraw_r.pc.in~ 2014-02-20 14:22:36.000000000 -0600 -+++ libraw_r.pc.in 2014-02-20 14:27:24.454267828 -0600 -@@ -5,7 +5,7 @@ - - Name: libraw - Description: Raw image decoder library (thread-safe) --Requires: @PACKAGE_REQUIRES@ -+Requires.private: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw_r@PC_OPENMP@ - Libs.private: -lstdc++ ---- libraw.pc.in~ 2014-02-20 14:22:36.000000000 -0600 -+++ libraw.pc.in 2014-02-20 14:27:18.368267964 -0600 -@@ -5,7 +5,7 @@ - - Name: libraw - Description: Raw image decoder library (non-thread-safe) --Requires: @PACKAGE_REQUIRES@ -+Requires.private: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw@PC_OPENMP@ - Libs.private: -lstdc++ diff --git a/SPECS-EXTENDED/LibRaw/LibRaw-pkgconfig.patch b/SPECS-EXTENDED/LibRaw/LibRaw-pkgconfig.patch new file mode 100644 index 00000000000..0c8ae94c1f9 --- /dev/null +++ b/SPECS-EXTENDED/LibRaw/LibRaw-pkgconfig.patch @@ -0,0 +1,25 @@ +--- LibRaw-0.21.0/libraw.pc.in~ 2022-12-18 01:26:41.000000000 -0600 ++++ LibRaw-0.21.0/libraw.pc.in 2022-12-19 10:27:02.793929537 -0600 +@@ -6,7 +6,9 @@ + Name: libraw + Description: Raw image decoder library (non-thread-safe) + Requires: @PACKAGE_REQUIRES@ ++Requires.private: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ ++Libs: -L${libdir} -lraw@PC_OPENMP@ ++Libs.private: -lstdc++ + Libs.private: @PACKAGE_LIBS_PRIVATE@ + Cflags: -I${includedir}/libraw -I${includedir} +--- LibRaw-0.21.0/libraw_r.pc.in~ 2022-12-18 01:26:41.000000000 -0600 ++++ LibRaw-0.21.0/libraw_r.pc.in 2022-12-19 10:28:30.620571338 -0600 +@@ -6,7 +6,8 @@ + Name: libraw + Description: Raw image decoder library (thread-safe) + Requires: @PACKAGE_REQUIRES@ ++Requires.private: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ ++Libs: -L${libdir} -lraw_r@PC_OPENMP@ + Libs.private: @PACKAGE_LIBS_PRIVATE@ + Cflags: -I${includedir}/libraw -I${includedir} diff --git a/SPECS-EXTENDED/LibRaw/LibRaw.signatures.json b/SPECS-EXTENDED/LibRaw/LibRaw.signatures.json index 1b4c034a74f..03817bc5463 100644 --- a/SPECS-EXTENDED/LibRaw/LibRaw.signatures.json +++ b/SPECS-EXTENDED/LibRaw/LibRaw.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "LibRaw-0.19.5.tar.gz": "40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5" + "LibRaw-0.21.3.tar.gz": "dba34b7fc1143503942fa32ad9db43e94f714e62a4a856e91617f8f3e1e0aa5c" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/LibRaw/LibRaw.spec b/SPECS-EXTENDED/LibRaw/LibRaw.spec index 1c7fd46b3c2..99a4b41ed4d 100644 --- a/SPECS-EXTENDED/LibRaw/LibRaw.spec +++ b/SPECS-EXTENDED/LibRaw/LibRaw.spec @@ -8,20 +8,21 @@ Distribution: Azure Linux Summary: Library for reading RAW files obtained from digital photo cameras Name: LibRaw -Version: 0.19.5 -Release: 5%{?dist} +Version: 0.21.3 +Release: 1%{?dist} License: BSD and (CDDL or LGPLv2) URL: http://www.libraw.org +Source0: https://www.libraw.org/data/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(jasper) BuildRequires: pkgconfig(libjpeg) -BuildRequires: autoconf automake libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool -Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz -Patch0: LibRaw-0.6.0-pkgconfig.patch -Patch1: CVE-2020-15503.patch +Patch0: LibRaw-pkgconfig.patch Provides: bundled(dcraw) = 9.25 %description @@ -58,9 +59,6 @@ LibRaw sample programs %prep %setup -q -%patch 0 -p0 -b .pkgconfig -%patch 1 -p1 -b .cve-2020-15503 - %build autoreconf -if %configure \ @@ -95,8 +93,8 @@ rm -fv %{buildroot}%{_libdir}/lib*.la %files %doc Changelog.txt %license LICENSE.CDDL LICENSE.LGPL COPYRIGHT -%{_libdir}/libraw.so.19* -%{_libdir}/libraw_r.so.19* +%{_libdir}/libraw.so.* +%{_libdir}/libraw_r.so.* %files static %{_libdir}/libraw.a @@ -121,6 +119,10 @@ rm -fv %{buildroot}%{_libdir}/lib*.la %changelog +* Mon Sept 30 2024 Jyoti Kanase - 0.21.3-1 +- Upgrade the version to 0.21.3 +- License Verified + * Fri Oct 15 2021 Pawel Winogrodzki - 0.19.5-5 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.1-fontset.patch b/SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.1-fontset.patch deleted file mode 100644 index 0f3c8d247d0..00000000000 --- a/SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.1-fontset.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up libXaw3d-1.6.1/src/AsciiSink.c.fontset libXaw3d-1.6.1/src/AsciiSink.c ---- libXaw3d-1.6.1/src/AsciiSink.c.fontset 2012-02-01 12:24:00.000000000 -0700 -+++ libXaw3d-1.6.1/src/AsciiSink.c 2012-02-25 14:52:46.802779081 -0700 -@@ -513,6 +513,8 @@ Initialize(Widget request, Widget new, A - { - AsciiSinkObject sink = (AsciiSinkObject) new; - -+ if (!sink->ascii_sink.font) XtError("Aborting: no font found\n"); -+ - GetGC(sink); - - sink->ascii_sink.insertCursorOn= CreateInsertCursor(XtScreenOfObject(new)); -diff -up libXaw3d-1.6.1/src/Command.c.fontset libXaw3d-1.6.1/src/Command.c ---- libXaw3d-1.6.1/src/Command.c.fontset 2011-09-19 15:42:36.000000000 -0600 -+++ libXaw3d-1.6.1/src/Command.c 2012-02-25 14:51:26.075372823 -0700 -@@ -218,6 +218,8 @@ Initialize(Widget request, Widget new, A - CommandWidget cbw = (CommandWidget) new; - int shape_event_base, shape_error_base; - -+ if (!cbw->label.font) XtError("Aborting: no font found\n"); -+ - if (cbw->command.shape_style != XawShapeRectangle - && !XShapeQueryExtension(XtDisplay(new), &shape_event_base, - &shape_error_base)) -diff -up libXaw3d-1.6.1/src/List.c.fontset libXaw3d-1.6.1/src/List.c ---- libXaw3d-1.6.1/src/List.c.fontset 2011-10-09 12:01:20.000000000 -0600 -+++ libXaw3d-1.6.1/src/List.c 2012-02-25 14:53:16.327465260 -0700 -@@ -362,6 +362,8 @@ Initialize(Widget junk, Widget new, ArgL - { - ListWidget lw = (ListWidget) new; - -+ if (!lw->list.font) XtError("Aborting: no font found\n"); -+ - /* - * Initialize all private resources. - */ -diff -up libXaw3d-1.6.1/src/SmeBSB.c.fontset libXaw3d-1.6.1/src/SmeBSB.c ---- libXaw3d-1.6.1/src/SmeBSB.c.fontset 2011-09-19 15:42:36.000000000 -0600 -+++ libXaw3d-1.6.1/src/SmeBSB.c 2012-02-25 14:50:19.056358107 -0700 -@@ -207,6 +207,8 @@ Initialize(Widget request, Widget new, A - else - entry->sme_bsb.label = XtNewString( entry->sme_bsb.label ); - -+ if (!entry->sme_bsb.font) XtError("Aborting: no font found\n"); -+ - CreateGCs(new); - - GetBitmapInfo(new, TRUE); /* Left Bitmap Info */ -diff -up libXaw3d-1.6.1/src/Tip.c.fontset libXaw3d-1.6.1/src/Tip.c ---- libXaw3d-1.6.1/src/Tip.c.fontset 2012-02-15 12:10:38.000000000 -0700 -+++ libXaw3d-1.6.1/src/Tip.c 2012-02-25 14:50:19.058358017 -0700 -@@ -248,6 +248,8 @@ XawTipInitialize(Widget req, Widget w, A - TipWidget tip = (TipWidget)w; - XGCValues values; - -+ if (!tip->tip.font) XtError("Aborting: no font found\n"); -+ - tip->tip.timer = 0; - - values.foreground = tip->tip.foreground; diff --git a/SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.5-fontset.patch b/SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.5-fontset.patch new file mode 100644 index 00000000000..a7a89659cee --- /dev/null +++ b/SPECS-EXTENDED/Xaw3d/Xaw3d-1.6.5-fontset.patch @@ -0,0 +1,44 @@ +--- libXaw3d-1.6.5/src/Command.c~ 2023-05-12 19:08:46.000000000 -0500 ++++ libXaw3d-1.6.5/src/Command.c 2024-02-01 15:39:48.779640222 -0600 +@@ -220,6 +220,8 @@ + CommandWidget cbw = (CommandWidget) new; + int shape_event_base, shape_error_base; + ++ if (!cbw->label.font) XtError("Aborting: no font found\n"); ++ + if (cbw->command.shape_style != XawShapeRectangle + && !XShapeQueryExtension(XtDisplay(new), &shape_event_base, + &shape_error_base)) +--- libXaw3d-1.6.5/src/List.c~ 2023-05-12 19:08:46.000000000 -0500 ++++ libXaw3d-1.6.5/src/List.c 2024-02-01 15:40:50.716135054 -0600 +@@ -362,6 +362,8 @@ + { + ListWidget lw = (ListWidget) new; + ++ if (!lw->list.font) XtError("Aborting: no font found\n"); ++ + /* + * Initialize all private resources. + */ +--- libXaw3d-1.6.5/src/SmeBSB.c~ 2023-05-12 19:08:46.000000000 -0500 ++++ libXaw3d-1.6.5/src/SmeBSB.c 2024-02-01 15:41:39.772150867 -0600 +@@ -203,6 +203,8 @@ + else + entry->sme_bsb.label = XtNewString( entry->sme_bsb.label ); + ++ if (!entry->sme_bsb.font) XtError("Aborting: no font found\n"); ++ + CreateGCs(new); + + GetBitmapInfo(new, TRUE); /* Left Bitmap Info */ +--- libXaw3d-1.6.5/src/Tip.c~ 2023-05-12 19:08:46.000000000 -0500 ++++ libXaw3d-1.6.5/src/Tip.c 2024-02-01 15:42:15.952687460 -0600 +@@ -248,6 +248,8 @@ + TipWidget tip = (TipWidget)w; + XGCValues values; + ++ if (!tip->tip.font) XtError("Aborting: no font found\n"); ++ + tip->tip.timer = 0; + + values.foreground = tip->tip.foreground; diff --git a/SPECS-EXTENDED/Xaw3d/Xaw3d.signatures.json b/SPECS-EXTENDED/Xaw3d/Xaw3d.signatures.json index e82ca4473bd..9c7c7ee819d 100644 --- a/SPECS-EXTENDED/Xaw3d/Xaw3d.signatures.json +++ b/SPECS-EXTENDED/Xaw3d/Xaw3d.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { - "libXaw3d-1.6.3.tar.bz2": "2dba993f04429ec3d7e99341e91bf46be265cc482df25963058c15f1901ec544", - "libXaw3d-1.6.3.tar.bz2.sig": "b9d970f78c9a4b279e49d44b4bba0fedc5eee34a74bf1b9bbb48b65b0cd229cd", - "mattst88.asc": "fea077506e27392203568df63280eed2e2fd5a50bd6df08c30819ac7b176914e" + "libXaw3d-1.6.6.tar.xz": "a41c3e37135ad616b1f28bbde70002afbf3cb59a30df34141f829d32eadc8646", + "libXaw3d-1.6.6.tar.xz.sig": "ba59884fc0ce7e48d5c35692a49d614be9241e1a585c03e3646c9ce5f075f696", + "alan.coopersmith.asc": "35a05973372b792db073c21163e9e4cd135bd9bb08dc4372991ae4b596b99f09" } } diff --git a/SPECS-EXTENDED/Xaw3d/Xaw3d.spec b/SPECS-EXTENDED/Xaw3d/Xaw3d.spec index 10a2afa510f..05d1060aa7e 100644 --- a/SPECS-EXTENDED/Xaw3d/Xaw3d.spec +++ b/SPECS-EXTENDED/Xaw3d/Xaw3d.spec @@ -2,14 +2,15 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Summary: A version of the MIT Athena widget set for X Name: Xaw3d -Version: 1.6.3 -Release: 3%{?dist} -Source0: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2 -Source1: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2.sig -Source2: mattst88.asc +Version: 1.6.6 +Release: 1%{?dist} +Source0: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.xz +Source1: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.xz.sig +Source2: alan.coopersmith.asc + Patch5: Xaw3d-1.5-debian-fixes.patch Patch7: Xaw3d-1.6.1-3Dlabel.patch -Patch10: Xaw3d-1.6.1-fontset.patch +Patch10: Xaw3d-1.6.5-fontset.patch Patch11: Xaw3d-1.6.1-hsbar.patch License: MIT @@ -88,7 +89,7 @@ rm -r $RPM_BUILD_ROOT%{_docdir} %files %license COPYING -%doc ChangeLog README src/README.XAW3D +%doc ChangeLog README.md src/README.XAW3D %{_libdir}/*.so.* %files devel @@ -97,6 +98,11 @@ rm -r $RPM_BUILD_ROOT%{_docdir} %{_includedir}/X11/Xaw3d %changelog + +* Wed Oct 16 2024 Jyoti Kanase - 1.6.6-1 +- Update to 1.6.6 +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 1.6.3-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/Xaw3d/alan.coopersmith.asc b/SPECS-EXTENDED/Xaw3d/alan.coopersmith.asc new file mode 100644 index 00000000000..12f43ea53c4 Binary files /dev/null and b/SPECS-EXTENDED/Xaw3d/alan.coopersmith.asc differ diff --git a/SPECS-EXTENDED/Xaw3d/libXaw3d-1.6.6.tar.xz.sig b/SPECS-EXTENDED/Xaw3d/libXaw3d-1.6.6.tar.xz.sig new file mode 100644 index 00000000000..d7640604452 Binary files /dev/null and b/SPECS-EXTENDED/Xaw3d/libXaw3d-1.6.6.tar.xz.sig differ diff --git a/SPECS-EXTENDED/Xaw3d/mattst88.asc b/SPECS-EXTENDED/Xaw3d/mattst88.asc deleted file mode 100644 index 88871afcef8..00000000000 --- a/SPECS-EXTENDED/Xaw3d/mattst88.asc +++ /dev/null @@ -1,843 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -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 -WcqEt1xlkIo8UPNOXuZIGk+pUdo49knvJQ== -=sz2Y ------END PGP PUBLIC KEY BLOCK----- diff --git a/SPECS-EXTENDED/accountsservice/0001-mocklibc-Fix-compiler-warning.patch b/SPECS-EXTENDED/accountsservice/0001-mocklibc-Fix-compiler-warning.patch new file mode 100644 index 00000000000..c4052a106d0 --- /dev/null +++ b/SPECS-EXTENDED/accountsservice/0001-mocklibc-Fix-compiler-warning.patch @@ -0,0 +1,54 @@ +From da65bee12d9118fe1a49c8718d428fe61d232339 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 11 Apr 2023 10:09:07 -0400 +Subject: [PATCH 1/2] mocklibc: Fix compiler warning + +print_indent is defined in one file and used in another without a +forward declaration. That leads to a compiler warning/error. + +This commit fixes that. +--- + subprojects/mocklibc.wrap | 2 ++ + subprojects/packagefiles/mocklibc-print-indent.diff | 13 +++++++++++++ + 2 files changed, 15 insertions(+) + create mode 100644 subprojects/packagefiles/mocklibc-print-indent.diff + +diff --git a/subprojects/mocklibc.wrap b/subprojects/mocklibc.wrap +index af82298..539ee83 100644 +--- a/subprojects/mocklibc.wrap ++++ b/subprojects/mocklibc.wrap +@@ -1,10 +1,12 @@ + [wrap-file] + directory = mocklibc-1.0 + + source_url = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mocklibc/mocklibc-1.0.tar.gz + source_filename = mocklibc-1.0.tar.gz + source_hash = b2236a6af1028414783e9734a46ea051916ec226479d6a55a3bb823bff68f120 + + patch_url = https://wrapdb.mesonbuild.com/v1/projects/mocklibc/1.0/2/get_zip + patch_filename = mocklibc-1.0-2-wrap.zip + patch_hash = 0280f96a2eeb3c023e5acf4e00cef03d362868218d4a85347ea45137c0ef6c56 ++ ++diff_files = mocklibc-print-indent.diff +diff --git a/subprojects/packagefiles/mocklibc-print-indent.diff b/subprojects/packagefiles/mocklibc-print-indent.diff +new file mode 100644 +index 0000000..4aaed40 +--- /dev/null ++++ b/subprojects/packagefiles/mocklibc-print-indent.diff +@@ -0,0 +1,13 @@ ++diff -up mocklibc-1.0/src/netgroup-debug.c.print-indent mocklibc-1.0/src/netgroup-debug.c ++--- mocklibc-1.0/src/netgroup-debug.c.print-indent 2023-04-11 10:20:53.717381559 -0400 +++++ mocklibc-1.0/src/netgroup-debug.c 2023-04-11 10:21:02.296270333 -0400 ++@@ -21,6 +21,9 @@ ++ #include ++ #include ++ +++void print_indent (FILE *stream, +++ unsigned int indent); +++ ++ void netgroup_debug_print_entry(struct entry *entry, FILE *stream, unsigned int indent) { ++ print_indent(stream, indent); ++ +-- +2.39.2 + diff --git a/SPECS-EXTENDED/accountsservice/0002-user-manager-Fix-another-compiler-warning.patch b/SPECS-EXTENDED/accountsservice/0002-user-manager-Fix-another-compiler-warning.patch new file mode 100644 index 00000000000..47b510e7a9e --- /dev/null +++ b/SPECS-EXTENDED/accountsservice/0002-user-manager-Fix-another-compiler-warning.patch @@ -0,0 +1,145 @@ +From 99aa57bfa59e2578c4ef47e84338f7de85c6f61b Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 11 Apr 2023 10:11:05 -0400 +Subject: [PATCH 2/2] user-manager: Fix another compiler warning + +-Wswitch-enum apparently complains about missing entries even if there +is a default:. + +This commit ensures ACT_USER_MANAGER_SEAT_STATE_UNLOADED is added to the +default case to fix that warning. +--- + src/libaccountsservice/act-user-manager.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c +index 61b4da5..3bbd480 100644 +--- a/src/libaccountsservice/act-user-manager.c ++++ b/src/libaccountsservice/act-user-manager.c +@@ -1727,60 +1727,61 @@ unload_seat (ActUserManager *manager) + { + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); + + priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED; + + g_free (priv->seat.id); + priv->seat.id = NULL; + + g_free (priv->seat.session_id); + priv->seat.session_id = NULL; + + g_debug ("ActUserManager: seat unloaded, so trying to set loaded property"); + maybe_set_is_loaded (manager); + } + + static void + load_new_session_incrementally (ActUserManagerNewSession *new_session) + { + switch (new_session->state) { + case ACT_USER_MANAGER_NEW_SESSION_STATE_GET_UID: + get_uid_for_new_session (new_session); + break; + case ACT_USER_MANAGER_NEW_SESSION_STATE_GET_X11_DISPLAY: + get_x11_display_for_new_session (new_session); + break; + case ACT_USER_MANAGER_NEW_SESSION_STATE_MAYBE_ADD: + maybe_add_new_session (new_session); + break; + case ACT_USER_MANAGER_NEW_SESSION_STATE_LOADED: + break; ++ case ACT_USER_MANAGER_NEW_SESSION_STATE_UNLOADED: + default: + g_assert_not_reached (); + } + } + + static void + free_fetch_user_request (ActUserManagerFetchUserRequest *request) + { + ActUserManager *manager = request->manager; + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); + + if (request->user != NULL) { + g_object_set_data (G_OBJECT (request->user), "fetch-user-request", NULL); + g_object_weak_unref (G_OBJECT (request->user), (GWeakNotify) on_user_destroyed, manager); + } + + priv->fetch_user_requests = g_slist_remove (priv->fetch_user_requests, request); + if (request->type == ACT_USER_MANAGER_FETCH_USER_FROM_USERNAME_REQUEST) { + g_free (request->username); + } + + g_free (request->object_path); + g_free (request->description); + + g_cancellable_cancel (request->cancellable); + g_object_unref (request->cancellable); + + + g_debug ("ActUserManager: unrefing manager owned by fetch user request"); + g_object_unref (manager); +@@ -2243,60 +2244,61 @@ load_users (ActUserManager *manager) + return; + } + + load_user_paths (manager, (const char * const *) user_paths); + + load_included_usernames (manager); + + priv->list_cached_users_done = TRUE; + } + + static gboolean + load_seat_incrementally (ActUserManager *manager) + { + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); + + priv->seat.load_idle_id = 0; + + switch (priv->seat.state) { + case ACT_USER_MANAGER_SEAT_STATE_GET_SESSION_ID: + get_current_session_id (manager); + break; + case ACT_USER_MANAGER_SEAT_STATE_GET_ID: + get_seat_id_for_current_session (manager); + break; + case ACT_USER_MANAGER_SEAT_STATE_GET_SEAT_PROXY: + get_seat_proxy (manager); + break; + case ACT_USER_MANAGER_SEAT_STATE_LOADED: + g_debug ("ActUserManager: Seat loading sequence complete"); + break; ++ case ACT_USER_MANAGER_NEW_SESSION_STATE_UNLOADED: + default: + g_assert_not_reached (); + } + + if (priv->seat.state == ACT_USER_MANAGER_SEAT_STATE_LOADED) { + load_sessions (manager); + } + + maybe_set_is_loaded (manager); + + return FALSE; + } + + static gboolean + load_idle (ActUserManager *manager) + { + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); + + priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED + 1; + load_seat_incrementally (manager); + priv->load_id = 0; + + return FALSE; + } + + static void + queue_load_seat (ActUserManager *manager) + { + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); + +-- +2.39.2 + diff --git a/SPECS-EXTENDED/accountsservice/accountsservice.signatures.json b/SPECS-EXTENDED/accountsservice/accountsservice.signatures.json index 6d51a64560f..f9e5b44200a 100644 --- a/SPECS-EXTENDED/accountsservice/accountsservice.signatures.json +++ b/SPECS-EXTENDED/accountsservice/accountsservice.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "accountsservice-0.6.55.tar.xz": "ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b" + "accountsservice-23.13.9.tar.xz": "adda4cdeae24fa0992e7df3ffff9effa7090be3ac233a3edfdf69d5a9c9b924f" } } diff --git a/SPECS-EXTENDED/accountsservice/accountsservice.spec b/SPECS-EXTENDED/accountsservice/accountsservice.spec index 9e2ea7563ce..18faeb4fe1b 100644 --- a/SPECS-EXTENDED/accountsservice/accountsservice.spec +++ b/SPECS-EXTENDED/accountsservice/accountsservice.spec @@ -3,14 +3,14 @@ Distribution: Azure Linux %global _hardened_build 1 Name: accountsservice -Version: 0.6.55 -Release: 4%{?dist} +Version: 23.13.9 +Release: 1%{?dist} Summary: D-Bus interfaces for querying and manipulating user account information -License: GPLv3+ +License: GPL-3.0-or-later URL: https://www.freedesktop.org/wiki/Software/AccountsService/ #VCS: git:git://git.freedesktop.org/accountsservice -Source0: http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz +Source0: https://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz BuildRequires: %{_bindir}/xsltproc BuildRequires: gettext-devel @@ -22,11 +22,16 @@ BuildRequires: systemd-devel BuildRequires: gobject-introspection-devel BuildRequires: git BuildRequires: meson +BuildRequires: gtk-doc +BuildRequires: vala Requires: polkit Requires: shadow-utils %{?systemd_requires} +Patch10001: 0001-mocklibc-Fix-compiler-warning.patch +Patch10002: 0002-user-manager-Fix-another-compiler-warning.patch + %description The accountsservice project provides a set of D-Bus interfaces for querying and manipulating user account information and an implementation @@ -54,12 +59,15 @@ files needed to build applications that use accountsservice-libs. %autosetup -S git %build -%meson -Dgtk_doc=false -Dsystemd=true -Duser_heuristics=true +%meson -Dgtk_doc=True \ + -Dadmin_group=wheel %meson_build %install %meson_install +mkdir -p $RPM_BUILD_ROOT%{_datadir}/accountsservice/interfaces/ + %find_lang accounts-service %ldconfig_scriptlets libs @@ -76,10 +84,13 @@ files needed to build applications that use accountsservice-libs. %files -f accounts-service.lang %license COPYING %doc README.md AUTHORS -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.Accounts.conf %{_libexecdir}/accounts-daemon +%dir %{_datadir}/accountsservice/ +%dir %{_datadir}/accountsservice/interfaces/ +%{_datadir}/accountsservice/user-templates/ %{_datadir}/dbus-1/interfaces/org.freedesktop.Accounts.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Accounts.User.xml +%{_datadir}/dbus-1/system.d/org.freedesktop.Accounts.conf %{_datadir}/dbus-1/system-services/org.freedesktop.Accounts.service %{_datadir}/polkit-1/actions/org.freedesktop.accounts.policy %dir %{_localstatedir}/lib/AccountsService/ @@ -89,15 +100,25 @@ files needed to build applications that use accountsservice-libs. %files libs %{_libdir}/libaccountsservice.so.* +%dir %{_libdir}/girepository-1.0/ %{_libdir}/girepository-1.0/AccountsService-1.0.typelib %files devel %{_includedir}/accountsservice-1.0 %{_libdir}/libaccountsservice.so %{_libdir}/pkgconfig/accountsservice.pc +%dir %{_datadir}/gir-1.0/ %{_datadir}/gir-1.0/AccountsService-1.0.gir +%dir %{_datadir}/gtk-doc/html/libaccountsservice +%{_datadir}/gtk-doc/html/libaccountsservice/* +%dir %{_datadir}/vala/ +%dir %{_datadir}/vala/vapi/ +%{_datadir}/vala/vapi/accountsservice.* %changelog +* Thu Oct 17 2024 Jyoti kanase - 23.13.9-1 +- Update to version 23.13.9 + * Mon Mar 21 2022 Pawel Winogrodzki - 0.6.55-4 - Adding BR on '%%{_bindir}/xsltproc'. - License verified. diff --git a/SPECS-EXTENDED/acpid/acpid.signatures.json b/SPECS-EXTENDED/acpid/acpid.signatures.json index f70b55578c4..c4603af8b4a 100644 --- a/SPECS-EXTENDED/acpid/acpid.signatures.json +++ b/SPECS-EXTENDED/acpid/acpid.signatures.json @@ -1,10 +1,10 @@ { "Signatures": { - "acpid-2.0.32.tar.xz": "f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e", + "acpid-2.0.34.tar.xz": "2d095c8cfcbc847caec746d62cdc8d0bff1ec1bc72ef7c674c721e04da6ab333", "acpid.power.conf": "c05dd0410ed6cf12ce3a6c917f52b678db9f6349464d12fc43d455fff0d3389f", "acpid.power.sh": "8d9846439625e023bdb73ee87f6c15cf7c8b46b858df129f04e7c04fbe1d3cc3", "acpid.service": "d4b837ae252bf621bb627a83a0b9c49308052af709d466af4a405fbc28f89dea", - "acpid.socket": "7b9a8348049b59a089a648a2de00e1dc3662b60cb4c95c1ba2e3673d6d9889c4", + "acpid.socket": "dbc374040cb7d961eb87171e0b00313a0ab3f4e58bf0c314bf361176df6e952c", "acpid.sysconfig": "29b7b5a5e52063c021fb5d1a66349e920ca5c84f8d711439e34b8c94595ff654", "acpid.video.conf": "a25de42b2578beecbc4fa6ab1405d94e243095f7f35f74f8ed5cf7710585e84a" } diff --git a/SPECS-EXTENDED/acpid/acpid.socket b/SPECS-EXTENDED/acpid/acpid.socket index d61cba23592..2f2770a1c20 100644 --- a/SPECS-EXTENDED/acpid/acpid.socket +++ b/SPECS-EXTENDED/acpid/acpid.socket @@ -3,7 +3,7 @@ Description=ACPID Listen Socket Documentation=man:acpid(8) [Socket] -ListenStream=/var/run/acpid.socket +ListenStream=/run/acpid.socket [Install] WantedBy=sockets.target diff --git a/SPECS-EXTENDED/acpid/acpid.spec b/SPECS-EXTENDED/acpid/acpid.spec index 79348167035..f6452d2c4f0 100644 --- a/SPECS-EXTENDED/acpid/acpid.spec +++ b/SPECS-EXTENDED/acpid/acpid.spec @@ -9,10 +9,10 @@ Distribution: Azure Linux Summary: ACPI Event Daemon Name: acpid -Version: 2.0.32 -Release: 3%{?dist} +Version: 2.0.34 +Release: 1%{?dist} License: GPLv2+ -Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz +Source: https://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf Source3: acpid.power.conf Source4: acpid.power.sh @@ -101,6 +101,11 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog + +* Tue Nov 18 2024 Jyoti Kanase - 2.0.34-1 +- Update to version 2.0.34 +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 2.0.32-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.signatures.json b/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.signatures.json index 3b9cafd7256..887bd712999 100644 --- a/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.signatures.json +++ b/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "cmap-resources-20171205.tar.gz": "37ea23faa2bb15c739adf8a63ab56b1d4433c9296e77148f4a64d43b748396b8" + "cmap-resources-20231115.tar.gz": "a88c3beee8d2f139b47f9d7e932ec198be24991dd46fcaef2961b4b5ea855ea2" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.spec b/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.spec index 4e4eeccff66..2723df7afe7 100644 --- a/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.spec +++ b/SPECS-EXTENDED/adobe-mappings-cmap/adobe-mappings-cmap.spec @@ -2,15 +2,39 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: adobe-mappings-cmap Summary: CMap resources for Adobe's character collections -Version: 20171205 -Release: 8%{?dist} -License: BSD +Version: 20231115 +Release: 1%{?dist} +License: BSD-3-Clause URL: https://www.adobe.com/ -Source: https://github.com/adobe-type-tools/cmap-resources/archive/%{version}.tar.gz#/cmap-resources-%{version}.tar.gz +Source: https://github.com/adobe-type-tools/cmap-resources/archive/refs/tags/%{version}.tar.gz#/cmap-resources-%{version}.tar.gz + BuildArch: noarch BuildRequires: git +BuildRequires: make + +#The cmap-resources package duplicated this one (albeit with different +# installation paths). It was retired for F36. Provide an upgrade path. +%global crversion %(echo '%{version}' | \ + awk '{print substr($0,1,4)"."substr($0,5,2)"."substr($0,7)}') +Provides: cmap-resources = %{crversion}-6.%{release} +Obsoletes: cmap-resources < 2019.07.30-6 +Provides: cmap-resources-cns1-6 = %{crversion}-6.%{release} +Obsoletes: cmap-resources-cns1-6 < 2019.07.30-6 +Provides: cmap-resources-cns1-7 = %{crversion}-6.%{release} +Obsoletes: cmap-resources-cns1-7 < 2019.07.30-6 +Provides: cmap-resources-gb1-5 = %{crversion}-6.%{release} +Obsoletes: cmap-resources-gb1-5 < 2019.07.30-6 +Provides: cmap-resources-japan1-7 = %{crversion}-6.%{release} +Obsoletes: cmap-resources-japan1-7 < 2019.07.30-6 +Provides: cmap-resources-korea1-2 = %{crversion}-6.%{release} +Obsoletes: cmap-resources-korea1-2 < 2019.07.30-6 +Provides: cmap-resources-identity-0 = %{crversion}-6.%{release} +Obsoletes: cmap-resources-identity-0 < 2019.07.30-6 +Provides: cmap-resources-kr-9 = %{crversion}-6.%{release} +Obsoletes: cmap-resources-kr-9 < 2019.07.30-6 + %description CMap (Character Map) resources are used to unidirectionally map character codes, @@ -64,7 +88,7 @@ _EOF %files %doc README.md VERSIONS.txt -%license LICENSE.txt +%license LICENSE.md # Necessary directories ownership (to remove them correctly when uninstalling): %dir %{_datadir}/adobe @@ -76,6 +100,8 @@ _EOF %{_datadir}/adobe/resources/mapping/Identity %{_datadir}/adobe/resources/mapping/Japan1 %{_datadir}/adobe/resources/mapping/Korea1 +%{_datadir}/adobe/resources/mapping/KR +%{_datadir}/adobe/resources/mapping/Manga1 %files deprecated %{_datadir}/adobe/resources/mapping/deprecated @@ -86,6 +112,10 @@ _EOF # ============================================================================= %changelog +* Thu Oct 17 2024 Jyoti kanase - 20231115-1 +- Update to version 20231115 +- License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 20171205-8 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.signatures.json b/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.signatures.json index 7bea8fff773..7d2cb5fa0b5 100644 --- a/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.signatures.json +++ b/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "mapping-resources-pdf-20180407.tar.gz": "2a1b86a4877f62d05169d67244f3e952f0c30a2872f5a6b705b13e3fb15a6d8e" + "mapping-resources-pdf-20230118.tar.gz": "a94b66aaa851ae5de9427904e6fd1a8be2246d66572fa38104bf8fc1d7f5593a" } } diff --git a/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.spec b/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.spec index 76da2cf0435..5d0ca05fda2 100644 --- a/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.spec +++ b/SPECS-EXTENDED/adobe-mappings-pdf/adobe-mappings-pdf.spec @@ -2,15 +2,16 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: adobe-mappings-pdf Summary: PDF mapping resources from Adobe -Version: 20180407 -Release: 6%{?dist} +Version: 20230118 +Release: 1%{?dist} License: BSD URL: https://www.adobe.com/ -Source: https://github.com/adobe-type-tools/mapping-resources-pdf/archive/%{version}.tar.gz#/mapping-resources-pdf-%{version}.tar.gz +Source0: https://github.com/adobe-type-tools/mapping-resources-pdf/archive/refs/tags/%{version}.tar.gz#/mapping-resources-pdf-%{version}.tar.gz BuildArch: noarch BuildRequires: git +BuildRequires: make %description Mapping resources for PDF have a variety of functions, such as mapping CIDs @@ -74,6 +75,10 @@ _EOF # ============================================================================= %changelog +* Mon Oct 21 2024 Jyoti Kanase - 20230118-1 +- Update to 20230118 +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 20180407-6 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/aopalliance/aopalliance.spec b/SPECS-EXTENDED/aopalliance/aopalliance.spec index 67037c3048d..cda032eaef7 100644 --- a/SPECS-EXTENDED/aopalliance/aopalliance.spec +++ b/SPECS-EXTENDED/aopalliance/aopalliance.spec @@ -20,16 +20,16 @@ Distribution: Azure Linux Name: aopalliance Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java/J2EE AOP standards License: Public Domain Group: Development/Libraries/Java -URL: http://aopalliance.sourceforge.net/ +URL: https://aopalliance.sourceforge.net/ # cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login # password empty # cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance Source0: %{_distro_sources_url}/aopalliance-src.tar.gz -Source1: http://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom +Source1: https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom Source2: %{name}-MANIFEST.MF Source3: %{name}-LICENSE.txt BuildRequires: ant @@ -61,7 +61,7 @@ cp %{SOURCE3} ./LICENSE.txt export CLASSPATH= export OPT_JAR_LIST=: %{ant} \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \ -Dbuild.sysclasspath=only jar javadoc # Inject OSGi manifest required by Eclipse. @@ -87,6 +87,11 @@ cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ %{_javadocdir}/%{name} %changelog +* Tue 08 2024 Durga Jagadeesh Palli - 1.0-5 +- Updating javac source and javac target from 1.6 to 1.8. +- change URL and source from http to https +- License verified. + * Thu Feb 22 2024 Pawel Winogrodzki - 1.0-4 - Updating naming for 3.0 version of Azure Linux. diff --git a/SPECS-EXTENDED/blosc/blosc.signatures.json b/SPECS-EXTENDED/blosc/blosc.signatures.json index dff853d6f1e..d8cc1a31fe7 100644 --- a/SPECS-EXTENDED/blosc/blosc.signatures.json +++ b/SPECS-EXTENDED/blosc/blosc.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "blosc-1.21.4.tar.gz": "e72bd03827b8564bbb3dc3ea0d0e689b4863871ce3861d946f2efd7a186ecf3e" + "blosc-1.21.6.tar.gz": "9fcd60301aae28f97f1301b735f966cc19e7c49b6b4321b839b4579a0c156f38" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/blosc/blosc.spec b/SPECS-EXTENDED/blosc/blosc.spec index 84342a77d3b..fd2230b2482 100644 --- a/SPECS-EXTENDED/blosc/blosc.spec +++ b/SPECS-EXTENDED/blosc/blosc.spec @@ -1,8 +1,8 @@ Summary: High performance compressor optimized for binary data Name: blosc -Version: 1.21.4 -Release: 2%{?dist} -License: MIT +Version: 1.21.6 +Release: 1%{?dist} +License: BSD Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://github.com/Blosc/c-blosc @@ -79,6 +79,10 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_includedir}/blosc-export.h %changelog +* Wed Nov 20 2024 Kevin Lockwood - 1.21.6-1 +- Update to 1.21.6 +- License verified. + * Thu Aug 10 2023 Archana Choudhary - 1.21.4-2 - Initial CBL-Mariner import from Fedora 37 (license: MIT). - License verified. diff --git a/SPECS-EXTENDED/bolt/0001-test-test-unix-skip-unix-domain-socket-test.patch b/SPECS-EXTENDED/bolt/0001-test-test-unix-skip-unix-domain-socket-test.patch new file mode 100644 index 00000000000..d0b1f941aa1 --- /dev/null +++ b/SPECS-EXTENDED/bolt/0001-test-test-unix-skip-unix-domain-socket-test.patch @@ -0,0 +1,31 @@ +From 74eace0d89b63be92615364568ba36ad7d748477 Mon Sep 17 00:00:00 2001 +From: Kate Hsuan +Date: Tue, 14 Feb 2023 16:25:04 +0800 +Subject: [PATCH] test: test-unix: skip unix domain socket test + +Skip the test since we can't test unix domain socket in mock. +--- + tests/test-unix.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/tests/test-unix.c b/tests/test-unix.c +index 98de3db..366488f 100644 +--- a/tests/test-unix.c ++++ b/tests/test-unix.c +@@ -198,13 +198,6 @@ main (int argc, char **argv) + test_pid_is_alive, + NULL); + +- g_test_add ("/common/unix/bolt_sd_notify", +- TestNotify, +- NULL, +- test_notify_setup, +- test_sd_notify, +- test_notify_teardown); +- + g_test_add ("/common/unix/sd_watchdog_enabled", + TestDummy, + NULL, +-- +2.39.1 + diff --git a/SPECS-EXTENDED/bolt/bolt.signatures.json b/SPECS-EXTENDED/bolt/bolt.signatures.json index cdd1c17ca8a..6f5d8a233ed 100644 --- a/SPECS-EXTENDED/bolt/bolt.signatures.json +++ b/SPECS-EXTENDED/bolt/bolt.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "bolt-0.9.2.tar.gz": "9119ad9bbc6406b401b5cae99d2b583006ef6c0e61e48a9d120a7f832b202b4e" + "bolt-0.9.8.tar.gz": "5a4306aa21ee398e1e9f2a5072748c9469c9360bf5edc7dcec2f12fc17be122e" } } diff --git a/SPECS-EXTENDED/bolt/bolt.spec b/SPECS-EXTENDED/bolt/bolt.spec index 4876b0e9127..78eb048f391 100644 --- a/SPECS-EXTENDED/bolt/bolt.spec +++ b/SPECS-EXTENDED/bolt/bolt.spec @@ -1,12 +1,15 @@ Summary: Thunderbolt device manager Name: bolt -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.8 +Release: 1%{?dist} License: LGPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://gitlab.freedesktop.org/bolt/bolt Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz + +Patch0: 0001-test-test-unix-skip-unix-domain-socket-test.patch + BuildRequires: asciidoc BuildRequires: gcc BuildRequires: libudev-devel @@ -69,6 +72,9 @@ mentioned tasks. %ghost %dir %{_localstatedir}/lib/boltd %changelog +* Mon Nov 25 2024 Akarsh Chaudhary - 0.9.8-1 +- Upgrade to version 0.9.8 + * Thu Jan 05 2023 Suresh Thelkar - 0.9.2-2 - Initial CBL-Mariner import from Fedora 36 (license: MIT) - License verified diff --git a/SPECS-EXTENDED/deltarpm/deltarpm.signatures.json b/SPECS-EXTENDED/deltarpm/deltarpm.signatures.json index fc69e3958d0..fab15eccf04 100644 --- a/SPECS-EXTENDED/deltarpm/deltarpm.signatures.json +++ b/SPECS-EXTENDED/deltarpm/deltarpm.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "deltarpm-3.6.2.tar.gz": "73de6f7b737b7834cf5e08ccb66063e5c7883b0b84a9902a9162115a2ca77f09" + "deltarpm-3.6.5.tar.gz": "f3fba9b96c55be21696466bbfc3b2a623a4fb35646ff9a135f5c29406b412f22" } } diff --git a/SPECS-EXTENDED/deltarpm/deltarpm.spec b/SPECS-EXTENDED/deltarpm/deltarpm.spec index 553fc20a894..3c7ded21145 100644 --- a/SPECS-EXTENDED/deltarpm/deltarpm.spec +++ b/SPECS-EXTENDED/deltarpm/deltarpm.spec @@ -1,10 +1,20 @@ Vendor: Microsoft Corporation Distribution: Azure Linux +## START: Set by rpmautospec +## (rpmautospec version 0.7.2) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + Name: deltarpm Summary: Create deltas between rpms -Version: 3.6.2 -Release: 7%{?dist} -License: BSD +Version: 3.6.5 +Release: 2%{?dist} +License: BSD-3-Clause URL: https://github.com/rpm-software-management/deltarpm Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc @@ -43,6 +53,7 @@ a difference between an old and a new iso containing rpms. Summary: Python bindings for deltarpm %{?python_provide:%python_provide python3-%{name}} BuildRequires: python3-devel +BuildRequires: make Requires: %{name}%{_isa} = %{version}-%{release} %description -n python3-%{name} @@ -54,17 +65,19 @@ Python 3 version. %autosetup -p1 %build -%{__make} %{?_smp_mflags} CFLAGS="%{build_cflags} -DWITH_ZSTD=1" LDFLAGS="%{build_ldflags}" \ +%set_build_flags +%make_build CFLAGS="${CFLAGS} -DWITH_ZSTD=1" \ bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \ zlibbundled='' zlibldflags='-lz' zlibcppflags='' -%{__make} %{?_smp_mflags} CFLAGS="%{build_cflags} -DWITH_ZSTD=1" LDFLAGS="%{build_ldflags}" \ +%make_build CFLAGS="${CFLAGS} -DWITH_ZSTD=1" \ bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \ zlibbundled='' zlibldflags='-lz' zlibcppflags='' \ python %install -%makeinstall pylibprefix=%{buildroot} +# cannot use %%make_install here, as then prefix is not passed into the Makefile +%make_build pylibprefix=%{buildroot} mandir=%{buildroot}%{_mandir} prefix=%{buildroot}%{_prefix} install %files %license LICENSE.BSD @@ -95,12 +108,78 @@ Python 3 version. %{python3_sitearch}/__pycache__/%{name}.* %changelog -* Tue Jun 01 2021 Thomas Crain - 3.6.2-7 -- Remove unneeded deletion of Python 2 sitelib in buildroot +* Mon Nov 04 2024 Sreenivasulu Malavathula - 3.6.5-2 +- Initial Azure Linux import from Fedora 41 (license: MIT) +- License verified + +* Mon Sep 16 2024 Dan Čermák - 3.6.5-1 +- New upstream release 3.6.5, fixes rhbz#2312195 + +* Mon Aug 19 2024 Dan Čermák - 3.6.4-1 +- New upstream release 3.6.4, fixes rhbz#2303707 + +* Mon Aug 19 2024 Dan Čermák - 3.6.3-16 +- Switch License identifier to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 3.6.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 3.6.3-14 +- Rebuilt for Python 3.13 + +* Wed Jan 24 2024 Fedora Release Engineering - 3.6.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.6.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 3.6.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 3.6.3-10 +- Rebuilt for Python 3.12 + +* Thu May 25 2023 Adam Williamson - 3.6.3-9 +- Rebuild for rpm 4.19 + +* Thu Jan 19 2023 Fedora Release Engineering - 3.6.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Mar 05 2021 Henry Li - 3.6.2-6 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). -- Remove python2 instances +* Tue Dec 20 2022 Dan Čermák - 3.6.3-7 +- Fix build failure due to %%%%make_install usage + +* Tue Dec 20 2022 Dan Čermák - 3.6.3-6 +- Switch from %%makeinstall to %%make_install + +* Tue Dec 20 2022 Dan Čermák - 3.6.3-5 +- Remove distutils from Makefile, fixes rhbz#2155020 + +* Thu Jul 21 2022 Fedora Release Engineering - 3.6.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 3.6.3-3 +- Rebuilt for Python 3.11 + +* Tue Mar 15 2022 Dan Čermák - 3.6.3-1 +- New upstream release 3.6.3 + +* Thu Jan 20 2022 Fedora Release Engineering - 3.6.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 3.6.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 3.6.2-9 +- Rebuilt for Python 3.10 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.6.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.6.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 3.6.2-6 +- Rebuilt for Python 3.9 * Tue Jan 28 2020 Fedora Release Engineering - 3.6.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -402,3 +481,5 @@ Python 3 version. * Sat Dec 03 2005 Dries Verachtert - 3.3-1 - 3768/dries - Initial package. + +## END: Generated by rpmautospec diff --git a/SPECS-EXTENDED/diffstat/diffstat.signatures.json b/SPECS-EXTENDED/diffstat/diffstat.signatures.json index 17a6737f82b..0784607f3e1 100644 --- a/SPECS-EXTENDED/diffstat/diffstat.signatures.json +++ b/SPECS-EXTENDED/diffstat/diffstat.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "COPYING": "4c13a1dd3f79e44679957051db96807506688109cafe11d7c899909119e0481d", - "diffstat-1.63.tgz": "7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f" + "diffstat-1.66.tgz": "f54531bbe32e8e0fa461f018b41e3af516b632080172f361f05e50367ecbb69e" } } diff --git a/SPECS-EXTENDED/diffstat/diffstat.spec b/SPECS-EXTENDED/diffstat/diffstat.spec index 0e5db76025c..2e3127684c4 100644 --- a/SPECS-EXTENDED/diffstat/diffstat.spec +++ b/SPECS-EXTENDED/diffstat/diffstat.spec @@ -1,17 +1,18 @@ +Vendor: Microsoft Corporation +Distribution: Azure Linux Summary: A utility which provides statistics based on the output of diff Name: diffstat -Version: 1.63 +Version: 1.66 Release: 3%{?dist} -License: MIT -Vendor: Microsoft Corporation -Distribution: Azure Linux -URL: http://invisible-island.net/diffstat -Source0: ftp://ftp.invisible-island.net/pub/diffstat/%{name}-%{version}.tgz +License: SMLNJ +URL: https://invisible-island.net/diffstat +Source0: https://invisible-mirror.net/archives/diffstat/%{name}-%{version}.tgz # Taken from diffstat.c. Source1: COPYING BuildRequires: gcc BuildRequires: xz +BuildRequires: make %description The diff command compares files line by line. Diffstat reads the @@ -43,8 +44,48 @@ make check %{_mandir}/*/* %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 1.63-3 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Mon Nov 04 2024 Sreenivasulu Malavathula - 1.66-3 +- Initial Azure Linux import from Fedora 41 (license: MIT) +- License verified + +* Wed Jul 17 2024 Fedora Release Engineering - 1.66-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 29 2024 Fedora Release Monitoring - 1.66-1 +- Update to 1.66 (#2260805) + +* Wed Jan 24 2024 Fedora Release Engineering - 1.65-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.65-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.65-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.65-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Oct 10 2022 Tim Waugh - 1.65-1 +- Update to 1.65 (bug #2133330). + +* Thu Jul 21 2022 Fedora Release Engineering - 1.64-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.64-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.64-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.64-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Tim Waugh - 1.64-1 +- Update to 1.64. + +* Mon Jul 27 2020 Fedora Release Engineering - 1.63-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Tue Jan 28 2020 Fedora Release Engineering - 1.63-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/exempi/exempi-e23c213-typeinfos.patch b/SPECS-EXTENDED/exempi/exempi-e23c213-typeinfos.patch deleted file mode 100644 index 0e05bf30a87..00000000000 --- a/SPECS-EXTENDED/exempi/exempi-e23c213-typeinfos.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d45c06270576493e1537080fa43c1af667c4337a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -Date: Tue, 12 Oct 2021 14:15:17 +0200 -Subject: [PATCH] Avoid multiple definitions of typeinfos - ---- - XMPFiles/source/XMPFiles_Impl.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp -index 2f918ac..ff45040 100644 ---- a/XMPFiles/source/XMPFiles_Impl.cpp -+++ b/XMPFiles/source/XMPFiles_Impl.cpp -@@ -47,7 +47,9 @@ using namespace std; - /// This file ... - /// - // ================================================================================================= --#include "public/include/XMP.incl_cpp" -+#if ! XMP_StaticBuild -+ #include "public/include/XMP.incl_cpp" -+#endif - - #if XMP_WinBuild - #pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) --- -2.33.0 - diff --git a/SPECS-EXTENDED/exempi/exempi.signatures.json b/SPECS-EXTENDED/exempi/exempi.signatures.json index 12d94b1638f..5e51db63383 100644 --- a/SPECS-EXTENDED/exempi/exempi.signatures.json +++ b/SPECS-EXTENDED/exempi/exempi.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "exempi-2.6.1.tar.bz2": "49f2172d2e9c601c4ee89b7f6c4b50f328ba1f2c165bdeab949b7de8c8223517" + "exempi-2.6.5.tar.bz2": "90b4c4cdde841402a7839b54add679e9d2ef749ea5f1f82fdcc2d0122d889123" } } diff --git a/SPECS-EXTENDED/exempi/exempi.spec b/SPECS-EXTENDED/exempi/exempi.spec index 738da3b61d0..c0494aff936 100644 --- a/SPECS-EXTENDED/exempi/exempi.spec +++ b/SPECS-EXTENDED/exempi/exempi.spec @@ -1,13 +1,16 @@ Summary: Library for easy parsing of XMP metadata Name: exempi -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.6.5 +Release: 1%{?dist} License: BSD +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: http://libopenraw.freedesktop.org/wiki/Exempi Source0: https://gitlab.freedesktop.org/libopenraw/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 -Patch0: exempi-e23c213-typeinfos.patch + BuildRequires: gcc-c++ BuildRequires: boost-devel expat-devel zlib-devel pkgconfig + # Work around for aarch64 support (https://bugzilla.redhat.com/show_bug.cgi?id=925327) BuildRequires: autoconf automake libtool BuildRequires: make @@ -42,8 +45,15 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build + %check +%ifarch s390x +# testcore test fails on big endian arches since exempi 2.5.2: +# https://gitlab.freedesktop.org/libopenraw/exempi/-/issues/23 +make check || [ "$(grep '^FAIL:' exempi/test-suite.log)" = "FAIL: tests/testcore" ] +%else make check +%endif %install %make_install @@ -64,6 +74,10 @@ rm -rf %{buildroot}%{_libdir}/*.a %{_libdir}/pkgconfig/*.pc %changelog +* Mon Oct 21 2024 Jyoti kanase - 2.6.5-1 +- Update to version 2.6.5 +- License verified + * Tue Aug 16 2022 Olivia Crain - 2.6.1-2 - Bump to rebuild with zlib 1.2.1-2 (fixes CVE-2022-37434) diff --git a/SPECS-EXTENDED/fabtests/fabtests.signatures.json b/SPECS-EXTENDED/fabtests/fabtests.signatures.json index 77b758c64a3..d00494941ef 100644 --- a/SPECS-EXTENDED/fabtests/fabtests.signatures.json +++ b/SPECS-EXTENDED/fabtests/fabtests.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "fabtests-1.12.0rc1.tar.bz2": "9b0eff5d0e60e8113d4b0f09b749e78240c3a2344260c130355d06023cde23f0" + "fabtests-1.18.0.tar.bz2": "9201ba020c3cf2f07dbf16d9837b565031f2eab664efd02f2e4345443983ae3e" } } diff --git a/SPECS-EXTENDED/fabtests/fabtests.spec b/SPECS-EXTENDED/fabtests/fabtests.spec index cb4313b7a7a..25bd710fa8d 100644 --- a/SPECS-EXTENDED/fabtests/fabtests.spec +++ b/SPECS-EXTENDED/fabtests/fabtests.spec @@ -1,35 +1,45 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: fabtests -Version: 1.12.0 -%global __rc rc1 +Version: 1.18.0 Release: 1%{?dist} Summary: Test suite for libfabric API + # include/jsmn.h and common/jsmn.c are licensed under MIT. # All other source files permit distribution under BSD. Some of them # additionaly expressly allow the option to be licensed under GPLv2. # See the license headers in individual source files to see which those are. License: BSD and (BSD or GPLv2) and MIT Url: https://github.com/ofiwg/libfabric -Source: https://github.com/ofiwg/libfabric/releases/download/v%{version}%{__rc}/%{name}-%{version}%{__rc}.tar.bz2 +Source: https://github.com/ofiwg/libfabric/releases/download/v%{version}/%{name}-%{version}.tar.bz2 + Patch0: 0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch + BuildRequires: libfabric-devel >= %{version} +%ifarch %{valgrind_arches} BuildRequires: valgrind-devel +%endif BuildRequires: gcc BuildRequires: make +Requires: python3-pytest %description Fabtests provides a set of examples that uses libfabric - a high-performance fabric software library. %prep -%setup -q -n %{name}-%{version}%{__rc} -%patch 0 -p2 +%setup -q -n %{name}-%{version} +%patch -P0 -p2 %build -%configure --with-valgrind +%configure \ +%ifarch %{valgrind_arches} + --with-valgrind +%endif + make %{?_smp_mflags} V=1 + %install %make_install # remove unpackaged files from the buildroot @@ -44,6 +54,10 @@ rm -f %{buildroot}%{_libdir}/*.la %license COPYING %changelog +* Fri Nov 08 2024 Jyoti Kanase - 1.18.0-1 +- Update to 1.18.0 +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 1.12.0-1 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Converting the 'Release' tag to the '[number].[distribution]' format. diff --git a/SPECS-EXTENDED/gdisk/gdisk-libuuid.patch b/SPECS-EXTENDED/gdisk/gdisk-libuuid.patch deleted file mode 100644 index 4538f811c5c..00000000000 --- a/SPECS-EXTENDED/gdisk/gdisk-libuuid.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gptfdisk-1.0.9/guid.cc.orig gptfdisk-1.0.9/guid.cc ---- gptfdisk-1.0.9/guid.cc.orig 2022-04-15 01:17:12.000000000 +0200 -+++ gptfdisk-1.0.9/guid.cc 2022-05-08 02:12:21.042712891 +0200 -@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { - void GUIDData::Randomize(void) { - int i, uuidGenerated = 0; - --#ifdef _UUID_UUID_H -+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) - uuid_generate(uuidData); - ReverseBytes(&uuidData[0], 4); - ReverseBytes(&uuidData[4], 2); diff --git a/SPECS-EXTENDED/gdisk/gdisk.signatures.json b/SPECS-EXTENDED/gdisk/gdisk.signatures.json index b9772fa4b7f..d99a04c45c1 100644 --- a/SPECS-EXTENDED/gdisk/gdisk.signatures.json +++ b/SPECS-EXTENDED/gdisk/gdisk.signatures.json @@ -1,5 +1,6 @@ { "Signatures": { - "gdisk-1.0.9.tar.gz": "dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2" + "gdisk-1.0.10.tar.gz": "2abed61bc6d2b9ec498973c0440b8b804b7a72d7144069b5a9209b2ad693a282" } } + diff --git a/SPECS-EXTENDED/gdisk/gdisk.spec b/SPECS-EXTENDED/gdisk/gdisk.spec index acdb243370d..385e7974e34 100644 --- a/SPECS-EXTENDED/gdisk/gdisk.spec +++ b/SPECS-EXTENDED/gdisk/gdisk.spec @@ -1,18 +1,17 @@ -Summary: An fdisk-like partitioning tool for GPT disks -Name: gdisk -Version: 1.0.9 -Release: 3%{?dist} -License: GPLv2 -Vendor: Microsoft Corporation -Distribution: Azure Linux -URL: https://www.rodsbooks.com/gdisk/ -Source0: https://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: gdisk-libuuid.patch -BuildRequires: gcc-c++ -BuildRequires: libuuid-devel -BuildRequires: make -BuildRequires: ncurses-devel -BuildRequires: popt-devel +Summary: An fdisk-like partitioning tool for GPT disks +Name: gdisk +Version: 1.0.10 +Release: 3%{?dist} +License: GPL-2.0-only +Vendor: Microsoft Corporation +Distribution: Azure Linux +URL: https://www.rodsbooks.com/gdisk/ +Source0: https://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: gcc-c++ +BuildRequires: libuuid-devel +BuildRequires: make +BuildRequires: ncurses-devel +BuildRequires: popt-devel %description An fdisk-like partitioning tool for GPT disks. GPT fdisk features a @@ -21,14 +20,13 @@ structures, recovery tools to help you deal with corrupt partition tables, and the ability to convert MBR disks to GPT format. %prep -%setup -q -n gptfdisk-%{version} -%patch 0 -p1 -b .orig +%autosetup -p1 -n gptfdisk-%{version} %build make CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" LDFLAGS="%{build_ldflags}" %install -for f in gdisk sgdisk cgdisk fixparts ; do +for f in gdisk sgdisk cgdisk fixparts ; do install -D -p -m 0755 $f %{buildroot}%{_sbindir}/$f install -D -p -m 0644 $f.8 %{buildroot}%{_mandir}/man8/$f.8 done @@ -49,10 +47,37 @@ make test %{_mandir}/man8/fixparts.8* %changelog -* Wed Mar 08 2023 Suresh Thelkar - 1.0.9-3 -- Initial CBL-Mariner import from Fedora 36 (license: MIT) +* Wed Nov 06 2024 Durga Jagadeesh Palli - 1.0.10-3 +- Initial Azure Linux import from Fedora 41 (license: MIT) - License verified +* Thu Jul 18 2024 Fedora Release Engineering - 1.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 20 2024 Terje Rosten - 1.0.10-1 +- 1.0.10 + +* Mon Feb 12 2024 Tomas Bzatek - 1.0.9-9 +- Use a SPDX license tag + +* Wed Jan 24 2024 Fedora Release Engineering - 1.0.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Aug 24 2022 Panu Matilainen - 1.0.9-4 +- Fix popt API misuse (#2100391) + +* Thu Jul 21 2022 Fedora Release Engineering - 1.0.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat May 07 2022 Dominik Mierzejewski - 1.0.9-2 - backport upstream fix for UUID issue with latest popt - run internal testsuite in %%check diff --git a/SPECS-EXTENDED/glew/glew-2.2.0-gcc12-cplusplus.patch b/SPECS-EXTENDED/glew/glew-2.2.0-gcc12-cplusplus.patch new file mode 100644 index 00000000000..3d4a61ae01c --- /dev/null +++ b/SPECS-EXTENDED/glew/glew-2.2.0-gcc12-cplusplus.patch @@ -0,0 +1,13 @@ +diff -up glew-2.2.0/include/GL/glew.h~ glew-2.2.0/include/GL/glew.h +--- glew-2.2.0/include/GL/glew.h~ 2020-03-15 12:53:59.000000000 +0100 ++++ glew-2.2.0/include/GL/glew.h 2022-02-22 23:17:58.889834158 +0100 +@@ -220,7 +220,8 @@ typedef _W64 int ptrdiff_t; + */ + + #if defined(__APPLE__) || defined(__linux__) +-# if defined(__cplusplus) ++/* GCC12 errors out when including with __cplusplus < 201103L */ ++# if defined(__cplusplus) && __cplusplus >= 201103L + # include + # include + # else diff --git a/SPECS-EXTENDED/glew/glew.signatures.json b/SPECS-EXTENDED/glew/glew.signatures.json index eec800960c7..40103dff379 100644 --- a/SPECS-EXTENDED/glew/glew.signatures.json +++ b/SPECS-EXTENDED/glew/glew.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "glew-2.1.0.tgz": "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" + "glew-2.2.0.tgz": "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1" } } diff --git a/SPECS-EXTENDED/glew/glew.spec b/SPECS-EXTENDED/glew/glew.spec index 5d38e4667cc..a0e1ca71fb5 100644 --- a/SPECS-EXTENDED/glew/glew.spec +++ b/SPECS-EXTENDED/glew/glew.spec @@ -1,16 +1,20 @@ Name: glew -Version: 2.1.0 -Release: 7%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: The OpenGL Extension Wrangler Library License: BSD and MIT Vendor: Microsoft Corporation Distribution: Azure Linux -URL: http://glew.sourceforge.net +URL: https://glew.sourceforge.net Source0: https://sourceforge.net/projects/glew/files/glew/%{version}/glew-%{version}.tgz Patch0: glew-2.1.0-install.patch +Patch1: glew-2.2.0-gcc12-cplusplus.patch + BuildRequires: gcc BuildRequires: libGLU-devel +BuildRequires: make + %description The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C/C++ @@ -74,6 +78,11 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so* %doc doc/* %changelog +* Tue Oct 29 2024 Durga Jagadeesh Palli - 2.2.0-1 +- Update to 2.2.0. +- change http URL to https +- License verified + * Thu Jun 17 2021 Thomas Crain - 2.1.0-7 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Remove redhat-specific config.guess seeding diff --git a/SPECS-EXTENDED/libbytesize/libbytesize.signatures.json b/SPECS-EXTENDED/libbytesize/libbytesize.signatures.json index 7176faa497e..8ad06d0f859 100644 --- a/SPECS-EXTENDED/libbytesize/libbytesize.signatures.json +++ b/SPECS-EXTENDED/libbytesize/libbytesize.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libbytesize-2.5.tar.gz": "6305addae2b7be313dbfc36b96094ec0544d5144859ab4a5685ca6d314d6fdda" + "libbytesize-2.11.tar.gz": "1f6ce157750ed1201ce83edd3c23d997a615c7da30f9a0e5bb44635f66768d81" } } diff --git a/SPECS-EXTENDED/libbytesize/libbytesize.spec b/SPECS-EXTENDED/libbytesize/libbytesize.spec index 017b85728cd..d8bab40f20c 100644 --- a/SPECS-EXTENDED/libbytesize/libbytesize.spec +++ b/SPECS-EXTENDED/libbytesize/libbytesize.spec @@ -2,24 +2,24 @@ Vendor: Microsoft Corporation Distribution: Azure Linux %define realname bytesize %define with_python3 1 -%define with_gtk_doc 0 +%define with_gtk_doc 1 %define with_tools 1 %if %{with_tools} != 1 %define tools_opts --without-tools %endif -%define configure_opts %{?python3_opts} %{?tools_opts} --without-gtk-doc +%define configure_opts %{?python3_opts} %{?tools_opts} Name: libbytesize -Version: 2.5 -Release: 3%{?dist} +Version: 2.11 +Release: 1%{?dist} Summary: A library for working with sizes in bytes License: LGPLv2+ URL: https://github.com/storaged-project/libbytesize Source0: https://github.com/storaged-project/libbytesize/releases/download/%{version}/%{name}-%{version}.tar.gz -BuildRequires: %{_bindir}/xsltproc +BuildRequires: make BuildRequires: gcc BuildRequires: gmp-devel BuildRequires: mpfr-devel @@ -50,7 +50,6 @@ with the libbytesize library. %package -n python3-%{realname} Summary: Python 3 bindings for libbytesize Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3-six %description -n python3-%{realname} This package contains Python 3 bindings for libbytesize making the use of @@ -68,11 +67,11 @@ for doing calculations with storage sizes. %endif %prep -%setup -q -n %{name}-%{version} +%autosetup -n %{name}-%{version} %build %configure %{?configure_opts} -%{__make} %{?_smp_mflags} +%make_build %install %{make_install} @@ -111,6 +110,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %endif %changelog +* Thu Nov 07 2024 Jyoti Kanase - 2.11-1 +- update to version 2.11 +- License verified. + * Mon Mar 21 2022 Pawel Winogrodzki - 2.5-3 - Adding BR on '%%{_bindir}/xsltproc'. - Disabled gtk doc generation to remove network dependency during build-time. diff --git a/SPECS-EXTENDED/libdeflate/libdeflate.signatures.json b/SPECS-EXTENDED/libdeflate/libdeflate.signatures.json index 997534e1174..b75761e8a03 100644 --- a/SPECS-EXTENDED/libdeflate/libdeflate.signatures.json +++ b/SPECS-EXTENDED/libdeflate/libdeflate.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libdeflate-1.9.tar.gz": "a537ab6125c226b874c02b166488b326aece954930260dbf682d88fc339137e3" + "libdeflate-1.22.tar.gz": "7f343c7bf2ba46e774d8a632bf073235e1fd27723ef0a12a90f8947b7fe851d6" } } diff --git a/SPECS-EXTENDED/libdeflate/libdeflate.spec b/SPECS-EXTENDED/libdeflate/libdeflate.spec index 491b4cfe4ac..42d5a4396d9 100644 --- a/SPECS-EXTENDED/libdeflate/libdeflate.spec +++ b/SPECS-EXTENDED/libdeflate/libdeflate.spec @@ -1,14 +1,18 @@ Summary: Fast implementation of DEFLATE, gzip, and zlib + Name: libdeflate -Version: 1.9 -Release: 4%{?dist} +Version: 1.22 +Release: 1%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://github.com/ebiggers/libdeflate -Source0: https://github.com/ebiggers/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/ebiggers/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz + + BuildRequires: gcc -BuildRequires: make +BuildRequires: cmake +BuildRequires: zlib-devel %description libdeflate is a library for fast, whole-buffer DEFLATE-based compression and @@ -28,16 +32,29 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description utils Binaries from libdeflate. + %prep %autosetup -sed -r -i 's/-O2 -fomit-frame-pointer -std=c99/-std=c99/' Makefile %build -%make_build CFLAGS="%{optflags} -fpic -pie -g" USE_SHARED_LIB=1 LIBDIR=%{_libdir} PREFIX=%{_prefix} +cmake_opts="\ + -DLIBDEFLATE_BUILD_STATIC_LIB:BOOL=OFF \ + -DLIBDEFLATE_BUILD_SHARED_LIB:BOOL=ON \ + -DLIBDEFLATE_COMPRESSION_SUPPORT:BOOL=ON \ + -DLIBDEFLATE_DECOMPRESSION_SUPPORT:BOOL=ON \ + -DLIBDEFLATE_ZLIB_SUPPORT:BOOL=ON \ + -DLIBDEFLATE_GZIP_SUPPORT:BOOL=ON \ + -DLIBDEFLATE_FREESTANDING:BOOL=OFF \ + -DLIBDEFLATE_BUILD_GZIP:BOOL=ON \ + -DLIBDEFLATE_BUILD_TESTS:BOOL=ON \ + -DLIBDEFLATE_USE_SHARED_LIBS:BOOL=ON" + +%cmake $cmake_opts +%cmake_build %install -%make_install CFLAGS="%{optflags} -fpic -pie -g" USE_SHARED_LIB=1 LIBDIR=%{_libdir} PREFIX=%{_prefix} -rm %{buildroot}/%{_libdir}/*.a +%cmake_install + %files %doc NEWS.md README.md @@ -48,12 +65,18 @@ rm %{buildroot}/%{_libdir}/*.a %{_includedir}/libdeflate.h %{_libdir}/libdeflate.so %{_libdir}/pkgconfig/* +%{_libdir}/cmake/libdeflate/ %files utils %{_bindir}/libdeflate-gzip %{_bindir}/libdeflate-gunzip + %changelog +* Mon Oct 14 2024 Jyoti kanase - 1.22-1 +- Update to version 1.22 +- License verified + * Wed Jan 18 2023 Suresh Thelkar - 1.9-4 - Initial CBL-Mariner import from Fedora 36 (license: MIT) - License verified diff --git a/SPECS-EXTENDED/libexttextcat/libexttextcat.signatures.json b/SPECS-EXTENDED/libexttextcat/libexttextcat.signatures.json index 6533fc83d18..1b165d88e80 100644 --- a/SPECS-EXTENDED/libexttextcat/libexttextcat.signatures.json +++ b/SPECS-EXTENDED/libexttextcat/libexttextcat.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libexttextcat-3.4.5.tar.xz": "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8" + "libexttextcat-3.4.6.tar.xz": "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df" } } diff --git a/SPECS-EXTENDED/libexttextcat/libexttextcat.spec b/SPECS-EXTENDED/libexttextcat/libexttextcat.spec index 65714970c9f..e143c62db61 100644 --- a/SPECS-EXTENDED/libexttextcat/libexttextcat.spec +++ b/SPECS-EXTENDED/libexttextcat/libexttextcat.spec @@ -1,15 +1,16 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: libexttextcat -Version: 3.4.5 -Release: 7%{?dist} +Version: 3.4.6 +Release: 1%{?dist} Summary: Text categorization library -License: BSD +License: BSD-3-Clause URL: https://wiki.documentfoundation.org/Libexttextcat -Source: http://dev-www.libreoffice.org/src/libexttextcat/%{name}-%{version}.tar.xz +Source: https://dev-www.libreoffice.org/src/libexttextcat/%{name}-%{version}.tar.xz BuildRequires: gcc +BuildRequires: make %description %{name} is an N-Gram-Based Text Categorization library primarily @@ -36,10 +37,10 @@ you to easily create your own document fingerprints. %build %configure --disable-silent-rules --disable-static --disable-werror -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install rm -f %{buildroot}/%{_libdir}/*.la %check @@ -63,6 +64,11 @@ make check %{_bindir}/createfp %changelog +* Mon Nov 04 2024 Durga Jagadeesh Palli - 3.4.6-1 +- Update to 3.4.6-1 +- License verified. +- change the Source from http to https + * Fri Oct 15 2021 Pawel Winogrodzki - 3.4.5-7 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/liblouis/liblouis.signatures.json b/SPECS-EXTENDED/liblouis/liblouis.signatures.json index 4e4258a1837..e7ae37ea92e 100644 --- a/SPECS-EXTENDED/liblouis/liblouis.signatures.json +++ b/SPECS-EXTENDED/liblouis/liblouis.signatures.json @@ -1,5 +1,5 @@ { - "Signatures": { - "liblouis-3.26.0.tar.gz": "ca9446c57fbce16a856f99a1abf69ae2e8671d4d8ab44cfb353bb651a820b73e" - } -} + "Signatures": { + "liblouis-3.31.0.tar.gz": "29286fe9edc9c7119941b0c847aa9587021f0e53f5623aa03ddfd5e285783af5" + } +} \ No newline at end of file diff --git a/SPECS-EXTENDED/liblouis/liblouis.spec b/SPECS-EXTENDED/liblouis/liblouis.spec index 8af120caccb..b7529c7d80e 100644 --- a/SPECS-EXTENDED/liblouis/liblouis.spec +++ b/SPECS-EXTENDED/liblouis/liblouis.spec @@ -1,8 +1,8 @@ Summary: Braille translation and back-translation library Name: liblouis -Version: 3.26.0 +Version: 3.31.0 Release: 1%{?dist} -License: LGPL-2.1-or-later +License: LGPL-2.1-or-later AND GPL-3 Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://github.com/liblouis/liblouis @@ -151,6 +151,10 @@ done %endif %changelog +* Thu Nov 07 2024 Kevin Lockwood 3.31.0-1 +- Update to 3.31.0 +- License verified + * Tue Jul 18 2023 CBL-Mariner Servicing Account - 3.26.0-1 - Auto-upgrade to 3.26.0 - to fix CVE-2023-26767, CVE-2023-26768, CVE-2023-26769 - oliviacrain: Fix LGPL version in license tags diff --git a/SPECS-EXTENDED/neon/neon-0.27.0-multilib.patch b/SPECS-EXTENDED/neon/neon-0.32.2-multilib.patch similarity index 77% rename from SPECS-EXTENDED/neon/neon-0.27.0-multilib.patch rename to SPECS-EXTENDED/neon/neon-0.32.2-multilib.patch index 5f8f86d9b49..a2197922170 100644 --- a/SPECS-EXTENDED/neon/neon-0.27.0-multilib.patch +++ b/SPECS-EXTENDED/neon/neon-0.32.2-multilib.patch @@ -1,5 +1,5 @@ ---- neon-0.27.0/neon-config.in.multilib -+++ neon-0.27.0/neon-config.in +--- neon-0.32.2/neon-config.in.multilib ++++ neon-0.32.2/neon-config.in @@ -5,7 +5,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -22,7 +22,7 @@ i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@] EOF -@@ -69,11 +73,10 @@ +@@ -69,16 +73,11 @@ ;; --cflags) @@ -32,10 +32,16 @@ --libs) - LIBS="-lneon @NEON_LIBS@" - # Don't add standard library paths - if test "$prefix" != "/usr"; then - LIBS="-L${libdir} ${LIBS}" -@@ -93,7 +96,7 @@ +- # Don't add standard library paths +- if test "$prefix" != "/usr"; then +- LIBS="-L${libdir} ${LIBS}" +- fi +- echo @user_LDFLAGS@ ${LIBS} ++ echo ${LIBS} + ;; + + --la-file) +@@ -93,7 +92,7 @@ zlib|ZLIB) support @NE_FLAG_ZLIB@ ;; ipv6|IPV6) support @NE_FLAG_IPV6@ ;; dav|DAV) support @NE_FLAG_DAV@ ;; @@ -44,8 +50,8 @@ i18n|I18N) support @NE_FLAG_I18N@ ;; ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;; *) support no ;; ---- neon-0.27.0/neon.pc.in.multilib -+++ neon-0.27.0/neon.pc.in +--- neon-0.32.2/neon.pc.in.multilib ++++ neon-0.32.2/neon.pc.in @@ -2,6 +2,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ diff --git a/SPECS-EXTENDED/neon/neon.signatures.json b/SPECS-EXTENDED/neon/neon.signatures.json index e9f3ca4fe98..f1c3e336b60 100644 --- a/SPECS-EXTENDED/neon/neon.signatures.json +++ b/SPECS-EXTENDED/neon/neon.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "neon-0.31.2.tar.gz": "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678" + "neon-0.33.0.tar.gz": "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8" } } diff --git a/SPECS-EXTENDED/neon/neon.spec b/SPECS-EXTENDED/neon/neon.spec index 5ecdd4de4e0..5e0b078e4fc 100644 --- a/SPECS-EXTENDED/neon/neon.spec +++ b/SPECS-EXTENDED/neon/neon.spec @@ -1,19 +1,39 @@ Vendor: Microsoft Corporation Distribution: Azure Linux + %bcond_without tests +%bcond_with pkcs11 + +%bcond_with libproxy + +# Disable automatic .la file removal +%global __brp_remove_la_files %nil + Summary: An HTTP and WebDAV client library Name: neon -Version: 0.31.2 -Release: 2%{?dist} -License: LGPLv2+ +Version: 0.33.0 +Release: 3%{?dist} +License: LGPL-2.0-or-later URL: https://notroj.github.io/neon/ Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz -Patch0: neon-0.27.0-multilib.patch -BuildRequires: gcc-c++ -BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel -BuildRequires: pkgconfig, pakchois-devel -Requires: ca-certificates +Patch0: neon-0.32.2-multilib.patch +BuildRequires: expat-devel +BuildRequires: openssl-devel +BuildRequires: zlib-devel +BuildRequires: krb5-devel + +BuildRequires: pkgconfig +BuildRequires: make +BuildRequires: gcc +BuildRequires: xmlto + +%if %{with pkcs11} +BuildRequires: pakchois-devel +%endif +%if %{with libproxy} +BuildRequires: libproxy-devel +%endif %if %{with tests} # SSL tests require openssl binary, PKCS#11 testing need certutil BuildRequires: /usr/bin/perl, /usr/bin/openssl, /usr/bin/certutil @@ -31,29 +51,31 @@ Summary: Development libraries and C header files for the neon library Requires: neon = %{version}-%{release}, openssl-devel, zlib-devel, expat-devel Requires: pkgconfig # Documentation is GPLv2+ -License: LGPLv2+ and GPLv2+ +License: LGPL-2.0-or-later AND GPL-2.0-or-later %description devel The development library for the C language HTTP and WebDAV client library. %prep -%setup -q -%patch 0 -p1 -b .multilib +%autosetup -p1 # prevent installation of HTML docs -sed -ibak '/^install-docs/s/install-html//' Makefile.in +sed -i '/^install-docs/s/install-html//' Makefile.in %build -export CC="%{__cc} -pthread" %configure --with-expat --enable-shared --disable-static \ --enable-warnings \ --with-ssl=openssl --enable-threadsafe-ssl=posix \ +%if %{with libproxy} --with-libproxy -make %{?_smp_mflags} +%else + --without-libproxy +%endif +%make_build %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \ $RPM_BUILD_ROOT%{_libdir}/libneon.la @@ -82,8 +104,82 @@ make %{?_smp_mflags} check %{_libdir}/*.so %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 0.31.2-2 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Tue Dec 17 2024 Durga Jagadeesh Palli - 0.33.0-3 +- Initial Azure Linux import from Fedora 41 (license: MIT) +- License verified + +* Thu Jul 18 2024 Fedora Release Engineering - 0.33.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jan 30 2024 Joe Orton - 0.33.0-1 +- update to 0.33.0 + +* Thu Jan 25 2024 Fedora Release Engineering - 0.32.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.32.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 29 2023 Joe Orton - 0.32.5-3 +- migrated to SPDX license + +* Thu Jul 20 2023 Fedora Release Engineering - 0.32.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jan 23 2023 Joe Orton - 0.32.5-1 +- update to 0.32.5 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.32.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Sep 5 2022 Joe Orton - 0.32.3-1 +- update to 0.32.3 + +* Fri Jul 22 2022 Fedora Release Engineering - 0.32.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 27 2022 Timm Bäder - 0.32.2-4 +- Disable automatic .la file removal +- https://fedoraproject.org/wiki/Changes/RemoveLaFiles + +* Thu Jan 27 2022 Joe Orton - 0.32.2-3 +- strip LIBS exported by neon-config to the minimum + +* Thu Jan 20 2022 Fedora Release Engineering - 0.32.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 13 2022 Joe Orton - 0.32.2-1 +- update to 0.32.2 + +* Tue Sep 21 2021 Joe Orton - 0.32.1-1 +- update to 0.32.1 +- add bcond for libproxy support + +* Mon Sep 20 2021 Joe Orton - 0.32.0-1 +- update to 0.32.0 + +* Tue Sep 14 2021 Sahana Prasad - 0.31.2-8 +- Rebuilt with OpenSSL 3.0.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.31.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Feb 4 2021 Joe Orton - 0.31.2-6 +- add bcond for PKCS#11 support +- use make macros + +* Tue Jan 26 2021 Fedora Release Engineering - 0.31.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Aug 26 2020 Joe Orton - 0.31.2-4 +- fix tests with current OpenSSL (#1863681) + +* Sat Aug 01 2020 Fedora Release Engineering - 0.31.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.31.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Wed Jun 24 2020 Joe Orton - 0.31.2-1 - update to 0.31.2 diff --git a/SPECS-EXTENDED/numatop/0001-common-Use-sym_type_t-in-elf64_binary_read-signature.patch b/SPECS-EXTENDED/numatop/0001-common-Use-sym_type_t-in-elf64_binary_read-signature.patch new file mode 100644 index 00000000000..ad3aaae0577 --- /dev/null +++ b/SPECS-EXTENDED/numatop/0001-common-Use-sym_type_t-in-elf64_binary_read-signature.patch @@ -0,0 +1,26 @@ +From 06c6d857654fdd4230604b4cd4cc2c127757574d Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 22:57:13 +0100 +Subject: [PATCH 1/9] common: Use sym_type_t in elf64_binary_read() signature + +This silences the enum-int-mismatch warning. +--- + common/os/sym.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/os/sym.c b/common/os/sym.c +index 9ead1fb..f0b5706 100644 +--- a/common/os/sym.c ++++ b/common/os/sym.c +@@ -463,7 +463,7 @@ L_EXIT: + } + + static int +-elf64_binary_read(sym_binary_t *binary, unsigned int sym_type) ++elf64_binary_read(sym_binary_t *binary, sym_type_t sym_type) + { + Elf64_Ehdr ehdr; + Elf64_Shdr shdr; +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/0002-common-Add-format-strings-to-mvwprintw-calls.patch b/SPECS-EXTENDED/numatop/0002-common-Add-format-strings-to-mvwprintw-calls.patch new file mode 100644 index 00000000000..ae1f8faf8e1 --- /dev/null +++ b/SPECS-EXTENDED/numatop/0002-common-Add-format-strings-to-mvwprintw-calls.patch @@ -0,0 +1,35 @@ +From 6316116c1e05031e53a1f5196ed92559c3123cc2 Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 23:00:10 +0100 +Subject: [PATCH 2/9] common: Add format strings to mvwprintw() calls + +This silences the format-security warning. +--- + common/reg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/common/reg.c b/common/reg.c +index 1a87161..ad37274 100644 +--- a/common/reg.c ++++ b/common/reg.c +@@ -240,7 +240,7 @@ reg_line_write(win_reg_t *r, int line, reg_align_t align, char *content) + } + + if (len > 0) { +- (void) mvwprintw(r->hdl, line, pos_x, content); ++ (void) mvwprintw(r->hdl, line, pos_x, "%s", content); + } + + if (r->mode != 0) { +@@ -267,7 +267,7 @@ reg_highlight_write(win_reg_t *r, int line, int align, char *content) + } + + if (len > 0) { +- (void) mvwprintw(r->hdl, line, pos_x, content); ++ (void) mvwprintw(r->hdl, line, pos_x, "%s", content); + } + + (void) wattroff(r->hdl, A_REVERSE | A_BOLD); +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/0003-common-Remove-unnecessary-temp-buffer.patch b/SPECS-EXTENDED/numatop/0003-common-Remove-unnecessary-temp-buffer.patch new file mode 100644 index 00000000000..912b94c07d2 --- /dev/null +++ b/SPECS-EXTENDED/numatop/0003-common-Remove-unnecessary-temp-buffer.patch @@ -0,0 +1,32 @@ +From 79c4cbbdfb603cf52f2b1416d2e1048074eb5a2f Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 23:02:15 +0100 +Subject: [PATCH 3/9] common: Remove unnecessary temp buffer + +--- + common/win.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/common/win.c b/common/win.c +index d0a8f3b..cdc5817 100644 +--- a/common/win.c ++++ b/common/win.c +@@ -484,14 +484,11 @@ topnproc_data_show(dyn_win_t *win) + static void + load_msg_show(void) + { +- char content[64]; + win_reg_t r; + +- (void) snprintf(content, sizeof (content), "Loading ..."); +- + (void) reg_init(&r, 0, 1, g_scr_width, g_scr_height - 1, A_BOLD); + reg_erase(&r); +- reg_line_write(&r, 1, ALIGN_LEFT, content); ++ reg_line_write(&r, 1, ALIGN_LEFT, "Loading ..."); + reg_refresh(&r); + reg_win_destroy(&r); + } +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/0004-common-Use-memcpy-to-the-process-name-to-a-line.patch b/SPECS-EXTENDED/numatop/0004-common-Use-memcpy-to-the-process-name-to-a-line.patch new file mode 100644 index 00000000000..32231941225 --- /dev/null +++ b/SPECS-EXTENDED/numatop/0004-common-Use-memcpy-to-the-process-name-to-a-line.patch @@ -0,0 +1,51 @@ +From 5e8f0af6241fdadc7dd52a26c18df0789ebf03e8 Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 23:03:02 +0100 +Subject: [PATCH 4/9] common: Use memcpy() to the process name to a line + +The copy will either collect the whole string, and potentially a little +more, but from a safe location, or a truncated string with a null char +guaranteed by the memset() call above. + +This silences the stringop-truncation warning. +--- + common/win.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/common/win.c b/common/win.c +index cdc5817..d97da43 100644 +--- a/common/win.c ++++ b/common/win.c +@@ -355,8 +355,7 @@ topnproc_data_save(track_proc_t *proc, int intval, topnproc_line_t *line) + /* + * Cut off the process name if it's too long. + */ +- (void) strncpy(line->proc_name, proc->name, sizeof (line->proc_name)); +- line->proc_name[WIN_PROCNAME_SIZE - 1] = 0; ++ memcpy(line->proc_name, proc->name, sizeof (line->proc_name) - 1); + line->pid = proc->pid; + line->nlwp = proc_nlwp(proc); + +@@ -2892,8 +2891,7 @@ pqos_cmt_proc_data_save(track_proc_t *proc, track_lwp_t *lwp, int intval, + { + (void) memset(line, 0, sizeof (pqos_cmt_proc_line_t)); + +- (void) strncpy(line->proc_name, proc->name, sizeof (line->proc_name)); +- line->proc_name[WIN_PROCNAME_SIZE - 1] = 0; ++ memcpy(line->proc_name, proc->name, sizeof (line->proc_name) - 1); + line->pid = proc->pid; + line->nlwp = proc_nlwp(proc); + +@@ -3216,8 +3214,7 @@ pqos_mbm_proc_data_save(track_proc_t *proc, track_lwp_t *lwp, int intval, + { + (void) memset(line, 0, sizeof (pqos_mbm_proc_line_t)); + +- (void) strncpy(line->proc_name, proc->name, sizeof (line->proc_name)); +- line->proc_name[WIN_PROCNAME_SIZE - 1] = 0; ++ memcpy(line->proc_name, proc->name, sizeof (line->proc_name) - 1); + line->pid = proc->pid; + line->nlwp = proc_nlwp(proc); + +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/0005-common-Replace-malloc-strncpy-with-strdup.patch b/SPECS-EXTENDED/numatop/0005-common-Replace-malloc-strncpy-with-strdup.patch new file mode 100644 index 00000000000..091444a1d8d --- /dev/null +++ b/SPECS-EXTENDED/numatop/0005-common-Replace-malloc-strncpy-with-strdup.patch @@ -0,0 +1,31 @@ +From c46ebd47907a77bfbcfa5ac8dacf7536102ae3af Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 23:07:07 +0100 +Subject: [PATCH 5/9] common: Replace malloc()+strncpy() with strdup() + +This silences the stringop-truncation warning. +--- + common/os/os_util.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/common/os/os_util.c b/common/os/os_util.c +index f442729..3fdb4ca 100644 +--- a/common/os/os_util.c ++++ b/common/os/os_util.c +@@ -387,12 +387,10 @@ str_int_extract(char *str, int *arr, int arr_size, int *num) + int len = strlen(str); + boolean_t ret = B_FALSE; + +- if ((scopy = malloc(len + 1)) == NULL) { ++ if ((scopy = strdup(str)) == NULL) { + return (B_FALSE); + } + +- strncpy(scopy, str, len); +- scopy[len] = 0; + cur = scopy; + + while (cur < (scopy + len)) { +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/0006-common-Build-node-string-with-bound-checks.patch b/SPECS-EXTENDED/numatop/0006-common-Build-node-string-with-bound-checks.patch new file mode 100644 index 00000000000..0dde6f31e54 --- /dev/null +++ b/SPECS-EXTENDED/numatop/0006-common-Build-node-string-with-bound-checks.patch @@ -0,0 +1,117 @@ +From 48a9a5597c638ca580458753fba564f0cfe248ea Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 23:11:13 +0100 +Subject: [PATCH 6/9] common: Build node string with bound checks + +A print_buf() function is added to keep track of progress inside the s1 +buffer and the remaining space. With s1 acting as a cursor and vsnprintf +taking care of formatting, the temp buffers s2 and s3 are no longer +needed. + +This silences the stringop-overflow warning. +--- + common/os/os_win.c | 44 ++++++++++++++++++++++++++++++-------------- + 1 file changed, 30 insertions(+), 14 deletions(-) + +diff --git a/common/os/os_win.c b/common/os/os_win.c +index de198ca..29afc19 100644 +--- a/common/os/os_win.c ++++ b/common/os/os_win.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -105,6 +106,28 @@ cpuid_cmp(const void *a, const void *b) + return (0); + } + ++static void ++print_buf(char **destp, int *sizep, const char *fmt, ...) ++{ ++ va_list ap; ++ int len; ++ ++ if (*sizep <= 0) ++ return; ++ ++ va_start(ap, fmt); ++ len = vsnprintf(*destp, *sizep, fmt, ap); ++ va_end(ap); ++ ++ if (len >= *sizep) { ++ *sizep = 0; ++ return; ++ } ++ ++ *destp += len; ++ *sizep -= len; ++} ++ + /* + * Build a readable string of CPU ID and try to reduce the string length. e.g. + * For cpu1, cpu2, cpu3, cpu4, the string is "CPU(1-4)", +@@ -113,7 +136,6 @@ cpuid_cmp(const void *a, const void *b) + static void + node_cpu_string(node_t *node, char *s1, int size) + { +- char s2[128], s3[128]; + int i, j, k, l, cpuid_start; + int *cpuid_arr; + int ncpus; +@@ -140,8 +162,7 @@ node_cpu_string(node_t *node, char *s1, int size) + cpuid_start = cpuid_arr[0]; + + if (ncpus == 1) { +- (void) snprintf(s2, sizeof (s2), "%d", cpuid_start); +- (void) strncat(s1, s2, strlen(s2)); ++ (void) snprintf(s1, size, "%d", cpuid_start); + free(cpuid_arr); + return; + } +@@ -154,33 +175,28 @@ node_cpu_string(node_t *node, char *s1, int size) + if (cpuid_arr[j] != cpuid_start + l) { + if (k < ncpus) { + if (l == 1) { +- (void) snprintf(s2, sizeof (s2), "%d ", cpuid_start); ++ print_buf(&s1, &size, "%d ", cpuid_start); + } else { +- (void) snprintf(s2, sizeof (s2), ++ print_buf(&s1, &size, + "%d-%d ", cpuid_start, cpuid_start + l - 1); + } + } else { + if (l == 1) { +- (void) snprintf(s2, sizeof (s2), "%d", +- cpuid_start); ++ print_buf(&s1, &size, "%d", cpuid_start); + } else { +- (void) snprintf(s2, sizeof (s2), "%d-%d", ++ print_buf(&s1, &size, "%d-%d", + cpuid_start, cpuid_start + l - 1); + } + +- (void) snprintf(s3, sizeof (s3), " %d", +- cpuid_arr[j]); +- (void) strncat(s2, s3, strlen(s3)); ++ print_buf(&s1, &size, " %d", cpuid_arr[j]); + } + +- (void) strncat(s1, s2, strlen(s2)); + cpuid_start = cpuid_arr[j]; + l = 1; + } else { + if (k == ncpus) { +- (void) snprintf(s2, sizeof (s2), "%d-%d", ++ print_buf(&s1, &size, "%d-%d", + cpuid_start, cpuid_start + l); +- (void) strncat(s1, s2, strlen(s2)); + } else { + l++; + } +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/0007-common-Increase-node-string-buffer-size.patch b/SPECS-EXTENDED/numatop/0007-common-Increase-node-string-buffer-size.patch new file mode 100644 index 00000000000..3fc160c3adf --- /dev/null +++ b/SPECS-EXTENDED/numatop/0007-common-Increase-node-string-buffer-size.patch @@ -0,0 +1,29 @@ +From e21a7f17997f2e611e8f706761065c8ec6576f5c Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 23:16:27 +0100 +Subject: [PATCH 7/9] common: Increase node string buffer size + +Since the maximum number of CPUs was doubled, it might be reasonable to +double the size of the buffer for the string representation. + +Refs 6f6cc3b24d84c413556639b64a62aca6ad0b21cc +--- + common/os/os_win.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/os/os_win.c b/common/os/os_win.c +index 29afc19..c0de320 100644 +--- a/common/os/os_win.c ++++ b/common/os/os_win.c +@@ -222,7 +222,7 @@ nodedetail_line_show(win_reg_t *reg, char *title, char *value, int line) + void + os_nodedetail_data(dyn_nodedetail_t *dyn, win_reg_t *seg) + { +- char s1[256], s2[32]; ++ char s1[512], s2[32]; + node_t *node; + win_countvalue_t value; + node_meminfo_t meminfo; +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/0008-x86-Add-missing-fields-to-s_emr_config.patch b/SPECS-EXTENDED/numatop/0008-x86-Add-missing-fields-to-s_emr_config.patch new file mode 100644 index 00000000000..2d06c271d2e --- /dev/null +++ b/SPECS-EXTENDED/numatop/0008-x86-Add-missing-fields-to-s_emr_config.patch @@ -0,0 +1,41 @@ +From e0f2421ecf7bd9b4783901eafea1d9f386c025ac Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Mon, 4 Mar 2024 23:19:41 +0100 +Subject: [PATCH 8/9] x86: Add missing fields to s_emr_config + +It looks as if EMR support had been authored before #66 was merged, +leading to a mismatch between the struct definition and this array +initialization. + +This silences the missing-field-initializers warning. + +Refs d3fcffc6a9cc2ad61b6f9a902796cb317bec266a +Refs #66 +--- + x86/skl.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/x86/skl.c b/x86/skl.c +index 17cfbcc..a80a868 100644 +--- a/x86/skl.c ++++ b/x86/skl.c +@@ -64,11 +64,11 @@ static plat_event_config_t s_spr_config[PERF_COUNT_NUM] = { + }; + + static plat_event_config_t s_emr_config[PERF_COUNT_NUM] = { +- { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.core" }, +- { PERF_TYPE_RAW, 0x012A, 0x53, 0x730000001, "off_core_response_0" }, +- { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.ref" }, +- { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, "instr_retired.any" }, +- { PERF_TYPE_RAW, 0x012B, 0x53, 0x104000001, "off_core_response_1" } ++ { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, 0, 0, "cpu_clk_unhalted.core" }, ++ { PERF_TYPE_RAW, 0x012A, 0x53, 0x730000001, 0, 0, "off_core_response_0" }, ++ { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, 0, 0, "cpu_clk_unhalted.ref" }, ++ { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, 0, 0, "instr_retired.any" }, ++ { PERF_TYPE_RAW, 0x012B, 0x53, 0x104000001, 0, 0, "off_core_response_1" } + }; + + static plat_event_config_t s_skl_ll = { +-- +2.44.0 + diff --git a/SPECS-EXTENDED/numatop/as-needed.patch b/SPECS-EXTENDED/numatop/as-needed.patch deleted file mode 100644 index da185f1e610..00000000000 --- a/SPECS-EXTENDED/numatop/as-needed.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4550fb0d3190e2b1c61aed3972889f0645e85df0 Mon Sep 17 00:00:00 2001 -From: Dridi Boukelmoune -Date: Sat, 23 Mar 2019 13:51:15 +0100 -Subject: [PATCH] Link ncurses libs in libnumatop.la - -On systems using the linker option --as-needed like Fedora it fails to build. ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index 643704a..ee57e7c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,6 +13,7 @@ AM_CFLAGS = -fPIC -O2 -g -Wall -W -Wformat-security -D_FORTIFY_SOURCE=2 -fno-com - ACLOCAL_AMFLAGS = -I m4 - - noinst_LTLIBRARIES = libnumatop.la -+libnumatop_la_LIBADD = $(NCURSES_LIBS) - libnumatop_la_SOURCES = \ - common/include/os/linux/perf_event.h \ - common/include/os/map.h \ diff --git a/SPECS-EXTENDED/numatop/fix-format-security.patch b/SPECS-EXTENDED/numatop/fix-format-security.patch deleted file mode 100644 index ff6dea6aa66..00000000000 --- a/SPECS-EXTENDED/numatop/fix-format-security.patch +++ /dev/null @@ -1,55 +0,0 @@ -From eda86237c1c3dd4f1cac82b2e164698f16d879dd Mon Sep 17 00:00:00 2001 -From: Olivia Crain -Date: Tue, 21 Jun 2022 16:33:24 +0000 -Subject: [PATCH] common/reg.c: Fix format-security warnings - -Version 6.3 of ncurses introduced function attributes that cause -GCC to recognize more instances of format-security warnings. - -In this case, `mvwprintw` is used with strings that have no format -arguments. These strings are effectively handed off to `printf`, -which triggers the format-security warnings. - -The proper function to use here is `mvwaddstr`, which serves the -same purpose without passing the string through `printf`. ---- - common/reg.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/common/reg.c b/common/reg.c -index 1a87161..8a66706 100644 ---- a/common/reg.c -+++ b/common/reg.c -@@ -240,7 +240,7 @@ reg_line_write(win_reg_t *r, int line, reg_align_t align, char *content) - } - - if (len > 0) { -- (void) mvwprintw(r->hdl, line, pos_x, content); -+ (void) mvwaddstr(r->hdl, line, pos_x, content); - } - - if (r->mode != 0) { -@@ -267,7 +267,7 @@ reg_highlight_write(win_reg_t *r, int line, int align, char *content) - } - - if (len > 0) { -- (void) mvwprintw(r->hdl, line, pos_x, content); -+ (void) mvwaddstr(r->hdl, line, pos_x, content); - } - - (void) wattroff(r->hdl, A_REVERSE | A_BOLD); -@@ -420,9 +420,9 @@ reg_curses_init(boolean_t first_load) - - if ((g_scr_height < 24 || g_scr_width < 80)) { - if (!first_load) { -- (void) mvwprintw(stdscr, 0, 0, -+ (void) mvwaddstr(stdscr, 0, 0, - "Terminal size is too small."); -- (void) mvwprintw(stdscr, 1, 0, -+ (void) mvwaddstr(stdscr, 1, 0, - "Please resize it to 80x24 or larger."); - (void) refresh(); - } else { --- -2.34.1 - diff --git a/SPECS-EXTENDED/numatop/numatop.signatures.json b/SPECS-EXTENDED/numatop/numatop.signatures.json index 7e56e12de30..79e13eff2e0 100644 --- a/SPECS-EXTENDED/numatop/numatop.signatures.json +++ b/SPECS-EXTENDED/numatop/numatop.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "numatop-v2.1.tar.xz": "e6b4729d604967adf3e86e3aa593ef62ab7b2d2def83d02f05926bdf03d6f7e8" + "numatop-v2.4.tar.gz": "f0a4fbce717f82658be0c44168bf6d9ae3ee63465b23b580eab11d2532bdc142" } } diff --git a/SPECS-EXTENDED/numatop/numatop.spec b/SPECS-EXTENDED/numatop/numatop.spec index c353d9793fe..c0cd2c43168 100644 --- a/SPECS-EXTENDED/numatop/numatop.spec +++ b/SPECS-EXTENDED/numatop/numatop.spec @@ -1,23 +1,30 @@ Vendor: Microsoft Corporation Distribution: Azure Linux - Name: numatop -Version: 2.1 -Release: 5%{?dist} +Version: 2.4 +Release: 3%{?dist} Summary: Memory access locality characterization and analysis -License: BSD +License: BSD-3-Clause URL: https://01.org/numatop -Source: https://github.com/intel/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.xz -# https://github.com/intel/numatop/pull/53 -Patch0: as-needed.patch -Patch1: fix-format-security.patch +Source: https://github.com/intel/numatop/archive/refs/tags/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz + +# https://github.com/intel/numatop/pull/71 +Patch: 0001-common-Use-sym_type_t-in-elf64_binary_read-signature.patch +Patch: 0002-common-Add-format-strings-to-mvwprintw-calls.patch +Patch: 0003-common-Remove-unnecessary-temp-buffer.patch +Patch: 0004-common-Use-memcpy-to-the-process-name-to-a-line.patch +Patch: 0005-common-Replace-malloc-strncpy-with-strdup.patch +Patch: 0006-common-Build-node-string-with-bound-checks.patch +Patch: 0007-common-Increase-node-string-buffer-size.patch +Patch: 0008-x86-Add-missing-fields-to-s_emr_config.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: make BuildRequires: libtool -BuildRequires: check-devel BuildRequires: gcc +BuildRequires: check-devel BuildRequires: ncurses-devel BuildRequires: numactl-devel @@ -31,14 +38,16 @@ analysis of processes and threads running on a NUMA system. It helps the user characterize the NUMA behavior of processes and threads and identify where the NUMA-related performance bottlenecks reside. -NumaTOP supports the Intel Xeon processors and PowerPC processors. +NumaTOP supports the Intel Xeon processors, AMD Zen processors and PowerPC +processors. %prep -%autosetup -p1 -n %{name}-v%{version} +%autosetup -p1 + %build -autoreconf -ivf +autoreconf --force --install --symlink %configure %make_build @@ -59,13 +68,42 @@ autoreconf -ivf %changelog -* Tue Jun 21 2022 Olivia Crain - 2.1-5 -- Add patch to fix format-security wanings with ncurses 6.3 +* Fri Dec 20 2024 Durga Jagadeesh Palli - 2.4-3 +- Initial Azure Linux import from Fedora 41 (license: MIT) - License verified -* Wed Aug 11 2021 Thomas Crain - 2.1-4 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). -- Add patch to fix linking error +* Thu Jul 18 2024 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Mar 04 2024 Dridi Boukelmoune - 2.4-1 +- Bump version to 2.4 + +* Thu Jan 25 2024 Fedora Release Engineering - 2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Feb 17 2023 Dridi Boukelmoune - 2.3-3 +- Migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 22 2022 Dridi Boukelmoune - 2.3-1 +- Update to 2.3 + +* Thu Jul 22 2021 Fedora Release Engineering - 2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Wed Jan 29 2020 Fedora Release Engineering - 2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/ocaml-libvirt/0001-Make-const-the-return-value-of-caml_named_value.patch b/SPECS-EXTENDED/ocaml-libvirt/0001-Make-const-the-return-value-of-caml_named_value.patch deleted file mode 100644 index c8b7aeea5f2..00000000000 --- a/SPECS-EXTENDED/ocaml-libvirt/0001-Make-const-the-return-value-of-caml_named_value.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 75b13978f85b32c7a121aa289d8ebf41ba14ee5a Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Thu, 5 Sep 2019 09:57:09 +0200 -Subject: [PATCH] Make const the return value of caml_named_value() - -With OCaml >= 4.09 caml_named_value() returns a const value *, so keep -the constness to build also in this case. - -Signed-off-by: Pino Toscano ---- - libvirt/libvirt_c_oneoffs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index 6f56f10..e23c0db 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -1207,7 +1207,7 @@ ocaml_libvirt_event_run_default_impl (value unitv) - #define DOMAIN_CALLBACK_BEGIN(NAME) \ - value connv, domv, callback_id, result; \ - connv = domv = callback_id = result = Val_int(0); \ -- static value *callback = NULL; \ -+ static const value *callback = NULL; \ - caml_leave_blocking_section(); \ - if (callback == NULL) \ - callback = caml_named_value(NAME); \ -@@ -1433,7 +1433,7 @@ timeout_callback(int timer, void *opaque) - { - value callback_id, result; - callback_id = result = Val_int(0); -- static value *callback = NULL; -+ static const value *callback = NULL; - caml_leave_blocking_section(); - if (callback == NULL) - callback = caml_named_value("Libvirt.timeout_callback"); --- -2.23.0 - diff --git a/SPECS-EXTENDED/ocaml-libvirt/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch b/SPECS-EXTENDED/ocaml-libvirt/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch deleted file mode 100644 index f3b93afd16a..00000000000 --- a/SPECS-EXTENDED/ocaml-libvirt/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 29709872404fad20a9822c43a831f30b7b09f34a Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 19 Jan 2020 12:58:17 +0000 -Subject: [PATCH 1/3] block_peek, memory_peek: Use bytes for return buffer. - -Strings are immutable in modern OCaml. ---- - libvirt/libvirt.ml | 4 ++-- - libvirt/libvirt.mli | 4 ++-- - libvirt/libvirt_c_oneoffs.c | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml -index 7f9d0e4..bdb9460 100644 ---- a/libvirt/libvirt.ml -+++ b/libvirt/libvirt.ml -@@ -731,8 +731,8 @@ struct - external migrate : [>`W] t -> [>`W] Connect.t -> migrate_flag list -> ?dname:string -> ?uri:string -> ?bandwidth:int -> unit -> rw t = "ocaml_libvirt_domain_migrate_bytecode" "ocaml_libvirt_domain_migrate_native" - external block_stats : [>`R] t -> string -> block_stats = "ocaml_libvirt_domain_block_stats" - external interface_stats : [>`R] t -> string -> interface_stats = "ocaml_libvirt_domain_interface_stats" -- external block_peek : [>`W] t -> string -> int64 -> int -> string -> int -> unit = "ocaml_libvirt_domain_block_peek_bytecode" "ocaml_libvirt_domain_block_peek_native" -- external memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> string -> int -> unit = "ocaml_libvirt_domain_memory_peek_bytecode" "ocaml_libvirt_domain_memory_peek_native" -+ external block_peek : [>`W] t -> string -> int64 -> int -> bytes -> int -> unit = "ocaml_libvirt_domain_block_peek_bytecode" "ocaml_libvirt_domain_block_peek_native" -+ external memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> bytes -> int -> unit = "ocaml_libvirt_domain_memory_peek_bytecode" "ocaml_libvirt_domain_memory_peek_native" - - external get_all_domain_stats : [>`R] Connect.t -> stats_type list -> get_all_domain_stats_flag list -> domain_stats_record array = "ocaml_libvirt_domain_get_all_domain_stats" - -diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli -index 0d74199..7900392 100644 ---- a/libvirt/libvirt.mli -+++ b/libvirt/libvirt.mli -@@ -708,7 +708,7 @@ sig - val interface_stats : [>`R] t -> string -> interface_stats - (** Returns network interface stats. *) - -- val block_peek : [>`W] t -> string -> int64 -> int -> string -> int -> unit -+ val block_peek : [>`W] t -> string -> int64 -> int -> bytes -> int -> unit - (** [block_peek dom path offset size buf boff] reads [size] bytes at - [offset] in the domain's [path] block device. - -@@ -717,7 +717,7 @@ sig - - See also {!max_peek}. *) - val memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> -- string -> int -> unit -+ bytes -> int -> unit - (** [memory_peek dom Virtual offset size] reads [size] bytes - at [offset] in the domain's virtual memory. - -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index 40384e8..8468c73 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -1057,7 +1057,7 @@ ocaml_libvirt_domain_block_peek_native (value domv, value pathv, value offsetv, - const char *path = String_val (pathv); - unsigned long long offset = Int64_val (offsetv); - size_t size = Int_val (sizev); -- char *buffer = String_val (bufferv); -+ unsigned char *buffer = Bytes_val (bufferv); - int boff = Int_val (boffv); - int r; - -@@ -1089,7 +1089,7 @@ ocaml_libvirt_domain_memory_peek_native (value domv, value flagsv, value offsetv - int flags = 0; - unsigned long long offset = Int64_val (offsetv); - size_t size = Int_val (sizev); -- char *buffer = String_val (bufferv); -+ unsigned char *buffer = Bytes_val (bufferv); - int boff = Int_val (boffv); - int r; - --- -2.24.1 - diff --git a/SPECS-EXTENDED/ocaml-libvirt/0002-String_val-returns-const-char-in-OCaml-4.10.patch b/SPECS-EXTENDED/ocaml-libvirt/0002-String_val-returns-const-char-in-OCaml-4.10.patch deleted file mode 100644 index 4f547cb8771..00000000000 --- a/SPECS-EXTENDED/ocaml-libvirt/0002-String_val-returns-const-char-in-OCaml-4.10.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 3705b9bdcd04dc86474c62e1c8dd8759669842bc Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 19 Jan 2020 12:59:09 +0000 -Subject: [PATCH 2/3] String_val returns const char * in OCaml 4.10. - -This should be compatible with earlier versions of OCaml -too since we are just assigning a char * to a const char *. ---- - libvirt/generator.pl | 14 +++++++------- - libvirt/libvirt_c_oneoffs.c | 6 +++--- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/libvirt/generator.pl b/libvirt/generator.pl -index ac3dd65..aff371b 100755 ---- a/libvirt/generator.pl -+++ b/libvirt/generator.pl -@@ -593,7 +593,7 @@ sub gen_c_code - } elsif ($sig =~ /^(\w+), string : unit$/) { - "\ - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - int r; - - NONBLOCKING (r = $c_name ($1, str)); -@@ -605,7 +605,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - int r; - - NONBLOCKING (r = $c_name ($1, str, 0)); -@@ -618,7 +618,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str)); -@@ -633,7 +633,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str, 0)); -@@ -648,7 +648,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - unsigned int u = Int_val (uv); - $c_ret_type r; - -@@ -735,7 +735,7 @@ sub gen_c_code - "\ - CAMLlocal2 (rv, connv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str)); -@@ -751,7 +751,7 @@ sub gen_c_code - "\ - CAMLlocal2 (rv, connv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str, 0)); -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index 8468c73..fc2ac13 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -601,7 +601,7 @@ ocaml_libvirt_domain_set_scheduler_parameters (value domv, value paramsv) - int nparams = Wosize_val (paramsv); - virSchedParameterPtr params; - int r, i; -- char *name; -+ const char *name; - - params = malloc (sizeof (*params) * nparams); - if (params == NULL) -@@ -1005,7 +1005,7 @@ ocaml_libvirt_domain_block_stats (value domv, value pathv) - CAMLparam2 (domv, pathv); - CAMLlocal2 (rv,v); - virDomainPtr dom = Domain_val (domv); -- char *path = String_val (pathv); -+ const char *path = String_val (pathv); - struct _virDomainBlockStats stats; - int r; - -@@ -1028,7 +1028,7 @@ ocaml_libvirt_domain_interface_stats (value domv, value pathv) - CAMLparam2 (domv, pathv); - CAMLlocal2 (rv,v); - virDomainPtr dom = Domain_val (domv); -- char *path = String_val (pathv); -+ const char *path = String_val (pathv); - struct _virDomainInterfaceStats stats; - int r; - --- -2.24.1 - diff --git a/SPECS-EXTENDED/ocaml-libvirt/0003-Don-t-try-to-memcpy-into-a-String_val.patch b/SPECS-EXTENDED/ocaml-libvirt/0003-Don-t-try-to-memcpy-into-a-String_val.patch deleted file mode 100644 index 720787f50dd..00000000000 --- a/SPECS-EXTENDED/ocaml-libvirt/0003-Don-t-try-to-memcpy-into-a-String_val.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3d3d6af425d369200a7a62a127adf640d94a38a3 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 19 Jan 2020 13:02:16 +0000 -Subject: [PATCH 3/3] Don't try to memcpy into a String_val. - -In OCaml 4.10 String_val returns const char *, so we cannot use it as -the destination for memcpy. Use Bytes_val instead. ---- - libvirt/generator.pl | 2 +- - libvirt/libvirt_c_oneoffs.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libvirt/generator.pl b/libvirt/generator.pl -index aff371b..463a19b 100755 ---- a/libvirt/generator.pl -+++ b/libvirt/generator.pl -@@ -440,7 +440,7 @@ sub gen_c_code - - /* UUIDs are byte arrays with a fixed length. */ - rv = caml_alloc_string (VIR_UUID_BUFLEN); -- memcpy (String_val (rv), uuid, VIR_UUID_BUFLEN); -+ memcpy (Bytes_val (rv), uuid, VIR_UUID_BUFLEN); - CAMLreturn (rv); - " - } elsif ($sig =~ /^(\w+) : uuid string$/) { -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index fc2ac13..e8472b7 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -394,7 +394,7 @@ ocaml_libvirt_connect_call_auth_default_callback (value listv) - elemv = caml_alloc (2, 0); - if (cred->result != NULL && cred->resultlen > 0) { - v = caml_alloc_string (cred->resultlen); -- memcpy (String_val (v), cred->result, cred->resultlen); -+ memcpy (Bytes_val (v), cred->result, cred->resultlen); - optv = caml_alloc (1, 0); - Store_field (optv, 0, v); - } else -@@ -715,7 +715,7 @@ ocaml_libvirt_domain_get_vcpus (value domv, value maxinfov, value maplenv) - - /* Copy the bitmap. */ - strv = caml_alloc_string (maxinfo * maplen); -- memcpy (String_val (strv), cpumaps, maxinfo * maplen); -+ memcpy (Bytes_val (strv), cpumaps, maxinfo * maplen); - - /* Allocate the tuple and return it. */ - rv = caml_alloc_tuple (3); -@@ -900,7 +900,7 @@ ocaml_libvirt_domain_get_all_domain_stats (value connv, - */ - v = caml_alloc_string (VIR_UUID_BUFLEN); - virDomainGetUUID (rstats[i]->dom, uuid); -- memcpy (String_val (v), uuid, VIR_UUID_BUFLEN); -+ memcpy (Bytes_val (v), uuid, VIR_UUID_BUFLEN); - Store_field (dsv, 0, v); - - tpv = caml_alloc (rstats[i]->nparams, 0); /* typed_param array */ -@@ -1646,7 +1646,7 @@ ocaml_libvirt_secret_get_value (value secv) - CHECK_ERROR (secval == NULL, "virSecretGetValue"); - - rv = caml_alloc_string (size); -- memcpy (String_val (rv), secval, size); -+ memcpy (Bytes_val (rv), secval, size); - free (secval); - - CAMLreturn (rv); --- -2.24.1 - diff --git a/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.signatures.json b/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.signatures.json index a8903ed3ed8..3cbf9ebc8bb 100644 --- a/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.signatures.json +++ b/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ocaml-libvirt-0.6.1.5.tar.gz": "bd8e340288f9734ba3e66ba1ee385b915ad74c95bfb0ff912581f7474469b6a1" + "ocaml-libvirt-0.6.1.7.tar.gz": "0e024711f33fb4cefc3670da014d21395ab83985423bb5850082412e583341cd" } } diff --git a/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.spec b/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.spec index 451b0e8025f..54550038fd1 100644 --- a/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.spec +++ b/SPECS-EXTENDED/ocaml-libvirt/ocaml-libvirt.spec @@ -1,30 +1,26 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: ocaml-libvirt -Version: 0.6.1.5 -Release: 8%{?dist} +Version: 0.6.1.7 +Release: 13%{?dist} Summary: OCaml binding for libvirt -License: LGPLv2+ +License: LGPL-2.1-or-later -URL: http://libvirt.org/ocaml/ -Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz - -# Fixes build with OCaml >= 4.09. -# Upstream commit 75b13978f85b32c7a121aa289d8ebf41ba14ee5a. -Patch1: 0001-Make-const-the-return-value-of-caml_named_value.patch - -# Fixes for OCaml 4.10, sent upstream 2020-01-19. -Patch2: 0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch -Patch3: 0002-String_val-returns-const-char-in-OCaml-4.10.patch -Patch4: 0003-Don-t-try-to-memcpy-into-a-String_val.patch +URL: https://ocaml.libvirt.org/ +Source0: https://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel +BuildRequires: ocaml-rpm-macros BuildRequires: libvirt-devel >= 0.2.1 BuildRequires: perl-interpreter -BuildRequires: gawk + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description @@ -33,7 +29,7 @@ OCaml binding for libvirt. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -45,13 +41,19 @@ developing applications that use %{name}. %setup -q %autopatch -p1 +# Fix detection of ocamlopt and ocamldoc +# https://gitlab.com/libvirt/libvirt-ocaml/-/merge_requests/27 +sed -i '/AM_CONDITIONAL/s/"x"/"xno"/' configure.ac + +# Regenerate the configure script +autoreconf -fi -I m4 . + %build +# Parallel builds do not work. +unset MAKEFLAGS %configure -make all doc -%ifarch %{ocaml_native_compiler} -make opt -%endif +make %install @@ -60,43 +62,125 @@ export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs mkdir -p $RPM_BUILD_ROOT%{_bindir} -%ifarch %{ocaml_native_compiler} -make install-opt -%else -make install-byte -%endif - - -%files -%doc COPYING.LIB README ChangeLog -%{_libdir}/ocaml/libvirt -%ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/libvirt/*.a -%exclude %{_libdir}/ocaml/libvirt/*.cmxa -%exclude %{_libdir}/ocaml/libvirt/*.cmx -%endif -%exclude %{_libdir}/ocaml/libvirt/*.mli -%{_libdir}/ocaml/stublibs/*.so -%{_libdir}/ocaml/stublibs/*.so.owner - - -%files devel -%doc COPYING.LIB README TODO.libvirt ChangeLog html/* -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/libvirt/*.a -%{_libdir}/ocaml/libvirt/*.cmxa -%{_libdir}/ocaml/libvirt/*.cmx -%endif -%{_libdir}/ocaml/libvirt/*.mli +make install +%ocaml_files + + +%files -f .ofiles +%doc README +%license COPYING.LIB + + +%files devel -f .ofiles-devel +%doc README TODO.libvirt +%license COPYING.LIB %changelog -* Thu Oct 14 2021 Pawel Winogrodzki - 0.6.1.5-8 -- Switching to using full number for the 'Release' tag. -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Fri Dec 20 2024 Durga Jagadeesh Palli - 0.6.1.7-13 +- Initial Azure Linux import from Fedora 41 (license: MIT) +- License verified + +* Thu Jul 18 2024 Fedora Release Engineering - 0.6.1.7-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 19 2024 Richard W.M. Jones - 0.6.1.7-11 +- OCaml 5.2.0 ppc64le fix + +* Wed May 29 2024 Richard W.M. Jones - 0.6.1.7-10 +- OCaml 5.2.0 for Fedora 41 + +* Thu Jan 25 2024 Fedora Release Engineering - 0.6.1.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.6.1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Richard W.M. Jones - 0.6.1.7-7 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + +* Tue Dec 12 2023 Richard W.M. Jones - 0.6.1.7-6 +- OCaml 5.1.1 rebuild for Fedora 40 + +* Thu Oct 05 2023 Richard W.M. Jones - 0.6.1.7-5 +- OCaml 5.1 rebuild for Fedora 40 + +* Thu Jul 20 2023 Fedora Release Engineering - 0.6.1.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Richard W.M. Jones - 0.6.1.7-3 +- OCaml 5.0 rebuild for Fedora 39 + +* Mon Jul 10 2023 Jerry James - 0.6.1.7-2 +- OCaml 5.0.0 rebuild +- New project URL +- Convert License tag to SPDX +- Fix build on bytecode-only architectures +- Use %%license macro +- Use new OCaml macros + +* Mon Feb 13 2023 Richard W.M. Jones - 0.6.1.7-1 +- New upstream version 0.6.1.7 +- Do not try parallel builds. +- Upstream now uses automake. + +- Remove ChangeLog file and HTML docs, dropped upstream. + +* Tue Jan 24 2023 Richard W.M. Jones - 0.6.1.6-5 +- Rebuild OCaml packages for F38 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.6.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.6.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jun 18 2022 Richard W.M. Jones - 0.6.1.6-2 +- OCaml 4.14.0 rebuild + +* Thu Apr 28 2022 Richard W.M. Jones - 0.6.1.6-1 +- New upstream version 0.6.1.6 +- Remove patches which are all upstream. + +* Fri Feb 04 2022 Richard W.M. Jones - 0.6.1.5-20 +- OCaml 4.13.1 rebuild to remove package notes + +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.1.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + + +* Mon Oct 04 2021 Richard W.M. Jones - 0.6.1.5-18 +- OCaml 4.13.1 build + +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.1.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones - 0.6.1.5-16 +- OCaml 4.12.0 build + +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.1.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 01 2020 Richard W.M. Jones - 0.6.1.5-14 +- OCaml 4.11.1 rebuild + +* Fri Aug 21 2020 Richard W.M. Jones - 0.6.1.5-13 +- OCaml 4.11.0 rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.6.1.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon May 04 2020 Richard W.M. Jones - 0.6.1.5-11 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + +* Tue Apr 21 2020 Richard W.M. Jones - 0.6.1.5-10 +- OCaml 4.11.0 pre-release attempt 2 + +* Fri Apr 17 2020 Richard W.M. Jones - 0.6.1.5-9 +- OCaml 4.11.0 pre-release -* Thu Feb 27 2020 Richard W.M. Jones - 0.6.1.5-7.1 -- OCaml 4.10.0 final (Fedora 32). +* Thu Apr 02 2020 Richard W.M. Jones - 0.6.1.5-8 +- Update all OCaml dependencies for RPM 4.16. * Wed Feb 26 2020 Richard W.M. Jones - 0.6.1.5-7 - OCaml 4.10.0 final. diff --git a/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.signatures.json b/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.signatures.json index 5eda0dfebc4..d8939bac295 100644 --- a/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.signatures.json +++ b/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "release-1.9.1.tar.gz": "49be0214f34ae05e7a83b53351f134ba73eddaf87d1abb6f61b19943c211ca5d" + "release-1.14.tar.gz": "5db9dcbd939153942a08581fabd846d0f3f2b8c67fe68b855127e0472d4d1859" } } diff --git a/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.spec b/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.spec index 8872a73ff1b..4aef51cc221 100644 --- a/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.spec +++ b/SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.spec @@ -2,26 +2,34 @@ Vendor: Microsoft Corporation Distribution: Azure Linux %global pkgname zarith + Name: ocaml-%{pkgname} -Version: 1.9.1 -Release: 9%{?dist} +Version: 1.14 +Release: 3%{?dist} Summary: OCaml interface to GMP -# The license has a static linking exception -License: LGPLv2 with exceptions -URL: https://github.com/ocaml/Zarith/ -Source0: https://github.com/ocaml/Zarith/archive/release-%{version}.tar.gz +License: LGPL-2.1-only WITH OCaml-LGPL-linking-exception +URL: https://github.com/ocaml/Zarith +Source: https://github.com/ocaml/Zarith/archive/release-%{version}.tar.gz BuildRequires: gcc BuildRequires: gmp-devel -BuildRequires: ocaml +BuildRequires: make +BuildRequires: ocaml >= 4.04.0 BuildRequires: ocaml-findlib BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-rpm-macros BuildRequires: perl-interpreter +# Replace config.guess with a more up to date version which knows about POWER. +BuildRequires: redhat-rpm-config + +# Do not require ocaml-compiler-libs at runtime +%global __ocaml_requires_opts -i Asttypes -i Build_path_prefix_map -i Cmi_format -i Env -i Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Toploop -i Type_immediacy -i Types -i Warnings + %description This library implements arithmetic and logical operations over -arbitrary-precision integers. +arbitrary-precision integers. The module is simply named "Z". Its interface is similar to that of the Int32, Int64 and Nativeint modules from the OCaml standard library, with @@ -58,9 +66,8 @@ developing applications that use %{name}. %autosetup -n Zarith-release-%{version} # Fix compilation flags -sed -i "s|^ccdef=''|ccdef='%{optflags}'|" configure -sed -ri "s/(-ccopt|-shared|-failsafe)/-g &/" project.mak -sed -i "s/+compiler-libs/& -g/;s/\(\$(OCAMLC)\) -o/\1 -g -o/" project.mak +sed -i "s|^ccdef=''|ccdef='%{build_cflags}'|" configure +sed -i "s/-shared/-g &/" project.mak %build export CC="gcc" @@ -71,47 +78,141 @@ make make doc %install -mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs -make install INSTALLDIR=%{buildroot}%{_libdir}/ocaml +mkdir -p %{buildroot}%{ocamldir}/stublibs +make install INSTALLDIR=%{buildroot}%{ocamldir} +# Install missing files +cp -p {big_int_Z,q,z}.cmt zarith_version.cm{i,t} zarith_top.{cm{i,t},ml} \ + z_mlgmpidl.mli %{buildroot}%{ocamldir}/zarith +cp -p zarith.opam %{buildroot}%{ocamldir}/zarith/opam + +%ocaml_files + +%ifarch %{ocaml_native_compiler} +# The tests assume the availability of ocamlopt %check export LD_LIBRARY_PATH=$PWD make tests +%endif -%files +%files -f .ofiles %doc README.md %license LICENSE -%{_libdir}/ocaml/%{pkgname}/ -%ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/%{pkgname}/*.a -%exclude %{_libdir}/ocaml/%{pkgname}/*.cmx -%exclude %{_libdir}/ocaml/%{pkgname}/*.cmxa -%endif -%exclude %{_libdir}/ocaml/%{pkgname}/*.mli -%exclude %{_libdir}/ocaml/%{pkgname}/*.h -%{_libdir}/ocaml/stublibs/*.so -%{_libdir}/ocaml/stublibs/*.so.owner -%files devel +%files devel -f .ofiles-devel %doc Changes html -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/%{pkgname}/*.a -%{_libdir}/ocaml/%{pkgname}/*.cmx -%{_libdir}/ocaml/%{pkgname}/*.cmxa -%endif -%{_libdir}/ocaml/%{pkgname}/*.mli -%{_libdir}/ocaml/%{pkgname}/*.h %changelog -* Thu Oct 14 2021 Pawel Winogrodzki - 1.9.1-9 -- Switching to using full number for the 'Release' tag. +* Fri Jan 03 2025 Durga Jagadeesh Palli - 1.14-3 +- Initial Azure Linux import from Fedora 41 (license: MIT) +- License verified + +* Thu Jul 18 2024 Fedora Release Engineering - 1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jul 16 2024 Jerry James - 1.14-1 +- Version 1.14 + +* Wed Jun 19 2024 Richard W.M. Jones - 1.13-8 +- OCaml 5.2.0 ppc64le fix + +* Wed May 29 2024 Richard W.M. Jones - 1.13-7 +- OCaml 5.2.0 for Fedora 41 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Richard W.M. Jones - 1.13-4 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + +* Tue Dec 12 2023 Richard W.M. Jones - 1.13-3 +- OCaml 5.1.1 rebuild for Fedora 40 + +* Thu Oct 05 2023 Richard W.M. Jones - 1.13-2 +- OCaml 5.1 rebuild for Fedora 40 + +* Thu Jul 27 2023 Jerry James - 1.13-1 +- Version 1.13 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.12-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Richard W.M. Jones - 1.12-11 +- OCaml 5.0 rebuild for Fedora 39 + +* Mon Jul 10 2023 Jerry James - 1.12-10 +- OCaml 5.0.0 rebuild +- Install missing files +- Do not require ocaml-compiler-libs at runtime + +* Tue Jan 24 2023 Richard W.M. Jones - 1.12-9 +- Rebuild OCaml packages for F38 + +* Thu Jan 19 2023 Fedora Release Engineering - 1.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Dec 12 2022 Jerry James - 1.12-7 +- Convert License tag to SPDX + +* Fri Jul 22 2022 Fedora Release Engineering - 1.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 20 2022 Jerry James - 1.12-6 +- Use new OCaml macros + +* Sat Jun 18 2022 Richard W.M. Jones - 1.12-6 +- OCaml 4.14.0 rebuild + +* Fri Feb 04 2022 Richard W.M. Jones - 1.12-5 +- OCaml 4.13.1 rebuild to remove package notes + +* Thu Jan 20 2022 Fedora Release Engineering - 1.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 04 2021 Richard W.M. Jones - 1.12-3 +- OCaml 4.13.1 build + +* Thu Jul 22 2021 Fedora Release Engineering - 1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Mar 3 2021 Jerry James - 1.12-1 +- Version 1.12 + +* Mon Mar 1 13:12:07 GMT 2021 Richard W.M. Jones - 1.11-3 +- OCaml 4.12.0 build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 16 2020 Jerry James - 1.11-1 +- Version 1.11 + +* Sun Sep 13 2020 Dan Čermák - 1.10-1 +- New upstream release 1.10 + +* Tue Sep 01 2020 Richard W.M. Jones - 1.9.1-14 +- OCaml 4.11.1 rebuild + +* Fri Aug 21 2020 Richard W.M. Jones - 1.9.1-13 +- OCaml 4.11.0 rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.9.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon May 04 2020 Richard W.M. Jones - 1.9.1-11 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + +* Tue Apr 21 2020 Richard W.M. Jones - 1.9.1-10 +- OCaml 4.11.0 pre-release attempt 2 -* Mon Jan 04 2021 Joe Schmitt - 1.9.1-8.1 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). -- Remove Red Hat guess file +* Fri Apr 17 2020 Richard W.M. Jones - 1.9.1-9 +- OCaml 4.11.0 pre-release -* Thu Feb 27 2020 Richard W.M. Jones - 1.9.1-7.1 -- OCaml 4.10.0 final (Fedora 32). +* Thu Apr 02 2020 Richard W.M. Jones - 1.9.1-8 +- Update all OCaml dependencies for RPM 4.16. * Wed Feb 26 2020 Richard W.M. Jones - 1.9.1-7 - OCaml 4.10.0 final. diff --git a/SPECS-EXTENDED/orc/0001-powerpc-fix-div255w-which-still-used-the-inexact-sub.patch b/SPECS-EXTENDED/orc/0001-powerpc-fix-div255w-which-still-used-the-inexact-sub.patch new file mode 100644 index 00000000000..a0e9f4e831b --- /dev/null +++ b/SPECS-EXTENDED/orc/0001-powerpc-fix-div255w-which-still-used-the-inexact-sub.patch @@ -0,0 +1,66 @@ +From 508280f7ac31c7d0ab2eaed33b26e6df59bb4dd9 Mon Sep 17 00:00:00 2001 +From: "L. E. Segovia" +Date: Fri, 19 Jul 2024 22:25:20 -0300 +Subject: [PATCH 1/2] powerpc: fix div255w which still used the inexact + substitution + +The code for this architecture used the substitution suggested in the +original bug report. That one had subtle failures on armv7a and aarch64, +but I was not able to verify if they affected PowerPC too. + +This commit fixes it by reusing the mulhuw instruction implementation -- +sse2 can be ported directly that way. + +Fixes #71 + +Part-of: +--- + orc/orcrules-altivec.c | 31 +++++++++++++++---------------- + 1 file changed, 15 insertions(+), 16 deletions(-) + +diff --git a/orc/orcrules-altivec.c b/orc/orcrules-altivec.c +index 23409a8..a13fb5b 100644 +--- a/orc/orcrules-altivec.c ++++ b/orc/orcrules-altivec.c +@@ -1513,23 +1513,22 @@ powerpc_rule_convlf (OrcCompiler *p, void *user, OrcInstruction *insn) + static void + powerpc_rule_div255w (OrcCompiler *p, void *user, OrcInstruction *insn) + { +- int src1 = ORC_SRC_ARG (p, insn, 0); +- int dest = ORC_DEST_ARG (p, insn, 0); +- int tmp = orc_compiler_get_temp_reg (p); +- int tmp2 = orc_compiler_get_temp_reg (p); +- int tmpc; +- +- tmpc = powerpc_get_constant (p, ORC_CONST_SPLAT_W, 0x0001); +- +- ORC_ASM_CODE(p," vspltish %s, 8\n", powerpc_get_regname(tmp2)); +- powerpc_emit_VX(p, 0x1000034c, powerpc_regnum(tmp2), 8, 0); +- +- powerpc_emit_VX_2 (p, "vadduhm", 0x10000040, dest, src1, tmpc); +- +- powerpc_emit_VX_2 (p, "vsrh", 0x10000244, tmp, src1, tmp2); +- powerpc_emit_VX_2 (p, "vadduhm", 0x10000040, dest, dest, tmp); ++ const int src1 = ORC_SRC_ARG (p, insn, 0); ++ const int dest = ORC_DEST_ARG(p, insn, 0); ++ const int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_W, 7); ++ const int tmpc = powerpc_get_constant (p, ORC_CONST_SPLAT_W, 0x8081); ++ ++ { ++ // mulhuw ++ const int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, ++ 0x18190809, 0x1c1d0c0d); ++ ++ powerpc_emit_vmuleuh (p, p->tmpreg, src1, tmpc); ++ powerpc_emit_vmulouh (p, dest, src1, tmpc); ++ powerpc_emit_vperm (p, dest, dest, p->tmpreg, perm); ++ } + +- powerpc_emit_VX_2 (p, "vsrh", 0x10000244, dest, dest, tmp2); ++ powerpc_emit_VX_2 (p, "vsrh", 0x10000244, dest, dest, tmp); + } + + static void +-- +2.45.2 + diff --git a/SPECS-EXTENDED/orc/orc.signatures.json b/SPECS-EXTENDED/orc/orc.signatures.json index 552d39e4f4e..952d8ac6d64 100644 --- a/SPECS-EXTENDED/orc/orc.signatures.json +++ b/SPECS-EXTENDED/orc/orc.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "orc-0.4.31.tar.xz": "a0ab5f10a6a9ae7c3a6b4218246564c3bf00d657cbdf587e6d34ec3ef0616075" + "orc-0.4.39.tar.xz": "33ed2387f49b825fa1b9c3b0072e05f259141b895474ad085ae51143d3040cc0" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/orc/orc.spec b/SPECS-EXTENDED/orc/orc.spec index 7fc6fada2e2..6d97ce9672a 100644 --- a/SPECS-EXTENDED/orc/orc.spec +++ b/SPECS-EXTENDED/orc/orc.spec @@ -1,17 +1,19 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux Name: orc -Version: 0.4.31 -Release: 4%{?dist} +Version: 0.4.39 +Release: 2%{?dist} Summary: The Oil Run-time Compiler -License: BSD +License: BSD-2-Clause AND BSD-3-Clause +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: http://cgit.freedesktop.org/gstreamer/orc/ -Source0: http://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz +Source0: https://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz + +Patch0001: 0001-powerpc-fix-div255w-which-still-used-the-inexact-sub.patch -BuildRequires: %{_bindir}/xsltproc BuildRequires: meson >= 0.47.0 BuildRequires: gcc +BuildRequires: gtk-doc %description Orc is a library and set of tools for compiling and executing @@ -20,6 +22,14 @@ is a generic assembly language that represents many of the features available in SIMD architectures, including saturated addition and subtraction, and many arithmetic operations. +%package doc +Summary: Documentation for Orc +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +Documentation for Orc. + %package devel Summary: Development files and libraries for Orc Requires: %{name} = %{version}-%{release} @@ -40,10 +50,10 @@ The Orc compiler, to produce optimized code. %prep -%setup -q +%autosetup -p1 %build -%meson -D default_library=shared -Dgtk_doc=disabled +%meson -D default_library=shared %meson_build %install @@ -54,9 +64,7 @@ find %{buildroot}/%{_libdir} -name \*.a -delete rm -rf %{buildroot}/%{_libdir}/orc %check -%ifnarch s390 s390x ppc %{power64} %{arm} i686 aarch64 %meson_test -%endif %ldconfig_scriptlets @@ -64,29 +72,77 @@ rm -rf %{buildroot}/%{_libdir}/orc %files %license COPYING %doc README -%{_libdir}/liborc-*.so.* +%{_libdir}/liborc-0.4.so.0* +%{_libdir}/liborc-test-0.4.so* %{_bindir}/orc-bugreport +%files doc +%doc %{_datadir}/gtk-doc/html/orc/ + %files devel %doc examples/*.c %{_includedir}/%{name}-0.4/ -%{_libdir}/liborc-*.so +%{_libdir}/liborc-0.4.so %{_libdir}/pkgconfig/orc-0.4.pc %{_libdir}/pkgconfig/orc-test-0.4.pc -%{_datadir}/aclocal/orc.m4 %files compiler %{_bindir}/orcc %changelog -* Mon Mar 21 2022 Pawel Winogrodzki - 0.4.31-4 -- Adding BR on '%%{_bindir}/xsltproc'. -- Disabled gtk doc generation to remove network dependency during build-time. +* Tue Dec 17 2024 Jyoti kanase - 0.4.39-2 +- Initial Azure Linux import from Fedora 41 (license: MIT). - License verified. -* Fri Oct 15 2021 Pawel Winogrodzki - 0.4.31-3 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Tue Jul 30 2024 Wim Taymans 0.4.39-1 +- Update to 0.4.39 +- Add patch for div255w fix on ppc64le + +* Thu Jul 18 2024 Fedora Release Engineering - 0.4.38-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Mar 06 2024 Peter Robinson - 0.4.38-2 +- Move orc-test to main package + +* Tue Mar 05 2024 Peter Robinson - 0.4.38-1 +- Update to 0.4.38 +- Version the library to catch bumps +- Cleanup spec, use license var + +* Thu Jan 25 2024 Fedora Release Engineering - 0.4.33-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.4.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.4.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.4.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Nov 04 2022 Wim Taymans 0.4.33-1 +- Update to 0.4.33 + +* Fri Jul 22 2022 Fedora Release Engineering - 0.4.31-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.4.31-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Aug 18 2021 Vít Ondruch - 0.4.31-6 +- Fix ppc64le segfault when used via libvips. + Resolves: rhbz#1917540 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.4.31-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.4.31-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.4.31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Wed Jan 29 2020 Fedora Release Engineering - 0.4.31-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/parallel/parallel.signatures.json b/SPECS-EXTENDED/parallel/parallel.signatures.json index ef9d0e8e9b0..6e0941d7240 100644 --- a/SPECS-EXTENDED/parallel/parallel.signatures.json +++ b/SPECS-EXTENDED/parallel/parallel.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "parallel-20190922.tar.bz2": "282fee2cb40a54ba32a922446365b782c4f461f848432b969de5a17b33193c63" + "parallel-20240922.tar.bz2": "63210715e8b7c5e129e098f333cd7cdd5fc7a2f325e8e0fb9ed6edba9f1acbc4" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/parallel/parallel.spec b/SPECS-EXTENDED/parallel/parallel.spec index d91e9e64147..000a7203a03 100644 --- a/SPECS-EXTENDED/parallel/parallel.spec +++ b/SPECS-EXTENDED/parallel/parallel.spec @@ -1,18 +1,24 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux + Name: parallel Summary: Shell tool for executing jobs in parallel -Version: 20190922 +Version: 20240922 Release: 3%{?dist} - -License: GPLv3+ -URL: http://www.gnu.org/software/parallel/ -Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 - +Vendor: Microsoft Corporation +Distribution: Azure Linux +# Automatically converted from old format: GFDL and GPLv3+ - review is highly recommended. +License: LicenseRef-Callaway-GFDL AND GPL-3.0-or-later +URL: https://www.gnu.org/software/parallel/ +Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 BuildArch: noarch - +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: make BuildRequires: perl-generators -BuildRequires: %{_bindir}/pod2man +BuildRequires: perl-podlators +BuildRequires: perl-FileHandle +BuildRequires: sed + +%define __requires_exclude sh$ # Due to a naming conflict, both packages cannot be installed in parallel # To prevent user confusion, GNU parallel is installed in a compatibility @@ -40,41 +46,145 @@ additional features. %prep %autosetup +# Replace shebang by replacing "env" by removing "env ". +# FIXME: this is quite a hack +sed -i '1s:/env :/:' src/env_parallel.* %build -%configure +autoreconf -ivf +%configure %make_build %install %make_install rm -vrf %{buildroot}%{_pkgdocdir} -sed -i -e '1s|!#/usr/bin/env perl|#!%{__perl}|' %{buildroot}%{_bindir}/* -# FIXME: do it properly -sed -i -e '1{\@^#!@d}' %{buildroot}%{_bindir}/env_parallel.* -chmod -x %{buildroot}%{_bindir}/env_parallel.* %files -%license COPYING +%license LICENSES/GPL-3.0-or-later.txt LICENSES/GFDL-1.3-or-later.txt %doc README NEWS %{_bindir}/parallel %{_bindir}/parcat %{_bindir}/parset +%{_bindir}/parsort %{_mandir}/man1/parallel.1* %{_mandir}/man1/parcat.1* %{_mandir}/man1/parset.1* +%{_mandir}/man1/parsort.1* %{_mandir}/man7/parallel* -%exclude %{_bindir}/env_parallel* -%exclude %{_mandir}/man1/env_parallel.1* +%{_bindir}/env_parallel* +%{_mandir}/man1/env_parallel.1* %{_bindir}/sem %{_mandir}/man1/sem.1* %{_bindir}/sql %{_mandir}/man1/sql.1* %{_bindir}/niceload %{_mandir}/man1/niceload.1* +%{_datadir}/bash-completion/completions/parallel +%{_datadir}/zsh/site-functions/_parallel %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 20190922-3 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Wed Dec 18 2024 Jyoti kanase - 20240922 -3 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Mon Sep 23 2024 Filipe Rosset - 20240922-2 +- update parallel to 20240922 + +* Mon Sep 23 2024 Filipe Rosset - 20240922-1 +- update parallel to 20240922 + +* Mon Sep 16 2024 Filipe Rosset - 20240822-1 +- update parallel to 20240822 + +* Mon Sep 02 2024 Miroslav Suchý - 20240722-2 +- convert license to SPDX + +* Wed Aug 14 2024 Filipe Rosset - 20240722-1 +- update parallel to 20240722 + +* Thu Jul 18 2024 Fedora Release Engineering - 20240622-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 15 2024 Filipe Rosset - 20240622-1 +- update to 20240622 fixes rbhz#2267428 + +* Thu Jan 25 2024 Fedora Release Engineering - 20230822-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 20230822-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Sep 09 2023 Filipe Rosset - 20230822-1 +- update to parallel-20230822 + +* Sun Jul 30 2023 Filipe Rosset - 20230722-1 +- update to 20230722 + +* Thu Jul 20 2023 Fedora Release Engineering - 20230522-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 09 2023 Filipe Rosset - 20230522-1 +- update to 20230522 + +* Tue May 02 2023 Filipe Rosset - 20230422-2 +- update parallel to 20230422 + +* Tue May 02 2023 Filipe Rosset - 20230422-1 +- update parallel to 20230422 + +* Fri Mar 31 2023 Filipe Rosset - 20230322-1 +- update to 20230322 + +* Sun Feb 19 2023 Filipe Rosset - 20230122-1 +- update to 20230122 + +* Thu Jan 19 2023 Fedora Release Engineering - 20221122-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Nov 24 2022 Filipe Rosset - 20221122-1 +- updated to latest version + +* Mon Oct 24 2022 Filipe Rosset - 20221022-1 +- update to 20221022 + +* Sat Sep 24 2022 Filipe Rosset - 20220922-1 +- Update to 20220922 + +* Tue Aug 23 2022 Filipe Rosset - 20220822-1 +- update to 20220822 + +* Fri Jul 22 2022 Fedora Release Engineering - 20220322-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Mar 30 2022 Filipe Rosset - 20220322-1 +- update to 20220322 + +* Thu Jan 20 2022 Fedora Release Engineering - 20211222-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 05 2022 Jirka Hladky - 20211222-2 +- Remove all shell dependencies + +* Thu Jul 22 2021 Fedora Release Engineering - 20201222-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 20201222-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Jan 16 2021 Filipe Rosset - 20201222-1 +- Update to 20201222 + +* Mon Aug 17 2020 Filipe Rosset - 20200722-1 +- Update to 20200722 + +* Tue Jul 28 2020 Fedora Release Engineering - 20200522-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Filipe Rosset - 20200522-1 +- Update to 20200522 + +* Wed Apr 22 2020 Filipe Rosset - 20200322-1 +- Update to 20200322 fixes rhbz#1740919 * Wed Jan 29 2020 Fedora Release Engineering - 20190922-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -162,3 +272,5 @@ chmod -x %{buildroot}%{_bindir}/env_parallel.* - Added a comment to the description, concerning the moreutils compatibility * Sun Feb 6 2011 Golo Fuchert - 20110205-1 - Initial package. Based on a package by Ole Tange and Markus Ammer. + +## END: Generated by rpmautospec diff --git a/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.signatures.json b/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.signatures.json index cf279249e43..dadd860fcae 100644 --- a/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.signatures.json +++ b/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-Algorithm-Diff-1.1903.tar.gz": "30e84ac4b31d40b66293f7b1221331c5a50561a39d580d85004d9c1fff991751" + "perl-Algorithm-Diff-1.201.tar.gz": "0022da5982645d9ef0207f3eb9ef63e70e9713ed2340ed7b3850779b0d842a7d" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.spec b/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.spec index bc3becb3646..4c2339087f8 100644 --- a/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.spec +++ b/SPECS-EXTENDED/perl-Algorithm-Diff/perl-Algorithm-Diff.spec @@ -1,18 +1,25 @@ +%global upstream_version 1.201 +%global extra_version 0 + Name: perl-Algorithm-Diff -Version: 1.1903 -Release: 16%{?dist} -Summary: Compute `intelligent' differences between two files/lists -License: GPL+ or Artistic +Version: %{upstream_version}%{?extra_version} +Release: 13%{?dist} +Summary: Compute 'intelligent' differences between two files/lists +License: GPL-1.0-or-later OR Artistic-1.0-Perl Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://metacpan.org/release/Algorithm-Diff -Source0: https://cpan.metacpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-%{version}.tar.gz#/perl-Algorithm-Diff-%{version}.tar.gz +Source0: https://cpan.metacpan.org/modules/by-module/Algorithm/Algorithm-Diff-%{upstream_version}.tar.gz#/perl-Algorithm-Diff-%{upstream_version}.tar.gz Patch0: Algorithm-Diff-1.1903-provides.patch BuildArch: noarch # Build: -BuildRequires: perl-interpreter +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl-generators +BuildRequires: perl-interpreter BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(warnings) # Run-time: BuildRequires: perl(Carp) BuildRequires: perl(Exporter) @@ -24,7 +31,6 @@ BuildRequires: perl(Data::Dumper) BuildRequires: perl(lib) BuildRequires: perl(Test) # Explicit requirements: -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Carp) %description @@ -34,36 +40,82 @@ or any other two lists of things. It uses an intelligent algorithm similar to find the *smallest possible* set of differences. %prep -%setup -q -n Algorithm-Diff-%{version} - -# Generate provide for perl(Algorithm::DiffOld) -%patch 0 +%autosetup -p0 -n Algorithm-Diff-%{upstream_version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} \; -%{_fixperms} %{buildroot} - -# Remove example scripts we're shipping as documentation -rm -f %{buildroot}%{perl_vendorlib}/Algorithm/*.pl +find %{buildroot} -type f -name .packlist -delete +%{_fixperms} -c %{buildroot} %check make test %files -%doc Changes README *.pl +%doc Changes README bin/*.pl %{perl_vendorlib}/Algorithm/ %{_mandir}/man3/Algorithm::Diff.3* %{_mandir}/man3/Algorithm::DiffOld.3* %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 1.1903-16 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Wed Dec 18 2024 Jyoti kanase - 1.2010 - 13 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Thu Jul 18 2024 Fedora Release Engineering - 1.2010-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.2010-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.2010-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.2010-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.2010-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.2010-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 1.2010-6 +- Perl 5.36 rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.2010-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.2010-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 1.2010-3 +- Perl 5.34 rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2010-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 14 2020 Paul Howarth - 1.2010-1 +- Update to 1.201 + - Speed up LCS when $keyGen is undef (CPAN RT#101105) + +* Mon Sep 28 2020 Paul Howarth - 1.2000-1 +- Update to 1.200 + - New release with no new features, just preparing for a series of bugfix + releases +- Specify all build dependencies +- Drop redundant buildroot cleaning in %%install section +- Simplify find command using -delete +- Fix permissions verbosely + +* Tue Jul 28 2020 Fedora Release Engineering - 1.1903-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 1.1903-16 +- Perl 5.32 rebuild * Wed Jan 29 2020 Fedora Release Engineering - 1.1903-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.signatures.json b/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.signatures.json index 876f1d29e96..67ffc40ab2f 100644 --- a/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.signatures.json +++ b/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-Class-C3-XS-0.14.tar.gz": "a81489bb1d84a18ca0199b7f3d332c1586cadb03365cb8f2dd7d77d8ab88bcc6" + "perl-Class-C3-XS-0.15.tar.gz": "cf86d2575c1a374041d1ef3050cb36db6beda4e31295918aaeb2a029f0983afb" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.spec b/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.spec index ad3650c0f00..77942a52fd0 100644 --- a/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.spec +++ b/SPECS-EXTENDED/perl-Class-C3-XS/perl-Class-C3-XS.spec @@ -1,22 +1,20 @@ Name: perl-Class-C3-XS -Version: 0.14 -Release: 13%{?dist} +Version: 0.15 +Release: 17%{?dist} Summary: XS speedups for Class::C3 -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://metacpan.org/release/Class-C3-XS -Source0: https://cpan.metacpan.org/authors/id/E/ET/ETHER/Class-C3-XS-%{version}.tar.gz#/perl-Class-C3-XS-%{version}.tar.gz +Source0: https://cpan.metacpan.org/modules/by-module/Class/Class-C3-XS-%{version}.tar.gz#/perl-Class-C3-XS-%{version}.tar.gz # Module Build BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc BuildRequires: make -BuildRequires: perl-interpreter - BuildRequires: perl-devel - BuildRequires: perl-generators +BuildRequires: perl-interpreter BuildRequires: perl(ExtUtils::MakeMaker) # Module Runtime BuildRequires: perl(strict) @@ -25,14 +23,12 @@ BuildRequires: perl(XSLoader) # Test Suite BuildRequires: perl(base) BuildRequires: perl(File::Spec) -BuildRequires: perl(Module::Metadata) BuildRequires: perl(Test::More) # Optional Tests BuildRequires: perl(CPAN::Meta) >= 2.120900 BuildRequires: perl(Sub::Name) # Dependencies Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) - # Avoid provides from private shared objects %{?perl_default_filter} @@ -49,29 +45,74 @@ perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -delete find %{buildroot} -type f -name '*.bs' -empty -delete -%{_fixperms} %{buildroot} +%{_fixperms} -c %{buildroot} %check make test %files -%if 0%{?_licensedir:1} %license LICENCE -%else -%doc LICENCE -%endif %doc Changes CONTRIBUTING README %{perl_vendorarch}/auto/Class/ %{perl_vendorarch}/Class/ %{_mandir}/man3/Class::C3::XS.3* %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 0.14-13 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Fri Dec 20 2024 Jyoti kanase - 0.15-17 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Thu Jul 18 2024 Fedora Release Engineering - 0.15-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 10 2024 Jitka Plesnikova - 0.15-15 +- Perl 5.40 rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.15-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.15-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.15-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 0.15-11 +- Perl 5.38 rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 0.15-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 31 2022 Jitka Plesnikova - 0.15-8 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 0.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 0.15-5 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 0.15-2 +- Perl 5.32 rebuild + +* Thu Apr 9 2020 Paul Howarth - 0.15-1 +- Update to 0.15 + - Minor distribution tooling updates * Wed Jan 29 2020 Fedora Release Engineering - 0.14-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.signatures.json b/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.signatures.json index 3457c3d738b..471e3b289b7 100644 --- a/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.signatures.json +++ b/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-Class-Method-Modifiers-2.13.tar.gz": "ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63" + "perl-Class-Method-Modifiers-2.15.tar.gz": "65cd85bfe475d066e9186f7a8cc636070985b30b0ebb1cde8681cf062c2e15fc" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.spec b/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.spec index 94183c5e5fc..06b7ae27fad 100644 --- a/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.spec +++ b/SPECS-EXTENDED/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.spec @@ -7,9 +7,9 @@ Name: perl-Class-Method-Modifiers Summary: Provides Moose-like method modifiers -Version: 2.13 -Release: 3%{?dist} -License: GPL+ or Artistic +Version: 2.15 +Release: 6%{?dist} +License: GPL-1.0-or-later OR Artistic-1.0-Perl Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://metacpan.org/release/Class-Method-Modifiers @@ -32,19 +32,16 @@ BuildRequires: perl(Exporter) # Test Suite BuildRequires: perl(File::Spec) BuildRequires: perl(if) -BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::More) >= 0.88 -BuildRequires: perl(Test::Needs) # Optional Test Requirements %if 0%{!?perl_bootstrap:1} && %{with perl_Class_Method_Modifiers_enables_optional_test} BuildRequires: perl(CPAN::Meta) >= 2.120900 BuildRequires: perl(Moose) %endif + # Runtime -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(B) Requires: perl(Carp) -Requires: perl(Exporter) # Avoid doc-file dependencies %{?perl_default_filter} @@ -66,7 +63,7 @@ original method. See the 'MODIFIERS' section for more details on how the particular modifiers work. %prep -%setup -q -n Class-Method-Modifiers-%{version} +%autosetup -n Class-Method-Modifiers-%{version} %build perl Makefile.PL INSTALLDIRS=vendor @@ -87,8 +84,66 @@ make test %{_mandir}/man3/Class::Method::Modifiers.3* %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 2.13-3 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Thu Dec 19 2024 Jyoti kanase - 2.15-6 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Thu Jul 18 2024 Fedora Release Engineering - 2.15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 2.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 2.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Mar 6 2023 Paul Howarth - 2.15-1 +- Update to 2.15 (rhbz#2175585) + - Localize $SIG{__DIE__} before calling eval (CPAN RT#146848) + +* Fri Jan 20 2023 Fedora Release Engineering - 2.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 17 2023 Paul Howarth - 2.14-1 +- Update to 2.14 (rhbz#2161420) + - Remove Test::Fatal and Test::Needs from test prereqs (GH#7, GH#8) +- Use SPDX-format license tag + +* Fri Jul 22 2022 Fedora Release Engineering - 2.13-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jun 03 2022 Jitka Plesnikova - 2.13-12 +- Perl 5.36 re-rebuild of bootstrapped packages + +* Tue May 31 2022 Jitka Plesnikova - 2.13-11 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 2.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 24 2021 Jitka Plesnikova - 2.13-8 +- Perl 5.34 re-rebuild of bootstrapped packages + +* Fri May 21 2021 Jitka Plesnikova - 2.13-7 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 26 2020 Jitka Plesnikova - 2.13-4 +- Perl 5.32 re-rebuild of bootstrapped packages + +* Tue Jun 23 2020 Jitka Plesnikova - 2.13-3 +- Perl 5.32 rebuild * Wed Jan 29 2020 Fedora Release Engineering - 2.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.signatures.json b/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.signatures.json index 50948115c8c..365bdf7a780 100644 --- a/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.signatures.json +++ b/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-Class-Singleton-1.5.tar.gz": "38220d04f02e3a803193c2575a1644cce0b95ad4b95c19eb932b94e2647ef678" + "perl-Class-Singleton-1.6.tar.gz": "27ba13f0d9512929166bbd8c9ef95d90d630fc80f0c9a1b7458891055e9282a4" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.spec b/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.spec index 364e6e1a084..88d60386311 100644 --- a/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.spec +++ b/SPECS-EXTENDED/perl-Class-Singleton/perl-Class-Singleton.spec @@ -1,26 +1,26 @@ Name: perl-Class-Singleton -Version: 1.5 -Release: 16%{?dist} +Version: 1.6 +Release: 13%{?dist} Summary: Implementation of a "Singleton" class -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://metacpan.org/release/Class-Singleton -Source0: https://cpan.metacpan.org/authors/id/S/SH/SHAY/Class-Singleton-%{version}.tar.gz#/perl-Class-Singleton-%{version}.tar.gz +Source0: https://cpan.metacpan.org/modules/by-module/Class/Class-Singleton-%{version}.tar.gz#/perl-Class-Singleton-%{version}.tar.gz BuildArch: noarch # Module Build -BuildRequires: perl-interpreter +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl-interpreter +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.64 # Module Runtime BuildRequires: perl(strict) BuildRequires: perl(warnings) # Test Suite BuildRequires: perl(base) -BuildRequires: perl(lib) BuildRequires: perl(Test::More) -# Runtime -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description This is the Class::Singleton module. A Singleton describes an object class @@ -33,29 +33,96 @@ Class::Singleton, your module will inherit the Singleton instantiation method and can implement whatever specific functionality is required. %prep -%setup -q -n Class-Singleton-%{version} +%autosetup -n Class-Singleton-%{version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -%{_fixperms} $RPM_BUILD_ROOT +make pure_install DESTDIR=%{buildroot} +find %{buildroot} -type f -name .packlist -delete +%{_fixperms} -c %{buildroot} %check make test %files +%license Artistic Copying LICENCE %doc Changes README %{perl_vendorlib}/Class/ %{_mandir}/man3/Class::Singleton.3* %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 1.5-16 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Thu Dec 19 2024 Jyoti kanase - 1.6-13 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Thu Jul 18 2024 Fedora Release Engineering - 1.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 1.6-6 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 1.6-3 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 3 2020 Paul Howarth - 1.6-1 +- Update to 1.6 + - Fixed confusing Changes entry about Perl's licensing terms (CPAN RT#132843) + - Added optional Changes testing (skipped unless AUTHOR_TESTING) + - Reformatted Changes file as per CPAN::Changes::Spec + - Added optional POD coverage testing (skipped unless AUTHOR_TESTING) + - Added optional Perl::Critic testing (skipped unless AUTHOR_TESTING) + - Made code Perl::Critic clean + - Added optional POD testing (skipped unless AUTHOR_TESTING) + - Included GitHub repository URLs in metadata now that source code has been + uploaded to GitHub (as of version 1.5) + - Included META.json file in addition to META.yml + - Set minimum required ExtUtils::MakeMaker version to 6.64 to ensure that all + parameters used are supported, to save jumping through hoops to support + earlier versions (this should not be a problem since ExtUtils::MakeMaker + 6.64 is easily installed into Perl 5.8.1 and above, that being the whole + point of the new choice of minimum supported Perl version) + - Set minimum required Perl version to 5.8.1; this is in line with the + minimum requirement of the "Perl Toolchain" + - Corrected typo in a comment (CPAN RT#86336) +- Use author-independent source URL +- Specify all build dependencies +- Drop redundant buildroot cleaning in %%install section +- Simplify find command using -delete +- Fix permissions verbosely +- Package Artistic, Copying and LICENCE licence files + +* Tue Jul 28 2020 Fedora Release Engineering - 1.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 1.5-16 +- Perl 5.32 rebuild * Wed Jan 29 2020 Fedora Release Engineering - 1.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.signatures.json b/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.signatures.json index a857a596ee5..e46bc1e7bfc 100644 --- a/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.signatures.json +++ b/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "perl-Config-IniFiles-3.000002.tar.gz": "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09" + "perl-Config-IniFiles-3.000003.tar.gz": "3c457b65d98e5ff40bdb9cf814b0d5983eb0c53fb8696bda3ba035ad2acd6802" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.spec b/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.spec index c7d14a48406..f865d80d0ff 100644 --- a/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.spec +++ b/SPECS-EXTENDED/perl-Config-IniFiles/perl-Config-IniFiles.spec @@ -1,21 +1,21 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux Name: perl-Config-IniFiles -Version: 3.000002 -Release: 6%{?dist} +Version: 3.000003 +Release: 15%{?dist} Summary: A module for reading .ini-style configuration files # LICENSE: GPL+ or Artistic # lib/Config/IniFiles.pm: GPL+ or Artistic ## Not distributed in a binary package # t/30parameters-with-empty-values.t: MIT License: GPL+ or Artistic +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://metacpan.org/release/Config-IniFiles Source0: https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Config-IniFiles-%{version}.tar.gz#/perl-Config-IniFiles-%{version}.tar.gz BuildRequires: coreutils BuildRequires: findutils BuildRequires: make -BuildRequires: perl-interpreter BuildRequires: perl-generators +BuildRequires: perl-interpreter BuildRequires: perl(Module::Build) >= 0.36 # Module::Build::Compat not used, we run Build.PL BuildRequires: perl(strict) @@ -32,22 +32,19 @@ BuildRequires: perl(List::Util) >= 1.33 BuildRequires: perl(Symbol) BuildRequires: perl(vars) # Tests: -%if 0%{?with_check} +BuildRequires: perl(base) +BuildRequires: perl(blib) BuildRequires: perl(English) BuildRequires: perl(Exporter) BuildRequires: perl(File::Spec) BuildRequires: perl(IO::File) BuildRequires: perl(IO::Handle) BuildRequires: perl(IPC::Open3) -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(Test::More) -BuildRequires: perl(base) -BuildRequires: perl(blib) BuildRequires: perl(lib) BuildRequires: perl(parent) -%endif +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Test::More) BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # Not autodetected. Found in lib/Config/IniFiles.pm:2761 Requires: perl(IO::Scalar) >= 2.109 # Also not autodetected @@ -85,12 +82,54 @@ perl Build.PL installdirs=vendor %{_mandir}/man3/*.3pm* %changelog -* Thu Sep 01 2022 Muhammad Falak - 3.000002-6 -- Add BR on `perl(blib)` to enable ptest -- License verified +* Thu Dec 19 2024 Jyoti kanase - 3.000003 - 15 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Thu Jul 18 2024 Fedora Release Engineering - 3.000003-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 3.000003-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.000003-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 3.000003-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 3.000003-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 3.000003-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 31 2022 Jitka Plesnikova - 3.000003-8 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 3.000003-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.000003-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 3.000003-5 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.000003-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.000003-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 3.000003-2 +- Perl 5.32 rebuild + +* Wed Mar 25 2020 Tom Callaway - 3.000003-1 +- update to 3.000003 -* Fri Oct 15 2021 Pawel Winogrodzki - 3.000002-5 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Thu Mar 19 2020 Petr Pisar - 3.000002-5 +- Build-require blib for the tests * Wed Jan 29 2020 Fedora Release Engineering - 3.000002-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.signatures.json b/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.signatures.json index 5a85ff225cc..5f226317462 100644 --- a/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.signatures.json +++ b/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "dbus-client-gen-0.4.tar.gz": "be2d7518238044f1ca148a5fff8504cc1324ee41dabec8b6e6a9ca2be3e93e7b" + "python-dbus-client-gen-0.5.1.tar.gz": "2fd53bf85955cf9bc76f8bbbdb9968fc891401bea247b31d702a35f5a3bd8bba" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.spec b/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.spec index c8b36fa8f7e..d94dd1c2f4e 100644 --- a/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.spec +++ b/SPECS-EXTENDED/python-dbus-client-gen/python-dbus-client-gen.spec @@ -1,21 +1,15 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux -%{?python_enable_dependency_generator} %global srcname dbus-client-gen Name: python-%{srcname} -Version: 0.4 -Release: 7%{?dist} +Version: 0.5.1 +Release: 9%{?dist} Summary: Library for Generating D-Bus Client Code - -License: MPLv2.0 +License: MPL-2.0 +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://github.com/stratis-storage/dbus-client-gen -Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz - +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/python-%{srcname}-%{version}.tar.gz BuildArch: noarch -%if 0%{?with_check} -BuildRequires: python3-pip -%endif %global _description \ This library contains a few methods that consume an XML specification\ @@ -31,8 +25,6 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-hypothesis -BuildRequires: python3-hs-dbus-signature %description -n python3-%{srcname} %{_description} @@ -47,11 +39,6 @@ Python 3 version. %install %py3_install -%check -pip3 install pytest sortedcontainers -pip3 install . -py.test -v tests - %files -n python3-%{srcname} %license LICENSE %doc README.rst @@ -59,12 +46,70 @@ py.test -v tests %{python3_sitelib}/dbus_client_gen-*.egg-info/ %changelog -* Mon Apr 25 2022 Muhammad Falak - 0.4-8 -- Drop BR on pytest & pip install latest deps to enable ptest -- License verified +* Mon Dec 23 2024 Akhila Guruju - 0.5.1-9 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.5.1-7 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.5.1-3 +- Rebuilt for Python 3.12 + +* Mon May 1 2023 mulhern - 0.5.1-2 +- SPDX license format + +* Mon May 1 2023 mulhern - 0.5.1-1 +- Update to 0.5.1 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.5-8 +- Rebuilt for Python 3.11 + +* Sat Feb 26 2022 mulhern - 0.5-7 +- Add gating tests + +* Fri Jan 21 2022 Fedora Release Engineering - 0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 28 2021 mulhern - 0.5-5 + Remove explicit generation of dependencies + +* Tue Jul 27 2021 Fedora Release Engineering - 0.5-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.5-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 8 2020 mulhern - 0.5-1 +- Update to 0.5 + +* Wed Jul 29 2020 Fedora Release Engineering - 0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Fri Oct 15 2021 Pawel Winogrodzki - 0.4-7 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Tue May 26 2020 Miro Hrončok - 0.4-7 +- Rebuilt for Python 3.9 * Thu Jan 30 2020 Fedora Release Engineering - 0.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.signatures.json b/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.signatures.json index 9993baa8089..80c4bf4d0d4 100644 --- a/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.signatures.json +++ b/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "dbus-python-client-gen-0.7.tar.gz": "9db0aa6692f5bb1496b5bd436aae1aa2b3f24cad0fb76ceceb5fae6df1594219" + "python-dbus-python-client-gen-0.8.3.tar.gz": "d9e93ad8d7011e843123248f127dbe7b394bf5d3c4e7367cf05bed112df8b384" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.spec b/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.spec index 533d226994c..9c3bf34c583 100644 --- a/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.spec +++ b/SPECS-EXTENDED/python-dbus-python-client-gen/python-dbus-python-client-gen.spec @@ -1,20 +1,15 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %global srcname dbus-python-client-gen Name: python-%{srcname} -Version: 0.7 -Release: 9%{?dist} +Version: 0.8.3 +Release: 8%{?dist} Summary: Python Library for Generating dbus-python Client Code - -License: MPLv2.0 +License: MPL-2.0 +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://github.com/stratis-storage/dbus-python-client-gen -Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz - +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/python-%{srcname}-%{version}.tar.gz BuildArch: noarch -%if 0%{?with_check} -BuildRequires: python3-pip -%endif %global _description \ %{summary}. @@ -26,10 +21,6 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-dbus -BuildRequires: python3-into-dbus-python >= 0.06 -Requires: python3-dbus -Requires: python3-into-dbus-python >= 0.06 %description -n python3-%{srcname} %{_description} @@ -44,10 +35,6 @@ Python 3 version. %install %py3_install -%check -pip3 install pytest -py.test -v tests - %files -n python3-%{srcname} %license LICENSE %doc README.rst @@ -55,12 +42,88 @@ py.test -v tests %{python3_sitelib}/dbus_python_client_gen-*.egg-info/ %changelog -* Mon Apr 25 2022 Muhammad Falak - 0.7-9 -- Use py.test instead of py.test-3 to enable ptest -- License verified +* Mon Dec 23 2024 Akhila Guruju - 0.8.3-8 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.8.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.8.3-6 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.8.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.8.3-2 +- Rebuilt for Python 3.12 + +* Thu Apr 27 2023 mulhern - 0.8.3-1 +- Update to 0.8.3 + +* Tue Apr 25 2023 mulhern - 0.8.2-6 +- Revise gating.yaml so that the phantom tier0 test becomes real + +* Tue Apr 25 2023 mulhern - 0.8.2-5 +- Rebuild again to see if tier0 test continues to appear + +* Tue Apr 25 2023 mulhern - 0.8.2-4 +- Rebuild to get rid of phantom tier0 test + +* Tue Apr 25 2023 mulhern - 0.8.2-3 +- Amend tmt specification + +* Tue Apr 25 2023 mulhern - 0.8.2-2 +- Use tmt format testing specification + +* Thu Feb 23 2023 Bryan Gurney - 0.8.2-1 +- Update to 0.8.2 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.8-9 +- Rebuilt for Python 3.11 + +* Sat Feb 26 2022 mulhern - 0.8-8 +- Fix gating tests + +* Sat Feb 26 2022 mulhern - 0.8-7 +- Add gating tests + +* Tue Feb 15 2022 mulhern - 0.8-6 +- Remove redundant Requires + +* Fri Jan 21 2022 Fedora Release Engineering - 0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 0.8-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.8-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 8 2020 mulhern - 0.8-1 +- Update to 0.8 + +* Wed Jul 29 2020 Fedora Release Engineering - 0.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Fri Oct 15 2021 Pawel Winogrodzki - 0.7-8 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Tue May 26 2020 Miro Hrončok - 0.7-8 +- Rebuilt for Python 3.9 * Thu Jan 30 2020 Fedora Release Engineering - 0.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.signatures.json b/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.signatures.json index 0d7147c051b..b7e5403db4a 100644 --- a/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.signatures.json +++ b/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "dbus-signature-pyparsing-0.03.tar.gz": "263a41161304f239213c0e1234f4afdbe28b7103e60129f0448ae14fb0e9c52b" + "python-dbus-signature-pyparsing-0.4.1.tar.gz": "dae2cfa1326e5fcdd13a102f259dcd02130d7e6cc667ade3aa82a61984cc3338" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.spec b/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.spec index 4a77260a920..da4530d52b4 100644 --- a/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.spec +++ b/SPECS-EXTENDED/python-dbus-signature-pyparsing/python-dbus-signature-pyparsing.spec @@ -1,16 +1,15 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %global srcname dbus-signature-pyparsing Name: python-%{srcname} -Version: 0.03 +Version: 0.4.1 Release: 10%{?dist} Summary: Parser for a D-Bus Signature -License: ASL 2.0 +License: Apache-2.0 +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://github.com/stratis-storage/dbus-signature-pyparsing -Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz - +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/python-%{srcname}-%{version}.tar.gz BuildArch: noarch %global _description \ @@ -23,11 +22,6 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-pytest -BuildRequires: python3-pyparsing -BuildRequires: python3-hypothesis -BuildRequires: python3-hs-dbus-signature -Requires: python3-pyparsing %description -n python3-%{srcname} %{_description} @@ -42,9 +36,6 @@ Python 3 version. %install %py3_install -%check -PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests - %files -n python3-%{srcname} %license LICENSE %doc README.rst @@ -52,8 +43,98 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests %{python3_sitelib}/dbus_signature_pyparsing-*.egg-info/ %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 0.03-10 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Mon Dec 23 2024 Akhila Guruju - 0.4.1-10 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.4.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.4.1-8 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.4.1-4 +- Rebuilt for Python 3.12 + +* Sun May 7 2023 mulhern - 0.4.3 +- Fix up testing plan tag + +* Sun May 7 2023 mulhern - 0.4.2 +- Fix up testing plan + +* Sun May 7 2023 mulhern - 0.4.1 +- Update to 0.4.1 + +* Wed Apr 26 2023 mulhern - 0.04-15 +- Checkout tests from HEAD revision + +* Wed Apr 26 2023 mulhern - 0.04-14 +- Include .fmf metadata + +* Wed Apr 26 2023 mulhern - 0.04-13 +- Use TMT instead of STI format gating tests; make license spec match upstream + +* Fri Jan 20 2023 Fedora Release Engineering - 0.04-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.04-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek - 0.04-10 +- Rebuilt for pyparsing-3.0.9 + +* Mon Jun 13 2022 Python Maint - 0.04-9 +- Rebuilt for Python 3.11 + +* Tue Feb 15 2022 mulhern - 0.04-8 +- Remove %check + +* Tue Feb 15 2022 mulhern - 0.04-7 +- Add gating tests + +* Fri Jan 21 2022 Fedora Release Engineering - 0.04-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 28 2021 mulhern - 0.04-5 + Remove redundant requires + +* Tue Jul 27 2021 Fedora Release Engineering - 0.04-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.04-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.04-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 03 2020 mulhern - 0.04-1 + Update to 0.04 + +* Tue Aug 04 2020 mulhern - 0.03-14 + Run check with deterministic tests only + +* Tue Aug 04 2020 mulhern - 0.03-13 + Rebuild to pass non-deterministic tests on very slow machine + +* Sat Aug 01 2020 Fedora Release Engineering - 0.03-12 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.03-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.03-10 +- Rebuilt for Python 3.9 * Thu Jan 30 2020 Fedora Release Engineering - 0.03-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.signatures.json b/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.signatures.json index 8666c9fe664..0d2e9a3a092 100644 --- a/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.signatures.json +++ b/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "into-dbus-python-0.07.tar.gz": "f0d47ad3bf1c6806789b6aadd3e9a8dda6761364114958cc5b4f0e0c279d2f8c" + "python-into-dbus-python-0.8.2.tar.gz": "df54a6f37ccd3b3f0df7f557ad8d7bdd412152b568beccd8d71cd73d4a9343e6" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.spec b/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.spec index bceaf8072b7..2463449043b 100644 --- a/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.spec +++ b/SPECS-EXTENDED/python-into-dbus-python/python-into-dbus-python.spec @@ -1,22 +1,16 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %global srcname into-dbus-python Name: python-%{srcname} -Version: 0.07 -Release: 6%{?dist} +Version: 0.8.2 +Release: 8%{?dist} Summary: Transformer to dbus-python types - -License: ASL 2.0 +License: Apache-2.0 +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://github.com/stratis-storage/into-dbus-python -Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz - +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch -%if 0%{?with_check} -BuildRequires: python3-pip -%endif - %global _description \ Facilities for converting an object that inhabits core Python types, e.g.,\ lists, ints, dicts, to an object that inhabits dbus-python types, e.g.,\ @@ -29,12 +23,7 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-dbus-signature-pyparsing -BuildRequires: python3-dbus -BuildRequires: python3-hypothesis -BuildRequires: python3-hs-dbus-signature -Requires: python3-dbus-signature-pyparsing -Requires: python3-dbus + %description -n python3-%{srcname} %{_description} @@ -49,11 +38,6 @@ Python 3 version. %install %py3_install -%check -pip3 install pytest==7.1.3 sortedcontainers -pip3 install . -pytest -v tests - %files -n python3-%{srcname} %license LICENSE %doc README.rst @@ -61,15 +45,66 @@ pytest -v tests %{python3_sitelib}/into_dbus_python-*.egg-info/ %changelog -* Tue Nov 01 2022 Pawel Winogrodzki - 0.07-6 -- Freezing "pytest" deps to version 7.1.3 to avoid regressions. +* Fri Dec 20 2024 Akhila Guruju - 0.8.2-8 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.8.2-6 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.8.2-2 +- Rebuilt for Python 3.12 + +* Thu May 4 2023 mulhern - 0.8.2-1 +- Upgrade to new release; fix license field; use TMT format tests + +* Fri Jan 20 2023 Fedora Release Engineering - 0.08-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.08-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.08-7 +- Rebuilt for Python 3.11 + +* Fri Feb 25 2022 mulhern - 0.08.6 +- Add gating tests + +* Fri Jan 21 2022 Fedora Release Engineering - 0.08-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 29 2021 mulhern - 0.08-5 +- Remove redundant requires + +* Fri Jul 23 2021 Fedora Release Engineering - 0.08-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.08-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.08-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 7 2020 mulhern - 0.08-1 +- New version: 0.08 -* Thu Apr 28 2022 Muhammad Falak - 0.07-5 -- Drop BR on pytest & pip install latest deps to enable ptest -- License verified +* Wed Jul 29 2020 Fedora Release Engineering - 0.07-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Fri Oct 15 2021 Pawel Winogrodzki - 0.07-4 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Tue May 26 2020 Miro Hrončok - 0.07-4 +- Rebuilt for Python 3.9 * Thu Jan 30 2020 Fedora Release Engineering - 0.07-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-justbases/python-justbases.signatures.json b/SPECS-EXTENDED/python-justbases/python-justbases.signatures.json index b46a5d338a6..474c359910e 100644 --- a/SPECS-EXTENDED/python-justbases/python-justbases.signatures.json +++ b/SPECS-EXTENDED/python-justbases/python-justbases.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "python-justbases-0.9.tar.gz": "3cc7e222f62c21f666398c7e32e5e82786fb7f7016d9b2eb1263c1ccb03d3eb3" + "python-justbases-0.15.2.tar.gz": "de6646eb9891b59657d183c7fc9ffa823b8523856b942446707e2a8615f4866f" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-justbases/python-justbases.spec b/SPECS-EXTENDED/python-justbases/python-justbases.spec index f3104bd51a5..9857abb4372 100644 --- a/SPECS-EXTENDED/python-justbases/python-justbases.spec +++ b/SPECS-EXTENDED/python-justbases/python-justbases.spec @@ -1,13 +1,13 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %{?python_enable_dependency_generator} %global srcname justbases Name: python-%{srcname} -Version: 0.9 -Release: 15%{?dist} +Version: 0.15.2 +Release: 10%{?dist} Summary: A small library for precise conversion between arbitrary bases -License: GPLv2+ +License: LGPL-2.1-or-later +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: http://pypi.python.org/pypi/justbases Source0: https://pypi.io/packages/source/j/%{srcname}/%{srcname}-%{version}.tar.gz#/python-%{srcname}-%{version}.tar.gz @@ -45,8 +45,81 @@ rm -rf justbases.egg-info %{python3_sitelib}/justbases-%{version}-*.egg-info %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 0.9-15 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Fri Dec 20 2024 Akhila Guruju - 0.15.2-10 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.15.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.15.2-8 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.15.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.15.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.15.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.15.2-4 +- Rebuilt for Python 3.12 + +* Mon May 15 2023 mulhern - 0.15.2-3 +- Fix package name + +* Mon May 15 2023 mulhern - 0.15.2-2 +- Update tag for tests + +* Sun May 14 2023 mulhern - 0.15.2-1 +- Update to 0.15.2; use SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 0.15-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.15-8 +- Rebuilt for Python 3.11 + +* Sun Feb 27 2022 mulhern - 0.15-7 +- Add gating tests + +* Fri Jan 21 2022 Fedora Release Engineering - 0.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.15-4 +- Rebuilt for Python 3.10 + +* Mon Mar 22 2021 mulhern - 0.15-2 +- Use the correct tarball + +* Wed Jan 27 2021 Fedora Release Engineering - 0.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 15 2020 mulhern - 0.15-1 +- Update to 0.15 + +* Wed Jul 29 2020 Fedora Release Engineering - 0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.14-2 +- Rebuilt for Python 3.9 + +* Thu Apr 23 2020 mulhern - 0.14-1 +- Update to new release + +* Thu Apr 23 2020 mulhern - 0.13-2 +- Remove license macro; upstream is not currently packaging its license file + +* Thu Apr 23 2020 mulhern - 0.13-1 +- Change license to LGPLv2+ * Thu Jan 30 2020 Fedora Release Engineering - 0.9-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-justbytes/python-justbytes.signatures.json b/SPECS-EXTENDED/python-justbytes/python-justbytes.signatures.json index 583f45f73e5..7c23e44d78a 100644 --- a/SPECS-EXTENDED/python-justbytes/python-justbytes.signatures.json +++ b/SPECS-EXTENDED/python-justbytes/python-justbytes.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "python-justbytes-0.11.tar.gz": "b8cb780db091d3f766283597c050a167ecf2039266b5ceb786206e7b34337fe4" + "python-justbytes-0.15.2.tar.gz": "c4cbeefc383014508933f03a47100dd22f4b01ac83f4fa204e13144a80c1cbcc" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-justbytes/python-justbytes.spec b/SPECS-EXTENDED/python-justbytes/python-justbytes.spec index 3ccef52d5af..6cfdeb2571d 100644 --- a/SPECS-EXTENDED/python-justbytes/python-justbytes.spec +++ b/SPECS-EXTENDED/python-justbytes/python-justbytes.spec @@ -1,18 +1,17 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %global srcname justbytes Name: python-%{srcname} -Version: 0.11 -Release: 12%{?dist} +Version: 0.15.2 +Release: 8%{?dist} Summary: Library for handling computation with address ranges in bytes -License: GPLv2+ +License: LGPL-2.1-or-later +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: http://pypi.python.org/pypi/justbytes -Source0: https://pypi.io/packages/source/%(n=%{srcname}; echo ${n:0:1})/%{srcname}/%{srcname}-%{version}.tar.gz#/python-%{srcname}-%{version}.tar.gz +Source0: https://pypi.io/packages/source/j/%{srcname}/%{srcname}-%{version}.tar.gz#/python-%{srcname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python3-pip %global _description \ A library for handling computations with address ranges. The library also offers\ @@ -25,11 +24,6 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-hypothesis -BuildRequires: python3-justbases -BuildRequires: python3-six -Requires: python3-justbases -Requires: python3-six %description -n python3-%{srcname} %{_description} @@ -45,11 +39,6 @@ rm -rf justbytes.egg-info %install %py3_install -%check -pip3 install pytest sortedcontainers -pip3 install . -py.test -v tests - %files -n python3-%{srcname} %license LICENSE %doc README.rst @@ -57,13 +46,81 @@ py.test -v tests %{python3_sitelib}/justbytes-%{version}-*.egg-info/ %changelog -* Wed Apr 27 2022 Muhammad Falak - 0.11-12 -- Drop BR on pytest & pip install latest deps -- Use `py.test` instead of `py.test-3` to enable ptest -- License verified +* Fri Dec 20 2024 Akhila Guruju - 0.15.2-8 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.15.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.15.2-6 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.15.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.15.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.15.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.15.2-2 +- Rebuilt for Python 3.12 + +* Mon May 15 2023 mulhern - 0.15.2-1 +- Update to 0.15.2 + +* Mon May 15 2023 mulhern - 0.15.1-2 +- Add .fmf/version file + +* Mon May 15 2023 mulhern - 0.15.1-1 +- Update to 0.15.1; use SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 0.15-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.15-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.15-9 +- Rebuilt for Python 3.11 + +* Sun Feb 27 2022 mulhern - 0.15-8 +- Add gating tests + +* Tue Feb 15 2022 mulhern - 0.15-7 +- Drop redundant requires + +* Fri Jan 21 2022 Fedora Release Engineering - 0.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.15-4 +- Rebuilt for Python 3.10 + +* Mon Mar 22 2021 mulhern - 0.15-3 +- Use the correct tarball + +* Wed Jan 27 2021 Fedora Release Engineering - 0.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 17 2020 mulhern - 0.15-1 +- Update to 0.15 + +* Wed Jul 29 2020 Fedora Release Engineering - 0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.14-2 +- Rebuilt for Python 3.9 + +* Thu Apr 23 2020 mulhern - 0.14-1 +- Update to new release -* Fri Oct 15 2021 Pawel Winogrodzki - 0.11-11 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Thu Apr 23 2020 mulhern - 0.12-1 +- Change license to LGPLv2+ * Thu Jan 30 2020 Fedora Release Engineering - 0.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-kmod/python-kmod.signatures.json b/SPECS-EXTENDED/python-kmod/python-kmod.signatures.json index 48c9b8bf832..4b1916a11ca 100644 --- a/SPECS-EXTENDED/python-kmod/python-kmod.signatures.json +++ b/SPECS-EXTENDED/python-kmod/python-kmod.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "python-kmod-0.9.tar.gz": "dd0fb181110fb32f4b1aa03cadc1491f98640b26d51e4a051fe55eb962ec1f57" + "python-kmod-0.9.2.tar.gz": "0100ff27b7030a73e68ec07829d6123f412ce195dc761b954c92a38d18ba8539" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-kmod/python-kmod.spec b/SPECS-EXTENDED/python-kmod/python-kmod.spec index 06b3e32decf..901a031a11f 100644 --- a/SPECS-EXTENDED/python-kmod/python-kmod.spec +++ b/SPECS-EXTENDED/python-kmod/python-kmod.spec @@ -1,15 +1,16 @@ Name: python-kmod -License: LGPLv2+ +License: LGPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux Summary: Python module to work with kernel modules -Version: 0.9 -Release: 28%{?dist} -URL: https://github.com/agrover/python-kmod/ -Source0: https://github.com/downloads/agrover/%{name}/%{name}-%{version}.tar.gz +Version: 0.9.2 +Release: 7%{?dist} +URL: https://github.com/maurizio-lombardi/python-kmod/ +Source0: https://github.com/maurizio-lombardi/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc -BuildRequires: python3-devel BuildRequires: python3-Cython +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3 BuildRequires: kmod-devel @@ -41,8 +42,63 @@ Linux kernel modules, using libkmod. %doc COPYING.LESSER README %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 0.9-28 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Fri Dec 20 2024 Akhila Guruju - 0.9.2-7 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.9.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.9.2-5 +- Rebuilt for Python 3.13 + +* Mon Feb 12 2024 Maurizio Lombardi - 0.9.2-4 +- migrated to SPDX license + +* Fri Jan 26 2024 Fedora Release Engineering - 0.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Aug 01 2023 Maurizio Lombardi - 0.9.2-1 +- Release a new version and take over maintainership upstream + +* Mon Jul 24 2023 Maurizio Lombardi - 0.9-39 +- Build for Cython < 3 + +* Fri Jul 21 2023 Fedora Release Engineering - 0.9-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.9-37 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.9-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.9-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.9-34 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 0.9-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.9-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.9-31 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.9-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.9-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.9-28 +- Rebuilt for Python 3.9 * Thu Jan 30 2020 Fedora Release Engineering - 0.9-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.signatures.json b/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.signatures.json index fbbcd182add..31565e06d81 100644 --- a/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.signatures.json +++ b/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "python-sphinxcontrib-apidoc-0.2.1.tar.gz": "4051899e7546621d34ec3bae789ce21aa6288c8def0e3f8af9b333782f2305f4" + "python-sphinxcontrib-apidoc-0.3.0.tar.gz": "729bf592cf7b7dd57c4c05794f732dc026127275d785c2a5494521fdde773fb9" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.spec b/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.spec index 9bd7a3637e8..5163e4c76df 100644 --- a/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.spec +++ b/SPECS-EXTENDED/python-sphinxcontrib-apidoc/python-sphinxcontrib-apidoc.spec @@ -1,14 +1,14 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %global pypi_name sphinxcontrib-apidoc Name: python-%{pypi_name} -Version: 0.2.1 +Version: 0.3.0 Release: 15%{?dist} Summary: A Sphinx extension for running 'sphinx-apidoc' on each build License: BSD +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: http://www.sphinx-doc.org/ Source0: https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz#/python-%{pypi_name}-%{version}.tar.gz BuildArch: noarch @@ -48,11 +48,9 @@ Requires: python3-sphinx rm -rf %{pypi_name}.egg-info %build - %py3_build %install - %py3_install # %check @@ -69,11 +67,60 @@ rm -rf %{pypi_name}.egg-info %doc README.rst %{python3_sitelib}/sphinxcontrib_apidoc*nspkg.pth %{python3_sitelib}/sphinxcontrib/apidoc -%{python3_sitelib}/sphinxcontrib_apidoc-%{version}-py?.?.egg-info +%{python3_sitelib}/sphinxcontrib_apidoc-%{version}-py%{python3_version}.egg-info %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 0.2.1-15 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Fri Dec 20 2024 Akhila Guruju - 0.3.0-15 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.3.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.3.0-13 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.3.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 0.3.0-9 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.3.0-6 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 0.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.3.0-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 15 2020 Joel Capitao - 0.3.0-1 +- Update to 0.3.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 0.2.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Miro Hrončok - 0.2.1-15 +- Rebuilt for Python 3.9 * Thu Jan 30 2020 Fedora Release Engineering - 0.2.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-uritemplate/python-uritemplate.signatures.json b/SPECS-EXTENDED/python-uritemplate/python-uritemplate.signatures.json index b7bff9c1d79..8a9492db363 100644 --- a/SPECS-EXTENDED/python-uritemplate/python-uritemplate.signatures.json +++ b/SPECS-EXTENDED/python-uritemplate/python-uritemplate.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "python-uritemplate-3.0.0.tar.gz": "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d" + "python-uritemplate-4.1.1.tar.gz": "64cae94edd83bbb0c2c49b15f2cb8192c3f8492af6bc468211d1e8b8496f5791" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-uritemplate/python-uritemplate.spec b/SPECS-EXTENDED/python-uritemplate/python-uritemplate.spec index 03c94c7b2ac..c21e28fae4c 100644 --- a/SPECS-EXTENDED/python-uritemplate/python-uritemplate.spec +++ b/SPECS-EXTENDED/python-uritemplate/python-uritemplate.spec @@ -1,25 +1,21 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %global modname uritemplate %global altname uritemplate.py %global _docdir_fmt %{name} Name: python-%{modname} -Version: 3.0.0 -Release: 13%{?dist} +Version: 4.1.1 +Release: 11%{?dist} Summary: Simple python library to deal with URI Templates (RFC 6570) -License: BSD +License: BSD or ASL 2.0 +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://%{modname}.readthedocs.io Source0: https://github.com/sigmavirus24/%{modname}/archive/%{version}/%{modname}-%{version}.tar.gz#/python-%{modname}-%{version}.tar.gz BuildArch: noarch -%if 0%{?with_check} -BuildRequires: python3-pip -%endif - %description %{summary}. @@ -30,7 +26,7 @@ Conflicts: python3-uri-templates %{?python_provide:%python_provide python3-%{altname}} BuildRequires: python3-devel BuildRequires: python3-setuptools - +BuildRequires: python3-pytest %description -n python3-%{modname} %{summary}. @@ -47,24 +43,71 @@ Python 3 version. %py3_install %check -pip3 install pytest -pip3 install . -py.test -v +PYTHONPATH=%{buildroot}%{python3_sitelib} py.test -v %files -n python3-%{modname} -%license LICENSE +%license LICENSE LICENSE.APACHE LICENSE.BSD %doc HISTORY.rst README.rst %{python3_sitelib}/%{modname}-*.egg-info/ %{python3_sitelib}/%{modname}/ %changelog -* Tue Apr 26 2022 Muhammad Falak - 3.0.0-13 -- Enable tests by removing build gates -- Drop BR on pytest & pip install latest deps to enable pytest -- License verified +* Mon Dec 23 2024 Akhila Guruju - 4.1.1-11 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 4.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 4.1.1-9 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 4.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 4.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 4.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 4.1.1-5 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 4.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 4.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 4.1.1-2 +- Rebuilt for Python 3.11 + +* Fri May 27 2022 Nick Bebout - 4.1.0-1 +- Update to 4.1.0 + +* Fri Jan 21 2022 Fedora Release Engineering - 3.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 3.0.1-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 3.0.1-5 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 3.0.1-2 +- Rebuilt for Python 3.9 -* Fri Oct 15 2021 Pawel Winogrodzki - 3.0.0-12 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Sun May 03 2020 Felix Schwarz - 3.0.1-1 +- update to 3.0.1 +- declare licensing correctly and include actual license files * Thu Jan 30 2020 Fedora Release Engineering - 3.0.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS-EXTENDED/python-xmltodict/python-xmltodict.signatures.json b/SPECS-EXTENDED/python-xmltodict/python-xmltodict.signatures.json index da04485af3b..6b0e5cf3de5 100644 --- a/SPECS-EXTENDED/python-xmltodict/python-xmltodict.signatures.json +++ b/SPECS-EXTENDED/python-xmltodict/python-xmltodict.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "xmltodict-0.12.0.tar.gz": "fc19d09c00e35ed92f961a679060dd1d20ece1914f8be7e7c8efddcd30b84250" + "python-xmltodict-0.13.0.tar.gz": "d74f4099d42bcca273ffd3bc9766abaa8765960eabc4399f2a6ad48cb4f58ce0" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/python-xmltodict/python-xmltodict.spec b/SPECS-EXTENDED/python-xmltodict/python-xmltodict.spec index 70a891764c1..5bc5837d2da 100644 --- a/SPECS-EXTENDED/python-xmltodict/python-xmltodict.spec +++ b/SPECS-EXTENDED/python-xmltodict/python-xmltodict.spec @@ -1,18 +1,16 @@ %global pypi_name xmltodict Name: python-xmltodict -Version: 0.12.0 -Release: 15%{?dist} +Version: 0.13.0 +Release: 6%{?dist} Summary: Python to transform XML to JSON -Vendor: Microsoft Corporation -Distribution: Azure Linux + License: MIT +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://github.com/martinblech/xmltodict -Source0: %{url}/archive/v%{version}/%{pypi_name}-%{version}.tar.gz +Source0: %{url}/archive/v%{version}/%{pypi_name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch -%if 0%{?with_check} -BuildRequires: python3-pip -%endif %description xmltodict is a Python module that makes working with XML feel like you are @@ -25,6 +23,7 @@ Summary: %{summary} BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: %{py3_dist pytest} %{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} @@ -43,8 +42,7 @@ Wikipedia. %py3_install %check -pip3 install nose -%{__python3} -m nose +%pytest -v %files -n python3-%{pypi_name} %doc README.md @@ -54,12 +52,45 @@ pip3 install nose %{python3_sitelib}/__pycache__/%{pypi_name}* %changelog -* Thu Apr 21 2022 Muhammad Falak - 0.12.0-15 -- Add an explicit BR on pip to enable ptest +* Fri Dec 20 2024 Akhila Guruju - 0.13.0-6 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 0.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.13.0-4 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 27 2023 Alfredo Moralejo - 0.13.0-1 +- Update to 0.13.0 + +* Fri Jul 21 2023 Fedora Release Engineering - 0.12.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.12.0-19 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.12.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.12.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.12.0-16 +- Rebuilt for Python 3.11 + +* Wed Mar 30 2022 Michel Alexandre Salim - 0.12.0-15 +- Switch tests from nose (deprecated) to pytest -* Mon Dec 27 2021 Suresh Babu Chalamalasetty - 0.12.0-14 -- Initial CBL-Mariner import from Fedora 35 (license: MIT) -- License verified +* Fri Jan 21 2022 Fedora Release Engineering - 0.12.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild * Fri Jul 23 2021 Fedora Release Engineering - 0.12.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/SPECS-EXTENDED/pywbem/0001-use-unittest-mock.patch b/SPECS-EXTENDED/pywbem/0001-use-unittest-mock.patch new file mode 100644 index 00000000000..09457112107 --- /dev/null +++ b/SPECS-EXTENDED/pywbem/0001-use-unittest-mock.patch @@ -0,0 +1,78 @@ +diff --git a/minimum-constraints.txt b/minimum-constraints.txt +index 570295ab..e771637b 100644 +--- a/minimum-constraints.txt ++++ b/minimum-constraints.txt +@@ -92,7 +92,6 @@ wheel==0.33.5; python_version >= '3.8' + # Direct dependencies for install (must be consistent with requirements.txt) + + M2Crypto==0.31.0 +-mock==2.0.0 + ordereddict==1.1 + ply==3.10 + PyYAML==3.11; python_version == '2.6' +diff --git a/pywbem_mock/_wbemconnection_mock.py b/pywbem_mock/_wbemconnection_mock.py +index aa27b305..3eedb330 100644 +--- a/pywbem_mock/_wbemconnection_mock.py ++++ b/pywbem_mock/_wbemconnection_mock.py +@@ -40,7 +40,7 @@ try: + from collections import Counter + except ImportError: + from backport_collections import Counter +-from mock import Mock ++from unittest.mock import Mock + import six + + # pylint: disable=ungrouped-imports +diff --git a/requirements.txt b/requirements.txt +index 3ac782d5..1e5cd238 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -11,9 +11,6 @@ + + # On Windows, M2Crypto must be installed via pywbem_os_setup.bat + M2Crypto>=0.31.0; python_version < '3.0' and sys_platform != 'win32' +-mock>=2.0.0,<3.0.0; python_version == '2.6' +-mock>=2.0.0,<4.0.0; python_version >= '2.7' and python_version <= '3.5' +-mock>=2.0.0; python_version >= '3.6' + ordereddict>=1.1; python_version == '2.6' + ply>=3.10 + # PyYAML 5.3 has removed support for Python 3.4; fixes narrow build error +diff --git a/tests/unittest/pywbem/test_cim_obj.py b/tests/unittest/pywbem/test_cim_obj.py +index 2f6b89d2..d3f8a9aa 100755 +--- a/tests/unittest/pywbem/test_cim_obj.py ++++ b/tests/unittest/pywbem/test_cim_obj.py +@@ -9,7 +9,7 @@ from __future__ import absolute_import, print_function + import sys + import re + from datetime import timedelta, datetime +-from mock import patch ++from unittest.mock import patch + try: + from collections import OrderedDict + except ImportError: +diff --git a/tests/unittest/pywbem/test_itermethods.py b/tests/unittest/pywbem/test_itermethods.py +index f7d0f8da..c613c3df 100644 +--- a/tests/unittest/pywbem/test_itermethods.py ++++ b/tests/unittest/pywbem/test_itermethods.py +@@ -24,7 +24,7 @@ from __future__ import absolute_import, print_function + import pytest + import six + +-from mock import Mock ++from unittest.mock import Mock + + # pylint: disable=wrong-import-position, wrong-import-order, invalid-name + from ...utils import import_installed +diff --git a/tests/unittest/pywbem/test_valuemapping.py b/tests/unittest/pywbem/test_valuemapping.py +index bf93b87c..263294a5 100644 +--- a/tests/unittest/pywbem/test_valuemapping.py ++++ b/tests/unittest/pywbem/test_valuemapping.py +@@ -7,7 +7,7 @@ from __future__ import absolute_import + + import re + import pytest +-from mock import Mock ++from unittest.mock import Mock + + # pylint: disable=wrong-import-position, wrong-import-order, invalid-name + from ...utils import import_installed diff --git a/SPECS-EXTENDED/pywbem/0002-coverity-deadcode.patch b/SPECS-EXTENDED/pywbem/0002-coverity-deadcode.patch new file mode 100644 index 00000000000..c5df2c54bfe --- /dev/null +++ b/SPECS-EXTENDED/pywbem/0002-coverity-deadcode.patch @@ -0,0 +1,15 @@ +diff --git a/pywbem/_recorder.py b/pywbem/_recorder.py +index f5b2b7d6..70de34fe 100644 +--- a/pywbem/_recorder.py ++++ b/pywbem/_recorder.py +@@ -689,8 +689,8 @@ class LogOperationRecorder(BaseOperationRecorder): + # Format the 'summary' and 'paths' detail_levels + if self.api_detail_level == 'summary': # pylint: disable=R1705 + if isinstance(ret, list): +- if ret: +- ret_type = type(ret[0]).__name__ if ret else "" ++ if len(ret) > 0: ++ ret_type = type(ret[0]).__name__ + return _format("list of {0}; count={1}", + ret_type, len(ret)) + return "Empty" diff --git a/SPECS-EXTENDED/pywbem/0003-coverity-forward-null.patch b/SPECS-EXTENDED/pywbem/0003-coverity-forward-null.patch new file mode 100644 index 00000000000..acea02cc156 --- /dev/null +++ b/SPECS-EXTENDED/pywbem/0003-coverity-forward-null.patch @@ -0,0 +1,12 @@ +diff --git a/pywbem/_cim_obj.py b/pywbem/_cim_obj.py +index d91a2cb1..5c9a69a5 100644 +--- a/pywbem/_cim_obj.py ++++ b/pywbem/_cim_obj.py +@@ -1954,6 +1954,7 @@ class CIMInstanceName(_CIMComparisonMixin): + _format("WBEM URI has an invalid format for its keybindings: " + "{0!A}", keybindings_str)) + ++ kb_assigns = [] + if m.group(1): + kb_assigns = [m.group(1)] + diff --git a/SPECS-EXTENDED/pywbem/0004-coverity-identifier-typo.patch b/SPECS-EXTENDED/pywbem/0004-coverity-identifier-typo.patch new file mode 100644 index 00000000000..f394ea45f00 --- /dev/null +++ b/SPECS-EXTENDED/pywbem/0004-coverity-identifier-typo.patch @@ -0,0 +1,19 @@ +diff --git a/pywbem/_cim_xml.py b/pywbem/_cim_xml.py +index 133b070d..c0ad603e 100644 +--- a/pywbem/_cim_xml.py ++++ b/pywbem/_cim_xml.py +@@ -1829,12 +1829,12 @@ class RESPONSEDESTINATION(CIMElement): + + :: + +- ++ + """ + + def __init__(self, data): + # We use call by class name because it is an old-style class. +- CIMElement.__init__(self, 'RESPONSEDESTINATON') ++ CIMElement.__init__(self, 'RESPONSEDESTINATION') + self.appendChild(data) + + diff --git a/SPECS-EXTENDED/pywbem/0005-python3_12.patch b/SPECS-EXTENDED/pywbem/0005-python3_12.patch new file mode 100644 index 00000000000..0315f04f8b5 --- /dev/null +++ b/SPECS-EXTENDED/pywbem/0005-python3_12.patch @@ -0,0 +1,216 @@ +diff --git a/pywbem/_cim_http.py b/pywbem/_cim_http.py +index b6080058..2779d7aa 100644 +--- a/pywbem/_cim_http.py ++++ b/pywbem/_cim_http.py +@@ -57,22 +57,12 @@ from ._utils import _ensure_unicode, _ensure_bytes, _format + + _ON_RTD = os.environ.get('READTHEDOCS', None) == 'True' + +-if six.PY2 and not _ON_RTD: # RTD has no swig to install M2Crypto +- # pylint: disable=wrong-import-order,wrong-import-position +- from M2Crypto import SSL +- from M2Crypto.Err import SSLError +- from M2Crypto.m2 import OPENSSL_VERSION_TEXT as OPENSSL_VERSION +- _HAVE_M2CRYPTO = True +- # pylint: disable=invalid-name +- SocketErrors = (socket.error, socket.sslerror) +-else: +- # pylint: disable=wrong-import-order,wrong-import-position +- import ssl as SSL +- from ssl import SSLError, CertificateError +- from ssl import OPENSSL_VERSION +- _HAVE_M2CRYPTO = False +- # pylint: disable=invalid-name +- SocketErrors = (socket.error,) ++# pylint: disable=wrong-import-order ++import ssl as SSL ++from ssl import SSLError, CertificateError ++from ssl import OPENSSL_VERSION ++# pylint: disable=invalid-name ++SocketErrors = (socket.error,) + + __all__ = ['DEFAULT_CA_CERT_PATHS'] + +@@ -519,12 +509,25 @@ def wbem_request(url, data, creds, cimxml_headers=None, debug=False, x509=None, + # Note: We do not use strict=True in the following call, because it + # is not clear what side effects that would have, and if no status + # line comes back we'll certainly find out about that. ++ ssl_context = SSL.create_default_context(purpose=SSL.Purpose.SERVER_AUTH) ++ ssl_context.check_hostname = False ++ ++ if no_verification: ++ ssl_context.verify_mode = SSL.CERT_NONE ++ ++ if cert_file and key_file: ++ ssl_context.load_cert_chain(cert_file, key_file) ++ ++ if ca_certs: ++ ssl_context.load_verify_locations(ca_certs) ++ ++ # 3.12 removed key_file, cert_file, etc. + httplib.HTTPSConnection.__init__(self, host=host, port=port, +- key_file=key_file, +- cert_file=cert_file, ++ context=ssl_context, + timeout=timeout) + self.ca_certs = ca_certs + self.verify_callback = verify_callback ++ self.ctx = ssl_context + # issue 297: Verify_callback is not used in py 3 + if verify_callback is not None and six.PY3: + warnings.warn("The 'verify_callback' parameter was specified " +@@ -534,137 +537,25 @@ def wbem_request(url, data, creds, cimxml_headers=None, debug=False, x509=None, + def connect(self): + # pylint: disable=too-many-branches + """Connect to a host on a given (SSL) port.""" ++ # set up the socket ++ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ++ sock.settimeout(self.timeout) + +- # Connect for M2Crypto ssl package +- if _HAVE_M2CRYPTO: +- # Calling httplib.HTTPSConnection.connect(self) does not work +- # because of its ssl.wrap_socket() call. So we copy the code of +- # that connect() method modulo the ssl.wrap_socket() call. +- +- # Another change is that we do not pass the timeout value +- # on to the socket call, because that does not work with +- # M2Crypto. +- +- if sys.version_info[0:2] >= (2, 7): +- # the source_address parameter was added in Python 2.7 +- self.sock = socket.create_connection( +- (self.host, self.port), None, self.source_address) +- else: +- self.sock = socket.create_connection( +- (self.host, self.port), None) +- +- # Removed code for tunneling support. +- +- # End of code from httplib.HTTPSConnection.connect(self). +- +- ctx = SSL.Context('sslv23') +- +- if self.cert_file: +- ctx.load_cert(self.cert_file, keyfile=self.key_file) +- if self.ca_certs: +- ctx.set_verify( +- SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, +- depth=9, callback=verify_callback) +- # M2Crypto requires binary strings as path names and +- # otherwise raises TypeError. +- ca_certs = _ensure_bytes(self.ca_certs) +- if os.path.isdir(self.ca_certs): +- ctx.load_verify_locations(capath=ca_certs) +- else: +- ctx.load_verify_locations(cafile=ca_certs) +- try: +- self.sock = SSL.Connection(ctx, self.sock) +- +- # Below is a body of SSL.Connection.connect() method +- # except for the first line (socket connection). +- +- # Removed code for tunneling support. +- +- # Setting the timeout on the input socket does not work +- # with M2Crypto, with such a timeout set it calls a +- # different low level function (nbio instead of bio) +- # that does not work. The symptom is that reading the +- # response returns None. +- # Therefore, we set the timeout at the level of the outer +- # M2Crypto socket object. +- # pylint: disable=using-constant-test +- +- if self.timeout is not None: +- self.sock.set_socket_read_timeout( +- SSL.timeout(self.timeout)) +- self.sock.set_socket_write_timeout( +- SSL.timeout(self.timeout)) +- +- self.sock.addr = (self.host, self.port) +- self.sock.setup_ssl() +- self.sock.set_connect_state() +- ret = self.sock.connect_ssl() +- if self.ca_certs: +- check = getattr(self.sock, 'postConnectionCheck', +- self.sock.clientPostConnectionCheck) +- if check is not None: +- if not check(self.sock.get_peer_cert(), self.host): +- raise ConnectionError( +- 'SSL error: post connection check failed', +- conn_id=conn_id) +- return ret +- +- except (SSLError, SSL.SSLError, +- SSL.Checker.SSLVerificationError) as arg: +- raise ConnectionError( +- _format("SSL error {0}: {1}; OpenSSL version: {2}", +- arg.__class__, arg, OPENSSL_VERSION), +- conn_id=conn_id) +- +- # Connect using Python SSL module +- else: +- # Setup the socket context +- +- # Note: PROTOCOL_SSLv23 allows talking to servers with TLS but +- # not with SSL. For details, see the table in +- # https://docs.python.org/3/library/ssl.html#ssl.wrap_socket +- # Within the defined set of protocol versions, SSLv23 selects +- # the highest protocol version that both client and server +- # support. +- # Issue #893: Consider the use of default_context() +- ctx = SSL.SSLContext(SSL.PROTOCOL_SSLv23) +- +- if self.cert_file: +- ctx.load_cert_chain(self.cert_file, keyfile=self.key_file) +- if self.ca_certs: +- # We need to use CERT_REQUIRED to require that the server +- # certificate is being validated by the client (against the +- # certificates in ca_certs). +- ctx.verify_mode = SSL.CERT_REQUIRED +- if os.path.isdir(self.ca_certs): +- ctx.load_verify_locations(capath=self.ca_certs) +- else: +- ctx.load_verify_locations(cafile=self.ca_certs) +- ctx.check_hostname = True +- else: +- ctx.check_hostname = False +- ctx.verify_mode = SSL.CERT_NONE +- +- # setup the socket +- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +- sock.settimeout(self.timeout) +- +- try: +- self.sock = ctx.wrap_socket(sock, +- server_hostname=self.host) +- return self.sock.connect((self.host, self.port)) ++ try: ++ self.sock = self.ctx.wrap_socket(sock) ++ return self.sock.connect((self.host, self.port)) + +- except SSLError as arg: +- raise ConnectionError( +- _format("SSL error {0}: {1}; OpenSSL version: {2}", +- arg.__class__, arg, OPENSSL_VERSION), +- conn_id=conn_id) +- except CertificateError as arg: +- raise ConnectionError( +- _format("SSL certificate error {0}: {1}; " +- "OpenSSL version: {2}", +- arg.__class__, arg, OPENSSL_VERSION), +- conn_id=conn_id) ++ except SSLError as arg: ++ raise ConnectionError( ++ _format("SSL error {0}: {1}; OpenSSL version: {2}", ++ arg.__class__, arg, OPENSSL_VERSION), ++ conn_id=conn_id) ++ except CertificateError as arg: ++ raise ConnectionError( ++ _format("SSL certificate error {0}: {1}; " ++ "OpenSSL version: {2}", ++ arg.__class__, arg, OPENSSL_VERSION), ++ conn_id=conn_id) + + class FileHTTPConnection(HTTPBaseConnection, httplib.HTTPConnection): + """Execute client connection based on a unix domain socket. """ diff --git a/SPECS-EXTENDED/pywbem/pywbem.signatures.json b/SPECS-EXTENDED/pywbem/pywbem.signatures.json index 684443b3ed2..dc97127493e 100644 --- a/SPECS-EXTENDED/pywbem/pywbem.signatures.json +++ b/SPECS-EXTENDED/pywbem/pywbem.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "pywbem-0.15.0.tar.gz": "6a08ae720bb6b3f6f4eaa69e6505037e8ca4031aee3ae5560be310591fe44a28" + "pywbem-0.17.6.tar.gz": "a36404f6f95f8c88bf996e183c7b6121e2046cb19df894f0ea2601b50006a70d" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/pywbem/pywbem.spec b/SPECS-EXTENDED/pywbem/pywbem.spec index 475351efce6..c58c3a7477e 100644 --- a/SPECS-EXTENDED/pywbem/pywbem.spec +++ b/SPECS-EXTENDED/pywbem/pywbem.spec @@ -1,17 +1,26 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %{?python_enable_dependency_generator} Name: pywbem -Version: 0.15.0 -Release: 3%{?dist} +Version: 0.17.6 +Epoch: 1 +Release: 12%{?dist} Summary: Python WBEM client interface and related utilities -License: LGPLv2 +License: LGPL-2.1-or-later +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://github.com/pywbem/pywbem -Source0: https://github.com/pywbem/pywbem/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: python3-pip python3-PyYAML python3-ply python3-rpm-macros -BuildRequires: python3-pbr +Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch1: 0001-use-unittest-mock.patch +Patch2: 0002-coverity-deadcode.patch +Patch3: 0003-coverity-forward-null.patch +Patch4: 0004-coverity-identifier-typo.patch +Patch5: 0005-python3_12.patch +BuildRequires: python3-pip +BuildRequires: python3-PyYAML +BuildRequires: python3-ply +BuildRequires: python3-rpm-macros BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildArch: noarch %description @@ -41,15 +50,14 @@ for more information about WBEM. %prep %setup -q -n %{name}-%{version} +%autosetup -p1 %build -PBR_VERSION="%{version}" CFLAGS="%{optflags}" %{__python3} setup.py build - +CFLAGS="%{optflags}" %{__python3} setup.py build %install rm -rf %{buildroot} env PYTHONPATH=%{buildroot}/%{python3_sitelib} \ - PBR_VERSION="%{version}" \ %{__python3} setup.py install -O1 --skip-build --root %{buildroot} rm -rf %{buildroot}/usr/bin/*.bat # wbemcli are conflicting with sblim-wbemcli @@ -68,11 +76,62 @@ mv -v %{buildroot}/%{_bindir}/wbemcli.py %{buildroot}/%{_bindir}/pywbemcli.py %doc README.rst %changelog -* Fri Oct 29 2021 Muhammad Falak - 0.15.0-3 -- Remove epoch +* Fri Dec 20 2024 Akhila Guruju - 1:0.17.6-12 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 1:0.17.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 1:0.17.6-10 +- Rebuilt for Python 3.13 + +* Wed Mar 13 2024 Tony Asleson - 1:0.17.6-9 +- Changes to support python 3.12 + +* Fri Jan 26 2024 Fedora Release Engineering - 1:0.17.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1:0.17.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Tony Asleson - 1:0.17.6-6 +- migrated to SPDX license + +* Tue Jun 13 2023 Python Maint - 1:0.17.6-5 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 1:0.17.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1:0.17.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1:0.17.6-2 +- Rebuilt for Python 3.11 + +* Tue Apr 12 2022 Tony Asleson - 1:0.17.6-1 +- Update to 0.17.6 which is the latest release that doesn't introduce + dependencies which we don't have available. + +* Fri Jan 21 2022 Fedora Release Engineering - 1:0.15.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 1:0.15.0-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 23 2021 Tony Asleson - 1:0.15.0-5 +- Remove python pbr build dependency + +* Fri Jun 04 2021 Python Maint - 1:0.15.0-4 +- Rebuilt for Python 3.10 + +* Tue Feb 9 2021 Tony Asleson 1:0.15.0-3 +- https://bugzilla.redhat.com/show_bug.cgi?id=1922368 -* Fri Oct 15 2021 Pawel Winogrodzki - 1:0.15.0-2 -- Initial CBL-Mariner import from Fedora 33 (license: MIT). +* Wed Jan 27 2021 Fedora Release Engineering - 1:0.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Fri Oct 23 2020 Tony Asleson - 0.15.0-1 - Update to 0.15.0 for python 3.8 fixes diff --git a/SPECS-EXTENDED/re2c/re2c.signatures.json b/SPECS-EXTENDED/re2c/re2c.signatures.json index 81fb7fc38a1..af78d053db4 100644 --- a/SPECS-EXTENDED/re2c/re2c.signatures.json +++ b/SPECS-EXTENDED/re2c/re2c.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "re2c-2.0.tar.xz": "89a9d7ee14be10e3779ea7b2c8ea4a964afce6e76b8dbcd5479940681db46d20" + "re2c-3.1.tar.xz": "0ac299ad359e3f512b06a99397d025cfff81d3be34464ded0656f8a96676c029" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/re2c/re2c.spec b/SPECS-EXTENDED/re2c/re2c.spec index 6319237cc16..4b5610fdb23 100644 --- a/SPECS-EXTENDED/re2c/re2c.spec +++ b/SPECS-EXTENDED/re2c/re2c.spec @@ -1,14 +1,17 @@ -Summary: Tool for generating C-based recognizers from regular expressions -Name: re2c -Version: 2.0 -Release: 1%{?dist} -License: Public Domain +Summary: Tool for generating C, C++, and go recognizers from regular expressions +Name: re2c +Version: 3.1 +Release: 4%{?dist} +License: Public Domain Vendor: Microsoft Corporation Distribution: Azure Linux -URL: https://re2c.org/ -Source: https://github.com/skvadrik/re2c/releases/download/%{version}/re2c-%{version}.tar.xz -BuildRequires: gcc -BuildRequires: gcc-c++ +URL: https://re2c.org/ +Source: https://github.com/skvadrik/re2c/releases/download/%{version}/%{name}-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: make +BuildRequires: python3 %description re2c is a tool for writing very fast and very flexible scanners. Unlike any @@ -35,17 +38,56 @@ make tests %license LICENSE %doc CHANGELOG README.md examples/ doc/* %{_bindir}/re2c +%{_bindir}/re2go +%{_bindir}/re2rust +%{_datadir}/re2c/ %{_mandir}/man1/re2c.1* -%{_datadir}/re2c/stdlib/unicode_categories.re +%{_mandir}/man1/re2go.1* +%{_mandir}/man1/re2rust.1* %changelog -* Mon Sep 18 2023 Andrew Phelps - 2.0-1 -- Upgrade to version 2.0 -- Lint spec -- License verified +* Thu Dec 19 2024 Akhila Guruju - 3.1-4 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 26 2024 Orion Poplawski - 3.1-1 +- Update to 3.1 + +* Mon Jan 22 2024 Fedora Release Engineering - 2.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 2.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Oct 15 2021 Pawel Winogrodzki - 1.1.1-5 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Sat Jul 23 2022 Fedora Release Engineering - 2.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jun 13 2021 Kyle Lexmond - 2.1.1-1 +- Update to 2.1.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Sep 9 21:15:59 MDT 2020 Orion Poplawski - 2.0.3-1 +- Update to 2.0.3 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Thu Jan 30 2020 Fedora Release Engineering - 1.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -148,3 +190,4 @@ make tests * Thu May 03 2007 Dag Wieers - 0.12.0-1 - Initial version. + diff --git a/SPECS-EXTENDED/recode/0001-src-task.c-only-close-input-stream-when-we-opened-it.patch b/SPECS-EXTENDED/recode/0001-src-task.c-only-close-input-stream-when-we-opened-it.patch new file mode 100644 index 00000000000..3ebd1c00709 --- /dev/null +++ b/SPECS-EXTENDED/recode/0001-src-task.c-only-close-input-stream-when-we-opened-it.patch @@ -0,0 +1,31 @@ +From 80516f601ce5f1cee44848615dffe4252f2d205f Mon Sep 17 00:00:00 2001 +From: Reuben Thomas +Date: Fri, 17 Feb 2023 12:52:19 +0000 +Subject: [PATCH] src/task.c: only close input stream when we opened it (fix + #48) + +Thanks to Remi Collet for the bug report and fix. +--- + src/task.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/task.c b/src/task.c +index 2977a03..e302858 100644 +--- a/src/task.c ++++ b/src/task.c +@@ -353,9 +353,10 @@ recode_perform_task (RECODE_TASK task) + SUBTASK_RETURN (subtask); + } + +- /* Close the input file. */ ++ /* Close the input file when we opened it. */ + +- if (subtask->input.file) ++ if (subtask->input.file && subtask->input.name && ++ subtask->input.name[0]) + fclose (subtask->input.file); + } + #endif +-- +2.39.1 + diff --git a/SPECS-EXTENDED/recode/recode-3.7.1-Rename-coliding-hash-functions.patch b/SPECS-EXTENDED/recode/recode-3.7.1-Rename-coliding-hash-functions.patch deleted file mode 100644 index b97e1069260..00000000000 --- a/SPECS-EXTENDED/recode/recode-3.7.1-Rename-coliding-hash-functions.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 170857800f2a84b4cdb8fefe9a698efe5509837a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 16 Aug 2019 09:29:54 +0200 -Subject: [PATCH] Rename coliding hash functions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Ported from Fedora recode patch: - - commit 5cd1d43a39e4679ed265efcdf4bdc3da517e3de5 (tag: recode-3_6-16) - Author: Bill Nottingham - Date: Fri May 27 02:52:25 2005 +0000 - - auto-import recode-3.6-16 on branch devel from recode-3.6-16.src.rpm - -Signed-off-by: Petr Písař ---- - lib/hash.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/hash.h b/lib/hash.h -index 562f5e6..65d967e 100644 ---- a/lib/hash.h -+++ b/lib/hash.h -@@ -24,6 +24,11 @@ - #ifndef HASH_H_ - # define HASH_H_ - -+#define hash_lookup recode_hash_lookup -+#define hash_delete recode_hash_delete -+#define hash_free recode_hash_free -+#define hash_insert recode_hash_insert -+ - # include - # include - --- -2.21.0 - diff --git a/SPECS-EXTENDED/recode/recode-3.7.13-Rename-coliding-hash-functions.patch b/SPECS-EXTENDED/recode/recode-3.7.13-Rename-coliding-hash-functions.patch new file mode 100644 index 00000000000..aa545aa5145 --- /dev/null +++ b/SPECS-EXTENDED/recode/recode-3.7.13-Rename-coliding-hash-functions.patch @@ -0,0 +1,15 @@ +diff -ur a/lib/hash.h b/lib/hash.h +--- a/lib/hash.h 2023-01-04 23:06:45.000000000 +0100 ++++ b/lib/hash.h 2023-01-17 13:04:05.200398680 +0100 +@@ -24,6 +24,11 @@ + #ifndef HASH_H_ + # define HASH_H_ + ++#define hash_lookup recode_hash_lookup ++#define hash_delete recode_hash_delete ++#define hash_free recode_hash_free ++#define hash_insert recode_hash_insert ++ + # include + + # ifdef __cplusplus diff --git a/SPECS-EXTENDED/recode/recode.signatures.json b/SPECS-EXTENDED/recode/recode.signatures.json index 261f2cef679..52e7e902f9c 100644 --- a/SPECS-EXTENDED/recode/recode.signatures.json +++ b/SPECS-EXTENDED/recode/recode.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "recode-3.7.7.tar.gz": "0946f63b706719e6aa74ea5c0c2276c265ca1ced2cb44e05f2b5654c0e7f38fb" + "recode-3.7.14.tar.gz": "786aafd544851a2b13b0a377eac1500f820ce62615ccc2e630b501e7743b9f33" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/recode/recode.spec b/SPECS-EXTENDED/recode/recode.spec index 6e106f22557..20dfcbbb2c0 100644 --- a/SPECS-EXTENDED/recode/recode.spec +++ b/SPECS-EXTENDED/recode/recode.spec @@ -1,8 +1,6 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux Name: recode -Version: 3.7.7 -Release: 2%{?dist} +Version: 3.7.14 +Release: 7%{?dist} Summary: Conversion between character sets and surfaces # COPYING: GPLv3 text # COPYING-LIB: LGPLv3 text @@ -52,11 +50,15 @@ Summary: Conversion between character sets and surfaces # tests/Makefile.am: GPLv3+ # tests/Makefile.in: FSFULLR and GPLv3+ # tests/Recode.pyx: GPLv3+ -License: GPLv3+ and LGPLv3+ and BSD and OFSFDL -URL: https://github.com/rrthomas/recode -Source: %{url}/releases/download/v%{version}/recode-%{version}.tar.gz -# Make internal hash function identifiers unique -Patch0: recode-3.7.1-Rename-coliding-hash-functions.patch +License: GPL-3.0-or-later AND LGPL-3.0-or-later AND BSD-2-Clause AND LicenseRef-OFSFDL +Vendor: Microsoft Corporation +Distribution: Azure Linux +URL: https://github.com/rrthomas/recode +Source: %{url}/releases/download/v%{version}/recode-%{version}.tar.gz +Patch0: recode-3.7.13-Rename-coliding-hash-functions.patch +# https://github.com/rrthomas/recode/issues/48 +Patch1: 0001-src-task.c-only-close-input-stream-when-we-opened-it.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: coreutils @@ -70,6 +72,7 @@ BuildRequires: texinfo # Tests: BuildRequires: python3-Cython BuildRequires: python3-devel >= 3.7.5 +BuildRequires: python3-setuptools %description The recode tool and library convert files between character sets and surfaces. @@ -81,15 +84,14 @@ character or falls back on an approximations. %package devel Summary: Header files for development using recode library # Header files are LGPLv3+ -License: LGPLv3+ +License: LGPL-3.0-or-later Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the header files for a recode library. %prep -%setup -q -%patch 0 -p1 +%autosetup -p1 -n %{name}-%{version} autoreconf -fi %build @@ -132,15 +134,74 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_includedir}/* %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 3.7.7-2 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Tue Dec 17 2024 Akhila Guruju - 3.7.14-7 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Fri Jul 19 2024 Fedora Release Engineering - 3.7.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 17 2024 Miroslav Suchý - 3.7.14-5 +- convert license to SPDX + +* Fri Jan 26 2024 Fedora Release Engineering - 3.7.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 3.7.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 3.7.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Feb 22 2023 Ondrej Pohorelsky - 3.7.14-1 +- 3.7.14 bump +- Adds upstream patch to prevent double free +- Require python3-setuptools unconditionaly +- Resolves: rhbz#2170818, rhbz#2166136 + +* Tue Jan 17 2023 Ondrej Pohorelsky - 3.7.13-1 +- 3.7.13 bump +- Resolves: rhbz#2158811 + +* Thu Oct 27 2022 Ondrej Pohorelsky - 3.7.12-3 +- Adds BuildRequire for Python 3.12 + +* Sat Jul 23 2022 Fedora Release Engineering - 3.7.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Feb 21 2022 Ondrej Pohorelsky - 3.7.12-1 +- 3.7.12 bump +- Resolves: rhbz#2055897 + +* Tue Feb 08 2022 Ondrej Pohorelsky - 3.7.11-1 +- 3.7.11 bump +- Resolves: rhbz#2043834 + +* Fri Jan 21 2022 Fedora Release Engineering - 3.7.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.7.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 08 2021 Ondrej Pohorelsky - 3.7.9-1 +- 3.7.9 bump +- Resolves: rhbz#1967383 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.7.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 12 2020 Ondrej Pohorelsky - 3.7.8-1 +- 3.7.8 bump * Thu Jul 30 2020 Petr Pisar - 3.7.7-1 - 3.7.7 bump -* Wed Jul 29 2020 Petr Pisar - 3.7.6-3 +* Wed Jul 29 2020 Petr Pisar - 3.7.6-4 - Correct a description +* Wed Jul 29 2020 Fedora Release Engineering - 3.7.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 3.7.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -327,3 +388,4 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la * Tue Nov 13 2001 Than Ngo 3.6-1 - initial RPM for 8.0 + diff --git a/SPECS-EXTENDED/volume_key/volume_key-0.3.12-fix_resource_leaks.patch b/SPECS-EXTENDED/volume_key/volume_key-0.3.12-fix_resource_leaks.patch new file mode 100644 index 00000000000..31d69d71096 --- /dev/null +++ b/SPECS-EXTENDED/volume_key/volume_key-0.3.12-fix_resource_leaks.patch @@ -0,0 +1,59 @@ +diff --git a/lib/kmip.c b/lib/kmip.c +index dda819a..333603c 100644 +--- a/lib/kmip.c ++++ b/lib/kmip.c +@@ -1152,6 +1152,7 @@ kmip_decode_key_value (struct kmip_decoding_state *kmip, + break; + + default: ++ kmip_key_value_free (res); + g_return_val_if_reached (-1); + } + res->attributes = g_ptr_array_new (); +@@ -1348,6 +1349,7 @@ kmip_decode_object_symmetric_key (struct kmip_decoding_state *kmip, + g_snprintf (num, sizeof (num), "%" G_GUINT32_FORMAT, res->block->type); + g_set_error (error, LIBVK_ERROR, LIBVK_ERROR_KMIP_UNSUPPORTED_VALUE, + _("Unsupported symmetric key format %s"), num); ++ kmip_object_symmetric_key_free (res); + return -1; + } + *obj = res; +@@ -1384,6 +1386,7 @@ kmip_decode_object_secret_data (struct kmip_decoding_state *kmip, + g_snprintf (num, sizeof (num), "%" G_GUINT32_FORMAT, res->block->type); + g_set_error (error, LIBVK_ERROR, LIBVK_ERROR_KMIP_UNSUPPORTED_VALUE, + _("Unsupported symmetric key format %s"), num); ++ kmip_object_secret_data_free (res); + return -1; + } + *obj = res; +diff --git a/lib/volume_luks.c b/lib/volume_luks.c +index d1c5d47..4d32d9b 100644 +--- a/lib/volume_luks.c ++++ b/lib/volume_luks.c +@@ -547,8 +547,8 @@ luks_apply_secret (struct libvk_volume *vol, const struct libvk_volume *packet, + } + g_free (last_log_entry); + +- g_return_val_if_fail (vol->v.luks->key_bytes == packet->v.luks->key_bytes, +- -1); ++ if (vol->v.luks->key_bytes != packet->v.luks->key_bytes) ++ goto err_passphrase; + luks_replace_key (vol, packet->v.luks->key); + luks_replace_passphrase (vol, passphrase); + vol->v.luks->passphrase_slot = res; +diff --git a/src/volume_key.c b/src/volume_key.c +index 074b187..24b70d6 100644 +--- a/src/volume_key.c ++++ b/src/volume_key.c +@@ -735,6 +735,11 @@ write_packet (struct packet_output_state *pos, const char *filename, + || g_file_set_contents (filename, packet, size, error) == FALSE) + { + g_prefix_error (error, _("Error creating `%s': "), filename); ++ if (packet != NULL) { ++ if (output_format_cleartext != 0) ++ memset (packet, 0, size); ++ g_free (packet); ++ } + return -1; + } + if (output_format_cleartext != 0) diff --git a/SPECS-EXTENDED/volume_key/volume_key.spec b/SPECS-EXTENDED/volume_key/volume_key.spec index e51b3059c63..6bfab43752a 100644 --- a/SPECS-EXTENDED/volume_key/volume_key.spec +++ b/SPECS-EXTENDED/volume_key/volume_key.spec @@ -23,7 +23,7 @@ Distribution: Azure Linux Summary: An utility for manipulating storage encryption keys and passphrases Name: volume_key Version: 0.3.12 -Release: 8%{?dist} +Release: 9%{?dist} # lib/{SECerrs,SSLerrs}.h are both licensed under MPLv1.1, GPLv2 and LGPLv2 License: GPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) URL: https://pagure.io/%{name}/ @@ -33,9 +33,24 @@ Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz # Support all LUKS devices # - backport of 26c09768662d8958debe8c9410dae9fda02292c3 Patch0: volume_key-0.3.12-support_LUKS2_and_more.patch +# Fix resource leaks +# - backport of bf6618ec0b09b4e51fc97fa021e687fbd87599ba +Patch1: volume_key-0.3.12-fix_resource_leaks.patch + BuildRequires: gcc -BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, /usr/bin/gpg2 -BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python3-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: make + +BuildRequires: cryptsetup-luks-devel +BuildRequires: gettext-devel +BuildRequires: glib2-devel +BuildRequires: /usr/bin/gpg2 +BuildRequires: gpgme-devel +BuildRequires: libblkid-devel +BuildRequires: nss-devel +BuildRequires: python3-devel %if 0%{?drop_python2} < 1 BuildRequires: python2-devel %endif @@ -105,15 +120,15 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %endif %prep -%setup -q -%patch 0 -p1 +%autosetup -p1 +autoreconf -fiv %build %configure %{?with_pythons} -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +%make_install # Remove libtool archive find %{buildroot} -type f -name "*.la" -delete @@ -157,6 +172,10 @@ exit 1; \ %endif %changelog +* Wed Nov 06 2024 Jyoti Kanase - 0.3.12-9 +- added patch to fix resource leaks +- License Verified + * Mon Mar 16 2021 Henry Li - 0.3.12-8 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Disable python2 build and enable python3 build diff --git a/SPECS-EXTENDED/xapian-core/xapian-core.signatures.json b/SPECS-EXTENDED/xapian-core/xapian-core.signatures.json index 20e29d89954..68f32788a30 100644 --- a/SPECS-EXTENDED/xapian-core/xapian-core.signatures.json +++ b/SPECS-EXTENDED/xapian-core/xapian-core.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "xapian-core-1.4.20.tar.xz": "ce2be5eff72075c8106c0340e70b1093dbcebe2ab42dc1c1be08dd3ad419442d" + "xapian-core-1.4.26.tar.xz": "9e6a7903806966d16ce220b49377c9c8fad667c8f0ffcb23a3442946269363a7" } } diff --git a/SPECS-EXTENDED/xapian-core/xapian-core.spec b/SPECS-EXTENDED/xapian-core/xapian-core.spec index e07c633922e..9d14ca2e3f5 100644 --- a/SPECS-EXTENDED/xapian-core/xapian-core.spec +++ b/SPECS-EXTENDED/xapian-core/xapian-core.spec @@ -1,29 +1,38 @@ -Summary: The Xapian Probabilistic Information Retrieval Library -Name: xapian-core -Version: 1.4.20 -Release: 2%{?dist} -License: GPLv2+ -Vendor: Microsoft Corporation -Distribution: Azure Linux -URL: https://www.xapian.org/ -Source0: https://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: libuuid-devel -BuildRequires: make -BuildRequires: zlib-devel -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%if 0%{?with_check} -BuildRequires: valgrind-devel +# Currently fails on s390x and ARMv7 +%if ! 0%{?_module_build} +%global with_tests 0 +%else +%global with_tests 0 %endif +Name: xapian-core +Version: 1.4.26 +Release: 2%{?dist} +Summary: The Xapian Probabilistic Information Retrieval Library +License: GPL-2.0-or-later +Vendor: Microsoft Corporation +Distribution: Azure Linux +URL: https://www.xapian.org/ +Source0: https://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libuuid-devel +BuildRequires: make +BuildRequires: zlib-devel +%if 0%{?with_tests} +BuildRequires: valgrind-devel +%endif +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + + %description Xapian is an Open Source Probabilistic Information Retrieval Library. It offers a highly adaptable toolkit that allows developers to easily add advanced indexing and search facilities to applications %package libs -Summary: Xapian search engine libraries +Summary: Xapian search engine libraries %description libs Xapian is an Open Source Probabilistic Information Retrieval framework. It @@ -32,10 +41,10 @@ indexing and search facilities to applications. This package provides the libraries for applications using Xapian functionality %package devel -Summary: Files needed for building packages which use Xapian -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: libuuid-devel +Summary: Files needed for building packages which use Xapian +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: libuuid-devel %description devel Xapian is an Open Source Probabilistic Information Retrieval framework. It @@ -49,19 +58,21 @@ files needed for building packages which use Xapian %build %configure -%make_build +%{make_build} %install -%make_install +%{make_install} # Remove libtool archives -find %{buildroot} -type f -name "*.la" -delete -print +find $RPM_BUILD_ROOT -name '*.la' -delete # Remove the dev docs, we pick them up below rm -rf %{buildroot}%{_datadir}/doc/%{name} +%if 0%{?with_tests} %check make check %{?_smp_mflags} +%endif %ldconfig_scriptlets libs @@ -94,10 +105,34 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog -* Tue Jan 03 2023 Sumedh Sharma - 1.4.20-2 -- Initial CBL-Mariner import from Fedora 37 (license: MIT) +* Tue Jan 14 2025 Aninda Pradhan - 1.4.26-2 +- Initial Azure Linux import from Fedora 41 (license: MIT) - License verified +* Fri Aug 16 2024 Peter Robinson - 1.4.26-1 +- Update to 1.4.26 + +* Sat Jul 20 2024 Fedora Release Engineering - 1.4.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.4.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jul 25 2023 Peter Robinson - 1.4.23-1 +- Update 1.4.23 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.4.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu May 18 2023 Peter Robinson - 1.4.22-1 +- Update to 1.4.22 + +* Tue Feb 21 2023 Than Ngo - 1.4.20-3 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Aug 02 2022 Peter Robinson - 1.4.20-1 - Update to 1.4.20 diff --git a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec index 78375e11dae..bedc670bb82 100644 --- a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec +++ b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec @@ -45,7 +45,7 @@ Summary: %{_name} Driver Name: %{_name} Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://nvidia.com Group: System Environment/Base @@ -112,6 +112,12 @@ fi # 1 : closed %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/iser-signed/iser-signed.spec b/SPECS-SIGNED/iser-signed/iser-signed.spec index 55edb4172e6..d68100538b2 100644 --- a/SPECS-SIGNED/iser-signed/iser-signed.spec +++ b/SPECS-SIGNED/iser-signed/iser-signed.spec @@ -41,7 +41,7 @@ Summary: %{_name} Driver Name: %{_name} Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -103,6 +103,12 @@ fi # 1 : closed %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/isert-signed/isert-signed.spec b/SPECS-SIGNED/isert-signed/isert-signed.spec index d2c5b413fa4..758d3a5770e 100644 --- a/SPECS-SIGNED/isert-signed/isert-signed.spec +++ b/SPECS-SIGNED/isert-signed/isert-signed.spec @@ -41,7 +41,7 @@ Summary: %{_name} Driver Name: %{_name} Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -102,6 +102,12 @@ fi # 1 : closed %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec b/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec index 26521581f7e..91977a09869 100644 --- a/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec +++ b/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec @@ -7,7 +7,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-64k-signed-%{buildarch} Version: 6.6.64.2 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -105,6 +105,12 @@ echo "initrd of kernel %{uname_r} removed" >&2 %exclude /module_info.ld %changelog +* Wed Feb 05 2025 Tobias Brick - 6.6.64.2-9 +- Bump release to match kernel + +* Tue Feb 04 2025 Alberto David Perez Guevara - 6.6.64.2-8 +- Bump release to match kernel + * Fri Jan 31 2025 Alberto David Perez Guevara - 6.6.64.2-7 - Bump release to match kernel diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 4d4b6bdf577..48b8e0cb0ec 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 6.6.64.2 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -145,6 +145,12 @@ echo "initrd of kernel %{uname_r} removed" >&2 %exclude /module_info.ld %changelog +* Wed Feb 05 2025 Tobias Brick - 6.6.64.2-9 +- Bump release to match kernel + +* Tue Feb 04 2025 Alberto David Perez Guevara - 6.6.64.2-8 +- Bump release to match kernel + * Fri Jan 31 2025 Alberto David Perez Guevara - 6.6.64.2-7 - Bump release to match kernel diff --git a/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec b/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec index 2bdc7adf224..401ec156d11 100644 --- a/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec +++ b/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec @@ -6,7 +6,7 @@ Summary: Signed Unified Kernel Image for %{buildarch} systems Name: kernel-uki-signed-%{buildarch} Version: 6.6.64.2 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -68,6 +68,12 @@ popd /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi %changelog +* Wed Feb 05 2025 Tobias Brick - 6.6.64.2-9 +- Bump release to match kernel + +* Tue Feb 04 2025 Alberto David Perez Guevara - 6.6.64.2-8 +- Bump release to match kernel + * Fri Jan 31 2025 Alberto David Perez Guevara - 6.6.64.2-7 - Bump release to match kernel diff --git a/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec b/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec index 48e241a4fe4..793624ad904 100644 --- a/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec +++ b/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec @@ -43,7 +43,7 @@ Summary: KNEM: High-Performance Intra-Node MPI Communication Name: %{_name}-modules Version: 1.1.4.90mlnx3 -Release: 4%{?dist} +Release: 6%{?dist} Provides: knem-mlnx = %{version}-%{release} Obsoletes: knem-mlnx < %{version}-%{release} License: BSD and GPLv2 @@ -103,6 +103,12 @@ fi /lib/modules/ %changelog +* Wed Feb 05 2025 Tobias Brick - 1.1.4.90mlnx3-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 1.1.4.90mlnx3-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 1.1.4.90mlnx3-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec b/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec index c7e7eec1d9a..985c4537fda 100644 --- a/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec +++ b/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec @@ -12,7 +12,7 @@ Name: mft_kernel Summary: %{name} Kernel Module for the %{KVERSION} kernel Version: 4.30.0 -Release: 4%{?dist} +Release: 6%{?dist} License: Dual BSD/GPLv2 Group: System Environment/Kernel @@ -74,6 +74,12 @@ popd /lib/modules/%{KVERSION}/updates/ %changelog +* Wed Feb 05 2025 Tobias Brick - 4.30.0-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 4.30.0-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 4.30.0-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec index 3de2a7befbe..f1b33823b33 100644 --- a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec +++ b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec @@ -43,7 +43,7 @@ Summary: %{_name} Driver Name: %{_name} Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -111,6 +111,12 @@ fi %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec b/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec index 20d889234d6..56e381eec32 100644 --- a/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec +++ b/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec @@ -44,7 +44,7 @@ Summary: Infiniband HCA Driver Name: %{_name}-modules Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com/ Group: System Environment/Base @@ -185,6 +185,12 @@ fi %license %{_datadir}/licenses/%{name}/copyright %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/srp-signed/srp-signed.spec b/SPECS-SIGNED/srp-signed/srp-signed.spec index 99b0e3ed888..472cb216ff0 100644 --- a/SPECS-SIGNED/srp-signed/srp-signed.spec +++ b/SPECS-SIGNED/srp-signed/srp-signed.spec @@ -41,7 +41,7 @@ Summary: srp driver Name: srp Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -99,6 +99,12 @@ popd %license %{_datadir}/licenses/%{name}/copyright %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec b/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec index b38abae11a0..71fbae799d7 100644 --- a/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec +++ b/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec @@ -16,7 +16,7 @@ Summary: Cross-partition memory Name: xpmem-modules Version: 2.7.4 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 and LGPLv2.1 Group: System Environment/Libraries Vendor: Microsoft Corporation @@ -76,6 +76,12 @@ popd %changelog +* Wed Feb 05 2025 Tobias Brick - 2.7.4-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 2.7.4-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 2.7.4-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/application-gateway-kubernetes-ingress/CVE-2022-21698.patch b/SPECS/application-gateway-kubernetes-ingress/CVE-2022-21698.patch deleted file mode 100644 index d182f16619a..00000000000 --- a/SPECS/application-gateway-kubernetes-ingress/CVE-2022-21698.patch +++ /dev/null @@ -1,364 +0,0 @@ -From 253029f7ffbade99588df59a8b89a35d99197fe0 Mon Sep 17 00:00:00 2001 -From: Tobias Brick -Date: Tue, 18 Jan 2022 10:19:28 +0100 -Subject: [PATCH] Port upstream patch - https://github.com/prometheus/client_golang/commit/9075cdf61646b5adf54d3ba77a0e4f6c65cb4fd7 - -Differences: -- Removed tests -- Removed some comments that don't merge -- Line numbers and such - -Based on: - -From 9075cdf61646b5adf54d3ba77a0e4f6c65cb4fd7 Mon Sep 17 00:00:00 2001 -From: Kemal Akkoyun -Date: Tue, 18 Jan 2022 10:19:28 +0100 -Subject: [PATCH] promhttp: Check validity of method and code label values - (#962) - -* Check validity of method and code label values - -Signed-off-by: Kemal Akkoyun - -* Use more flexibly functional option pattern for configuration - -Signed-off-by: Kemal Akkoyun - -* Update documentation - -Signed-off-by: Kemal Akkoyun - -* Simplify - -Signed-off-by: Kemal Akkoyun - -* Fix inconsistent method naming - -Signed-off-by: Kemal Akkoyun ---- - prometheus/promhttp/instrument_client.go | 28 ++++++-- - prometheus/promhttp/instrument_server.go | 82 ++++++++++++++++++------ - prometheus/promhttp/option.go | 31 +++++++++ - 3 files changed, 116 insertions(+), 25 deletions(-) - create mode 100644 prometheus/promhttp/option.go - -diff --git a/prometheus/promhttp/instrument_client.go b/prometheus/promhttp/instrument_client.go -index 83c49b6..861b4d2 100644 ---- a/prometheus/promhttp/instrument_client.go -+++ b/prometheus/promhttp/instrument_client.go -@@ -49,7 +49,10 @@ func InstrumentRoundTripperInFlight(gauge prometheus.Gauge, next http.RoundTripp - // http.RoundTripper to observe the request result with the provided CounterVec. - // The CounterVec must have zero, one, or two non-const non-curried labels. For - // those, the only allowed label names are "code" and "method". The function --// panics otherwise. Partitioning of the CounterVec happens by HTTP status code -+// panics otherwise. For the "method" label a predefined default label value set -+// is used to filter given values. Values besides predefined values will count -+// as `unknown` method.`WithExtraMethods` can be used to add more -+// methods to the set. Partitioning of the CounterVec happens by HTTP status code - // and/or HTTP method if the respective instance label names are present in the - // CounterVec. For unpartitioned counting, use a CounterVec with zero labels. - // -@@ -57,13 +60,18 @@ func InstrumentRoundTripperInFlight(gauge prometheus.Gauge, next http.RoundTripp - // is not incremented. - // - // See the example for ExampleInstrumentRoundTripperDuration for example usage. --func InstrumentRoundTripperCounter(counter *prometheus.CounterVec, next http.RoundTripper) RoundTripperFunc { -+func InstrumentRoundTripperCounter(counter *prometheus.CounterVec, next http.RoundTripper, opts ...Option) RoundTripperFunc { -+ rtOpts := &option{} -+ for _, o := range opts { -+ o(rtOpts) -+ } -+ - code, method := checkLabels(counter) - - return RoundTripperFunc(func(r *http.Request) (*http.Response, error) { - resp, err := next.RoundTrip(r) - if err == nil { -- counter.With(labels(code, method, r.Method, resp.StatusCode)).Inc() -+ counter.With(labels(code, method, r.Method, resp.StatusCode, rtOpts.extraMethods...)).Inc() - } - return resp, err - }) -@@ -73,7 +81,10 @@ func InstrumentRoundTripperCounter(counter *prometheus.CounterVec, next http.Rou - // http.RoundTripper to observe the request duration with the provided - // ObserverVec. The ObserverVec must have zero, one, or two non-const - // non-curried labels. For those, the only allowed label names are "code" and --// "method". The function panics otherwise. The Observe method of the Observer -+// "method". The function panics otherwise. For the "method" label a predefined -+// default label value set is used to filter given values. Values besides -+// predefined values will count as `unknown` method. `WithExtraMethods` -+// can be used to add more methods to the set. The Observe method of the Observer - // in the ObserverVec is called with the request duration in - // seconds. Partitioning happens by HTTP status code and/or HTTP method if the - // respective instance label names are present in the ObserverVec. For -@@ -85,14 +96,19 @@ func InstrumentRoundTripperCounter(counter *prometheus.CounterVec, next http.Rou - // - // Note that this method is only guaranteed to never observe negative durations - // if used with Go1.9+. --func InstrumentRoundTripperDuration(obs prometheus.ObserverVec, next http.RoundTripper) RoundTripperFunc { -+func InstrumentRoundTripperDuration(obs prometheus.ObserverVec, next http.RoundTripper, opts ...Option) RoundTripperFunc { -+ rtOpts := &option{} -+ for _, o := range opts { -+ o(rtOpts) -+ } -+ - code, method := checkLabels(obs) - - return RoundTripperFunc(func(r *http.Request) (*http.Response, error) { - start := time.Now() - resp, err := next.RoundTrip(r) - if err == nil { -- obs.With(labels(code, method, r.Method, resp.StatusCode)).Observe(time.Since(start).Seconds()) -+ obs.With(labels(code, method, r.Method, resp.StatusCode, rtOpts.extraMethods...)).Observe(time.Since(start).Seconds()) - } - return resp, err - }) -diff --git a/prometheus/promhttp/instrument_server.go b/prometheus/promhttp/instrument_server.go -index 9db2438..91802f8 100644 ---- a/prometheus/promhttp/instrument_server.go -+++ b/prometheus/promhttp/instrument_server.go -@@ -58,7 +58,12 @@ func InstrumentHandlerInFlight(g prometheus.Gauge, next http.Handler) http.Handl - // - // Note that this method is only guaranteed to never observe negative durations - // if used with Go1.9+. --func InstrumentHandlerDuration(obs prometheus.ObserverVec, next http.Handler) http.HandlerFunc { -+func InstrumentHandlerDuration(obs prometheus.ObserverVec, next http.Handler, opts ...Option) http.HandlerFunc { -+ mwOpts := &option{} -+ for _, o := range opts { -+ o(mwOpts) -+ } -+ - code, method := checkLabels(obs) - - if code { -@@ -67,14 +72,14 @@ func InstrumentHandlerDuration(obs prometheus.ObserverVec, next http.Handler) ht - d := newDelegator(w, nil) - next.ServeHTTP(d, r) - -- obs.With(labels(code, method, r.Method, d.Status())).Observe(time.Since(now).Seconds()) -+ obs.With(labels(code, method, r.Method, d.Status(), mwOpts.extraMethods...)).Observe(time.Since(now).Seconds()) - }) - } - - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - now := time.Now() - next.ServeHTTP(w, r) -- obs.With(labels(code, method, r.Method, 0)).Observe(time.Since(now).Seconds()) -+ obs.With(labels(code, method, r.Method, 0, mwOpts.extraMethods...)).Observe(time.Since(now).Seconds()) - }) - } - -@@ -91,20 +96,25 @@ func InstrumentHandlerDuration(obs prometheus.ObserverVec, next http.Handler) ht - // If the wrapped Handler panics, the Counter is not incremented. - // - // See the example for InstrumentHandlerDuration for example usage. --func InstrumentHandlerCounter(counter *prometheus.CounterVec, next http.Handler) http.HandlerFunc { -+func InstrumentHandlerCounter(counter *prometheus.CounterVec, next http.Handler, opts ...Option) http.HandlerFunc { -+ mwOpts := &option{} -+ for _, o := range opts { -+ o(mwOpts) -+ } -+ - code, method := checkLabels(counter) - - if code { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - d := newDelegator(w, nil) - next.ServeHTTP(d, r) -- counter.With(labels(code, method, r.Method, d.Status())).Inc() -+ counter.With(labels(code, method, r.Method, d.Status(), mwOpts.extraMethods...)).Inc() - }) - } - - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - next.ServeHTTP(w, r) -- counter.With(labels(code, method, r.Method, 0)).Inc() -+ counter.With(labels(code, method, r.Method, 0, mwOpts.extraMethods...)).Inc() - }) - } - -@@ -126,13 +136,18 @@ func InstrumentHandlerCounter(counter *prometheus.CounterVec, next http.Handler) - // if used with Go1.9+. - // - // See the example for InstrumentHandlerDuration for example usage. --func InstrumentHandlerTimeToWriteHeader(obs prometheus.ObserverVec, next http.Handler) http.HandlerFunc { -+func InstrumentHandlerTimeToWriteHeader(obs prometheus.ObserverVec, next http.Handler, opts ...Option) http.HandlerFunc { -+ mwOpts := &option{} -+ for _, o := range opts { -+ o(mwOpts) -+ } -+ - code, method := checkLabels(obs) - - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - now := time.Now() - d := newDelegator(w, func(status int) { -- obs.With(labels(code, method, r.Method, status)).Observe(time.Since(now).Seconds()) -+ obs.With(labels(code, method, r.Method, status, mwOpts.extraMethods...)).Observe(time.Since(now).Seconds()) - }) - next.ServeHTTP(d, r) - }) -@@ -154,7 +169,12 @@ func InstrumentHandlerTimeToWriteHeader(obs prometheus.ObserverVec, next http.Ha - // If the wrapped Handler panics, no values are reported. - // - // See the example for InstrumentHandlerDuration for example usage. --func InstrumentHandlerRequestSize(obs prometheus.ObserverVec, next http.Handler) http.HandlerFunc { -+func InstrumentHandlerRequestSize(obs prometheus.ObserverVec, next http.Handler, opts ...Option) http.HandlerFunc { -+ mwOpts := &option{} -+ for _, o := range opts { -+ o(mwOpts) -+ } -+ - code, method := checkLabels(obs) - - if code { -@@ -162,14 +182,14 @@ func InstrumentHandlerRequestSize(obs prometheus.ObserverVec, next http.Handler) - d := newDelegator(w, nil) - next.ServeHTTP(d, r) - size := computeApproximateRequestSize(r) -- obs.With(labels(code, method, r.Method, d.Status())).Observe(float64(size)) -+ obs.With(labels(code, method, r.Method, d.Status(), mwOpts.extraMethods...)).Observe(float64(size)) - }) - } - - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - next.ServeHTTP(w, r) - size := computeApproximateRequestSize(r) -- obs.With(labels(code, method, r.Method, 0)).Observe(float64(size)) -+ obs.With(labels(code, method, r.Method, 0, mwOpts.extraMethods...)).Observe(float64(size)) - }) - } - -@@ -189,12 +209,18 @@ func InstrumentHandlerRequestSize(obs prometheus.ObserverVec, next http.Handler) - // If the wrapped Handler panics, no values are reported. - // - // See the example for InstrumentHandlerDuration for example usage. --func InstrumentHandlerResponseSize(obs prometheus.ObserverVec, next http.Handler) http.Handler { -+func InstrumentHandlerResponseSize(obs prometheus.ObserverVec, next http.Handler, opts ...Option) http.Handler { -+ mwOpts := &option{} -+ for _, o := range opts { -+ o(mwOpts) -+ } -+ - code, method := checkLabels(obs) -+ - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - d := newDelegator(w, nil) - next.ServeHTTP(d, r) -- obs.With(labels(code, method, r.Method, d.Status())).Observe(float64(d.Written())) -+ obs.With(labels(code, method, r.Method, d.Status(), mwOpts.extraMethods...)).Observe(float64(d.Written())) - }) - } - -@@ -279,7 +305,7 @@ func isLabelCurried(c prometheus.Collector, label string) bool { - // unnecessary allocations on each request. - var emptyLabels = prometheus.Labels{} - --func labels(code, method bool, reqMethod string, status int) prometheus.Labels { -+func labels(code, method bool, reqMethod string, status int, extraMethods ...string) prometheus.Labels { - if !(code || method) { - return emptyLabels - } -@@ -289,7 +315,7 @@ func labels(code, method bool, reqMethod string, status int) prometheus.Labels { - labels["code"] = sanitizeCode(status) - } - if method { -- labels["method"] = sanitizeMethod(reqMethod) -+ labels["method"] = sanitizeMethod(reqMethod, extraMethods...) - } - - return labels -@@ -319,7 +345,12 @@ func computeApproximateRequestSize(r *http.Request) int { - return s - } - --func sanitizeMethod(m string) string { -+// If the wrapped http.Handler has a known method, it will be sanitized and returned. -+// Otherwise, "unknown" will be returned. The known method list can be extended -+// as needed by using extraMethods parameter. -+func sanitizeMethod(m string, extraMethods ...string) string { -+ // See https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods for -+ // the methods chosen as default. - switch m { - case "GET", "get": - return "get" -@@ -337,15 +368,25 @@ func sanitizeMethod(m string) string { - return "options" - case "NOTIFY", "notify": - return "notify" -+ case "TRACE", "trace": -+ return "trace" -+ case "PATCH", "patch": -+ return "patch" - default: -- return strings.ToLower(m) -+ for _, method := range extraMethods { -+ if strings.EqualFold(m, method) { -+ return strings.ToLower(m) -+ } -+ } -+ return "unknown" - } - } - - // If the wrapped http.Handler has not set a status code, i.e. the value is --// currently 0, santizeCode will return 200, for consistency with behavior in -+// currently 0, sanitizeCode will return 200, for consistency with behavior in - // the stdlib. - func sanitizeCode(s int) string { -+ // See for accepted codes https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml - switch s { - case 100: - return "100" -@@ -442,6 +483,9 @@ func sanitizeCode(s int) string { - return "511" - - default: -- return strconv.Itoa(s) -+ if s >= 100 && s <= 599 { -+ return strconv.Itoa(s) -+ } -+ return "unknown" - } - } -diff --git a/prometheus/promhttp/option.go b/prometheus/promhttp/option.go -new file mode 100644 -index 0000000..35e41bd ---- /dev/null -+++ b/prometheus/promhttp/option.go -@@ -0,0 +1,31 @@ -+// Copyright 2022 The Prometheus Authors -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// http://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+ -+package promhttp -+ -+// Option are used to configure a middleware or round tripper.. -+type Option func(*option) -+ -+type option struct { -+ extraMethods []string -+} -+ -+// WithExtraMethods adds additional HTTP methods to the list of allowed methods. -+// See https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods for the default list. -+// -+// See the example for ExampleInstrumentHandlerWithExtraMethods for example usage. -+func WithExtraMethods(methods ...string) Option { -+ return func(o *option) { -+ o.extraMethods = methods -+ } -+} --- -2.33.8 - diff --git a/SPECS/application-gateway-kubernetes-ingress/CVE-2022-41273.patch b/SPECS/application-gateway-kubernetes-ingress/CVE-2022-41273.patch deleted file mode 100644 index 9357743fb59..00000000000 --- a/SPECS/application-gateway-kubernetes-ingress/CVE-2022-41273.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/http2/hpack/hpack.go b/http2/hpack/hpack.go -index b184a27..7a1d976 100644 ---- a/http2/hpack/hpack.go -+++ b/http2/hpack/hpack.go -@@ -359,6 +359,7 @@ - - var hf HeaderField - wantStr := d.emitEnabled || it.indexed() -+ var undecodedName undecodedString - if nameIdx > 0 { - ihf, ok := d.at(nameIdx) - if !ok { -@@ -366,15 +367,27 @@ - } - hf.Name = ihf.Name - } else { -- hf.Name, buf, err = d.readString(buf, wantStr) -+ undecodedName, buf, err = d.readString(buf) - if err != nil { - return err - } - } -- hf.Value, buf, err = d.readString(buf, wantStr) -+ undecodedValue, buf, err := d.readString(buf) - if err != nil { - return err - } -+ if wantStr { -+ if nameIdx <= 0 { -+ hf.Name, err = d.decodeString(undecodedName) -+ if err != nil { -+ return err -+ } -+ } -+ hf.Value, err = d.decodeString(undecodedValue) -+ if err != nil { -+ return err -+ } -+ } - d.buf = buf - if it.indexed() { - d.dynTab.add(hf) -@@ -459,46 +472,52 @@ - return 0, origP, errNeedMore - } - --// readString decodes an hpack string from p. -+// readString reads an hpack string from p. - // --// wantStr is whether s will be used. If false, decompression and --// []byte->string garbage are skipped if s will be ignored --// anyway. This does mean that huffman decoding errors for non-indexed --// strings past the MAX_HEADER_LIST_SIZE are ignored, but the server --// is returning an error anyway, and because they're not indexed, the error --// won't affect the decoding state. --func (d *Decoder) readString(p []byte, wantStr bool) (s string, remain []byte, err error) { -+// It returns a reference to the encoded string data to permit deferring decode costs -+// until after the caller verifies all data is present. -+func (d *Decoder) readString(p []byte) (u undecodedString, remain []byte, err error) { - if len(p) == 0 { -- return "", p, errNeedMore -+ return u, p, errNeedMore - } - isHuff := p[0]&128 != 0 - strLen, p, err := readVarInt(7, p) - if err != nil { -- return "", p, err -+ return u, p, err - } - if d.maxStrLen != 0 && strLen > uint64(d.maxStrLen) { -- return "", nil, ErrStringLength -+ // Returning an error here means Huffman decoding errors -+ // for non-indexed strings past the maximum string length -+ // are ignored, but the server is returning an error anyway -+ // and because the string is not indexed the error will not -+ // affect the decoding state. -+ return u, nil, ErrStringLength - } - if uint64(len(p)) < strLen { -- return "", p, errNeedMore -+ return u, p, errNeedMore - } -- if !isHuff { -- if wantStr { -- s = string(p[:strLen]) -- } -- return s, p[strLen:], nil -- } -+ u.isHuff = isHuff -+ u.b = p[:strLen] -+ return u, p[strLen:], nil -+} - -- if wantStr { -- buf := bufPool.Get().(*bytes.Buffer) -- buf.Reset() // don't trust others -- defer bufPool.Put(buf) -- if err := huffmanDecode(buf, d.maxStrLen, p[:strLen]); err != nil { -- buf.Reset() -- return "", nil, err -- } -- s = buf.String() -- buf.Reset() // be nice to GC -+type undecodedString struct { -+ isHuff bool -+ b []byte -+} -+ -+func (d *Decoder) decodeString(u undecodedString) (string, error) { -+ if !u.isHuff { -+ return string(u.b), nil - } -- return s, p[strLen:], nil -+ buf := bufPool.Get().(*bytes.Buffer) -+ buf.Reset() // don't trust others -+ var s string -+ err := huffmanDecode(buf, d.maxStrLen, u.b) -+ if err == nil { -+ s = buf.String() -+ } -+ buf.Reset() // be nice to GC -+ bufPool.Put(buf) -+ return s, err - } diff --git a/SPECS/application-gateway-kubernetes-ingress/CVE-2024-45338.patch b/SPECS/application-gateway-kubernetes-ingress/CVE-2024-45338.patch deleted file mode 100644 index ecfb199d033..00000000000 --- a/SPECS/application-gateway-kubernetes-ingress/CVE-2024-45338.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 16acb322637a8ee779fa757345d7aef0ac16e69e Mon Sep 17 00:00:00 2001 -From: Rohit Rawat -Date: Thu, 2 Jan 2025 10:22:13 +0000 -Subject: [PATCH] Fix CVE CVE-2024-45338 in - application-gateway-kubernetes-ingress - ---- - vendor/golang.org/x/net/html/doctype.go | 2 +- - vendor/golang.org/x/net/html/foreign.go | 3 +-- - vendor/golang.org/x/net/html/parse.go | 4 ++-- - 3 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/vendor/golang.org/x/net/html/doctype.go b/vendor/golang.org/x/net/html/doctype.go -index c484e5a..bca3ae9 100644 ---- a/vendor/golang.org/x/net/html/doctype.go -+++ b/vendor/golang.org/x/net/html/doctype.go -@@ -87,7 +87,7 @@ func parseDoctype(s string) (n *Node, quirks bool) { - } - } - if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" && -- strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" { -+ strings.EqualFold(lastAttr.Val, "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd") { - quirks = true - } - } -diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go -index 9da9e9d..e8515d8 100644 ---- a/vendor/golang.org/x/net/html/foreign.go -+++ b/vendor/golang.org/x/net/html/foreign.go -@@ -40,8 +40,7 @@ func htmlIntegrationPoint(n *Node) bool { - if n.Data == "annotation-xml" { - for _, a := range n.Attr { - if a.Key == "encoding" { -- val := strings.ToLower(a.Val) -- if val == "text/html" || val == "application/xhtml+xml" { -+ if strings.EqualFold(a.Val, "text/html") || strings.EqualFold(a.Val, "application/xhtml+xml") { - return true - } - } -diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go -index 291c919..d93fe03 100644 ---- a/vendor/golang.org/x/net/html/parse.go -+++ b/vendor/golang.org/x/net/html/parse.go -@@ -1031,7 +1031,7 @@ func inBodyIM(p *parser) bool { - if p.tok.DataAtom == a.Input { - for _, t := range p.tok.Attr { - if t.Key == "type" { -- if strings.ToLower(t.Val) == "hidden" { -+ if strings.EqualFold(t.Val, "hidden") { - // Skip setting framesetOK = false - return true - } -@@ -1459,7 +1459,7 @@ func inTableIM(p *parser) bool { - return inHeadIM(p) - case a.Input: - for _, t := range p.tok.Attr { -- if t.Key == "type" && strings.ToLower(t.Val) == "hidden" { -+ if t.Key == "type" && strings.EqualFold(t.Val, "hidden") { - p.addElement() - p.oe.pop() - return true --- -2.39.4 - diff --git a/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.signatures.json b/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.signatures.json index 1492f857abb..0bd7b0b16e8 100644 --- a/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.signatures.json +++ b/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "application-gateway-kubernetes-ingress-1.7.2-vendor.tar.gz": "c7ed26c959d032de3be6b14717ea0703b3543df299c77aa1d553f11b13b88a0e", - "application-gateway-kubernetes-ingress-1.7.2.tar.gz": "df1ca6b5a5c328521fea35d4fea5edc48e0214324986f263e2f7d960a8a6acd8" + "application-gateway-kubernetes-ingress-1.7.7-govendor-v1.tar.gz": "75b49d0831e436fdef44c1d69fccd495441ef37e20cac949a31bc4fedea60537", + "application-gateway-kubernetes-ingress-1.7.7.tar.gz": "a5b81630e0be41373d11f53813461dad2f825d1b5a250bb243011a783ba8d4f9" } } diff --git a/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.spec b/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.spec index 99e94cf9042..701835aae63 100644 --- a/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.spec +++ b/SPECS/application-gateway-kubernetes-ingress/application-gateway-kubernetes-ingress.spec @@ -1,33 +1,20 @@ %global debug_package %{nil} Summary: Application Gateway Ingress Controller Name: application-gateway-kubernetes-ingress -Version: 1.7.2 -Release: 3%{?dist} +Version: 1.7.7 +Release: 1%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux Group: Applications/Networking URL: https://github.com/Azure/application-gateway-kubernetes-ingress Source0: https://github.com/Azure/application-gateway-kubernetes-ingress/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Below is a manually created tarball, no download link. -# We're using vendored Go modules from this tarball, since network is disabled during build time. -# How to re-build this file: -# 1. wget https://github.com/Azure/%%{name}/archive/refs/tags/%%{version}.tar.gz -O %%{name}-%%{version}.tar.gz -# 2. tar -xf %%{name}-%%{version}.tar.gz -# 3. cd %%{name}-%%{version} -# 4. go mod vendor -# 5. tar --sort=name \ -# --mtime="2021-04-26 00:00Z" \ -# --owner=0 --group=0 --numeric-owner \ -# --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \ -# -cf %%{name}-%%{version}-vendor.tar.gz vendor -# -Source1: %{name}-%{version}-vendor.tar.gz -Patch0: CVE-2022-21698.patch -Patch1: CVE-2022-41273.patch -Patch2: CVE-2024-45338.patch - -BuildRequires: golang >= 1.13 +# Leverage the `generate_source_tarball.sh` to create the vendor sources +# NOTE: govendor-v1 format is for inplace CVE updates so that we do not have to overwrite in the blob-store. +# After fixing any possible CVE for the vendored source, we must bump v1 -> v2 +Source1: %{name}-%{version}-govendor-v1.tar.gz + +BuildRequires: golang >= 1.23 %description This is an ingress controller that can be run on Azure Kubernetes Service (AKS) to allow an Azure Application Gateway @@ -38,9 +25,6 @@ to act as the ingress for an AKS cluster. rm -rf vendor tar -xf %{SOURCE1} --no-same-owner -%patch 0 -p1 -d vendor/github.com/prometheus/client_golang -%patch 1 -p1 -d vendor/golang.org/x/net -%patch 2 -p1 %build export VERSION=%{version} @@ -59,6 +43,11 @@ cp appgw-ingress %{buildroot}%{_bindir}/ %{_bindir}/appgw-ingress %changelog +* Tue Feb 04 2025 Gary Swalling - 1.7.7-1 +- Upgrade to v1.7.7 with golang.org/x/net v0.33.0 for CVE-2023-39325, CVE-2023-44487, +- CVE-2023-45288, CVE-2024-51744, CVE-2024-35255, CVE-2023-3978 +- Remove patches which are no longer needed + * Tue Dec 31 2024 Rohit Rawat - 1.7.2-3 - Add patch for CVE-2024-45338 @@ -96,7 +85,7 @@ cp appgw-ingress %{buildroot}%{_bindir}/ * Fri Feb 03 2023 CBL-Mariner Servicing Account - 1.4.0-8 - Bump release to rebuild with go 1.19.5 -* Tues Jan 24 2023 Adit Jha - 1.4.0-7 +* Tue Jan 24 2023 Adit Jha - 1.4.0-7 - Bump release to rebuild vendor repoistory which contain patch fix for CVE-2021-4235, CVE-2022-3064 * Wed Jan 18 2023 CBL-Mariner Servicing Account - 1.4.0-6 diff --git a/SPECS/application-gateway-kubernetes-ingress/generate_source_tarball.sh b/SPECS/application-gateway-kubernetes-ingress/generate_source_tarball.sh index fcab42ea772..6609b85e3d2 100755 --- a/SPECS/application-gateway-kubernetes-ingress/generate_source_tarball.sh +++ b/SPECS/application-gateway-kubernetes-ingress/generate_source_tarball.sh @@ -7,15 +7,17 @@ set -e PKG_VERSION="" SRC_TARBALL="" +VENDOR_VERSION="1" OUT_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # parameters: # -# --srcTarball : src tarball file -# this file contains the 'initial' source code of the component -# and should be replaced with the new/modified src code -# --outFolder : folder where to copy the new tarball(s) -# --pkgVersion : package version +# --srcTarball : src tarball file +# this file contains the 'initial' source code of the component +# and should be replaced with the new/modified src code +# --outFolder : folder where to copy the new tarball(s) +# --pkgVersion : package version +# --vendorVersion : vendor version # PARAMS="" while (( "$#" )); do @@ -47,6 +49,15 @@ while (( "$#" )); do exit 1 fi ;; + --vendorVersion) + if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then + VENDOR_VERSION=$2 + shift 2 + else + echo "Error: Argument for $1 is missing" >&2 + exit 1 + fi + ;; -*|--*=) # unsupported flags echo "Error: Unsupported flag $1" >&2 exit 1 @@ -58,9 +69,10 @@ while (( "$#" )); do esac done -echo "--srcTarball -> $SRC_TARBALL" -echo "--outFolder -> $OUT_FOLDER" -echo "--pkgVersion -> $PKG_VERSION" +echo "--srcTarball -> $SRC_TARBALL" +echo "--outFolder -> $OUT_FOLDER" +echo "--pkgVersion -> $PKG_VERSION" +echo "--vendorVersion -> $VENDOR_VERSION" if [ -z "$PKG_VERSION" ]; then echo "--pkgVersion parameter cannot be empty" @@ -75,10 +87,15 @@ function cleanup { } trap cleanup EXIT +TARBALL_FOLDER="$tmpdir/tarballFolder" +mkdir -p $TARBALL_FOLDER +cp $SRC_TARBALL $tmpdir + pushd $tmpdir > /dev/null -NAME_VER="application-gateway-kubernetes-ingress-$PKG_VERSION" -VENDOR_TARBALL="$OUT_FOLDER/$NAME_VER-vendor.tar.gz" +PKG_NAME="application-gateway-kubernetes-ingress" +NAME_VER="$PKG_NAME-$PKG_VERSION" +VENDOR_TARBALL="$OUT_FOLDER/$NAME_VER-govendor-v$VENDOR_VERSION.tar.gz" echo "Unpacking source tarball..." tar -xf $SRC_TARBALL @@ -92,7 +109,7 @@ tar --sort=name \ --mtime="2021-04-26 00:00Z" \ --owner=0 --group=0 --numeric-owner \ --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \ - -cf "$VENDOR_TARBALL" vendor + -czf "$VENDOR_TARBALL" vendor popd > /dev/null -echo "application-gateway-kubernetes-ingress vendored modules are available at $VENDOR_TARBALL" +echo "$PKG_NAME vendored modules are available at $VENDOR_TARBALL" diff --git a/SPECS/containerized-data-importer/containerized-data-importer.spec b/SPECS/containerized-data-importer/containerized-data-importer.spec index cb3de2a79ed..076f9da6b41 100644 --- a/SPECS/containerized-data-importer/containerized-data-importer.spec +++ b/SPECS/containerized-data-importer/containerized-data-importer.spec @@ -18,7 +18,7 @@ Summary: Container native virtualization Name: containerized-data-importer Version: 1.57.0 -Release: 9%{?dist} +Release: 10%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -149,20 +149,20 @@ CGO_ENABLED=0 ./hack/build/build-go.sh build \ %install mkdir -p %{buildroot}%{_bindir} -install -p -m 0755 _out/cmd/cdi-apiserver/cdi-apiserver %{buildroot}%{_bindir}/virt-cdi-apiserver +install -p -m 0755 _out/cmd/cdi-apiserver/cdi-apiserver %{buildroot}%{_bindir}/cdi-apiserver install -p -m 0755 cmd/cdi-cloner/cloner_startup.sh %{buildroot}%{_bindir}/ install -p -m 0755 _out/cmd/cdi-cloner/cdi-cloner %{buildroot}%{_bindir}/ -install -p -m 0755 _out/cmd/cdi-controller/cdi-controller %{buildroot}%{_bindir}/virt-cdi-controller +install -p -m 0755 _out/cmd/cdi-controller/cdi-controller %{buildroot}%{_bindir}/cdi-controller -install -p -m 0755 _out/cmd/cdi-importer/cdi-importer %{buildroot}%{_bindir}/virt-cdi-importer +install -p -m 0755 _out/cmd/cdi-importer/cdi-importer %{buildroot}%{_bindir}/cdi-importer -install -p -m 0755 _out/cmd/cdi-operator/cdi-operator %{buildroot}%{_bindir}/virt-cdi-operator +install -p -m 0755 _out/cmd/cdi-operator/cdi-operator %{buildroot}%{_bindir}/cdi-operator -install -p -m 0755 _out/cmd/cdi-uploadproxy/cdi-uploadproxy %{buildroot}%{_bindir}/virt-cdi-uploadproxy +install -p -m 0755 _out/cmd/cdi-uploadproxy/cdi-uploadproxy %{buildroot}%{_bindir}/cdi-uploadproxy -install -p -m 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver %{buildroot}%{_bindir}/virt-cdi-uploadserver +install -p -m 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver %{buildroot}%{_bindir}/cdi-uploadserver install -p -m 0755 _out/tools/cdi-containerimage-server/cdi-containerimage-server %{buildroot}%{_bindir}/cdi-containerimage-server @@ -180,7 +180,7 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m %files api %license LICENSE %doc README.md -%{_bindir}/virt-cdi-apiserver +%{_bindir}/cdi-apiserver %files cloner %license LICENSE @@ -191,12 +191,12 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m %files controller %license LICENSE %doc README.md -%{_bindir}/virt-cdi-controller +%{_bindir}/cdi-controller %files importer %license LICENSE %doc README.md -%{_bindir}/virt-cdi-importer +%{_bindir}/cdi-importer %{_bindir}/cdi-containerimage-server %{_bindir}/cdi-image-size-detection %{_bindir}/cdi-source-update-poller @@ -204,18 +204,18 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m %files operator %license LICENSE %doc README.md -%{_bindir}/virt-cdi-operator +%{_bindir}/cdi-operator %{_bindir}/csv-generator %files uploadproxy %license LICENSE %doc README.md -%{_bindir}/virt-cdi-uploadproxy +%{_bindir}/cdi-uploadproxy %files uploadserver %license LICENSE %doc README.md -%{_bindir}/virt-cdi-uploadserver +%{_bindir}/cdi-uploadserver %files manifests %license LICENSE @@ -226,6 +226,9 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m %{_datadir}/cdi/manifests %changelog +* Mon Feb 03 2025 Sharath Srikanth Chellappa - 1.57.0-10 +- Rename cdi binaries to be inline with upstream. + * Wed Jan 29 2025 Kanishk Bansal - 1.57.0-9 - Fix CVE-2024-28180 with an upstream patch diff --git a/SPECS/etcd/CVE-2024-24786.patch b/SPECS/etcd/CVE-2024-24786.patch deleted file mode 100644 index 7d4b7aaf768..00000000000 --- a/SPECS/etcd/CVE-2024-24786.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bb1e9bdc04af19078578d008af166030916eef18 Mon Sep 17 00:00:00 2001 -From: bhapathak -Date: Tue, 3 Dec 2024 14:35:21 +0000 -Subject: [PATCH] Vendor patch applied - ---- - .../protobuf/encoding/protojson/well_known_types.go | 3 +++ - .../protobuf/internal/encoding/json/decode.go | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go b/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go -index 6c37d41..3a7d3e7 100644 ---- a/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go -+++ b/vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go -@@ -348,6 +348,9 @@ func (d decoder) skipJSONValue() error { - } - } - } -+ -+ case json.EOF: -+ return errors.New("unexpected EOF") - } - return nil - } -diff --git a/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go b/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go -index d043a6e..d2b3ac0 100644 ---- a/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go -+++ b/vendor/google.golang.org/protobuf/internal/encoding/json/decode.go -@@ -121,7 +121,7 @@ func (d *Decoder) Read() (Token, error) { - - case ObjectClose: - if len(d.openStack) == 0 || -- d.lastToken.kind == comma || -+ d.lastToken.kind&(Name|comma) != 0 || - d.openStack[len(d.openStack)-1] != ObjectOpen { - return Token{}, d.newSyntaxError(tok.pos, unexpectedFmt, tok.RawString()) - } --- -2.39.4 - diff --git a/SPECS/etcd/etcd.signatures.json b/SPECS/etcd/etcd.signatures.json index b6e142fc1a6..5a4ca8a4074 100644 --- a/SPECS/etcd/etcd.signatures.json +++ b/SPECS/etcd/etcd.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "etcd.service": "4550a4967ba35670051cbfd9b4edf1fc57c0f1d7a07e51f88351ac44c76d8066", - "etcd-3.5.12-vendor.tar.gz": "2427523101fa0c5ec75f8c65224cddac89de86ae2f5d6b07f14ae7ea1b195064", - "etcd-3.5.12.tar.gz": "90b56a7f2f43a993d420954322e607a6e6a0ca5549f1f7c7dc3567d2f56678d9" + "etcd-3.5.18.tar.gz": "8c8890b15c1a19263ab4ee2b374698c1d76c2b31e9b55bdeea47193aa48d8025", + "etcd-3.5.18-vendor.tar.gz": "c8b9c5dac4466a1cc528801aad1664fbd4cc7967f31f495187afd79e01d716f3" } } diff --git a/SPECS/etcd/etcd.spec b/SPECS/etcd/etcd.spec index 43fc23987a6..3c5e07bedef 100644 --- a/SPECS/etcd/etcd.spec +++ b/SPECS/etcd/etcd.spec @@ -2,8 +2,8 @@ Summary: A highly-available key value store for shared configuration Name: etcd -Version: 3.5.12 -Release: 2%{?dist} +Version: 3.5.18 +Release: 1%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -44,7 +44,6 @@ Source1: etcd.service # --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \ # -cJf [tarball name] [folder to tar] Source2: %{name}-%{version}-vendor.tar.gz -Patch0: CVE-2024-24786.patch BuildRequires: golang >= 1.16 %description @@ -72,7 +71,6 @@ mkdir -p %{ETCD_OUT_DIR} for component in server etcdctl etcdutl; do pushd $component tar --no-same-owner -xf %{_builddir}/%{name}-%{version}/vendor-$component.tar.gz - patch -p1 -s --fuzz=0 --no-backup-if-mismatch -f --input %{PATCH0} go build \ -o %{ETCD_OUT_DIR} \ -ldflags=-X=go.etcd.io/etcd/api/v3/version.GitSHA=v%{version} @@ -147,13 +145,16 @@ install -vdm755 %{buildroot}%{_sharedstatedir}/etcd /%{_docdir}/%{name}-%{version}-tools/* %changelog +* Tue Feb 04 2025 CBL-Mariner Servicing Account - 3.5.18-1 +- Auto-upgrade to 3.5.18 - Upgrade to fix CVE-2023-39325, CVE-2023-44487 and CVE-2023-45288. + * Tue Dec 03 2024 bhapathak - 3.5.12-2 - Patch CVE-2024-24786 * Fri May 24 2024 CBL-Mariner Servicing Account - 3.5.12-1 - Auto-upgrade to 3.5.12 - none -* Tue Oct 18 2023 Nicolas Guibourge - 3.5.9-1 +* Wed Oct 18 2023 Nicolas Guibourge - 3.5.9-1 - Upgrade to 3.5.9 to match version required by kubernetes * Mon Oct 16 2023 CBL-Mariner Servicing Account - 3.5.6-12 diff --git a/SPECS/fwctl/fwctl.spec b/SPECS/fwctl/fwctl.spec index ae523b75bac..bcda09f1d16 100644 --- a/SPECS/fwctl/fwctl.spec +++ b/SPECS/fwctl/fwctl.spec @@ -67,7 +67,7 @@ Summary: %{_name} Driver Name: fwctl Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://nvidia.com Group: System Environment/Base @@ -250,6 +250,12 @@ fi # 1 : closed %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/golang/golang-1.22.spec b/SPECS/golang/golang-1.22.spec index e854d24b5ba..5535269a3c1 100644 --- a/SPECS/golang/golang-1.22.spec +++ b/SPECS/golang/golang-1.22.spec @@ -2,7 +2,6 @@ %global gopath %{_datadir}/gocode %global ms_go_filename go1.22.10-20241203.4.src.tar.gz %global ms_go_revision 1 -%global go_priority %(echo %{version}.%{ms_go_revision} | tr -d .) %ifarch aarch64 %global gohostarch arm64 %else @@ -16,7 +15,7 @@ Summary: Go Name: golang Version: 1.22.10 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause Vendor: Microsoft Corporation Distribution: Azure Linux @@ -134,17 +133,10 @@ EOF %post -p /sbin/ldconfig -alternatives --install %{_bindir}/go go %{goroot}/bin/go %{go_priority} -alternatives --install %{_bindir}/gofmt gofmt %{goroot}/bin/gofmt %{go_priority} - %postun /sbin/ldconfig if [ $1 -eq 0 ]; then # This is uninstall - alternatives --remove go %{goroot}/bin/go - alternatives --remove gofmt %{goroot}/bin/gofmt - - rm %{_sysconfdir}/profile.d/go-exports.sh rm -rf /opt/go exit 0 fi @@ -162,6 +154,11 @@ fi %{_bindir}/* %changelog +* Tue Feb 04 2025 Tobias Brick - 1.22.10-2 +- Fix post scriptlet +- Remove calls to alternatives +- Don't manually delete go-exports.sh + * Wed Dec 04 2024 Microsoft Golang Bot - 1.22.10-1 - Bump version to 1.22.10-1 @@ -186,7 +183,7 @@ fi * Tue Jun 04 2024 Davis Goodin - 1.22.4-1 - Bump version to 1.22.4-1 -* Tue May 07 2024 Davis Goodin - 1.22.3-1 +* Mon May 27 2024 Davis Goodin - 1.22.3-1 - Bump version to 1.22.3-1 * Wed May 08 2024 Davis Goodin - 1.21.9-2 diff --git a/SPECS/golang/golang.spec b/SPECS/golang/golang.spec index 2a883f90095..6dbcc60c183 100644 --- a/SPECS/golang/golang.spec +++ b/SPECS/golang/golang.spec @@ -2,7 +2,6 @@ %global gopath %{_datadir}/gocode %global ms_go_filename go1.23.3-20241202.3.src.tar.gz %global ms_go_revision 2 -%global go_priority %(echo %{version}.%{ms_go_revision} | tr -d .) %ifarch aarch64 %global gohostarch arm64 %else @@ -16,7 +15,7 @@ Summary: Go Name: golang Version: 1.23.3 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause Vendor: Microsoft Corporation Distribution: Azure Linux @@ -134,17 +133,10 @@ EOF %post -p /sbin/ldconfig -alternatives --install %{_bindir}/go go %{goroot}/bin/go %{go_priority} -alternatives --install %{_bindir}/gofmt gofmt %{goroot}/bin/gofmt %{go_priority} - %postun /sbin/ldconfig if [ $1 -eq 0 ]; then # This is uninstall - alternatives --remove go %{goroot}/bin/go - alternatives --remove gofmt %{goroot}/bin/gofmt - - rm %{_sysconfdir}/profile.d/go-exports.sh rm -rf /opt/go exit 0 fi @@ -162,6 +154,11 @@ fi %{_bindir}/* %changelog +* Tue Feb 04 2025 Tobias Brick - 1.23.3-3 +- Fix post scriptlet +- Remove calls to alternatives +- Don't manually delete go-exports.sh + * Tue Dec 03 2024 Microsoft Golang Bot - 1.23.3-2 - Bump version to 1.23.3-2 @@ -186,7 +183,7 @@ fi * Tue Jun 04 2024 Davis Goodin - 1.22.4-1 - Bump version to 1.22.4-1 -* Tue May 07 2024 Davis Goodin - 1.22.3-1 +* Mon May 27 2024 Davis Goodin - 1.22.3-1 - Bump version to 1.22.3-1 * Wed May 08 2024 Davis Goodin - 1.21.9-2 diff --git a/SPECS/iser/iser.spec b/SPECS/iser/iser.spec index 635f9f29c2e..1efd9b05007 100644 --- a/SPECS/iser/iser.spec +++ b/SPECS/iser/iser.spec @@ -64,7 +64,7 @@ Summary: %{_name} Driver Name: iser Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -247,6 +247,12 @@ fi # 1 : closed %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/isert/isert.spec b/SPECS/isert/isert.spec index 839fbe24d3d..08a9bdf55d4 100644 --- a/SPECS/isert/isert.spec +++ b/SPECS/isert/isert.spec @@ -64,7 +64,7 @@ Summary: %{_name} Driver Name: isert Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -247,6 +247,12 @@ fi # 1 : closed %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/kernel-64k/config_aarch64 b/SPECS/kernel-64k/config_aarch64 index 4be3b44dfc2..be9855836dc 100644 --- a/SPECS/kernel-64k/config_aarch64 +++ b/SPECS/kernel-64k/config_aarch64 @@ -10682,6 +10682,13 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=3 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set # end of Random number generation diff --git a/SPECS/kernel-64k/jent-init-fix.patch b/SPECS/kernel-64k/jent-init-fix.patch new file mode 100644 index 00000000000..28c9cb835b4 --- /dev/null +++ b/SPECS/kernel-64k/jent-init-fix.patch @@ -0,0 +1,746 @@ +From bf0bd689d17bd56558250f7cae643ffb26e196a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stephan=20M=C3=BCller?= +Date: Thu, 21 Sep 2023 13:48:11 +0200 +Subject: [PATCH 1/4] crypto: jitter - add RCT/APT support for different OSRs + +The oversampling rate (OSR) value specifies the heuristically implied +entropy in the recorded data - H_submitter = 1/osr. A different entropy +estimate implies a different APT/RCT cutoff value. This change adds +support for OSRs 1 through 15. This OSR can be selected by the caller +of the Jitter RNG. + +For this patch, the caller still uses one hard-coded OSR. A subsequent +patch allows this value to be configured. + +In addition, the power-up self test is adjusted as follows: + +* It allows the caller to provide an oversampling rate that should be +tested with - commonly it should be the same as used for the actual +runtime operation. This makes the power-up testing therefore consistent +with the runtime operation. + +* It calls now jent_measure_jitter (i.e. collects the full entropy +that can possibly be harvested by the Jitter RNG) instead of only +jent_condition_data (which only returns the entropy harvested from +the conditioning component). This should now alleviate reports where +the Jitter RNG initialization thinks there is too little entropy. + +* The power-up test now solely relies on the (enhanced) APT and RCT +test that is used as a health test at runtime. + +The code allowing the different OSRs as well as the power-up test +changes are present in the user space version of the Jitter RNG 3.4.1 +and thus was already in production use for some time. + +Reported-by "Ospan, Abylay" +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/jitterentropy-kcapi.c | 4 +- + crypto/jitterentropy.c | 233 ++++++++++++++++++----------------- + crypto/jitterentropy.h | 3 +- + 3 files changed, 123 insertions(+), 117 deletions(-) + +diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c +index 7d1463a1562a..1de730f94683 100644 +--- a/crypto/jitterentropy-kcapi.c ++++ b/crypto/jitterentropy-kcapi.c +@@ -245,7 +245,7 @@ static int jent_kcapi_init(struct crypto_tfm *tfm) + crypto_shash_init(sdesc); + rng->sdesc = sdesc; + +- rng->entropy_collector = jent_entropy_collector_alloc(1, 0, sdesc); ++ rng->entropy_collector = jent_entropy_collector_alloc(0, 0, sdesc); + if (!rng->entropy_collector) { + ret = -ENOMEM; + goto err; +@@ -334,7 +334,7 @@ static int __init jent_mod_init(void) + + desc->tfm = tfm; + crypto_shash_init(desc); +- ret = jent_entropy_init(desc); ++ ret = jent_entropy_init(0, 0, desc); + shash_desc_zero(desc); + crypto_free_shash(tfm); + if (ret) { +diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c +index fe9c233ec769..1b99ffaa8c34 100644 +--- a/crypto/jitterentropy.c ++++ b/crypto/jitterentropy.c +@@ -72,6 +72,8 @@ struct rand_data { + __u64 prev_time; /* SENSITIVE Previous time stamp */ + __u64 last_delta; /* SENSITIVE stuck test */ + __s64 last_delta2; /* SENSITIVE stuck test */ ++ ++ unsigned int flags; /* Flags used to initialize */ + unsigned int osr; /* Oversample rate */ + #define JENT_MEMORY_BLOCKS 64 + #define JENT_MEMORY_BLOCKSIZE 32 +@@ -88,16 +90,9 @@ struct rand_data { + /* Repetition Count Test */ + unsigned int rct_count; /* Number of stuck values */ + +- /* Intermittent health test failure threshold of 2^-30 */ +- /* From an SP800-90B perspective, this RCT cutoff value is equal to 31. */ +- /* However, our RCT implementation starts at 1, so we subtract 1 here. */ +-#define JENT_RCT_CUTOFF (31 - 1) /* Taken from SP800-90B sec 4.4.1 */ +-#define JENT_APT_CUTOFF 325 /* Taken from SP800-90B sec 4.4.2 */ +- /* Permanent health test failure threshold of 2^-60 */ +- /* From an SP800-90B perspective, this RCT cutoff value is equal to 61. */ +- /* However, our RCT implementation starts at 1, so we subtract 1 here. */ +-#define JENT_RCT_CUTOFF_PERMANENT (61 - 1) +-#define JENT_APT_CUTOFF_PERMANENT 355 ++ /* Adaptive Proportion Test cutoff values */ ++ unsigned int apt_cutoff; /* Intermittent health test failure */ ++ unsigned int apt_cutoff_permanent; /* Permanent health test failure */ + #define JENT_APT_WINDOW_SIZE 512 /* Data window size */ + /* LSB of time stamp to process */ + #define JENT_APT_LSB 16 +@@ -122,6 +117,9 @@ struct rand_data { + * zero). */ + #define JENT_ESTUCK 8 /* Too many stuck results during init. */ + #define JENT_EHEALTH 9 /* Health test failed during initialization */ ++#define JENT_ERCT 10 /* RCT failed during initialization */ ++#define JENT_EHASH 11 /* Hash self test failed */ ++#define JENT_EMEM 12 /* Can't allocate memory for initialization */ + + /* + * The output n bits can receive more than n bits of min entropy, of course, +@@ -147,6 +145,48 @@ struct rand_data { + * This test complies with SP800-90B section 4.4.2. + ***************************************************************************/ + ++/* ++ * See the SP 800-90B comment #10b for the corrected cutoff for the SP 800-90B ++ * APT. ++ * http://www.untruth.org/~josh/sp80090b/UL%20SP800-90B-final%20comments%20v1.9%2020191212.pdf ++ * In in the syntax of R, this is C = 2 + qbinom(1 − 2^(−30), 511, 2^(-1/osr)). ++ * (The original formula wasn't correct because the first symbol must ++ * necessarily have been observed, so there is no chance of observing 0 of these ++ * symbols.) ++ * ++ * For the alpha < 2^-53, R cannot be used as it uses a float data type without ++ * arbitrary precision. A SageMath script is used to calculate those cutoff ++ * values. ++ * ++ * For any value above 14, this yields the maximal allowable value of 512 ++ * (by FIPS 140-2 IG 7.19 Resolution # 16, we cannot choose a cutoff value that ++ * renders the test unable to fail). ++ */ ++static const unsigned int jent_apt_cutoff_lookup[15] = { ++ 325, 422, 459, 477, 488, 494, 499, 502, ++ 505, 507, 508, 509, 510, 511, 512 }; ++static const unsigned int jent_apt_cutoff_permanent_lookup[15] = { ++ 355, 447, 479, 494, 502, 507, 510, 512, ++ 512, 512, 512, 512, 512, 512, 512 }; ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ++ ++static void jent_apt_init(struct rand_data *ec, unsigned int osr) ++{ ++ /* ++ * Establish the apt_cutoff based on the presumed entropy rate of ++ * 1/osr. ++ */ ++ if (osr >= ARRAY_SIZE(jent_apt_cutoff_lookup)) { ++ ec->apt_cutoff = jent_apt_cutoff_lookup[ ++ ARRAY_SIZE(jent_apt_cutoff_lookup) - 1]; ++ ec->apt_cutoff_permanent = jent_apt_cutoff_permanent_lookup[ ++ ARRAY_SIZE(jent_apt_cutoff_permanent_lookup) - 1]; ++ } else { ++ ec->apt_cutoff = jent_apt_cutoff_lookup[osr - 1]; ++ ec->apt_cutoff_permanent = ++ jent_apt_cutoff_permanent_lookup[osr - 1]; ++ } ++} + /* + * Reset the APT counter + * +@@ -187,12 +227,12 @@ static void jent_apt_insert(struct rand_data *ec, unsigned int delta_masked) + /* APT health test failure detection */ + static int jent_apt_permanent_failure(struct rand_data *ec) + { +- return (ec->apt_count >= JENT_APT_CUTOFF_PERMANENT) ? 1 : 0; ++ return (ec->apt_count >= ec->apt_cutoff_permanent) ? 1 : 0; + } + + static int jent_apt_failure(struct rand_data *ec) + { +- return (ec->apt_count >= JENT_APT_CUTOFF) ? 1 : 0; ++ return (ec->apt_count >= ec->apt_cutoff) ? 1 : 0; + } + + /*************************************************************************** +@@ -275,15 +315,28 @@ static int jent_stuck(struct rand_data *ec, __u64 current_delta) + return 0; + } + +-/* RCT health test failure detection */ ++/* ++ * The cutoff value is based on the following consideration: ++ * alpha = 2^-30 or 2^-60 as recommended in SP800-90B. ++ * In addition, we require an entropy value H of 1/osr as this is the minimum ++ * entropy required to provide full entropy. ++ * Note, we collect (DATA_SIZE_BITS + ENTROPY_SAFETY_FACTOR)*osr deltas for ++ * inserting them into the entropy pool which should then have (close to) ++ * DATA_SIZE_BITS bits of entropy in the conditioned output. ++ * ++ * Note, ec->rct_count (which equals to value B in the pseudo code of SP800-90B ++ * section 4.4.1) starts with zero. Hence we need to subtract one from the ++ * cutoff value as calculated following SP800-90B. Thus ++ * C = ceil(-log_2(alpha)/H) = 30*osr or 60*osr. ++ */ + static int jent_rct_permanent_failure(struct rand_data *ec) + { +- return (ec->rct_count >= JENT_RCT_CUTOFF_PERMANENT) ? 1 : 0; ++ return (ec->rct_count >= (60 * ec->osr)) ? 1 : 0; + } + + static int jent_rct_failure(struct rand_data *ec) + { +- return (ec->rct_count >= JENT_RCT_CUTOFF) ? 1 : 0; ++ return (ec->rct_count >= (30 * ec->osr)) ? 1 : 0; + } + + /* Report of health test failures */ +@@ -448,7 +501,7 @@ static void jent_memaccess(struct rand_data *ec, __u64 loop_cnt) + * + * @return result of stuck test + */ +-static int jent_measure_jitter(struct rand_data *ec) ++static int jent_measure_jitter(struct rand_data *ec, __u64 *ret_current_delta) + { + __u64 time = 0; + __u64 current_delta = 0; +@@ -472,6 +525,10 @@ static int jent_measure_jitter(struct rand_data *ec) + if (jent_condition_data(ec, current_delta, stuck)) + stuck = 1; + ++ /* return the raw entropy value */ ++ if (ret_current_delta) ++ *ret_current_delta = current_delta; ++ + return stuck; + } + +@@ -489,11 +546,11 @@ static void jent_gen_entropy(struct rand_data *ec) + safety_factor = JENT_ENTROPY_SAFETY_FACTOR; + + /* priming of the ->prev_time value */ +- jent_measure_jitter(ec); ++ jent_measure_jitter(ec, NULL); + + while (!jent_health_failure(ec)) { + /* If a stuck measurement is received, repeat measurement */ +- if (jent_measure_jitter(ec)) ++ if (jent_measure_jitter(ec, NULL)) + continue; + + /* +@@ -554,7 +611,8 @@ int jent_read_entropy(struct rand_data *ec, unsigned char *data, + * Perform startup health tests and return permanent + * error if it fails. + */ +- if (jent_entropy_init(ec->hash_state)) ++ if (jent_entropy_init(ec->osr, ec->flags, ++ ec->hash_state)) + return -3; + + return -2; +@@ -604,11 +662,15 @@ struct rand_data *jent_entropy_collector_alloc(unsigned int osr, + + /* verify and set the oversampling rate */ + if (osr == 0) +- osr = 1; /* minimum sampling rate is 1 */ ++ osr = 1; /* H_submitter = 1 / osr */ + entropy_collector->osr = osr; ++ entropy_collector->flags = flags; + + entropy_collector->hash_state = hash_state; + ++ /* Initialize the APT */ ++ jent_apt_init(entropy_collector, osr); ++ + /* fill the data pad with non-zero values */ + jent_gen_entropy(entropy_collector); + +@@ -622,20 +684,14 @@ void jent_entropy_collector_free(struct rand_data *entropy_collector) + jent_zfree(entropy_collector); + } + +-int jent_entropy_init(void *hash_state) ++int jent_entropy_init(unsigned int osr, unsigned int flags, void *hash_state) + { +- int i; +- __u64 delta_sum = 0; +- __u64 old_delta = 0; +- unsigned int nonstuck = 0; +- int time_backwards = 0; +- int count_mod = 0; +- int count_stuck = 0; +- struct rand_data ec = { 0 }; +- +- /* Required for RCT */ +- ec.osr = 1; +- ec.hash_state = hash_state; ++ struct rand_data *ec; ++ int i, time_backwards = 0, ret = 0; ++ ++ ec = jent_entropy_collector_alloc(osr, flags, hash_state); ++ if (!ec) ++ return JENT_EMEM; + + /* We could perform statistical tests here, but the problem is + * that we only have a few loop counts to do testing. These +@@ -664,31 +720,28 @@ int jent_entropy_init(void *hash_state) + #define TESTLOOPCOUNT 1024 + #define CLEARCACHE 100 + for (i = 0; (TESTLOOPCOUNT + CLEARCACHE) > i; i++) { +- __u64 time = 0; +- __u64 time2 = 0; +- __u64 delta = 0; +- unsigned int lowdelta = 0; +- int stuck; ++ __u64 start_time = 0, end_time = 0, delta = 0; + + /* Invoke core entropy collection logic */ +- jent_get_nstime(&time); +- ec.prev_time = time; +- jent_condition_data(&ec, time, 0); +- jent_get_nstime(&time2); ++ jent_measure_jitter(ec, &delta); ++ end_time = ec->prev_time; ++ start_time = ec->prev_time - delta; + + /* test whether timer works */ +- if (!time || !time2) +- return JENT_ENOTIME; +- delta = jent_delta(time, time2); ++ if (!start_time || !end_time) { ++ ret = JENT_ENOTIME; ++ goto out; ++ } ++ + /* + * test whether timer is fine grained enough to provide + * delta even when called shortly after each other -- this + * implies that we also have a high resolution timer + */ +- if (!delta) +- return JENT_ECOARSETIME; +- +- stuck = jent_stuck(&ec, delta); ++ if (!delta || (end_time == start_time)) { ++ ret = JENT_ECOARSETIME; ++ goto out; ++ } + + /* + * up to here we did not modify any variable that will be +@@ -700,49 +753,9 @@ int jent_entropy_init(void *hash_state) + if (i < CLEARCACHE) + continue; + +- if (stuck) +- count_stuck++; +- else { +- nonstuck++; +- +- /* +- * Ensure that the APT succeeded. +- * +- * With the check below that count_stuck must be less +- * than 10% of the overall generated raw entropy values +- * it is guaranteed that the APT is invoked at +- * floor((TESTLOOPCOUNT * 0.9) / 64) == 14 times. +- */ +- if ((nonstuck % JENT_APT_WINDOW_SIZE) == 0) { +- jent_apt_reset(&ec, +- delta & JENT_APT_WORD_MASK); +- } +- } +- +- /* Validate health test result */ +- if (jent_health_failure(&ec)) +- return JENT_EHEALTH; +- + /* test whether we have an increasing timer */ +- if (!(time2 > time)) ++ if (!(end_time > start_time)) + time_backwards++; +- +- /* use 32 bit value to ensure compilation on 32 bit arches */ +- lowdelta = time2 - time; +- if (!(lowdelta % 100)) +- count_mod++; +- +- /* +- * ensure that we have a varying delta timer which is necessary +- * for the calculation of entropy -- perform this check +- * only after the first loop is executed as we need to prime +- * the old_data value +- */ +- if (delta > old_delta) +- delta_sum += (delta - old_delta); +- else +- delta_sum += (old_delta - delta); +- old_delta = delta; + } + + /* +@@ -752,31 +765,23 @@ int jent_entropy_init(void *hash_state) + * should not fail. The value of 3 should cover the NTP case being + * performed during our test run. + */ +- if (time_backwards > 3) +- return JENT_ENOMONOTONIC; +- +- /* +- * Variations of deltas of time must on average be larger +- * than 1 to ensure the entropy estimation +- * implied with 1 is preserved +- */ +- if ((delta_sum) <= 1) +- return JENT_EVARVAR; ++ if (time_backwards > 3) { ++ ret = JENT_ENOMONOTONIC; ++ goto out; ++ } + +- /* +- * Ensure that we have variations in the time stamp below 10 for at +- * least 10% of all checks -- on some platforms, the counter increments +- * in multiples of 100, but not always +- */ +- if ((TESTLOOPCOUNT/10 * 9) < count_mod) +- return JENT_ECOARSETIME; ++ /* Did we encounter a health test failure? */ ++ if (jent_rct_failure(ec)) { ++ ret = JENT_ERCT; ++ goto out; ++ } ++ if (jent_apt_failure(ec)) { ++ ret = JENT_EHEALTH; ++ goto out; ++ } + +- /* +- * If we have more than 90% stuck results, then this Jitter RNG is +- * likely to not work well. +- */ +- if ((TESTLOOPCOUNT/10 * 9) < count_stuck) +- return JENT_ESTUCK; ++out: ++ jent_entropy_collector_free(ec); + +- return 0; ++ return ret; + } +diff --git a/crypto/jitterentropy.h b/crypto/jitterentropy.h +index 4c92176ea2b1..626c6228b7e2 100644 +--- a/crypto/jitterentropy.h ++++ b/crypto/jitterentropy.h +@@ -9,7 +9,8 @@ extern int jent_hash_time(void *hash_state, __u64 time, u8 *addtl, + int jent_read_random_block(void *hash_state, char *dst, unsigned int dst_len); + + struct rand_data; +-extern int jent_entropy_init(void *hash_state); ++extern int jent_entropy_init(unsigned int osr, unsigned int flags, ++ void *hash_state); + extern int jent_read_entropy(struct rand_data *ec, unsigned char *data, + unsigned int len); + +-- +2.40.4 + + +From f5508d63a84bb67d6463f6ed2dc0db6c89e5c586 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stephan=20M=C3=BCller?= +Date: Thu, 21 Sep 2023 13:48:33 +0200 +Subject: [PATCH 2/4] crypto: jitter - Allow configuration of memory size + +The memory size consumed by the Jitter RNG is one contributing factor in +the amount of entropy that is gathered. As the amount of entropy +directly correlates with the distance of the memory from the CPU, the +caches that are possibly present on a given system have an impact on the +collected entropy. + +Thus, the kernel compile time should offer a means to configure the +amount of memory used by the Jitter RNG. Although this option could be +turned into a runtime option (e.g. a kernel command line option), it +should remain a compile time option as otherwise adminsitrators who may +not have performed an entropy assessment may select a value that is +inappropriate. + +The default value selected by the configuration is identical to the +current Jitter RNG value. Thus, the patch should not lead to any change +in the Jitter RNG behavior. + +To accommodate larger memory buffers, kvzalloc / kvfree is used. + +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/Kconfig | 39 ++++++++++++++++++++++++++++++++++++ + crypto/jitterentropy-kcapi.c | 11 ++++++++++ + crypto/jitterentropy.c | 16 ++++++++------- + crypto/jitterentropy.h | 2 ++ + 4 files changed, 61 insertions(+), 7 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index fc0f75d8be01..af66aab2cf47 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -1297,6 +1297,45 @@ config CRYPTO_JITTERENTROPY + + See https://www.chronox.de/jent/ + ++choice ++ prompt "CPU Jitter RNG Memory Size" ++ default CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ depends on CRYPTO_JITTERENTROPY ++ help ++ The Jitter RNG measures the execution time of memory accesses. ++ Multiple consecutive memory accesses are performed. If the memory ++ size fits into a cache (e.g. L1), only the memory access timing ++ to that cache is measured. The closer the cache is to the CPU ++ the less variations are measured and thus the less entropy is ++ obtained. Thus, if the memory size fits into the L1 cache, the ++ obtained entropy is less than if the memory size fits within ++ L1 + L2, which in turn is less if the memory fits into ++ L1 + L2 + L3. Thus, by selecting a different memory size, ++ the entropy rate produced by the Jitter RNG can be modified. ++ config CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ bool "2048 Bytes (default)" ++ config CRYPTO_JITTERENTROPY_MEMSIZE_128 ++ bool "128 kBytes" ++ config CRYPTO_JITTERENTROPY_MEMSIZE_1024 ++ bool "1024 kBytes" ++ config CRYPTO_JITTERENTROPY_MEMSIZE_8192 ++ bool "8192 kBytes" ++endchoice ++ ++config CRYPTO_JITTERENTROPY_MEMORY_BLOCKS ++ int ++ default 64 if CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ default 512 if CRYPTO_JITTERENTROPY_MEMSIZE_128 ++ default 1024 if CRYPTO_JITTERENTROPY_MEMSIZE_1024 ++ default 4096 if CRYPTO_JITTERENTROPY_MEMSIZE_8192 ++ ++config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE ++ int ++ default 32 if CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ default 256 if CRYPTO_JITTERENTROPY_MEMSIZE_128 ++ default 1024 if CRYPTO_JITTERENTROPY_MEMSIZE_1024 ++ default 2048 if CRYPTO_JITTERENTROPY_MEMSIZE_8192 ++ + config CRYPTO_JITTERENTROPY_TESTINTERFACE + bool "CPU Jitter RNG Test Interface" + depends on CRYPTO_JITTERENTROPY +diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c +index 1de730f94683..a8e7bbd28c6e 100644 +--- a/crypto/jitterentropy-kcapi.c ++++ b/crypto/jitterentropy-kcapi.c +@@ -54,6 +54,17 @@ + * Helper function + ***************************************************************************/ + ++void *jent_kvzalloc(unsigned int len) ++{ ++ return kvzalloc(len, GFP_KERNEL); ++} ++ ++void jent_kvzfree(void *ptr, unsigned int len) ++{ ++ memzero_explicit(ptr, len); ++ kvfree(ptr); ++} ++ + void *jent_zalloc(unsigned int len) + { + return kzalloc(len, GFP_KERNEL); +diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c +index 1b99ffaa8c34..18bbe2b89a94 100644 +--- a/crypto/jitterentropy.c ++++ b/crypto/jitterentropy.c +@@ -75,10 +75,10 @@ struct rand_data { + + unsigned int flags; /* Flags used to initialize */ + unsigned int osr; /* Oversample rate */ +-#define JENT_MEMORY_BLOCKS 64 +-#define JENT_MEMORY_BLOCKSIZE 32 + #define JENT_MEMORY_ACCESSLOOPS 128 +-#define JENT_MEMORY_SIZE (JENT_MEMORY_BLOCKS*JENT_MEMORY_BLOCKSIZE) ++#define JENT_MEMORY_SIZE \ ++ (CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS * \ ++ CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE) + unsigned char *mem; /* Memory access location with size of + * memblocks * memblocksize */ + unsigned int memlocation; /* Pointer to byte in *mem */ +@@ -650,13 +650,15 @@ struct rand_data *jent_entropy_collector_alloc(unsigned int osr, + /* Allocate memory for adding variations based on memory + * access + */ +- entropy_collector->mem = jent_zalloc(JENT_MEMORY_SIZE); ++ entropy_collector->mem = jent_kvzalloc(JENT_MEMORY_SIZE); + if (!entropy_collector->mem) { + jent_zfree(entropy_collector); + return NULL; + } +- entropy_collector->memblocksize = JENT_MEMORY_BLOCKSIZE; +- entropy_collector->memblocks = JENT_MEMORY_BLOCKS; ++ entropy_collector->memblocksize = ++ CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE; ++ entropy_collector->memblocks = ++ CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS; + entropy_collector->memaccessloops = JENT_MEMORY_ACCESSLOOPS; + } + +@@ -679,7 +681,7 @@ struct rand_data *jent_entropy_collector_alloc(unsigned int osr, + + void jent_entropy_collector_free(struct rand_data *entropy_collector) + { +- jent_zfree(entropy_collector->mem); ++ jent_kvzfree(entropy_collector->mem, JENT_MEMORY_SIZE); + entropy_collector->mem = NULL; + jent_zfree(entropy_collector); + } +diff --git a/crypto/jitterentropy.h b/crypto/jitterentropy.h +index 626c6228b7e2..e31661ee00d3 100644 +--- a/crypto/jitterentropy.h ++++ b/crypto/jitterentropy.h +@@ -1,5 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + ++extern void *jent_kvzalloc(unsigned int len); ++extern void jent_kvzfree(void *ptr, unsigned int len); + extern void *jent_zalloc(unsigned int len); + extern void jent_zfree(void *ptr); + extern void jent_get_nstime(__u64 *out); +-- +2.40.4 + + +From afca13478837945571efb9dc00dbaa7dbaffec18 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stephan=20M=C3=BCller?= +Date: Thu, 21 Sep 2023 13:48:59 +0200 +Subject: [PATCH 3/4] crypto: jitter - Allow configuration of oversampling rate + +The oversampling rate used by the Jitter RNG allows the configuration of +the heuristically implied entropy in one timing measurement. This +entropy rate is (1 / OSR) bits of entropy per time stamp. + +Considering that the Jitter RNG now support APT/RCT health tests for +different OSRs, allow this value to be configured at compile time to +support systems with limited amount of entropy in their timer. + +The allowed range of OSR values complies with the APT/RCT cutoff health +test values which range from 1 through 15. + +The default value of the OSR selection support is left at 1 which is the +current default. Thus, the addition of the configuration support does +not alter the default Jitter RNG behavior. + +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/Kconfig | 17 +++++++++++++++++ + crypto/jitterentropy-kcapi.c | 6 ++++-- + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index af66aab2cf47..4789e5864ef5 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -1336,6 +1336,23 @@ config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE + default 1024 if CRYPTO_JITTERENTROPY_MEMSIZE_1024 + default 2048 if CRYPTO_JITTERENTROPY_MEMSIZE_8192 + ++config CRYPTO_JITTERENTROPY_OSR ++ int "CPU Jitter RNG Oversampling Rate" ++ range 1 15 ++ default 1 ++ depends on CRYPTO_JITTERENTROPY ++ help ++ The Jitter RNG allows the specification of an oversampling rate (OSR). ++ The Jitter RNG operation requires a fixed amount of timing ++ measurements to produce one output block of random numbers. The ++ OSR value is multiplied with the amount of timing measurements to ++ generate one output block. Thus, the timing measurement is oversampled ++ by the OSR factor. The oversampling allows the Jitter RNG to operate ++ on hardware whose timers deliver limited amount of entropy (e.g. ++ the timer is coarse) by setting the OSR to a higher value. The ++ trade-off, however, is that the Jitter RNG now requires more time ++ to generate random numbers. ++ + config CRYPTO_JITTERENTROPY_TESTINTERFACE + bool "CPU Jitter RNG Test Interface" + depends on CRYPTO_JITTERENTROPY +diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c +index a8e7bbd28c6e..0c6752221451 100644 +--- a/crypto/jitterentropy-kcapi.c ++++ b/crypto/jitterentropy-kcapi.c +@@ -256,7 +256,9 @@ static int jent_kcapi_init(struct crypto_tfm *tfm) + crypto_shash_init(sdesc); + rng->sdesc = sdesc; + +- rng->entropy_collector = jent_entropy_collector_alloc(0, 0, sdesc); ++ rng->entropy_collector = ++ jent_entropy_collector_alloc(CONFIG_CRYPTO_JITTERENTROPY_OSR, 0, ++ sdesc); + if (!rng->entropy_collector) { + ret = -ENOMEM; + goto err; +@@ -345,7 +347,7 @@ static int __init jent_mod_init(void) + + desc->tfm = tfm; + crypto_shash_init(desc); +- ret = jent_entropy_init(0, 0, desc); ++ ret = jent_entropy_init(CONFIG_CRYPTO_JITTERENTROPY_OSR, 0, desc); + shash_desc_zero(desc); + crypto_free_shash(tfm); + if (ret) { +-- +2.40.4 + + +From 324c2a3b7107ae5aceceab9ae9518077ca56c6d7 Mon Sep 17 00:00:00 2001 +From: Stephan Mueller +Date: Mon, 12 Aug 2024 08:25:42 +0200 +Subject: [PATCH 4/4] crypto: jitter - set default OSR to 3 + +The user space Jitter RNG library uses the oversampling rate of 3 which +implies that each time stamp is credited with 1/3 bit of entropy. To +obtain 256 bits of entropy, 768 time stamps need to be sampled. The +increase in OSR is applied based on a report where the Jitter RNG is +used on a system exhibiting a challenging environment to collect +entropy. + +This OSR default value is now applied to the Linux kernel version of +the Jitter RNG as well. + +The increase in the OSR from 1 to 3 also implies that the Jitter RNG is +now slower by default. + +Reported-by: Jeff Barnes +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index 4789e5864ef5..17c2890fa0b2 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -1339,7 +1339,7 @@ config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE + config CRYPTO_JITTERENTROPY_OSR + int "CPU Jitter RNG Oversampling Rate" + range 1 15 +- default 1 ++ default 3 + depends on CRYPTO_JITTERENTROPY + help + The Jitter RNG allows the specification of an oversampling rate (OSR). +-- +2.40.4 + diff --git a/SPECS/kernel-64k/kernel-64k.signatures.json b/SPECS/kernel-64k/kernel-64k.signatures.json index fc6edbea401..07b60d47bd7 100644 --- a/SPECS/kernel-64k/kernel-64k.signatures.json +++ b/SPECS/kernel-64k/kernel-64k.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", - "config_aarch64": "083cdb49d1d26855db4b60dd044e4ce38e71d9bd0ce583997078681127c4c6c6", + "config_aarch64": "7a3bbc0673c96c95d7f3ed505b1533830bc433eb4b0cb06bbc4d75ac2bb65ee9", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", diff --git a/SPECS/kernel-64k/kernel-64k.spec b/SPECS/kernel-64k/kernel-64k.spec index b99776fab62..89c8a1fb89d 100644 --- a/SPECS/kernel-64k/kernel-64k.spec +++ b/SPECS/kernel-64k/kernel-64k.spec @@ -25,7 +25,7 @@ Summary: Linux Kernel Name: kernel-64k Version: 6.6.64.2 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -39,6 +39,7 @@ Source4: cpupower Source5: cpupower.service Patch0: 0001-add-mstflint-kernel-%{mstflintver}.patch Patch1: 0002-Increase-EFI_MMAP_NR_SLACK_SLOTS-for-GB200.patch +Patch2: jent-init-fix.patch ExclusiveArch: aarch64 BuildRequires: audit-devel BuildRequires: bash @@ -370,6 +371,13 @@ echo "initrd of kernel %{uname_r} removed" >&2 %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Wed Feb 05 2025 Tobias Brick - 6.6.64.2-9 +- Apply upstream patches to fix kernel panic in jitterentropy initialization on + ARM64 FIPS boot + +* Tue Feb 04 2025 Alberto David Perez Guevara - 6.6.64.2-8 +- Bump release to match kernel + * Fri Jan 31 2025 Alberto David Perez Guevara - 6.6.64.2-7 - Bump release to match kernel diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 91810604f25..ca6fb77bae5 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -14,7 +14,7 @@ Summary: Linux API header files Name: kernel-headers Version: 6.6.64.2 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -75,6 +75,12 @@ done %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 6.6.64.2-9 +- Bump release to match kernel + +* Tue Feb 04 2025 Alberto David Perez Guevara - 6.6.64.2-8 +- Bump release to match kernel + * Fri Jan 31 2025 Alberto David Perez Guevara - 6.6.64.2-7 - Bump release to match kernel diff --git a/SPECS/kernel/config b/SPECS/kernel/config index d2e30e132a5..49dae636ca9 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -1106,7 +1106,7 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y CONFIG_ARCH_HAS_PTE_DEVMAP=y CONFIG_ARCH_HAS_ZONE_DMA_SET=y -CONFIG_ZONE_DMA=y +# CONFIG_ZONE_DMA is not set CONFIG_ZONE_DMA32=y CONFIG_ZONE_DEVICE=y CONFIG_HMM_MIRROR=y @@ -5063,9 +5063,7 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_AC97_POWER_SAVE is not set CONFIG_SND_PCI=y # CONFIG_SND_AD1889 is not set -# CONFIG_SND_ALS300 is not set # CONFIG_SND_ALS4000 is not set -# CONFIG_SND_ALI5451 is not set # CONFIG_SND_ASIHPI is not set # CONFIG_SND_ATIIXP is not set # CONFIG_SND_ATIIXP_MODEM is not set @@ -5073,7 +5071,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_AU8820 is not set # CONFIG_SND_AU8830 is not set # CONFIG_SND_AW2 is not set -# CONFIG_SND_AZT3328 is not set # CONFIG_SND_BT87X is not set # CONFIG_SND_CA0106 is not set # CONFIG_SND_CMIPCI is not set @@ -5095,23 +5092,17 @@ CONFIG_SND_PCI=y # CONFIG_SND_INDIGODJ is not set # CONFIG_SND_INDIGOIOX is not set # CONFIG_SND_INDIGODJX is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_EMU10K1X is not set # CONFIG_SND_ENS1370 is not set CONFIG_SND_ENS1371=m -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set # CONFIG_SND_FM801 is not set # CONFIG_SND_HDSP is not set # CONFIG_SND_HDSPM is not set -# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1724 is not set # CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_KORG1212 is not set # CONFIG_SND_LOLA is not set # CONFIG_SND_LX6464ES is not set -# CONFIG_SND_MAESTRO3 is not set # CONFIG_SND_MIXART is not set # CONFIG_SND_NM256 is not set # CONFIG_SND_PCXHR is not set @@ -5120,8 +5111,6 @@ CONFIG_SND_ENS1371=m # CONFIG_SND_RME96 is not set # CONFIG_SND_RME9652 is not set # CONFIG_SND_SE6X is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_TRIDENT is not set # CONFIG_SND_VIA82XX is not set # CONFIG_SND_VIA82XX_MODEM is not set # CONFIG_SND_VIRTUOSO is not set @@ -7640,6 +7629,13 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=3 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set # end of Random number generation diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index d01138a582b..498ef6bca40 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -10678,6 +10678,13 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set +# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=3 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set # end of Random number generation diff --git a/SPECS/kernel/jent-init-fix.patch b/SPECS/kernel/jent-init-fix.patch new file mode 100644 index 00000000000..28c9cb835b4 --- /dev/null +++ b/SPECS/kernel/jent-init-fix.patch @@ -0,0 +1,746 @@ +From bf0bd689d17bd56558250f7cae643ffb26e196a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stephan=20M=C3=BCller?= +Date: Thu, 21 Sep 2023 13:48:11 +0200 +Subject: [PATCH 1/4] crypto: jitter - add RCT/APT support for different OSRs + +The oversampling rate (OSR) value specifies the heuristically implied +entropy in the recorded data - H_submitter = 1/osr. A different entropy +estimate implies a different APT/RCT cutoff value. This change adds +support for OSRs 1 through 15. This OSR can be selected by the caller +of the Jitter RNG. + +For this patch, the caller still uses one hard-coded OSR. A subsequent +patch allows this value to be configured. + +In addition, the power-up self test is adjusted as follows: + +* It allows the caller to provide an oversampling rate that should be +tested with - commonly it should be the same as used for the actual +runtime operation. This makes the power-up testing therefore consistent +with the runtime operation. + +* It calls now jent_measure_jitter (i.e. collects the full entropy +that can possibly be harvested by the Jitter RNG) instead of only +jent_condition_data (which only returns the entropy harvested from +the conditioning component). This should now alleviate reports where +the Jitter RNG initialization thinks there is too little entropy. + +* The power-up test now solely relies on the (enhanced) APT and RCT +test that is used as a health test at runtime. + +The code allowing the different OSRs as well as the power-up test +changes are present in the user space version of the Jitter RNG 3.4.1 +and thus was already in production use for some time. + +Reported-by "Ospan, Abylay" +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/jitterentropy-kcapi.c | 4 +- + crypto/jitterentropy.c | 233 ++++++++++++++++++----------------- + crypto/jitterentropy.h | 3 +- + 3 files changed, 123 insertions(+), 117 deletions(-) + +diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c +index 7d1463a1562a..1de730f94683 100644 +--- a/crypto/jitterentropy-kcapi.c ++++ b/crypto/jitterentropy-kcapi.c +@@ -245,7 +245,7 @@ static int jent_kcapi_init(struct crypto_tfm *tfm) + crypto_shash_init(sdesc); + rng->sdesc = sdesc; + +- rng->entropy_collector = jent_entropy_collector_alloc(1, 0, sdesc); ++ rng->entropy_collector = jent_entropy_collector_alloc(0, 0, sdesc); + if (!rng->entropy_collector) { + ret = -ENOMEM; + goto err; +@@ -334,7 +334,7 @@ static int __init jent_mod_init(void) + + desc->tfm = tfm; + crypto_shash_init(desc); +- ret = jent_entropy_init(desc); ++ ret = jent_entropy_init(0, 0, desc); + shash_desc_zero(desc); + crypto_free_shash(tfm); + if (ret) { +diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c +index fe9c233ec769..1b99ffaa8c34 100644 +--- a/crypto/jitterentropy.c ++++ b/crypto/jitterentropy.c +@@ -72,6 +72,8 @@ struct rand_data { + __u64 prev_time; /* SENSITIVE Previous time stamp */ + __u64 last_delta; /* SENSITIVE stuck test */ + __s64 last_delta2; /* SENSITIVE stuck test */ ++ ++ unsigned int flags; /* Flags used to initialize */ + unsigned int osr; /* Oversample rate */ + #define JENT_MEMORY_BLOCKS 64 + #define JENT_MEMORY_BLOCKSIZE 32 +@@ -88,16 +90,9 @@ struct rand_data { + /* Repetition Count Test */ + unsigned int rct_count; /* Number of stuck values */ + +- /* Intermittent health test failure threshold of 2^-30 */ +- /* From an SP800-90B perspective, this RCT cutoff value is equal to 31. */ +- /* However, our RCT implementation starts at 1, so we subtract 1 here. */ +-#define JENT_RCT_CUTOFF (31 - 1) /* Taken from SP800-90B sec 4.4.1 */ +-#define JENT_APT_CUTOFF 325 /* Taken from SP800-90B sec 4.4.2 */ +- /* Permanent health test failure threshold of 2^-60 */ +- /* From an SP800-90B perspective, this RCT cutoff value is equal to 61. */ +- /* However, our RCT implementation starts at 1, so we subtract 1 here. */ +-#define JENT_RCT_CUTOFF_PERMANENT (61 - 1) +-#define JENT_APT_CUTOFF_PERMANENT 355 ++ /* Adaptive Proportion Test cutoff values */ ++ unsigned int apt_cutoff; /* Intermittent health test failure */ ++ unsigned int apt_cutoff_permanent; /* Permanent health test failure */ + #define JENT_APT_WINDOW_SIZE 512 /* Data window size */ + /* LSB of time stamp to process */ + #define JENT_APT_LSB 16 +@@ -122,6 +117,9 @@ struct rand_data { + * zero). */ + #define JENT_ESTUCK 8 /* Too many stuck results during init. */ + #define JENT_EHEALTH 9 /* Health test failed during initialization */ ++#define JENT_ERCT 10 /* RCT failed during initialization */ ++#define JENT_EHASH 11 /* Hash self test failed */ ++#define JENT_EMEM 12 /* Can't allocate memory for initialization */ + + /* + * The output n bits can receive more than n bits of min entropy, of course, +@@ -147,6 +145,48 @@ struct rand_data { + * This test complies with SP800-90B section 4.4.2. + ***************************************************************************/ + ++/* ++ * See the SP 800-90B comment #10b for the corrected cutoff for the SP 800-90B ++ * APT. ++ * http://www.untruth.org/~josh/sp80090b/UL%20SP800-90B-final%20comments%20v1.9%2020191212.pdf ++ * In in the syntax of R, this is C = 2 + qbinom(1 − 2^(−30), 511, 2^(-1/osr)). ++ * (The original formula wasn't correct because the first symbol must ++ * necessarily have been observed, so there is no chance of observing 0 of these ++ * symbols.) ++ * ++ * For the alpha < 2^-53, R cannot be used as it uses a float data type without ++ * arbitrary precision. A SageMath script is used to calculate those cutoff ++ * values. ++ * ++ * For any value above 14, this yields the maximal allowable value of 512 ++ * (by FIPS 140-2 IG 7.19 Resolution # 16, we cannot choose a cutoff value that ++ * renders the test unable to fail). ++ */ ++static const unsigned int jent_apt_cutoff_lookup[15] = { ++ 325, 422, 459, 477, 488, 494, 499, 502, ++ 505, 507, 508, 509, 510, 511, 512 }; ++static const unsigned int jent_apt_cutoff_permanent_lookup[15] = { ++ 355, 447, 479, 494, 502, 507, 510, 512, ++ 512, 512, 512, 512, 512, 512, 512 }; ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ++ ++static void jent_apt_init(struct rand_data *ec, unsigned int osr) ++{ ++ /* ++ * Establish the apt_cutoff based on the presumed entropy rate of ++ * 1/osr. ++ */ ++ if (osr >= ARRAY_SIZE(jent_apt_cutoff_lookup)) { ++ ec->apt_cutoff = jent_apt_cutoff_lookup[ ++ ARRAY_SIZE(jent_apt_cutoff_lookup) - 1]; ++ ec->apt_cutoff_permanent = jent_apt_cutoff_permanent_lookup[ ++ ARRAY_SIZE(jent_apt_cutoff_permanent_lookup) - 1]; ++ } else { ++ ec->apt_cutoff = jent_apt_cutoff_lookup[osr - 1]; ++ ec->apt_cutoff_permanent = ++ jent_apt_cutoff_permanent_lookup[osr - 1]; ++ } ++} + /* + * Reset the APT counter + * +@@ -187,12 +227,12 @@ static void jent_apt_insert(struct rand_data *ec, unsigned int delta_masked) + /* APT health test failure detection */ + static int jent_apt_permanent_failure(struct rand_data *ec) + { +- return (ec->apt_count >= JENT_APT_CUTOFF_PERMANENT) ? 1 : 0; ++ return (ec->apt_count >= ec->apt_cutoff_permanent) ? 1 : 0; + } + + static int jent_apt_failure(struct rand_data *ec) + { +- return (ec->apt_count >= JENT_APT_CUTOFF) ? 1 : 0; ++ return (ec->apt_count >= ec->apt_cutoff) ? 1 : 0; + } + + /*************************************************************************** +@@ -275,15 +315,28 @@ static int jent_stuck(struct rand_data *ec, __u64 current_delta) + return 0; + } + +-/* RCT health test failure detection */ ++/* ++ * The cutoff value is based on the following consideration: ++ * alpha = 2^-30 or 2^-60 as recommended in SP800-90B. ++ * In addition, we require an entropy value H of 1/osr as this is the minimum ++ * entropy required to provide full entropy. ++ * Note, we collect (DATA_SIZE_BITS + ENTROPY_SAFETY_FACTOR)*osr deltas for ++ * inserting them into the entropy pool which should then have (close to) ++ * DATA_SIZE_BITS bits of entropy in the conditioned output. ++ * ++ * Note, ec->rct_count (which equals to value B in the pseudo code of SP800-90B ++ * section 4.4.1) starts with zero. Hence we need to subtract one from the ++ * cutoff value as calculated following SP800-90B. Thus ++ * C = ceil(-log_2(alpha)/H) = 30*osr or 60*osr. ++ */ + static int jent_rct_permanent_failure(struct rand_data *ec) + { +- return (ec->rct_count >= JENT_RCT_CUTOFF_PERMANENT) ? 1 : 0; ++ return (ec->rct_count >= (60 * ec->osr)) ? 1 : 0; + } + + static int jent_rct_failure(struct rand_data *ec) + { +- return (ec->rct_count >= JENT_RCT_CUTOFF) ? 1 : 0; ++ return (ec->rct_count >= (30 * ec->osr)) ? 1 : 0; + } + + /* Report of health test failures */ +@@ -448,7 +501,7 @@ static void jent_memaccess(struct rand_data *ec, __u64 loop_cnt) + * + * @return result of stuck test + */ +-static int jent_measure_jitter(struct rand_data *ec) ++static int jent_measure_jitter(struct rand_data *ec, __u64 *ret_current_delta) + { + __u64 time = 0; + __u64 current_delta = 0; +@@ -472,6 +525,10 @@ static int jent_measure_jitter(struct rand_data *ec) + if (jent_condition_data(ec, current_delta, stuck)) + stuck = 1; + ++ /* return the raw entropy value */ ++ if (ret_current_delta) ++ *ret_current_delta = current_delta; ++ + return stuck; + } + +@@ -489,11 +546,11 @@ static void jent_gen_entropy(struct rand_data *ec) + safety_factor = JENT_ENTROPY_SAFETY_FACTOR; + + /* priming of the ->prev_time value */ +- jent_measure_jitter(ec); ++ jent_measure_jitter(ec, NULL); + + while (!jent_health_failure(ec)) { + /* If a stuck measurement is received, repeat measurement */ +- if (jent_measure_jitter(ec)) ++ if (jent_measure_jitter(ec, NULL)) + continue; + + /* +@@ -554,7 +611,8 @@ int jent_read_entropy(struct rand_data *ec, unsigned char *data, + * Perform startup health tests and return permanent + * error if it fails. + */ +- if (jent_entropy_init(ec->hash_state)) ++ if (jent_entropy_init(ec->osr, ec->flags, ++ ec->hash_state)) + return -3; + + return -2; +@@ -604,11 +662,15 @@ struct rand_data *jent_entropy_collector_alloc(unsigned int osr, + + /* verify and set the oversampling rate */ + if (osr == 0) +- osr = 1; /* minimum sampling rate is 1 */ ++ osr = 1; /* H_submitter = 1 / osr */ + entropy_collector->osr = osr; ++ entropy_collector->flags = flags; + + entropy_collector->hash_state = hash_state; + ++ /* Initialize the APT */ ++ jent_apt_init(entropy_collector, osr); ++ + /* fill the data pad with non-zero values */ + jent_gen_entropy(entropy_collector); + +@@ -622,20 +684,14 @@ void jent_entropy_collector_free(struct rand_data *entropy_collector) + jent_zfree(entropy_collector); + } + +-int jent_entropy_init(void *hash_state) ++int jent_entropy_init(unsigned int osr, unsigned int flags, void *hash_state) + { +- int i; +- __u64 delta_sum = 0; +- __u64 old_delta = 0; +- unsigned int nonstuck = 0; +- int time_backwards = 0; +- int count_mod = 0; +- int count_stuck = 0; +- struct rand_data ec = { 0 }; +- +- /* Required for RCT */ +- ec.osr = 1; +- ec.hash_state = hash_state; ++ struct rand_data *ec; ++ int i, time_backwards = 0, ret = 0; ++ ++ ec = jent_entropy_collector_alloc(osr, flags, hash_state); ++ if (!ec) ++ return JENT_EMEM; + + /* We could perform statistical tests here, but the problem is + * that we only have a few loop counts to do testing. These +@@ -664,31 +720,28 @@ int jent_entropy_init(void *hash_state) + #define TESTLOOPCOUNT 1024 + #define CLEARCACHE 100 + for (i = 0; (TESTLOOPCOUNT + CLEARCACHE) > i; i++) { +- __u64 time = 0; +- __u64 time2 = 0; +- __u64 delta = 0; +- unsigned int lowdelta = 0; +- int stuck; ++ __u64 start_time = 0, end_time = 0, delta = 0; + + /* Invoke core entropy collection logic */ +- jent_get_nstime(&time); +- ec.prev_time = time; +- jent_condition_data(&ec, time, 0); +- jent_get_nstime(&time2); ++ jent_measure_jitter(ec, &delta); ++ end_time = ec->prev_time; ++ start_time = ec->prev_time - delta; + + /* test whether timer works */ +- if (!time || !time2) +- return JENT_ENOTIME; +- delta = jent_delta(time, time2); ++ if (!start_time || !end_time) { ++ ret = JENT_ENOTIME; ++ goto out; ++ } ++ + /* + * test whether timer is fine grained enough to provide + * delta even when called shortly after each other -- this + * implies that we also have a high resolution timer + */ +- if (!delta) +- return JENT_ECOARSETIME; +- +- stuck = jent_stuck(&ec, delta); ++ if (!delta || (end_time == start_time)) { ++ ret = JENT_ECOARSETIME; ++ goto out; ++ } + + /* + * up to here we did not modify any variable that will be +@@ -700,49 +753,9 @@ int jent_entropy_init(void *hash_state) + if (i < CLEARCACHE) + continue; + +- if (stuck) +- count_stuck++; +- else { +- nonstuck++; +- +- /* +- * Ensure that the APT succeeded. +- * +- * With the check below that count_stuck must be less +- * than 10% of the overall generated raw entropy values +- * it is guaranteed that the APT is invoked at +- * floor((TESTLOOPCOUNT * 0.9) / 64) == 14 times. +- */ +- if ((nonstuck % JENT_APT_WINDOW_SIZE) == 0) { +- jent_apt_reset(&ec, +- delta & JENT_APT_WORD_MASK); +- } +- } +- +- /* Validate health test result */ +- if (jent_health_failure(&ec)) +- return JENT_EHEALTH; +- + /* test whether we have an increasing timer */ +- if (!(time2 > time)) ++ if (!(end_time > start_time)) + time_backwards++; +- +- /* use 32 bit value to ensure compilation on 32 bit arches */ +- lowdelta = time2 - time; +- if (!(lowdelta % 100)) +- count_mod++; +- +- /* +- * ensure that we have a varying delta timer which is necessary +- * for the calculation of entropy -- perform this check +- * only after the first loop is executed as we need to prime +- * the old_data value +- */ +- if (delta > old_delta) +- delta_sum += (delta - old_delta); +- else +- delta_sum += (old_delta - delta); +- old_delta = delta; + } + + /* +@@ -752,31 +765,23 @@ int jent_entropy_init(void *hash_state) + * should not fail. The value of 3 should cover the NTP case being + * performed during our test run. + */ +- if (time_backwards > 3) +- return JENT_ENOMONOTONIC; +- +- /* +- * Variations of deltas of time must on average be larger +- * than 1 to ensure the entropy estimation +- * implied with 1 is preserved +- */ +- if ((delta_sum) <= 1) +- return JENT_EVARVAR; ++ if (time_backwards > 3) { ++ ret = JENT_ENOMONOTONIC; ++ goto out; ++ } + +- /* +- * Ensure that we have variations in the time stamp below 10 for at +- * least 10% of all checks -- on some platforms, the counter increments +- * in multiples of 100, but not always +- */ +- if ((TESTLOOPCOUNT/10 * 9) < count_mod) +- return JENT_ECOARSETIME; ++ /* Did we encounter a health test failure? */ ++ if (jent_rct_failure(ec)) { ++ ret = JENT_ERCT; ++ goto out; ++ } ++ if (jent_apt_failure(ec)) { ++ ret = JENT_EHEALTH; ++ goto out; ++ } + +- /* +- * If we have more than 90% stuck results, then this Jitter RNG is +- * likely to not work well. +- */ +- if ((TESTLOOPCOUNT/10 * 9) < count_stuck) +- return JENT_ESTUCK; ++out: ++ jent_entropy_collector_free(ec); + +- return 0; ++ return ret; + } +diff --git a/crypto/jitterentropy.h b/crypto/jitterentropy.h +index 4c92176ea2b1..626c6228b7e2 100644 +--- a/crypto/jitterentropy.h ++++ b/crypto/jitterentropy.h +@@ -9,7 +9,8 @@ extern int jent_hash_time(void *hash_state, __u64 time, u8 *addtl, + int jent_read_random_block(void *hash_state, char *dst, unsigned int dst_len); + + struct rand_data; +-extern int jent_entropy_init(void *hash_state); ++extern int jent_entropy_init(unsigned int osr, unsigned int flags, ++ void *hash_state); + extern int jent_read_entropy(struct rand_data *ec, unsigned char *data, + unsigned int len); + +-- +2.40.4 + + +From f5508d63a84bb67d6463f6ed2dc0db6c89e5c586 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stephan=20M=C3=BCller?= +Date: Thu, 21 Sep 2023 13:48:33 +0200 +Subject: [PATCH 2/4] crypto: jitter - Allow configuration of memory size + +The memory size consumed by the Jitter RNG is one contributing factor in +the amount of entropy that is gathered. As the amount of entropy +directly correlates with the distance of the memory from the CPU, the +caches that are possibly present on a given system have an impact on the +collected entropy. + +Thus, the kernel compile time should offer a means to configure the +amount of memory used by the Jitter RNG. Although this option could be +turned into a runtime option (e.g. a kernel command line option), it +should remain a compile time option as otherwise adminsitrators who may +not have performed an entropy assessment may select a value that is +inappropriate. + +The default value selected by the configuration is identical to the +current Jitter RNG value. Thus, the patch should not lead to any change +in the Jitter RNG behavior. + +To accommodate larger memory buffers, kvzalloc / kvfree is used. + +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/Kconfig | 39 ++++++++++++++++++++++++++++++++++++ + crypto/jitterentropy-kcapi.c | 11 ++++++++++ + crypto/jitterentropy.c | 16 ++++++++------- + crypto/jitterentropy.h | 2 ++ + 4 files changed, 61 insertions(+), 7 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index fc0f75d8be01..af66aab2cf47 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -1297,6 +1297,45 @@ config CRYPTO_JITTERENTROPY + + See https://www.chronox.de/jent/ + ++choice ++ prompt "CPU Jitter RNG Memory Size" ++ default CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ depends on CRYPTO_JITTERENTROPY ++ help ++ The Jitter RNG measures the execution time of memory accesses. ++ Multiple consecutive memory accesses are performed. If the memory ++ size fits into a cache (e.g. L1), only the memory access timing ++ to that cache is measured. The closer the cache is to the CPU ++ the less variations are measured and thus the less entropy is ++ obtained. Thus, if the memory size fits into the L1 cache, the ++ obtained entropy is less than if the memory size fits within ++ L1 + L2, which in turn is less if the memory fits into ++ L1 + L2 + L3. Thus, by selecting a different memory size, ++ the entropy rate produced by the Jitter RNG can be modified. ++ config CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ bool "2048 Bytes (default)" ++ config CRYPTO_JITTERENTROPY_MEMSIZE_128 ++ bool "128 kBytes" ++ config CRYPTO_JITTERENTROPY_MEMSIZE_1024 ++ bool "1024 kBytes" ++ config CRYPTO_JITTERENTROPY_MEMSIZE_8192 ++ bool "8192 kBytes" ++endchoice ++ ++config CRYPTO_JITTERENTROPY_MEMORY_BLOCKS ++ int ++ default 64 if CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ default 512 if CRYPTO_JITTERENTROPY_MEMSIZE_128 ++ default 1024 if CRYPTO_JITTERENTROPY_MEMSIZE_1024 ++ default 4096 if CRYPTO_JITTERENTROPY_MEMSIZE_8192 ++ ++config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE ++ int ++ default 32 if CRYPTO_JITTERENTROPY_MEMSIZE_2 ++ default 256 if CRYPTO_JITTERENTROPY_MEMSIZE_128 ++ default 1024 if CRYPTO_JITTERENTROPY_MEMSIZE_1024 ++ default 2048 if CRYPTO_JITTERENTROPY_MEMSIZE_8192 ++ + config CRYPTO_JITTERENTROPY_TESTINTERFACE + bool "CPU Jitter RNG Test Interface" + depends on CRYPTO_JITTERENTROPY +diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c +index 1de730f94683..a8e7bbd28c6e 100644 +--- a/crypto/jitterentropy-kcapi.c ++++ b/crypto/jitterentropy-kcapi.c +@@ -54,6 +54,17 @@ + * Helper function + ***************************************************************************/ + ++void *jent_kvzalloc(unsigned int len) ++{ ++ return kvzalloc(len, GFP_KERNEL); ++} ++ ++void jent_kvzfree(void *ptr, unsigned int len) ++{ ++ memzero_explicit(ptr, len); ++ kvfree(ptr); ++} ++ + void *jent_zalloc(unsigned int len) + { + return kzalloc(len, GFP_KERNEL); +diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c +index 1b99ffaa8c34..18bbe2b89a94 100644 +--- a/crypto/jitterentropy.c ++++ b/crypto/jitterentropy.c +@@ -75,10 +75,10 @@ struct rand_data { + + unsigned int flags; /* Flags used to initialize */ + unsigned int osr; /* Oversample rate */ +-#define JENT_MEMORY_BLOCKS 64 +-#define JENT_MEMORY_BLOCKSIZE 32 + #define JENT_MEMORY_ACCESSLOOPS 128 +-#define JENT_MEMORY_SIZE (JENT_MEMORY_BLOCKS*JENT_MEMORY_BLOCKSIZE) ++#define JENT_MEMORY_SIZE \ ++ (CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS * \ ++ CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE) + unsigned char *mem; /* Memory access location with size of + * memblocks * memblocksize */ + unsigned int memlocation; /* Pointer to byte in *mem */ +@@ -650,13 +650,15 @@ struct rand_data *jent_entropy_collector_alloc(unsigned int osr, + /* Allocate memory for adding variations based on memory + * access + */ +- entropy_collector->mem = jent_zalloc(JENT_MEMORY_SIZE); ++ entropy_collector->mem = jent_kvzalloc(JENT_MEMORY_SIZE); + if (!entropy_collector->mem) { + jent_zfree(entropy_collector); + return NULL; + } +- entropy_collector->memblocksize = JENT_MEMORY_BLOCKSIZE; +- entropy_collector->memblocks = JENT_MEMORY_BLOCKS; ++ entropy_collector->memblocksize = ++ CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE; ++ entropy_collector->memblocks = ++ CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS; + entropy_collector->memaccessloops = JENT_MEMORY_ACCESSLOOPS; + } + +@@ -679,7 +681,7 @@ struct rand_data *jent_entropy_collector_alloc(unsigned int osr, + + void jent_entropy_collector_free(struct rand_data *entropy_collector) + { +- jent_zfree(entropy_collector->mem); ++ jent_kvzfree(entropy_collector->mem, JENT_MEMORY_SIZE); + entropy_collector->mem = NULL; + jent_zfree(entropy_collector); + } +diff --git a/crypto/jitterentropy.h b/crypto/jitterentropy.h +index 626c6228b7e2..e31661ee00d3 100644 +--- a/crypto/jitterentropy.h ++++ b/crypto/jitterentropy.h +@@ -1,5 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + ++extern void *jent_kvzalloc(unsigned int len); ++extern void jent_kvzfree(void *ptr, unsigned int len); + extern void *jent_zalloc(unsigned int len); + extern void jent_zfree(void *ptr); + extern void jent_get_nstime(__u64 *out); +-- +2.40.4 + + +From afca13478837945571efb9dc00dbaa7dbaffec18 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stephan=20M=C3=BCller?= +Date: Thu, 21 Sep 2023 13:48:59 +0200 +Subject: [PATCH 3/4] crypto: jitter - Allow configuration of oversampling rate + +The oversampling rate used by the Jitter RNG allows the configuration of +the heuristically implied entropy in one timing measurement. This +entropy rate is (1 / OSR) bits of entropy per time stamp. + +Considering that the Jitter RNG now support APT/RCT health tests for +different OSRs, allow this value to be configured at compile time to +support systems with limited amount of entropy in their timer. + +The allowed range of OSR values complies with the APT/RCT cutoff health +test values which range from 1 through 15. + +The default value of the OSR selection support is left at 1 which is the +current default. Thus, the addition of the configuration support does +not alter the default Jitter RNG behavior. + +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/Kconfig | 17 +++++++++++++++++ + crypto/jitterentropy-kcapi.c | 6 ++++-- + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index af66aab2cf47..4789e5864ef5 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -1336,6 +1336,23 @@ config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE + default 1024 if CRYPTO_JITTERENTROPY_MEMSIZE_1024 + default 2048 if CRYPTO_JITTERENTROPY_MEMSIZE_8192 + ++config CRYPTO_JITTERENTROPY_OSR ++ int "CPU Jitter RNG Oversampling Rate" ++ range 1 15 ++ default 1 ++ depends on CRYPTO_JITTERENTROPY ++ help ++ The Jitter RNG allows the specification of an oversampling rate (OSR). ++ The Jitter RNG operation requires a fixed amount of timing ++ measurements to produce one output block of random numbers. The ++ OSR value is multiplied with the amount of timing measurements to ++ generate one output block. Thus, the timing measurement is oversampled ++ by the OSR factor. The oversampling allows the Jitter RNG to operate ++ on hardware whose timers deliver limited amount of entropy (e.g. ++ the timer is coarse) by setting the OSR to a higher value. The ++ trade-off, however, is that the Jitter RNG now requires more time ++ to generate random numbers. ++ + config CRYPTO_JITTERENTROPY_TESTINTERFACE + bool "CPU Jitter RNG Test Interface" + depends on CRYPTO_JITTERENTROPY +diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c +index a8e7bbd28c6e..0c6752221451 100644 +--- a/crypto/jitterentropy-kcapi.c ++++ b/crypto/jitterentropy-kcapi.c +@@ -256,7 +256,9 @@ static int jent_kcapi_init(struct crypto_tfm *tfm) + crypto_shash_init(sdesc); + rng->sdesc = sdesc; + +- rng->entropy_collector = jent_entropy_collector_alloc(0, 0, sdesc); ++ rng->entropy_collector = ++ jent_entropy_collector_alloc(CONFIG_CRYPTO_JITTERENTROPY_OSR, 0, ++ sdesc); + if (!rng->entropy_collector) { + ret = -ENOMEM; + goto err; +@@ -345,7 +347,7 @@ static int __init jent_mod_init(void) + + desc->tfm = tfm; + crypto_shash_init(desc); +- ret = jent_entropy_init(0, 0, desc); ++ ret = jent_entropy_init(CONFIG_CRYPTO_JITTERENTROPY_OSR, 0, desc); + shash_desc_zero(desc); + crypto_free_shash(tfm); + if (ret) { +-- +2.40.4 + + +From 324c2a3b7107ae5aceceab9ae9518077ca56c6d7 Mon Sep 17 00:00:00 2001 +From: Stephan Mueller +Date: Mon, 12 Aug 2024 08:25:42 +0200 +Subject: [PATCH 4/4] crypto: jitter - set default OSR to 3 + +The user space Jitter RNG library uses the oversampling rate of 3 which +implies that each time stamp is credited with 1/3 bit of entropy. To +obtain 256 bits of entropy, 768 time stamps need to be sampled. The +increase in OSR is applied based on a report where the Jitter RNG is +used on a system exhibiting a challenging environment to collect +entropy. + +This OSR default value is now applied to the Linux kernel version of +the Jitter RNG as well. + +The increase in the OSR from 1 to 3 also implies that the Jitter RNG is +now slower by default. + +Reported-by: Jeff Barnes +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +--- + crypto/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index 4789e5864ef5..17c2890fa0b2 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -1339,7 +1339,7 @@ config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE + config CRYPTO_JITTERENTROPY_OSR + int "CPU Jitter RNG Oversampling Rate" + range 1 15 +- default 1 ++ default 3 + depends on CRYPTO_JITTERENTROPY + help + The Jitter RNG allows the specification of an oversampling rate (OSR). +-- +2.40.4 + diff --git a/SPECS/kernel/kernel-uki.spec b/SPECS/kernel/kernel-uki.spec index e8e9ef4e65a..dde1b388dbe 100644 --- a/SPECS/kernel/kernel-uki.spec +++ b/SPECS/kernel/kernel-uki.spec @@ -13,7 +13,7 @@ Summary: Unified Kernel Image Name: kernel-uki Version: 6.6.64.2 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -70,6 +70,12 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi %changelog +* Wed Feb 05 2025 Tobias Brick - 6.6.64.2-9 +- Bump release to match kernel + +* Tue Feb 04 2025 Alberto David Perez Guevara - 6.6.64.2-8 +- Bump release to match kernel + * Fri Jan 31 2025 Alberto David Perez Guevara - 6.6.64.2-7 - Bump release to match kernel diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index f89aed83b36..4399160a6ab 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", - "config": "e215b7795a78bc56ad815fa759983baab20aec8a8964d8ef621001e552ceca1b", - "config_aarch64": "017245201dda4a823fc51f8e212c410d2b12ab849a2da7588d000bcb8cc48ef4", + "config": "63c47ff4d57ac336f4caf2e5b724dd1b505b1df58edc84684679c59635a0ca18", + "config_aarch64": "f37710a86967e43edbaa61b59203ec8fae80312d96b89e7df248e0b2149124d4", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 1f5924e96fa..30ab0dfac53 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -30,7 +30,7 @@ Summary: Linux Kernel Name: kernel Version: 6.6.64.2 -Release: 7%{?dist} +Release: 9%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -44,6 +44,7 @@ Source4: azurelinux-ca-20230216.pem Source5: cpupower Source6: cpupower.service Patch0: 0001-add-mstflint-kernel-%{mstflintver}.patch +Patch1: jent-init-fix.patch BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc @@ -170,8 +171,7 @@ This package contains the bpftool, which allows inspection and simple manipulation of eBPF programs and maps. %prep -%setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{mariner_version}-%{version} -%patch 0 -p1 +%autosetup -p1 -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{mariner_version}-%{version} make mrproper cp %{config_source} .config @@ -428,6 +428,13 @@ echo "initrd of kernel %{uname_r} removed" >&2 %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Wed Feb 05 2025 Tobias Brick - 6.6.64.2-9 +- Apply upstream patches to fix kernel panic in jitterentropy initialization on + ARM64 FIPS boot + +* Tue Feb 04 2025 Alberto David Perez Guevara - 6.6.64.2-8 +- Revert ZONE_DMA option to avoid memory ussage overuse + * Fri Jan 31 2025 Alberto David Perez Guevara - 6.6.64.2-7 - Enable NUMA Balancing and UCLAMP task diff --git a/SPECS/knem/knem.spec b/SPECS/knem/knem.spec index b1386745a97..2babed91d0a 100644 --- a/SPECS/knem/knem.spec +++ b/SPECS/knem/knem.spec @@ -53,7 +53,7 @@ Summary: KNEM: High-Performance Intra-Node MPI Communication Name: knem Version: 1.1.4.90mlnx3 -Release: 4%{?dist} +Release: 6%{?dist} Provides: knem-mlnx = %{version}-%{release} Obsoletes: knem-mlnx < %{version}-%{release} License: BSD and GPLv2 @@ -116,7 +116,7 @@ EOF) %global flavors_to_build default %package -n %{non_kmp_pname} -Release: 4%{?dist} +Release: 6%{?dist} Summary: KNEM: High-Performance Intra-Node MPI Communication Group: System Environment/Libraries %description -n %{non_kmp_pname} @@ -282,6 +282,12 @@ fi %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 1.1.4.90mlnx3-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 1.1.4.90mlnx3-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 1.1.4.90mlnx3-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/mft_kernel/mft_kernel.spec b/SPECS/mft_kernel/mft_kernel.spec index 97289db7a1f..a821a620f8f 100644 --- a/SPECS/mft_kernel/mft_kernel.spec +++ b/SPECS/mft_kernel/mft_kernel.spec @@ -33,7 +33,7 @@ Name: mft_kernel Summary: %{name} Kernel Module for the %{KVERSION} kernel Version: 4.30.0 -Release: 4%{?dist} +Release: 6%{?dist} License: Dual BSD/GPLv2 Group: System Environment/Kernel BuildRoot: /var/tmp/%{name}-%{version}-build @@ -228,6 +228,12 @@ find %{buildroot} -type f -name \*.ko -exec %{__strip} -p --strip-debug --discar %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 4.30.0-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 4.30.0-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 4.30.0-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec index 884e14f4edf..9f398b89717 100644 --- a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec +++ b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec @@ -65,7 +65,7 @@ Summary: %{_name} Driver Name: mlnx-nfsrdma Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -248,6 +248,12 @@ fi %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec index 8fe54ff55a7..43aa0cc439b 100644 --- a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec +++ b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec @@ -99,7 +99,7 @@ Summary: Infiniband HCA Driver Name: mlnx-ofa_kernel Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com/ Group: System Environment/Base @@ -191,7 +191,7 @@ Obsoletes: mlnx-en-debuginfo Obsoletes: mlnx-en-sources Obsoletes: mlnx-rdma-rxe Version: %{_version} -Release: 4%{?dist} +Release: 6%{?dist} Summary: Infiniband Driver and ULPs kernel modules Group: System Environment/Libraries %description -n %{non_kmp_pname} @@ -203,7 +203,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o %package -n %{devel_pname} Version: %{_version} # build KMP rpms? -Release: 4%{?dist} +Release: 6%{?dist} Obsoletes: kernel-ib-devel Obsoletes: kernel-ib Obsoletes: mlnx-en @@ -739,6 +739,12 @@ update-alternatives --remove \ %{_prefix}/src/mlnx-ofa_kernel-%version %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/srp/srp.spec b/SPECS/srp/srp.spec index bd503d8a558..9edc2e99708 100644 --- a/SPECS/srp/srp.spec +++ b/SPECS/srp/srp.spec @@ -64,7 +64,7 @@ Summary: srp driver Name: srp Version: 24.10 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -253,6 +253,12 @@ fi %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 24.10-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 24.10-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 24.10-4 - Bump release to rebuild for new kernel release diff --git a/SPECS/xpmem/xpmem.spec b/SPECS/xpmem/xpmem.spec index b4c818b1005..f9a654175cb 100644 --- a/SPECS/xpmem/xpmem.spec +++ b/SPECS/xpmem/xpmem.spec @@ -39,7 +39,7 @@ Summary: Cross-partition memory Name: xpmem Version: 2.7.4 -Release: 4%{?dist} +Release: 6%{?dist} License: GPLv2 and LGPLv2.1 Group: System Environment/Libraries Vendor: Microsoft Corporation @@ -125,7 +125,7 @@ EOF) %package modules # %{nil}: to avoid having the script that build OFED-internal # munge the release version here as well: -Release: 4%{?dist} +Release: 6%{?dist} Summary: XPMEM: kernel modules Group: System Environment/Libraries %description modules @@ -247,6 +247,12 @@ fi %endif %changelog +* Wed Feb 05 2025 Tobias Brick - 2.7.4-6 +- Bump release to rebuild for new kernel release + +* Tue Feb 04 2025 Alberto David Perez Guevara - 2.7.4-5 +- Bump release to rebuild for new kernel release + * Fri Jan 31 2025 Alberto David Perez Guevara - 2.7.4-4 - Bump release to rebuild for new kernel release diff --git a/cgmanifest.json b/cgmanifest.json index 0435ffed50c..d0ad1a5349e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -35,8 +35,8 @@ "type": "other", "other": { "name": "accountsservice", - "version": "0.6.55", - "downloadUrl": "http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.55.tar.xz" + "version": "23.13.9", + "downloadUrl": "https://www.freedesktop.org/software/accountsservice/accountsservice-23.13.9.tar.xz" } } }, @@ -65,8 +65,8 @@ "type": "other", "other": { "name": "acpid", - "version": "2.0.32", - "downloadUrl": "http://downloads.sourceforge.net/acpid2/acpid-2.0.32.tar.xz" + "version": "2.0.34", + "downloadUrl": "https://downloads.sourceforge.net/acpid2/acpid-2.0.34.tar.xz" } } }, @@ -85,8 +85,8 @@ "type": "other", "other": { "name": "adobe-mappings-cmap", - "version": "20171205", - "downloadUrl": "https://github.com/adobe-type-tools/cmap-resources/archive/20171205.tar.gz" + "version": "20231115", + "downloadUrl": "https://github.com/adobe-type-tools/cmap-resources/archive/refs/tags/20231115.tar.gz" } } }, @@ -95,8 +95,8 @@ "type": "other", "other": { "name": "adobe-mappings-pdf", - "version": "20180407", - "downloadUrl": "https://github.com/adobe-type-tools/mapping-resources-pdf/archive/20180407.tar.gz" + "version": "20230118", + "downloadUrl": "https://github.com/adobe-type-tools/mapping-resources-pdf/archive/refs/tags/20230118.tar.gz" } } }, @@ -495,8 +495,8 @@ "type": "other", "other": { "name": "application-gateway-kubernetes-ingress", - "version": "1.7.2", - "downloadUrl": "https://github.com/Azure/application-gateway-kubernetes-ingress/archive/refs/tags/1.7.2.tar.gz" + "version": "1.7.7", + "downloadUrl": "https://github.com/Azure/application-gateway-kubernetes-ingress/archive/refs/tags/1.7.7.tar.gz" } } }, @@ -1147,8 +1147,8 @@ "type": "other", "other": { "name": "blosc", - "version": "1.21.4", - "downloadUrl": "https://github.com/Blosc/c-blosc/archive/v1.21.4/blosc-1.21.4.tar.gz" + "version": "1.21.6", + "downloadUrl": "https://github.com/Blosc/c-blosc/archive/v1.21.6/blosc-1.21.6.tar.gz" } } }, @@ -1187,8 +1187,8 @@ "type": "other", "other": { "name": "bolt", - "version": "0.9.2", - "downloadUrl": "https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9.2/bolt-0.9.2.tar.gz" + "version": "0.9.8", + "downloadUrl": "https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9.8/bolt-0.9.8.tar.gz" } } }, @@ -2538,8 +2538,8 @@ "type": "other", "other": { "name": "deltarpm", - "version": "3.6.2", - "downloadUrl": "https://github.com/rpm-software-management/deltarpm/archive/3.6.2/deltarpm-3.6.2.tar.gz" + "version": "3.6.5", + "downloadUrl": "https://github.com/rpm-software-management/deltarpm/archive/3.6.5/deltarpm-3.6.5.tar.gz" } } }, @@ -2618,8 +2618,8 @@ "type": "other", "other": { "name": "diffstat", - "version": "1.63", - "downloadUrl": "ftp://ftp.invisible-island.net/pub/diffstat/diffstat-1.63.tgz" + "version": "1.66", + "downloadUrl": "https://invisible-mirror.net/archives/diffstat/diffstat-1.66.tgz" } } }, @@ -3368,8 +3368,8 @@ "type": "other", "other": { "name": "etcd", - "version": "3.5.12", - "downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.5.12.tar.gz" + "version": "3.5.18", + "downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.5.18.tar.gz" } } }, @@ -3408,9 +3408,9 @@ "type": "other", "other": { "name": "exempi", - "version": "2.6.1", - "downloadUrl": "https://gitlab.freedesktop.org/libopenraw/exempi/-/archive/2.6.1/exempi-2.6.1.tar.bz2" - } + "version": "2.6.5", + "downloadUrl": "https://gitlab.freedesktop.org/libopenraw/exempi/-/archive/2.6.5/exempi-2.6.5.tar.bz2" + } } }, { @@ -3458,8 +3458,8 @@ "type": "other", "other": { "name": "fabtests", - "version": "1.12.0", - "downloadUrl": "https://github.com/ofiwg/libfabric/releases/download/v1.12.0rc1/fabtests-1.12.0rc1.tar.bz2" + "version": "1.18.0", + "downloadUrl": "https://github.com/ofiwg/libfabric/releases/download/v1.18.0/fabtests-1.18.0.tar.bz2" } } }, @@ -4150,8 +4150,8 @@ "type": "other", "other": { "name": "gdisk", - "version": "1.0.9", - "downloadUrl": "https://downloads.sourceforge.net/gptfdisk/gptfdisk-1.0.9.tar.gz" + "version": "1.0.10", + "downloadUrl": "https://downloads.sourceforge.net/gptfdisk/gptfdisk-1.0.10.tar.gz" } } }, @@ -4340,8 +4340,8 @@ "type": "other", "other": { "name": "glew", - "version": "2.1.0", - "downloadUrl": "https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.tgz" + "version": "2.2.0", + "downloadUrl": "https://sourceforge.net/projects/glew/files/glew/2.2.0/glew-2.2.0.tgz" } } }, @@ -8811,8 +8811,8 @@ "type": "other", "other": { "name": "libbytesize", - "version": "2.5", - "downloadUrl": "https://github.com/storaged-project/libbytesize/releases/download/2.5/libbytesize-2.5.tar.gz" + "version": "2.11", + "downloadUrl": "https://github.com/storaged-project/libbytesize/releases/download/2.11/libbytesize-2.11.tar.gz" } } }, @@ -9101,8 +9101,8 @@ "type": "other", "other": { "name": "libdeflate", - "version": "1.9", - "downloadUrl": "https://github.com/ebiggers/libdeflate/archive/v1.9.tar.gz" + "version": "1.22", + "downloadUrl": "https://github.com/ebiggers/libdeflate/archive/refs/tags/v1.22.tar.gz" } } }, @@ -9351,8 +9351,8 @@ "type": "other", "other": { "name": "libexttextcat", - "version": "3.4.5", - "downloadUrl": "http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.5.tar.xz" + "version": "3.4.6", + "downloadUrl": "https://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.6.tar.xz" } } }, @@ -10011,8 +10011,8 @@ "type": "other", "other": { "name": "liblouis", - "version": "3.26.0", - "downloadUrl": "https://github.com/liblouis/liblouis/releases/download/v3.26.0/liblouis-3.26.0.tar.gz" + "version": "3.31.0", + "downloadUrl": "https://github.com/liblouis/liblouis/releases/download/v3.31.0/liblouis-3.31.0.tar.gz" } } }, @@ -10771,8 +10771,8 @@ "type": "other", "other": { "name": "LibRaw", - "version": "0.19.5", - "downloadUrl": "http://www.libraw.org/data/LibRaw-0.19.5.tar.gz" + "version": "0.21.3", + "downloadUrl": "https://www.libraw.org/data/LibRaw-0.21.3.tar.gz" } } }, @@ -13992,8 +13992,8 @@ "type": "other", "other": { "name": "neon", - "version": "0.31.2", - "downloadUrl": "https://notroj.github.io/neon/neon-0.31.2.tar.gz" + "version": "0.33.0", + "downloadUrl": "https://notroj.github.io/neon/neon-0.33.0.tar.gz" } } }, @@ -14422,8 +14422,8 @@ "type": "other", "other": { "name": "numatop", - "version": "2.1", - "downloadUrl": "https://github.com/intel/numatop/releases/download/v2.1/numatop-v2.1.tar.xz" + "version": "2.4", + "downloadUrl": "https://github.com/intel/numatop/archive/refs/tags/v2.4.tar.gz" } } }, @@ -14802,8 +14802,8 @@ "type": "other", "other": { "name": "ocaml-libvirt", - "version": "0.6.1.5", - "downloadUrl": "http://libvirt.org/sources/ocaml/ocaml-libvirt-0.6.1.5.tar.gz" + "version": "0.6.1.7", + "downloadUrl": "https://libvirt.org/sources/ocaml/ocaml-libvirt-0.6.1.7.tar.gz" } } }, @@ -15072,8 +15072,8 @@ "type": "other", "other": { "name": "ocaml-zarith", - "version": "1.9.1", - "downloadUrl": "https://github.com/ocaml/Zarith/archive/release-1.9.1.tar.gz" + "version": "1.14", + "downloadUrl": "https://github.com/ocaml/Zarith/archive/release-1.14.tar.gz" } } }, @@ -15493,8 +15493,8 @@ "type": "other", "other": { "name": "orc", - "version": "0.4.31", - "downloadUrl": "http://gstreamer.freedesktop.org/src/orc/orc-0.4.31.tar.xz" + "version": "0.4.39", + "downloadUrl": "https://gstreamer.freedesktop.org/src/orc/orc-0.4.39.tar.xz" } } }, @@ -15733,8 +15733,8 @@ "type": "other", "other": { "name": "parallel", - "version": "20190922", - "downloadUrl": "http://ftp.gnu.org/gnu/parallel/parallel-20190922.tar.bz2" + "version": "20240922", + "downloadUrl": "https://ftp.gnu.org/gnu/parallel/parallel-20240922.tar.bz2" } } }, @@ -15903,8 +15903,8 @@ "type": "other", "other": { "name": "perl-Algorithm-Diff", - "version": "1.1903", - "downloadUrl": "https://cpan.metacpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz" + "version": "1.2010", + "downloadUrl": "https://cpan.metacpan.org/modules/by-module/Algorithm/Algorithm-Diff-1.201.tar.gz" } } }, @@ -16243,8 +16243,8 @@ "type": "other", "other": { "name": "perl-Class-C3-XS", - "version": "0.14", - "downloadUrl": "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Class-C3-XS-0.14.tar.gz" + "version": "0.15", + "downloadUrl": "https://cpan.metacpan.org/modules/by-module/Class/Class-C3-XS-0.15.tar.gz" } } }, @@ -16313,8 +16313,8 @@ "type": "other", "other": { "name": "perl-Class-Method-Modifiers", - "version": "2.13", - "downloadUrl": "https://cpan.metacpan.org/modules/by-module/Class/Class-Method-Modifiers-2.13.tar.gz" + "version": "2.15", + "downloadUrl": "https://cpan.metacpan.org/modules/by-module/Class/Class-Method-Modifiers-2.15.tar.gz" } } }, @@ -16323,8 +16323,8 @@ "type": "other", "other": { "name": "perl-Class-Singleton", - "version": "1.5", - "downloadUrl": "https://cpan.metacpan.org/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz" + "version": "1.6", + "downloadUrl": "https://cpan.metacpan.org/modules/by-module/Class/Class-Singleton-1.6.tar.gz" } } }, @@ -16493,8 +16493,8 @@ "type": "other", "other": { "name": "perl-Config-IniFiles", - "version": "3.000002", - "downloadUrl": "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz" + "version": "3.000003", + "downloadUrl": "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000003.tar.gz" } } }, @@ -22293,8 +22293,8 @@ "type": "other", "other": { "name": "python-dbus-client-gen", - "version": "0.4", - "downloadUrl": "https://github.com/stratis-storage/dbus-client-gen/archive/v0.4/dbus-client-gen-0.4.tar.gz" + "version": "0.5.1", + "downloadUrl": "https://github.com/stratis-storage/dbus-client-gen/archive/refs/tags/v0.5.1.tar.gz" } } }, @@ -22303,8 +22303,8 @@ "type": "other", "other": { "name": "python-dbus-python-client-gen", - "version": "0.7", - "downloadUrl": "https://github.com/stratis-storage/dbus-python-client-gen/archive/v0.7/dbus-python-client-gen-0.7.tar.gz" + "version": "0.8.3", + "downloadUrl": "https://github.com/stratis-storage/dbus-python-client-gen/archive/refs/tags/v0.8.3.tar.gz" } } }, @@ -22313,8 +22313,8 @@ "type": "other", "other": { "name": "python-dbus-signature-pyparsing", - "version": "0.03", - "downloadUrl": "https://github.com/stratis-storage/dbus-signature-pyparsing/archive/v0.03/dbus-signature-pyparsing-0.03.tar.gz" + "version": "0.4.1", + "downloadUrl": "https://github.com/stratis-storage/dbus-signature-pyparsing/archive/refs/tags/v0.4.1.tar.gz" } } }, @@ -22923,8 +22923,8 @@ "type": "other", "other": { "name": "python-into-dbus-python", - "version": "0.07", - "downloadUrl": "https://github.com/stratis-storage/into-dbus-python/archive/v0.07/into-dbus-python-0.07.tar.gz" + "version": "0.8.2", + "downloadUrl": "https://github.com/stratis-storage/into-dbus-python/archive/refs/tags/v0.8.2.tar.gz" } } }, @@ -23053,8 +23053,8 @@ "type": "other", "other": { "name": "python-justbases", - "version": "0.9", - "downloadUrl": "https://pypi.io/packages/source/j/justbases/justbases-0.9.tar.gz" + "version": "0.15.2", + "downloadUrl": "https://pypi.io/packages/source/j/justbases/justbases-0.15.2.tar.gz" } } }, @@ -23063,8 +23063,8 @@ "type": "other", "other": { "name": "python-justbytes", - "version": "0.11", - "downloadUrl": "https://pypi.io/packages/source/j/justbytes/justbytes-0.11.tar.gz" + "version": "0.15.2", + "downloadUrl": "https://pypi.io/packages/source/j/justbytes/justbytes-0.15.2.tar.gz" } } }, @@ -23123,8 +23123,8 @@ "type": "other", "other": { "name": "python-kmod", - "version": "0.9", - "downloadUrl": "https://github.com/downloads/agrover/python-kmod/python-kmod-0.9.tar.gz" + "version": "0.9.2", + "downloadUrl": "https://github.com/maurizio-lombardi/python-kmod/archive/refs/tags/v0.9.2.tar.gz" } } }, @@ -24633,8 +24633,8 @@ "type": "other", "other": { "name": "python-sphinxcontrib-apidoc", - "version": "0.2.1", - "downloadUrl": "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.2.1.tar.gz" + "version": "0.3.0", + "downloadUrl": "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.tar.gz" } } }, @@ -25003,8 +25003,8 @@ "type": "other", "other": { "name": "python-uritemplate", - "version": "3.0.0", - "downloadUrl": "https://github.com/sigmavirus24/uritemplate/archive/3.0.0/uritemplate-3.0.0.tar.gz" + "version": "4.1.1", + "downloadUrl": "https://github.com/sigmavirus24/uritemplate/archive/4.1.1/uritemplate-4.1.1.tar.gz" } } }, @@ -25223,8 +25223,8 @@ "type": "other", "other": { "name": "python-xmltodict", - "version": "0.12.0", - "downloadUrl": "https://github.com/martinblech/xmltodict/archive/v0.12.0/xmltodict-0.12.0.tar.gz" + "version": "0.13.0", + "downloadUrl": "https://github.com/martinblech/xmltodict/archive/v0.13.0/xmltodict-0.13.0.tar.gz" } } }, @@ -25373,8 +25373,8 @@ "type": "other", "other": { "name": "pywbem", - "version": "0.15.0", - "downloadUrl": "https://github.com/pywbem/pywbem/archive/v0.15.0/pywbem-0.15.0.tar.gz" + "version": "0.17.6", + "downloadUrl": "https://github.com/pywbem/pywbem/archive/refs/tags/0.17.6.tar.gz" } } }, @@ -25693,8 +25693,8 @@ "type": "other", "other": { "name": "re2c", - "version": "2.0", - "downloadUrl": "https://github.com/skvadrik/re2c/releases/download/2.0/re2c-2.0.tar.xz" + "version": "3.1", + "downloadUrl": "https://github.com/skvadrik/re2c/releases/download/3.1/re2c-3.1.tar.xz" } } }, @@ -25733,8 +25733,8 @@ "type": "other", "other": { "name": "recode", - "version": "3.7.7", - "downloadUrl": "https://github.com/rrthomas/recode/releases/download/v3.7.7/recode-3.7.7.tar.gz" + "version": "3.7.14", + "downloadUrl": "https://github.com/rrthomas/recode/releases/download/v3.7.14/recode-3.7.14.tar.gz" } } }, @@ -29937,8 +29937,8 @@ "type": "other", "other": { "name": "xapian-core", - "version": "1.4.20", - "downloadUrl": "https://www.oligarchy.co.uk/xapian/1.4.20/xapian-core-1.4.20.tar.xz" + "version": "1.4.26", + "downloadUrl": "https://www.oligarchy.co.uk/xapian/1.4.26/xapian-core-1.4.26.tar.xz" } } }, @@ -29947,8 +29947,8 @@ "type": "other", "other": { "name": "Xaw3d", - "version": "1.6.3", - "downloadUrl": "https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-1.6.3.tar.bz2" + "version": "1.6.6", + "downloadUrl": "https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-1.6.6.tar.xz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index d2548b33f57..f4d84d20b4f 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-21.azl3.aarch64.rpm -kernel-headers-6.6.64.2-7.azl3.noarch.rpm +kernel-headers-6.6.64.2-9.azl3.noarch.rpm glibc-2.38-8.azl3.aarch64.rpm glibc-devel-2.38-8.azl3.aarch64.rpm glibc-i18n-2.38-8.azl3.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 a903b09502b..1664bcf36cd 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-21.azl3.x86_64.rpm -kernel-headers-6.6.64.2-7.azl3.noarch.rpm +kernel-headers-6.6.64.2-9.azl3.noarch.rpm glibc-2.38-8.azl3.x86_64.rpm glibc-devel-2.38-8.azl3.x86_64.rpm glibc-i18n-2.38-8.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 7b460d52309..12ab4510a02 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm itstool-2.0.7-1.azl3.noarch.rpm kbd-2.2.0-2.azl3.aarch64.rpm kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm -kernel-headers-6.6.64.2-7.azl3.noarch.rpm +kernel-headers-6.6.64.2-9.azl3.noarch.rpm kmod-30-1.azl3.aarch64.rpm kmod-debuginfo-30-1.azl3.aarch64.rpm kmod-devel-30-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 65357fe0212..75e254ffbf8 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -163,8 +163,8 @@ intltool-0.51.0-7.azl3.noarch.rpm itstool-2.0.7-1.azl3.noarch.rpm kbd-2.2.0-2.azl3.x86_64.rpm kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm -kernel-cross-headers-6.6.64.2-7.azl3.noarch.rpm -kernel-headers-6.6.64.2-7.azl3.noarch.rpm +kernel-cross-headers-6.6.64.2-9.azl3.noarch.rpm +kernel-headers-6.6.64.2-9.azl3.noarch.rpm kmod-30-1.azl3.x86_64.rpm kmod-debuginfo-30-1.azl3.x86_64.rpm kmod-devel-30-1.azl3.x86_64.rpm