Skip to content

Commit f6b39c7

Browse files
author
Git for Windows Build Agent
committed
Update 2 packages
automake1.18 (1.18-1 -> 1.18.1-1) mingw-w64-x86_64 (7zip-25.00-1 -> 7zip-25.01-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent c3b56f0 commit f6b39c7

File tree

47 files changed

+88
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+88
-100
lines changed

mingw64/bin/7z.dll

0 Bytes
Binary file not shown.

mingw64/bin/7z.exe

5.5 KB
Binary file not shown.

mingw64/lib/7zip/7zCon.sfx

512 Bytes
Binary file not shown.

mingw64/share/doc/7zip/7zip.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22

33
<?define VerMajor = "25" ?>
4-
<?define VerMinor = "00" ?>
4+
<?define VerMinor = "01" ?>
55
<?define VerBuild = "00" ?>
66
<?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
77
<?define MmHex = "$(var.VerMajor)$(var.VerMinor)" ?>

mingw64/share/doc/7zip/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
7-Zip 25.00 Sources
1+
7-Zip 25.01 Sources
22
-------------------
33

44
7-Zip is a file archiver for Windows.

mingw64/share/doc/7zip/src-history.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
HISTORY of the 7-Zip source code
22
--------------------------------
33

4+
25.01 2025-08-03
5+
-------------------------
6+
- The code for handling symbolic links has been changed
7+
to provide greater security when extracting files from archives.
8+
Command line switch -snld20 can be used to bypass default security
9+
checks when creating symbolic links.
10+
11+
412
25.00 2025-07-05
513
-------------------------
614
- 7-Zip for Windows can now use more than 64 CPU threads for compression
@@ -11,6 +19,8 @@ HISTORY of the 7-Zip source code
1119
- deflate (zip/gz) compression speed was increased by 1-3%.
1220
- improved support for zip, cpio and fat archives.
1321
- fixed some bugs and vulnerabilities.
22+
- the bug was fixed : CVE-2025-53816 : 7-Zip could work incorrectly for some incorrect RAR archives.
23+
- the bug was fixed : CVE-2025-53817 : 7-Zip could crash for some incorrect COM (Compound File) archives.
1424

1525

1626
24.09 2024-11-29

usr/share/aclocal-1.18/amversion.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
1515
[am__api_version='1.18'
1616
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
1717
dnl require some minimum version. Point them to the right macro.
18-
m4_if([$1], [1.18], [],
18+
m4_if([$1], [1.18.1], [],
1919
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2020
])
2121

@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
3131
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
3232
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
3333
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
34-
[AM_AUTOMAKE_VERSION([1.18])dnl
34+
[AM_AUTOMAKE_VERSION([1.18.1])dnl
3535
m4_ifndef([AC_AUTOCONF_VERSION],
3636
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
3737
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

usr/share/automake-1.18/Automake/Config.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_BUGREPORT $VERSION
3030
our $APIVERSION = '1.18';
3131
our $PACKAGE = 'automake';
3232
our $PACKAGE_BUGREPORT = '[email protected]';
33-
our $VERSION = '1.18';
33+
our $VERSION = '1.18.1';
3434
our $RELEASE_YEAR = '2025';
3535
our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '/usr/share/automake-1.18';
3636

usr/share/automake-1.18/am/progs.am

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,26 @@ installcheck-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
137137
## Insert the directory back if nobase_ is used.
138138
?!BASE? f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
139139
for opt in --help --version; do \
140-
if "$(DESTDIR)$(%NDIR%dir)/$$f" $$opt >c$${pid}_.out \
141-
2>c$${pid}_.err </dev/null \
142-
&& test -n "`cat c$${pid}_.out`" \
143-
&& test -z "`cat c$${pid}_.err`"; then :; \
144-
else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
140+
"$(DESTDIR)$(%NDIR%dir)/$$f" $$opt \
141+
>c$${pid}_.out 2>c$${pid}_.err </dev/null; \
142+
xc=$$?; \
143+
if test -n "`cat c$${pid}_.err`"; then \
144+
echo "$$f does not support $$opt: error output" 1>&2; \
145+
cat c$${pid}_.err 1>&2; \
146+
bad=1; \
147+
else \
148+
if test -z "`cat c$${pid}_.out`"; then \
149+
echo "$$f does not support $$opt: no output" 1>&2; \
150+
bad=1; \
151+
else \
152+
if test $$xc != 0; then \
153+
echo "$$f does not support $$opt: exit code $$xc" 1>&2; \
154+
bad=1; \
155+
else \
156+
:; \
157+
fi; \
158+
fi; \
159+
fi; \
145160
done; \
146161
done; rm -f c$${pid}_.???; exit $$bad
147162
endif %?CK-OPTS%

usr/share/automake-1.18/am/scripts.am

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,26 @@ installcheck-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
117117
## Insert the directory back if nobase_ is used.
118118
?!BASE? f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
119119
for opt in --help --version; do \
120-
if "$(DESTDIR)$(%NDIR%dir)/$$f" $$opt >c$${pid}_.out \
121-
2>c$${pid}_.err </dev/null \
122-
&& test -n "`cat c$${pid}_.out`" \
123-
&& test -z "`cat c$${pid}_.err`"; then :; \
124-
else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
120+
"$(DESTDIR)$(%NDIR%dir)/$$f" $$opt \
121+
>c$${pid}_.out 2>c$${pid}_.err </dev/null; \
122+
xc=$$?; \
123+
if test -n "`cat c$${pid}_.err`"; then \
124+
echo "$$f does not support $$opt: error output" 1>&2; \
125+
cat c$${pid}_.err 1>&2; \
126+
bad=1; \
127+
else \
128+
if test -z "`cat c$${pid}_.out`"; then \
129+
echo "$$f does not support $$opt: no output" 1>&2; \
130+
bad=1; \
131+
else \
132+
if test $$xc != 0; then \
133+
echo "$$f does not support $$opt: exit code $$xc" 1>&2; \
134+
bad=1; \
135+
else \
136+
:; \
137+
fi; \
138+
fi; \
139+
fi; \
125140
done; \
126141
done; rm -f c$${pid}_.???; exit $$bad
127142
endif %?CK-OPTS%

0 commit comments

Comments
 (0)