rpms/em8300-kmod/F-14 em8300-kmod.spec,1.47,1.48
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/em8300-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18490
Modified Files:
em8300-kmod.spec
Log Message:
* Fri Oct 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.18.0-1.1
- rebuild for F-14 kernel
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-14/em8300-kmod.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- em8300-kmod.spec 14 Feb 2010 08:48:25 -0000 1.47
+++ em8300-kmod.spec 29 Oct 2010 18:44:13 -0000 1.48
@@ -10,7 +10,7 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
Version: 0.18.0
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Group: System Environment/Kernel
License: GPLv2+
@@ -63,6 +63,9 @@
%changelog
+* Fri Oct 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.18.0-1.1
+- rebuild for F-14 kernel
+
* Sun Feb 14 2010 Felix Kaechele <heffer(a)fedoraproject.org> - 0.18.0-1
- update to 0.18.0
13 years, 6 months
rpms/buildsys-build-rpmfusion/F-14 buildsys-build-rpmfusion.spec, 1.28, 1.29
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15775
Modified Files:
buildsys-build-rpmfusion.spec
Log Message:
adjust version for F14
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-14/buildsys-build-rpmfusion.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- buildsys-build-rpmfusion.spec 29 Oct 2010 18:04:07 -0000 1.28
+++ buildsys-build-rpmfusion.spec 29 Oct 2010 18:05:11 -0000 1.29
@@ -2,8 +2,8 @@
Name: buildsys-build-%{repo}
Epoch: 10
-Version: 13
-Release: 0.2
+Version: 14
+Release: 1
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,7 +86,7 @@
%changelog
-* Fri Oct 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:13-0.2
+* Fri Oct 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:14-1
- rebuild for kernel 2.6.35.6-45.fc14
* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:13-0.1
13 years, 6 months
rpms/buildsys-build-rpmfusion/F-14 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.19, 1.20 buildsys-build-rpmfusion.spec, 1.27, 1.28
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15569
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Fri Oct 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:13-0.2
- rebuild for kernel 2.6.35.6-45.fc14
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-14/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- buildsys-build-rpmfusion-kerneldevpkgs-current 14 Jun 2009 11:13:04 -0000 1.19
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 29 Oct 2010 18:04:07 -0000 1.20
@@ -1 +1,3 @@
-default
+2.6.35.6-45.fc14
+2.6.35.6-45.fc14smp
+2.6.35.6-45.fc14PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-14/buildsys-build-rpmfusion.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- buildsys-build-rpmfusion.spec 22 Nov 2009 12:25:44 -0000 1.27
+++ buildsys-build-rpmfusion.spec 29 Oct 2010 18:04:07 -0000 1.28
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 13
-Release: 0.1
+Release: 0.2
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Fri Oct 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:13-0.2
+- rebuild for kernel 2.6.35.6-45.fc14
+
* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:13-0.1
- no i586 in devel anymore, so adjust ExclusiveArch and
buildsys-build-rpmfusion-list-kernels.sh
13 years, 6 months
rpms/mpd/devel .cvsignore, 1.11, 1.12 mpd.spec, 1.18, 1.19 sources, 1.11, 1.12
by Adrian Reber
Author: adrian
Update of /cvs/free/rpms/mpd/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3089
Modified Files:
.cvsignore mpd.spec sources
Log Message:
* Thu Oct 28 2010 Adrian Reber <adrian(a)lisas.de> - 0.15.13-1
- updated to 0.15.13
- added mpd user to audio group (#1461)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 29 Sep 2010 13:29:31 -0000 1.11
+++ .cvsignore 28 Oct 2010 12:35:46 -0000 1.12
@@ -1 +1 @@
-mpd-0.15.12.tar.bz2
+mpd-0.15.13.tar.bz2
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mpd.spec 29 Sep 2010 13:29:31 -0000 1.18
+++ mpd.spec 28 Oct 2010 12:35:46 -0000 1.19
@@ -1,13 +1,13 @@
%define _default_patch_fuzz 2
Name: mpd
-Version: 0.15.12
+Version: 0.15.13
Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
-Source: http://downloads.sourceforge.net/musicpd/mpd-0.15.12.tar.bz2
+Source: http://downloads.sourceforge.net/musicpd/mpd-0.15.13.tar.bz2
Source1: mpd.init
Source2: 95-grant-audio-devices-to-mpd.fdi
Patch0: mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
@@ -115,6 +115,7 @@
-c "Music Player Daemon" mpd
# fix for pulseaudio playback (#230)
usermod -aG pulse-rt mpd
+usermod -aG audio mpd
exit 0
@@ -162,6 +163,10 @@
%ghost %{_localstatedir}/lib/%{name}/mpdstate
%changelog
+* Thu Oct 28 2010 Adrian Reber <adrian(a)lisas.de> - 0.15.13-1
+- updated to 0.15.13
+- added mpd user to audio group (#1461)
+
* Wed Sep 29 2010 Adrian Reber <adrian(a)lisas.de> - 0.15.12-1
- updated to 0.15.12
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 29 Sep 2010 13:29:31 -0000 1.11
+++ sources 28 Oct 2010 12:35:46 -0000 1.12
@@ -1 +1 @@
-b00b289a20ecd9accfd4972d6395135c mpd-0.15.12.tar.bz2
+d4b6fbc87541a37825c8f25e3ecd5283 mpd-0.15.13.tar.bz2
13 years, 6 months
rpms/west-chamber/F-13 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 west-chamber-manpage.patch, 1.1, 1.2 west-chamber-userspace.patch, 1.1, 1.2 west-chamber.spec, 1.2, 1.3
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9633
Modified Files:
.cvsignore sources west-chamber-manpage.patch
west-chamber-userspace.patch west-chamber.spec
Log Message:
Update to snapshot 20101017
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 15 Apr 2010 12:15:15 -0000 1.4
+++ .cvsignore 28 Oct 2010 07:41:35 -0000 1.5
@@ -1 +1 @@
-west-chamber-20100405.tar.bz2
+west-chamber-20101017.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 15 Apr 2010 12:15:15 -0000 1.4
+++ sources 28 Oct 2010 07:41:35 -0000 1.5
@@ -1 +1 @@
-38d1503a1df5d8b5fa6823e3e0ed4982 west-chamber-20100405.tar.bz2
+fa4543064bbcde2d3b287a3a068b2e57 west-chamber-20101017.tar.bz2
west-chamber-manpage.patch:
xtables-addons.8.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: west-chamber-manpage.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/west-chamber-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-manpage.patch 15 Apr 2010 06:45:28 -0000 1.1
+++ west-chamber-manpage.patch 28 Oct 2010 07:41:35 -0000 1.2
@@ -1,7 +1,7 @@
--- west-chamber-20100329/xtables-addons.8.in 2010-02-17 03:17:37.488265000 +0800
+++ west-chamber-0.0.1/xtables-addons.8.in 2010-03-29 13:55:48.376922724 +0800
@@ -1,6 +1,6 @@
--.TH xtables-addons 8 "v1.22 (2010-01-22)" "" "v1.22 (2010-11-22)"
+-.TH xtables-addons 8 "v1.30 (2010-10-02)" "" "v1.30 (2010-10-02)"
+.TH west-chamber 8 "v0.0.1 (2010-03-10)" "" "v0.0.1 (2010-03-10)"
.SH Name
-Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
west-chamber-userspace.patch:
Makefile.am | 1 -
configure.ac | 46 ----------------------------------------------
extensions/Makefile.am | 22 ----------------------
3 files changed, 69 deletions(-)
Index: west-chamber-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/west-chamber-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-userspace.patch 15 Apr 2010 06:45:28 -0000 1.1
+++ west-chamber-userspace.patch 28 Oct 2010 07:41:35 -0000 1.2
@@ -1,6 +1,7 @@
---- west-chamber-0.0.1/configure.ac.org 2010-03-10 17:29:33.000000000 +0800
-+++ west-chamber-0.0.1/configure.ac 2010-03-25 17:26:14.318739496 +0800
-@@ -9,19 +9,6 @@
+diff -Naur xtables-addons-1.30.orig/configure.ac xtables-addons-1.30/configure.ac
+--- xtables-addons-1.30.orig/configure.ac 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/configure.ac 2010-10-27 17:54:14.962186249 +0800
+@@ -9,18 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -16,21 +17,12 @@
- kbuilddir="";
-fi
-
--AC_ARG_WITH([ksource],,[ksourcedir="$withval"])
- AC_ARG_WITH([xtables],
- AS_HELP_STRING([--with-xtables=PATH],
- [Path to the Xtables includes [[none]]]),
-@@ -64,52 +51,9 @@
- -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
- -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
- -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\"";
--kinclude_CFLAGS="";
--if [[ -n "$kbuilddir" ]]; then
-- kinclude_CFLAGS="$kinclude_CFLAGS -I $kbuilddir/include";
--fi;
--if [[ -n "$ksourcedir" ]]; then
-- kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
--fi;
+ AC_ARG_WITH([xtlibdir],
+ AS_HELP_STRING([--with-xtlibdir=PATH],
+ [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
+@@ -37,42 +25,8 @@
+ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+ -I\${XA_TOPSRCDIR}/include";
-#
-# check kernel version
@@ -57,7 +49,7 @@
- fi;
-fi;
-echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 32; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then
- echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
-elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \
- \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
@@ -67,25 +59,14 @@
-fi;
AC_SUBST([regular_CFLAGS])
--AC_SUBST([kinclude_CFLAGS])
-AC_SUBST([kbuilddir])
--AC_SUBST([ksourcedir])
AC_SUBST([xtlibdir])
- AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
+ AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
extensions/Makefile extensions/ipset/Makefile])
---- _kmod_build_2.6.32.9-70.fc12.i686/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/Makefile.am 2010-03-18 15:42:33.261210915 +0800
-@@ -12,7 +12,6 @@
- ${MAKE} -f Makefile.mans all;
-
- install-exec-hook:
-- depmod -a || :;
-
- config.status: Makefile.iptrules.in
-
---- _kmod_build_2.6.32.9-70.fc12.i686/extensions/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/extensions/Makefile.am 2010-03-18 15:39:05.484210946 +0800
-@@ -1,24 +1,5 @@
+diff -Naur xtables-addons-1.30.orig/extensions/Makefile.am xtables-addons-1.30/extensions/Makefile.am
+--- xtables-addons-1.30.orig/extensions/Makefile.am 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/extensions/Makefile.am 2010-10-27 17:54:53.010183177 +0800
+@@ -1,26 +1,4 @@
# -*- Makefile -*-
# AUTOMAKE
@@ -95,6 +76,8 @@
-_kcall = -C ${kbuilddir} M=${abs_srcdir}
-
-modules:
+- @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
+- @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
-
-modules_install:
@@ -108,5 +91,16 @@
-install-exec-local: modules_install
-
-clean-local: clean_modules
-
+-
include ../Makefile.extra
+diff -Naur xtables-addons-1.30.orig/Makefile.am xtables-addons-1.30/Makefile.am
+--- xtables-addons-1.30.orig/Makefile.am 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/Makefile.am 2010-10-27 17:55:29.350434539 +0800
+@@ -12,7 +12,6 @@
+ ${MAKE} -f Makefile.mans all;
+
+ install-exec-hook:
+- depmod -a || :;
+
+ config.status: Makefile.iptrules.in
+
Index: west-chamber.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/west-chamber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- west-chamber.spec 15 Apr 2010 06:45:28 -0000 1.2
+++ west-chamber.spec 28 Oct 2010 07:41:35 -0000 1.3
@@ -1,11 +1,10 @@
-%define svndate 20100405
-%define svnver 84
-
+%define svndate 20101017
+%define svnver 105
Name: west-chamber
Summary: Extensions named after Romance of the West Chamber for iptables
Version: 0.0.1
-Release: 3.%{?svndate}svn%{?dist}
+Release: 6.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://code.google.com/p/scholarzhang/
@@ -14,13 +13,12 @@
# following commands to generate the tarball:
# 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: http://scholarzhang.googlecode.com/files/%{name}-%{svndate}.tar.bz2
+Source0: %{name}-%{svndate}.tar.bz2
Patch0: %{name}-userspace.patch
Patch1: %{name}-manpage.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: iptables-devel
BuildRequires: autoconf automake libtool
-Requires: xtables-addons
+Requires: xtables-addons >= 1.30
Provides: %{name}-kmod-common = %{version}
Requires: %{name}-kmod >= %{version}
@@ -36,6 +34,10 @@
%setup -q -n west-chamber-%{svndate}
%patch0 -p1
%patch1 -p1
+
+# remove bundled files from xtables-addons
+rm -rf include extensions/compat*
+
#do not build bundled xtables-addons modules
sed -i '/build_ipset=m/d' mconfig
@@ -46,7 +48,6 @@
%install
-rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
mv %{buildroot}%{_mandir}/man8/xtables-addons.8 %{buildroot}%{_mandir}/man8/%{name}.8
@@ -60,6 +61,9 @@
%{_mandir}/man8/*
%changelog
+* Thu Oct 28 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-6.20101017svn
+- svn 105
+
* Mon Apr 05 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-3.20100405svn
- svn 84
13 years, 6 months
rpms/west-chamber/F-14 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 west-chamber-manpage.patch, 1.1, 1.2 west-chamber-userspace.patch, 1.1, 1.2 west-chamber.spec, 1.2, 1.3
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8981
Modified Files:
.cvsignore sources west-chamber-manpage.patch
west-chamber-userspace.patch west-chamber.spec
Log Message:
Update to snapshot 20101017
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-14/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 15 Apr 2010 12:17:36 -0000 1.4
+++ .cvsignore 28 Oct 2010 07:36:06 -0000 1.5
@@ -1 +1 @@
-west-chamber-20100405.tar.bz2
+west-chamber-20101017.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-14/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 15 Apr 2010 12:17:36 -0000 1.4
+++ sources 28 Oct 2010 07:36:06 -0000 1.5
@@ -1 +1 @@
-38d1503a1df5d8b5fa6823e3e0ed4982 west-chamber-20100405.tar.bz2
+fa4543064bbcde2d3b287a3a068b2e57 west-chamber-20101017.tar.bz2
west-chamber-manpage.patch:
xtables-addons.8.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: west-chamber-manpage.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-14/west-chamber-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-manpage.patch 15 Apr 2010 06:45:29 -0000 1.1
+++ west-chamber-manpage.patch 28 Oct 2010 07:36:06 -0000 1.2
@@ -1,7 +1,7 @@
--- west-chamber-20100329/xtables-addons.8.in 2010-02-17 03:17:37.488265000 +0800
+++ west-chamber-0.0.1/xtables-addons.8.in 2010-03-29 13:55:48.376922724 +0800
@@ -1,6 +1,6 @@
--.TH xtables-addons 8 "v1.22 (2010-01-22)" "" "v1.22 (2010-11-22)"
+-.TH xtables-addons 8 "v1.30 (2010-10-02)" "" "v1.30 (2010-10-02)"
+.TH west-chamber 8 "v0.0.1 (2010-03-10)" "" "v0.0.1 (2010-03-10)"
.SH Name
-Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
west-chamber-userspace.patch:
Makefile.am | 1 -
configure.ac | 46 ----------------------------------------------
extensions/Makefile.am | 22 ----------------------
3 files changed, 69 deletions(-)
Index: west-chamber-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-14/west-chamber-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-userspace.patch 15 Apr 2010 06:45:29 -0000 1.1
+++ west-chamber-userspace.patch 28 Oct 2010 07:36:06 -0000 1.2
@@ -1,6 +1,7 @@
---- west-chamber-0.0.1/configure.ac.org 2010-03-10 17:29:33.000000000 +0800
-+++ west-chamber-0.0.1/configure.ac 2010-03-25 17:26:14.318739496 +0800
-@@ -9,19 +9,6 @@
+diff -Naur xtables-addons-1.30.orig/configure.ac xtables-addons-1.30/configure.ac
+--- xtables-addons-1.30.orig/configure.ac 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/configure.ac 2010-10-27 17:54:14.962186249 +0800
+@@ -9,18 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -16,21 +17,12 @@
- kbuilddir="";
-fi
-
--AC_ARG_WITH([ksource],,[ksourcedir="$withval"])
- AC_ARG_WITH([xtables],
- AS_HELP_STRING([--with-xtables=PATH],
- [Path to the Xtables includes [[none]]]),
-@@ -64,52 +51,9 @@
- -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
- -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
- -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\"";
--kinclude_CFLAGS="";
--if [[ -n "$kbuilddir" ]]; then
-- kinclude_CFLAGS="$kinclude_CFLAGS -I $kbuilddir/include";
--fi;
--if [[ -n "$ksourcedir" ]]; then
-- kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
--fi;
+ AC_ARG_WITH([xtlibdir],
+ AS_HELP_STRING([--with-xtlibdir=PATH],
+ [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
+@@ -37,42 +25,8 @@
+ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+ -I\${XA_TOPSRCDIR}/include";
-#
-# check kernel version
@@ -57,7 +49,7 @@
- fi;
-fi;
-echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 32; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then
- echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
-elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \
- \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
@@ -67,25 +59,14 @@
-fi;
AC_SUBST([regular_CFLAGS])
--AC_SUBST([kinclude_CFLAGS])
-AC_SUBST([kbuilddir])
--AC_SUBST([ksourcedir])
AC_SUBST([xtlibdir])
- AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
+ AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
extensions/Makefile extensions/ipset/Makefile])
---- _kmod_build_2.6.32.9-70.fc12.i686/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/Makefile.am 2010-03-18 15:42:33.261210915 +0800
-@@ -12,7 +12,6 @@
- ${MAKE} -f Makefile.mans all;
-
- install-exec-hook:
-- depmod -a || :;
-
- config.status: Makefile.iptrules.in
-
---- _kmod_build_2.6.32.9-70.fc12.i686/extensions/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/extensions/Makefile.am 2010-03-18 15:39:05.484210946 +0800
-@@ -1,24 +1,5 @@
+diff -Naur xtables-addons-1.30.orig/extensions/Makefile.am xtables-addons-1.30/extensions/Makefile.am
+--- xtables-addons-1.30.orig/extensions/Makefile.am 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/extensions/Makefile.am 2010-10-27 17:54:53.010183177 +0800
+@@ -1,26 +1,4 @@
# -*- Makefile -*-
# AUTOMAKE
@@ -95,6 +76,8 @@
-_kcall = -C ${kbuilddir} M=${abs_srcdir}
-
-modules:
+- @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
+- @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
-
-modules_install:
@@ -108,5 +91,16 @@
-install-exec-local: modules_install
-
-clean-local: clean_modules
-
+-
include ../Makefile.extra
+diff -Naur xtables-addons-1.30.orig/Makefile.am xtables-addons-1.30/Makefile.am
+--- xtables-addons-1.30.orig/Makefile.am 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/Makefile.am 2010-10-27 17:55:29.350434539 +0800
+@@ -12,7 +12,6 @@
+ ${MAKE} -f Makefile.mans all;
+
+ install-exec-hook:
+- depmod -a || :;
+
+ config.status: Makefile.iptrules.in
+
Index: west-chamber.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-14/west-chamber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- west-chamber.spec 15 Apr 2010 06:45:29 -0000 1.2
+++ west-chamber.spec 28 Oct 2010 07:36:06 -0000 1.3
@@ -1,11 +1,10 @@
-%define svndate 20100405
-%define svnver 84
-
+%define svndate 20101017
+%define svnver 105
Name: west-chamber
Summary: Extensions named after Romance of the West Chamber for iptables
Version: 0.0.1
-Release: 3.%{?svndate}svn%{?dist}
+Release: 6.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://code.google.com/p/scholarzhang/
@@ -14,13 +13,12 @@
# following commands to generate the tarball:
# 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: http://scholarzhang.googlecode.com/files/%{name}-%{svndate}.tar.bz2
+Source0: %{name}-%{svndate}.tar.bz2
Patch0: %{name}-userspace.patch
Patch1: %{name}-manpage.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: iptables-devel
BuildRequires: autoconf automake libtool
-Requires: xtables-addons
+Requires: xtables-addons >= 1.30
Provides: %{name}-kmod-common = %{version}
Requires: %{name}-kmod >= %{version}
@@ -36,6 +34,10 @@
%setup -q -n west-chamber-%{svndate}
%patch0 -p1
%patch1 -p1
+
+# remove bundled files from xtables-addons
+rm -rf include extensions/compat*
+
#do not build bundled xtables-addons modules
sed -i '/build_ipset=m/d' mconfig
@@ -46,7 +48,6 @@
%install
-rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
mv %{buildroot}%{_mandir}/man8/xtables-addons.8 %{buildroot}%{_mandir}/man8/%{name}.8
@@ -60,6 +61,9 @@
%{_mandir}/man8/*
%changelog
+* Thu Oct 28 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-6.20101017svn
+- svn 105
+
* Mon Apr 05 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-3.20100405svn
- svn 84
13 years, 6 months
rpms/west-chamber/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 west-chamber-manpage.patch, 1.1, 1.2 west-chamber-userspace.patch, 1.1, 1.2 west-chamber.spec, 1.2, 1.3
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8403
Modified Files:
.cvsignore sources west-chamber-manpage.patch
west-chamber-userspace.patch west-chamber.spec
Log Message:
Update to snapshot 20101017
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/west-chamber/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 15 Apr 2010 12:17:36 -0000 1.4
+++ .cvsignore 28 Oct 2010 07:32:16 -0000 1.5
@@ -1 +1 @@
-west-chamber-20100405.tar.bz2
+west-chamber-20101017.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/west-chamber/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 15 Apr 2010 12:17:36 -0000 1.4
+++ sources 28 Oct 2010 07:32:16 -0000 1.5
@@ -1 +1 @@
-38d1503a1df5d8b5fa6823e3e0ed4982 west-chamber-20100405.tar.bz2
+fa4543064bbcde2d3b287a3a068b2e57 west-chamber-20101017.tar.bz2
west-chamber-manpage.patch:
xtables-addons.8.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: west-chamber-manpage.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/devel/west-chamber-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-manpage.patch 15 Apr 2010 06:45:29 -0000 1.1
+++ west-chamber-manpage.patch 28 Oct 2010 07:32:16 -0000 1.2
@@ -1,7 +1,7 @@
--- west-chamber-20100329/xtables-addons.8.in 2010-02-17 03:17:37.488265000 +0800
+++ west-chamber-0.0.1/xtables-addons.8.in 2010-03-29 13:55:48.376922724 +0800
@@ -1,6 +1,6 @@
--.TH xtables-addons 8 "v1.22 (2010-01-22)" "" "v1.22 (2010-11-22)"
+-.TH xtables-addons 8 "v1.30 (2010-10-02)" "" "v1.30 (2010-10-02)"
+.TH west-chamber 8 "v0.0.1 (2010-03-10)" "" "v0.0.1 (2010-03-10)"
.SH Name
-Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
west-chamber-userspace.patch:
Makefile.am | 1 -
configure.ac | 46 ----------------------------------------------
extensions/Makefile.am | 22 ----------------------
3 files changed, 69 deletions(-)
Index: west-chamber-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/devel/west-chamber-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-userspace.patch 15 Apr 2010 06:45:29 -0000 1.1
+++ west-chamber-userspace.patch 28 Oct 2010 07:32:16 -0000 1.2
@@ -1,6 +1,7 @@
---- west-chamber-0.0.1/configure.ac.org 2010-03-10 17:29:33.000000000 +0800
-+++ west-chamber-0.0.1/configure.ac 2010-03-25 17:26:14.318739496 +0800
-@@ -9,19 +9,6 @@
+diff -Naur xtables-addons-1.30.orig/configure.ac xtables-addons-1.30/configure.ac
+--- xtables-addons-1.30.orig/configure.ac 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/configure.ac 2010-10-27 17:54:14.962186249 +0800
+@@ -9,18 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -16,21 +17,12 @@
- kbuilddir="";
-fi
-
--AC_ARG_WITH([ksource],,[ksourcedir="$withval"])
- AC_ARG_WITH([xtables],
- AS_HELP_STRING([--with-xtables=PATH],
- [Path to the Xtables includes [[none]]]),
-@@ -64,52 +51,9 @@
- -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
- -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
- -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\"";
--kinclude_CFLAGS="";
--if [[ -n "$kbuilddir" ]]; then
-- kinclude_CFLAGS="$kinclude_CFLAGS -I $kbuilddir/include";
--fi;
--if [[ -n "$ksourcedir" ]]; then
-- kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
--fi;
+ AC_ARG_WITH([xtlibdir],
+ AS_HELP_STRING([--with-xtlibdir=PATH],
+ [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
+@@ -37,42 +25,8 @@
+ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+ -I\${XA_TOPSRCDIR}/include";
-#
-# check kernel version
@@ -57,7 +49,7 @@
- fi;
-fi;
-echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 32; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then
- echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
-elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \
- \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
@@ -67,25 +59,14 @@
-fi;
AC_SUBST([regular_CFLAGS])
--AC_SUBST([kinclude_CFLAGS])
-AC_SUBST([kbuilddir])
--AC_SUBST([ksourcedir])
AC_SUBST([xtlibdir])
- AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
+ AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
extensions/Makefile extensions/ipset/Makefile])
---- _kmod_build_2.6.32.9-70.fc12.i686/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/Makefile.am 2010-03-18 15:42:33.261210915 +0800
-@@ -12,7 +12,6 @@
- ${MAKE} -f Makefile.mans all;
-
- install-exec-hook:
-- depmod -a || :;
-
- config.status: Makefile.iptrules.in
-
---- _kmod_build_2.6.32.9-70.fc12.i686/extensions/Makefile.am 2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/extensions/Makefile.am 2010-03-18 15:39:05.484210946 +0800
-@@ -1,24 +1,5 @@
+diff -Naur xtables-addons-1.30.orig/extensions/Makefile.am xtables-addons-1.30/extensions/Makefile.am
+--- xtables-addons-1.30.orig/extensions/Makefile.am 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/extensions/Makefile.am 2010-10-27 17:54:53.010183177 +0800
+@@ -1,26 +1,4 @@
# -*- Makefile -*-
# AUTOMAKE
@@ -95,6 +76,8 @@
-_kcall = -C ${kbuilddir} M=${abs_srcdir}
-
-modules:
+- @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
+- @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
-
-modules_install:
@@ -108,5 +91,16 @@
-install-exec-local: modules_install
-
-clean-local: clean_modules
-
+-
include ../Makefile.extra
+diff -Naur xtables-addons-1.30.orig/Makefile.am xtables-addons-1.30/Makefile.am
+--- xtables-addons-1.30.orig/Makefile.am 2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/Makefile.am 2010-10-27 17:55:29.350434539 +0800
+@@ -12,7 +12,6 @@
+ ${MAKE} -f Makefile.mans all;
+
+ install-exec-hook:
+- depmod -a || :;
+
+ config.status: Makefile.iptrules.in
+
Index: west-chamber.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber/devel/west-chamber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- west-chamber.spec 15 Apr 2010 06:45:29 -0000 1.2
+++ west-chamber.spec 28 Oct 2010 07:32:16 -0000 1.3
@@ -1,11 +1,10 @@
-%define svndate 20100405
-%define svnver 84
-
+%define svndate 20101017
+%define svnver 105
Name: west-chamber
Summary: Extensions named after Romance of the West Chamber for iptables
Version: 0.0.1
-Release: 3.%{?svndate}svn%{?dist}
+Release: 6.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://code.google.com/p/scholarzhang/
@@ -14,13 +13,12 @@
# following commands to generate the tarball:
# 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: http://scholarzhang.googlecode.com/files/%{name}-%{svndate}.tar.bz2
+Source0: %{name}-%{svndate}.tar.bz2
Patch0: %{name}-userspace.patch
Patch1: %{name}-manpage.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: iptables-devel
BuildRequires: autoconf automake libtool
-Requires: xtables-addons
+Requires: xtables-addons >= 1.30
Provides: %{name}-kmod-common = %{version}
Requires: %{name}-kmod >= %{version}
@@ -36,6 +34,10 @@
%setup -q -n west-chamber-%{svndate}
%patch0 -p1
%patch1 -p1
+
+# remove bundled files from xtables-addons
+rm -rf include extensions/compat*
+
#do not build bundled xtables-addons modules
sed -i '/build_ipset=m/d' mconfig
@@ -46,7 +48,6 @@
%install
-rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
mv %{buildroot}%{_mandir}/man8/xtables-addons.8 %{buildroot}%{_mandir}/man8/%{name}.8
@@ -60,6 +61,9 @@
%{_mandir}/man8/*
%changelog
+* Thu Oct 28 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-6.20101017svn
+- svn 105
+
* Mon Apr 05 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-3.20100405svn
- svn 84
13 years, 6 months
rpms/west-chamber-kmod/F-14 compat_xtables.h, 1.1, 1.2 sources, 1.2, 1.3 west-chamber-kmod.spec, 1.4, 1.5
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4883
Modified Files:
compat_xtables.h sources west-chamber-kmod.spec
Log Message:
Update to snapshot 20101017
Index: compat_xtables.h
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-14/compat_xtables.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat_xtables.h 5 Aug 2010 05:33:55 -0000 1.1
+++ compat_xtables.h 28 Oct 2010 06:35:07 -0000 1.2
@@ -86,6 +86,11 @@
# define ip6t_unregister_table(tbl) ip6t_unregister_table(tbl)
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+# define rt_dst(rt) (&(rt)->dst)
+#else
+# define rt_dst(rt) (&(rt)->u.dst)
+#endif
#if !defined(NIP6) && !defined(NIP6_FMT)
# define NIP6(addr) \
Index: sources
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-14/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Apr 2010 05:44:56 -0000 1.2
+++ sources 28 Oct 2010 06:35:07 -0000 1.3
@@ -1 +1 @@
-38d1503a1df5d8b5fa6823e3e0ed4982 west-chamber-20100405.tar.bz2
+fa4543064bbcde2d3b287a3a068b2e57 west-chamber-20101017.tar.bz2
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-14/west-chamber-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- west-chamber-kmod.spec 5 Aug 2010 05:44:01 -0000 1.4
+++ west-chamber-kmod.spec 28 Oct 2010 06:35:07 -0000 1.5
@@ -7,13 +7,13 @@
%define buildforkernels current
#define buildforkernels akmods
-%define svndate 20100405
-%define svnver 84
+%define svndate 20101017
+%define svnver 105
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 5.%{?svndate}svn%{?dist}
+Release: 6.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -23,7 +23,7 @@
# 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
-# Header files extracted from xtables-addons 1.28
+# Header files extracted from xtables-addons 1.30
Source1: compat_xtables.h
Source2: compat_skbuff.h
Source3: compat_xtnu.h
@@ -83,8 +83,10 @@
%clean
rm -rf %{buildroot}
-
%changelog
+* Thu Oct 28 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-6.20101017svn
+- Renew header files to work with xtables-addons >= 1.30
+
* 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
13 years, 6 months
rpms/west-chamber-kmod/F-13 .cvsignore, 1.2, 1.3 compat_xtables.h, 1.1, 1.2 sources, 1.2, 1.3 west-chamber-kmod.spec, 1.23, 1.24
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4671
Modified Files:
.cvsignore compat_xtables.h sources west-chamber-kmod.spec
Log Message:
Update to snapshot 20101017
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Apr 2010 05:47:26 -0000 1.2
+++ .cvsignore 28 Oct 2010 06:34:05 -0000 1.3
@@ -1 +1 @@
-west-chamber-20100405.tar.bz2
+west-chamber-20101017.tar.bz2
Index: compat_xtables.h
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-13/compat_xtables.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat_xtables.h 5 Aug 2010 07:33:56 -0000 1.1
+++ compat_xtables.h 28 Oct 2010 06:34:05 -0000 1.2
@@ -86,6 +86,11 @@
# define ip6t_unregister_table(tbl) ip6t_unregister_table(tbl)
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+# define rt_dst(rt) (&(rt)->dst)
+#else
+# define rt_dst(rt) (&(rt)->u.dst)
+#endif
#if !defined(NIP6) && !defined(NIP6_FMT)
# define NIP6(addr) \
Index: sources
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Apr 2010 05:47:26 -0000 1.2
+++ sources 28 Oct 2010 06:34:05 -0000 1.3
@@ -1 +1 @@
-38d1503a1df5d8b5fa6823e3e0ed4982 west-chamber-20100405.tar.bz2
+fa4543064bbcde2d3b287a3a068b2e57 west-chamber-20101017.tar.bz2
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-13/west-chamber-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- west-chamber-kmod.spec 21 Oct 2010 19:45:35 -0000 1.23
+++ west-chamber-kmod.spec 28 Oct 2010 06:34:05 -0000 1.24
@@ -3,17 +3,17 @@
# "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
-%define svnver 84
+%define svndate 20101017
+%define svnver 105
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 5.%{?svndate}svn%{?dist}.9
+Release: 6.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -23,7 +23,7 @@
# 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
-# Header files extracted from xtables-addons 1.28
+# Header files extracted from xtables-addons 1.30
Source1: compat_xtables.h
Source2: compat_skbuff.h
Source3: compat_xtnu.h
@@ -83,34 +83,9 @@
%clean
rm -rf %{buildroot}
-
%changelog
-* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.9
-- rebuild for new kernel
-
-* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.8
-- rebuild for new kernel
-
-* Sat Sep 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.7
-- rebuild for new kernel
-
-* Fri Sep 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.6
-- rebuild for new kernel
-
-* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.5
-- rebuild for new kernel
-
-* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.3
-- rebuild for new kernel with akmod
-
-* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.3
-- rebuild for new kernel
-
-* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.2
-- rebuild for new kernel
-
-* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.1
-- rebuild for new kernel
+* Thu Oct 28 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-6.20101017svn
+- Renew header files to work with xtables-addons >= 1.30
* 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
13 years, 6 months
rpms/west-chamber-kmod/devel .cvsignore, 1.3, 1.4 compat_xtables.h, 1.1, 1.2 sources, 1.2, 1.3 west-chamber-kmod.spec, 1.4, 1.5
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/west-chamber-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4272
Modified Files:
compat_xtables.h sources west-chamber-kmod.spec
Added Files:
.cvsignore
Log Message:
Update to snapshot 20101017
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ .cvsignore 28 Oct 2010 06:31:31 -0000 1.4
@@ -0,0 +1 @@
+west-chamber-20101017.tar.bz2
Index: compat_xtables.h
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/devel/compat_xtables.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat_xtables.h 5 Aug 2010 05:33:55 -0000 1.1
+++ compat_xtables.h 28 Oct 2010 06:31:31 -0000 1.2
@@ -86,6 +86,11 @@
# define ip6t_unregister_table(tbl) ip6t_unregister_table(tbl)
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+# define rt_dst(rt) (&(rt)->dst)
+#else
+# define rt_dst(rt) (&(rt)->u.dst)
+#endif
#if !defined(NIP6) && !defined(NIP6_FMT)
# define NIP6(addr) \
Index: sources
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Apr 2010 05:44:56 -0000 1.2
+++ sources 28 Oct 2010 06:31:31 -0000 1.3
@@ -1 +1 @@
-38d1503a1df5d8b5fa6823e3e0ed4982 west-chamber-20100405.tar.bz2
+fa4543064bbcde2d3b287a3a068b2e57 west-chamber-20101017.tar.bz2
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/devel/west-chamber-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- west-chamber-kmod.spec 5 Aug 2010 05:44:01 -0000 1.4
+++ west-chamber-kmod.spec 28 Oct 2010 06:31:31 -0000 1.5
@@ -7,13 +7,13 @@
%define buildforkernels current
#define buildforkernels akmods
-%define svndate 20100405
-%define svnver 84
+%define svndate 20101017
+%define svnver 105
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 5.%{?svndate}svn%{?dist}
+Release: 6.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -23,7 +23,7 @@
# 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
-# Header files extracted from xtables-addons 1.28
+# Header files extracted from xtables-addons 1.30
Source1: compat_xtables.h
Source2: compat_skbuff.h
Source3: compat_xtnu.h
@@ -83,8 +83,10 @@
%clean
rm -rf %{buildroot}
-
%changelog
+* Thu Oct 28 2010 Chen Lei <supercyper(a)163.com> - 0.0.1-6.20101017svn
+- Renew header files to work with xtables-addons >= 1.30
+
* 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
13 years, 6 months