rpms/vlc/devel sources, 1.35, 1.36 .cvsignore, 1.29, 1.30 vlc.spec, 1.86, 1.87
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22349
Modified Files:
sources .cvsignore vlc.spec
Log Message:
Update to 1.1.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 1 Jul 2010 22:15:44 -0000 1.35
+++ sources 5 Aug 2010 15:49:59 -0000 1.36
@@ -1 +1 @@
-e2142957137b183a5ad0a4827c39f655 vlc-1.1.0.tar.bz2
+dec11ed850e044c518aee6fef7e7f893 vlc-1.1.2.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 1 Jul 2010 22:15:44 -0000 1.29
+++ .cvsignore 5 Aug 2010 15:49:59 -0000 1.30
@@ -1 +1 @@
-vlc-1.1.0.tar.bz2
+vlc-1.1.2.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- vlc.spec 15 Jul 2010 21:43:50 -0000 1.86
+++ vlc.spec 5 Aug 2010 15:49:59 -0000 1.87
@@ -20,8 +20,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.0
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -295,7 +295,6 @@
--enable-xosd \
--enable-fbosd \
--enable-lirc \
- --disable-notify \
%ifarch %{ix86}
--enable-loader \
%else
@@ -514,8 +513,8 @@
%changelog
-* Thu Jul 15 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.0-2
-- Disable notify
+* Thu Aug 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.2-1
+- Update to 1.1.2
* Thu Jul 01 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.0-1
- Update to 1.1.0
14 years, 3 months
rpms/west-chamber-kmod/F-12 compat_skbuff.h, NONE, 1.1 compat_xtables.h, NONE, 1.1 compat_xtnu.h, NONE, 1.1 west-chamber-kmod.spec, 1.10, 1.11 west-chamber-kmodtool-excludekernel-filterfile, 1.1, NONE
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22238
Modified Files:
west-chamber-kmod.spec
Added Files:
compat_skbuff.h compat_xtables.h compat_xtnu.h
Removed Files:
west-chamber-kmodtool-excludekernel-filterfile
Log Message:
--- NEW FILE compat_skbuff.h ---
#ifndef COMPAT_SKBUFF_H
#define COMPAT_SKBUFF_H 1
struct tcphdr;
struct udphdr;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 30)
static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)
{
skb->dst = dst;
}
static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
{
return skb->dst;
}
static inline struct rtable *skb_rtable(const struct sk_buff *skb)
{
return (void *)skb->dst;
}
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define skb_ifindex(skb) \
(((skb)->input_dev != NULL) ? (skb)->input_dev->ifindex : 0)
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->nfmark)
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
# define skb_ifindex(skb) (skb)->iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
#else
# define skb_ifindex(skb) (skb)->skb_iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
#endif
#ifdef CONFIG_NETWORK_SECMARK
# define skb_secmark(skb) ((skb)->secmark)
#else
# define skb_secmark(skb) 0
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 21)
# define ip_hdr(skb) ((skb)->nh.iph)
# define ip_hdrlen(skb) (ip_hdr(skb)->ihl * 4)
# define ipv6_hdr(skb) ((skb)->nh.ipv6h)
# define skb_network_header(skb) ((skb)->nh.raw)
# define skb_transport_header(skb) ((skb)->h.raw)
static inline void skb_reset_network_header(struct sk_buff *skb)
{
skb->nh.raw = skb->data;
}
static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
{
return (void *)skb_transport_header(skb);
}
static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
{
return (void *)skb_transport_header(skb);
}
#endif
#endif /* COMPAT_SKBUFF_H */
--- NEW FILE compat_xtables.h ---
#ifndef _XTABLES_COMPAT_H
#define _XTABLES_COMPAT_H 1
#include <linux/kernel.h>
#include <linux/version.h>
#include "compat_skbuff.h"
#include "compat_xtnu.h"
#define DEBUGP Use__pr_debug__instead
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 17)
# warning Kernels below 2.6.17 not supported.
#endif
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
# if !defined(CONFIG_NF_CONNTRACK_MARK)
# warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNTRACK_MARK is not (please enable).
# endif
# include <net/netfilter/nf_conntrack.h>
#elif defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
# if !defined(CONFIG_IP_NF_CONNTRACK_MARK)
# warning You have CONFIG_IP_NF_CONNTRACK enabled, but CONFIG_IP_NF_CONNTRACK_MARK is not (please enable).
# endif
# include <linux/netfilter_ipv4/ip_conntrack.h>
# define nf_conn ip_conntrack
# define nf_ct_get ip_conntrack_get
# define nf_conntrack_untracked ip_conntrack_untracked
#else
# warning You need either CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK.
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
# define skb_init_secmark(skb)
# define skb_linearize xtnu_skb_linearize
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define neigh_hh_output xtnu_neigh_hh_output
# define IPPROTO_UDPLITE 136
# define CSUM_MANGLED_0 ((__force __sum16)0xffff)
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
# define NF_INET_PRE_ROUTING NF_IP_PRE_ROUTING
# define NF_INET_LOCAL_IN NF_IP_LOCAL_IN
# define NF_INET_FORWARD NF_IP_FORWARD
# define NF_INET_LOCAL_OUT NF_IP_LOCAL_OUT
# define NF_INET_POST_ROUTING NF_IP_POST_ROUTING
# define ip_local_out xtnu_ip_local_out
# define ip_route_output_key xtnu_ip_route_output_key
# include "compat_nfinetaddr.h"
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
# define init_net xtnu_ip_route_output_key /* yes */
# define init_net__loopback_dev (&loopback_dev)
# define init_net__proc_net proc_net
#else
# define init_net__loopback_dev init_net.loopback_dev
# define init_net__proc_net init_net.proc_net
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
# define xt_match xtnu_match
# define xt_register_match xtnu_register_match
# define xt_unregister_match xtnu_unregister_match
# define xt_register_matches xtnu_register_matches
# define xt_unregister_matches xtnu_unregister_matches
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define csum_replace2 xtnu_csum_replace2
# define csum_replace4 xtnu_csum_replace4
# define inet_proto_csum_replace4 xtnu_proto_csum_replace4
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
# define csum_replace2 nf_csum_replace2
# define csum_replace4 nf_csum_replace4
# define inet_proto_csum_replace4 xtnu_proto_csum_replace4
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
# define ipt_unregister_table(tbl) ipt_unregister_table(&init_net, (tbl))
# define ip6t_unregister_table(tbl) ip6t_unregister_table(&init_net, (tbl))
#else
# define ipt_unregister_table(tbl) ipt_unregister_table(tbl)
# define ip6t_unregister_table(tbl) ip6t_unregister_table(tbl)
#endif
#if !defined(NIP6) && !defined(NIP6_FMT)
# define NIP6(addr) \
ntohs((addr).s6_addr16[0]), \
ntohs((addr).s6_addr16[1]), \
ntohs((addr).s6_addr16[2]), \
ntohs((addr).s6_addr16[3]), \
ntohs((addr).s6_addr16[4]), \
ntohs((addr).s6_addr16[5]), \
ntohs((addr).s6_addr16[6]), \
ntohs((addr).s6_addr16[7])
# define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
#endif
#if !defined(NIPQUAD) && !defined(NIPQUAD_FMT)
# define NIPQUAD(addr) \
((const unsigned char *)&addr)[0], \
((const unsigned char *)&addr)[1], \
((const unsigned char *)&addr)[2], \
((const unsigned char *)&addr)[3]
# define NIPQUAD_FMT "%u.%u.%u.%u"
#endif
#define ip_route_me_harder xtnu_ip_route_me_harder
#define skb_make_writable xtnu_skb_make_writable
#define xt_target xtnu_target
#define xt_register_target xtnu_register_target
#define xt_unregister_target xtnu_unregister_target
#define xt_register_targets xtnu_register_targets
#define xt_unregister_targets xtnu_unregister_targets
#define xt_request_find_match xtnu_request_find_match
#endif /* _XTABLES_COMPAT_H */
--- NEW FILE compat_xtnu.h ---
#ifndef _COMPAT_XTNU_H
#define _COMPAT_XTNU_H 1
#include <linux/list.h>
#include <linux/netfilter/x_tables.h>
#include <linux/spinlock.h>
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
typedef _Bool bool;
enum { false = 0, true = 1, };
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
typedef __u16 __bitwise __sum16;
typedef __u32 __bitwise __wsum;
#endif
struct flowi;
struct hh_cache;
struct module;
struct net_device;
struct rtable;
struct sk_buff;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
enum {
NFPROTO_UNSPEC = 0,
NFPROTO_IPV4 = 2,
NFPROTO_ARP = 3,
NFPROTO_BRIDGE = 7,
NFPROTO_IPV6 = 10,
NFPROTO_DECNET = 12,
NFPROTO_NUMPROTO,
};
struct xt_mtchk_param {
const char *table;
const void *entryinfo;
const struct xt_match *match;
void *matchinfo;
unsigned int hook_mask;
u_int8_t family;
};
struct xt_mtdtor_param {
const struct xt_match *match;
void *matchinfo;
u_int8_t family;
};
struct xt_target_param {
const struct net_device *in, *out;
unsigned int hooknum;
const struct xt_target *target;
const void *targinfo;
u_int8_t family;
};
struct xt_tgchk_param {
const char *table;
const void *entryinfo;
const struct xt_target *target;
void *targinfo;
unsigned int hook_mask;
u_int8_t family;
};
struct xt_tgdtor_param {
const struct xt_target *target;
void *targinfo;
u_int8_t family;
};
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
struct xt_action_param {
union {
const struct xt_match *match;
const struct xt_target *target;
};
union {
const void *matchinfo, *targinfo;
};
const struct net_device *in, *out;
int fragoff;
unsigned int thoff, hooknum;
u_int8_t family;
bool hotdrop;
};
#endif
struct xtnu_match {
/*
* Making it smaller by sizeof(void *) on purpose to catch
* lossy translation, if any.
*/
char name[sizeof(((struct xt_match *)NULL)->name) - 1 - sizeof(void *)];
uint8_t revision;
bool (*match)(const struct sk_buff *, struct xt_action_param *);
int (*checkentry)(const struct xt_mtchk_param *);
void (*destroy)(const struct xt_mtdtor_param *);
struct module *me;
const char *table;
unsigned int matchsize, hooks;
unsigned short proto, family;
void *__compat_match;
};
struct xtnu_target {
char name[sizeof(((struct xt_target *)NULL)->name) - 1 - sizeof(void *)];
uint8_t revision;
unsigned int (*target)(struct sk_buff **,
const struct xt_action_param *);
int (*checkentry)(const struct xt_tgchk_param *);
void (*destroy)(const struct xt_tgdtor_param *);
struct module *me;
const char *table;
unsigned int targetsize, hooks;
unsigned short proto, family;
void *__compat_target;
};
static inline struct xtnu_match *xtcompat_numatch(const struct xt_match *m)
{
void *q;
memcpy(&q, m->name + sizeof(m->name) - sizeof(void *), sizeof(void *));
return q;
}
static inline struct xtnu_target *xtcompat_nutarget(const struct xt_target *t)
{
void *q;
memcpy(&q, t->name + sizeof(t->name) - sizeof(void *), sizeof(void *));
return q;
}
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
static inline __wsum csum_unfold(__sum16 n)
{
return (__force __wsum)n;
}
#endif
extern int xtnu_ip_local_out(struct sk_buff *);
extern int xtnu_ip_route_me_harder(struct sk_buff **, unsigned int);
extern int xtnu_skb_make_writable(struct sk_buff **, unsigned int);
extern int xtnu_register_match(struct xtnu_match *);
extern int xtnu_ip_route_output_key(void *, struct rtable **, struct flowi *);
extern void xtnu_unregister_match(struct xtnu_match *);
extern int xtnu_register_matches(struct xtnu_match *, unsigned int);
extern void xtnu_unregister_matches(struct xtnu_match *, unsigned int);
extern int xtnu_register_target(struct xtnu_target *);
extern void xtnu_unregister_target(struct xtnu_target *);
extern int xtnu_register_targets(struct xtnu_target *, unsigned int);
extern void xtnu_unregister_targets(struct xtnu_target *, unsigned int);
extern struct xt_match *xtnu_request_find_match(unsigned int,
const char *, uint8_t);
extern int xtnu_neigh_hh_output(struct hh_cache *, struct sk_buff *);
extern void xtnu_csum_replace2(__u16 __bitwise *, __be16, __be16);
extern void xtnu_csum_replace4(__u16 __bitwise *, __be32, __be32);
extern void xtnu_proto_csum_replace4(__u16 __bitwise *, struct sk_buff *,
__be32, __be32, bool);
extern int xtnu_skb_linearize(struct sk_buff *);
extern void *HX_memmem(const void *, size_t, const void *, size_t);
#endif /* _COMPAT_XTNU_H */
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-12/west-chamber-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- west-chamber-kmod.spec 27 Jul 2010 07:49:40 -0000 1.10
+++ west-chamber-kmod.spec 5 Aug 2010 07:36:28 -0000 1.11
@@ -3,8 +3,8 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
-#define buildforkernels current
+#define buildforkernels newest
+%define buildforkernels current
#define buildforkernels akmods
%define svndate 20100405
@@ -13,7 +13,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 4.%{?svndate}svn%{?dist}.8
+Release: 5.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -23,14 +23,16 @@
# svn export -r %{svnver} http://scholarzhang.googlecode.com/svn/trunk/west-chamber west-chamber-%{svndate}
# tar -cjvf west-chamber-%{svndate}.tar.bz2 west-chamber-%{svndate}
Source0: west-chamber-%{svndate}.tar.bz2
-Source11: west-chamber-kmodtool-excludekernel-filterfile
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Header files extracted from xtables-addons 1.28
+Source1: compat_xtables.h
+Source2: compat_skbuff.h
+Source3: compat_xtnu.h
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
West-chamber is extensions named after the famous Chinese ancient friction -
@@ -43,14 +45,21 @@
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
-kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
-#do not build bundled xtables-addons modules
+
pushd west-chamber-%{svndate}
+# do not build bundled xtables-addons modules
sed -i '/compat_xtables.o/d' extensions/Kbuild
sed -i '/build_ipset/d' extensions/Kbuild
+
+# remove bundled files from xtables-addons
+rm -rf include extensions/compat*
+
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} extensions/
popd
+
for kernel_version in %{?kernel_versions} ; do
cp -a west-chamber-%{svndate} _kmod_build_${kernel_version%%___*}
done
@@ -59,14 +68,12 @@
%build
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
- make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
+ make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
done
%install
-rm -rf %{buildroot}
for kernel_version in %{?kernel_versions} ; do
- find _kmod_build_${kernel_version%%___*}/extensions -name "*.ko" -exec mv {} _kmod_build_${kernel_version%%___*}/extensions ";"
install -dm 755 %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
install -pm 755 _kmod_build_${kernel_version%%___*}/extensions/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
done
@@ -78,31 +85,35 @@
%changelog
-* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.8
+* Thu Aug 05 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-5.20100405svn
+- Renew header files to work with xtables-addons >= 1.27
+
+* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.8
- rebuild for new kernel
-* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.7
+* Fri May 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.7
- rebuild for new kernel
-* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.6
+* Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.6
- rebuild for new kernel
-* Sat May 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.5
+* Mon May 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.5
- rebuild for new kernel
-* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.4
+* Fri May 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.4
- rebuild for new kernel
-* Thu Apr 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.3
+* Tue May 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.3
- rebuild for new kernel
-* Mon Apr 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.2
+* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.2
- rebuild for new kernel
-* Sat Apr 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.1
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.1
- rebuild for new kernel
-* Thu Apr 15 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-4.20100405svn-- Changed 'buildforkernels' to current.
+* Thu Apr 15 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-4.20100405svn
+- Changed 'buildforkernels' to current.
* Mon Apr 05 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-3.20100405svn
- svn 84
--- west-chamber-kmodtool-excludekernel-filterfile DELETED ---
14 years, 3 months
rpms/west-chamber-kmod/F-13 compat_skbuff.h, NONE, 1.1 compat_xtables.h, NONE, 1.1 compat_xtnu.h, NONE, 1.1 west-chamber-kmod.spec, 1.12, 1.13
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21906
Modified Files:
west-chamber-kmod.spec
Added Files:
compat_skbuff.h compat_xtables.h compat_xtnu.h
Log Message:
--- NEW FILE compat_skbuff.h ---
#ifndef COMPAT_SKBUFF_H
#define COMPAT_SKBUFF_H 1
struct tcphdr;
struct udphdr;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 30)
static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)
{
skb->dst = dst;
}
static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
{
return skb->dst;
}
static inline struct rtable *skb_rtable(const struct sk_buff *skb)
{
return (void *)skb->dst;
}
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define skb_ifindex(skb) \
(((skb)->input_dev != NULL) ? (skb)->input_dev->ifindex : 0)
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->nfmark)
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
# define skb_ifindex(skb) (skb)->iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
#else
# define skb_ifindex(skb) (skb)->skb_iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
#endif
#ifdef CONFIG_NETWORK_SECMARK
# define skb_secmark(skb) ((skb)->secmark)
#else
# define skb_secmark(skb) 0
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 21)
# define ip_hdr(skb) ((skb)->nh.iph)
# define ip_hdrlen(skb) (ip_hdr(skb)->ihl * 4)
# define ipv6_hdr(skb) ((skb)->nh.ipv6h)
# define skb_network_header(skb) ((skb)->nh.raw)
# define skb_transport_header(skb) ((skb)->h.raw)
static inline void skb_reset_network_header(struct sk_buff *skb)
{
skb->nh.raw = skb->data;
}
static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
{
return (void *)skb_transport_header(skb);
}
static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
{
return (void *)skb_transport_header(skb);
}
#endif
#endif /* COMPAT_SKBUFF_H */
--- NEW FILE compat_xtables.h ---
#ifndef _XTABLES_COMPAT_H
#define _XTABLES_COMPAT_H 1
#include <linux/kernel.h>
#include <linux/version.h>
#include "compat_skbuff.h"
#include "compat_xtnu.h"
#define DEBUGP Use__pr_debug__instead
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 17)
# warning Kernels below 2.6.17 not supported.
#endif
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
# if !defined(CONFIG_NF_CONNTRACK_MARK)
# warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNTRACK_MARK is not (please enable).
# endif
# include <net/netfilter/nf_conntrack.h>
#elif defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
# if !defined(CONFIG_IP_NF_CONNTRACK_MARK)
# warning You have CONFIG_IP_NF_CONNTRACK enabled, but CONFIG_IP_NF_CONNTRACK_MARK is not (please enable).
# endif
# include <linux/netfilter_ipv4/ip_conntrack.h>
# define nf_conn ip_conntrack
# define nf_ct_get ip_conntrack_get
# define nf_conntrack_untracked ip_conntrack_untracked
#else
# warning You need either CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK.
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
# define skb_init_secmark(skb)
# define skb_linearize xtnu_skb_linearize
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define neigh_hh_output xtnu_neigh_hh_output
# define IPPROTO_UDPLITE 136
# define CSUM_MANGLED_0 ((__force __sum16)0xffff)
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
# define NF_INET_PRE_ROUTING NF_IP_PRE_ROUTING
# define NF_INET_LOCAL_IN NF_IP_LOCAL_IN
# define NF_INET_FORWARD NF_IP_FORWARD
# define NF_INET_LOCAL_OUT NF_IP_LOCAL_OUT
# define NF_INET_POST_ROUTING NF_IP_POST_ROUTING
# define ip_local_out xtnu_ip_local_out
# define ip_route_output_key xtnu_ip_route_output_key
# include "compat_nfinetaddr.h"
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
# define init_net xtnu_ip_route_output_key /* yes */
# define init_net__loopback_dev (&loopback_dev)
# define init_net__proc_net proc_net
#else
# define init_net__loopback_dev init_net.loopback_dev
# define init_net__proc_net init_net.proc_net
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
# define xt_match xtnu_match
# define xt_register_match xtnu_register_match
# define xt_unregister_match xtnu_unregister_match
# define xt_register_matches xtnu_register_matches
# define xt_unregister_matches xtnu_unregister_matches
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define csum_replace2 xtnu_csum_replace2
# define csum_replace4 xtnu_csum_replace4
# define inet_proto_csum_replace4 xtnu_proto_csum_replace4
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
# define csum_replace2 nf_csum_replace2
# define csum_replace4 nf_csum_replace4
# define inet_proto_csum_replace4 xtnu_proto_csum_replace4
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
# define ipt_unregister_table(tbl) ipt_unregister_table(&init_net, (tbl))
# define ip6t_unregister_table(tbl) ip6t_unregister_table(&init_net, (tbl))
#else
# define ipt_unregister_table(tbl) ipt_unregister_table(tbl)
# define ip6t_unregister_table(tbl) ip6t_unregister_table(tbl)
#endif
#if !defined(NIP6) && !defined(NIP6_FMT)
# define NIP6(addr) \
ntohs((addr).s6_addr16[0]), \
ntohs((addr).s6_addr16[1]), \
ntohs((addr).s6_addr16[2]), \
ntohs((addr).s6_addr16[3]), \
ntohs((addr).s6_addr16[4]), \
ntohs((addr).s6_addr16[5]), \
ntohs((addr).s6_addr16[6]), \
ntohs((addr).s6_addr16[7])
# define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
#endif
#if !defined(NIPQUAD) && !defined(NIPQUAD_FMT)
# define NIPQUAD(addr) \
((const unsigned char *)&addr)[0], \
((const unsigned char *)&addr)[1], \
((const unsigned char *)&addr)[2], \
((const unsigned char *)&addr)[3]
# define NIPQUAD_FMT "%u.%u.%u.%u"
#endif
#define ip_route_me_harder xtnu_ip_route_me_harder
#define skb_make_writable xtnu_skb_make_writable
#define xt_target xtnu_target
#define xt_register_target xtnu_register_target
#define xt_unregister_target xtnu_unregister_target
#define xt_register_targets xtnu_register_targets
#define xt_unregister_targets xtnu_unregister_targets
#define xt_request_find_match xtnu_request_find_match
#endif /* _XTABLES_COMPAT_H */
--- NEW FILE compat_xtnu.h ---
#ifndef _COMPAT_XTNU_H
#define _COMPAT_XTNU_H 1
#include <linux/list.h>
#include <linux/netfilter/x_tables.h>
#include <linux/spinlock.h>
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
typedef _Bool bool;
enum { false = 0, true = 1, };
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
typedef __u16 __bitwise __sum16;
typedef __u32 __bitwise __wsum;
#endif
struct flowi;
struct hh_cache;
struct module;
struct net_device;
struct rtable;
struct sk_buff;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
enum {
NFPROTO_UNSPEC = 0,
NFPROTO_IPV4 = 2,
NFPROTO_ARP = 3,
NFPROTO_BRIDGE = 7,
NFPROTO_IPV6 = 10,
NFPROTO_DECNET = 12,
NFPROTO_NUMPROTO,
};
struct xt_mtchk_param {
const char *table;
const void *entryinfo;
const struct xt_match *match;
void *matchinfo;
unsigned int hook_mask;
u_int8_t family;
};
struct xt_mtdtor_param {
const struct xt_match *match;
void *matchinfo;
u_int8_t family;
};
struct xt_target_param {
const struct net_device *in, *out;
unsigned int hooknum;
const struct xt_target *target;
const void *targinfo;
u_int8_t family;
};
struct xt_tgchk_param {
const char *table;
const void *entryinfo;
const struct xt_target *target;
void *targinfo;
unsigned int hook_mask;
u_int8_t family;
};
struct xt_tgdtor_param {
const struct xt_target *target;
void *targinfo;
u_int8_t family;
};
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
struct xt_action_param {
union {
const struct xt_match *match;
const struct xt_target *target;
};
union {
const void *matchinfo, *targinfo;
};
const struct net_device *in, *out;
int fragoff;
unsigned int thoff, hooknum;
u_int8_t family;
bool hotdrop;
};
#endif
struct xtnu_match {
/*
* Making it smaller by sizeof(void *) on purpose to catch
* lossy translation, if any.
*/
char name[sizeof(((struct xt_match *)NULL)->name) - 1 - sizeof(void *)];
uint8_t revision;
bool (*match)(const struct sk_buff *, struct xt_action_param *);
int (*checkentry)(const struct xt_mtchk_param *);
void (*destroy)(const struct xt_mtdtor_param *);
struct module *me;
const char *table;
unsigned int matchsize, hooks;
unsigned short proto, family;
void *__compat_match;
};
struct xtnu_target {
char name[sizeof(((struct xt_target *)NULL)->name) - 1 - sizeof(void *)];
uint8_t revision;
unsigned int (*target)(struct sk_buff **,
const struct xt_action_param *);
int (*checkentry)(const struct xt_tgchk_param *);
void (*destroy)(const struct xt_tgdtor_param *);
struct module *me;
const char *table;
unsigned int targetsize, hooks;
unsigned short proto, family;
void *__compat_target;
};
static inline struct xtnu_match *xtcompat_numatch(const struct xt_match *m)
{
void *q;
memcpy(&q, m->name + sizeof(m->name) - sizeof(void *), sizeof(void *));
return q;
}
static inline struct xtnu_target *xtcompat_nutarget(const struct xt_target *t)
{
void *q;
memcpy(&q, t->name + sizeof(t->name) - sizeof(void *), sizeof(void *));
return q;
}
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
static inline __wsum csum_unfold(__sum16 n)
{
return (__force __wsum)n;
}
#endif
extern int xtnu_ip_local_out(struct sk_buff *);
extern int xtnu_ip_route_me_harder(struct sk_buff **, unsigned int);
extern int xtnu_skb_make_writable(struct sk_buff **, unsigned int);
extern int xtnu_register_match(struct xtnu_match *);
extern int xtnu_ip_route_output_key(void *, struct rtable **, struct flowi *);
extern void xtnu_unregister_match(struct xtnu_match *);
extern int xtnu_register_matches(struct xtnu_match *, unsigned int);
extern void xtnu_unregister_matches(struct xtnu_match *, unsigned int);
extern int xtnu_register_target(struct xtnu_target *);
extern void xtnu_unregister_target(struct xtnu_target *);
extern int xtnu_register_targets(struct xtnu_target *, unsigned int);
extern void xtnu_unregister_targets(struct xtnu_target *, unsigned int);
extern struct xt_match *xtnu_request_find_match(unsigned int,
const char *, uint8_t);
extern int xtnu_neigh_hh_output(struct hh_cache *, struct sk_buff *);
extern void xtnu_csum_replace2(__u16 __bitwise *, __be16, __be16);
extern void xtnu_csum_replace4(__u16 __bitwise *, __be32, __be32);
extern void xtnu_proto_csum_replace4(__u16 __bitwise *, struct sk_buff *,
__be32, __be32, bool);
extern int xtnu_skb_linearize(struct sk_buff *);
extern void *HX_memmem(const void *, size_t, const void *, size_t);
#endif /* _COMPAT_XTNU_H */
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-13/west-chamber-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- west-chamber-kmod.spec 27 Jul 2010 07:36:09 -0000 1.12
+++ west-chamber-kmod.spec 5 Aug 2010 07:33:56 -0000 1.13
@@ -3,8 +3,8 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
-#define buildforkernels current
+#define buildforkernels newest
+%define buildforkernels current
#define buildforkernels akmods
%define svndate 20100405
@@ -13,7 +13,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 4.%{?svndate}svn%{?dist}.10
+Release: 5.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -23,14 +23,16 @@
# svn export -r %{svnver} http://scholarzhang.googlecode.com/svn/trunk/west-chamber west-chamber-%{svndate}
# tar -cjvf west-chamber-%{svndate}.tar.bz2 west-chamber-%{svndate}
Source0: west-chamber-%{svndate}.tar.bz2
-Source11: west-chamber-kmodtool-excludekernel-filterfile
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Header files extracted from xtables-addons 1.28
+Source1: compat_xtables.h
+Source2: compat_skbuff.h
+Source3: compat_xtnu.h
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
West-chamber is extensions named after the famous Chinese ancient friction -
@@ -43,14 +45,21 @@
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
-kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
-#do not build bundled xtables-addons modules
+
pushd west-chamber-%{svndate}
+# do not build bundled xtables-addons modules
sed -i '/compat_xtables.o/d' extensions/Kbuild
sed -i '/build_ipset/d' extensions/Kbuild
+
+# remove bundled files from xtables-addons
+rm -rf include extensions/compat*
+
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} extensions/
popd
+
for kernel_version in %{?kernel_versions} ; do
cp -a west-chamber-%{svndate} _kmod_build_${kernel_version%%___*}
done
@@ -59,14 +68,12 @@
%build
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
- make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
+ make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
done
%install
-rm -rf %{buildroot}
for kernel_version in %{?kernel_versions} ; do
- find _kmod_build_${kernel_version%%___*}/extensions -name "*.ko" -exec mv {} _kmod_build_${kernel_version%%___*}/extensions ";"
install -dm 755 %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
install -pm 755 _kmod_build_${kernel_version%%___*}/extensions/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
done
@@ -78,11 +85,8 @@
%changelog
-* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.10
-- rebuild for new kernel
-
-* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.9
-- rebuild for new kernel
+* Thu Aug 05 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-5.20100405svn
+- Renew header files to work with xtables-addons >= 1.27
* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.8
- rebuild for new kernel
@@ -108,7 +112,8 @@
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.1
- rebuild for new kernel
-* Thu Apr 15 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-4.20100405svn-- Changed 'buildforkernels' to current.
+* Thu Apr 15 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-4.20100405svn
+- Changed 'buildforkernels' to current.
* Mon Apr 05 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-3.20100405svn
- svn 84
14 years, 3 months
rpms/west-chamber-kmod/devel west-chamber-kmod.spec,1.3,1.4
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14449
Modified Files:
west-chamber-kmod.spec
Log Message:
Fix build
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/devel/west-chamber-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- west-chamber-kmod.spec 5 Aug 2010 05:33:55 -0000 1.3
+++ west-chamber-kmod.spec 5 Aug 2010 05:44:01 -0000 1.4
@@ -55,7 +55,7 @@
sed -i '/build_ipset/d' extensions/Kbuild
# remove bundled files from xtables-addons
-rm -rf extensions/{compat*}
+rm -rf include extensions/compat*
cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} extensions/
popd
14 years, 3 months
rpms/west-chamber-kmod/devel compat_skbuff.h, NONE, 1.1 compat_xtables.h, NONE, 1.1 compat_xtnu.h, NONE, 1.1 west-chamber-kmod.spec, 1.2, 1.3 .cvsignore, 1.2, NONE west-chamber-kmodtool-excludekernel-filterfile, 1.1, NONE
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13588
Modified Files:
west-chamber-kmod.spec
Added Files:
compat_skbuff.h compat_xtables.h compat_xtnu.h
Removed Files:
.cvsignore west-chamber-kmodtool-excludekernel-filterfile
Log Message:
Add support for xtables-addons >= 1.27
--- NEW FILE compat_skbuff.h ---
#ifndef COMPAT_SKBUFF_H
#define COMPAT_SKBUFF_H 1
struct tcphdr;
struct udphdr;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 30)
static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)
{
skb->dst = dst;
}
static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
{
return skb->dst;
}
static inline struct rtable *skb_rtable(const struct sk_buff *skb)
{
return (void *)skb->dst;
}
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define skb_ifindex(skb) \
(((skb)->input_dev != NULL) ? (skb)->input_dev->ifindex : 0)
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->nfmark)
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
# define skb_ifindex(skb) (skb)->iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
#else
# define skb_ifindex(skb) (skb)->skb_iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
#endif
#ifdef CONFIG_NETWORK_SECMARK
# define skb_secmark(skb) ((skb)->secmark)
#else
# define skb_secmark(skb) 0
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 21)
# define ip_hdr(skb) ((skb)->nh.iph)
# define ip_hdrlen(skb) (ip_hdr(skb)->ihl * 4)
# define ipv6_hdr(skb) ((skb)->nh.ipv6h)
# define skb_network_header(skb) ((skb)->nh.raw)
# define skb_transport_header(skb) ((skb)->h.raw)
static inline void skb_reset_network_header(struct sk_buff *skb)
{
skb->nh.raw = skb->data;
}
static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
{
return (void *)skb_transport_header(skb);
}
static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
{
return (void *)skb_transport_header(skb);
}
#endif
#endif /* COMPAT_SKBUFF_H */
--- NEW FILE compat_xtables.h ---
#ifndef _XTABLES_COMPAT_H
#define _XTABLES_COMPAT_H 1
#include <linux/kernel.h>
#include <linux/version.h>
#include "compat_skbuff.h"
#include "compat_xtnu.h"
#define DEBUGP Use__pr_debug__instead
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 17)
# warning Kernels below 2.6.17 not supported.
#endif
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
# if !defined(CONFIG_NF_CONNTRACK_MARK)
# warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNTRACK_MARK is not (please enable).
# endif
# include <net/netfilter/nf_conntrack.h>
#elif defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
# if !defined(CONFIG_IP_NF_CONNTRACK_MARK)
# warning You have CONFIG_IP_NF_CONNTRACK enabled, but CONFIG_IP_NF_CONNTRACK_MARK is not (please enable).
# endif
# include <linux/netfilter_ipv4/ip_conntrack.h>
# define nf_conn ip_conntrack
# define nf_ct_get ip_conntrack_get
# define nf_conntrack_untracked ip_conntrack_untracked
#else
# warning You need either CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK.
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
# define skb_init_secmark(skb)
# define skb_linearize xtnu_skb_linearize
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define neigh_hh_output xtnu_neigh_hh_output
# define IPPROTO_UDPLITE 136
# define CSUM_MANGLED_0 ((__force __sum16)0xffff)
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
# define NF_INET_PRE_ROUTING NF_IP_PRE_ROUTING
# define NF_INET_LOCAL_IN NF_IP_LOCAL_IN
# define NF_INET_FORWARD NF_IP_FORWARD
# define NF_INET_LOCAL_OUT NF_IP_LOCAL_OUT
# define NF_INET_POST_ROUTING NF_IP_POST_ROUTING
# define ip_local_out xtnu_ip_local_out
# define ip_route_output_key xtnu_ip_route_output_key
# include "compat_nfinetaddr.h"
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
# define init_net xtnu_ip_route_output_key /* yes */
# define init_net__loopback_dev (&loopback_dev)
# define init_net__proc_net proc_net
#else
# define init_net__loopback_dev init_net.loopback_dev
# define init_net__proc_net init_net.proc_net
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
# define xt_match xtnu_match
# define xt_register_match xtnu_register_match
# define xt_unregister_match xtnu_unregister_match
# define xt_register_matches xtnu_register_matches
# define xt_unregister_matches xtnu_unregister_matches
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
# define csum_replace2 xtnu_csum_replace2
# define csum_replace4 xtnu_csum_replace4
# define inet_proto_csum_replace4 xtnu_proto_csum_replace4
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
# define csum_replace2 nf_csum_replace2
# define csum_replace4 nf_csum_replace4
# define inet_proto_csum_replace4 xtnu_proto_csum_replace4
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
# define ipt_unregister_table(tbl) ipt_unregister_table(&init_net, (tbl))
# define ip6t_unregister_table(tbl) ip6t_unregister_table(&init_net, (tbl))
#else
# define ipt_unregister_table(tbl) ipt_unregister_table(tbl)
# define ip6t_unregister_table(tbl) ip6t_unregister_table(tbl)
#endif
#if !defined(NIP6) && !defined(NIP6_FMT)
# define NIP6(addr) \
ntohs((addr).s6_addr16[0]), \
ntohs((addr).s6_addr16[1]), \
ntohs((addr).s6_addr16[2]), \
ntohs((addr).s6_addr16[3]), \
ntohs((addr).s6_addr16[4]), \
ntohs((addr).s6_addr16[5]), \
ntohs((addr).s6_addr16[6]), \
ntohs((addr).s6_addr16[7])
# define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
#endif
#if !defined(NIPQUAD) && !defined(NIPQUAD_FMT)
# define NIPQUAD(addr) \
((const unsigned char *)&addr)[0], \
((const unsigned char *)&addr)[1], \
((const unsigned char *)&addr)[2], \
((const unsigned char *)&addr)[3]
# define NIPQUAD_FMT "%u.%u.%u.%u"
#endif
#define ip_route_me_harder xtnu_ip_route_me_harder
#define skb_make_writable xtnu_skb_make_writable
#define xt_target xtnu_target
#define xt_register_target xtnu_register_target
#define xt_unregister_target xtnu_unregister_target
#define xt_register_targets xtnu_register_targets
#define xt_unregister_targets xtnu_unregister_targets
#define xt_request_find_match xtnu_request_find_match
#endif /* _XTABLES_COMPAT_H */
--- NEW FILE compat_xtnu.h ---
#ifndef _COMPAT_XTNU_H
#define _COMPAT_XTNU_H 1
#include <linux/list.h>
#include <linux/netfilter/x_tables.h>
#include <linux/spinlock.h>
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
typedef _Bool bool;
enum { false = 0, true = 1, };
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
typedef __u16 __bitwise __sum16;
typedef __u32 __bitwise __wsum;
#endif
struct flowi;
struct hh_cache;
struct module;
struct net_device;
struct rtable;
struct sk_buff;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
enum {
NFPROTO_UNSPEC = 0,
NFPROTO_IPV4 = 2,
NFPROTO_ARP = 3,
NFPROTO_BRIDGE = 7,
NFPROTO_IPV6 = 10,
NFPROTO_DECNET = 12,
NFPROTO_NUMPROTO,
};
struct xt_mtchk_param {
const char *table;
const void *entryinfo;
const struct xt_match *match;
void *matchinfo;
unsigned int hook_mask;
u_int8_t family;
};
struct xt_mtdtor_param {
const struct xt_match *match;
void *matchinfo;
u_int8_t family;
};
struct xt_target_param {
const struct net_device *in, *out;
unsigned int hooknum;
const struct xt_target *target;
const void *targinfo;
u_int8_t family;
};
struct xt_tgchk_param {
const char *table;
const void *entryinfo;
const struct xt_target *target;
void *targinfo;
unsigned int hook_mask;
u_int8_t family;
};
struct xt_tgdtor_param {
const struct xt_target *target;
void *targinfo;
u_int8_t family;
};
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
struct xt_action_param {
union {
const struct xt_match *match;
const struct xt_target *target;
};
union {
const void *matchinfo, *targinfo;
};
const struct net_device *in, *out;
int fragoff;
unsigned int thoff, hooknum;
u_int8_t family;
bool hotdrop;
};
#endif
struct xtnu_match {
/*
* Making it smaller by sizeof(void *) on purpose to catch
* lossy translation, if any.
*/
char name[sizeof(((struct xt_match *)NULL)->name) - 1 - sizeof(void *)];
uint8_t revision;
bool (*match)(const struct sk_buff *, struct xt_action_param *);
int (*checkentry)(const struct xt_mtchk_param *);
void (*destroy)(const struct xt_mtdtor_param *);
struct module *me;
const char *table;
unsigned int matchsize, hooks;
unsigned short proto, family;
void *__compat_match;
};
struct xtnu_target {
char name[sizeof(((struct xt_target *)NULL)->name) - 1 - sizeof(void *)];
uint8_t revision;
unsigned int (*target)(struct sk_buff **,
const struct xt_action_param *);
int (*checkentry)(const struct xt_tgchk_param *);
void (*destroy)(const struct xt_tgdtor_param *);
struct module *me;
const char *table;
unsigned int targetsize, hooks;
unsigned short proto, family;
void *__compat_target;
};
static inline struct xtnu_match *xtcompat_numatch(const struct xt_match *m)
{
void *q;
memcpy(&q, m->name + sizeof(m->name) - sizeof(void *), sizeof(void *));
return q;
}
static inline struct xtnu_target *xtcompat_nutarget(const struct xt_target *t)
{
void *q;
memcpy(&q, t->name + sizeof(t->name) - sizeof(void *), sizeof(void *));
return q;
}
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19)
static inline __wsum csum_unfold(__sum16 n)
{
return (__force __wsum)n;
}
#endif
extern int xtnu_ip_local_out(struct sk_buff *);
extern int xtnu_ip_route_me_harder(struct sk_buff **, unsigned int);
extern int xtnu_skb_make_writable(struct sk_buff **, unsigned int);
extern int xtnu_register_match(struct xtnu_match *);
extern int xtnu_ip_route_output_key(void *, struct rtable **, struct flowi *);
extern void xtnu_unregister_match(struct xtnu_match *);
extern int xtnu_register_matches(struct xtnu_match *, unsigned int);
extern void xtnu_unregister_matches(struct xtnu_match *, unsigned int);
extern int xtnu_register_target(struct xtnu_target *);
extern void xtnu_unregister_target(struct xtnu_target *);
extern int xtnu_register_targets(struct xtnu_target *, unsigned int);
extern void xtnu_unregister_targets(struct xtnu_target *, unsigned int);
extern struct xt_match *xtnu_request_find_match(unsigned int,
const char *, uint8_t);
extern int xtnu_neigh_hh_output(struct hh_cache *, struct sk_buff *);
extern void xtnu_csum_replace2(__u16 __bitwise *, __be16, __be16);
extern void xtnu_csum_replace4(__u16 __bitwise *, __be32, __be32);
extern void xtnu_proto_csum_replace4(__u16 __bitwise *, struct sk_buff *,
__be32, __be32, bool);
extern int xtnu_skb_linearize(struct sk_buff *);
extern void *HX_memmem(const void *, size_t, const void *, size_t);
#endif /* _COMPAT_XTNU_H */
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/devel/west-chamber-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- west-chamber-kmod.spec 15 Apr 2010 06:55:23 -0000 1.2
+++ west-chamber-kmod.spec 5 Aug 2010 05:33:55 -0000 1.3
@@ -3,8 +3,8 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
-#define buildforkernels current
+#define buildforkernels newest
+%define buildforkernels current
#define buildforkernels akmods
%define svndate 20100405
@@ -13,7 +13,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 4.%{?svndate}svn%{?dist}
+Release: 5.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -23,14 +23,16 @@
# svn export -r %{svnver} http://scholarzhang.googlecode.com/svn/trunk/west-chamber west-chamber-%{svndate}
# tar -cjvf west-chamber-%{svndate}.tar.bz2 west-chamber-%{svndate}
Source0: west-chamber-%{svndate}.tar.bz2
-Source11: west-chamber-kmodtool-excludekernel-filterfile
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Header files extracted from xtables-addons 1.28
+Source1: compat_xtables.h
+Source2: compat_skbuff.h
+Source3: compat_xtnu.h
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
West-chamber is extensions named after the famous Chinese ancient friction -
@@ -43,14 +45,21 @@
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
-kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
-#do not build bundled xtables-addons modules
+
pushd west-chamber-%{svndate}
+# do not build bundled xtables-addons modules
sed -i '/compat_xtables.o/d' extensions/Kbuild
sed -i '/build_ipset/d' extensions/Kbuild
+
+# remove bundled files from xtables-addons
+rm -rf extensions/{compat*}
+
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} extensions/
popd
+
for kernel_version in %{?kernel_versions} ; do
cp -a west-chamber-%{svndate} _kmod_build_${kernel_version%%___*}
done
@@ -59,14 +68,12 @@
%build
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
- make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
+ make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
done
%install
-rm -rf %{buildroot}
for kernel_version in %{?kernel_versions} ; do
- find _kmod_build_${kernel_version%%___*}/extensions -name "*.ko" -exec mv {} _kmod_build_${kernel_version%%___*}/extensions ";"
install -dm 755 %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
install -pm 755 _kmod_build_${kernel_version%%___*}/extensions/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
done
@@ -78,7 +85,35 @@
%changelog
-* Thu Apr 15 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-4.20100405svn-- Changed 'buildforkernels' to current.
+* Thu Aug 05 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-5.20100405svn
+- Renew header files to work with xtables-addons >= 1.27
+
+* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.8
+- rebuild for new kernel
+
+* Fri May 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.7
+- rebuild for new kernel
+
+* Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.6
+- rebuild for new kernel
+
+* Mon May 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.5
+- rebuild for new kernel
+
+* Fri May 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.4
+- rebuild for new kernel
+
+* Tue May 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.3
+- rebuild for new kernel
+
+* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.2
+- rebuild for new kernel
+
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-4.20100405svn.1
+- rebuild for new kernel
+
+* Thu Apr 15 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-4.20100405svn
+- Changed 'buildforkernels' to current.
* Mon Apr 05 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-3.20100405svn
- svn 84
--- .cvsignore DELETED ---
--- west-chamber-kmodtool-excludekernel-filterfile DELETED ---
14 years, 3 months
rpms/psb-kmod/F-13 0001-psb-Declare-firmware.patch, NONE, 1.1 0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch, NONE, 1.1 0003-psb-Fix-framebuffer.patch, NONE, 1.1 psb-kmod.spec, 1.3, 1.4
by Adam Williamson
Author: adamwill
Update of /cvs/nonfree/rpms/psb-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17826
Modified Files:
psb-kmod.spec
Added Files:
0001-psb-Declare-firmware.patch
0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch
0003-psb-Fix-framebuffer.patch
Log Message:
* Wed Aug 04 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-13
- add three patches from Matthew Garrett:
+ Declare-firmware.patch (declare module firmware)
+ If-not-asking-for-debug...patch (clean up debug error)
+ Fix-framebuffer.patch (fix framebuffer)
0001-psb-Declare-firmware.patch:
psb_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE 0001-psb-Declare-firmware.patch ---
>From 0149839482b34dc7fe399c0cc7ee4747279b5eab Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg(a)redhat.com>
Date: Mon, 2 Aug 2010 11:16:29 -0400
Subject: [PATCH 1/3] psb: Declare firmware
---
psb_drv.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/psb_drv.c b/psb_drv.c
index 2a2e8d4..618dfcd 100644
--- a/psb_drv.c
+++ b/psb_drv.c
@@ -55,6 +55,8 @@ int psb_init_yres;
extern int SII_1392;
#endif
+MODULE_FIRMWARE("msvdx_fw.bin");
+
MODULE_PARM_DESC(debug, "Enable debug output");
MODULE_PARM_DESC(clock_gating, "clock gating");
MODULE_PARM_DESC(no_fb, "Disable FBdev");
--
1.7.2
0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch:
psb_drv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE 0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch ---
>From 7051c003142ed6340b14783d7e4dc6386ccfebe8 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg(a)redhat.com>
Date: Mon, 2 Aug 2010 11:41:54 -0400
Subject: [PATCH 2/3] psb: If not asking for debug is an error, I want to be right
---
psb_drv.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/psb_drv.c b/psb_drv.c
index 618dfcd..76b4a01 100644
--- a/psb_drv.c
+++ b/psb_drv.c
@@ -265,7 +265,8 @@ static int psb_do_init(struct drm_device *dev)
int ret = -ENOMEM;
- DRM_ERROR("Debug is 0x%08x\n", drm_psb_debug);
+ if (drm_psb_debug)
+ DRM_ERROR("Debug is 0x%08x\n", drm_psb_debug);
dev_priv->ta_mem_pages =
PSB_ALIGN_TO(drm_psb_ta_mem_size * 1024, PAGE_SIZE) >> PAGE_SHIFT;
--
1.7.2
0003-psb-Fix-framebuffer.patch:
psb_fb.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
--- NEW FILE 0003-psb-Fix-framebuffer.patch ---
>From 302d40a1664d1d1dbf8a3b0408736f091c397030 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg(a)redhat.com>
Date: Mon, 2 Aug 2010 13:03:21 -0400
Subject: [PATCH 3/3] psb: Fix framebuffer
---
psb_fb.c | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/psb_fb.c b/psb_fb.c
index 72d1d14..2f10b90 100644
--- a/psb_fb.c
+++ b/psb_fb.c
@@ -420,8 +420,22 @@ static int psbfb_set_par(struct fb_info *info)
fb->depth = depth;
info->fix.line_length = fb->pitch;
- info->fix.visual =
- (fb->depth == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
+
+ switch (fb->depth) {
+ case 8:
+ info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+ break;
+ case 15:
+ case 16:
+ info->fix.visual = FB_VISUAL_DIRECTCOLOR;
+ break;
+ case 24:
+ case 32:
+ info->fix.visual = FB_VISUAL_TRUECOLOR;
+ break;
+ default:
+ BUG();
+ }
/* some fbdev's apps don't want these to change */
info->fix.smem_start = dev->mode_config.fb_base + fb->offset;
@@ -990,8 +1004,13 @@ void psbfb_resume(struct drm_device *dev)
* Also, these should be the default vm ops for buffer object type fbs.
*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+extern int drm_bo_vm_nopfn(struct vm_area_struct *vma,
+ struct vm_fault *vmf );
+#else
extern unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma,
unsigned long address);
+#endif
/*
* This wrapper is a bit ugly and is here because we need access to a mutex
@@ -1001,6 +1020,7 @@ extern unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma,
* recursive locking.
*/
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
static unsigned long psbfb_nopfn(struct vm_area_struct *vma,
unsigned long address)
{
@@ -1015,7 +1035,7 @@ static unsigned long psbfb_nopfn(struct vm_area_struct *vma,
mutex_unlock(&vi->vm_mutex);
return ret;
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+#else
static int psbfb_fault(struct vm_area_struct *vma,
struct vm_fault *vmf)
{
@@ -1023,12 +1043,10 @@ static int psbfb_fault(struct vm_area_struct *vma,
struct vm_area_struct tmp_vma;
unsigned long ret;
- unsigned long address = (unsigned long)vmf->virtual_address;
-
mutex_lock(&vi->vm_mutex);
tmp_vma = *vma;
tmp_vma.vm_private_data = vi->bo;
- ret = drm_bo_vm_nopfn(&tmp_vma, address);
+ ret = drm_bo_vm_nopfn(&tmp_vma, vmf);
mutex_unlock(&vi->vm_mutex);
return ret;
}
--
1.7.2
Index: psb-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/F-13/psb-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- psb-kmod.spec 27 Jul 2010 07:29:54 -0000 1.3
+++ psb-kmod.spec 4 Aug 2010 19:18:35 -0000 1.4
@@ -7,7 +7,7 @@
Name: psb-kmod
Version: 4.41.1
-Release: 12%{?dist}.1
+Release: 13%{?dist}
Summary: Kernel module for Poulsbo graphics chipsets
Group: System Environment/Kernel
@@ -36,6 +36,12 @@
Patch6: psb-kernel-source-4.41.1-2.6.32.patch
# Fix build for 2.6.34 (Eric Piel: https://patchwork.kernel.org/patch/90678/ )
Patch7: psb-kmod-4.41.1-2.6.34.patch
+# From Matthew Garrett: declare module firmware
+Patch8: 0001-psb-Declare-firmware.patch
+# From Matthew Garrett: clean up debug error
+Patch9: 0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch
+# From Matthew Garrett: fix framebuffer
+Patch10: 0003-psb-Fix-framebuffer.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i586 i686
@@ -74,6 +80,9 @@
fi
%patch4 -p1 -b .drmpsb
%patch7 -p0 -b .build2634
+%patch8 -p1 -b .firmware
+%patch9 -p1 -b .debug
+%patch10 -p1 -b .framebuffer
popd
done
@@ -104,6 +113,12 @@
%changelog
+* Wed Aug 04 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-13
+- add three patches from Matthew Garrett:
+ + Declare-firmware.patch (declare module firmware)
+ + If-not-asking-for-debug...patch (clean up debug error)
+ + Fix-framebuffer.patch (fix framebuffer)
+
* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-12.1
- rebuild for new kernel
14 years, 3 months
rpms/sdlmame-data/F-12 .cvsignore, 1.17, 1.18 sdlmame-data.spec, 1.22, 1.23 sources, 1.17, 1.18
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31068
Modified Files:
.cvsignore sdlmame-data.spec sources
Log Message:
* Wed Aug 04 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0139-1
- Updated to 0.139
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 29 May 2010 08:55:08 -0000 1.17
+++ .cvsignore 4 Aug 2010 06:20:52 -0000 1.18
@@ -1,6 +1,6 @@
ctrlr.rar
catveren.zip
-cheat0137.7z
-mamehistory138.7z
-Mameinfo0138.zip
-nplayers0138.zip
+cheat0139.7z
+mamehistory139.7z
+Mameinfo0139.zip
+nplayers0139.zip
Index: sdlmame-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-12/sdlmame-data.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sdlmame-data.spec 29 May 2010 08:55:08 -0000 1.22
+++ sdlmame-data.spec 4 Aug 2010 06:20:52 -0000 1.23
@@ -1,4 +1,4 @@
-%define vernumber 138
+%define vernumber 139
Name: sdlmame-data
Version: 0%{vernumber}
@@ -13,7 +13,7 @@
Source3: http://www.kutek.net/mame_roms_pinball/mame32_config_files/ctrlr.rar
Source4: http://www.progettoemma.net/public/cat/catveren.zip
Source5: http://nplayers.arcadebelgium.be/files/nplayers%{version}.zip
-Source6: http://cheat.retrogames.com/download/cheat0137.7z
+Source6: http://cheat.retrogames.com/download/cheat%{version}.7z
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -42,13 +42,13 @@
# fix permissions and line endings
chmod 0644 mameinfo/*.txt
chmod 0755 mameinfo
-sed -i 's/\r//' cheat.txt readhist.txt mameinfo/* nplayers/nplayers.txt
+sed -i 's/\r//' cheat.txt readhist.txt readme.txt mameinfo/* nplayers/nplayers.txt
#fix encoding
for i in readhist.txt mameinfo/*.txt
do
/usr/bin/iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i;
-done
+done
%build
@@ -70,11 +70,14 @@
%files
%defattr(-,root,root,-)
-%doc nplayers/nplayers.txt mameinfo cheat.txt readhist.txt
+%doc nplayers/nplayers.txt mameinfo cheat.txt readhist.txt readme.txt
%{_datadir}/mame
%changelog
+* Wed Aug 04 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0139-1
+- Updated to 0.139
+
* Sat May 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0138-1
- Updated to 0.138 (except cheats)
- Fixed Source2 and Source6 Source URLs
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 29 May 2010 08:55:08 -0000 1.17
+++ sources 4 Aug 2010 06:20:52 -0000 1.18
@@ -1,6 +1,6 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-7bf2a577416889ea2c0073cf5d1fc53f catveren.zip
-19579deaac171d6e50559afcdb72b5ce cheat0137.7z
-9c85a098b9b61e57b105ab37b86568f9 mamehistory138.7z
-251b1a88681765b811b0a00c83fbfad5 Mameinfo0138.zip
-8a2c7c4f17dcc3028a273546a9cbbaf0 nplayers0138.zip
+8b50a3babddfc5bc7330688614eb8f6a catveren.zip
+70c964beeb3d6db8a349a308eb86e7a7 cheat0139.7z
+10b17877e2ea65e2e63184818bd9183c mamehistory139.7z
+5b44bd74fe9694ef8a0cc0d190f0d804 Mameinfo0139.zip
+73ec9f74b13beea09b7319a935dc2142 nplayers0139.zip
14 years, 3 months
rpms/sdlmame-data/F-13 .cvsignore, 1.16, 1.17 sdlmame-data.spec, 1.20, 1.21 sources, 1.16, 1.17
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30960
Modified Files:
.cvsignore sdlmame-data.spec sources
Log Message:
* Wed Aug 04 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0139-1
- Updated to 0.139
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-13/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 29 May 2010 08:55:00 -0000 1.16
+++ .cvsignore 4 Aug 2010 06:20:45 -0000 1.17
@@ -1,6 +1,6 @@
ctrlr.rar
catveren.zip
-cheat0137.7z
-mamehistory138.7z
-Mameinfo0138.zip
-nplayers0138.zip
+cheat0139.7z
+mamehistory139.7z
+Mameinfo0139.zip
+nplayers0139.zip
Index: sdlmame-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-13/sdlmame-data.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sdlmame-data.spec 29 May 2010 08:55:00 -0000 1.20
+++ sdlmame-data.spec 4 Aug 2010 06:20:45 -0000 1.21
@@ -1,4 +1,4 @@
-%define vernumber 138
+%define vernumber 139
Name: sdlmame-data
Version: 0%{vernumber}
@@ -13,7 +13,7 @@
Source3: http://www.kutek.net/mame_roms_pinball/mame32_config_files/ctrlr.rar
Source4: http://www.progettoemma.net/public/cat/catveren.zip
Source5: http://nplayers.arcadebelgium.be/files/nplayers%{version}.zip
-Source6: http://cheat.retrogames.com/download/cheat0137.7z
+Source6: http://cheat.retrogames.com/download/cheat%{version}.7z
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -42,13 +42,13 @@
# fix permissions and line endings
chmod 0644 mameinfo/*.txt
chmod 0755 mameinfo
-sed -i 's/\r//' cheat.txt readhist.txt mameinfo/* nplayers/nplayers.txt
+sed -i 's/\r//' cheat.txt readhist.txt readme.txt mameinfo/* nplayers/nplayers.txt
#fix encoding
for i in readhist.txt mameinfo/*.txt
do
/usr/bin/iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i;
-done
+done
%build
@@ -70,11 +70,14 @@
%files
%defattr(-,root,root,-)
-%doc nplayers/nplayers.txt mameinfo cheat.txt readhist.txt
+%doc nplayers/nplayers.txt mameinfo cheat.txt readhist.txt readme.txt
%{_datadir}/mame
%changelog
+* Wed Aug 04 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0139-1
+- Updated to 0.139
+
* Sat May 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0138-1
- Updated to 0.138 (except cheats)
- Fixed Source2 and Source6 Source URLs
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-13/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 29 May 2010 08:55:00 -0000 1.16
+++ sources 4 Aug 2010 06:20:45 -0000 1.17
@@ -1,6 +1,6 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-7bf2a577416889ea2c0073cf5d1fc53f catveren.zip
-19579deaac171d6e50559afcdb72b5ce cheat0137.7z
-9c85a098b9b61e57b105ab37b86568f9 mamehistory138.7z
-251b1a88681765b811b0a00c83fbfad5 Mameinfo0138.zip
-8a2c7c4f17dcc3028a273546a9cbbaf0 nplayers0138.zip
+8b50a3babddfc5bc7330688614eb8f6a catveren.zip
+70c964beeb3d6db8a349a308eb86e7a7 cheat0139.7z
+10b17877e2ea65e2e63184818bd9183c mamehistory139.7z
+5b44bd74fe9694ef8a0cc0d190f0d804 Mameinfo0139.zip
+73ec9f74b13beea09b7319a935dc2142 nplayers0139.zip
14 years, 3 months
rpms/sdlmame-data/devel .cvsignore, 1.17, 1.18 sdlmame-data.spec, 1.21, 1.22 sources, 1.17, 1.18
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30854
Modified Files:
.cvsignore sdlmame-data.spec sources
Log Message:
* Wed Aug 04 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0139-1
- Updated to 0.139
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 29 May 2010 08:54:52 -0000 1.17
+++ .cvsignore 4 Aug 2010 06:20:36 -0000 1.18
@@ -1,6 +1,6 @@
ctrlr.rar
catveren.zip
-cheat0137.7z
-mamehistory138.7z
-Mameinfo0138.zip
-nplayers0138.zip
+cheat0139.7z
+mamehistory139.7z
+Mameinfo0139.zip
+nplayers0139.zip
Index: sdlmame-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/devel/sdlmame-data.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sdlmame-data.spec 29 May 2010 08:54:52 -0000 1.21
+++ sdlmame-data.spec 4 Aug 2010 06:20:36 -0000 1.22
@@ -1,4 +1,4 @@
-%define vernumber 138
+%define vernumber 139
Name: sdlmame-data
Version: 0%{vernumber}
@@ -13,7 +13,7 @@
Source3: http://www.kutek.net/mame_roms_pinball/mame32_config_files/ctrlr.rar
Source4: http://www.progettoemma.net/public/cat/catveren.zip
Source5: http://nplayers.arcadebelgium.be/files/nplayers%{version}.zip
-Source6: http://cheat.retrogames.com/download/cheat0137.7z
+Source6: http://cheat.retrogames.com/download/cheat%{version}.7z
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -42,13 +42,13 @@
# fix permissions and line endings
chmod 0644 mameinfo/*.txt
chmod 0755 mameinfo
-sed -i 's/\r//' cheat.txt readhist.txt mameinfo/* nplayers/nplayers.txt
+sed -i 's/\r//' cheat.txt readhist.txt readme.txt mameinfo/* nplayers/nplayers.txt
#fix encoding
for i in readhist.txt mameinfo/*.txt
do
/usr/bin/iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i;
-done
+done
%build
@@ -70,11 +70,14 @@
%files
%defattr(-,root,root,-)
-%doc nplayers/nplayers.txt mameinfo cheat.txt readhist.txt
+%doc nplayers/nplayers.txt mameinfo cheat.txt readhist.txt readme.txt
%{_datadir}/mame
%changelog
+* Wed Aug 04 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0139-1
+- Updated to 0.139
+
* Sat May 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0138-1
- Updated to 0.138 (except cheats)
- Fixed Source2 and Source6 Source URLs
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 29 May 2010 08:54:52 -0000 1.17
+++ sources 4 Aug 2010 06:20:36 -0000 1.18
@@ -1,6 +1,6 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-7bf2a577416889ea2c0073cf5d1fc53f catveren.zip
-19579deaac171d6e50559afcdb72b5ce cheat0137.7z
-9c85a098b9b61e57b105ab37b86568f9 mamehistory138.7z
-251b1a88681765b811b0a00c83fbfad5 Mameinfo0138.zip
-8a2c7c4f17dcc3028a273546a9cbbaf0 nplayers0138.zip
+8b50a3babddfc5bc7330688614eb8f6a catveren.zip
+70c964beeb3d6db8a349a308eb86e7a7 cheat0139.7z
+10b17877e2ea65e2e63184818bd9183c mamehistory139.7z
+5b44bd74fe9694ef8a0cc0d190f0d804 Mameinfo0139.zip
+73ec9f74b13beea09b7319a935dc2142 nplayers0139.zip
14 years, 3 months