Skip to contentSkip to conversation

logrotate: upgrade 3.19.0 -> 3.20.1

PATCH New Wang Mingyu 2 participants 5 messages May 30, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 logrotate: upgrade 3.19.0 -> 3.20.1

Changelog:
=========
drop world-readable permission on state file even when ACLs are enabled (#446) fix potential DoS from unprivileged users via the state file (CVE-2022-1348) fix a misleading debug message with copytruncate and rotate 0 (#443) add support for unsigned time_t (#438)
do not lock state file /dev/null (#433)

---
 .../logrotate/{logrotate_3.19.0.bb => logrotate_3.20.1.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/logrotate/{logrotate_3.19.0.bb => logrotate_3.20.1.bb} (97%)
meta/recipes-extended/logrotate/logrotate_3.20.1.bb renamed from meta/recipes-extended/logrotate/logrotate_3.19.0.bb +1 -1
similarity index 97%
rename from meta/recipes-extended/logrotate/logrotate_3.19.0.bb
rename to meta/recipes-extended/logrotate/logrotate_3.20.1.bb
index 2a60d9b31f..35977535aa 100644
@@ -15,7 +15,7 @@ UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
 
-SRC_URI[sha256sum] = "ddd5274d684c5c99ca724e8069329f343ebe376e07493d537d9effdc501214ba"
+SRC_URI[sha256sum] = "742f6d6e18eceffa49a4bacd933686d3e42931cfccfb694d7f6369b704e5d094"
 
 # These CVEs are debian, gentoo or SUSE specific on the way logrotate was installed/used
 CVE_CHECK_IGNORE += "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 btrfs-tools: upgrade 5.16.2 -> 5.18

lzo-option.patch
removed since it's included in 5.18.

Changelog:
==========
fixes:
dump-tree: don't print traling zeros in checksums
recognize paused balance as exclusive operation state, allow to start device add
convert: properly initialize target filesystem label
mkfs: don't create free space bitmaps for empty filesystem
restore: make lzo support build-time configurable, print supported compression in help text update kernel-lib sources
other:
documentation updates, finish conversion to RST, CHANGES and INSTALL could be included into RST fix build detection of experimental mode
new tests

---
 .../btrfs-tools/btrfs-tools/lzo-option.patch  | 126 ------------------
 ...fs-tools_5.16.2.bb => btrfs-tools_5.18.bb} |   3 +-
 2 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.16.2.bb => btrfs-tools_5.18.bb} (96%)
meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch deleted +0 -126
deleted file mode 100644
index f4278a5c5d..0000000000
@@ -1,126 +0,0 @@
-Upstream-Status: Backport [https://github.com/kdave/btrfs-progs/commit/73545c1fe6304f08ab306b76d2bcacaf22a5e99a]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 4f4eafe8ebcc86f84f6c85a5c5814c430d8f190c Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Tue, 24 May 2022 13:44:29 +0100
-Subject: [PATCH] btrfs-progs: add option to disable LZO support
-
-LZO as a compression format is pretty archaic these days, there are
-better algorithsm in all metrics for compression and decompression, and
-lzo hasn't had a new release since 2017.
-
-Add an option to disable LZO (defaulting to enabled), and respect it in
-cmds/restore.c.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- Makefile        |  2 +-
- Makefile.inc.in |  1 +
- cmds/restore.c  |  7 +++++++
- configure.ac    | 30 ++++++++++++++++++++----------
- 4 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index af4908f9..0e8e05f3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -335,7 +335,7 @@ endif
- btrfs_convert_cflags = -DBTRFSCONVERT_EXT2=$(BTRFSCONVERT_EXT2)
- btrfs_convert_cflags += -DBTRFSCONVERT_REISERFS=$(BTRFSCONVERT_REISERFS)
- btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype
--cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD)
-+cmds_restore_cflags = -DBTRFSRESTORE_LZO=$(BTRFSRESTORE_LZO) -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD)
- 
- ifeq ($(CRYPTOPROVIDER_BUILTIN),1)
- CRYPTO_OBJECTS = crypto/sha224-256.o crypto/blake2b-ref.o
-diff --git a/Makefile.inc.in b/Makefile.inc.in
-index c995aef9..385b7ae1 100644
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -16,6 +16,7 @@ BUILD_PROGRAMS = @BUILD_PROGRAMS@
- BUILD_SHARED_LIBRARIES = @BUILD_SHARED_LIBRARIES@
- BUILD_STATIC_LIBRARIES = @BUILD_STATIC_LIBRARIES@
- BTRFSCONVERT_EXT2 = @BTRFSCONVERT_EXT2@
-+BTRFSRESTORE_LZO = @BTRFSRESTORE_LZO@
- BTRFSCONVERT_REISERFS = @BTRFSCONVERT_REISERFS@
- BTRFSRESTORE_ZSTD = @BTRFSRESTORE_ZSTD@
- PYTHON_BINDINGS = @PYTHON_BINDINGS@
-diff --git a/cmds/restore.c b/cmds/restore.c
-index 5923d571..4dd79fce 100644
---- a/cmds/restore.c
-+++ b/cmds/restore.c
-@@ -25,8 +25,10 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#if BTRFSRESTORE_LZO
- #include <lzo/lzoconf.h>
- #include <lzo/lzo1x.h>
-+#endif
- #include <zlib.h>
- #if BTRFSRESTORE_ZSTD
- #include <zstd.h>
-@@ -98,6 +100,10 @@ static inline size_t read_compress_length(unsigned char *buf)
- static int decompress_lzo(struct btrfs_root *root, unsigned char *inbuf,
- 			char *outbuf, u64 compress_len, u64 *decompress_len)
- {
-+#if !BTRFSRESTORE_LZO
-+	error("btrfs not compiled with lzo support");
-+	return -1;
-+#else
- 	size_t new_len;
- 	size_t in_len;
- 	size_t out_len = 0;
-@@ -156,6 +162,7 @@ static int decompress_lzo(struct btrfs_root *root, unsigned char *inbuf,
- 	*decompress_len = out_len;
- 
- 	return 0;
-+#endif
- }
- 
- static int decompress_zstd(const char *inbuf, char *outbuf, u64 compress_len,
-diff --git a/configure.ac b/configure.ac
-index d907636b..c1ad2c22 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -372,16 +372,26 @@ if ${PKG_CONFIG} udev --atleast-version 190; then
- fi
- AC_SUBST(UDEVDIR)
- 
--dnl lzo library does not provide pkg-config, let use classic way
--AC_CHECK_LIB([lzo2], [lzo_version], [
--	LZO2_LIBS="-llzo2"
--	LZO2_CFLAGS=""
--	LZO2_LIBS_STATIC="-llzo2"],[
--	AC_MSG_ERROR([cannot find lzo2 library])
--])
--AC_SUBST([LZO2_LIBS])
--AC_SUBST([LZO2_LIBS_STATIC])
--AC_SUBST([LZO2_CFLAGS])
-+AC_ARG_ENABLE([lzo],
-+	AS_HELP_STRING([--disable-lzo], [build without lzo support]),
-+	[], [enable_lzo=yes]
-+)
-+
-+if test "x$enable_lzo" = xyes; then
-+	dnl lzo library does not provide pkg-config, let use classic way
-+	AC_CHECK_LIB([lzo2], [lzo_version], [
-+		LZO2_LIBS="-llzo2"
-+		LZO2_CFLAGS=""
-+		LZO2_LIBS_STATIC="-llzo2"],[
-+		AC_MSG_ERROR([cannot find lzo2 library])
-+	])
-+	AC_SUBST([LZO2_LIBS])
-+	AC_SUBST([LZO2_LIBS_STATIC])
-+	AC_SUBST([LZO2_CFLAGS])
-+fi
-+
-+AS_IF([test "x$enable_lzo" = xyes], [BTRFSRESTORE_LZO=1], [BTRFSRESTORE_LZO=0])
-+AC_SUBST(BTRFSRESTORE_LZO)
- 
- dnl call PKG_INSTALLDIR from pkg.m4 to set pkgconfigdir
- m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_MSG_ERROR([please install pkgconf])])
--- 
-2.25.1
-
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb +1 -2
similarity index 96%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.bb
index 88b5c6259c..b83b4cd1b8 100644
@@ -17,9 +17,8 @@ DEPENDS = "util-linux zlib"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
-           file://lzo-option.patch \
            "
-SRCREV = "31458c9c81935abbed010221261897273a98d2c1"
+SRCREV = "f9e303584272b81b05b926a0cc9010f43af12a03"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
Signature · 1 line
2.25.1
#2 lore raw

Re: [OE-core] [PATCH] btrfs-tools: upgrade 5.16.2 -> 5.18

Hi wangmy,

Il giorno Mon, 30 May 2022 14:40:48 +0800
"wangmy" <[email protected]> ha scritto:

Quoted 17 lines

lzo-option.patch
removed since it's included in 5.18.

Changelog:
==========
fixes:
dump-tree: don't print traling zeros in checksums
recognize paused balance as exclusive operation state, allow to start device add
convert: properly initialize target filesystem label
mkfs: don't create free space bitmaps for empty filesystem
restore: make lzo support build-time configurable, print supported compression in help text update kernel-lib sources
other:
documentation updates, finish conversion to RST, CHANGES and INSTALL could be included into RST fix build detection of experimental mode
new tests

Quoted 1 line

This patch triggers a build failure:

configure: error: cannot find sphinx-build, cannot build documentation

https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/3051/steps/11/logs/errors
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/3051/steps/11/logs/stdio

Signature · 3 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 dpkg: upgrade 1.21.7 -> 1.21.8

In reply to Wang Mingyu

Changelog:
==========
* dpkg-statoverride: Add support for --force-not-root. Closes: #1009069
* dpkg: Fix <De-configuring> message to allow configuration to use new version.
* Perl modules:
- Dpkg::Source::Archive: Prevent directory traversal for in-place extracts.
- Dpkg::Substvars: Add support for optional substvars assigned with ?=.
* Documentation:
- man: Reference deb-substvar(5) from dpkg-source(1) and dpkg-shlibdeps(1).
- man: Structure and clarify deb-substvars(5).
* Build system:
- Unhook dist-cpan from make dist target.
* Packaging:
- Silence warning about merged-usr-via-aliased-dirs on Ubuntu.
- Remove useless [] around tr sets.
* Localization:
- Update Dutch translations. Closes: #1010031, #1010032, #1010033
- Update Portuguese man pages translations. Closes: #1011095
* Localization:
- Update German man pages translation.

---
 meta/recipes-devtools/dpkg/{dpkg_1.21.7.bb => dpkg_1.21.8.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/dpkg/{dpkg_1.21.7.bb => dpkg_1.21.8.bb} (95%)
meta/recipes-devtools/dpkg/dpkg_1.21.8.bb renamed from meta/recipes-devtools/dpkg/dpkg_1.21.7.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/dpkg/dpkg_1.21.7.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.21.8.bb
index 902cc03bcd..0d6b43aabb 100644
@@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
 
 SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
 
-SRCREV = "e61f582015a9c67bbb3791cb93a864cfeb9c7151"
+SRCREV = "a154134fe70c0b823ae14905bdc33b64e7dcd454"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
#4 lore raw

PATCH 1/1 repo: upgrade 2.25 -> 2.26

In reply to Wang Mingyu
---
 meta/recipes-devtools/repo/{repo_2.25.bb => repo_2.26.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/repo/{repo_2.25.bb => repo_2.26.bb} (95%)
meta/recipes-devtools/repo/repo_2.26.bb renamed from meta/recipes-devtools/repo/repo_2.25.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/repo/repo_2.25.bb
rename to meta/recipes-devtools/repo/repo_2.26.bb
index b7332515c8..ff5b7eb6aa 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \
            file://0001-python3-shebang.patch \
            "
-SRCREV = "501733c2abb1180679f25b2f78970d73a2f8d413"
+SRCREV = "bdcba7dc36f1c8e6041681eb5b3b5229c93c7c5c"
 
 MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
 
Signature · 1 line
2.25.1