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 10:01:47
Branch: OPENPKG_2_5_SOLID Handle: 2005101609014700
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/gift-ares gift-ares.patch
Log:
MFC: workaround symbol conflict under Solaris
Summary:
Revision Changes Path
1.3.2.2 +49 -2 openpkg-src/gift-ares/gift-ares.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gift-ares/gift-ares.patch
============================================================================
$ cvs diff -u -r1.3.2.1 -r1.3.2.2 gift-ares.patch
--- openpkg-src/gift-ares/gift-ares.patch 12 Oct 2005 14:32:18 -0000
1.3.2.1
+++ openpkg-src/gift-ares/gift-ares.patch 16 Oct 2005 08:01:47 -0000
1.3.2.2
@@ -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;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
