summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/AIX/RPM/README12
-rw-r--r--packages/AIX/RPM/curl.spec.in14
-rw-r--r--packages/Linux/RPM/curl-ssl.spec.in4
-rw-r--r--packages/Linux/RPM/curl.spec.in2
-rw-r--r--packages/Makefile.am2
-rw-r--r--packages/README12
-rw-r--r--packages/Symbian/group/curl.iby4
-rw-r--r--packages/Symbian/group/libcurl.mmp2
-rw-r--r--packages/Symbian/readme.txt2
-rw-r--r--packages/TPF/maketpf.env_curl3
-rw-r--r--packages/TPF/maketpf.env_curllib10
-rw-r--r--packages/Win32/cygwin/Makefile.am2
-rw-r--r--packages/Win32/cygwin/README20
-rwxr-xr-xpackages/vms/build_vms.com20
-rw-r--r--packages/vms/config-vms.h2
-rw-r--r--packages/vms/curlmsg.h2
-rw-r--r--packages/vms/curlmsg.msg22
-rw-r--r--packages/vms/curlmsg.sdl26
18 files changed, 82 insertions, 79 deletions
diff --git a/packages/AIX/RPM/README b/packages/AIX/RPM/README
index 348cb8582..f5e0f68b8 100644
--- a/packages/AIX/RPM/README
+++ b/packages/AIX/RPM/README
@@ -12,22 +12,22 @@ The spec file in this directory is based on the Linux ssl and non-ssl
curl spec files, plus additions to make it AIX Toolbox compatible.
The AIX Toolbox setup (installs into /opt/freeware, with symlinks in
-/usr/bin,/usr/lib,/usr/include) are based on IBM's aixtoolbox spec
+/usr/bin,/usr/lib,/usr/include) are based on IBM's aixtoolbox spec
file written by David Clissold <cliss@austin.ibm.com>, see
ftp://ftp.software.ibm.com/aixtoolbox/SPECS/curl-7.9.3-2.spec
This spec file is designed to be a drop-in replacement for the
-old spec file found at the above link. Thus, like the old spec file
-this version is also a unified ssl/non-ssl version. To get non-ssl
-RPMs just pass --define 'nossl 1' to the command line when building
-the RPM, e.g.
+old spec file found at the above link. Thus, like the old spec file
+this version is also a unified ssl/non-ssl version. To get non-ssl
+RPMs just pass --define 'nossl 1' to the command line when building
+the RPM, e.g.
rpm -bb --define 'nossl 1' curl.spec
Default is to build with ssl support.
-Lastly, the spec file expects the Curl source distribution file to be
+Lastly, the spec file expects the Curl source distribution file to be
in .tar.bz2 format.
The nifty cURL header of this README is a ripoff of the vms/readme file.
diff --git a/packages/AIX/RPM/curl.spec.in b/packages/AIX/RPM/curl.spec.in
index 766b0f304..a37e0d7ca 100644
--- a/packages/AIX/RPM/curl.spec.in
+++ b/packages/AIX/RPM/curl.spec.in
@@ -38,14 +38,14 @@ Note: this version is compiled without SSL support.
%package devel
Summary: Development files for the curl libary
Group: Development/Libraries
-%if %{SSL} == 1
-Requires: openssl >= 0.9.5
-%endif
+%if %{SSL} == 1
+Requires: openssl >= 0.9.5
+%endif
Requires: curl = %{version}
Provides: curl-devel
%description devel
-libcurl is the core engine of curl; this packages contains all the
+libcurl is the core engine of curl; this packages contains all the
libs, headers, and manual pages to develop applications using libcurl.
%define DEFCC xlc
@@ -61,7 +61,7 @@ if [[ -z "$CC" ]]
then
if test "X`type %{DEFCC} 2>/dev/null`" != 'X'; then
export CC=%{DEFCC}
- else
+ else
export CC=gcc
fi
fi
@@ -109,9 +109,9 @@ make DESTDIR=%{buildroot} install-strip
%if %{SSL} == 1
%{_datadir}/curl/curl-ca-bundle.crt
%endif
-%doc CHANGES COPYING README RELEASE-NOTES
+%doc CHANGES COPYING README RELEASE-NOTES
%doc docs/BUGS docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/HISTORY
-%doc docs/INSTALL docs/KNOWN_BUGS
+%doc docs/INSTALL docs/KNOWN_BUGS
%doc docs/MANUAL docs/RESOURCES docs/THANKS docs/VERSIONS docs/TODO
%doc docs/TheArtOfHttpScripting
%if %{SSL} == 1
diff --git a/packages/Linux/RPM/curl-ssl.spec.in b/packages/Linux/RPM/curl-ssl.spec.in
index d953b3960..7f290ba21 100644
--- a/packages/Linux/RPM/curl-ssl.spec.in
+++ b/packages/Linux/RPM/curl-ssl.spec.in
@@ -40,13 +40,13 @@ headers, and manual pages to develop applications using libcurl.
%prep
-%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{version}
%build
cd %{curlroot} && (if [ -f configure.in ]; then mv -f configure.in configure.in.rpm; fi)
%configure
cd %{curlroot} && (if [ -f configure.in.rpm ]; then mv -f configure.in.rpm configure.in; fi)
-make
+make
%install
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
diff --git a/packages/Linux/RPM/curl.spec.in b/packages/Linux/RPM/curl.spec.in
index 8b81726b7..2382f578d 100644
--- a/packages/Linux/RPM/curl.spec.in
+++ b/packages/Linux/RPM/curl.spec.in
@@ -42,7 +42,7 @@ rm -rf %{builddir}
%build
%configure --without-ssl --prefix=%{prefix}
-make
+make
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/packages/Makefile.am b/packages/Makefile.am
index 88fed435a..e211c0a3f 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -28,5 +28,5 @@ EXTRA_DIST = README \
Symbian/readme.txt \
TPF/curl.mak \
TPF/maketpf.env_curl \
- TPF/maketpf.env_curllib
+ TPF/maketpf.env_curllib
diff --git a/packages/README b/packages/README
index cb50b4018..2487d95d0 100644
--- a/packages/README
+++ b/packages/README
@@ -1,7 +1,7 @@
- _ _ ____ _
- ___| | | | _ \| |
- / __| | | | |_) | |
- | (__| |_| | _ <| |___
+ _ _ ____ _
+ ___| | | | _ \| |
+ / __| | | | |_) | |
+ | (__| |_| | _ <| |___
\___|\___/|_| \_\_____|
PACKAGES
@@ -14,14 +14,14 @@ of those custom formats.
The hierarchy for these directories is something like this:
packages/[OS]/[FORMAT]/
-
+
Currently, we have Win32 and Linux for [OS]. There might be different formats
for the same OS so for Linux we have RPM as format.
We might need to add some differentiation for CPU as well, as there is
Linux-RPMs for several CPUs. However, it might not be necessary since the
packaging should be pretty much the same no matter what CPU that is used.
-
+
For each unique OS-FORMAT pair, there's a directory to "fill"! I'd like to
see a single README with as much details as possible, and then I'd like some
template files for the package process.
diff --git a/packages/Symbian/group/curl.iby b/packages/Symbian/group/curl.iby
index f05bff3b8..7921aaa07 100644
--- a/packages/Symbian/group/curl.iby
+++ b/packages/Symbian/group/curl.iby
@@ -1,8 +1,8 @@
-//
+//
// curl file transfer utility command-line utility
//
// Use this file with buildrom to add curl to a device ROM
-//
+//
#ifndef CURL_IBY
#define CURL_IBY
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index cac26d5a8..512ff97ae 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -38,7 +38,7 @@ USERINCLUDE ../../../lib ../../../include/curl
#ifdef ENABLE_SSL
USERINCLUDE /epoc32/include/osextensions/stdapis
// Older versions of the SDK need this instead:
-//USERINCLUDE /epoc32/include/stdapis/openssl
+//USERINCLUDE /epoc32/include/stdapis/openssl
#endif
SYSTEMINCLUDE ../../../include /epoc32/include/stdapis /epoc32/include
diff --git a/packages/Symbian/readme.txt b/packages/Symbian/readme.txt
index 840447b5d..05834e7b1 100644
--- a/packages/Symbian/readme.txt
+++ b/packages/Symbian/readme.txt
@@ -9,7 +9,7 @@ from client applications as well as creating a GUI application to allow
file transfers. The author has no current plans to do so.
This means that integration with standard Symbian OS programs can be
-tricky, since libcurl isn't designed with Symbian's native asynchronous
+tricky, since libcurl isn't designed with Symbian's native asynchronous
message passing idioms in mind. However, it may be possible to use libcurl
in an active object-based application through libcurl's multi interface.
The port is most easily used when porting POSIX applications to Symbian
diff --git a/packages/TPF/maketpf.env_curl b/packages/TPF/maketpf.env_curl
index fd9a90f28..91a2573a1 100644
--- a/packages/TPF/maketpf.env_curl
+++ b/packages/TPF/maketpf.env_curl
@@ -6,7 +6,8 @@
################################################################################
# Define the directories where the shared objects reside
-################################################################################
+################################################################################
+
ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lib)
################################################################################
diff --git a/packages/TPF/maketpf.env_curllib b/packages/TPF/maketpf.env_curllib
index 8a9ad9f0a..f6ad5ba9d 100644
--- a/packages/TPF/maketpf.env_curllib
+++ b/packages/TPF/maketpf.env_curllib
@@ -6,19 +6,21 @@
################################################################################
# Define the directories where the shared objects reside
-################################################################################
+################################################################################
+
ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lib)
################################################################################
-# Define the directories where the loadables (XXXXVV) are to be written
+# Define the directories where the loadables (XXXXVV) are to be written
################################################################################
ROOTLOADDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/load)
################################################################################
# Define the location of the export files used by the LD postprocessor
-# - currently expected that .exp files will also live in lib dir
-################################################################################
+# - currently expected that .exp files will also live in lib dir
+################################################################################
+
ROOTEXPDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/output/exp)
################################################################################
diff --git a/packages/Win32/cygwin/Makefile.am b/packages/Win32/cygwin/Makefile.am
index 936f1b59f..b56148dc9 100644
--- a/packages/Win32/cygwin/Makefile.am
+++ b/packages/Win32/cygwin/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = README
# Read the README file for details on using this Makefile
#
# NOTE: As I'm not particularly familiar with Makefiles, this was the
-# best I could come up with. It should probably be enhanced someday
+# best I could come up with. It should probably be enhanced someday
# to actually use the correct target and pre-requisite names, etc...
# If anyone else wants to volunteer, feel free ;-)
#
diff --git a/packages/Win32/cygwin/README b/packages/Win32/cygwin/README
index 313daccbe..7457f7397 100644
--- a/packages/Win32/cygwin/README
+++ b/packages/Win32/cygwin/README
@@ -1,7 +1,7 @@
-Curl is a tool for transferring files with URL syntax, supporting
+Curl is a tool for transferring files with URL syntax, supporting
FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP.
- Curl supports HTTPS certificates, HTTP POST, HTTP PUT,
- FTP uploading, kerberos, HTTP form based upload, proxies,
+ Curl supports HTTPS certificates, HTTP POST, HTTP PUT,
+ FTP uploading, kerberos, HTTP form based upload, proxies,
cookies, user+password authentication, file transfer resume,
http proxy tunneling and a busload of other useful tricks.
@@ -43,7 +43,7 @@ Build Instructions (to recompile from the cygwin source tarball):
http://mail.gnu.org/pipermail/libtool/2001-September/005549.html
The copy of ltmain.sh that is distributed with cURL includes this patch.
- As of curl 7.9.1, the official source compiles (under Cygwin) and tests
+ As of curl 7.9.1, the official source compiles (under Cygwin) and tests
100% cleanly OOTB (Out Of The Box)
---NO SSL RELEASE---
@@ -63,7 +63,7 @@ Packaging Instructions:
where n is the cygwin release number (e.g. the "1" in curl-7.9-1),
and "CYGBUILD=n" is optional (n defaults to 1 if not specified)
-
+
Assuming everything worked, you'll find your binary tarballs in
$(buildtop)/packages/Win32/cygwin/
@@ -77,8 +77,8 @@ Packaging Instructions:
$ cd curl-7.9-1; mkdir CYGWIN-PATCHES
$ cp packages/Win32/cygwin/README CYGWIN-PATCHES/curl-7.9-1.README
4. if applicable, document any changes in the README file
- 5. create a patch which, when applied
- (using `patch -p1 < curl-7.9-$(REL).patch`)
+ 5. create a patch which, when applied
+ (using `patch -p1 < curl-7.9-$(REL).patch`)
will remove any changes you've made to the pristine source:
$ cd ..
$ diff -Nrup curl-7.9-1 curl-7.9 > curl-7.9-1.patch
@@ -91,9 +91,9 @@ Packaging Instructions:
@ curl
sdesc: "a client that groks URLs"
ldesc: "Curl is a tool for transferring files with URL syntax,
- supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE
- and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT,
- FTP uploading, kerberos, HTTP form based upload, proxies,
+ supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE
+ and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT,
+ FTP uploading, kerberos, HTTP form based upload, proxies,
cookies, user+password authentication, file transfer resume,
http proxy tunneling and a busload of other useful tricks."
category: Web Libs
diff --git a/packages/vms/build_vms.com b/packages/vms/build_vms.com
index 92df84e51..00b55d3d6 100755
--- a/packages/vms/build_vms.com
+++ b/packages/vms/build_vms.com
@@ -1,5 +1,5 @@
$! $Id$
-$! BUILD_VMS.COM
+$! BUILD_VMS.COM
$!
$! I've taken the original build_vms.com, supplied by Nico Baggus, if
$! memory serves me correctly, and made some modifications.
@@ -45,11 +45,11 @@ $! 29-JAN-2004, MSK, moved logical defines into defines.com
$! 6-FEB-2004, MSK, put in various SSL support bits
$! 9-MAR-2004, MSK, the config-vms.h* files are now copied to the lib and
$! src directories as curl_config.h.
-$! 15-MAR-2004, MSK, All of the curlmsg*.* files have also been moved to
-$! this build directory. They will be copied to the src
-$! directory before build. The .msg file will be compiled
-$! to get the .obj for messages, but the .h and .sdl files
-$! are not automatically created since they partly rely on
+$! 15-MAR-2004, MSK, All of the curlmsg*.* files have also been moved to
+$! this build directory. They will be copied to the src
+$! directory before build. The .msg file will be compiled
+$! to get the .obj for messages, but the .h and .sdl files
+$! are not automatically created since they partly rely on
$! the freeware SDL tool.
$! 8-FEB-2005, MSK, merged the two config-vms.h* files into one that uses
$! USE_SSLEAY to define if the target has SSL support built
@@ -95,7 +95,7 @@ $ orig_def = f$environment( "DEFAULT")
$ on error then goto Common_Exit
$ on control_y then goto Common_Exit
$!
-$ ctrl_y = 1556
+$ ctrl_y = 1556
$ proc = f$environment( "PROCEDURE")
$ proc_dev_dir = -
f$parse( proc, , , "DEVICE")+ f$parse( proc, , , "DIRECTORY")
@@ -467,8 +467,8 @@ $ link 'link_qual' /executable = 'exedir'CURL.EXE -
$!
$ goto Common_Exit
$!
-$! Subroutine to build everything with a filetype passed in via P2 in
-$! the directory passed in via P1 and put it in the object library named
+$! Subroutine to build everything with a filetype passed in via P2 in
+$! the directory passed in via P1 and put it in the object library named
$! via P3. Exclude items in P4.
$!
$build: subroutine
@@ -533,7 +533,7 @@ $ set default 'build_def'
$ exit 'sts'
$ endsubroutine ! Build
$!
-$! Based on the file TYPE, do the right compile command.
+$! Based on the file TYPE, do the right compile command.
$! Only C and MSG supported.
$!
$compile: subroutine
diff --git a/packages/vms/config-vms.h b/packages/vms/config-vms.h
index 85eaf6bfc..b7da92f59 100644
--- a/packages/vms/config-vms.h
+++ b/packages/vms/config-vms.h
@@ -205,7 +205,7 @@
#define HAVE_SYS_TYPES_H 1
/* Define if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
+#undef HAVE_TERMIOS_H
/* Define if you have the <time.h> header file. */
#define HAVE_TIME_H 1
diff --git a/packages/vms/curlmsg.h b/packages/vms/curlmsg.h
index 99d5042a0..08da68a8a 100644
--- a/packages/vms/curlmsg.h
+++ b/packages/vms/curlmsg.h
@@ -114,7 +114,7 @@
#define CURL_SSL_CRL_BADFILE 251757210
#define CURL_SSL_ISSUER_ERROR 251757218
#define CURL_CURL_LAST 251757226
-
+
#pragma __member_alignment __restore
#endif /* HEADER_CURLMSG_H */
diff --git a/packages/vms/curlmsg.msg b/packages/vms/curlmsg.msg
index 93b3d7546..3765167f4 100644
--- a/packages/vms/curlmsg.msg
+++ b/packages/vms/curlmsg.msg
@@ -1,22 +1,22 @@
! $Id$
-!
-! These VMS error codes are generated by taking apart the curl.h
-! file and putting all the CURLE_* enum stuff into this file,
-! CURLMSG.MSG. An .SDL file is created from this file with
+!
+! These VMS error codes are generated by taking apart the curl.h
+! file and putting all the CURLE_* enum stuff into this file,
+! CURLMSG.MSG. An .SDL file is created from this file with
! MESSAGE/SDL. The .H file is created using the freeware SDL tool
! against the .SDL file with SDL/ALPHA/LANG=CC command.
!
-! With the exception of CURLE_OK, all of the messages are at
-! the error severity level. With the exception of
-! PEER_FAILED_VERIF, which is a shortened form of
-! PEER_FAILED_VERIFICATION, these are the same names as the
+! With the exception of CURLE_OK, all of the messages are at
+! the error severity level. With the exception of
+! PEER_FAILED_VERIF, which is a shortened form of
+! PEER_FAILED_VERIFICATION, these are the same names as the
! CURLE_ ones in include/curl.h. The Message Utility manual states
-! "The combined length of the prefix and the message symbol name cannot
+! "The combined length of the prefix and the message symbol name cannot
! exceed 31 characters." With a prefix of five that leaves us with 26
! for the message name.
-!
+!
! If you update this file also update curlmsg_vms.h so that they are in sync
-!
+!
.TITLE CURLMSG Message files
.FACILITY CURL,1793 /PREFIX=CURL_
.BASE 1
diff --git a/packages/vms/curlmsg.sdl b/packages/vms/curlmsg.sdl
index 42a7e8cc8..e192c0750 100644
--- a/packages/vms/curlmsg.sdl
+++ b/packages/vms/curlmsg.sdl
@@ -1,29 +1,29 @@
-
+
MODULE $CURDEF;
-
+
/*
/* This SDL File Generated by VAX-11 Message V04-00 on 3-SEP-2008 13:33:54.09
/*
/* $ID: CURLMSG.MSG,V 1.7 2008-05-30 23:51:09 CURLVMS EXP $
-/*
-/* THESE VMS ERROR CODES ARE GENERATED BY TAKING APART THE CURL.H
-/* FILE AND PUTTING ALL THE CURLE_* ENUM STUFF INTO THIS FILE,
-/* CURLMSG.MSG. AN .SDL FILE IS CREATED FROM THIS FILE WITH
+/*
+/* THESE VMS ERROR CODES ARE GENERATED BY TAKING APART THE CURL.H
+/* FILE AND PUTTING ALL THE CURLE_* ENUM STUFF INTO THIS FILE,
+/* CURLMSG.MSG. AN .SDL FILE IS CREATED FROM THIS FILE WITH
/* MESSAGE/SDL. THE .H FILE IS CREATED USING THE FREEWARE SDL TOOL
/* AGAINST THE .SDL FILE WITH SDL/ALPHA/LANG=CC COMMAND.
/*
-/* WITH THE EXCEPTION OF CURLE_OK, ALL OF THE MESSAGES ARE AT
-/* THE ERROR SEVERITY LEVEL. WITH THE EXCEPTION OF
-/* PEER_FAILED_VERIF, WHICH IS A SHORTENED FORM OF
-/* PEER_FAILED_VERIFICATION, THESE ARE THE SAME NAMES AS THE
+/* WITH THE EXCEPTION OF CURLE_OK, ALL OF THE MESSAGES ARE AT
+/* THE ERROR SEVERITY LEVEL. WITH THE EXCEPTION OF
+/* PEER_FAILED_VERIF, WHICH IS A SHORTENED FORM OF
+/* PEER_FAILED_VERIFICATION, THESE ARE THE SAME NAMES AS THE
/* CURLE_ ONES IN INCLUDE/CURL.H. THE MESSAGE UTILITY MANUAL STATES
-/* "THE COMBINED LENGTH OF THE PREFIX AND THE MESSAGE SYMBOL NAME CANNOT
+/* "THE COMBINED LENGTH OF THE PREFIX AND THE MESSAGE SYMBOL NAME CANNOT
/* EXCEED 31 CHARACTERS." WITH A PREFIX OF FIVE THAT LEAVES US WITH 26
/* FOR THE MESSAGE NAME.
-/*
+/*
/* IF YOU UPDATE THIS FILE ALSO UPDATE CURLMSG_VMS.H SO THAT THEY ARE IN SYNC
-/*
+/*
CONSTANT
"FACILITY" EQUALS 3841 PREFIX "CURL" TAG ""
,"OK" EQUALS %X0F018009 PREFIX "CURL" TAG ""
View Lorry Controller Status