libopkg: remove config.h references

[oweals/opkg-lede.git] / libopkg / pkg_parse.c

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index e0c0069f40ab8a37a1d93743c5cb4908732cadf0..ae52deb2556766211e0e19062340e3030fe1af74 100644 (file)
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -16,8 +16,6 @@
    General Public License for more details.
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -42,7 +40,7 @@ static void parse_status(pkg_t * pkg, const char *sstr)
        }
 
        pkg->state_want = pkg_state_want_from_str(sw_str);
-       pkg->state_flag = pkg_state_flag_from_str(sf_str);
+       pkg->state_flag |= pkg_state_flag_from_str(sf_str);
        pkg->state_status = pkg_state_status_from_str(ss_str);
 }
 
@@ -186,20 +184,25 @@ int pkg_parse_line(void *ptr, const char *line, uint mask)
                break;
 
        case 'M':
-               if ((mask & PFM_MD5SUM) && (is_field("MD5sum:", line) || is_field("MD5Sum:", line))) {
-                       size_t len;
-                       char *cksum = checksum_hex2bin(line + strlen("MD5sum") + 1, &len);
-                       if (cksum && len == 16)
-                               pkg_set_raw(pkg, PKG_MD5SUM, cksum, len);
-               }
+               if ((mask & PFM_MD5SUM) && (is_field("MD5sum:", line) || is_field("MD5Sum:", line)))
+                       pkg_set_md5(pkg, line + strlen("MD5sum") + 1);
                else if ((mask & PFM_MAINTAINER)
                         && is_field("Maintainer", line))
                        pkg_set_string(pkg, PKG_MAINTAINER, line + strlen("Maintainer") + 1);
                break;
 
        case 'P':
-               if ((mask & PFM_PACKAGE) && is_field("Package", line))
+               if ((mask & PFM_PACKAGE) && is_field("Package", line)) {
                        pkg->name = parse_simple("Package", line);
+                       ab_pkg = abstract_pkg_fetch_by_name(pkg->name);
+
+                       if (ab_pkg && (ab_pkg->state_flag & SF_NEED_DETAIL)) {
+                               if (!(pkg->state_flag & SF_NEED_DETAIL)) {
+                                       opkg_msg(DEPEND, "propagating abpkg flag to pkg %s\n", pkg->name);
+                                       pkg->state_flag |= SF_NEED_DETAIL;
+                               }
+                       }
+               }
                else if ((mask & PFM_PRIORITY) && is_field("Priority", line))
                        pkg_set_string(pkg, PKG_PRIORITY, line + strlen("Priority") + 1);
                else if ((mask & PFM_PROVIDES) && is_field("Provides", line))
@@ -220,12 +223,8 @@ int pkg_parse_line(void *ptr, const char *line, uint mask)
                if ((mask & PFM_SECTION) && is_field("Section", line))
                        pkg_set_string(pkg, PKG_SECTION, line + strlen("Section") + 1);
 #ifdef HAVE_SHA256
-               else if ((mask & PFM_SHA256SUM) && is_field("SHA256sum", line)) {
-                       size_t len;
-                       char *cksum = checksum_hex2bin(line + strlen("SHA256sum") + 1, &len);
-                       if (cksum && len == 32)
-                               pkg_set_raw(pkg, PKG_SHA256SUM, cksum, len);
-               }
+               else if ((mask & PFM_SHA256SUM) && is_field("SHA256sum", line))
+                       pkg_set_sha256(pkg, line + strlen("SHA256sum") + 1);
 #endif
                else if ((mask & PFM_SIZE) && is_field("Size", line)) {
                        pkg_set_int(pkg, PKG_SIZE, strtoul(line + strlen("Size") + 1, NULL, 0));