Accepting request 286232 from Apache:Modules

1

OBS-URL: https://build.opensuse.org/request/show/286232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_security2?expand=0&rev=18

apache2-mod_security2-no_rpath.diff

@@ -1,23 +1,19 @@
-diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.am ./apache2/Makefile.am
+--- ../modsecurity-2.9.0-o/apache2/Makefile.am	2015-02-12 20:08:30.000000000 +0100
---- ../modsecurity-2.8.0-o/apache2/Makefile.am	2014-04-15 14:44:04.000000000 +0200
++++ ./apache2/Makefile.am	2015-02-14 18:55:11.762837073 +0100
-+++ ./apache2/Makefile.am	2014-06-16 16:17:44.000000000 +0200
+@@ -91,61 +91,61 @@
-@@ -73,61 +73,61 @@
-     @APXS_LDFLAGS@ \
-     @LIBXML2_LDFLAGS@ \
-     @LUA_LDFLAGS@ \
-     @PCRE_LDFLAGS@ \
-     @YAJL_LDFLAGS@
- endif
  
  if MACOSX
  mod_security2_la_LDFLAGS = -module -avoid-version \
      @APR_LDFLAGS@ \
      @APU_LDFLAGS@ \
      @APXS_LDFLAGS@ \
+     @CURL_LDFLAGS@ \
+     @LIBXML2_CFLAGS@ \
      @LIBXML2_LDFLAGS@ \
      @LUA_LDFLAGS@ \
      @PCRE_LDFLAGS@ \
-     @YAJL_LDFLAGS@
+     @YAJL_LDFLAGS@ \
+     @SSDEEP_LDFLAGS@
  endif
  
  if SOLARIS
@@ -25,10 +21,13 @@ diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.am ./apache2/Makefile.am
      @APR_LDFLAGS@ \
      @APU_LDFLAGS@ \
      @APXS_LDFLAGS@ \
+     @CURL_LDFLAGS@ \
+     @LIBXML2_CFLAGS@ \
      @LIBXML2_LDFLAGS@ \
      @LUA_LDFLAGS@ \
      @PCRE_LDFLAGS@ \
-     @YAJL_LDFLAGS@
+     @YAJL_LDFLAGS@ \
+     @SSDEEP_LDFLAGS@
  endif
  
  if LINUX
@@ -37,10 +36,13 @@ diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.am ./apache2/Makefile.am
      @APR_LDFLAGS@ \
      @APU_LDFLAGS@ \
      @APXS_LDFLAGS@ \
+     @CURL_LDFLAGS@ \
+     @LIBXML2_CFLAGS@ \
      @LIBXML2_LDFLAGS@ \
      @LUA_LDFLAGS@ \
      @PCRE_LDFLAGS@ \
-     @YAJL_LDFLAGS@
+     @YAJL_LDFLAGS@ \
+     @SSDEEP_LDFLAGS@
  endif
  
  if FREEBSD
@@ -48,41 +50,22 @@ diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.am ./apache2/Makefile.am
      @APR_LDFLAGS@ \
      @APU_LDFLAGS@ \
      @APXS_LDFLAGS@ \
+     @CURL_LDFLAGS@ \
+     @LIBXML2_CFLAGS@ \
      @LIBXML2_LDFLAGS@ \
      @LUA_LDFLAGS@ \
      @PCRE_LDFLAGS@ \
-     @YAJL_LDFLAGS@
+     @YAJL_LDFLAGS@ \
+     @SSDEEP_LDFLAGS@
  endif
  
  if OPENBSD
  mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
      @APR_LDFLAGS@ \
      @APU_LDFLAGS@ \
