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

sync busybox with trunk (update to v1.1.3).

Browse source 
SVN-Revision: 3823
This commit is contained in:
Nicolas Thill 2006-05-24 07:06:23 +00:00
parent f69beb4a34
commit 551aff096d
7 changed files with 676 additions and 398 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openwrt/package/busybox/Makefile
View file

@ -3,13 +3,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=busybox PKG_NAME:=busybox
PKG_VERSION:=1.1.2 PKG_VERSION:=1.1.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.busybox.net/downloads PKG_SOURCE_URL:=http://www.busybox.net/downloads
PKG_MD5SUM:=0b5d78072302fe687407956537bdb9e3 PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7
PKG_CAT:=bzcat PKG_CAT:=bzcat
include $(TOPDIR)/package/rules.mk include $(TOPDIR)/package/rules.mk

13
openwrt/package/busybox/patches/230-passwd_salt.patch
View file

@ -1,13 +0,0 @@
--- busybox-1.00/loginutils/passwd.c 2006-03-26 06:07:37 -05:00
+++ busybox-1.00/loginutils/passwd.c 2006-03-26 06:09:03 -05:00
@@ -386,7 +386,9 @@
bzero(orig, sizeof(orig));
if (algo == 1) {
- cp = pw_encrypt(pass, "$1$");
+ char salt[6]="$1$\0\0\0";
+ memcpy(salt+3,crypt_make_salt(),3);
+ cp = pw_encrypt(pass, salt);
} else
cp = pw_encrypt(pass, crypt_make_salt());
bzero(pass, sizeof pass);

2
openwrt/package/busybox/patches/300-netmsg.patch
View file

