Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20351/libs
Modified Files:
ggz-client-libs.info ggz-client-libs.patch libggz.info
libggz.patch
Log Message:
ggz workage!
Index: libggz.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libggz.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libggz.info 25 May 2005 10:04:44 -0000 1.2
+++ libggz.info 21 Jun 2005 19:39:01 -0000 1.3
@@ -1,6 +1,6 @@
Package: libggz
Version: 0.0.11
-Revision: 11
+Revision: 12
Description: GGZ Gaming Zone base library
License: LGPL
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
Index: libggz.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libggz.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libggz.patch 25 May 2005 10:04:44 -0000 1.1
+++ libggz.patch 21 Jun 2005 19:39:01 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur libggz-old/src/Makefile.in libggz-new/src/Makefile.in
---- libggz-old/src/Makefile.in 2005-05-21 09:36:03.000000000 -0400
-+++ libggz-new/src/Makefile.in 2005-05-25 03:16:52.000000000 -0400
+diff -Naur lib-old/src/Makefile.in lib-new/src/Makefile.in
+--- lib-old/src/Makefile.in 2005-05-21 09:36:03.000000000 -0400
++++ lib-new/src/Makefile.in 2005-06-19 12:50:08.000000000 -0400
@@ -220,7 +220,7 @@
lib_LTLIBRARIES = libggz.la
include_HEADERS = ggz.h ggz_common.h
@@ -10,3 +10,68 @@
libggz_la_SOURCES = conf.c \
easysock.c \
ggz.h \
+diff -Naur lib-old/src/easysock.c lib-new/src/easysock.c
+--- lib-old/src/easysock.c 2005-05-14 15:51:48.000000000 -0400
++++ lib-new/src/easysock.c 2005-06-19 19:08:04.000000000 -0400
+@@ -64,6 +64,7 @@
+ #include <stdarg.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <fcntl.h>
+
+ #include "ggz.h"
+
+@@ -150,6 +151,31 @@
+ return 0;
+ }
+
++int ggz_accept(const int sock) {
++ int newsock = accept(sock, NULL, NULL);
++ if (newsock < 0) {
++ if (_err_func)
++ (*_err_func) (strerror(errno), GGZ_IO_CREATE, sock,
GGZ_DATA_NONE);
++ switch (errno) {
++ case EWOULDBLOCK:
++ case ECONNABORTED:
++ case EINTR:
++ return -1;
++ default:
++ return 2;
++ }
++ } else {
++ int flags;
++ flags = fcntl(newsock, F_GETFL, 0);
++ if (flags != -1)
++ flags = fcntl(newsock, F_SETFL, flags & ~O_NONBLOCK);
++ if (flags == -1 && _err_func)
++ (*_err_func) (strerror(errno), GGZ_IO_CREATE, sock,
GGZ_DATA_NONE);
++
++ return newsock;
++ }
++}
++
+
+ static int es_bind(const char *host, int port)
+ {
+diff -Naur lib-old/src/ggz.h lib-new/src/ggz.h
+--- lib-old/src/ggz.h 2005-05-21 06:19:22.000000000 -0400
++++ lib-new/src/ggz.h 2005-06-19 17:24:13.000000000 -0400
+@@ -1311,6 +1311,18 @@
+ GGZ_SOCK_CLIENT /**< Connect to a particular port of a server. */
+ } GGZSockType;
+
++/** @brief Accept a socket connection.
++ *
++ * This function accepts a new socket connection, on an existing socket,
++ * returning the new socket connection. It ensures that the new socket is
++ * blocking.
++ *
++ * @param sock The existing socket on which to accept a connection.
++ * @return File descriptor on success, -1 on an error where the call may be
++ * retried, -2 on other error
++ */
++int ggz_accept(const int sock);
++
+ /** @brief Make a socket connection.
+ *
+ * This function makes a TCP socket connection.
Index: ggz-client-libs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/ggz-client-libs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ggz-client-libs.patch 25 May 2005 10:04:44 -0000 1.2
+++ ggz-client-libs.patch 21 Jun 2005 19:39:01 -0000 1.3
@@ -1,7 +1,7 @@
-diff -Naur ggz-client-libs-0.0.11/ggz-config-fake
ggz-client-libs-new/ggz-config-fake
---- ggz-client-libs-0.0.11/ggz-config-fake 1969-12-31 19:00:00.000000000
-0500
-+++ ggz-client-libs-new/ggz-config-fake 2005-05-25 04:09:39.000000000
-0400
-@@ -0,0 +1,43 @@
+diff -Naur client-old/ggz-config-fake client-new/ggz-config-fake
+--- client-old/ggz-config-fake 1969-12-31 19:00:00.000000000 -0500
++++ client-new/ggz-config-fake 2005-06-21 10:30:43.000000000 -0400
+@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+use Getopt::Long;
@@ -16,14 +16,14 @@
+ exec("$prefix/bin/ggz-config", @ARGV);
+}
+
-+my $destdir = $ENV{DESTDIR} or die "No DESTDIR specified!";
++my $destdir = $ENV{DESTDIR} or die "ERROR: No DESTDIR specified!\n";
+
+my $moddir = "$destdir/$prefix/share/ggz/modules/$pkg";
+
+my $modfile;
+Getopt::Long::Configure qw(bundling pass_through);
+GetOptions("modfile=s" => \$modfile);
-+defined $modfile || die "No module file specified!";
++die "ERROR: No module file specified!\n" unless defined $modfile;
+
+# Get a name
+my $destfile;
@@ -35,19 +35,16 @@
+ }
+}
+close MOD;
-+
-+if (!defined $destfile || -f $destfile) {
-+ # Choose a better name
-+ (undef, $destfile) = tempfile("moduleXXXXXX", DIR => $moddir,
-+ SUFFIX => ".dsc", UNLINK => 0);
-+}
++die "Can't find a name for this module!\n" unless defined $destfile;
++print "WARNING: Module already exists!\n" if -f $destfile;
+
+print "Installing module file to $destfile\n";
-+system("mkdir -p \Q$moddir\E") == 0 or die "Can't create module directory";
-+copy($modfile, $destfile) or die "Can't copy module file";
-diff -Naur ggz-client-libs-0.0.11/ggzmod/Makefile.in
ggz-client-libs-new/ggzmod/Makefile.in
---- ggz-client-libs-0.0.11/ggzmod/Makefile.in 2005-05-21 12:24:00.000000000
-0400
-+++ ggz-client-libs-new/ggzmod/Makefile.in 2005-05-25 04:10:15.000000000
-0400
++system("mkdir -p \Q$moddir\E") == 0
++ or die "ERROR: Can't create module directory!\n";
++copy($modfile, $destfile) or die "ERROR: Can't copy module file!\n";
+diff -Naur client-old/ggzmod/Makefile.in client-new/ggzmod/Makefile.in
+--- client-old/ggzmod/Makefile.in 2005-05-21 12:24:00.000000000 -0400
++++ client-new/ggzmod/Makefile.in 2005-06-21 10:15:21.000000000 -0400
@@ -215,7 +215,7 @@
include_HEADERS = ggzmod.h
@@ -57,3 +54,24 @@
AM_CPPFLAGS = $(LIBGGZ_INCLUDES) -I$(top_srcdir)/ggzcore
all: all-am
+diff -Naur client-old/ggzmod-ggz/ggzmod-ggz.c
client-new/ggzmod-ggz/ggzmod-ggz.c
+--- client-old/ggzmod-ggz/ggzmod-ggz.c 2005-05-07 12:45:01.000000000 -0400
++++ client-new/ggzmod-ggz/ggzmod-ggz.c 2005-06-21 10:15:21.000000000 -0400
+@@ -824,7 +824,7 @@
+ /* FIXME: we need to select, with a maximum timeout. */
+ /* FIXME: this is insecure; it should be restricted to local
+ * connections. */
+- sock2 = accept(sock, NULL, NULL);
++ sock2 = ggz_accept(sock);
+ if (sock2 < 0) {
+ ggz_error_sys("Listening to socket failed.");
+ return -1;
+@@ -889,7 +889,7 @@
+ /* FIXME: we need to select, with a maximum timeout. */
+ /* FIXME: this is insecure; it should be restricted to local
+ * connections. */
+- sock2 = accept(sock, NULL, NULL);
++ sock2 = ggz_accept(sock);
+ if (sock2 < 0) {
+ ggz_error_sys("Listening to socket failed.");
+ return -1;
Index: ggz-client-libs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/ggz-client-libs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ggz-client-libs.info 25 May 2005 10:04:44 -0000 1.2
+++ ggz-client-libs.info 21 Jun 2005 19:39:00 -0000 1.3
@@ -1,12 +1,12 @@
Package: ggz-client-libs
Version: 0.0.11
-Revision: 11
+Revision: 12
Description: GGZ Gaming Zone core client libraries
License: LGPL
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
BuildDepends: <<
- expat, libggz-crypto (>= %v-11) | libggz (>= %v-11), gettext-dev,
+ expat, libggz-crypto (>= %v-12) | libggz (>= %v-12), gettext-dev,
gettext-bin, gettext-tools, libiconv-dev
<<
Depends: %N-shlibs (= %v-%r)
@@ -55,7 +55,7 @@
Package: %N-shlibs
Depends: <<
expat-shlibs, gettext, libiconv,
- libggz-crypto-shlibs (>= %v-1) | libggz-shlibs (>= %v-1)
+ libggz-crypto-shlibs (>= %v-12) | libggz-shlibs (>= %v-12)
<<
Files: lib/*.*.dylib
Shlibs: <<
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
