Hello all, > Attached :)
Sylvain, thank you for your help. I also make minimized diff file like Sylvain's one with this command below on Debian 7zip git tree. $ git diff -b debian/22.01+really25.01+dfsg-0+deb12u1...debian/bookworm debian/ > 7zip_22.01+really26.01+dfsg-0+deb12u1-debian-git--b.diff The output file is not a canonical debdiff format, but it's handy to check important changes. -- YOKOTA Hiroshi
diff --git a/debian/changelog b/debian/changelog index 9da700c..4c6dc2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +7zip (22.01+really26.01+dfsg-0+deb12u1) bookworm; urgency=medium + + * Fix CVE-2026-48095 + + * New upstream version 26.01+dfsg + * Change EOL from DOS style to Unix style in patch file + * Rediff patches + * Update debian/watch + + -- YOKOTA Hiroshi <[email protected]> Fri, 29 May 2026 00:19:38 +0900 + 7zip (22.01+really25.01+dfsg-0+deb12u1) bookworm; urgency=high * Non-maintainer upload by the LTS Security Team. diff --git a/debian/patches/0001-Accept-Debian-build-flags.patch b/debian/patches/0001-Accept-Debian-build-flags.patch index 2bf482c..b2a639e 100644 --- a/debian/patches/0001-Accept-Debian-build-flags.patch +++ b/debian/patches/0001-Accept-Debian-build-flags.patch @@ -8,7 +8,7 @@ Forwarded: not-needed 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak -index 8fbef14..2756ba4 100644 +index a78c0fa..ac6b056 100644 --- a/CPP/7zip/7zip_gcc.mak +++ b/CPP/7zip/7zip_gcc.mak @@ -45,7 +45,7 @@ CFLAGS_DEBUG = -g diff --git a/debian/patches/0002-Use-getcwd-3-POSIX-extension-to-avoid-PATH_MAX-macro.patch b/debian/patches/0002-Use-getcwd-3-POSIX-extension-to-avoid-PATH_MAX-macro.patch index 812805a..d91ddbc 100644 --- a/debian/patches/0002-Use-getcwd-3-POSIX-extension-to-avoid-PATH_MAX-macro.patch +++ b/debian/patches/0002-Use-getcwd-3-POSIX-extension-to-avoid-PATH_MAX-macro.patch @@ -10,7 +10,7 @@ This fix helps GNU Hurd. 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/CPP/Windows/FileDir.cpp b/CPP/Windows/FileDir.cpp -index 4a4bf52..e1747fc 100644 +index ad0d8c9..f5f94d4 100644 --- a/CPP/Windows/FileDir.cpp +++ b/CPP/Windows/FileDir.cpp @@ -1141,22 +1141,11 @@ bool GetCurrentDir(FString &path) diff --git a/debian/patches/0003-Disable-local-echo-display-when-in-input-passwords-C.patch b/debian/patches/0003-Disable-local-echo-display-when-in-input-passwords-C.patch index c5e7182..a240e4e 100644 --- a/debian/patches/0003-Disable-local-echo-display-when-in-input-passwords-C.patch +++ b/debian/patches/0003-Disable-local-echo-display-when-in-input-passwords-C.patch @@ -11,7 +11,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006238 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/CPP/7zip/UI/Console/UserInputUtils.cpp b/CPP/7zip/UI/Console/UserInputUtils.cpp -index 6c3c85a..2832b00 100644 +index 2adf9df..fbc1568 100644 --- a/CPP/7zip/UI/Console/UserInputUtils.cpp +++ b/CPP/7zip/UI/Console/UserInputUtils.cpp @@ -57,9 +57,18 @@ NUserAnswerMode::EEnum ScanUserYesNoAllQuit(CStdOutStream *outStream) @@ -72,7 +72,7 @@ index 6c3c85a..2832b00 100644 const bool res = g_StdIn.ScanUStringUntilNewLine(psw); diff --git a/CPP/Common/StdInStream.h b/CPP/Common/StdInStream.h -index 2253c43..69d84fe 100644 +index 81ca3bf..e8b6214 100644 --- a/CPP/Common/StdInStream.h +++ b/CPP/Common/StdInStream.h @@ -23,7 +23,10 @@ public: diff --git a/debian/patches/0005-Add-note-for-unexpected-recursive-operations-behavio.patch b/debian/patches/0005-Add-note-for-unexpected-recursive-operations-behavio.patch index 440ee78..445b874 100644 --- a/debian/patches/0005-Add-note-for-unexpected-recursive-operations-behavio.patch +++ b/debian/patches/0005-Add-note-for-unexpected-recursive-operations-behavio.patch @@ -9,7 +9,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1091693 1 file changed, 4 insertions(+) diff --git a/CPP/7zip/UI/Console/Main.cpp b/CPP/7zip/UI/Console/Main.cpp -index 5094452..7511322 100644 +index 521fe77..1b6c2a3 100644 --- a/CPP/7zip/UI/Console/Main.cpp +++ b/CPP/7zip/UI/Console/Main.cpp @@ -133,6 +133,10 @@ static const char * const kHelpString = diff --git a/debian/patches/0008-Remove-unwanted-hack-for-object-files.patch b/debian/patches/0008-Remove-unwanted-hack-for-object-files.patch index 909aa45..5a52616 100644 --- a/debian/patches/0008-Remove-unwanted-hack-for-object-files.patch +++ b/debian/patches/0008-Remove-unwanted-hack-for-object-files.patch @@ -7,10 +7,10 @@ Subject: Remove unwanted hack for object files CPP/7zip/7zip_gcc.mak | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -Index: 7zip/CPP/7zip/7zip_gcc.mak -=================================================================== ---- 7zip.orig/CPP/7zip/7zip_gcc.mak -+++ 7zip/CPP/7zip/7zip_gcc.mak +diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak +index ac6b056..421a171 100644 +--- a/CPP/7zip/7zip_gcc.mak ++++ b/CPP/7zip/7zip_gcc.mak @@ -51,8 +51,7 @@ endif # CFLAGS_BASE_LIST = -S diff --git a/debian/watch b/debian/watch index ddb2188..e1616e8 100644 --- a/debian/watch +++ b/debian/watch @@ -1,7 +1,10 @@ # -*- mode: conf -*- version=4 -opts="uversionmangle=s/(\d{2})(\d{2})/$1.$2/, \ - dversionmangle=s/\+dfsg$//, \ - oversionmangle=s/$/+dfsg/, \ +opts="filenamemangle=s%.*/@ANY_VERSION@%@PACKAGE@-$1.tar.gz%, \ + downloadurlmangle=s%api.github.com/repos/([^/]+/[^/]+)/git/refs/tags/@ANY_VERSION@%github.com/$1/archive/refs/tags/$2.tar.gz%g, \ + searchmode=plain, \ + dversionmangle=s/^22.01\+really//; s/\+dfsg$//, \ + oversionmangle=s/^/22.01+really/; s/$/+dfsg/, \ pgpmode=none" \ -https://www.7-zip.org/download.html a/7z(\d{4})-src\.tar\.xz +https://api.github.com/repos/ip7z/7zip/git/matching-refs/tags/ \ + https://api.github.com/repos/[^/]+/[^/]+/git/refs/tags/@ANY_VERSION@