-     @APXS_LDFLAGS@ \
+--- ../modsecurity-2.9.0-o/apache2/Makefile.in	2015-02-12 20:08:45.000000000 +0100
-     @LIBXML2_LDFLAGS@ \
++++ ./apache2/Makefile.in	2015-02-14 18:54:58.781828724 +0100
-     @LUA_LDFLAGS@ \
+@@ -651,61 +651,61 @@
-     @PCRE_LDFLAGS@ \
-     @YAJL_LDFLAGS@
- endif
-diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.in ./apache2/Makefile.in
---- ../modsecurity-2.8.0-o/apache2/Makefile.in	2014-04-15 14:44:14.000000000 +0200
-+++ ./apache2/Makefile.in	2014-06-16 16:18:03.000000000 +0200
-@@ -600,61 +600,61 @@
- 	  else :; fi; \
- 	done; \
- 	test -z "$$list2" || { \
- 	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
- 	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
- 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
- 	}
- 
- uninstall-pkglibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- 	for p in $$list; do \
- 	  $(am__strip_dir) \
- 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
  	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
  	done
  
@@ -96,6 +79,21 @@ diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.in ./apache2/Makefile.in
  	  echo rm -f $${locs}; \
  	  rm -f $${locs}; \
  	}
+ libinjection/$(am__dirstamp):
+ 	@$(MKDIR_P) libinjection
+ 	@: > libinjection/$(am__dirstamp)
+ libinjection/$(DEPDIR)/$(am__dirstamp):
+ 	@$(MKDIR_P) libinjection/$(DEPDIR)
+ 	@: > libinjection/$(DEPDIR)/$(am__dirstamp)
+ libinjection/mod_security2_la-libinjection_html5.lo:  \
+ 	libinjection/$(am__dirstamp) \
+ 	libinjection/$(DEPDIR)/$(am__dirstamp)
+ libinjection/mod_security2_la-libinjection_sqli.lo:  \
+ 	libinjection/$(am__dirstamp) \
+ 	libinjection/$(DEPDIR)/$(am__dirstamp)
+ libinjection/mod_security2_la-libinjection_xss.lo:  \
+ 	libinjection/$(am__dirstamp) \
+ 	libinjection/$(DEPDIR)/$(am__dirstamp)
  
  mod_security2.la: $(mod_security2_la_OBJECTS) $(mod_security2_la_DEPENDENCIES) $(EXTRA_mod_security2_la_DEPENDENCIES) 
 -	$(AM_V_CCLD)$(mod_security2_la_LINK) -rpath $(pkglibdir) $(mod_security2_la_OBJECTS) $(mod_security2_la_LIBADD) $(LIBS)
@@ -103,6 +101,8 @@ diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.in ./apache2/Makefile.in
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
+ 	-rm -f libinjection/*.$(OBJEXT)
+ 	-rm -f libinjection/*.lo
  
  distclean-compile:
  	-rm -f *.tab.c
@@ -111,9 +111,6 @@ diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.in ./apache2/Makefile.in
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-apache2_config.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-apache2_io.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-apache2_util.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-libinjection_html5.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-libinjection_sqli.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-libinjection_xss.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-mod_security2.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-modsecurity.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_crypt.Plo@am__quote@
@@ -126,6 +123,7 @@ diff -rNU 30 ../modsecurity-2.8.0-o/apache2/Makefile.in ./apache2/Makefile.in
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_parsers.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_pcre.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_release.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_remote_rules.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_reqbody.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_status_engine.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_security2_la-msc_tree.Plo@am__quote@

apache2-mod_security2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Feb 14 17:51:49 UTC 2015 - thomas.worm@sicsec.de
+
+- Raised to version 2.9.0
+- Updated patch: apache2-mod_security2-no_rpath.diff
+  (adapted lines)
+
 -------------------------------------------------------------------
 Mon Nov  3 09:41:02 UTC 2014 - pgajdos@suse.com
 

apache2-mod_security2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache2-mod_security2
 #
-# 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
@@ -22,8 +22,9 @@
 %define usrsharedir %{_datadir}/%{name}
 %define refman Reference-Manual.html
 %define faq ModSecurity-Frequently-Asked-Questions-FAQ.html
+
 Name:           apache2-mod_security2
-Version:        2.8.0
+Version:        2.9.0
 Release:        0
 #
 Summary:        ModSecurity Open Source Web Application Firewall

modsecurity-2.8.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5cbbc7fc993d39106b653213753d25c4ec21771eee17b01b69122ccf3f73460e
-size 3940357

modsecurity-2.9.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434
+size 4246467