OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Aug-2002 17:06:16
Branch: HEAD Handle: 2002081916061600
Added files:
openpkg-src/mysql mysql.patch
Modified files:
openpkg-src/mysql mysql.spec
Log:
Cast variables to repair Solaris building.
Summary:
Revision Changes Path
1.1 +33 -0 openpkg-src/mysql/mysql.patch
1.32 +2 -0 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
Index: openpkg-src/mysql/mysql.patch
============================================================
$ cvs update -p -r1.1 mysql.patch
diff -Naur mysql-3.23.52.orig/sql/mini_client.cc mysql-3.23.52/sql/mini_client.cc
--- mysql-3.23.52.orig/sql/mini_client.cc Mon Aug 19 15:47:00 2002
+++ mysql-3.23.52/sql/mini_client.cc Mon Aug 19 15:48:44 2002
@@ -318,7 +318,7 @@
*/
s_err=0;
- if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, &s_err_size) != 0)
+ if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, (socklen_t *)&s_err_size)
!= 0)
return(-1);
if (s_err)
diff -Naur mysql-3.23.52.orig/sql/mysqld.cc mysql-3.23.52/sql/mysqld.cc
--- mysql-3.23.52.orig/sql/mysqld.cc Mon Aug 19 15:47:01 2002
+++ mysql-3.23.52/sql/mysqld.cc Mon Aug 19 15:49:01 2002
@@ -2407,7 +2407,7 @@
{
size_socket length=sizeof(struct sockaddr_in);
new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
- &length);
+ (socklen_t *)&length);
if (new_sock != INVALID_SOCKET ||
(socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN))
break;
@@ -2473,7 +2473,7 @@
size_socket dummyLen;
struct sockaddr dummy;
dummyLen = sizeof(struct sockaddr);
- if (getsockname(new_sock,&dummy, &dummyLen) < 0)
+ if (getsockname(new_sock,&dummy, (socklen_t *)&dummyLen) < 0)
{
sql_perror("Error on new connection socket");
(void) shutdown(new_sock,2);
Index: openpkg-src/mysql/mysql.spec
============================================================
$ cvs diff -u -r1.31 -r1.32 mysql.spec
--- openpkg-src/mysql/mysql.spec 19 Aug 2002 09:05:00 -0000 1.31
+++ openpkg-src/mysql/mysql.spec 19 Aug 2002 15:06:16 -0000 1.32
@@ -52,6 +52,7 @@
Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-3.23/mysql-%{version}.tar.gz
Source1: my.cnf
Source2: rc.mysql
+Patch0: mysql.patch
# build information
Prefix: %{l_prefix}
@@ -76,6 +77,7 @@
%prep
%setup -q
+ %patch0 -p1
%build
PATH="%{l_prefix}/bin:$PATH"; export PATH
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
