Merge branch '3.0-dev' into 3.0

microsoft · Feb 6, 2025 · bfd36df · bfd36df
2 parents ac6d1fa + 9f84d0e
commit bfd36df
Show file tree

Hide file tree

Showing 184 changed files with 5,568 additions and 3,060 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch b/SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch
diff --git a/SPECS-EXTENDED/LibRaw/LibRaw-pkgconfig.patch 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
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "LibRaw-0.19.5.tar.gz": "40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5"
+  "LibRaw-0.21.3.tar.gz": "dba34b7fc1143503942fa32ad9db43e94f714e62a4a856e91617f8f3e1e0aa5c"
  }
-}
+}
diff --git 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  <[email protected]> - 0.21.3-1
+- Upgrade the version to 0.21.3
+- License Verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.19.5-5
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).