Startseite Erkunden Hilfe
Anmelden
thinkmassive
/
GnuBee-libreCMC
geforkt von ldpinney/GnuBee-libreCMC
1
0
Fork 0
Dateien
Struktur: 92a7239b36
Branches Tags
GnuBee-libreCMC
/
package
/
system
/
opkg
/
patches
/
210-add-force-signature.patch

210-add-force-signature.patch 2.3 KB
Verlauf Originalformat

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 
  1. --- a/libopkg/opkg_conf.h
    2. 

  2. +++ b/libopkg/opkg_conf.h
    3. 

  3. @@ -80,6 +80,7 @@ struct opkg_conf
    4. 

  4.       int force_remove;
    5. 

  5.       int force_checksum;
    6. 

  6.       int check_signature;
    7. 

  7. +     int force_signature;
    8. 

  8.       int nodeps; /* do not follow dependencies */
    9. 

  9.       int nocase; /* perform case insensitive matching */
    10. 

  10.       char *offline_root;
    11. 

  11. --- a/src/opkg-cl.c
    12. 

  12. +++ b/src/opkg-cl.c
    13. 

  13. @@ -51,6 +51,7 @@ enum {
    14. 

  14.  	ARGS_OPT_NOCASE,
    15. 

  15.  	ARGS_OPT_AUTOREMOVE,
    16. 

  16.  	ARGS_OPT_CACHE,
    17. 

  17. +	ARGS_OPT_FORCE_SIGNATURE,
    18. 

  18.  };
    19. 

  19.  
    20. 

  20.  static struct option long_options[] = {
    21. 

  21. @@ -87,6 +88,8 @@ static struct option long_options[] = {
    22. 

  22.  	{"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
    23. 

  23.  	{"force-checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},
    24. 

  24.  	{"force_checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},
    25. 

  25. +	{"force-signature", 0, 0, ARGS_OPT_FORCE_SIGNATURE},
    26. 

  26. +	{"force_signature", 0, 0, ARGS_OPT_FORCE_SIGNATURE},
    27. 

  27.  	{"noaction", 0, 0, ARGS_OPT_NOACTION},
    28. 

  28.  	{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
    29. 

  29.  	{"nodeps", 0, 0, ARGS_OPT_NODEPS},
    30. 

  30. @@ -210,6 +213,9 @@ args_parse(int argc, char *argv[])
    31. 

  31.          case ARGS_OPT_DOWNLOAD_ONLY:
    32. 

  32.  			conf->download_only = 1;
    33. 

  33.  			break;
    34. 

  34. +		case ARGS_OPT_FORCE_SIGNATURE:
    35. 

  35. +			conf->force_signature = 1;
    36. 

  36. +			break;
    37. 

  37.  		case ':':
    38. 

  38.  			parse_err = -1;
    39. 

  39.  			break;
    40. 

  40. --- a/libopkg/opkg_install.c
    41. 

  41. +++ b/libopkg/opkg_install.c
    42. 

  42. @@ -1306,13 +1306,15 @@ opkg_install_pkg(pkg_t *pkg, int from_up
    43. 

  43.           if (opkg_verify_file (list_file_name, sig_file_name)){
    44. 

  44.             opkg_msg(ERROR, "Failed to verify the signature of %s.\n",
    45. 

  45.                             list_file_name);
    46. 

  46. -           return -1;
    47. 

  47. +           if (!conf->force_signature)
    48. 

  48. +             return -1;
    49. 

  49.           }
    50. 

  50.         }else{
    51. 

  51.           opkg_msg(ERROR, "Signature file is missing for %s. "
    52. 

  52.                           "Perhaps you need to run 'opkg update'?\n",
    53. 

  53.  			 pkg->name);
    54. 

  54. -         return -1;
    55. 

  55. +         if (!conf->force_signature)
    56. 

  56. +           return -1;
    57. 

  57.         }
    58. 

  58.  
    59. 

  59.         free (lists_dir);
    60. 

  60. --- a/libopkg/opkg_cmd.c
    61. 

  61. +++ b/libopkg/opkg_cmd.c
    62. 

  62. @@ -196,7 +196,7 @@ opkg_update_cmd(int argc, char **argv)
    63. 

  63.                    else
    64. 

  64.                        opkg_msg(NOTICE, "Signature check failed.\n");
    65. 

  65.                }
    66. 

  66. -              if (err) {
    67. 

  67. +              if (err && !conf->force_signature) {
    68. 

  68.                    /* The signature was wrong so delete it */
    69. 

  69.                    opkg_msg(NOTICE, "Remove wrong Signature file.\n");
    70. 

  70.                    unlink (tmp_file_name);
    71.