opkg += 0.6.0

negan07 · Jun 9, 2022 · 51b25b5 · 51b25b5
1 parent 8e50425
commit 51b25b5
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 64 deletions.
diff --git a/diffs/work/opkg-0.5.0/D7000_V1.0.1.84_work_opkg-0.5.0-002-makefileam_dir_removal.diff b/diffs/work/opkg-0.5.0/D7000_V1.0.1.84_work_opkg-0.5.0-002-makefileam_dir_removal.diff
diff --git a/....0.1.84_work_opkg-0.5.0-000-makefile.diff → ....0.1.84_work_opkg-0.6.0-000-makefile.diff b/....0.1.84_work_opkg-0.5.0-000-makefile.diff → ....0.1.84_work_opkg-0.6.0-000-makefile.diff
@@ -1,6 +1,5 @@
-diff -urN work/opkg-0.5.0/Makefile work/opkg-0.5.0/Makefile
---- work/opkg-0.5.0/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ work/opkg-0.5.0/Makefile	2017-03-23 20:35:42.745736890 +0100
+--- work/opkg-0.6.0/Makefile
++++ work/opkg-0.6.0/Makefile
 @@ -0,0 +1,159 @@
 +include ../Rules.mak
 +

diff --git a/diffs/work/opkg-0.6.0/D7000_V1.0.1.84_work_opkg-0.6.0-002-makefileam_dir_removal.diff b/diffs/work/opkg-0.6.0/D7000_V1.0.1.84_work_opkg-0.6.0-002-makefileam_dir_removal.diff
@@ -0,0 +1,10 @@
+--- work/opkg-0.6.0/opkg-0.6.0/Makefile.am
++++ work/opkg-0.6.0/opkg-0.6.0/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+-SUBDIRS = libopkg src utils man
++SUBDIRS = libopkg src #utils man
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libopkg.pc
diff --git a/...pkg-0.5.0-003-libcurl_no_peer_verify.diff → ...pkg-0.6.0-003-libcurl_no_peer_verify.diff b/...pkg-0.5.0-003-libcurl_no_peer_verify.diff → ...pkg-0.6.0-003-libcurl_no_peer_verify.diff
@@ -1,6 +1,5 @@
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_download_curl.c work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_download_curl.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_download_curl.c	1970-01-01 01:00:00.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_download_curl.c	2017-03-23 20:35:42.745736890 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_download_curl.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_download_curl.c
 @@ -219,6 +219,7 @@
      double src_size = -1;
      int ret = 1;

diff --git a/...010-add_section_field_to_status_file.diff → ...010-add_section_field_to_status_file.diff b/...010-add_section_field_to_status_file.diff → ...010-add_section_field_to_status_file.diff
@@ -1,7 +1,6 @@
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg.c work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg.c	2016-12-22 18:38:14.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg.c	2017-03-22 00:12:25.566249000 +0100
-@@ -902,9 +902,7 @@
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/pkg.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/pkg.c
+@@ -919,9 +919,7 @@
      pkg_formatted_field(file, pkg, "Replaces", NULL);
      pkg_formatted_field(file, pkg, "Conflicts", NULL);
      pkg_formatted_field(file, pkg, "Status", NULL);

diff --git a/...0-040-wrap-descriptions-only-on-ttys.diff → ...0-040-wrap-descriptions-only-on-ttys.diff b/...0-040-wrap-descriptions-only-on-ttys.diff → ...0-040-wrap-descriptions-only-on-ttys.diff
@@ -1,6 +1,5 @@
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_parse.c work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_parse.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_parse.c	2016-12-22 18:38:14.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_parse.c	2017-03-24 22:30:50.254489817 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/pkg_parse.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/pkg_parse.c
 @@ -23,6 +23,7 @@
 
  #include <stdio.h>

