packages: mediaproxy/mediaproxy.spec, mediaproxy/mediaproxy-kernel_headers....
jajcus
jajcus at pld-linux.org
Tue Apr 5 13:44:47 CEST 2011
Author: jajcus Date: Tue Apr 5 11:44:47 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- Version: 2.4.4
- patch to fix compatibility with recent linux-libc-headers
---- Files affected:
packages/mediaproxy:
mediaproxy.spec (1.3 -> 1.4) , mediaproxy-kernel_headers.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mediaproxy/mediaproxy.spec
diff -u packages/mediaproxy/mediaproxy.spec:1.3 packages/mediaproxy/mediaproxy.spec:1.4
--- packages/mediaproxy/mediaproxy.spec:1.3 Tue Sep 15 09:46:50 2009
+++ packages/mediaproxy/mediaproxy.spec Tue Apr 5 13:44:42 2011
@@ -2,22 +2,24 @@
#
Summary: Media relay for RTP/RTCP and UDP streams
Name: mediaproxy
-Version: 2.3.8
+Version: 2.4.4
Release: 1
License: GPL v2
Group: Networking/Daemons
Source0: http://download.ag-projects.com/MediaProxy/%{name}-%{version}.tar.gz
-# Source0-md5: 8914a2b69415946e5ffdb843823b3ef1
+# Source0-md5: 4ae842662702ddd4a5a9db263d261693
Source1: media-dispatcher.sysconfig
Source2: media-dispatcher.init
Source3: media-relay.sysconfig
Source4: media-relay.init
+Patch0: %{name}-kernel_headers.patch
URL: http://mediaproxy.ag-projects.com/
BuildRequires: libnetfilter_conntrack-devel
BuildRequires: python >= 1:2.5
BuildRequires: python-devel >= 1:2.5
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: linux-libc-headers >= 7:2.6.37
%pyrequires_eq python-modules
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -87,6 +89,7 @@
%prep
%setup -q
+%patch0 -p1
%build
python setup.py build
@@ -169,6 +172,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2011/04/05 11:44:42 jajcus
+- Version: 2.4.4
+- patch to fix compatibility with recent linux-libc-headers
+
Revision 1.3 2009/09/15 07:46:50 jajcus
- Version: 2.3.8
- R: python-application >= 1.1.5
================================================================
Index: packages/mediaproxy/mediaproxy-kernel_headers.patch
diff -u /dev/null packages/mediaproxy/mediaproxy-kernel_headers.patch:1.1
--- /dev/null Tue Apr 5 13:44:47 2011
+++ packages/mediaproxy/mediaproxy-kernel_headers.patch Tue Apr 5 13:44:42 2011
@@ -0,0 +1,43 @@
+--- 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;
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mediaproxy/mediaproxy.spec?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list