summaryrefslogtreecommitdiff
path: root/package/exmap/patches
diff options
context:
space:
mode:
authorwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
committerwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
commit219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch)
treeb9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/exmap/patches
Initial import
Diffstat (limited to 'package/exmap/patches')
-rw-r--r--package/exmap/patches/patch-Makefile_in12
-rw-r--r--package/exmap/patches/patch-kernel_exmap_c31
-rw-r--r--package/exmap/patches/patch-src_exmapd_c20
-rw-r--r--package/exmap/patches/patch-src_exmapserver_c22
4 files changed, 85 insertions, 0 deletions
diff --git a/package/exmap/patches/patch-Makefile_in b/package/exmap/patches/patch-Makefile_in
new file mode 100644
index 000000000..cb3281aff
--- /dev/null
+++ b/package/exmap/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- exmap-console-0.4.1.orig/Makefile.in 2007-02-26 12:44:02.000000000 +0100
++++ exmap-console-0.4.1/Makefile.in 2009-04-18 16:16:03.926793719 +0200
+@@ -155,7 +155,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = kernel src doc
++SUBDIRS = src
+ DISTCLEANFILES = *~ Makefile.in install-sh missing depcomp *.m4 config.log config.status Makefile
+ all: all-recursive
+
diff --git a/package/exmap/patches/patch-kernel_exmap_c b/package/exmap/patches/patch-kernel_exmap_c
new file mode 100644
index 000000000..8278e6510
--- /dev/null
+++ b/package/exmap/patches/patch-kernel_exmap_c
@@ -0,0 +1,31 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- exmap-console-0.4.1.orig/kernel/exmap.c 2006-10-24 20:45:11.000000000 +0200
++++ exmap-console-0.4.1/kernel/exmap.c 2008-12-14 13:34:01.000000000 +0100
+@@ -392,7 +392,11 @@ int setup_from_pid(pid_t pid)
+ struct task_struct *tsk;
+ int errcode = -EINVAL;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++ tsk = find_task_by_vpid(pid);
++#else
+ tsk = find_task_by_pid(pid);
++#endif
+ if (tsk == NULL) {
+ printk (KERN_ALERT
+ "/proc/%s: can't find task for pid %d\n",
+@@ -507,7 +511,7 @@ int init_module ()
+ NULL);
+
+ if (exmap_proc_file == NULL) {
+- remove_proc_entry (PROCFS_NAME, &proc_root);
++ remove_proc_entry (PROCFS_NAME, NULL);
+ printk (KERN_ALERT "/proc/%s: could not initialize\n",
+ PROCFS_NAME);
+ return -ENOMEM;
+@@ -532,5 +536,5 @@ int init_module ()
+ void cleanup_module ()
+ {
+ printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
+- remove_proc_entry (PROCFS_NAME, &proc_root);
++ remove_proc_entry (PROCFS_NAME, NULL);
+ }
diff --git a/package/exmap/patches/patch-src_exmapd_c b/package/exmap/patches/patch-src_exmapd_c
new file mode 100644
index 000000000..68921e5f4
--- /dev/null
+++ b/package/exmap/patches/patch-src_exmapd_c
@@ -0,0 +1,20 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- exmap-console-0.4.1.orig/src/exmapd.c 2006-12-11 08:50:23.000000000 +0100
++++ exmap-console-0.4.1/src/exmapd.c 2008-12-14 15:53:02.000000000 +0100
+@@ -257,6 +257,7 @@ main (int argc, char ** argv)
+ }
+
+ /* make sure that the exmap module is loaded */
++ /*
+ if (g_spawn_sync (NULL, (char**)&modp_args, NULL, G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, NULL, &modp_status, &error))
+ {
+@@ -268,7 +269,7 @@ main (int argc, char ** argv)
+ {
+ g_error ("Could not spawn modprobe: %s", error ? error->message : "");
+ }
+-
++ */
+ /* Initialise data for the timeout callback
+ *
+ * 4 == 3 + 1: 3 for the exec name + 2 params we feed exmap
diff --git a/package/exmap/patches/patch-src_exmapserver_c b/package/exmap/patches/patch-src_exmapserver_c
new file mode 100644
index 000000000..721ec2fa3
--- /dev/null
+++ b/package/exmap/patches/patch-src_exmapserver_c
@@ -0,0 +1,22 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- exmap-console-0.4.1.orig/src/exmapserver.c 2007-02-26 12:00:48.000000000 +0100
++++ exmap-console-0.4.1/src/exmapserver.c 2008-12-14 15:52:07.000000000 +0100
+@@ -532,9 +532,9 @@ main (int argc, char ** argv)
+ }
+ }
+
++ /* do not try to modprobe
+ if (getuid() == 0)
+ {
+- /* if running a root, we can make sure that the exmap module is loaded */
+ if (g_spawn_sync (NULL, (char**)&modp_args, NULL, G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, NULL, &modp_status, &error))
+ {
+@@ -548,6 +548,7 @@ main (int argc, char ** argv)
+ error ? error->message : "");
+ }
+ }
++ */
+
+ /* handle SIGPIPE */
+ struct sigaction sa;