<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugzilla.yoctoproject.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.6"
          urlbase="https://bugzilla.yoctoproject.org/"
          
          maintainer="it-coreprojects-helpdesk@linuxfoundation.org"
>

    <bug>
          <bug_id>8165</bug_id>
          
          <creation_ts>2015-08-14 21:12:16 +0000</creation_ts>
          <short_desc>[libsolv] opkg_list_upgradable_cmd() does not work with an external solver enabled.</short_desc>
          <delta_ts>2017-09-29 21:20:10 +0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>6</classification_id>
          <classification>Yocto Project Subprojects</classification>
          <product>opkg</product>
          <component>opkg</component>
          <version>unspecified</version>
          <rep_platform>All</rep_platform>
          <op_sys>Multiple</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>Medium</priority>
          <bug_severity>normal</bug_severity>
          <target_milestone>0.3.6</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Eric Yu">ericaustinyu</reporter>
          <assigned_to name="Alejandro del Castillo">alejandro.delcastillo</assigned_to>
          <cc>edwards.shawn</cc>
    
    <cc>richard.purdie</cc>
    
    <cc>zboszor</cc>
          
          
          <cf_os>---</cf_os>
          <cf_regression_type>---</cf_regression_type>
          
          <cf_docchange>No (bug/feature does not impact docs)</cf_docchange>

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>53129</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Yu">ericaustinyu</who>
    <bug_when>2015-08-14 21:12:16 +0000</bug_when>
    <thetext>Preconditions/Environment
-------------------------


Triggering Action/Cause
-----------------------
Build opkg with an external solver enabled.
Try using the list upgradable command.

Expectation
-----------
A list of upgradable packages should be returned

Actual Result
-------------
A message is printed saying that the list upgradable command does not work with an external solver.

Reproducibility
---------------
1/1



opkg_list_upgradable_cmd() uses a function from opkg_upgrade.c to list what packages are available for upgrading. This function is not built when an external solver is used since the solver should handle what can be upgraded. Because the solver decides what to upgrade, perhaps this listing should be handled by the solver as well.

See todo in opkg_list_upgradable_cmd() in opkg_cmd.c</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>77095</commentid>
    <comment_count>1</comment_count>
      <attachid>4030</attachid>
    <who name="Zoltán Böszörményi">zboszor</who>
    <bug_when>2017-09-25 11:03:32 +0000</bug_when>
    <thetext>Created attachment 4030
Patch to print transaction &quot;list-upgradable&quot; when using libsolv

This works for me, altough it produces an output slightly different
from the non-libsolv-enabled opkg build. It also prints dependencies
that are newly installed or removed, like:

packagename - not_installed - new_version
packagename - old_version - removed

&quot;not_installed&quot; and &quot;removed&quot; are printed as literals for such cases.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>77125</commentid>
    <comment_count>2</comment_count>
      <attachid>4030</attachid>
    <who name="Alejandro del Castillo">alejandro.delcastillo</who>
    <bug_when>2017-09-25 21:01:04 +0000</bug_when>
    <thetext>Comment on attachment 4030
Patch to print transaction &quot;list-upgradable&quot; when using libsolv

