Update 1 package

pacman (6.1.0-4 -> 6.1.0-10) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · Dec 31, 2024 · 936a639 · 936a639
1 parent 220e59b
commit 936a639
Show file tree

Hide file tree

Showing 56 changed files with 30 additions and 136 deletions.
diff --git a/etc/makepkg_mingw.conf b/etc/makepkg_mingw.conf
@@ -41,10 +41,11 @@ if [[ "$MSYSTEM" == "MINGW64" ]]; then
   MINGW_PACKAGE_PREFIX="mingw-w64-x86_64"
   CC="gcc"
   CXX="g++"
-  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CPPFLAGS=
+  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
   CXXFLAGS="$CFLAGS"
   LDFLAGS=""
+  RUSTFLAGS="-Cforce-frame-pointers=yes"
 elif [[ "$MSYSTEM" == "MINGW32" ]]; then
   CARCH="i686"
   CHOST="i686-w64-mingw32"
@@ -53,10 +54,11 @@ elif [[ "$MSYSTEM" == "MINGW32" ]]; then
   MINGW_PACKAGE_PREFIX="mingw-w64-i686"
   CC="gcc"
   CXX="g++"
-  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CPPFLAGS=
+  CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
   CXXFLAGS="$CFLAGS"
   LDFLAGS="-Wl,--no-seh -Wl,--large-address-aware"
+  RUSTFLAGS="-Cforce-frame-pointers=yes"
 elif [[ "$MSYSTEM" == "CLANG64" ]]; then
   CARCH="x86_64"
   CHOST="x86_64-w64-mingw32"
@@ -65,22 +67,11 @@ elif [[ "$MSYSTEM" == "CLANG64" ]]; then
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-x86_64"
   CC="clang"
   CXX="clang++"
-  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CPPFLAGS=
+  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
   CXXFLAGS="$CFLAGS"
   LDFLAGS=""
-elif [[ "$MSYSTEM" == "CLANG32" ]]; then
-  CARCH="i686"
-  CHOST="i686-w64-mingw32"
-  MINGW_CHOST="i686-w64-mingw32"
-  MINGW_PREFIX="/clang32"
-  MINGW_PACKAGE_PREFIX="mingw-w64-clang-i686"
-  CC="clang"
-  CXX="clang++"
-  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
-  CXXFLAGS="$CFLAGS"
-  LDFLAGS="-Wl,--no-seh -Wl,--large-address-aware"
+  RUSTFLAGS="-Cforce-frame-pointers=yes"
 elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
   CARCH="aarch64"
   CHOST="aarch64-w64-mingw32"
@@ -89,10 +80,11 @@ elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-aarch64"
   CC="clang"
   CXX="clang++"
-  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CPPFLAGS=
+  CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
   CXXFLAGS="$CFLAGS"
   LDFLAGS=""
+  RUSTFLAGS="-Cforce-frame-pointers=yes"
 elif [[ "$MSYSTEM" == "UCRT64" ]]; then
   CARCH="x86_64"
   CHOST="x86_64-w64-mingw32"
@@ -101,10 +93,11 @@ elif [[ "$MSYSTEM" == "UCRT64" ]]; then
   MINGW_PACKAGE_PREFIX="mingw-w64-ucrt-x86_64"
   CC="gcc"
   CXX="g++"
-  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CPPFLAGS=
+  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
   CXXFLAGS="$CFLAGS"
   LDFLAGS=""
+  RUSTFLAGS="-Cforce-frame-pointers=yes"
 else
   echo "Unsupported MSYSTEM: $MSYSTEM"
   exit 1

diff --git a/etc/pacman.conf b/etc/pacman.conf
@@ -21,8 +21,8 @@ HoldPkg     = pacman
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
 IgnorePkg   = msys2-runtime
-#IgnoreGroup =
 
 #NoUpgrade   =
 #NoExtract   =
@@ -70,7 +70,6 @@ LocalFileSigLevel = Optional
 # Server = https://repo.msys2.org/staging/
 # SigLevel = Never
 
-# Enable if you are on arm64
 [git-for-windows-aarch64]
 Server = https://wingit.blob.core.windows.net/aarch64
 
@@ -92,9 +91,6 @@ Include = /etc/pacman.d/mirrorlist.mingw
 [ucrt64]
 Include = /etc/pacman.d/mirrorlist.mingw
 
