[mod_evasive] adapt to httpd-2.4: changed remote_ip to client_ip
by Ján ONDREJ
commit b78253ce539eea911b319d511ba2206f10f3a1e4
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date: Sat Mar 31 16:18:48 2012 +0200
adapt to httpd-2.4: changed remote_ip to client_ip
mod_evasive.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/mod_evasive.spec b/mod_evasive.spec
index 3013c22..c3355f0 100644
--- a/mod_evasive.spec
+++ b/mod_evasive.spec
@@ -1,6 +1,6 @@
Name: mod_evasive
Version: 1.10.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Denial of Service evasion module for Apache
Group: System Environment/Daemons
@@ -27,7 +27,10 @@ reports abuses via email and syslog facilities.
%build
-apxs -Wc,"%{optflags}" -c mod_evasive20.c
+# create apache httpd-2.4 version and compile it
+sed 's/connection->remote_ip/connection->client_ip/' \
+ < mod_evasive20.c > mod_evasive24.c
+apxs -Wc,"%{optflags}" -c mod_evasive24.c
%install
@@ -35,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -pm 755 \
$RPM_BUILD_ROOT%{_libdir}/httpd/modules \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -pm 755 .libs/mod_evasive20.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/
+install -pm 755 .libs/mod_evasive24.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
@@ -51,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Mar 31 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.10.1-13
+- adapt to httpd-2.4: changed remote_ip to client_ip
+
* Thu Mar 29 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.10.1-12
- apxs moved to bindir, do not use sbindir macro
10Â years, 1Â month
[dietlibc/f17] - updated to 20120330 CVS snapshot - versionized the patchset fetched from github
by ensc
commit 7ec2c6aed0d8d0292d5e5a0b8391a079717c270d
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Mar 31 16:04:45 2012 +0200
- updated to 20120330 CVS snapshot
- versionized the patchset fetched from github
.gitignore | 4 ++--
dietlibc.spec | 12 +++++++++---
sources | 4 ++--
3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0869ba..1b6e4d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/dietlibc-0.33.20111222.tar.xz
-/dietlibc-github.patch.gz
+/dietlibc-0.33.20120330.tar.xz
+/dietlibc-github-e3675c7d1939de7fa679f6a80372ac35d0848589.patch.gz
diff --git a/dietlibc.spec b/dietlibc.spec
index 3803fc7..1dd5a3e 100644
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -7,7 +7,8 @@
%bcond_without noarch
##
-%global prerelease 20111222
+%global prerelease 20120330
+%global githubref e3675c7d1939de7fa679f6a80372ac35d0848589
%global pkglibdir %_prefix/lib/dietlibc
%ifarch %ix86 x86_64
@@ -34,7 +35,7 @@
Summary: Small libc implementation
Name: dietlibc
Version: 0.33
-Release: %release_func 1700
+Release: %release_func 1701
License: GPLv2
Group: Development/Libraries
URL: http://www.fefe.de/dietlibc/
@@ -47,7 +48,7 @@ Source0: %name-%version.%prerelease.tar.xz
%endif
Source10: runtests-X.sh
## CVS..master diff from https://github.com/ensc/dietlibc
-Patch0: dietlibc-github.patch.gz
+Patch0: dietlibc-github-%githubref.patch.gz
BuildRoot: %_tmppath/%name-%version-%release-buildroot
%{?with_dynamic:Requires: dietlibc-lib = %version-%release}
%{!?with_dynamic:Obsoletes: dietlibc-lib < %version-%release}
@@ -202,6 +203,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Mar 31 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.33-0.1701.20120330
+- updated to 20120330 CVS snapshot
+- versionized the patchset fetched from github
+- fixed build on armv7+ systems (#800601)
+
* Sat Jan 14 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.33-0.1700.20111222
- updated to 20111222 CVS snapshot
- rediffed + updated patchset
diff --git a/sources b/sources
index f956b98..b9c6c67 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-13401ee8360ac03aa862840b2a2cae47 dietlibc-0.33.20111222.tar.xz
-03d26bdc779a9abf62792ca4c449f182 dietlibc-github.patch.gz
+a6f2dac580cff9bb79da5d3a75c7cc8a dietlibc-0.33.20120330.tar.xz
+7e2bd759a5fc8699b845b6162f945cb5 dietlibc-github-e3675c7d1939de7fa679f6a80372ac35d0848589.patch.gz
10Â years, 1Â month
[dietlibc] - updated to 20120330 CVS snapshot - versionized the patchset fetched from github
by ensc
commit 022e9e26422466a52c3d72f8f06c93dd31a933fc
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Mar 31 16:04:45 2012 +0200
- updated to 20120330 CVS snapshot
- versionized the patchset fetched from github
.gitignore | 4 ++--
dietlibc.spec | 12 +++++++++---
sources | 4 ++--
3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0869ba..1b6e4d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/dietlibc-0.33.20111222.tar.xz
-/dietlibc-github.patch.gz
+/dietlibc-0.33.20120330.tar.xz
+/dietlibc-github-e3675c7d1939de7fa679f6a80372ac35d0848589.patch.gz
diff --git a/dietlibc.spec b/dietlibc.spec
index 3803fc7..e3e1640 100644
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -7,7 +7,8 @@
%bcond_without noarch
##
-%global prerelease 20111222
+%global prerelease 20120330
+%global githubref e3675c7d1939de7fa679f6a80372ac35d0848589
%global pkglibdir %_prefix/lib/dietlibc
%ifarch %ix86 x86_64
@@ -34,7 +35,7 @@
Summary: Small libc implementation
Name: dietlibc
Version: 0.33
-Release: %release_func 1700
+Release: %release_func 1800
License: GPLv2
Group: Development/Libraries
URL: http://www.fefe.de/dietlibc/
@@ -47,7 +48,7 @@ Source0: %name-%version.%prerelease.tar.xz
%endif
Source10: runtests-X.sh
## CVS..master diff from https://github.com/ensc/dietlibc
-Patch0: dietlibc-github.patch.gz
+Patch0: dietlibc-github-%githubref.patch.gz
BuildRoot: %_tmppath/%name-%version-%release-buildroot
%{?with_dynamic:Requires: dietlibc-lib = %version-%release}
%{!?with_dynamic:Obsoletes: dietlibc-lib < %version-%release}
@@ -202,6 +203,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Mar 31 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.33-0.1800.20120330
+- updated to 20120330 CVS snapshot
+- versionized the patchset fetched from github
+- fixed build on armv7+ systems (#800601)
+
* Sat Jan 14 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.33-0.1700.20111222
- updated to 20111222 CVS snapshot
- rediffed + updated patchset
diff --git a/sources b/sources
index f956b98..b9c6c67 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-13401ee8360ac03aa862840b2a2cae47 dietlibc-0.33.20111222.tar.xz
-03d26bdc779a9abf62792ca4c449f182 dietlibc-github.patch.gz
+a6f2dac580cff9bb79da5d3a75c7cc8a dietlibc-0.33.20120330.tar.xz
+7e2bd759a5fc8699b845b6162f945cb5 dietlibc-github-e3675c7d1939de7fa679f6a80372ac35d0848589.patch.gz
10Â years, 1Â month
[dietlibc] makefile: added target to fetch the github patch
by ensc
commit 2ed074850186d436b065d0581b1e1ca58ae17fcf
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Mar 31 16:01:11 2012 +0200
makefile: added target to fetch the github patch
Makefile | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/Makefile b/Makefile
index c64dfb6..b274c60 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,25 @@ MAKEFILE_COMMON = $(HOME)/.fedora/common.mk
-include $(MAKEFILE_COMMON)
CVS ?= cvs
+GIT ?= git
TAR ?= tar
+GZIP ?= gzip
CVS_BASEVER = 0.33
CVS_DATE := $(shell date +'%Y%m%d' -d '-1 day')
+GIT_URL = git://github.com/ensc/dietlibc.git
+GIT_DIFF_OPTS = --summary --stat --patch
+GIT_BRANCH_OLD = CVS
+GIT_BRANCH_NEW = master
_cvs_suffix = ${CVS_BASEVER}.${CVS_DATE}
cvs-sources:
cd ${DESTDIR} . && $(CVS) -d :pserver:cvs@cvs.fefe.de:/cvs -z9 export -D${CVS_DATE} -d dietlibc-${_cvs_suffix} dietlibc
cd ${DESTDIR} . && $(TAR) cJf dietlibc-${_cvs_suffix}.tar.xz dietlibc-${_cvs_suffix} --owner root --group root
+
+git-patch:
+ cd ${DESTDIR} . && $(GIT) clone --mirror $(GIT_URL) dietlibc.git
+ cd ${DESTDIR} . && cd dietlibc.git && { \
+ ref=`git ls-remote . refs/heads/$(GIT_BRANCH_NEW) | cut -f 1` && \
+ $(GIT) diff $(GIT_DIFF_OPTS) $(GIT_BRANCH_OLD)..$(GIT_BRANCH_NEW) > diff && \
+ $(GZIP) -c < diff > ../dietlibc-github-$$ref.patch.gz ; }
+ cd ${DESTDIR} . && rm -rf dietlibc.git
10Â years, 1Â month
[gnome-boxes/f17] Only pull in libvirtd + KVM drivers, without default configs (bug 802475)
by Daniel P. Berrange
commit 17c886039c002543d095a1361c576a9ab3a0fd2f
Author: Daniel P. Berrange <berrange(a)redhat.com>
Date: Sat Mar 31 13:14:15 2012 +0100
Only pull in libvirtd + KVM drivers, without default configs (bug 802475)
gnome-boxes.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gnome-boxes.spec b/gnome-boxes.spec
index 922bb85..85ce8b9 100644
--- a/gnome-boxes.spec
+++ b/gnome-boxes.spec
@@ -3,7 +3,7 @@
Name: gnome-boxes
Version: 3.4.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A simple GNOME 3 application to access remote or virtual systems
Group: Applications/Emulators
@@ -33,9 +33,8 @@ BuildRequires: tracker-devel
# spice-gtk available only on these arches
ExclusiveArch: %{ix86} x86_64
-# Need libvirtd and an hypervisor to do anything useful
-Requires: libvirt
-Requires: qemu-kvm
+# Pulls in libvirtd + KVM, but no NAT / firewall configs
+Requires: libvirt-daemon-kvm
# Needed for unattended installations
Requires: fuseiso
@@ -97,6 +96,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/icons/hicolor/*/apps/gnome-boxes.*
%changelog
+* Sat Mar 31 2012 Daniel P. Berrange <berrange(a)redhat.com> - 3.4.0.1-2
+- Only pull in libvirtd + KVM drivers, without default configs (bug 802475)
+
* Sat Mar 31 2012 Zeeshan Ali <zeenix(a)redhat.com> - 3.4.0.1-1
- Update to 3.4.0.1
10Â years, 1Â month
[gnome-boxes] Only pull in libvirtd + KVM drivers, without default configs (bug 802475)
by Daniel P. Berrange
commit 1b6318116b23f3b2be8bd59b077e0cce76721bb5
Author: Daniel P. Berrange <berrange(a)redhat.com>
Date: Sat Mar 31 13:14:15 2012 +0100
Only pull in libvirtd + KVM drivers, without default configs (bug 802475)
gnome-boxes.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gnome-boxes.spec b/gnome-boxes.spec
index 922bb85..85ce8b9 100644
--- a/gnome-boxes.spec
+++ b/gnome-boxes.spec
@@ -3,7 +3,7 @@
Name: gnome-boxes
Version: 3.4.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A simple GNOME 3 application to access remote or virtual systems
Group: Applications/Emulators
@@ -33,9 +33,8 @@ BuildRequires: tracker-devel
# spice-gtk available only on these arches
ExclusiveArch: %{ix86} x86_64
-# Need libvirtd and an hypervisor to do anything useful
-Requires: libvirt
-Requires: qemu-kvm
+# Pulls in libvirtd + KVM, but no NAT / firewall configs
+Requires: libvirt-daemon-kvm
# Needed for unattended installations
Requires: fuseiso
@@ -97,6 +96,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/icons/hicolor/*/apps/gnome-boxes.*
%changelog
+* Sat Mar 31 2012 Daniel P. Berrange <berrange(a)redhat.com> - 3.4.0.1-2
+- Only pull in libvirtd + KVM drivers, without default configs (bug 802475)
+
* Sat Mar 31 2012 Zeeshan Ali <zeenix(a)redhat.com> - 3.4.0.1-1
- Update to 3.4.0.1
10Â years, 1Â month