rpms/mod_auth_pgsql/devel mod_auth_pgsql-2.0.1-apr1x.patch, NONE, 1.1 mod_auth_pgsql.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/mod_auth_pgsql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5060

Modified Files:
	mod_auth_pgsql.spec 
Added Files:
	mod_auth_pgsql-2.0.1-apr1x.patch 
Log Message:
* Mon Dec  5 2005 Joe Orton <jorton at redhat.com> 2.0.1-9
- rebuild for httpd-2.2
- don't strip DSO so debuginfo works


mod_auth_pgsql-2.0.1-apr1x.patch:
 mod_auth_pgsql.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE mod_auth_pgsql-2.0.1-apr1x.patch ---
--- mod_auth_pgsql-2.0.1/mod_auth_pgsql.c.apr1x
+++ mod_auth_pgsql-2.0.1/mod_auth_pgsql.c
@@ -432,16 +432,16 @@
 
 static char *auth_pg_md5(char *pw)
 {
-	unsigned char digest[MD5_DIGESTSIZE];
-	static unsigned char md5hash[MD5_DIGESTSIZE * 2 + 1];
+	unsigned char digest[APR_MD5_DIGESTSIZE];
+	static unsigned char md5hash[APR_MD5_DIGESTSIZE * 2 + 1];
 	int i;
 
 	apr_md5(digest, (const unsigned char *) pw, strlen(pw));
 
-	for (i = 0; i < MD5_DIGESTSIZE; i++)
+	for (i = 0; i < APR_MD5_DIGESTSIZE; i++)
 		apr_snprintf((char *) &md5hash[i + i], 3, "%02x", digest[i]);
 
-	md5hash[MD5_DIGESTSIZE * 2] = '\0';
+	md5hash[APR_MD5_DIGESTSIZE * 2] = '\0';
 	return (char *) md5hash;
 }
 
@@ -453,7 +453,7 @@
 	if (auth_pgsql_pool == NULL)
 		return NULL;
 
-	return ap_pbase64encode(auth_pgsql_pool, pw);
+	return apr_pbase64encode(auth_pgsql_pool, pw);
 }
 
 
@@ -580,7 +580,7 @@
 			return NULL;
 		}
 
-		if (!(result = (char *) ap_palloc(r->pool, strlen(val) + 1))) {
+		if (!(result = (char *) ap_pcalloc(r->pool, strlen(val) + 1))) {
 			apr_snprintf(pg_errstr, MAX_STRING_LEN,
 						 "Could not get memory for Postgres query.");
 			PQclear(pg_result);


Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_auth_pgsql.spec	13 Apr 2005 08:18:03 -0000	1.18
+++ mod_auth_pgsql.spec	5 Dec 2005 12:18:32 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Basic authentication for the Apache web server using a PostgreSQL database.
 Name: mod_auth_pgsql
 Version: 2.0.1
-Release: 8
+Release: 9
 Group: System Environment/Daemons
 URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch1: mod_auth_pgsql-2.0.1-pgconn.patch
 Patch2: mod_auth_pgsql-2.0.1-static.patch
 Patch3: mod_auth_pgsql-2.0.1-crasher.patch
+Patch4: mod_auth_pgsql-2.0.1-apr1x.patch
 License: Apache Software License
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: httpd-devel >= 2.0.40-6, postgresql-devel
@@ -28,16 +29,15 @@
 %patch1 -p1 -b .pgconn
 %patch2 -p1 -b .static
 %patch3 -p1 -b .crasher
+%patch4 -p1 -b .apr1x
 
 %build
 %{_sbindir}/apxs -c %{name}.c -lpq
-mv .libs/%{name}.so .
-%{__strip} -g %{name}.so
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
-install -m755 %{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
+install -m755 .libs/%{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 
 # Install the config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
@@ -59,6 +59,10 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Mon Dec  5 2005 Joe Orton <jorton at redhat.com> 2.0.1-9
+- rebuild for httpd-2.2
+- don't strip DSO so debuginfo works
+
 * Wed Apr 13 2005 Joe Orton <jorton at redhat.com> 2.0.1-8
 - rebuild for new libpq