From 0c8c7e865dd4be7e6e32182211fc0d1c8acdaab9 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 06 Apr 2019 13:00:20 -0400 Subject: patches: Apply sequentially --- diff --git a/patches/0001-cli-Set-default-conf-file-path-in-build-system.patch b/patches/0001-cli-Set-default-conf-file-path-in-build-system.patch index fd2c91d..93a6cc2 100644 --- a/patches/0001-cli-Set-default-conf-file-path-in-build-system.patch +++ b/patches/0001-cli-Set-default-conf-file-path-in-build-system.patch @@ -1,7 +1,7 @@ -From 2afcd1b6890f34e7723dc032f0aedb85c409f589 Mon Sep 17 00:00:00 2001 +From 59c7a3653d360ec25a7e6104dd83e6bd3c814865 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 4 Apr 2019 16:55:39 -0400 -Subject: [PATCH] cli: Set default conf file path in build system +Subject: [PATCH 1/6] cli: Set default conf file path in build system Signed-off-by: Patrick McDermott --- diff --git a/patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch b/patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch index 9c3a728..4b727aa 100644 --- a/patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch +++ b/patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch @@ -1,7 +1,7 @@ -From 2b29cbc39554ddae21461eaf781b944eddfc7d9d Mon Sep 17 00:00:00 2001 +From 96e92e8411ddde1fcb15cde07542a71d89849584 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 6 Apr 2019 12:00:22 -0400 -Subject: [PATCH 2/2] build: Allow overriding opkg state dir prefix +Subject: [PATCH 2/6] build: Allow overriding opkg state dir prefix Signed-off-by: Patrick McDermott --- diff --git a/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch b/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch index 9765026..7a35403 100644 --- a/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch +++ b/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch @@ -1,7 +1,7 @@ -From 8297cbe6f15ddef8bb47682913ff10a3cffa997c Mon Sep 17 00:00:00 2001 +From f96d300f0c236ebd4edb8e8b11aa948257cb7fb0 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 4 Apr 2019 18:25:51 -0400 -Subject: [PATCH] cli: Optionally enforce argument to upgrade command +Subject: [PATCH 3/6] cli: Optionally enforce argument to upgrade command This reverts and amends commit 673d7213175c2cf209b25c8eb2632941cdbb8519. @@ -13,10 +13,10 @@ Signed-off-by: Patrick McDermott 3 files changed, 25 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 26230b3..508eccc 100644 +index 9acd6b4..dfb1b81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13,6 +13,7 @@ SET(VERSION "" CACHE STRING "Override version") +@@ -15,6 +15,7 @@ SET(VERSION "" CACHE STRING "Override version") OPTION(STATIC_UBOX "Statically link libubox" OFF) OPTION(BUILD_TESTS "Build test programs" ON) OPTION(ENABLE_USIGN "Enable usign support" ON) @@ -24,7 +24,7 @@ index 26230b3..508eccc 100644 IF(NOT HOST_CPU) SET(HOST_CPU "${CMAKE_HOST_SYSTEM_PROCESSOR}") -@@ -49,6 +50,9 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations +@@ -52,6 +53,9 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations IF(ENABLE_USIGN) ADD_DEFINITIONS(-DHAVE_USIGN) ENDIF() @@ -71,7 +71,7 @@ index c823df8..0a4180d 100644 {"list", 0, (opkg_cmd_fun_t) opkg_list_cmd, PFM_SOURCE}, {"list_installed", 0, (opkg_cmd_fun_t) opkg_list_installed_cmd, diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index a3ea5c1..29cd373 100644 +index a299514..6488e00 100644 --- a/src/opkg-cl.c +++ b/src/opkg-cl.c @@ -260,7 +260,11 @@ static void usage() diff --git a/patches/0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch b/patches/0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch index 56181dd..825fe37 100644 --- a/patches/0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch +++ b/patches/0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch @@ -1,7 +1,7 @@ -From a47ab58d94a48bd86fbb0fc54caea651464beaea Mon Sep 17 00:00:00 2001 +From a4c13397c7ea899c0aaef10b089bac48dc655cd3 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 6 Apr 2019 11:12:31 -0400 -Subject: [PATCH] libopkg: Fix segfault on trailing comma in deps +Subject: [PATCH 4/6] libopkg: Fix segfault on trailing comma in deps A "Depends" or other package relationship field with a trailing comma (followed by zero or more whitespace characters) in any package feed -- cgit v0.9.1