summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/ipkg/ipkg-0.99.135
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded/packages/ipkg/ipkg-0.99.135')
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.135/depends.patch107
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch42
2 files changed, 0 insertions, 149 deletions
diff --git a/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch b/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch
deleted file mode 100644
index 8f472ab405..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1Index: ipkg_cmd.c
2===================================================================
3RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
4retrieving revision 1.99
5diff -u -r1.99 ipkg_cmd.c
6--- ipkg/ipkg_cmd.c 6 Jan 2005 00:21:49 -0000 1.99
7+++ ipkg/ipkg_cmd.c 8 Jan 2005 13:11:16 -0000
8@@ -1150,7 +1150,7 @@
9
10 int pkg_mark_provides(pkg_t *pkg)
11 {
12- int provides_count = pkg->provides_count;
13+ int provides_count = pkg->provides_count + 1;
14 abstract_pkg_t **provides = pkg->provides;
15 int i;
16 pkg->parent->state_flag |= SF_MARKED;
17@@ -1207,7 +1207,7 @@
18 for (j = 0; j < available_pkgs->len; j++) {
19 pkg_t *pkg = available_pkgs->pkgs[j];
20 int k;
21- int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count;
22+ int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count + 1 : pkg->replaces_count;
23 for (k = 0; k < count; k++) {
24 abstract_pkg_t *apkg =
25 ((what_field_type == WHATPROVIDES)
26Index: ipkg_remove.c
27===================================================================
28RCS file: /cvs/familiar/dist/ipkg/C/ipkg_remove.c,v
29retrieving revision 1.40
30diff -u -r1.40 ipkg_remove.c
31--- ipkg/ipkg_remove.c 10 May 2004 21:37:07 -0000 1.40
32+++ ipkg/ipkg_remove.c 8 Jan 2005 13:11:19 -0000
33@@ -39,7 +39,7 @@
34 */
35 int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents)
36 {
37- int nprovides = pkg->provides_count;
38+ int nprovides = pkg->provides_count + 1;
39 abstract_pkg_t **provides = pkg->provides;
40 int n_installed_dependents = 0;
41 int i;
42Index: pkg_depends.c
43===================================================================
44RCS file: /cvs/familiar/dist/ipkg/C/pkg_depends.c,v
45retrieving revision 1.61
46diff -u -r1.61 pkg_depends.c
47--- ipkg/pkg_depends.c 1 Sep 2004 20:30:39 -0000 1.61
48+++ ipkg/pkg_depends.c 8 Jan 2005 13:11:21 -0000
49@@ -420,9 +420,9 @@
50 int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee)
51 {
52 abstract_pkg_t **provides = pkg->provides;
53- int provides_count = pkg->provides_count;
54+ int provides_count = pkg->provides_count + 1;
55 abstract_pkg_t **replacee_provides = replacee->provides;
56- int replacee_provides_count = replacee->provides_count;
57+ int replacee_provides_count = replacee->provides_count + 1;
58 int i, j;
59 for (i = 0; i < provides_count; i++) {
60 abstract_pkg_t *apkg = provides[i];
61@@ -443,7 +443,7 @@
62 int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee)
63 {
64 abstract_pkg_t **provides = pkg->provides;
65- int provides_count = pkg->provides_count;
66+ int provides_count = pkg->provides_count + 1;
67 int i;
68 for (i = 0; i < provides_count; i++) {
69 if (provides[i] == providee)
70@@ -461,7 +461,7 @@
71 abstract_pkg_t **replaces = pkg->replaces;
72 int replaces_count = pkg->replaces_count;
73 abstract_pkg_t **replacee_provides = pkg->provides;
74- int replacee_provides_count = pkg->provides_count;
75+ int replacee_provides_count = pkg->provides_count + 1;
76 int i, j;
77 for (i = 0; i < replaces_count; i++) {
78 abstract_pkg_t *abstract_replacee = replaces[i];
79@@ -504,7 +504,7 @@
80 compound_depend_t *conflicts = pkg->conflicts;
81 int conflicts_count = pkg->conflicts_count;
82 abstract_pkg_t **conflictee_provides = conflictee->provides;
83- int conflictee_provides_count = conflictee->provides_count;
84+ int conflictee_provides_count = conflictee->provides_count + 1;
85 int i, j, k;
86 for (i = 0; i < conflicts_count; i++) {
87 int possibility_count = conflicts[i].possibility_count;
88@@ -605,9 +605,6 @@
89 /* every pkg provides itself */
90 abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
91
92- if (!pkg->provides_count)
93- return 0;
94-
95 pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1));
96 if (pkg->provides == NULL) {
97 fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
98@@ -615,6 +612,9 @@
99 }
100 pkg->provides[0] = ab_pkg;
101
102+ if (pkg->provides_count == 0)
103+ return 0;
104+
105 // if (strcmp(ab_pkg->name, pkg->name))
106 // fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);
107
diff --git a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch b/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
deleted file mode 100644
index e70f3af9ff..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- C/ipkg_install.c~remove-c99isms.patch
7+++ C/ipkg_install.c
8@@ -186,14 +186,16 @@
9 {
10 abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name);
11 int i;
12+ ipkg_error_t err;
13+ abstract_pkg_t *ppkg;
14
15 if (providers == NULL)
16 return IPKG_PKG_HAS_NO_CANDIDATE;
17
18 for (i = 0; i < providers->len; i++) {
19- abstract_pkg_t *ppkg = abstract_pkg_vec_get(providers, i);
20- ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
21- ipkg_error_t err = ipkg_install_by_name(conf, ppkg->name);
22+ ppkg = abstract_pkg_vec_get(providers, i);
23+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
24+ err = ipkg_install_by_name(conf, ppkg->name);
25 if (err)
26 return err;
27 }
28@@ -614,12 +616,13 @@
29 int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees)
30 {
31 int i;
32+ int err;
33 int replaces_count = replacees->len;
34 for (i = 0; i < replaces_count; i++) {
35 pkg_t *replacee = replacees->pkgs[i];
36 if (replacee->state_status != SS_INSTALLED) {
37 ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
38- int err = ipkg_install_pkg(conf, replacee);
39+ err = ipkg_install_pkg(conf, replacee);
40 if (err)
41 return err;
42 }
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 13:02:02 +0000