@ -5,7 +5,7 @@ diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h
USE_MV(APPLET(mv, mv_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_MV(APPLET(mv, mv_main, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_NAMEIF(APPLET(nameif, nameif_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_NAMEIF(APPLET(nameif, nameif_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_NC(APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_NC(APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_NETMSG(APPLET_NOUSAGE("netmsg", netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)) +USE_NETMSG(APPLET_NOUSAGE(netmsg, netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS))
USE_NETSTAT(APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_NETSTAT(APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_NICE(APPLET(nice, nice_main, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_NICE(APPLET(nice, nice_main, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_NOHUP(APPLET(nohup, nohup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_NOHUP(APPLET(nohup, nohup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))

906
openwrt/package/busybox/patches/911-ipkg.patch
View file

File diff suppressed because it is too large Load diff

131
openwrt/package/busybox/patches/912-ipkg-no_warnings.patch
View file

@ -1,6 +1,9 @@
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/file_util.c busybox-1.1.0-pre1-new/archival/libipkg/file_util.c #
--- busybox-1.1.0-pre1-old/archival/libipkg/file_util.c 2005-12-08 09:01:04.000000000 +0100 # remove (numerous) compile warnings
+++ busybox-1.1.0-pre1-new/archival/libipkg/file_util.c 2005-12-08 09:04:01.000000000 +0100 #
diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/file_util.c
--- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.c 2006-05-09 02:06:48.000000000 +0200
+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/file_util.c 2006-05-09 02:16:48.000000000 +0200
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
int file_mkdir_hier(const char *path, long mode) int file_mkdir_hier(const char *path, long mode)
@ -10,10 +13,10 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/file_util.c busybox-1.1.0-pre1
} }
char *file_md5sum_alloc(const char *file_name) char *file_md5sum_alloc(const char *file_name)
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c busybox-1.1.0-pre1-new/archival/libipkg/ipkg_cmd.c diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_cmd.c
--- busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.c 2006-05-09 02:23:37.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/ipkg_cmd.c 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_cmd.c 2006-05-09 02:23:17.000000000 +0200
@@ -251,7 +251,7 @@ @@ -246,7 +246,7 @@
in = fopen (tmp_file_name, "r"); in = fopen (tmp_file_name, "r");
out = fopen (list_file_name, "w"); out = fopen (list_file_name, "w");
if (in && out) if (in && out)
@ -22,7 +25,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c busybox-1.1.0-pre1-
else else
err = 1; err = 1;
if (in) if (in)
@@ -807,14 +807,13 @@ @@ -894,14 +894,13 @@
pkg_vec_free(available); pkg_vec_free(available);
} else { } else {
pkg_vec_t *installed_pkgs = pkg_vec_alloc(); pkg_vec_t *installed_pkgs = pkg_vec_alloc();
@ -38,7 +41,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c busybox-1.1.0-pre1-
if (pkg->state_flag & SF_USER) { if (pkg->state_flag & SF_USER) {
flagged_pkg_count++; flagged_pkg_count++;
} else { } else {
@@ -834,7 +833,7 @@ @@ -921,7 +920,7 @@
do { do {
removed = 0; removed = 0;
for (i = 0; i < installed_pkgs->len; i++) { for (i = 0; i < installed_pkgs->len; i++) {
@ -47,7 +50,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c busybox-1.1.0-pre1-
if (!(pkg->state_flag & SF_USER) if (!(pkg->state_flag & SF_USER)
&& !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) { && !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) {
removed++; removed++;
@@ -889,7 +888,7 @@ @@ -976,7 +975,7 @@
{ {
int i; int i;
pkg_t *pkg; pkg_t *pkg;
@ -56,10 +59,10 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c busybox-1.1.0-pre1-
global_conf = conf; global_conf = conf;
signal(SIGINT, sigint_handler); signal(SIGINT, sigint_handler);
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_conf.c busybox-1.1.0-pre1-new/archival/libipkg/ipkg_conf.c diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_conf.c
--- busybox-1.1.0-pre1-old/archival/libipkg/ipkg_conf.c 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.c 2006-05-09 02:12:04.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/ipkg_conf.c 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_conf.c 2006-05-09 02:16:48.000000000 +0200
@@ -540,14 +540,14 @@ @@ -542,14 +542,14 @@
if (strcmp(type, "option") == 0) { if (strcmp(type, "option") == 0) {
ipkg_conf_set_option(options, name, value); ipkg_conf_set_option(options, name, value);
} else if (strcmp(type, "src") == 0) { } else if (strcmp(type, "src") == 0) {
@ -76,9 +79,21 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_conf.c busybox-1.1.0-pre1
pkg_src_list_append (pkg_src_list, name, value, extra, 1); pkg_src_list_append (pkg_src_list, name, value, extra, 1);
} else { } else {
ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration. Skipping:\n\t src %s %s\n", ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration. Skipping:\n\t src %s %s\n",
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/libipkg.c busybox-1.1.0-pre1-new/archival/libipkg/libipkg.c diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_download.c
--- busybox-1.1.0-pre1-old/archival/libipkg/libipkg.c 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.c 2006-05-09 02:12:04.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/libipkg.c 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_download.c 2006-05-09 02:22:51.000000000 +0200
@@ -166,7 +166,7 @@
if (err)
return err;
pkg->local_filename = strdup(url);
- ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand \(%s\).\n", pkg->name,pkg->local_filename);
+ ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand (%s).\n", pkg->name,pkg->local_filename);
pkg->provided_by_hand = 1;
} else {
diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/libipkg.c
--- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.c 2006-05-09 02:12:05.000000000 +0200
+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/libipkg.c 2006-05-09 02:16:48.000000000 +0200
@@ -445,7 +445,7 @@ @@ -445,7 +445,7 @@
int int
ipkg_op (int argc, char *argv[]) ipkg_op (int argc, char *argv[])
@ -105,7 +120,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/libipkg.c busybox-1.1.0-pre1-n
/* Pigi: added a flag to disable the checking of structures if the command does not need to /* Pigi: added a flag to disable the checking of structures if the command does not need to
read anything from there. read anything from there.
*/ */
@@ -494,7 +494,7 @@ @@ -509,7 +509,7 @@
args_usage (NULL); args_usage (NULL);
} }
@ -114,7 +129,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/libipkg.c busybox-1.1.0-pre1-n
{ {
fprintf (stderr, fprintf (stderr,
"%s: the ``%s'' command requires at least one argument\n", "%s: the ``%s'' command requires at least one argument\n",
@@ -502,7 +502,7 @@ @@ -517,7 +517,7 @@
args_usage (NULL); args_usage (NULL);
} }
@ -123,9 +138,9 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/libipkg.c busybox-1.1.0-pre1-n
ipkg_conf_deinit (&ipkg_conf); ipkg_conf_deinit (&ipkg_conf);
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/md5.c busybox-1.1.0-pre1-new/archival/libipkg/md5.c diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/md5.c
--- busybox-1.1.0-pre1-old/archival/libipkg/md5.c 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.c 2006-05-09 02:06:48.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/md5.c 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/md5.c 2006-05-09 02:16:48.000000000 +0200
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
int md5_stream(FILE *stream, void *resblock) int md5_stream(FILE *stream, void *resblock)
{ {
@ -134,10 +149,10 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/md5.c busybox-1.1.0-pre1-new/a
if( (fd = fileno(stream)) == -1 ) { if( (fd = fileno(stream)) == -1 ) {
bb_error_msg("bad file descriptor"); bb_error_msg("bad file descriptor");
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/archival/libipkg/pkg.c diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg.c 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.c 2006-05-09 02:12:05.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg.c 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c 2006-05-09 02:16:48.000000000 +0200
@@ -527,6 +527,7 @@ @@ -528,6 +528,7 @@
char * pkg_formatted_field(pkg_t *pkg, const char *field ) char * pkg_formatted_field(pkg_t *pkg, const char *field )
{ {
static size_t LINE_LEN = 128; static size_t LINE_LEN = 128;
@ -145,7 +160,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
char * temp = (char *)malloc(1); char * temp = (char *)malloc(1);
int len = 0; int len = 0;
int flag_provide_false = 0; int flag_provide_false = 0;
@@ -566,7 +567,6 @@ @@ -567,7 +568,6 @@
if (strcasecmp(field, "Conffiles") == 0) { if (strcasecmp(field, "Conffiles") == 0) {
/* Conffiles */ /* Conffiles */
conffile_list_elt_t *iter; conffile_list_elt_t *iter;
@ -153,7 +168,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
if (pkg->conffiles.head == NULL) { if (pkg->conffiles.head == NULL) {
return temp; return temp;
@@ -587,15 +587,14 @@ @@ -588,15 +588,14 @@
strncpy(temp, "Conffiles:\n", 12); strncpy(temp, "Conffiles:\n", 12);
for (iter = pkg->conffiles.head; iter; iter = iter->next) { for (iter = pkg->conffiles.head; iter; iter = iter->next) {
if (iter->data->name && iter->data->value) { if (iter->data->name && iter->data->value) {
@ -171,7 +186,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
len = 14 ; len = 14 ;
for(i = 0; i < pkg->conflicts_count; i++) { for(i = 0; i < pkg->conflicts_count; i++) {
len = len + (strlen(pkg->conflicts_str[i])+5); len = len + (strlen(pkg->conflicts_str[i])+5);
@@ -608,8 +607,8 @@ @@ -609,8 +608,8 @@
temp[0]='\0'; temp[0]='\0';
strncpy(temp, "Conflicts:", 11); strncpy(temp, "Conflicts:", 11);
for(i = 0; i < pkg->conflicts_count; i++) { for(i = 0; i < pkg->conflicts_count; i++) {
@ -182,7 +197,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
} }
strncat(temp, "\n", strlen("\n")); strncat(temp, "\n", strlen("\n"));
} }
@@ -624,7 +623,6 @@ @@ -625,7 +624,6 @@
int i; int i;
if (pkg->depends_count) { if (pkg->depends_count) {
@ -190,7 +205,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
len = 14 ; len = 14 ;
for(i = 0; i < pkg->depends_count; i++) { for(i = 0; i < pkg->depends_count; i++) {
len = len + (strlen(pkg->depends_str[i])+4); len = len + (strlen(pkg->depends_str[i])+4);
@@ -637,8 +635,8 @@ @@ -638,8 +636,8 @@
temp[0]='\0'; temp[0]='\0';
strncpy(temp, "Depends:", 10); strncpy(temp, "Depends:", 10);
for(i = 0; i < pkg->depends_count; i++) { for(i = 0; i < pkg->depends_count; i++) {
@ -201,7 +216,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
} }
strncat(temp, "\n", strlen("\n")); strncat(temp, "\n", strlen("\n"));
} }
@@ -803,7 +801,6 @@ @@ -804,7 +802,6 @@
/* Replaces | Recommends*/ /* Replaces | Recommends*/
if (strcasecmp (field, "Replaces") == 0) { if (strcasecmp (field, "Replaces") == 0) {
if (pkg->replaces_count) { if (pkg->replaces_count) {
@ -209,7 +224,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
len = 14; len = 14;
for (i = 0; i < pkg->replaces_count; i++) { for (i = 0; i < pkg->replaces_count; i++) {
len = len + (strlen(pkg->replaces_str[i])+5); len = len + (strlen(pkg->replaces_str[i])+5);
@@ -816,14 +813,13 @@ @@ -817,14 +814,13 @@
temp[0]='\0'; temp[0]='\0';
strncpy(temp, "Replaces:", 12); strncpy(temp, "Replaces:", 12);
for (i = 0; i < pkg->replaces_count; i++) { for (i = 0; i < pkg->replaces_count; i++) {
@ -226,7 +241,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
len = 15; len = 15;
for(i = 0; i < pkg->recommends_count; i++) { for(i = 0; i < pkg->recommends_count; i++) {
len = len + (strlen( pkg->recommends_str[i])+5); len = len + (strlen( pkg->recommends_str[i])+5);
@@ -836,8 +832,8 @@ @@ -837,8 +833,8 @@
temp[0]='\0'; temp[0]='\0';
strncpy(temp, "Recommends:", 13); strncpy(temp, "Recommends:", 13);
for(i = 0; i < pkg->recommends_count; i++) { for(i = 0; i < pkg->recommends_count; i++) {
@ -237,7 +252,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
} }
strncat(temp, "\n", strlen("\n")); strncat(temp, "\n", strlen("\n"));
} }
@@ -906,7 +902,6 @@ @@ -907,7 +903,6 @@
} else if (strcasecmp(field, "Suggests") == 0) { } else if (strcasecmp(field, "Suggests") == 0) {
if (pkg->suggests_count) { if (pkg->suggests_count) {
int i; int i;
@ -245,7 +260,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
len = 13; len = 13;
for(i = 0; i < pkg->suggests_count; i++) { for(i = 0; i < pkg->suggests_count; i++) {
len = len + (strlen(pkg->suggests_str[i])+5); len = len + (strlen(pkg->suggests_str[i])+5);
@@ -919,8 +914,8 @@ @@ -920,8 +915,8 @@
temp[0]='\0'; temp[0]='\0';
strncpy(temp, "Suggests:", 10); strncpy(temp, "Suggests:", 10);
for(i = 0; i < pkg->suggests_count; i++) { for(i = 0; i < pkg->suggests_count; i++) {
@ -256,7 +271,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
} }
strncat(temp, "\n", strlen("\n")); strncat(temp, "\n", strlen("\n"));
} }
@@ -1139,10 +1134,8 @@ @@ -1140,10 +1135,8 @@
return 0; return 0;
} }
@ -268,7 +283,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
int namecmp; int namecmp;
int vercmp; int vercmp;
if (!a->name || !b->name) { if (!a->name || !b->name) {
@@ -1169,10 +1162,8 @@ @@ -1170,10 +1163,8 @@
return 0; return 0;
} }
@ -280,7 +295,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
if (!a->name || !b->name) { if (!a->name || !b->name) {
fprintf(stderr, "abstract_pkg_name_compare: a=%p a->name=%p b=%p b->name=%p\n", fprintf(stderr, "abstract_pkg_name_compare: a=%p a->name=%p b=%p b->name=%p\n",
a, a->name, b, b->name); a, a->name, b, b->name);
@@ -1192,7 +1183,7 @@ @@ -1193,7 +1184,7 @@
#endif #endif
if (pkg->epoch) { if (pkg->epoch) {
@ -289,10 +304,10 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/a
} else { } else {
epoch_str = strdup(""); epoch_str = strdup("");
} }
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.h busybox-1.1.0-pre1-new/archival/libipkg/pkg.h diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.h busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.h
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg.h 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.h 2006-05-09 02:12:05.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg.h 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.h 2006-05-09 02:16:48.000000000 +0200
@@ -192,8 +192,8 @@ @@ -194,8 +194,8 @@
char *pkg_version_str_alloc(pkg_t *pkg); char *pkg_version_str_alloc(pkg_t *pkg);
int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg); int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
@ -303,9 +318,9 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.h busybox-1.1.0-pre1-new/a
char * pkg_formatted_info(pkg_t *pkg ); char * pkg_formatted_info(pkg_t *pkg );
char * pkg_formatted_field(pkg_t *pkg, const char *field ); char * pkg_formatted_field(pkg_t *pkg, const char *field );
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.c busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.c diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.c
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.c 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.c 2006-05-09 02:12:05.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.c 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.c 2006-05-09 02:16:48.000000000 +0200
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
pkg_vec_t *unsatisfied, char *** unresolved) pkg_vec_t *unsatisfied, char *** unresolved)
{ {
@ -336,7 +351,7 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.c busybox-1.1.0-pr
if (p->state_want == SW_INSTALL) if (p->state_want == SW_INSTALL)
continue; continue;
ipkg_message(conf, IPKG_DEBUG, "not installing %s due to requirement for %s\n", pkg_scout->name, p->name); ipkg_message(conf, IPKG_DEBUG, "not installing %s due to requirement for %s\n", pkg_scout->name, p->name);
@@ -810,27 +808,27 @@ @@ -814,27 +812,27 @@
* [npredepends+nrecommends,npredepends+nrecommends+nsuggests) -> returns recommends_str[index] * [npredepends+nrecommends,npredepends+nrecommends+nsuggests) -> returns recommends_str[index]
* [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index] * [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index]
*/ */
@ -377,9 +392,9 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.c busybox-1.1.0-pr
return NULL; return NULL;
} }
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.h busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.h diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.h busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.h
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.h 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.h 2006-05-09 02:06:48.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.h 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.h 2006-05-09 02:16:48.000000000 +0200
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
*/ */
int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts); int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts);
@ -389,9 +404,9 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.h busybox-1.1.0-pr
void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg); void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg);
void freeDepends(pkg_t *pkg); void freeDepends(pkg_t *pkg);
void printDepends(pkg_t * pkg); void printDepends(pkg_t * pkg);
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_hash.c busybox-1.1.0-pre1-new/archival/libipkg/pkg_hash.c diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_hash.c
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_hash.c 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.c 2006-05-09 02:12:05.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_hash.c 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_hash.c 2006-05-09 02:17:35.000000000 +0200
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg, pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg,
int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet) int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet)
@ -412,12 +427,12 @@ diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_hash.c busybox-1.1.0-pre1-
- pkg_t *maybe = vec->pkgs[i]; - pkg_t *maybe = vec->pkgs[i];
+ for (j = 0; j < vec->len; j++) { + for (j = 0; j < vec->len; j++) {
+ pkg_t *maybe = vec->pkgs[j]; + pkg_t *maybe = vec->pkgs[j];
ipkg_message(conf, IPKG_DEBUG, " %s arch=%s arch_priority=%d \n", ipkg_message(conf, IPKG_DEBUG, " %s arch=%s arch_priority=%d version=%s \n",
maybe->name, maybe->architecture, maybe->arch_priority); maybe->name, maybe->architecture, maybe->arch_priority, maybe->version);
if (maybe->arch_priority > 0) { if (maybe->arch_priority > 0) {
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_vec.h busybox-1.1.0-pre1-new/archival/libipkg/pkg_vec.h diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.h busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_vec.h
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_vec.h 2005-12-08 09:01:04.000000000 +0100 --- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.h 2006-05-09 02:06:48.000000000 +0200
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_vec.h 2005-12-08 09:04:01.000000000 +0100 +++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_vec.h 2006-05-09 02:16:48.000000000 +0200
@@ -35,6 +35,8 @@ @@ -35,6 +35,8 @@
}; };
typedef struct abstract_pkg_vec abstract_pkg_vec_t; typedef struct abstract_pkg_vec abstract_pkg_vec_t;

3
openwrt/package/busybox/patches/913-libbb_hash.patch
View file

@ -1,3 +1,6 @@
#
# expose (again) an hash_fd function (used 911-ipkg.patch)
#
diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils/md5_sha1_sum.c diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils/md5_sha1_sum.c
--- busybox-1.1.1-old/coreutils/md5_sha1_sum.c 2006-03-30 00:14:50.000000000 +0200 --- busybox-1.1.1-old/coreutils/md5_sha1_sum.c 2006-03-30 00:14:50.000000000 +0200
+++ busybox-1.1.1-new/coreutils/md5_sha1_sum.c 2006-03-29 23:46:51.000000000 +0200 +++ busybox-1.1.1-new/coreutils/md5_sha1_sum.c 2006-03-29 23:46:51.000000000 +0200

15
openwrt/package/busybox/patches/914-ipkg-fixes.patch Normal file
View file

@ -0,0 +1,15 @@
#
# fix ipkg bugs
#
diff -ruN busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c busybox-1.1.2+ipkg-0.99.162-fixes/archival/libipkg/pkg.c
--- busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c 2006-05-09 02:16:48.000000000 +0200
+++ busybox-1.1.2+ipkg-0.99.162-fixes/archival/libipkg/pkg.c 2006-05-09 05:15:29.000000000 +0200
@@ -359,6 +359,8 @@
if (!oldpkg->essential)
oldpkg->essential = newpkg->essential;
+ oldpkg->provided_by_hand |= newpkg->provided_by_hand;
+
return 0;
}