[csw-devel] SF.net SVN: gar:[12075] csw/mgar/pkg/pacparser/trunk

[dmichelsen at users.sourceforge.net]

Revision: 12075
          http://gar.svn.sourceforge.net/gar/?rev=12075&view=rev
Author:   dmichelsen
Date:     2010-12-23 19:37:42 +0000 (Thu, 23 Dec 2010)

Log Message:
-----------
pacparser: Update to 1.2.7 and remove accepted upstream patches

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

Removed Paths:
-------------
    csw/mgar/pkg/pacparser/trunk/files/0002-Fix-nullpointer-bug.patch
    csw/mgar/pkg/pacparser/trunk/files/0008-Always-set-myIpAddr-to-127.0.0.1-or-tests-on-current.patch

Modified: csw/mgar/pkg/pacparser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pacparser/trunk/Makefile	2010-12-23 01:57:41 UTC (rev 12074)
+++ csw/mgar/pkg/pacparser/trunk/Makefile	2010-12-23 19:37:42 UTC (rev 12075)
@@ -1,7 +1,6 @@
 # $Id$
 NAME = pacparser
-VERSION = 1.2.6
-#SPKG_VERSION = $(subst -,.,$(VERSION))
+VERSION = 1.2.7
 CATEGORIES = lib
 
 DESCRIPTION = A library to parse proxy auto-config (PAC) files
@@ -20,16 +19,11 @@
 
 PATCHFILES  = 0001-Adjust-Makefile.patch
 
-# Reported upstream as
-#   http://code.google.com/p/pacparser/issues/detail?id=6
-PATCHFILES += 0002-Fix-nullpointer-bug.patch
-
 PATCHFILES += 0003-Only-GNU-grep-knows-q.patch
 PATCHFILES += 0004-Some-more-Makefile-tweaks.patch
 PATCHFILES += 0005-Fix-soname-and-pactester-compilation.patch
 PATCHFILES += 0006-Add-flags-to-make-library-self-sufficient.patch
 PATCHFILES += 0007-Add-config-for-spidermonkey-i386.patch
-PATCHFILES += 0008-Always-set-myIpAddr-to-127.0.0.1-or-tests-on-current.patch
 
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/pacparser/trunk/checksums
===================================================================
--- csw/mgar/pkg/pacparser/trunk/checksums	2010-12-23 01:57:41 UTC (rev 12074)
+++ csw/mgar/pkg/pacparser/trunk/checksums	2010-12-23 19:37:42 UTC (rev 12075)
@@ -1 +1 @@
-612a355115d70a842dde661eee2c915b  pacparser-1.2.6.tar.gz
+d97cd4136403ee73c1ec6aa96b6708ae  pacparser-1.2.7.tar.gz

Deleted: csw/mgar/pkg/pacparser/trunk/files/0002-Fix-nullpointer-bug.patch
===================================================================
--- csw/mgar/pkg/pacparser/trunk/files/0002-Fix-nullpointer-bug.patch	2010-12-23 01:57:41 UTC (rev 12074)
+++ csw/mgar/pkg/pacparser/trunk/files/0002-Fix-nullpointer-bug.patch	2010-12-23 19:37:42 UTC (rev 12075)
@@ -1,25 +0,0 @@
-From 9b90310b830099acbd0b7339f534970e74d47c3a Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 7 Dec 2010 12:09:29 +0100
-Subject: [PATCH 2/8] Fix nullpointer bug
-
----
- src/pacparser.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pacparser.c b/src/pacparser.c
-index 315f854..dd6a840 100644
---- a/src/pacparser.c
-+++ b/src/pacparser.c
-@@ -112,7 +112,7 @@ resolve_host(const char *hostname, char *ipaddr_list, int max_results)
-     if (ipaddr_list[0] == '\0') sprintf(ipaddr_list, "%s", ipaddr);
-     else sprintf(ipaddr_list, "%s;%s", ipaddr_list, ipaddr);
-   }
--  freeaddrinfo(ai);
-+  freeaddrinfo(result);
-   return 0;
- }
- 
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/pacparser/trunk/files/0008-Always-set-myIpAddr-to-127.0.0.1-or-tests-on-current.patch
===================================================================
--- csw/mgar/pkg/pacparser/trunk/files/0008-Always-set-myIpAddr-to-127.0.0.1-or-tests-on-current.patch	2010-12-23 01:57:41 UTC (rev 12074)
+++ csw/mgar/pkg/pacparser/trunk/files/0008-Always-set-myIpAddr-to-127.0.0.1-or-tests-on-current.patch	2010-12-23 19:37:42 UTC (rev 12075)
@@ -1,34 +0,0 @@
-From 1a11df76feae6867b665d5e7c2d70ad8151a0823 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 7 Dec 2010 15:44:37 +0100
-Subject: [PATCH 8/8] Always set myIpAddr to 127.0.0.1 or tests on current9x fails
-
----
- tests/runtests.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/runtests.sh b/tests/runtests.sh
-index 09a6b1e..61663f8 100755
---- a/tests/runtests.sh
-+++ b/tests/runtests.sh
-@@ -26,7 +26,7 @@ while read line
-     echo "$line" | ggrep -q "^#" && continue
-     PARAMS=$(echo "$line"|cut -d"|" -f1)
-     EXPECTED_RESULT=$(echo $line|cut -d"|" -f2)
--    RESULT=$($PACTESTER -p $PACFILE $PARAMS)
-+    RESULT=$($PACTESTER -c 127.0.0.1 -p $PACFILE $PARAMS)
-     if [ $? != 0 ]; then
-       echo "pactester execution failed."
-       echo "Command tried: $PACTESTER -p $PACFILE $PARAMS"
-@@ -39,7 +39,7 @@ while read line
-     [ $DEBUG ] && echo "Params: $PARAMS"
-     if [ "$RESULT" != "$EXPECTED_RESULT" ]; then
-       echo "Test failed: got \"$RESULT\", expected \"$EXPECTED_RESULT\""
--      echo "Command tried: $PACTESTER -p $PACFILE $PARAMS"
-+      echo "Command tried: $PACTESTER -c 127.0.0.1 -p $PACFILE $PARAMS"
-       echo "Running with debug mode on..."
-       echo "DEBUG=1 $PACTESTER -p $PACFILE $PARAMS"
-       DEBUG=1 $PACTESTER -p $PACFILE $PARAMS
--- 
-1.7.3.2
-


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