&gt;diff -durpN opkg-0.3.5-bz2.orig/libopkg/opkg_cmd.c opkg-0.3.5-bz2/libopkg/opkg_cmd.c
&gt;--- opkg-0.3.5-bz2.orig/libopkg/opkg_cmd.c	2017-06-15 19:00:20.000000000 +0200
&gt;+++ opkg-0.3.5-bz2/libopkg/opkg_cmd.c	2017-09-25 10:23:40.099784704 +0200
&gt;@@ -616,11 +616,15 @@ static int opkg_list_changed_conffiles_c
&gt; static int opkg_list_upgradable_cmd(int argc, char **argv)
&gt; {
&gt; #ifndef HAVE_SOLVER_INTERNAL
&gt;-    // TODO: this requires prepare_upgrade_list in opkg_upgrade.c but opkg_upgrade
&gt;-    // is not built when an external solver is enabled. Either let the solver
&gt;-    // handle this, include opkg_upgrade, or put prepare_upgrade_list somewhere else.
&gt;-    opkg_msg(ERROR,&quot;list-upgradable command not available with external solver enabled\n&quot;);
&gt;-    return -1;
&gt;+    int err = 0;
&gt;+
&gt;+    signal(SIGINT, sigint_handler);

the sigint_handler is used to write to the opkg database in case the operation is interrupted. Since list-upgradable it&apos;s not going to touch the opkg status file, you can omit the signal callback registration.

&gt;+
&gt;+    pkg_info_preinstall_check();
&gt;+
&gt;+    err = opkg_solver_list_upgradable(argc, argv);
&gt;+
&gt;+    return err;
&gt; #else

I think we can follow the opkg_solver_{install,remove,upgrade} pattern and move this code to a opkg_solver_list_upgradable implementation for the internal solver on solver/internal/opkg_action.c

&gt;     pkg_t *_old_pkg, *_new_pkg;
&gt;     LIST_HEAD(head);
&gt;diff -durpN opkg-0.3.5-bz2.orig/libopkg/opkg_solver.h opkg-0.3.5-bz2/libopkg/opkg_solver.h
&gt;--- opkg-0.3.5-bz2.orig/libopkg/opkg_solver.h	2017-06-15 19:00:20.000000000 +0200
&gt;+++ opkg-0.3.5-bz2/libopkg/opkg_solver.h	2017-09-25 10:22:25.931016465 +0200
&gt;@@ -27,6 +27,7 @@ int opkg_solver_install(int num_pkgs, ch
&gt; int opkg_solver_remove(int num_pkgs, char **pkg_names);
&gt; int opkg_solver_upgrade(int num_pkgs, char **pkg_names);
&gt; int opkg_solver_distupgrade(int num_pkgs, char **pkg_names);
&gt;+int opkg_solver_list_upgradable(int num_pkgs, char **pkg_names);
&gt; 
&gt; #ifdef __cplusplus
&gt; }
&gt;diff -durpN opkg-0.3.5-bz2.orig/libopkg/solvers/libsolv/opkg_solver_libsolv.c opkg-0.3.5-bz2/libopkg/solvers/libsolv/opkg_solver_libsolv.c
&gt;--- opkg-0.3.5-bz2.orig/libopkg/solvers/libsolv/opkg_solver_libsolv.c	2017-06-15 19:00:20.000000000 +0200
&gt;+++ opkg-0.3.5-bz2/libopkg/solvers/libsolv/opkg_solver_libsolv.c	2017-09-25 10:26:51.531767555 +0200
&gt;@@ -78,6 +78,7 @@ static void libsolv_solver_add_job(libso
&gt;                                    version_constraint_t constraint);
&gt; static int libsolv_solver_solve(libsolv_solver_t *libsolv_solver);
&gt; static int libsolv_solver_execute_transaction(libsolv_solver_t *libsolv_solver);
&gt;+static int libsolv_solver_list_upgradable(libsolv_solver_t *libsolv_solver);
&gt; 
&gt; int opkg_solver_install(int num_pkgs, char **pkg_names)
&gt; {
&gt;@@ -190,6 +191,38 @@ CLEANUP:
&gt;     return err;
&gt; }
&gt; 
&gt;+int opkg_solver_list_upgradable(int num_pkgs, char **pkg_names)
&gt;+{
&gt;+    int i, err;
&gt;+    Dataiterator di;
&gt;+
&gt;+    libsolv_solver_t *solver = libsolv_solver_new();
&gt;+    if (solver == NULL)
&gt;+        return -1;
&gt;+
&gt;+    if (num_pkgs == 0) {
&gt;+        libsolv_solver_add_job(solver, JOB_UPGRADE, 0, NULL, NONE);
&gt;+    } else {
&gt;+        for (i = 0; i &lt; num_pkgs; i++) {
&gt;+            dataiterator_init(&amp;di, solver-&gt;pool, solver-&gt;repo_installed, 0, 0, pkg_names[i], SEARCH_GLOB);
&gt;+            while (dataiterator_step(&amp;di)) {
&gt;+                libsolv_solver_add_job(solver, JOB_UPGRADE, di.kv.str, NULL, NONE);
&gt;+                dataiterator_skip_solvable(&amp;di);
&gt;+            }
&gt;+            dataiterator_free(&amp;di);
&gt;+        }
&gt;+    }
&gt;+
&gt;+    err = libsolv_solver_solve(solver);
&gt;+    if (err)
&gt;+        goto CLEANUP;
&gt;+

seems like all this code is the same as the on in opkg_solver_upgrade, maybe you could factor that out into a static function?

&gt;+    err = libsolv_solver_list_upgradable(solver);
&gt;+
&gt;+CLEANUP:
&gt;+    libsolv_solver_free(solver);
&gt;+    return err;
&gt;+}
&gt; 
&gt; int opkg_solver_distupgrade(int num_pkgs, char **pkg_names)
&gt; {
&gt;@@ -917,6 +950,76 @@ CLEANUP:
&gt;     return err;
&gt; }
&gt; 
&gt;+static int libsolv_solver_list_upgradable(libsolv_solver_t *libsolv_solver)
&gt;+{
&gt;+    int i;
&gt;+    Transaction *transaction;
&gt;+    pkg_vec_t *pkgs;
&gt;+
&gt;+    transaction = solver_create_transaction(libsolv_solver-&gt;solver);
&gt;+    pkgs = pkg_vec_alloc();
&gt;+
&gt;+    if (transaction-&gt;steps.count) {
&gt;+        pkg_t *pkg;
&gt;+
&gt;+        /* order the transaction so dependencies are handled first */
&gt;+        transaction_order(transaction, 0);
&gt;+
&gt;+        for (i = 0; i &lt; transaction-&gt;steps.count; i++) {
&gt;+            Id stepId = transaction-&gt;steps.elements[i];
&gt;+            Solvable *solvable = pool_id2solvable(libsolv_solver-&gt;pool, stepId);
&gt;+
&gt;+            const char *pkg_name = pool_id2str(libsolv_solver-&gt;pool, solvable-&gt;name);
&gt;+            const char *evr = pool_id2str(libsolv_solver-&gt;pool, solvable-&gt;evr);
&gt;+
&gt;+            pkg = pkg_hash_fetch_by_name_version(pkg_name, evr);
&gt;+            pkg_vec_insert(pkgs, pkg);
&gt;+        }
&gt;+
&gt;+        for (i = 0; i &lt; transaction-&gt;steps.count; i++) {
&gt;+            Id stepId = transaction-&gt;steps.elements[i];
&gt;+            Id typeId = transaction_type(transaction, stepId,
&gt;+                    SOLVER_TRANSACTION_SHOW_ACTIVE |
&gt;+                    SOLVER_TRANSACTION_CHANGE_IS_REINSTALL);
&gt;+
&gt;+            pkg = pkgs-&gt;pkgs[i];
&gt;+            pkg_t *old = 0;
&gt;+            char *old_v, *new_v;
&gt;+
&gt;+            switch (typeId) {
&gt;+            case SOLVER_TRANSACTION_ERASE:
&gt;+                new_v = pkg_version_str_alloc(pkg);
&gt;+                printf(&quot;%s - %s - removed\n&quot;, pkg-&gt;name, new_v);
&gt;+                free(new_v);
&gt;+                break;

while I do appreciate (and like) the more verbose output, I think this may break existing applications that may rely on an output that only gives a list of the packages that can be updated. This more verbose output sounds more like what you would get with a dry run (opkg --noaction upgrade)


&gt;+            case SOLVER_TRANSACTION_REINSTALL:
&gt;+            case SOLVER_TRANSACTION_INSTALL:
&gt;+            case SOLVER_TRANSACTION_MULTIINSTALL:
&gt;+                new_v = pkg_version_str_alloc(pkg);
&gt;+                printf(&quot;%s - not_installed - %s\n&quot;, pkg-&gt;name, new_v);
&gt;+                free(new_v);
&gt;+                break;
&gt;+            case SOLVER_TRANSACTION_DOWNGRADE:
&gt;+            case SOLVER_TRANSACTION_UPGRADE:

This code is almost the same as the one in libsolv_solver_execute_transaction, maybe we could call into the same function? or split the function in too so we can at least share everything but the bottom for loop?

BTW, thank you so much for taking this on, it has been on my TODO for a while, but just haven&apos;t taken the time to do it.


&gt;+                old = pkg_hash_fetch_installed_by_name(pkg-&gt;name);
&gt;+                new_v = pkg_version_str_alloc(pkg);
&gt;+                old_v = pkg_version_str_alloc(old);
&gt;+                printf(&quot;%s - %s - %s\n&quot;, pkg-&gt;name, old_v, new_v);
&gt;+                free(new_v);
&gt;+                free(old_v);
&gt;+                break;
&gt;+            case SOLVER_TRANSACTION_IGNORE:
&gt;+            default:
&gt;+                break;
&gt;+            }
&gt;+        }
&gt;+    }
&gt;+
&gt;+    pkg_vec_free(pkgs);
&gt;+    transaction_free(transaction);
&gt;+    return 0;
&gt;+}
&gt;+
&gt; char *opkg_solver_version_alloc(void)
&gt; {
&gt;     char *version;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>77225</commentid>
    <comment_count>3</comment_count>
    <who name="Zoltán Böszörményi">zboszor</who>
    <bug_when>2017-09-29 07:50:11 +0000</bug_when>
    <thetext>The latest patch was sent to the mailing list at
https://groups.google.com/forum/#!topic/opkg-devel/ZJf2csuv_Ms</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>77240</commentid>
    <comment_count>4</comment_count>
    <who name="Alejandro del Castillo">alejandro.delcastillo</who>
    <bug_when>2017-09-29 21:20:10 +0000</bug_when>
    <thetext>Fixed by Zoltán Böszörményi on cc624806a6179c2d3d7b3eec4260e50ab0653c5d</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>4030</attachid>
            <date>2017-09-25 11:03:32 +0000</date>
            <delta_ts>2017-09-25 11:03:32 +0000</delta_ts>
            <desc>Patch to print transaction &quot;list-upgradable&quot; when using libsolv</desc>
            <filename>opkg-0.3.5-libsolv-list-upgradable-v1.patch</filename>
            <type>text/plain</type>
            <size>5981</size>
            <attacher name="Zoltán Böszörményi">zboszor</attacher>
            
              <data encoding="base64">ZGlmZiAtZHVycE4gb3BrZy0wLjMuNS1iejIub3JpZy9saWJvcGtnL29wa2dfY21kLmMgb3BrZy0w
LjMuNS1iejIvbGlib3BrZy9vcGtnX2NtZC5jCi0tLSBvcGtnLTAuMy41LWJ6Mi5vcmlnL2xpYm9w
a2cvb3BrZ19jbWQuYwkyMDE3LTA2LTE1IDE5OjAwOjIwLjAwMDAwMDAwMCArMDIwMAorKysgb3Br
Zy0wLjMuNS1iejIvbGlib3BrZy9vcGtnX2NtZC5jCTIwMTctMDktMjUgMTA6MjM6NDAuMDk5Nzg0
NzA0ICswMjAwCkBAIC02MTYsMTEgKzYxNiwxNSBAQCBzdGF0aWMgaW50IG9wa2dfbGlzdF9jaGFu
Z2VkX2NvbmZmaWxlc19jCiBzdGF0aWMgaW50IG9wa2dfbGlzdF91cGdyYWRhYmxlX2NtZChpbnQg
YXJnYywgY2hhciAqKmFyZ3YpCiB7CiAjaWZuZGVmIEhBVkVfU09MVkVSX0lOVEVSTkFMCi0gICAg
Ly8gVE9ETzogdGhpcyByZXF1aXJlcyBwcmVwYXJlX3VwZ3JhZGVfbGlzdCBpbiBvcGtnX3VwZ3Jh
ZGUuYyBidXQgb3BrZ191cGdyYWRlCi0gICAgLy8gaXMgbm90IGJ1aWx0IHdoZW4gYW4gZXh0ZXJu
YWwgc29sdmVyIGlzIGVuYWJsZWQuIEVpdGhlciBsZXQgdGhlIHNvbHZlcgotICAgIC8vIGhhbmRs
ZSB0aGlzLCBpbmNsdWRlIG9wa2dfdXBncmFkZSwgb3IgcHV0IHByZXBhcmVfdXBncmFkZV9saXN0
IHNvbWV3aGVyZSBlbHNlLgotICAgIG9wa2dfbXNnKEVSUk9SLCJsaXN0LXVwZ3JhZGFibGUgY29t
bWFuZCBub3QgYXZhaWxhYmxlIHdpdGggZXh0ZXJuYWwgc29sdmVyIGVuYWJsZWRcbiIpOwotICAg
IHJldHVybiAtMTsKKyAgICBpbnQgZXJyID0gMDsKKworICAgIHNpZ25hbChTSUdJTlQsIHNpZ2lu
dF9oYW5kbGVyKTsKKworICAgIHBrZ19pbmZvX3ByZWluc3RhbGxfY2hlY2soKTsKKworICAgIGVy
ciA9IG9wa2dfc29sdmVyX2xpc3RfdXBncmFkYWJsZShhcmdjLCBhcmd2KTsKKworICAgIHJldHVy
biBlcnI7CiAjZWxzZQogICAgIHBrZ190ICpfb2xkX3BrZywgKl9uZXdfcGtnOwogICAgIExJU1Rf
SEVBRChoZWFkKTsKZGlmZiAtZHVycE4gb3BrZy0wLjMuNS1iejIub3JpZy9saWJvcGtnL29wa2df
c29sdmVyLmggb3BrZy0wLjMuNS1iejIvbGlib3BrZy9vcGtnX3NvbHZlci5oCi0tLSBvcGtnLTAu
My41LWJ6Mi5vcmlnL2xpYm9wa2cvb3BrZ19zb2x2ZXIuaAkyMDE3LTA2LTE1IDE5OjAwOjIwLjAw
MDAwMDAwMCArMDIwMAorKysgb3BrZy0wLjMuNS1iejIvbGlib3BrZy9vcGtnX3NvbHZlci5oCTIw
MTctMDktMjUgMTA6MjI6MjUuOTMxMDE2NDY1ICswMjAwCkBAIC0yNyw2ICsyNyw3IEBAIGludCBv
cGtnX3NvbHZlcl9pbnN0YWxsKGludCBudW1fcGtncywgY2gKIGludCBvcGtnX3NvbHZlcl9yZW1v
dmUoaW50IG51bV9wa2dzLCBjaGFyICoqcGtnX25hbWVzKTsKIGludCBvcGtnX3NvbHZlcl91cGdy
YWRlKGludCBudW1fcGtncywgY2hhciAqKnBrZ19uYW1lcyk7CiBpbnQgb3BrZ19zb2x2ZXJfZGlz
dHVwZ3JhZGUoaW50IG51bV9wa2dzLCBjaGFyICoqcGtnX25hbWVzKTsKK2ludCBvcGtnX3NvbHZl
cl9saXN0X3VwZ3JhZGFibGUoaW50IG51bV9wa2dzLCBjaGFyICoqcGtnX25hbWVzKTsKIAogI2lm
ZGVmIF9fY3BsdXNwbHVzCiB9CmRpZmYgLWR1cnBOIG9wa2ctMC4zLjUtYnoyLm9yaWcvbGlib3Br
Zy9zb2x2ZXJzL2xpYnNvbHYvb3BrZ19zb2x2ZXJfbGlic29sdi5jIG9wa2ctMC4zLjUtYnoyL2xp
Ym9wa2cvc29sdmVycy9saWJzb2x2L29wa2dfc29sdmVyX2xpYnNvbHYuYwotLS0gb3BrZy0wLjMu
NS1iejIub3JpZy9saWJvcGtnL3NvbHZlcnMvbGlic29sdi9vcGtnX3NvbHZlcl9saWJzb2x2LmMJ
MjAxNy0wNi0xNSAxOTowMDoyMC4wMDAwMDAwMDAgKzAyMDAKKysrIG9wa2ctMC4zLjUtYnoyL2xp
Ym9wa2cvc29sdmVycy9saWJzb2x2L29wa2dfc29sdmVyX2xpYnNvbHYuYwkyMDE3LTA5LTI1IDEw
OjI2OjUxLjUzMTc2NzU1NSArMDIwMApAQCAtNzgsNiArNzgsNyBAQCBzdGF0aWMgdm9pZCBsaWJz
b2x2X3NvbHZlcl9hZGRfam9iKGxpYnNvCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIHZlcnNpb25fY29uc3RyYWludF90IGNvbnN0cmFpbnQpOwogc3RhdGljIGludCBsaWJzb2x2
X3NvbHZlcl9zb2x2ZShsaWJzb2x2X3NvbHZlcl90ICpsaWJzb2x2X3NvbHZlcik7CiBzdGF0aWMg
aW50IGxpYnNvbHZfc29sdmVyX2V4ZWN1dGVfdHJhbnNhY3Rpb24obGlic29sdl9zb2x2ZXJfdCAq
bGlic29sdl9zb2x2ZXIpOworc3RhdGljIGludCBsaWJzb2x2X3NvbHZlcl9saXN0X3VwZ3JhZGFi
bGUobGlic29sdl9zb2x2ZXJfdCAqbGlic29sdl9zb2x2ZXIpOwogCiBpbnQgb3BrZ19zb2x2ZXJf
aW5zdGFsbChpbnQgbnVtX3BrZ3MsIGNoYXIgKipwa2dfbmFtZXMpCiB7CkBAIC0xOTAsNiArMTkx
LDM4IEBAIENMRUFOVVA6CiAgICAgcmV0dXJuIGVycjsKIH0KIAoraW50IG9wa2dfc29sdmVyX2xp
c3RfdXBncmFkYWJsZShpbnQgbnVtX3BrZ3MsIGNoYXIgKipwa2dfbmFtZXMpCit7CisgICAgaW50
IGksIGVycjsKKyAgICBEYXRhaXRlcmF0b3IgZGk7CisKKyAgICBsaWJzb2x2X3NvbHZlcl90ICpz
b2x2ZXIgPSBsaWJzb2x2X3NvbHZlcl9uZXcoKTsKKyAgICBpZiAoc29sdmVyID09IE5VTEwpCisg
ICAgICAgIHJldHVybiAtMTsKKworICAgIGlmIChudW1fcGtncyA9PSAwKSB7CisgICAgICAgIGxp
YnNvbHZfc29sdmVyX2FkZF9qb2Ioc29sdmVyLCBKT0JfVVBHUkFERSwgMCwgTlVMTCwgTk9ORSk7
CisgICAgfSBlbHNlIHsKKyAgICAgICAgZm9yIChpID0gMDsgaSA8IG51bV9wa2dzOyBpKyspIHsK
KyAgICAgICAgICAgIGRhdGFpdGVyYXRvcl9pbml0KCZkaSwgc29sdmVyLT5wb29sLCBzb2x2ZXIt
PnJlcG9faW5zdGFsbGVkLCAwLCAwLCBwa2dfbmFtZXNbaV0sIFNFQVJDSF9HTE9CKTsKKyAgICAg
ICAgICAgIHdoaWxlIChkYXRhaXRlcmF0b3Jfc3RlcCgmZGkpKSB7CisgICAgICAgICAgICAgICAg
bGlic29sdl9zb2x2ZXJfYWRkX2pvYihzb2x2ZXIsIEpPQl9VUEdSQURFLCBkaS5rdi5zdHIsIE5V
TEwsIE5PTkUpOworICAgICAgICAgICAgICAgIGRhdGFpdGVyYXRvcl9za2lwX3NvbHZhYmxlKCZk
aSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBkYXRhaXRlcmF0b3JfZnJlZSgmZGkpOwor
ICAgICAgICB9CisgICAgfQorCisgICAgZXJyID0gbGlic29sdl9zb2x2ZXJfc29sdmUoc29sdmVy
KTsKKyAgICBpZiAoZXJyKQorICAgICAgICBnb3RvIENMRUFOVVA7CisKKyAgICBlcnIgPSBsaWJz
b2x2X3NvbHZlcl9saXN0X3VwZ3JhZGFibGUoc29sdmVyKTsKKworQ0xFQU5VUDoKKyAgICBsaWJz
b2x2X3NvbHZlcl9mcmVlKHNvbHZlcik7CisgICAgcmV0dXJuIGVycjsKK30KIAogaW50IG9wa2df
c29sdmVyX2Rpc3R1cGdyYWRlKGludCBudW1fcGtncywgY2hhciAqKnBrZ19uYW1lcykKIHsKQEAg
LTkxNyw2ICs5NTAsNzYgQEAgQ0xFQU5VUDoKICAgICByZXR1cm4gZXJyOwogfQogCitzdGF0aWMg
aW50IGxpYnNvbHZfc29sdmVyX2xpc3RfdXBncmFkYWJsZShsaWJzb2x2X3NvbHZlcl90ICpsaWJz
b2x2X3NvbHZlcikKK3sKKyAgICBpbnQgaTsKKyAgICBUcmFuc2FjdGlvbiAqdHJhbnNhY3Rpb247
CisgICAgcGtnX3ZlY190ICpwa2dzOworCisgICAgdHJhbnNhY3Rpb24gPSBzb2x2ZXJfY3JlYXRl
X3RyYW5zYWN0aW9uKGxpYnNvbHZfc29sdmVyLT5zb2x2ZXIpOworICAgIHBrZ3MgPSBwa2dfdmVj
X2FsbG9jKCk7CisKKyAgICBpZiAodHJhbnNhY3Rpb24tPnN0ZXBzLmNvdW50KSB7CisgICAgICAg
IHBrZ190ICpwa2c7CisKKyAgICAgICAgLyogb3JkZXIgdGhlIHRyYW5zYWN0aW9uIHNvIGRlcGVu
ZGVuY2llcyBhcmUgaGFuZGxlZCBmaXJzdCAqLworICAgICAgICB0cmFuc2FjdGlvbl9vcmRlcih0
cmFuc2FjdGlvbiwgMCk7CisKKyAgICAgICAgZm9yIChpID0gMDsgaSA8IHRyYW5zYWN0aW9uLT5z
dGVwcy5jb3VudDsgaSsrKSB7CisgICAgICAgICAgICBJZCBzdGVwSWQgPSB0cmFuc2FjdGlvbi0+
c3RlcHMuZWxlbWVudHNbaV07CisgICAgICAgICAgICBTb2x2YWJsZSAqc29sdmFibGUgPSBwb29s
X2lkMnNvbHZhYmxlKGxpYnNvbHZfc29sdmVyLT5wb29sLCBzdGVwSWQpOworCisgICAgICAgICAg
ICBjb25zdCBjaGFyICpwa2dfbmFtZSA9IHBvb2xfaWQyc3RyKGxpYnNvbHZfc29sdmVyLT5wb29s
LCBzb2x2YWJsZS0+bmFtZSk7CisgICAgICAgICAgICBjb25zdCBjaGFyICpldnIgPSBwb29sX2lk
MnN0cihsaWJzb2x2X3NvbHZlci0+cG9vbCwgc29sdmFibGUtPmV2cik7CisKKyAgICAgICAgICAg
IHBrZyA9IHBrZ19oYXNoX2ZldGNoX2J5X25hbWVfdmVyc2lvbihwa2dfbmFtZSwgZXZyKTsKKyAg
ICAgICAgICAgIHBrZ192ZWNfaW5zZXJ0KHBrZ3MsIHBrZyk7CisgICAgICAgIH0KKworICAgICAg
ICBmb3IgKGkgPSAwOyBpIDwgdHJhbnNhY3Rpb24tPnN0ZXBzLmNvdW50OyBpKyspIHsKKyAgICAg
ICAgICAgIElkIHN0ZXBJZCA9IHRyYW5zYWN0aW9uLT5zdGVwcy5lbGVtZW50c1tpXTsKKyAgICAg
ICAgICAgIElkIHR5cGVJZCA9IHRyYW5zYWN0aW9uX3R5cGUodHJhbnNhY3Rpb24sIHN0ZXBJZCwK
KyAgICAgICAgICAgICAgICAgICAgU09MVkVSX1RSQU5TQUNUSU9OX1NIT1dfQUNUSVZFIHwKKyAg
ICAgICAgICAgICAgICAgICAgU09MVkVSX1RSQU5TQUNUSU9OX0NIQU5HRV9JU19SRUlOU1RBTEwp
OworCisgICAgICAgICAgICBwa2cgPSBwa2dzLT5wa2dzW2ldOworICAgICAgICAgICAgcGtnX3Qg
Km9sZCA9IDA7CisgICAgICAgICAgICBjaGFyICpvbGRfdiwgKm5ld192OworCisgICAgICAgICAg
ICBzd2l0Y2ggKHR5cGVJZCkgeworICAgICAgICAgICAgY2FzZSBTT0xWRVJfVFJBTlNBQ1RJT05f
RVJBU0U6CisgICAgICAgICAgICAgICAgbmV3X3YgPSBwa2dfdmVyc2lvbl9zdHJfYWxsb2MocGtn
KTsKKyAgICAgICAgICAgICAgICBwcmludGYoIiVzIC0gJXMgLSByZW1vdmVkXG4iLCBwa2ctPm5h
bWUsIG5ld192KTsKKyAgICAgICAgICAgICAgICBmcmVlKG5ld192KTsKKyAgICAgICAgICAgICAg
ICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgU09MVkVSX1RSQU5TQUNUSU9OX1JFSU5TVEFMTDoK
KyAgICAgICAgICAgIGNhc2UgU09MVkVSX1RSQU5TQUNUSU9OX0lOU1RBTEw6CisgICAgICAgICAg
ICBjYXNlIFNPTFZFUl9UUkFOU0FDVElPTl9NVUxUSUlOU1RBTEw6CisgICAgICAgICAgICAgICAg
bmV3X3YgPSBwa2dfdmVyc2lvbl9zdHJfYWxsb2MocGtnKTsKKyAgICAgICAgICAgICAgICBwcmlu
dGYoIiVzIC0gbm90X2luc3RhbGxlZCAtICVzXG4iLCBwa2ctPm5hbWUsIG5ld192KTsKKyAgICAg
ICAgICAgICAgICBmcmVlKG5ld192KTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg
ICAgIGNhc2UgU09MVkVSX1RSQU5TQUNUSU9OX0RPV05HUkFERToKKyAgICAgICAgICAgIGNhc2Ug
U09MVkVSX1RSQU5TQUNUSU9OX1VQR1JBREU6CisgICAgICAgICAgICAgICAgb2xkID0gcGtnX2hh
c2hfZmV0Y2hfaW5zdGFsbGVkX2J5X25hbWUocGtnLT5uYW1lKTsKKyAgICAgICAgICAgICAgICBu
ZXdfdiA9IHBrZ192ZXJzaW9uX3N0cl9hbGxvYyhwa2cpOworICAgICAgICAgICAgICAgIG9sZF92
ID0gcGtnX3ZlcnNpb25fc3RyX2FsbG9jKG9sZCk7CisgICAgICAgICAgICAgICAgcHJpbnRmKCIl
cyAtICVzIC0gJXNcbiIsIHBrZy0+bmFtZSwgb2xkX3YsIG5ld192KTsKKyAgICAgICAgICAgICAg
ICBmcmVlKG5ld192KTsKKyAgICAgICAgICAgICAgICBmcmVlKG9sZF92KTsKKyAgICAgICAgICAg
ICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgU09MVkVSX1RSQU5TQUNUSU9OX0lHTk9SRToK
KyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg
ICB9CisgICAgICAgIH0KKyAgICB9CisKKyAgICBwa2dfdmVjX2ZyZWUocGtncyk7CisgICAgdHJh
bnNhY3Rpb25fZnJlZSh0cmFuc2FjdGlvbik7CisgICAgcmV0dXJuIDA7Cit9CisKIGNoYXIgKm9w
a2dfc29sdmVyX3ZlcnNpb25fYWxsb2Modm9pZCkKIHsKICAgICBjaGFyICp2ZXJzaW9uOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>