[xpra-codecs-freeworld] Update to 2.0.3
by Antonio
commit b062bd190d156497fe1c5a8ede9a3b9e6ab4af69
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Jul 4 17:51:01 2017 +0200
Update to 2.0.3
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d74379d..3ebcfe9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xpra-0.16.3.tar.xz
/xpra-0.17.5.tar.xz
/xpra-1.0.2.tar.xz
/xpra-2.0.2.tar.xz
+/xpra-2.0.3.tar.xz
diff --git a/sources b/sources
index 9adbbd7..2c247f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d4c418f2c208403694ba5b47e144a71 xpra-2.0.2.tar.xz
+abd6f8e65d14241d3d7638acb4d78a23 xpra-2.0.3.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 18be44c..761fc23 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -18,8 +18,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.0.3
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -103,6 +103,9 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Tue Jul 04 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 2.0.3-1
+- Update to 2.0.3
+
* Wed May 10 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 2.0.2-2
- Patched for building against ffmpeg-3.1 (f25)
6 years, 9 months
[xtables-addons-kmod/f26: 4/4] Avoid xt_TARPIT on rhel7 kernel
by Nicolas Chauvet
commit db29bfb1090b662233df9e8b53549537b89dec93
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 3 19:00:40 2017 +0200
Avoid xt_TARPIT on rhel7 kernel
xtables-addons-kmod.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index f818ee8..bbdece6 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -41,6 +41,10 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildfo
%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
+ %if 0%{?rhel}
+ # FIXME!!! TARPIT doesn't build with the rhel kernel
+ sed -i 's/build_TARPIT=m//' _kmod_build_${kernel_version%%___*}/mconfig
+ %endif
done
@@ -64,6 +68,7 @@ rm -rf %{buildroot}
%changelog
* Mon Jul 03 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.13-1
- Update to 2.13
+- Avoid xt_TARPIT on rhel kernel
* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
6 years, 9 months
[xtables-addons-kmod/el7] Add missing sources
by Nicolas Chauvet
commit 8aeb80cc185aeae89c183db5d244b58bd6cd9034
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 3 19:09:34 2017 +0200
Add missing sources
.gitignore | 2 +-
sources | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 340c3df..ac352a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xtables-addons-2.5.tar.xz
+xtables-addons-*.tar.xz
diff --git a/sources b/sources
index 72f6a6c..7e187ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-335663ece5fb17c7d0bb24dbdc697eb1 xtables-addons-2.5.tar.xz
+be20b0b9c4b001b364431a836e361d33 xtables-addons-2.13.tar.xz
6 years, 9 months
[xtables-addons/el7] squashed merge master to el7
by Nicolas Chauvet
commit 7e4f7f5fe985bfc615d5a61138d97f519370829b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 3 19:07:34 2017 +0200
squashed merge master to el7
.gitignore | 2 +-
ipset-config | 28 ------
ipset.init | 247 ----------------------------------------------------
sources | 2 +-
xtables-addons.spec | 52 ++---------
5 files changed, 11 insertions(+), 320 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 340c3df..ac352a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xtables-addons-2.5.tar.xz
+xtables-addons-*.tar.xz
diff --git a/sources b/sources
index 72f6a6c..7e187ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-335663ece5fb17c7d0bb24dbdc697eb1 xtables-addons-2.5.tar.xz
+be20b0b9c4b001b364431a836e361d33 xtables-addons-2.13.tar.xz
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 27d6118..687e84c 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,23 +1,18 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 2.5
+Version: 2.13
Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
Group: System Environment/Base
URL: http://xtables-addons.sourceforge.net
-Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/%{version}/xtable...
-Source1: ipset.init
-Source2: ipset-config
+Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/xtables-addons-%{...
+
+BuildRequires: gcc
BuildRequires: iptables-devel >= 1.4.5
BuildRequires: autoconf automake libtool
Provides: %{name}-kmod-common = %{version}
Requires: %{name}-kmod >= %{version}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(postun): initscripts
Requires: ipset >= 6.11
Obsoletes: %{name}-devel < 1.27-1
@@ -33,21 +28,14 @@ in the %{name}-kmod package. You must also install the
%prep
%setup -q -n %{name}-%{version}
./autogen.sh
-if [ ! -e /%{_lib}/xtables/libxt_CHECKSUM.so ]; then
- sed -i 's/build_CHECKSUM=/build_CHECKSUM=m/' mconfig
-fi
-if [ ! -e /%{_lib}/xtables/libxt_TEE.so ]; then
- sed -i 's/build_TEE=/build_TEE=m/' mconfig
-fi
-sed -i 's/build_ipset6=/build_ipset6=m/' mconfig
%build
%configure --without-kbuild
-make V=1 %{?_smp_mflags}
+%make_build V=1
%install
-make DESTDIR=%{buildroot} install
+%make_install
# We add xt_geoip database scripts manually
rm -rf %{buildroot}%{_libexecdir}
@@ -57,40 +45,18 @@ chmod 0644 geoip/*
# There is no -devel package. So no need for these files
rm -f %{buildroot}%{_libdir}/*.{la,so}
-# install init scripts and configuration files
-install -D -pm 0755 %{SOURCE1} %{buildroot}%{_initddir}/ipset
-install -D -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ipset-config
-
-%post
-/sbin/ldconfig
-/sbin/chkconfig --add ipset
-
-%preun
-if [ $1 = 0 ] ; then
- /sbin/service ipset stop >/dev/null 2>&1
- /sbin/chkconfig --del ipset
-fi
-
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
- /sbin/service ipset condrestart >/dev/null 2>&1 || :
-fi
-
-%clean
-rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc LICENSE README doc/* geoip
-%attr(0755,root,root) %{_initddir}/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
%{_libdir}/xtables/*.so
%{_libdir}/*.so.*
%{_sbindir}/iptaccount
%{_mandir}/man?/*
%changelog
+* Mon Jul 03 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.13-1
+- Update to 2.13
+
* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5-1
- Update to 2.5
6 years, 9 months
[xtables-addons-kmod/el7] squashed merge master on el7
by Nicolas Chauvet
commit cf06db10c5bbbdde51104236ade05b2497cb4789
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 3 19:02:42 2017 +0200
squashed merge master on el7
xtables-addons-kmod.spec | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index 4be28c3..1ad7f63 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -3,16 +3,19 @@
# "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
-%global buildforkernels newest
+%if 0%{?fedora}
+%global buildforkernels akmod
+%global debug_package %{nil}
+%endif
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
-Version: 2.5
-Release: 1%{?dist}.48
+Version: 2.13
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
-Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/%{version}/xtable...
+Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/xtables-addons-%{...
#Source11: xtables-addons-kmodtool-excludekernel-filterfile
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
@@ -38,17 +41,15 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildfo
%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
+ %if 0%{?rhel}
+ # FIXME!!! TARPIT doesn't build with the rhel kernel
+ sed -i 's/build_TARPIT=m//' _kmod_build_${kernel_version%%___*}/mconfig
+ %endif
done
%build
for kernel_version in %{?kernel_versions} ; do
- if ! grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
- sed -i 's/build_TEE=/build_TEE=m/' _kmod_build_${kernel_version%%___*}/mconfig
- fi
- if ! grep -q 'XT_TARGET_CHECKSUM=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
- sed -i 's/build_CHECKSUM=/build_CHECKSUM=m/' _kmod_build_${kernel_version%%___*}/mconfig
- fi
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
done
@@ -65,6 +66,10 @@ done
rm -rf %{buildroot}
%changelog
+* Mon Jul 03 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.13-1
+- Update to 2.13
+- Avoid xt_TARPIT on rhel kernel
+
* Wed Jun 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5-1.48
- Rebuilt for kernel
6 years, 9 months
