packages: apache-mod_watch/apache-mod_watch.spec, apache-mod_watch/apache-m...

[baggins]

Author: baggins                      Date: Thu Mar 10 18:30:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7
- fix for "Internal error: shGetLockedEntry", see http://ovcharov.me/2009/09/01/kak-pochinit-mod_watch/

---- Files affected:
packages/apache-mod_watch:
   apache-mod_watch.spec (1.35 -> 1.36) , apache-mod_watch-shm-fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/apache-mod_watch/apache-mod_watch.spec
diff -u packages/apache-mod_watch/apache-mod_watch.spec:1.35 packages/apache-mod_watch/apache-mod_watch.spec:1.36
--- packages/apache-mod_watch/apache-mod_watch.spec:1.35	Tue Feb  3 09:25:56 2009
+++ packages/apache-mod_watch/apache-mod_watch.spec	Thu Mar 10 19:30:18 2011
@@ -8,13 +8,14 @@
 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
@@ -46,6 +47,7 @@
 %prep
 %setup -q -n mod_%{mod_name}-4.3
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} -f Makefile.dso build \
@@ -83,6 +85,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2011/03/10 18:30:18  baggins
+- rel 7
+- fix for "Internal error: shGetLockedEntry", see http://ovcharov.me/2009/09/01/kak-pochinit-mod_watch/
+
 Revision 1.35  2009/02/03 08:25:56  glen
 - no httpd.conf dir provided in th; rel 6
 

================================================================
Index: packages/apache-mod_watch/apache-mod_watch-shm-fix.patch
diff -u /dev/null packages/apache-mod_watch/apache-mod_watch-shm-fix.patch:1.1
--- /dev/null	Thu Mar 10 19:30:23 2011
+++ packages/apache-mod_watch/apache-mod_watch-shm-fix.patch	Thu Mar 10 19:30:18 2011
@@ -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;
+ 	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_watch/apache-mod_watch.spec?r1=1.35&r2=1.36&f=u