- rel 7

- fix for "Internal error: shGetLockedEntry", see http://ovcharov.me/2009/09/01/kak-pochinit-mod_watch/

Changed files:
    apache-mod_watch-shm-fix.patch -> 1.1
    apache-mod_watch.spec -> 1.36

diff --git a/apache-mod_watch-shm-fix.patch b/apache-mod_watch-shm-fix.patch
new file mode 100644 (file)
index 0000000..a541e5e
--- /dev/null
+++ b/apache-mod_watch-shm-fix.patch
@@ -0,0 +1,11 @@
+--- mod_watch-4.3/SharedHash.c~        2003-03-14 10:56:44.000000000 +0100
++++ mod_watch-4.3/SharedHash.c 2011-03-10 19:27:57.164192958 +0100
+@@ -99,7 +99,7 @@
+ char *
+ shVerifyString(struct shTable *tp, char *str)
+ {
+-      if ((char *) tp->shared <= str && str < (char *) tp->eshared) {
++      if ((char *) apr_shm_baseaddr_get(tp->shared) <= str && str < (char *) tp->eshared) {
+               if (str + strlen(str) < (char *) tp->eshared)
+                       return str;
+       }

diff --git a/apache-mod_watch.spec b/apache-mod_watch.spec
index 2a1b92002c72610cfe3a04b8c800b07b52fd497d..f2411f1be2353acee5f5219017946be83370a4cb 100644 (file)
--- a/apache-mod_watch.spec
+++ b/apache-mod_watch.spec
@@ -7,13 +7,14 @@ Summary:      Apache module: Monitoring Interface for MRTG
 Summary(pl.UTF-8):     Moduł do apache: Interfejs do monitorowania za pomocą MRTG
 Name:          apache-mod_%{mod_name}
 Version:       4.03
-Release:       6
+Release:       7
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.snert.com/Software/download/mod_watch%(echo %{version} | tr -d .).tgz
 # Source0-md5: 06d57713adb935f16596d22256bca913
 Source1:       %{name}.conf
 Patch0:                %{name}-apr-fix.patch
+Patch1:                %{name}-shm-fix.patch
 URL:           http://www.snert.com/Software/mod_watch/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.52-2
@@ -45,6 +46,7 @@ wspiera mod_vhost_alias oraz mod_gzip.
 %prep
 %setup -q -n mod_%{mod_name}-4.3
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} -f Makefile.dso build \