Re: [sisyphus] iptables

[Sergei Epiphanov <serpiph@nikiet.ru>]

[-- Attachment #1: Type: Text/Plain, Size: 273 bytes --]

В сообщении от 13 октября 2010 14:22:13 автор Victor Forsiuk написал:
> Актуальная версия сейчас 1.30. Только аффтар архивы начал зачем-то паковать
> xz... :-\

Мне из git-а сейчас сложно забрать что бы то ни было. Вот для 1.30 изменения.

-- 
С уважением, Епифанов Сергей

[-- Attachment #2: xtables-addons.spec --]
[-- Type: text/x-rpm-spec, Size: 1821 bytes --]

Name: xtables-addons
Version: 1.30
Release: alt1
Summary: IP tables addons
Group: System/Kernel and hardware

URL: http://xtables-addons.sourceforge.net/
License: GPLv2

Source0: %name-%version.tar.bz2
Patch1: %name-1.30.patch

BuildRequires(pre): kernel-build-tools
BuildRequires: iptables-devel >= 1.4.3
Requires: iptables

Packager: Sergei Epiphanov <serpiph@altlinux.ru>

%description 
Additional modules for iptables

%package -n kernel-source-%name
Summary: xtables module sources
Group: Development/Kernel

%description -n kernel-source-%name
XTable addons module sources for Linux kernel.

%prep
%setup -q
%patch1 -p1
autoreconf -fisv
%configure --libdir=/%_lib --with-kbuild=no --with-xtlibdir=/%_lib/iptables

%build
%make

%install
%make_install install DESTDIR=%buildroot
tar -xjf %SOURCE0
mv %name-%version/extensions kernel-source-%name-%version
cp mconfig kernel-source-%name-%version/mconfig
cp kernel-source-%name-%version/Mbuild kernel-source-%name-%version/Makefile
tar -cjf kernel-source-%name-%version.tar.bz2 kernel-source-%name-%version
rm -rf kernel-source-%name-%version
rm -rf %name-%version
install -m644 -pD kernel-source-%name-%version.tar.bz2 %kernel_srcdir/kernel-source-%name-%version.tar.bz2
mv geoip/geoip* .

#Remove these files due to iptables and ipset packages
rm -f %buildroot/%_lib/iptables/libipset_*
rm -f %buildroot/%_lib/iptables/libxt_TEE.so
rm -f %buildroot%_sbindir/ipset
rm -f %buildroot%_man8dir/ipset*

%files
%doc README geoip_build_db.pl geoip_download.sh
%_sbindir/*
%attr(0755,-,-) /%_lib/*.so*
/%_lib/iptables/*.so*
%_man8dir/*

%files -n kernel-source-%name
%kernel_src/*

%changelog
* Wed Oct 13 2010 Sergei Epiphanov <serpiph@altlinux.ru> 1.30-alt1
- Version 1.30

* Wed Oct 13 2010 Sergei Epiphanov <serpiph@altlinux.ru> 1.26-alt1
- Initial release for Sisyphus

[-- Attachment #3: kernel-modules-xtables-addons.spec --]
[-- Type: text/x-rpm-spec, Size: 2686 bytes --]

%define module_name	xtables-addons
%define module_version	1.30

%define kversion	2.6.32
%define krelease	alt21.1
%define flavour		std-def

%define module_release	alt1
Packager:       Sergei Epiphanov <serpiph@altlinux.ru>

Name:		kernel-modules-%module_name-%flavour
Version:	%module_version
Release:	%module_release.132640.21.1
%define module_dir /lib/modules/%kversion-%flavour-%krelease/kernel/net/netfilter/

Group:		System/Kernel and hardware
Summary:	%module_name kernel module for submount
URL:		http://xtables-addons.sourceforge.net/
License: GPL 

ExclusiveOS:	Linux
BuildRequires: kernel-build-tools >= 0.7
BuildRequires: kernel-headers-modules-%flavour = %kversion-%krelease
BuildRequires: kernel-source-%module_name = %module_version
BuildRequires: rpm-build-licenses
ExclusiveArch: %ix86 x86_64

Provides:  kernel-modules-%module_name-%kversion-%flavour-%krelease = %version-%release
Conflicts: kernel-modules-%module_name-%kversion-%flavour-%krelease < %version-%release
Conflicts: kernel-modules-%module_name-%kversion-%flavour-%krelease > %version-%release

Prereq:		coreutils
Prereq:         kernel-image-%flavour = %kversion-%krelease
Requires(postun): kernel-image-%flavour = %kversion-%krelease

%description
Xtables-addons is the proclaimed successor to patch-o-matic(-ng). It
contains extensions that were not accepted in the main Xtables
package.

Xtables-addons is different from patch-o-matic in that you do not
have to patch or recompile either kernel or Xtables(iptables). But
please see the INSTALL file for the minimum requirements of this
package.

All code imported from patch-o-matic has been reviewed and all
apparent bugs like binary stability across multiarches, missing
sanity checks and incorrect endianess handling have been fixed,
simplified, and sped up.

%prep
rm -rf kernel-source-%module_name-%{module_version}*
tar xjf %kernel_src/kernel-source-%module_name-%module_version.tar.*
%setup -D -T -n kernel-source-%module_name-%module_version

%build
. %_usrsrc/linux-%kversion-%flavour/gcc_version.inc
%make -C %_usrsrc/linux-%kversion-%flavour TEMP_DIR=$(pwd) V=1 SUBDIRS=$(pwd) XA_ABSTOPSRCDIR=`pwd` modules

%install
mkdir -p %buildroot/%module_dir/
install -pD -m 0644 *.ko %buildroot/%module_dir/

#Remove not used modules
rm -f %buildroot/%module_dir/xt_TEE.ko

%post
%post_kernel_modules %kversion-%flavour-%krelease

%postun
%postun_kernel_modules %kversion-%flavour-%krelease

%files
#dir #module_dir
%module_dir/*

%changelog
* Wed Oct 13 2010 Sergei Epiphanov <serpiph@altlinux.ru> 1.30-alt1.132640.21.1
- New version 1.30

* Wed Oct 13 2010 Sergei Epiphanov <serpiph@altlinux.ru> 1.26-alt1.132640.21.1
- Initial release for Sisyphus

[-- Attachment #4: xtables-addons-1.30.patch --]
[-- Type: text/x-patch, Size: 395 bytes --]

diff -Naur xtables-addons-1.30.orig/Makefile.am xtables-addons-1.30/Makefile.am
--- xtables-addons-1.30.orig/Makefile.am	2010-10-13 13:41:04.000000000 +0400
+++ xtables-addons-1.30/Makefile.am	2010-10-13 14:55:28.223967720 +0400
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
 
 ACLOCAL_AMFLAGS  = -I m4
-SUBDIRS          = extensions geoip
+SUBDIRS          = extensions
 
 man_MANS := xtables-addons.8