commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2020-02-18 10:36:52
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new.26092 (New)
Package is "apache2-mod_evasive"
Tue Feb 18 10:36:52 2020 rev:13 rq:774742 version:1.10.1
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2019-10-24 23:10:34.172620700 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new.26092/apache2-mod_evasive.changes
2020-02-18 10:37:59.532649080 +0100
@@ -1,0 +2,6 @@
+Sun Feb 9 20:40:21 UTC 2020 - pgaj...@suse.com
+
+- removing %apache_test_* macros, do not test module just by
+ loading the module
+
+---
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.qIg1mG/_old 2020-02-18 10:38:01.336652760 +0100
+++ /var/tmp/diff_new_pack.qIg1mG/_new 2020-02-18 10:38:01.340652768 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_evasive
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -83,11 +83,6 @@
perl -i -pe "s{/usr/lib/}{%_libdir/}g" \
"$b/%apache_sysconfdir/conf.d/mod_evasive.conf"
-%check
-set +x
-%apache_test_module_load -m evasive%ap_suffix -i mod_evasive.conf
-set -x
-
%files
%defattr(-,root,root)
%apache_libexecdir/
commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2019-10-24 23:10:30
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new.2990 (New)
Package is "apache2-mod_evasive"
Thu Oct 24 23:10:30 2019 rev:12 rq:742505 version:1.10.1
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2015-12-21 12:04:05.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new.2990/apache2-mod_evasive.changes
2019-10-24 23:10:34.172620700 +0200
@@ -1,0 +2,5 @@
+Thu Oct 17 09:53:13 UTC 2019 - Jan Engelhardt
+
+- Update homepage URL.
+
+---
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.TELNQt/_old 2019-10-24 23:10:34.756621381 +0200
+++ /var/tmp/diff_new_pack.TELNQt/_new 2019-10-24 23:10:34.756621381 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_evasive
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,11 +12,11 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%if %{apache_branch} >= 204
+%if %apache_branch >= 204
%define ap_suffix 24
%else
%define ap_suffix 20
@@ -25,14 +25,14 @@
Version:1.10.1
Release:0
Summary:Denial of Service evasion module for Apache
-License:GPL-2.0+
-Group: Productivity/Networking/Web/Servers
#
# Only mod_evasive20.c (GPL-2.0+) is provided in object form.
# mod_evasive.c (GPL-2.0) and mod_evasiveNSAPI.c (non-OSI compliant)
# are merely shipped unmodified, fulfilling their terms.
#
-Url:http://zdziarski.com/blog/?page_id=442
+License:GPL-2.0-or-later
+Group: Productivity/Networking/Web/Servers
+URL:https://github.com/jzdziarski/mod_evasive
Source:
http://zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_%version.tar.gz
Source2:mod_evasive.conf
@@ -46,8 +46,8 @@
BuildRequires: gcc-c++
BuildRequires: pcre-devel
Recommends: mailx
-Requires: %{apache_mmn}
-Requires: %{apache_suse_maintenance_mmn}
+Requires: %apache_mmn
+Requires: %apache_suse_maintenance_mmn
Requires: apache2
%description
@@ -64,28 +64,28 @@
%build
cp -a %{S:2} .
-%if %{ap_suffix} == 24
+%if %ap_suffix == 24
# create apache httpd-2.4 version and compile it
sed 's/connection->remote_ip/connection->client_ip/' \
- < mod_evasive20.c > mod_evasive%{ap_suffix}.c
-sed -i 's/evasive20_module/evasive24_module/' mod_evasive%{ap_suffix}.c
+ "mod_evasive%ap_suffix.c"
+sed -i 's/evasive20_module/evasive24_module/' "mod_evasive%ap_suffix.c"
sed -i 's/evasive20/evasive24/g' mod_evasive.conf
%endif
-%apache_apxs -Wc,"%{optflags}" -c mod_evasive%{ap_suffix}.c
+%apache_apxs -Wc,"%optflags" -c "mod_evasive%ap_suffix.c"
%install
b="%buildroot"
mkdir -p "$b/%apache_libexecdir" "$b/%apache_sysconfdir/conf.d"
%apache_apxs -i -S LIBEXECDIR="%buildroot/%apache_libexecdir" \
- -n mod_evasive%{ap_suffix}.so mod_evasive%{ap_suffix}.la;
-cp -a mod_evasive.conf "$b/%apache_sysconfdir/conf.d/";
+ -n "mod_evasive%ap_suffix.so" "mod_evasive%ap_suffix.la"
+cp -a mod_evasive.conf "$b/%apache_sysconfdir/conf.d/"
perl -i -pe "s{/usr/lib/}{%_libdir/}g" \
- "$b/%apache_sysconfdir/conf.d/mod_evasive.conf";
+ "$b/%apache_sysconfdir/conf.d/mod_evasive.conf"
%check
set +x
-%apache_test_module_load -m evasive%{ap_suffix} -i mod_evasive.conf
+%apache_test_module_load -m evasive%ap_suffix -i mod_evasive.conf
set -x
%files
commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2015-12-21 12:04:04
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new (New)
Package is "apache2-mod_evasive"
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2015-09-24 06:13:50.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new/apache2-mod_evasive.changes
2015-12-21 12:04:05.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec 11 12:04:37 UTC 2015 - pgaj...@suse.com
+
+- %{apache_branch} converted to number
+
+---
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.ARfq8s/_old 2015-12-21 12:04:06.0 +0100
+++ /var/tmp/diff_new_pack.ARfq8s/_new 2015-12-21 12:04:06.0 +0100
@@ -16,7 +16,7 @@
#
-%if "%apache_branch" == "2.4"
+%if %{apache_branch} >= 204
%define ap_suffix 24
%else
%define ap_suffix 20
commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2015-09-24 06:13:49
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new (New)
Package is "apache2-mod_evasive"
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2015-07-20 11:20:44.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new/apache2-mod_evasive.changes
2015-09-24 06:13:50.0 +0200
@@ -1,0 +2,5 @@
+Mon Aug 31 11:08:52 UTC 2015 - pgaj...@suse.com
+
+- test module with %apache_test_module
+
+---
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.ME2ZDd/_old 2015-09-24 06:13:50.0 +0200
+++ /var/tmp/diff_new_pack.ME2ZDd/_new 2015-09-24 06:13:50.0 +0200
@@ -83,6 +83,11 @@
perl -i -pe "s{/usr/lib/}{%_libdir/}g" \
"$b/%apache_sysconfdir/conf.d/mod_evasive.conf";
+%check
+set +x
+%apache_test_module_load -m evasive%{ap_suffix} -i mod_evasive.conf
+set -x
+
%files
%defattr(-,root,root)
%apache_libexecdir/
commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2015-07-20 11:20:42
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new (New)
Package is apache2-mod_evasive
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2014-11-26 10:33:38.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new/apache2-mod_evasive.changes
2015-07-20 11:20:44.0 +0200
@@ -1,0 +2,7 @@
+Thu Jul 16 07:22:02 UTC 2015 - pgaj...@suse.com
+
+- Requries: %{apache_suse_maintenance_mmn}
+ This will pull this module to the update (in released distribution)
+ when apache maintainer thinks it is good (due api/abi changes).
+
+---
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.Z2HkNh/_old 2015-07-20 11:20:45.0 +0200
+++ /var/tmp/diff_new_pack.Z2HkNh/_new 2015-07-20 11:20:45.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_evasive
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,7 +46,8 @@
BuildRequires: gcc-c++
BuildRequires: pcre-devel
Recommends: mailx
-Requires: %apache_mmn
+Requires: %{apache_mmn}
+Requires: %{apache_suse_maintenance_mmn}
Requires: apache2
%description
commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2014-11-26 10:33:34
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new (New)
Package is apache2-mod_evasive
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2014-11-10 17:28:46.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new/apache2-mod_evasive.changes
2014-11-26 10:33:38.0 +0100
@@ -1,0 +2,6 @@
+Mon Nov 10 16:15:00 UTC 2014 - jeng...@inai.de
+
+- Add mail-invocation.diff: Use -t parameter with the mail program
+ [boo#884877]; add recommends on mailx so that that can work
+
+---
New:
mail-invocation.diff
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.L2FtsE/_old 2014-11-26 10:33:39.0 +0100
+++ /var/tmp/diff_new_pack.L2FtsE/_new 2014-11-26 10:33:39.0 +0100
@@ -37,6 +37,7 @@
Source:
http://zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_%version.tar.gz
Source2:mod_evasive.conf
Patch1: modev-return.diff
+Patch2: mail-invocation.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
@@ -44,6 +45,7 @@
BuildRequires: curl-devel
BuildRequires: gcc-c++
BuildRequires: pcre-devel
+Recommends: mailx
Requires: %apache_mmn
Requires: apache2
@@ -57,7 +59,7 @@
%prep
%setup -qn mod_evasive
-%patch -P 1 -p1
+%patch -P 1 -P 2 -p1
%build
cp -a %{S:2} .
@@ -82,7 +84,7 @@
%files
%defattr(-,root,root)
-%apache_libexecdir/mod_evasive%{ap_suffix}.so
+%apache_libexecdir/
%config(noreplace) %apache_sysconfdir/conf.d/mod_evasive.conf
%doc CHANGELOG LICENSE README test.pl
++ mail-invocation.diff ++
diff -uNr mod_evasive.orig/mod_evasive20.c mod_evasive/mod_evasive20.c
--- mod_evasive.orig/mod_evasive20.c2014-05-22 08:49:48.255033765 +0200
+++ mod_evasive/mod_evasive20.c 2014-05-22 10:35:52.362010725 +0200
@@ -42,7 +42,7 @@
/* BEGIN DoS Evasive Maneuvers Definitions */
-#define MAILER /bin/mail %s
+#define MAILER /usr/bin/mail -t %s
#define LOG( A, ... ) { openlog(mod_evasive, LOG_PID, LOG_DAEMON); syslog(
A, __VA_ARGS__ ); closelog(); }
#define DEFAULT_HASH_TBL_SIZE 3097ul // Default hash table size
diff -uNr mod_evasive.orig/mod_evasiveNSAPI.c mod_evasive/mod_evasiveNSAPI.c
--- mod_evasive.orig/mod_evasiveNSAPI.c 2005-10-08 19:47:21.0 +0200
+++ mod_evasive/mod_evasiveNSAPI.c 2014-05-22 10:36:04.309558479 +0200
@@ -50,7 +50,7 @@
/* BEGIN DoS Evasive Maneuvers Definitions */
#define DEFAULT_LOG_DIR /tmp
-#define MAILER /bin/mail %s
+#define MAILER /usr/bin/mail -t %s
#define LOG( A, ... ) { openlog(mod_dosevasive, LOG_PID, LOG_DAEMON);
syslog( A, __VA_ARGS__ ); closelog(); }
#define DEFAULT_HASH_TBL_SIZE 3097ul // Default hash table size
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2014-11-10 17:28:34
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new (New)
Package is apache2-mod_evasive
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2014-10-15 08:52:18.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new/apache2-mod_evasive.changes
2014-11-10 17:28:46.0 +0100
@@ -1,0 +2,5 @@
+Fri Oct 31 08:34:11 UTC 2014 - pgaj...@suse.com
+
+- use apache rpm macros
+
+---
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.lbZN0C/_old 2014-11-10 17:28:47.0 +0100
+++ /var/tmp/diff_new_pack.lbZN0C/_new 2014-11-10 17:28:47.0 +0100
@@ -16,6 +16,11 @@
#
+%if %apache_branch == 2.4
+%define ap_suffix 24
+%else
+%define ap_suffix 20
+%endif
Name: apache2-mod_evasive
Version:1.10.1
Release:0
@@ -33,24 +38,12 @@
Source2:mod_evasive.conf
Patch1: modev-return.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: apache2-prefork
BuildRequires: curl-devel
BuildRequires: gcc-c++
BuildRequires: pcre-devel
-
-%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o
2\\.[0-9]+)
-%if %{apache_branch} == 2.4
- %define ap_suffix 24
- %define apxs %{_bindir}/apxs2
-%else
- %define ap_suffix 20
- %define apxs %{_sbindir}/apxs2
-%endif
-%define apache_libexecdir %(%apxs -q LIBEXECDIR)
-%define apache_sysconfdir %(%apxs -q SYSCONFDIR)
-%define apache_mmn%(MMN=$(%apxs -q LIBEXECDIR)_MMN; test -x $MMN
$MMN)
-
Requires: %apache_mmn
Requires: apache2
@@ -75,13 +68,13 @@
sed -i 's/evasive20_module/evasive24_module/' mod_evasive%{ap_suffix}.c
sed -i 's/evasive20/evasive24/g' mod_evasive.conf
%endif
-%apxs -Wc,%{optflags} -c mod_evasive%{ap_suffix}.c
+%apache_apxs -Wc,%{optflags} -c mod_evasive%{ap_suffix}.c
%install
b=%buildroot
mkdir -p $b/%apache_libexecdir $b/%apache_sysconfdir/conf.d
-%apxs -i -S LIBEXECDIR=%buildroot/%apache_libexecdir \
+%apache_apxs -i -S LIBEXECDIR=%buildroot/%apache_libexecdir \
-n mod_evasive%{ap_suffix}.so mod_evasive%{ap_suffix}.la;
cp -a mod_evasive.conf $b/%apache_sysconfdir/conf.d/;
perl -i -pe s{/usr/lib/}{%_libdir/}g \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache2-mod_evasive for openSUSE:Factory
Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2014-10-15 08:51:42
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new (New)
Package is apache2-mod_evasive
Changes:
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2013-01-29 12:00:46.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new/apache2-mod_evasive.changes
2014-10-15 08:52:18.0 +0200
@@ -1,0 +2,5 @@
+Tue Oct 14 11:56:38 UTC 2014 - pgaj...@suse.com
+
+- fixed module loading [bnc#865567], [bnc#867984]
+
+---
Other differences:
--
++ apache2-mod_evasive.spec ++
--- /var/tmp/diff_new_pack.YRPlgX/_old 2014-10-15 08:52:19.0 +0200
+++ /var/tmp/diff_new_pack.YRPlgX/_new 2014-10-15 08:52:19.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_evasive
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -67,10 +67,13 @@
%patch -P 1 -p1
%build
+cp -a %{S:2} .
%if %{ap_suffix} == 24
# create apache httpd-2.4 version and compile it
sed 's/connection-remote_ip/connection-client_ip/' \
mod_evasive20.c mod_evasive%{ap_suffix}.c
+sed -i 's/evasive20_module/evasive24_module/' mod_evasive%{ap_suffix}.c
+sed -i 's/evasive20/evasive24/g' mod_evasive.conf
%endif
%apxs -Wc,%{optflags} -c mod_evasive%{ap_suffix}.c
@@ -80,7 +83,7 @@
%apxs -i -S LIBEXECDIR=%buildroot/%apache_libexecdir \
-n mod_evasive%{ap_suffix}.so mod_evasive%{ap_suffix}.la;
-cp -a %{S:2} $b/%apache_sysconfdir/conf.d/;
+cp -a mod_evasive.conf $b/%apache_sysconfdir/conf.d/;
perl -i -pe s{/usr/lib/}{%_libdir/}g \
$b/%apache_sysconfdir/conf.d/mod_evasive.conf;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
