[csw-devel] SF.net SVN: gar:[9911] csw/mgar/pkg/libserf/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9911
          http://gar.svn.sourceforge.net/gar/?rev=9911&view=rev
Author:   dmichelsen
Date:     2010-05-17 20:19:43 +0000 (Mon, 17 May 2010)

Log Message:
-----------
libserf: Add patches

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile
    csw/mgar/pkg/libserf/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2010-05-17 16:10:44 UTC (rev 9910)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2010-05-17 20:19:43 UTC (rev 9911)
@@ -14,21 +14,29 @@
 
 MASTER_SITES = http://serf.googlecode.com/files/
 DISTFILES  = $(DISTNAME).tar.bz2
+PATCHFILES = 0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch
 
 RUNTIME_DEP_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2
 
+LICENSE = LICENSE
+
+# Make sure the current directory comes before everything else
+INCLUDE_FLAGS = -I. -I$(includedir)
+
+# We don't need it and if defined the test breaks
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
 CONFIGURE_ARGS = $(DIRPATHS)
+# CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config
 CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config
 
 TEST_TARGET = check
 
-CHECKPKG_OVERRIDES_CSWlibserf += license-missing
-
-
 include gar/category.mk
 
 #EXTRA_LDFLAGS = -R/opt/csw/bdb44/lib

Modified: csw/mgar/pkg/libserf/trunk/checksums
===================================================================
--- csw/mgar/pkg/libserf/trunk/checksums	2010-05-17 16:10:44 UTC (rev 9910)
+++ csw/mgar/pkg/libserf/trunk/checksums	2010-05-17 20:19:43 UTC (rev 9911)
@@ -1 +1,2 @@
+85656f49ab1a0a811b620f4b177d8c5a  0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch
 14267fa2b49aa3484366e713970384a5  serf-0.6.1.tar.bz2

Added: csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch
===================================================================
--- csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch	                        (rev 0)
+++ csw/mgar/pkg/libserf/trunk/files/0001-Do-not-cast-lvalue-as-left-side-is-already-of-type-c.patch	2010-05-17 20:19:43 UTC (rev 9911)
@@ -0,0 +1,25 @@
+From 6c411f42f71cab30ee81d30b142596ad331cdeb8 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 17 May 2010 22:15:13 +0200
+Subject: [PATCH] Do not cast lvalue as left side is already of type char*
+
+---
+ outgoing.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/outgoing.c b/outgoing.c
+index 11d58aa..b4b3a50 100644
+--- a/outgoing.c
++++ b/outgoing.c
+@@ -470,7 +470,7 @@ static apr_status_t socket_writev(serf_connection_t *conn)
+                             sizeof(struct iovec) * (conn->vec_len - i));
+                     conn->vec_len -= i;
+                 }
+-                ((char *) conn->vec[0].iov_base) += conn->vec[0].iov_len - (len - written);
++                conn->vec[0].iov_base += conn->vec[0].iov_len - (len - written);
+                 conn->vec[0].iov_len = len - written;
+                 break;
+             }
+-- 
+1.7.0
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.