rpms/httpd/devel httpd-2.0.48-davmisc.patch, 1.5, 1.6 httpd.spec, 1.70, 1.71

[fedora-cvs-commits redhat com]

Author: jorton

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18322

Modified Files:
	httpd-2.0.48-davmisc.patch httpd.spec 
Log Message:
* Thu Jun 30 2005 Joe Orton <jorton redhat com> 2.0.54-11
- mod_dav_fs: fix uninitialized variable (#162144)
- add epoch to dependencies as appropriate
- mod_ssl: drop dependencies on dev, make
- mod_ssl: mark post script dependencies as such


httpd-2.0.48-davmisc.patch:
 repos.c |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

Index: httpd-2.0.48-davmisc.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd-2.0.48-davmisc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd-2.0.48-davmisc.patch	18 Apr 2005 08:10:30 -0000	1.5
+++ httpd-2.0.48-davmisc.patch	26 Jul 2005 12:07:19 -0000	1.6
@@ -31,6 +31,7 @@
 +    /* Determine permissions to use for destination */
 +    if (src_finfo && src_finfo->valid & APR_FINFO_PROT
 +        && src_finfo->protection & APR_UEXECUTE) {
++        perms = src_finfo->protection;
 +        if (dst_finfo != NULL) {
 +            /* chmod it if it already exist */
 +            if (apr_file_perms_set(dst, perms)) {
@@ -38,7 +39,6 @@
 +                                     "Could not set permissions on destination");
 +            }
 +        }
-+        perms = src_finfo->protection;
 +    } 
 +    else {
 +        perms = APR_OS_DEFAULT;


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- httpd.spec	23 May 2005 12:10:13 -0000	1.70
+++ httpd.spec	26 Jul 2005 12:07:19 -0000	1.71
@@ -94,7 +94,8 @@
 Group: Development/Libraries
 Summary: Development tools for the Apache HTTP server.
 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
-Requires: apr-devel, apr-util-devel, httpd = %{version}, pcre-devel >= 5.0
+Requires: apr-devel, apr-util-devel, pcre-devel >= 0:5.0
+Requires: httpd = %{epoch}:%{version}-%{release}
 
 %description devel
 The httpd-devel package contains the APXS binary and other files
@@ -108,7 +109,7 @@
 %package manual
 Group: Documentation
 Summary: Documentation for the Apache HTTP server.
-Requires: httpd = %{version}-%{release}
+Requires: httpd = %{epoch}:%{version}-%{release}
 Obsoletes: secureweb-manual, apache-manual
 
 %description manual
@@ -121,8 +122,8 @@
 Summary: SSL/TLS module for the Apache HTTP server
 Epoch: 1
 BuildRequires: openssl-devel, distcache-devel
-Requires(pre): openssl >= 0.9.7f-4, dev, /bin/cat
-Requires: httpd = %{version}-%{release}, make, httpd-mmn = %{mmn}
+Requires(post): openssl >= 0.9.7f-4, /bin/cat
+Requires: httpd = %{epoch}:%{version}-%{release}, httpd-mmn = %{mmn}
 Obsoletes: stronghold-mod_ssl
 
 %description -n mod_ssl
@@ -546,6 +547,12 @@
 %{_libdir}/httpd/build/libtool
 
 %changelog
+* Thu Jun 30 2005 Joe Orton <jorton redhat com> 2.0.54-11
+- mod_dav_fs: fix uninitialized variable (#162144)
+- add epoch to dependencies as appropriate
+- mod_ssl: drop dependencies on dev, make
+- mod_ssl: mark post script dependencies as such
+
 * Mon May 23 2005 Joe Orton <jorton redhat com> 2.0.54-10
 - remove broken symlink (Robert Scheck, #158404)