OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Oct-2005 09:59:46
Branch: HEAD Handle: 2005101608594500
Modified files:
openpkg-src/gift-ares gift-ares.patch gift-ares.spec
Log:
workaround symbol conflict under Solaris
Summary:
Revision Changes Path
1.5 +49 -2 openpkg-src/gift-ares/gift-ares.patch
1.4 +1 -1 openpkg-src/gift-ares/gift-ares.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gift-ares/gift-ares.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 gift-ares.patch
--- openpkg-src/gift-ares/gift-ares.patch 12 Oct 2005 08:31:21 -0000
1.4
+++ openpkg-src/gift-ares/gift-ares.patch 16 Oct 2005 07:59:45 -0000
1.5
@@ -1,6 +1,6 @@
Index: lib/as_session.c
---- lib/as_session.c.orig 2005-10-12 09:38:49 +0200
-+++ lib/as_session.c 2005-10-12 09:41:43 +0200
+--- lib/as_session.c.orig 2005-10-12 09:38:49.000000000 +0200
++++ lib/as_session.c 2005-10-16 09:53:54.187758341 +0200
@@ -401,7 +401,7 @@
/* hardcoded zero byte (only if original nonce is used) */
as_packet_put_8 (packet, 0x00);
@@ -19,3 +19,50 @@
{
AS_ERR ("Handshake nonce2 creation failed");
as_packet_free (packet);
+Index: lib/as_upload_man.c
+--- lib/as_upload_man.c.orig 2005-01-01 02:56:59.000000000 +0100
++++ lib/as_upload_man.c 2005-10-16 09:55:34.896795729 +0200
+@@ -16,7 +16,7 @@
+
+
/*****************************************************************************/
+
+-struct queue
++struct xqueue
+ {
+ in_addr_t host;
+ time_t time;
+@@ -341,14 +341,14 @@
+ * specified to ignore beyond, so that we can avoid timing out entries
+ * if later entries haven't pinged us yet.
+ */
+-static void tidy_queue (ASUpMan *man, struct queue *last)
++static void tidy_queue (ASUpMan *man, struct xqueue *last)
+ {
+ List *l, *next;
+ time_t t = time (NULL);
+
+ for (l = man->queue; l; l = next)
+ {
+- struct queue *q = l->data;
++ struct xqueue *q = l->data;
+
+ next = l->next; /* to avoid referencing freed data
+ * should we choose to remove this
+@@ -372,7 +372,7 @@
+ {
+ ASUpload *up;
+ List *l;
+- struct queue *q = NULL;
++ struct xqueue *q = NULL;
+ int i;
+
+ #ifdef VERIFY_ACTIVE_COUNT
+@@ -431,7 +431,7 @@
+ if (!l)
+ {
+ /* not queued; insert at end */
+- q = malloc (sizeof(struct queue));
++ q = malloc (sizeof(struct xqueue));
+
+ if (!q)
+ return -1;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gift-ares/gift-ares.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 gift-ares.spec
--- openpkg-src/gift-ares/gift-ares.spec 12 Oct 2005 08:31:21 -0000
1.3
+++ openpkg-src/gift-ares/gift-ares.spec 16 Oct 2005 07:59:45 -0000
1.4
@@ -35,7 +35,7 @@
Group: Network
License: GPL
Version: 0.2.2
-Release: 20051012
+Release: 20051016
# list of sources
# Source0:
http://download.berlios.de/gift-ares/gift-ares-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
