diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-01-03 02:25:16 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-01-03 02:25:16 +0000 |
| commit | 3e64a8c618bb9886c214ab2ec5c267bfb880fdad (patch) | |
| tree | 9a09bd69bea7eaa3352066a8c9a6117d6bc650a0 /package | |
| parent | 418f0e9c10a32a453638d03497ffa9fb14ea1a22 (diff) | |
| download | mtk-20170518-3e64a8c618bb9886c214ab2ec5c267bfb880fdad.zip mtk-20170518-3e64a8c618bb9886c214ab2ec5c267bfb880fdad.tar.gz mtk-20170518-3e64a8c618bb9886c214ab2ec5c267bfb880fdad.tar.bz2 | |
fix ipkg segfault and add conffiles patch from #2946
SVN-Revision: 10090
Diffstat (limited to 'package')
| -rw-r--r-- | package/busybox/patches/522-memleak.patch | 12 | ||||
| -rw-r--r-- | package/busybox/patches/523-conffiles_fix.patch | 21 |
2 files changed, 21 insertions, 12 deletions
diff --git a/package/busybox/patches/522-memleak.patch b/package/busybox/patches/522-memleak.patch index 1bcfb8f..ab639c5 100644 --- a/package/busybox/patches/522-memleak.patch +++ b/package/busybox/patches/522-memleak.patch @@ -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 =================================================================== --- busybox-1.8.2.orig/archival/libipkg/pkg.c 2007-12-30 00:27:32.001919565 +0100 diff --git a/package/busybox/patches/523-conffiles_fix.patch b/package/busybox/patches/523-conffiles_fix.patch new file mode 100644 index 0000000..8206faf --- /dev/null +++ b/package/busybox/patches/523-conffiles_fix.patch @@ -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; + |