-[clang32]
-Include = /etc/pacman.d/mirrorlist.mingw
-
 [clang64]
 Include = /etc/pacman.d/mirrorlist.mingw
 
@@ -105,4 +101,4 @@ Include = /etc/pacman.d/mirrorlist.msys
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
+#Server = file:///home/custompkgs
diff --git a/etc/pacman.conf.pacnew b/etc/pacman.conf.pacnew
diff --git a/usr/bin/makepkg-mingw b/usr/bin/makepkg-mingw
@@ -84,7 +84,7 @@ if [[ -z "${MINGW_ARCH}" ]] && [[ -n "${MINGW_INSTALLS}" ]]; then
 fi
 
 # Validate or set MINGW_ARCH
-MINGW_ARCH_ALLOWED=('mingw32' 'mingw64' 'clang32' 'clang64' 'clangarm64' 'ucrt64')
+MINGW_ARCH_ALLOWED=('mingw32' 'mingw64' 'clang64' 'clangarm64' 'ucrt64')
 MINGW_ARCH="${MINGW_ARCH,,}"
 if [[ -z "$MINGW_ARCH" ]]; then
   # In case MINGW_ARCH isn't set we default to MSYSTEM, or error out

diff --git a/usr/bin/pacman-conf.exe b/usr/bin/pacman-conf.exe
diff --git a/usr/bin/pacman.exe b/usr/bin/pacman.exe
diff --git a/usr/bin/testpkg.exe b/usr/bin/testpkg.exe
diff --git a/usr/bin/vercmp.exe b/usr/bin/vercmp.exe
diff --git a/usr/lib/libalpm.a b/usr/lib/libalpm.a
diff --git a/usr/share/locale/ja/LC_MESSAGES/pacman.mo b/usr/share/locale/ja/LC_MESSAGES/pacman.mo
diff --git a/usr/share/man/man1/makepkg-template.1.gz b/usr/share/man/man1/makepkg-template.1.gz
diff --git a/usr/share/man/man3/libalpm.3.gz b/usr/share/man/man3/libalpm.3.gz
diff --git a/usr/share/man/man3/libalpm_cb.3.gz b/usr/share/man/man3/libalpm_cb.3.gz
diff --git a/usr/share/man/man3/libalpm_databases.3.gz b/usr/share/man/man3/libalpm_databases.3.gz
diff --git a/usr/share/man/man3/libalpm_depends.3.gz b/usr/share/man/man3/libalpm_depends.3.gz
diff --git a/usr/share/man/man3/libalpm_errors.3.gz b/usr/share/man/man3/libalpm_errors.3.gz
diff --git a/usr/share/man/man3/libalpm_files.3.gz b/usr/share/man/man3/libalpm_files.3.gz
diff --git a/usr/share/man/man3/libalpm_groups.3.gz b/usr/share/man/man3/libalpm_groups.3.gz
diff --git a/usr/share/man/man3/libalpm_handle.3.gz b/usr/share/man/man3/libalpm_handle.3.gz
diff --git a/usr/share/man/man3/libalpm_list.3.gz b/usr/share/man/man3/libalpm_list.3.gz
diff --git a/usr/share/man/man3/libalpm_log.3.gz b/usr/share/man/man3/libalpm_log.3.gz
diff --git a/usr/share/man/man3/libalpm_misc.3.gz b/usr/share/man/man3/libalpm_misc.3.gz
diff --git a/usr/share/man/man3/libalpm_options.3.gz b/usr/share/man/man3/libalpm_options.3.gz
diff --git a/usr/share/man/man3/libalpm_packages.3.gz b/usr/share/man/man3/libalpm_packages.3.gz
diff --git a/usr/share/man/man3/libalpm_sig.3.gz b/usr/share/man/man3/libalpm_sig.3.gz
diff --git a/usr/share/man/man3/libalpm_trans.3.gz b/usr/share/man/man3/libalpm_trans.3.gz
diff --git a/usr/share/man/man5/BUILDINFO.5.gz b/usr/share/man/man5/BUILDINFO.5.gz
diff --git a/usr/share/man/man5/PKGBUILD.5.gz b/usr/share/man/man5/PKGBUILD.5.gz
diff --git a/usr/share/man/man5/alpm-hooks.5.gz b/usr/share/man/man5/alpm-hooks.5.gz
diff --git a/usr/share/man/man5/makepkg.conf.5.gz b/usr/share/man/man5/makepkg.conf.5.gz
diff --git a/usr/share/man/man5/pacman-hooks.5.gz b/usr/share/man/man5/pacman-hooks.5.gz
diff --git a/usr/share/man/man5/pacman.conf.5.gz b/usr/share/man/man5/pacman.conf.5.gz
diff --git a/usr/share/man/man8/makepkg.8.gz b/usr/share/man/man8/makepkg.8.gz
diff --git a/usr/share/man/man8/pacman-conf.8.gz b/usr/share/man/man8/pacman-conf.8.gz
diff --git a/usr/share/man/man8/pacman-db-upgrade.8.gz b/usr/share/man/man8/pacman-db-upgrade.8.gz
diff --git a/usr/share/man/man8/pacman-key.8.gz b/usr/share/man/man8/pacman-key.8.gz
diff --git a/usr/share/man/man8/pacman.8.gz b/usr/share/man/man8/pacman.8.gz
diff --git a/usr/share/man/man8/repo-add.8.gz b/usr/share/man/man8/repo-add.8.gz
diff --git a/usr/share/man/man8/repo-remove.8.gz b/usr/share/man/man8/repo-remove.8.gz
diff --git a/usr/share/man/man8/testpkg.8.gz b/usr/share/man/man8/testpkg.8.gz
diff --git a/usr/share/man/man8/vercmp.8.gz b/usr/share/man/man8/vercmp.8.gz
diff --git a/var/lib/pacman/local/mingw-w64-clang-aarch64-git-extra-1.1.641.031e03baf-1/desc b/var/lib/pacman/local/mingw-w64-clang-aarch64-git-extra-1.1.641.031e03baf-1/desc
@@ -20,7 +20,7 @@ any
 1718204686
 
 %INSTALLDATE%
