From 5d9c91b9de244e7e6d2137b0dd86f876008cb355 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 3 Jan 2008 02:25:16 +0000 Subject: fix ipkg segfault and add conffiles patch from #2946 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10090 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/patches/523-conffiles_fix.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/busybox/patches/523-conffiles_fix.patch (limited to 'package/busybox/patches/523-conffiles_fix.patch') diff --git a/package/busybox/patches/523-conffiles_fix.patch b/package/busybox/patches/523-conffiles_fix.patch new file mode 100644 index 0000000000..8206faf91b --- /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; + -- cgit v1.2.3