From f0469e585740ca001dfed50af3b29cd6fad89286 Mon Sep 17 00:00:00 2001 From: acinonyx Date: Sat, 3 Apr 2010 18:29:37 +0000 Subject: [PATCH] [package] hotplug2: Refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20685 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../hotplug2/patches/120-sysfs_path_fix.patch | 7 ++-- .../patches/130-cancel_download_fix.patch | 7 ++-- .../patches/140-worker_fork_fix.patch | 23 ++++++------- .../patches/160-event_block_fix.patch | 33 +++++++++---------- 4 files changed, 31 insertions(+), 39 deletions(-) diff --git a/package/hotplug2/patches/120-sysfs_path_fix.patch b/package/hotplug2/patches/120-sysfs_path_fix.patch index 2b032a9d4..0903057c7 100644 --- a/package/hotplug2/patches/120-sysfs_path_fix.patch +++ b/package/hotplug2/patches/120-sysfs_path_fix.patch @@ -1,7 +1,6 @@ -diff -x '*~' -Naur hotplug2-201/rules/command.c hotplug2-201.patched/rules/command.c ---- hotplug2-201/rules/command.c 2009-12-09 20:44:13.000000000 +0200 -+++ hotplug2-201.patched/rules/command.c 2010-03-31 17:24:09.000000000 +0300 -@@ -374,9 +374,9 @@ +--- a/rules/command.c ++++ b/rules/command.c +@@ -374,9 +374,9 @@ RULES_COMMAND_F(cmd_firmware) { if (firmware == NULL) return -1; diff --git a/package/hotplug2/patches/130-cancel_download_fix.patch b/package/hotplug2/patches/130-cancel_download_fix.patch index 6053a307c..c94000dcc 100644 --- a/package/hotplug2/patches/130-cancel_download_fix.patch +++ b/package/hotplug2/patches/130-cancel_download_fix.patch @@ -1,7 +1,6 @@ -diff -x '*~' -Naur hotplug2-201/rules/command.c hotplug2-201.patched/rules/command.c ---- hotplug2-201/rules/command.c 2010-03-31 17:14:44.000000000 +0300 -+++ hotplug2-201.patched/rules/command.c 2010-03-31 17:14:51.000000000 +0300 -@@ -385,13 +385,13 @@ +--- a/rules/command.c ++++ b/rules/command.c +@@ -385,13 +385,13 @@ RULES_COMMAND_F(cmd_firmware) { infp = fopen(firmware_path, "r"); if (infp == NULL) { diff --git a/package/hotplug2/patches/140-worker_fork_fix.patch b/package/hotplug2/patches/140-worker_fork_fix.patch index 5527b22d2..eaf3c5c36 100644 --- a/package/hotplug2/patches/140-worker_fork_fix.patch +++ b/package/hotplug2/patches/140-worker_fork_fix.patch @@ -1,7 +1,6 @@ -diff -x '*~' -Naur hotplug2-201/action.c hotplug2-201.patched/action.c ---- hotplug2-201/action.c 2010-04-01 04:48:10.000000000 +0300 -+++ hotplug2-201.patched/action.c 2010-04-01 04:53:49.000000000 +0300 -@@ -39,7 +39,7 @@ +--- a/action.c ++++ b/action.c +@@ -39,7 +39,7 @@ static void action_dumb(const struct set * Returns: Newly allocated string in "key=value" form * */ @@ -10,9 +9,8 @@ diff -x '*~' -Naur hotplug2-201/action.c hotplug2-201.patched/action.c size_t keylen, vallen; char *combined; -diff -x '*~' -Naur hotplug2-201/action.h hotplug2-201.patched/action.h ---- hotplug2-201/action.h 2009-12-09 20:44:14.000000000 +0200 -+++ hotplug2-201.patched/action.h 2010-04-01 04:54:14.000000000 +0300 +--- a/action.h ++++ b/action.h @@ -12,5 +12,6 @@ #include "settings.h" @@ -20,10 +18,9 @@ diff -x '*~' -Naur hotplug2-201/action.h hotplug2-201.patched/action.h +char* alloc_env(const char *, const char *); #endif /* ifndef ACTION_H */ -diff -x '*~' -Naur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers/worker_fork.c ---- hotplug2-201/workers/worker_fork.c 2010-04-01 04:52:26.000000000 +0300 -+++ hotplug2-201.patched/workers/worker_fork.c 2010-04-01 04:51:49.000000000 +0300 -@@ -380,6 +380,7 @@ +--- a/workers/worker_fork.c ++++ b/workers/worker_fork.c +@@ -380,6 +380,7 @@ static void worker_fork_deinit(void *in_ static int worker_fork_process(void *in_ctx, struct uevent_t *uevent) { @@ -31,7 +28,7 @@ diff -x '*~' -Naur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/worke int i; struct worker_fork_child_t *child; struct worker_fork_ctx_t *ctx = in_ctx; -@@ -406,6 +407,12 @@ +@@ -406,6 +407,12 @@ static int worker_fork_process(void *in_ * No child process is currently available. */ if (child == NULL) { @@ -44,7 +41,7 @@ diff -x '*~' -Naur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/worke /* * Are the matching rules trivial enough that we * can execute them in the main process? -@@ -421,6 +428,12 @@ +@@ -421,6 +428,12 @@ static int worker_fork_process(void *in_ */ if (ctx->children_count < ctx->max_children) child = worker_fork_spawn(ctx); diff --git a/package/hotplug2/patches/160-event_block_fix.patch b/package/hotplug2/patches/160-event_block_fix.patch index fd037b122..ac7e79ab1 100644 --- a/package/hotplug2/patches/160-event_block_fix.patch +++ b/package/hotplug2/patches/160-event_block_fix.patch @@ -1,7 +1,6 @@ -diff -x '*~' -ur hotplug2-201/uevent.c hotplug2-201.patched/uevent.c ---- hotplug2-201/uevent.c 2009-12-09 20:44:14.000000000 +0200 -+++ hotplug2-201.patched/uevent.c 2010-04-02 23:03:11.000000000 +0300 -@@ -132,6 +132,8 @@ +--- a/uevent.c ++++ b/uevent.c +@@ -132,6 +132,8 @@ struct uevent_t *uevent_dup(const struct dest = xmalloc(sizeof(struct uevent_t)); dest->action = src->action; @@ -10,9 +9,8 @@ diff -x '*~' -ur hotplug2-201/uevent.c hotplug2-201.patched/uevent.c dest->env_vars_c = src->env_vars_c; dest->env_vars = xmalloc(sizeof(struct env_var_t) * dest->env_vars_c); dest->plain_s = src->plain_s; -diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers/worker_fork.c ---- hotplug2-201/workers/worker_fork.c 2010-04-03 17:02:15.000000000 +0300 -+++ hotplug2-201.patched/workers/worker_fork.c 2010-04-03 17:04:27.000000000 +0300 +--- a/workers/worker_fork.c ++++ b/workers/worker_fork.c @@ -1,6 +1,69 @@ #include "worker_fork.h" @@ -83,7 +81,7 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers /** * Destroys data structures related to the given child ID (not PID). -@@ -315,6 +378,8 @@ +@@ -315,6 +378,8 @@ static void *worker_fork_init(struct set struct worker_fork_ctx_t *ctx; PRINTFUNC(); @@ -92,7 +90,7 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers ctx = malloc(sizeof(struct worker_fork_ctx_t)); ctx->children = NULL; ctx->children_count = 0; -@@ -376,6 +441,7 @@ +@@ -376,6 +441,7 @@ static void worker_fork_deinit(void *in_ free(ctx->children); free(ctx); global_ctx = NULL; @@ -100,7 +98,7 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers } -@@ -384,15 +450,26 @@ +@@ -384,15 +450,26 @@ static int worker_fork_process(void *in_ int i; struct worker_fork_child_t *child; struct worker_fork_ctx_t *ctx = in_ctx; @@ -128,7 +126,7 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers worker_fork_update_children(ctx); child = NULL; -@@ -407,9 +484,9 @@ +@@ -407,9 +484,9 @@ static int worker_fork_process(void *in_ * No child process is currently available. */ if (child == NULL) { @@ -141,7 +139,7 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers putenv(env[i]); } -@@ -418,8 +495,11 @@ +@@ -418,8 +495,11 @@ static int worker_fork_process(void *in_ * can execute them in the main process? */ if (ctx->always_fork == 0 && ctx->settings->dumb == 0 && @@ -155,7 +153,7 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers break; } -@@ -427,11 +507,11 @@ +@@ -427,11 +507,11 @@ static int worker_fork_process(void *in_ * We have to fork off a new child. */ if (ctx->children_count < ctx->max_children || @@ -170,7 +168,7 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers free(env[i]); } free(env); -@@ -442,9 +522,14 @@ +@@ -442,9 +522,14 @@ static int worker_fork_process(void *in_ */ if (child != NULL) { child->busy = 1; @@ -188,10 +186,9 @@ diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers } /* -diff -x '*~' -ur hotplug2-201/workers/worker_fork.h hotplug2-201.patched/workers/worker_fork.h ---- hotplug2-201/workers/worker_fork.h 2009-12-09 20:44:13.000000000 +0200 -+++ hotplug2-201.patched/workers/worker_fork.h 2010-04-03 01:00:24.000000000 +0300 -@@ -35,4 +35,9 @@ +--- a/workers/worker_fork.h ++++ b/workers/worker_fork.h +@@ -35,4 +35,9 @@ struct worker_fork_ctx_t { struct settings_t *settings; };