commit 4fbd20cb73331ee7292a90db269599bb4fbfe87b
Author: Jacek Konieczny <[email protected]>
Date: Tue Oct 2 14:03:14 2012 +0200
remove the patches from repo too
mediaproxy-kernel_headers.patch | 43 --------------------------------
mediaproxy-kernelversion_discovery.patch | 11 --------
2 files changed, 54 deletions(-)
---
diff --git a/mediaproxy-kernel_headers.patch b/mediaproxy-kernel_headers.patch
deleted file mode 100644
index 04b0d8a..0000000
--- a/mediaproxy-kernel_headers.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mediaproxy-2.4.4/mediaproxy/interfaces/system/libiptc/libiptc.c.orig
2010-07-15 11:28:32.000000000 +0200
-+++ mediaproxy-2.4.4/mediaproxy/interfaces/system/libiptc/libiptc.c
2011-04-05 13:41:53.000000000 +0200
-@@ -60,12 +60,6 @@
- };
-
- /* Convenience structures */
--struct ipt_error_target
--{
-- STRUCT_ENTRY_TARGET t;
-- char error[TABLE_MAXNAMELEN];
--};
--
- struct chain_head;
- struct rule_head;
-
-@@ -654,10 +648,10 @@
- head = (void *)repl->entries + c->head_offset;
- head->e.target_offset = sizeof(STRUCT_ENTRY);
- head->e.next_offset = IPTCB_CHAIN_START_SIZE;
-- strcpy(head->name.t.u.user.name, ERROR_TARGET);
-- head->name.t.u.target_size =
-+ strcpy(head->name.target.u.user.name, ERROR_TARGET);
-+ head->name.target.u.target_size =
- ALIGN(sizeof(struct ipt_error_target));
-- strcpy(head->name.error, c->name);
-+ strcpy(head->name.errorname, c->name);
- } else {
- repl->hook_entry[c->hooknum-1] = c->head_offset;
- repl->underflow[c->hooknum-1] = c->foot_offset;
-@@ -763,10 +757,10 @@
- error = (void *)repl->entries + repl->size - IPTCB_CHAIN_ERROR_SIZE;
- error->entry.target_offset = sizeof(STRUCT_ENTRY);
- error->entry.next_offset = IPTCB_CHAIN_ERROR_SIZE;
-- error->target.t.u.user.target_size =
-+ error->target.target.u.user.target_size =
- ALIGN(sizeof(struct ipt_error_target));
-- strcpy((char *)&error->target.t.u.user.name, ERROR_TARGET);
-- strcpy((char *)&error->target.error, "ERROR");
-+ strcpy((char *)&error->target.target.u.user.name, ERROR_TARGET);
-+ strcpy((char *)&error->target.errorname, "ERROR");
-
- return 1;
- }
diff --git a/mediaproxy-kernelversion_discovery.patch
b/mediaproxy-kernelversion_discovery.patch
deleted file mode 100644
index a1fccc5..0000000
--- a/mediaproxy-kernelversion_discovery.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mediaproxy-2.4.4/mediaproxy/relay.py.orig 2011-06-09 12:47:39.190215619
+0200
-+++ mediaproxy-2.4.4/mediaproxy/relay.py 2011-06-09 12:49:33.578825187
+0200
-@@ -326,7 +326,7 @@
- if not ip_forward:
- raise RuntimeError("IP forwarding is not available or not enabled
(check %s)" % IP_FORWARD_FILE)
- try:
-- major, minor, revision = [int(num) for num in
open(KERNEL_VERSION_FILE).read().split("-", 1)[0].split(".")[:3]]
-+ major, minor, revision = [int(num) for num in
open(KERNEL_VERSION_FILE).read().split("-", 1)[0].split("_",
1)[0].split(".")[:3]]
- except:
- raise RuntimeError("Could not determine Linux kernel version")
- if (major, minor, revision) < (2, 6, 18):
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediaproxy.git/commitdiff/4fbd20cb73331ee7292a90db269599bb4fbfe87b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