diff --git a/...insensitive-flag-old-config-location.diff → ...insensitive-flag-old-config-location.diff b/...insensitive-flag-old-config-location.diff → ...insensitive-flag-old-config-location.diff
@@ -1,6 +1,5 @@
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c	2016-12-22 18:38:14.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c	2017-03-24 22:57:03.946704785 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_cmd.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_cmd.c
 @@ -369,7 +331,7 @@
      for (i = 0; i < ordered->len; i++) {
          pkg = ordered->pkgs[i];
@@ -76,9 +75,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c work/opkg-0.5.0/opkg-0.5
                  found_match = 1;
                  print_pkg(pkg);
              }
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.c work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.c	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.c	2018-03-19 23:02:24.135480676 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_conf.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_conf.c
 @@ -75,6 +75,7 @@
      {"download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only},
      {"download_first", OPKG_OPT_TYPE_BOOL, &_conf.download_first}, /* Not available on internal solver */
@@ -87,9 +85,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.c work/opkg-0.5.0/opkg-0.
      {"no_install_recommends", OPKG_OPT_TYPE_BOOL, &_conf.no_install_recommends},
      {"offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root},
      {"overlay_root", OPKG_OPT_TYPE_STRING, &_conf.overlay_root},
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.h work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.h
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.h	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.h	2018-03-19 23:03:50.142966116 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_conf.h
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_conf.h
 @@ -22,6 +22,7 @@
  #define OPKG_CONF_H
 
@@ -106,9 +103,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_conf.h work/opkg-0.5.0/opkg-0.
      int no_install_recommends;
      char *offline_root;
      char *overlay_root;
-diff -urN work/opkg-0.5.0/opkg-0.5.0/src/opkg.c work/opkg-0.5.0/opkg-0.5.0/src/opkg.c
---- work/opkg-0.5.0/opkg-0.5.0/src/opkg.c	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/src/opkg.c	2018-03-19 23:07:10.981458627 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/src/opkg.c
++++ work/opkg-0.6.0/opkg-0.6.0/src/opkg.c
 @@ -57,6 +57,7 @@
      ARGS_OPT_NOACTION,
      ARGS_OPT_DOWNLOAD_ONLY,

diff --git a/..._opkg-0.5.0-220-drop-release-support.diff → ..._opkg-0.6.0-220-drop-release-support.diff b/..._opkg-0.5.0-220-drop-release-support.diff → ..._opkg-0.6.0-220-drop-release-support.diff
@@ -1,6 +1,5 @@
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/Makefile.am work/opkg-0.5.0/opkg-0.5.0/libopkg/Makefile.am
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/Makefile.am	2016-12-22 18:38:14.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/Makefile.am	2017-03-24 23:46:06.404090221 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/Makefile.am
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/Makefile.am
 @@ -6,24 +6,24 @@
 
  libopkg_includedir=$(includedir)/libopkg
@@ -32,9 +31,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/Makefile.am work/opkg-0.5.0/opkg-0.
  	sprintf_alloc.c xregex.c xsystem.c xfuncs.c opkg_archive.c \
  	opkg_verify.c string_util.c
 
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.c work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.c	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.c	1970-01-01 01:00:00.000000000 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/cksum_list.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/cksum_list.c
 @@ -1,90 +0,0 @@
 -/* vi: set expandtab sw=4 sts=4: */
 -/* cksum_lis.c - the opkg package management system
@@ -126,9 +124,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.c work/opkg-0.5.0/opkg-0
 -    }
 -    return NULL;
 -}
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.h work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.h
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.h	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.h	1970-01-01 01:00:00.000000000 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/cksum_list.h
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/cksum_list.h
 @@ -1,53 +0,0 @@
 -/* vi: set expandtab sw=4 sts=4: */
 -/* cksum_list.h - the opkg package management system
@@ -183,9 +180,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/cksum_list.h work/opkg-0.5.0/opkg-0
 -#endif
 -
 -#endif                          /* CKSUM_LIST_H */
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c	2018-03-19 23:24:40.857986605 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_cmd.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/opkg_cmd.c
 @@ -31,7 +31,6 @@
  #include "opkg_conf.h"
  #include "opkg_cmd.h"
@@ -236,9 +232,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/opkg_cmd.c work/opkg-0.5.0/opkg-0.5
      for (iter = void_list_first(&opkg_config->pkg_src_list); iter;
              iter = void_list_next(&opkg_config->pkg_src_list, iter)) {
          src = (pkg_src_t *) iter->data;
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_hash.c work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_hash.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_hash.c	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_hash.c	2018-03-19 22:56:46.405529250 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/pkg_hash.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/pkg_hash.c
 @@ -25,7 +25,6 @@
  #include <fnmatch.h>
 
@@ -337,9 +332,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/pkg_hash.c work/opkg-0.5.0/opkg-0.5
      for (iter = void_list_first(&opkg_config->pkg_src_list); iter;
              iter = void_list_next(&opkg_config->pkg_src_list, iter)) {
 
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/release.c work/opkg-0.5.0/opkg-0.5.0/libopkg/release.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/release.c	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/release.c	1970-01-01 01:00:00.000000000 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/release.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/release.c
 @@ -1,375 +0,0 @@
 -/* vi: set expandtab sw=4 sts=4: */
 -/* release.c - the opkg package management system
@@ -716,9 +710,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/release.c work/opkg-0.5.0/opkg-0.5.
 -
 -    return ret;
 -}
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/release.h work/opkg-0.5.0/opkg-0.5.0/libopkg/release.h
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/release.h	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/release.h	1970-01-01 01:00:00.000000000 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/release.h
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/release.h
 @@ -1,56 +0,0 @@
 -/* vi: set expandtab sw=4 sts=4: */
 -/* release.h - the opkg package management system
@@ -776,9 +769,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/release.h work/opkg-0.5.0/opkg-0.5.
 -}
 -#endif
 -#endif                          /* RELEASE_H */
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.c work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.c
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.c	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.c	1970-01-01 01:00:00.000000000 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/release_parse.c
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/release_parse.c
 @@ -1,130 +0,0 @@
 -/* vi: set expandtab sw=4 sts=4: */
 -/* release_parse.c - the opkg package management system
@@ -910,9 +902,8 @@ diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.c work/opkg-0.5.0/opk
 -
 -    return ret;
 -}
-diff -urN work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.h work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.h
---- work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.h	2018-02-19 18:08:43.000000000 +0100
-+++ work/opkg-0.5.0/opkg-0.5.0/libopkg/release_parse.h	1970-01-01 01:00:00.000000000 +0100
+--- work/opkg-0.6.0/opkg-0.6.0/libopkg/release_parse.h
++++ work/opkg-0.6.0/opkg-0.6.0/libopkg/release_parse.h
 @@ -1,31 +0,0 @@
 -/* vi: set expandtab sw=4 sts=4: */
 -/* release_parse.h - the opkg package management system

diff --git a/work/dirs.mak b/work/dirs.mak
@@ -294,7 +294,7 @@ DIRLIST				+= $(OPKG_UTILS)
 TARLIST				+= $(TAR_$(OPKG_UTILS))
 # OPKG
 OPKG_NAME			:= opkg
-VER_$(OPKG_NAME)		:= 0.5.0
+VER_$(OPKG_NAME)		:= 0.6.0
 OPKG				:= $(OPKG_NAME)-$(VER_$(OPKG_NAME))
 NAME_$(OPKG)			:= $(OPKG_NAME)$(DBG)
 SUBVER_$(OPKG)			:=