KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix ipkg segfault and add conffiles patch from #2946

Browse source 
SVN-Revision: 10090
This commit is contained in:
Felix Fietkau 2008-01-03 02:25:16 +00:00
parent 418f0e9c10
commit 3e64a8c618
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package/busybox/patches/522-memleak.patch
View file

@ -1,15 +1,3 @@
Index: busybox-1.8.2/archival/libipkg/ipkg_install.c
===================================================================
--- busybox-1.8.2.orig/archival/libipkg/ipkg_install.c 2007-12-30 00:02:53.577161007 +0100
+++ busybox-1.8.2/archival/libipkg/ipkg_install.c 2007-12-30 00:03:14.042327251 +0100
@@ -500,6 +500,7 @@
}
}
}
+ pkg_free_installed_files(new_pkg);
return 0;
}
Index: busybox-1.8.2/archival/libipkg/pkg.c Index: busybox-1.8.2/archival/libipkg/pkg.c
=================================================================== ===================================================================
--- busybox-1.8.2.orig/archival/libipkg/pkg.c 2007-12-30 00:27:32.001919565 +0100 --- busybox-1.8.2.orig/archival/libipkg/pkg.c 2007-12-30 00:27:32.001919565 +0100

21
package/busybox/patches/523-conffiles_fix.patch Normal file
View file

@ -0,0 +1,21 @@
Index: busybox-1.8.2/archival/libipkg/pkg.c
===================================================================
--- busybox-1.8.2.orig/archival/libipkg/pkg.c 2008-01-02 21:53:12.616453611 +0100
+++ busybox-1.8.2/archival/libipkg/pkg.c 2008-01-02 21:54:41.462489150 +0100
@@ -587,13 +587,14 @@
return NULL;
}
temp[0]='\0';
- strncpy(temp, "Conffiles:\n", 12);
+ strncpy(temp, "Conffiles: ", 12);
for (iter = pkg->conffiles.head; iter; iter = iter->next) {
if (iter->data->name && iter->data->value) {
- snprintf(line_str, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value);
+ snprintf(line_str, LINE_LEN, "%s %s", iter->data->name, iter->data->value);
strncat(temp, line_str, strlen(line_str));
}
}
+ strcat(temp, "\n");
} else if (strcasecmp(field, "Conflicts") == 0) {
int i;