Merge branch 'main' into 2.0

microsoft · Feb 29, 2024 · 1775bea · 1775bea
2 parents 430aced + 87bd75d
commit 1775bea
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/SPECS/pam/pam.signatures.json b/SPECS/pam/pam.signatures.json
@@ -1,5 +1,5 @@
 {
-  "Signatures": {
-    "Linux-PAM-1.5.3.tar.xz": "7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283"
-  }
+ "Signatures": {
+  "Linux-PAM-1.5.1.tar.xz": "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc"
+ }
 }
diff --git a/SPECS/pam/pam.spec b/SPECS/pam/pam.spec
@@ -1,7 +1,7 @@
 Summary:        Linux Pluggable Authentication Modules
 Name:           pam
-Version:        1.5.3
-Release:        1%{?dist}
+Version:        1.5.1
+Release:        5%{?dist}
 License:        BSD and GPLv2+
 URL:            https://github.com/linux-pam/linux-pam
 Source0:        https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz
@@ -96,14 +96,8 @@ EOF
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_docdir}/%{name}-%{version}/*
-%{_libdir}/pkgconfig/pam.pc
-%{_libdir}/pkgconfig/pam_misc.pc
-%{_libdir}/pkgconfig/pamc.pc
 
 %changelog
-* Mon Feb 19 2024 CBL-Mariner Servicing Account <[email protected]> - 1.5.3-1
-- Auto-upgrade to 1.5.3 - fix CVE-2022-28321
-
 * Tue Mar 22 2022 Andrew Phelps <[email protected]> - 1.5.1-5
 - Require audit-libs
 

diff --git a/cgmanifest.json b/cgmanifest.json
@@ -15814,8 +15814,8 @@
         "type": "other",
         "other": {
           "name": "pam",
-          "version": "1.5.3",
-          "downloadUrl": "https://github.com/linux-pam/linux-pam/releases/download/v1.5.3/Linux-PAM-1.5.3.tar.xz"
+          "version": "1.5.1",
+          "downloadUrl": "https://github.com/linux-pam/linux-pam/releases/download/v1.5.1/Linux-PAM-1.5.1.tar.xz"
         }
       }
     },
@@ -30957,4 +30957,4 @@
     }
   ],
   "Version": 1
-}
+}
diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -281,10 +281,10 @@ p11-kit-debuginfo-0.24.1-1.cm2.aarch64.rpm
 p11-kit-devel-0.24.1-1.cm2.aarch64.rpm
 p11-kit-server-0.24.1-1.cm2.aarch64.rpm
 p11-kit-trust-0.24.1-1.cm2.aarch64.rpm
-pam-1.5.3-1.cm2.aarch64.rpm
-pam-debuginfo-1.5.3-1.cm2.aarch64.rpm
-pam-devel-1.5.3-1.cm2.aarch64.rpm
-pam-lang-1.5.3-1.cm2.aarch64.rpm
+pam-1.5.1-5.cm2.aarch64.rpm
+pam-debuginfo-1.5.1-5.cm2.aarch64.rpm
+pam-devel-1.5.1-5.cm2.aarch64.rpm
+pam-lang-1.5.1-5.cm2.aarch64.rpm
 patch-2.7.6-8.cm2.aarch64.rpm
 patch-debuginfo-2.7.6-8.cm2.aarch64.rpm
 pcre-8.45-2.cm2.aarch64.rpm

diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -287,10 +287,10 @@ p11-kit-debuginfo-0.24.1-1.cm2.x86_64.rpm
 p11-kit-devel-0.24.1-1.cm2.x86_64.rpm
 p11-kit-server-0.24.1-1.cm2.x86_64.rpm
 p11-kit-trust-0.24.1-1.cm2.x86_64.rpm
-pam-1.5.3-1.cm2.x86_64.rpm
-pam-debuginfo-1.5.3-1.cm2.x86_64.rpm
-pam-devel-1.5.3-1.cm2.x86_64.rpm
-pam-lang-1.5.3-1.cm2.x86_64.rpm
+pam-1.5.1-5.cm2.x86_64.rpm
+pam-debuginfo-1.5.1-5.cm2.x86_64.rpm
+pam-devel-1.5.1-5.cm2.x86_64.rpm
+pam-lang-1.5.1-5.cm2.x86_64.rpm
 patch-2.7.6-8.cm2.x86_64.rpm
 patch-debuginfo-2.7.6-8.cm2.x86_64.rpm
 pcre-8.45-2.cm2.x86_64.rpm