-1735495462
+1735615412
 
 %PACKAGER%
 Johannes Schindelin <[email protected]>

diff --git a/var/lib/pacman/local/pacman-6.1.0-4/desc → var/lib/pacman/local/pacman-6.1.0-10/desc b/var/lib/pacman/local/pacman-6.1.0-4/desc → var/lib/pacman/local/pacman-6.1.0-10/desc
@@ -2,7 +2,7 @@
 pacman
 
 %VERSION%
-6.1.0-4
+6.1.0-10
 
 %BASE%
 pacman
@@ -17,22 +17,22 @@ https://www.archlinux.org/pacman/
 x86_64
 
 %BUILDDATE%
-1716404205
+1734593027
 
 %INSTALLDATE%
-1716414615
+1735615392
 
 %PACKAGER%
-Unknown Packager
+CI (msys2/msys2-autobuild/657fd895/12408103218)
 
 %SIZE%
-42128803
+42655567
 
 %LICENSE%
 spdx:GPL-2.0-or-later
 
 %VALIDATION%
-none
+pgp
 
 %DEPENDS%
 bash>=4.2.045
@@ -46,3 +46,6 @@ bzip2
 xz
 zstd
 
+%XDATA%
+pkgtype=pkg
+
diff --git a/var/lib/pacman/local/pacman-6.1.0-4/files → var/lib/pacman/local/pacman-6.1.0-10/files b/var/lib/pacman/local/pacman-6.1.0-4/files → var/lib/pacman/local/pacman-6.1.0-10/files
@@ -409,7 +409,7 @@ var/lib/
 var/lib/pacman/
 
 %BACKUP%
-etc/pacman.conf	e37d160042192fbf55e19de408d175d6
+etc/pacman.conf	a4184b6eef7d651d07550d8019cc707d
 etc/makepkg.conf	a24fe8f78577fafad94b907e7feb3971
-etc/makepkg_mingw.conf	13303067b2404d08c7b96233f99a6f85
+etc/makepkg_mingw.conf	5b4db9d8cf86f10ad9b846e3d87c26da
 
diff --git a/var/lib/pacman/local/pacman-6.1.0-10/mtree b/var/lib/pacman/local/pacman-6.1.0-10/mtree
diff --git a/var/lib/pacman/local/pacman-6.1.0-4/mtree b/var/lib/pacman/local/pacman-6.1.0-4/mtree
diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db
diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig
diff --git a/var/lib/pacman/sync/clangarm64.db b/var/lib/pacman/sync/clangarm64.db
diff --git a/var/lib/pacman/sync/clangarm64.db.sig b/var/lib/pacman/sync/clangarm64.db.sig
diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db
diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig
diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db
diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig
diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db
diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig