From 4e6a94ff7b6b9337f26673d930bc74f0eb8070a3 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Tue, 30 Jun 2026 05:16:51 +0000
Subject: [PATCH] opkg: upgrade 0.9.0 -> 0.10.0

---
 ...-opkg.lock-in-run-instead-of-var-run.patch |  4 +-
 .../opkg/opkg/0002-config.h.in-fix-typo.patch | 27 ------
 ...003-cmake-fix-WITH_ACL-and-USE_XATTR.patch | 95 -------------------
 .../opkg/{opkg_0.9.0.bb => opkg_0.10.0.bb}    |  4 +-
 4 files changed, 3 insertions(+), 127 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch
 delete mode 100644 meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch
 rename meta/recipes-devtools/opkg/{opkg_0.9.0.bb => opkg_0.10.0.bb} (94%)

diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
index 98daf746ec..88aadbd51c 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
+++ b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
@@ -1,4 +1,4 @@
-From 82b29dcfe3033d8285890bf46e58f464d9944196 Mon Sep 17 00:00:00 2001
+From 1b1ea74d7375168eadc562d316a590e0dcae1260 Mon Sep 17 00:00:00 2001
 From: Jonathan Liu <net147@gmail.com>
 Date: Mon, 21 Sep 2015 20:23:23 +1000
 Subject: [PATCH] opkg_conf: create opkg.lock in /run instead of /var/run
@@ -17,7 +17,7 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
-index 3fa6ca9..b12672e 100644
+index 650b59c..f9cf981 100644
 --- a/libopkg/opkg_conf.h
 +++ b/libopkg/opkg_conf.h
 @@ -42,7 +42,7 @@ extern "C" {
diff --git a/meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch b/meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch
deleted file mode 100644
index 626bbd01b6..0000000000
--- a/meta/recipes-devtools/opkg/opkg/0002-config.h.in-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5a81faadbc2397d554bc598d535fd2d44cbc8d10 Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <ecordonnier@snap.com>
-Date: Mon, 20 Oct 2025 18:57:56 +0200
-Subject: [PATCH] config.h.in: fix typo
-
-Upstream-Status: Backport [https://git.yoctoproject.org/opkg/commit/?id=d723a90bfe6409c7ad983ed911225d4aefbfd09e]
-Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
----
- config.h.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.h.in b/config.h.in
-index 4fa9842..877b8c7 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -2,7 +2,7 @@
- #cmakedefine01 WITH_XZ
- #cmakedefine01 WITH_BZIP2
- #cmakedefine01 WITH_LZ4
--#cmakedefine01 WITH_LZSTD
-+#cmakedefine01 WITH_ZSTD
- #cmakedefine01 WITH_CURL
- #cmakedefine01 WITH_SSLCURL
- #cmakedefine01 WITH_ACL
--- 
-2.43.0
-
diff --git a/meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch b/meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch
deleted file mode 100644
index a041965515..0000000000
--- a/meta/recipes-devtools/opkg/opkg/0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6d2eb69bb7b8f1ada6232eba4eb9c223be386d29 Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <ecordonnier@snap.com>
-Date: Thu, 27 Nov 2025 19:05:16 +0100
-Subject: [PATCH] cmake: fix WITH_ACL and USE_XATTR
-
-- CMakeLists.txt was using USE_ACL, but config.h.in was using WITH_ACL.
-  Use the consistent logic that optional dependencies use the prefix HAVE_,
-  and thus since use WITH_ACL consistently (build dependency libacl).
-
-- opkg_archive.c was using ifdef instead of if for both USE_ACL and USE_XATTR.
-
-- ENABLE_XATTR and ENABLE_ACL were both "no" per default in autoconf, and this default
-  value was mistakenly changed during the cmake migration. Change it back to OFF per default.
-
-Upstream-Status: Backport [https://git.yoctoproject.org/opkg/commit/?id=6d2eb69bb7b8f1ada6232eba4eb9c223be386d29]
-Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
-Signed-off-by: Alex Stewart <alex.stewart@emerson.com>
----
- CMakeLists.txt         | 6 ++++--
- config.h.in            | 2 +-
- libopkg/CMakeLists.txt | 2 +-
- libopkg/opkg_archive.c | 4 ++--
- 4 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f2c01b1..316e343 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(PROJECT_VERSION "${PROJECT_VERSION}+git")
- set(VERSION ${PROJECT_VERSION})
- 
- option(STATIC_LIBOPKG "Statically link libopkg into opkg" OFF)
-+# Options which add optional dependencies are prefixed with "WITH_"
- # The current libopkg API is deprecated so only build it if requested
- option(WITH_LIBOPKG_API "Enable deprecated libopkg API" OFF)
- option(WITH_XZ "Enable xz compressor support" ON)
-@@ -23,8 +24,9 @@ option(WITH_CURL "Enable downloading with curl" ON)
- include(CMakeDependentOption)
- cmake_dependent_option(WITH_SSLCURL "Enable certificate authentication with curl" ON "WITH_CURL" OFF)
- option(WITH_SHA256 "Enable sha256sum check" OFF)
--option(USE_ACL "Enable ACL support" ON)
--option(USE_XATTR "Enable xattr support" ON)
-+option(WITH_ACL "Enable ACL support" OFF)
-+# Options which don't add optional dependencies are prefixed with "USE_"
-+option(USE_XATTR "Enable xattr support" OFF)
- option(USE_SOLVER_LIBSOLV "Enable libsolv solver support if true. Enable the internal solver if false." ON)
- if(USE_SOLVER_LIBSOLV)
-     set(USE_SOLVER_INTERNAL OFF CACHE BOOL "Disable internal solver")
-diff --git a/config.h.in b/config.h.in
-index 877b8c7..f2d74c5 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -6,7 +6,7 @@
- #cmakedefine01 WITH_CURL
- #cmakedefine01 WITH_SSLCURL
- #cmakedefine01 WITH_ACL
--#cmakedefine01 WITH_XATTR
-+#cmakedefine01 USE_XATTR
- #cmakedefine01 USE_SOLVER_LIBSOLV
- #cmakedefine01 USE_SOLVER_INTERNAL
- #cmakedefine01 WITH_GPGME
-diff --git a/libopkg/CMakeLists.txt b/libopkg/CMakeLists.txt
-index 628cb8c..39064c2 100644
---- a/libopkg/CMakeLists.txt
-+++ b/libopkg/CMakeLists.txt
-@@ -182,7 +182,7 @@ if(WITH_SSLCURL)
-     target_link_libraries(libopkg OpenSSL::Crypto OpenSSL::SSL)
- endif()
- 
--if(USE_ACL)
-+if(WITH_ACL)
-     pkg_check_modules(acl REQUIRED IMPORTED_TARGET libacl)
-     target_link_libraries(libopkg PkgConfig::acl)
- endif()
-diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c
-index 48f80c0..fb40db3 100644
---- a/libopkg/opkg_archive.c
-+++ b/libopkg/opkg_archive.c
-@@ -914,11 +914,11 @@ struct opkg_ar *ar_open_pkg_data_archive(const char *filename)
-     ar->extract_flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM |
-         ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_UNLINK | ARCHIVE_EXTRACT_NO_OVERWRITE;
- 
--#ifdef USE_ACL
-+#if WITH_ACL
-     ar->extract_flags |= ARCHIVE_EXTRACT_ACL;
- #endif
- 
--#ifdef USE_XATTR
-+#if USE_XATTR
-     ar->extract_flags |= ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_XATTR;
- #endif
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-devtools/opkg/opkg_0.9.0.bb b/meta/recipes-devtools/opkg/opkg_0.10.0.bb
similarity index 94%
rename from meta/recipes-devtools/opkg/opkg_0.9.0.bb
rename to meta/recipes-devtools/opkg/opkg_0.10.0.bb
index 7551f1bc49..debcd94a30 100644
--- a/meta/recipes-devtools/opkg/opkg_0.9.0.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.10.0.bb
@@ -15,12 +15,10 @@ PE = "1"
 SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
            file://opkg.conf \
            file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
-           file://0002-config.h.in-fix-typo.patch \
-           file://0003-cmake-fix-WITH_ACL-and-USE_XATTR.patch \
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "440ef321862e01f83da4d02884a0cbb4d9d7b32f82faa81a6a85493f0c89d0f5"
+SRC_URI[sha256sum] = "4d099e010a5d262b34184fee4766bc60a8c7439741fb210aa11d51704afd04d1"
 
 # This needs to be before ptest inherit, otherwise all ptest files end packaged
 # in libopkg package if OPKGLIBDIR == libdir, because default
-- 
2.47.1

