OS/400 update:

New declarations in curl.h reported to curl.inc.in.
Copyrights extended to 2008.
SONAME handling introduced in build scripts.

diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 5a20f30..469f4fa 100644 (file)
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -183,8 +183,9 @@ _ Modules for all libcurl units.
 _ Binding directory CURL_A, to be used at calling program link time for
   statically binding the modules (specify BNDSRVPGM(QADRTTS QGLDCLNT QGLDBRDR)
   when creating a program using CURL_A).
-_ Service program CURL, to be used at calling program run-time when this program
-  has dynamically bound curl at link time.
+_ Service program CURL.<soname>, where <soname> is extracted from the
+  lib/Makefile.am VERSION variable. To be used at calling program run-time
+  when this program has dynamically bound curl at link time.
 _ Binding directory CURL. To be used to dynamically bind libcurl when linking a
   calling program.
 _ Source file H. It contains all the include members needed to compile a C/C++

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 78ff74d..f5ae892 100644 (file)
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms

diff --git a/packages/OS400/ccsidcurl.h b/packages/OS400/ccsidcurl.h
index e964793..f270d83 100644 (file)
--- a/packages/OS400/ccsidcurl.h
+++ b/packages/OS400/ccsidcurl.h
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms

diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 4551605..dd6685b 100644 (file)
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -5,7 +5,7 @@
       *                            | (__| |_| |  _ <| |___
       *                             \___|\___/|_| \_\_____|
       *
-      * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+      * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
       *
       * This software is licensed as described in the file COPYING, which
       * you should have received as part of this distribution. The terms
@@ -112,6 +112,11 @@
       *
      d CURL_READFUNC_ABORT...
      d                 c                   X'10000000'
+     d CURL_READFUNC_PAUSE...
+     d                 c                   X'10000001'
+      *
+     d CURL_WRITEFUNC_PAUSE...
+     d                 c                   X'10000001'
       *
      d CURLAUTH_NONE   c                   X'00000000'
      d CURLAUTH_BASIC  c                   X'00000001'
@@ -196,6 +201,15 @@
      d CURL_CSELECT_ERR...
      d                 c                   X'00000004'
       *
+     d CURLPAUSE_RECV  c                   X'00000001'
+     d CURLPAUSE_RECV_CONT...
+     d                 c                   X'00000000'
+     d CURLPAUSE_SEND  c                   X'00000004'
+     d CURLPAUSE_SEND_CONT...
+     d                 c                   X'00000000'
+     d CURLPAUSE_ALL   c                   X'00000005'
+     d CURLPAUSE_CONT  c                   X'00000000'
+      *
       **************************************************************************
       *                                Types
       **************************************************************************
@@ -739,6 +753,10 @@
      d                 c                   10165
      d  CURLOPT_PROXY_TRANSFER_MODE...
      d                 c                   00166
+     d  CURLOPT_SEEKFUNCTION...
+     d                 c                   20167
+     d  CURLOPT_SEEKDATA...
+     d                 c                   10168
       *
      d CURLFORMcode    s             10i 0 based(######ptr######)               Enum
      d  CURL_FORMADD_OK...
@@ -1090,6 +1108,9 @@
      d curl_read_callback...
      d                 s               *   based(######ptr######) procptr
       *
+     d curl_seek_callback...
+     d                 s               *   based(######ptr######) procptr
+      *
      d curl_sockopt_callback...
      d                 s               *   based(######ptr######) procptr
       *
@@ -1333,6 +1354,11 @@
      d                 pr                  extproc('curl_easy_reset')
      d  curl                           *   value                                CURL *
       *
+     d curl_easy_pause...
+     d                 pr                  extproc('curl_easy_pause')
+     d  curl                           *   value                                CURL *
+     d  bitmask                      10i 0 value
+      *
      d curl_multi_init...
      d                 pr              *   extproc('curl_multi_init')           CURLM *
       *

diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh
index f32e891..b851e36 100644 (file)
--- a/packages/OS400/initscript.sh
+++ b/packages/OS400/initscript.sh
@@ -20,6 +20,12 @@ TOPDIR=`dirname "${SCRIPTDIR}"`
 TOPDIR=`dirname "${TOPDIR}"`
 export SCRIPTDIR TOPDIR
 
+#  Extract the SONAME from the library makefile.
+
+SONAME=`sed -e '/^VERSION=/!d' -e 's/^.* \([0-9]*\):.*$/\1/'           \
+                                                < "${TOPDIR}/lib/Makefile.am"`
+export SONAME
+
 
 ################################################################################
 #
@@ -30,7 +36,7 @@ export SCRIPTDIR TOPDIR
 TARGETLIB='CURL'                # Target OS/400 program library
 STATBNDDIR='CURL_A'             # Static binding directory.
 DYNBNDDIR='CURL'                # Dynamic binding directory.
-SRVPGM='CURL'                   # Service program.
+SRVPGM="CURL.${SONAME}"         # Service program.
 TGTCCSID='500'                  # Target CCSID of objects
 DEBUG='*ALL'                    # Debug level
 OPTIMIZE='10'                   # Optimisation level

diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh
index d2a7a05..cd1db3e 100644 (file)
--- a/packages/OS400/make-lib.sh
+++ b/packages/OS400/make-lib.sh
@@ -28,7 +28,7 @@ fi
 
 echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c
 echo '#pragma comment(date)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1998-2007 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1998-2008 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
 make_module     OS400           os400.c
 LINK=                           # No need to rebuild service program yet.
 MODULES=
@@ -113,12 +113,13 @@ EXPORTS=`grep '^CURL_EXTERN[      ]'                                      \
 
 BSF="${LIBIFSNAME}/TOOLS.FILE/BNDSRC.MBR"
 
-if action_needed "${BSF}"
+if action_needed "${BSF}" Makefile.am
 then    LINK=YES
 fi
 
 if [ "${LINK}" ]
-then    echo " STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('LIBCURL')" > "${BSF}"
+then    echo " STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('LIBCURL_${SONAME}')" \
+            > "${BSF}"
         for EXPORT in ${EXPORTS}
         do      echo ' EXPORT    SYMBOL("'"${EXPORT}"'")' >> "${BSF}"
         done

diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 3eb0b09..404bc71 100644 (file)
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms

diff --git a/packages/OS400/os400sys.h b/packages/OS400/os400sys.h
index 6da99d4..fb36ac8 100644 (file)
--- a/packages/OS400/os400sys.h
+++ b/packages/OS400/os400sys.h
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms