Attachment #174234 for bug #212271

Lines 2-8 Link Here

(-)./Makefile (-1 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= curl	4	PORTNAME= curl
5	PORTVERSION= 2.0	5	PORTVERSION= 2.0.1
6	CATEGORIES= ftp	6	CATEGORIES= ftp
7	MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
8	PKGNAMEPREFIX= rexx-	8	PKGNAMEPREFIX= rexx-
Lines 31-36 Link Here
31		31
32	OPTIONS_DEFINE= DOCS	32	OPTIONS_DEFINE= DOCS
33		33
		34	do-extract:
		35	# avoid extracting circular hard links in distfile!
		36	@${MKDIR} ${WRKDIR}
		37	@tar -x -C ${WRKDIR} --exclude='common/filterexports' --exclude='common/fixrc' \
		38	-f ${DISTDIR}/${DISTNAME}.tar.gz
		39
34	post-patch:	40	post-patch:
35	@${REINPLACE_CMD} -e "s\| -lc \| \|g" \	41	@${REINPLACE_CMD} -e "s\| -lc \| \|g" \
36	-e "/\$.sharedir)\/images/d" \	42	-e "/\$.sharedir)\/images/d" \

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1472501183	1	TIMESTAMP = 1472503050
2	SHA256 (RexxCURL-2.0.tar.gz) = 6ada98c9dfa2be459fb6d664829b734360244f00ec943e66f1edd116b4055bea	2	SHA256 (RexxCURL-2.0.1.tar.gz) = 83b857686af41323f238722dccbb0ded85d1317e7fe95410ebe8978daadaa51a
3	SIZE (RexxCURL-2.0.tar.gz) = 336923	3	SIZE (RexxCURL-2.0.1.tar.gz) = 455919




--- Makefile.in.orig	2015-04-12 10:29:42 UTC
+++ Makefile.in
@@ -120,7 +120,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
 $(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \
 $(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \
 $(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \
-$(PACKAGE_DIR)/doc/*.html $(PACKAGE_DIR)/doc/images/*.png \
 $(PACKAGE_DIR)/RexxCURL.spec \
 $(PACKAGE_DIR)/debian/*.rexxtrans $(PACKAGE_DIR)/debian/*.regina $(PACKAGE_DIR)/debian/*.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules $(PACKAGE_DIR)/debian/control
 
@@ -231,8 +230,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w
 
 doco:
 	mkdir images

 
 zip:
 	zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES)
@@ -241,7 +238,6 @@ zip:
 	zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx
 	zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx
 	zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex
-	zip rexxcurl$(VER) doc/*.html doc/images/*.png
 	zip rexxcurl$(VER) debian/*.regina debian/*.oorexx debian/copyright debian/compat
 	zip rexxcurl$(VER) RexxCURL.spec
 
@@ -259,8 +255,6 @@ installbase: all
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(INSTALL) -d $(DESTDIR)$(libdir)
 	$(INSTALL) -d $(DESTDIR)$(sharedir)

 	$(INSTALL) -c -m 755 ./$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
 	$(INSTALL) -c -m 755 ./rexxcurl-config $(DESTDIR)$(bindir)/rexxcurl-config
 	-$(INSTALL) -c -m 755 ./$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST)
@@ -273,9 +267,6 @@ installbase: all
 	$(INSTALL) -c -m 755 $(srcdir)/demo/upload.rexx        $(DESTDIR)$(sharedir)/upload.rexx
 	$(INSTALL) -c -m 755 $(srcdir)/demo/getright.rexx      $(DESTDIR)$(sharedir)/getright.rexx
 	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt $(DESTDIR)$(sharedir)/README.txt
-	$(INSTALL) -c -m 644 $(srcdocdir)/index.html $(DESTDIR)$(docdir)/index.html
-	$(INSTALL) -c -m 644 $(srcdocdir)/images/rxcurl64.png $(DESTDIR)$(docdir)/images/rxcurl64.png
-	$(INSTALL) -c -m 644 $(srcdir)/CPLv1.0.txt $(DESTDIR)$(docdir)/CPLv1.0.txt
 
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
@@ -313,8 +304,6 @@ beosinstall: all
 	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt
 #
 # where to put doc for BeOS ?

 #
 
 binary: $(BASE_BINARY)
@@ -324,7 +313,6 @@ binarybase: all
 	-mkdir -p ./tmpdir/bin
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
-	-mkdir -p ./tmpdir/share/doc/rexxcurl/images
-	-mkdir -p ./tmpdir/doc/rexxcurl/images
 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(PACKAGE_NAME)-config ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
@@ -334,8 +322,6 @@ binarybase: all
 	cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl
 	cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl
 	cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl
-	cp $(srcdir)/doc/index.html ./tmpdir/share/doc/rexxcurl
-	cp $(srcdir)/doc/images/*.png ./tmpdir/share/doc/rexxcurl/images
 	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx
 	cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx
 	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx
@@ -353,7 +339,6 @@ cygwinbinary: all
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/rexx
 	-mkdir -p ./tmpdir/doc/rexxcurl

 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -362,8 +347,6 @@ cygwinbinary: all
 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl

 	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
 	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
 	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
@@ -381,7 +364,6 @@ beosbinary: all
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/add-ons/rexx
 	-mkdir -p ./tmpdir/doc/rexxcurl

 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -390,8 +372,6 @@ beosbinary: all
 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl

Lines 1-4 Link Here

(-)./files/patch-common_loader.c (-1 / +1 lines)
1	--- common/loader.c.orig 2012-04-20 00:41:50 UTC	1	--- common/loader.c.orig 2012-08-14 01:16:58 UTC
2	+++ common/loader.c	2	+++ common/loader.c
3	@@ -225,6 +225,7 @@ int main	3	@@ -225,6 +225,7 @@ int main
4	/*	4	/*

Lines 1-11 Link Here

(-)./files/patch-common_rxmt__posix.c (-11 lines)
1	--- common/rxmt_posix.c.orig 2011-05-09 01:25:33 UTC
2	+++ common/rxmt_posix.c
3	@@ -163,7 +163,7 @@ RxPackageGlobalDataDef *RxPackInitialize
4	pthread_setspecific( ThreadIndex, retval );
5
6	memset( retval, 0, sizeof(RxPackageGlobalDataDef) );
7	- retval->MTMalloc = MTMalloc;
8	+ retval->MTMalloc = (void ()(const struct _tsd_t * ,long)) MTMalloc;
9	retval->MTFree = MTFree;
10	retval->MTExit = MTExit;
11




--- rexxcurl.c.orig	2015-04-11 22:53:39 UTC
+++ rexxcurl.c
@@ -53,6 +53,8 @@
  * internal error                   set                 N/A
  * cURL runtime errors              -1                  set
  */
+#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #else
@@ -1366,7 +1368,7 @@ void RexxCURLSetVersionInfoConstants( Rx
@@ -489,8 +491,13 @@ static curl_options RexxCurlOptions[] =
    { "GSSAPIDELEGATION",CURLOPT_GSSAPI_DELEGATION,RXCURLOPT_GSSAPI_DELEGATION , NULL },
 #endif
    { "HEADER"          ,CURLOPT_HEADER          ,RXCURLOPT_BOOL        , NULL },
+#if LIBCURL_VERSION_NUM >= 0x070907
+   { "HEADERFILE"      ,CURLOPT_HEADERDATA      ,RXCURLOPT_OUTFILE     , NULL },
+   { "HEADERSTEM"      ,CURLOPT_HEADERDATA      ,RXCURLOPT_HEADERSTEM  , NULL },
+#else
    { "HEADERFILE"      ,CURLOPT_WRITEHEADER     ,RXCURLOPT_OUTFILE     , NULL },
    { "HEADERSTEM"      ,CURLOPT_WRITEHEADER     ,RXCURLOPT_HEADERSTEM  , NULL },
+#endif
 #if LIBCURL_VERSION_NUM >= 0x070a03
    { "HTTP200ALIASES"  ,CURLOPT_HTTP200ALIASES  ,RXCURLOPT_LIST        , NULL },
 #endif
@@ -517,9 +524,17 @@ static curl_options RexxCurlOptions[] =
 #if LIBCURL_VERSION_NUM >= 0x070e01
    { "IGNORECONTENTLENGTH",CURLOPT_IGNORE_CONTENT_LENGTH,RXCURLOPT_LONG, NULL },
 #endif
+#if LIBCURL_VERSION_NUM >= 0x070907
+   { "INFILE"          ,CURLOPT_READDATA        ,RXCURLOPT_INFILE      , NULL },
+#else
    { "INFILE"          ,CURLOPT_INFILE          ,RXCURLOPT_INFILE      , NULL },
+#endif
    { "INTERFACE"       ,CURLOPT_INTERFACE       ,RXCURLOPT_STRING      , NULL },
+#if LIBCURL_VERSION_NUM >= 0x070907
+   { "INSTEM"          ,CURLOPT_READDATA        ,RXCURLOPT_INSTEM      , NULL },
+#else
    { "INSTEM"          ,CURLOPT_INFILE          ,RXCURLOPT_INSTEM      , NULL },
+#endif
 #if LIBCURL_VERSION_NUM >= 0x070a08
    { "IPRESOLVE"       ,CURLOPT_IPRESOLVE       ,RXCURLOPT_IPRESOLVE   , NULL },
 #endif
@@ -576,8 +591,10 @@ static curl_options RexxCurlOptions[] =
 #if LIBCURL_VERSION_NUM >= 0x070a02
    { "NOSIGNAL"        ,CURLOPT_NOSIGNAL        ,RXCURLOPT_BOOL        , NULL },
 #endif
-   { "OUTFILE"         ,CURLOPT_FILE            ,RXCURLOPT_OUTFILE     , NULL },
-   { "OUTSTEM"         ,CURLOPT_FILE            ,RXCURLOPT_OUTSTEM     , NULL },
+#if LIBCURL_VERSION_NUM >= 0x070907
+   { "OUTFILE"         ,CURLOPT_WRITEDATA       ,RXCURLOPT_OUTFILE     , NULL },
+   { "OUTSTEM"         ,CURLOPT_WRITEDATA       ,RXCURLOPT_OUTSTEM     , NULL },
+#endif
 #if LIBCURL_VERSION_NUM >= 0x071301
    { "PASSWORD"        ,CURLOPT_PASSWORD        ,RXCURLOPT_STRING      , NULL },
 #endif
@@ -1269,7 +1286,7 @@ void RexxCURLSetVersionInfoConstants( Rx
    valuelen = 0;
    namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) );
 #if LIBCURL_VERSION_NUM >= 0x071001

    valuelen = (version_info->libssh_version) ? strlen( version_info->libssh_version ) : 0;
 #endif
    SetRexxVariable( RxPackageGlobalData, name, namelen, support, valuelen );
@@ -1841,9 +1843,9 @@ int rexxcurl_sshkey_callback( CURL *easy
       if ( argv == NULL )
          return -1;
 
-      rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", knownkey->len );
+      rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", (unsigned long) knownkey->len );
       rx_knownkeytype_len = sprintf( rx_knownkeytype, "%u", knownkey->keytype );
-      rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", foundkey->len );
+      rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", (unsigned long) foundkey->len );
       rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
       rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
 
@@ -2293,6 +2311,7 @@ rxfunc( CurlSetopt )
             default:
                break;
          }
+#endif
          break;
       case RXCURLOPT_INFILE:
          /* parameter must be the name of a file to read from or blank to turn it off */
@@ -2317,7 +2336,11 @@ rxfunc( CurlSetopt )
           */
          switch ( RexxCurlOptions[opt].number )
          {
+#if LIBCURL_VERSION_NUM >= 0x070907
+            case CURLOPT_READDATA:
+#else
             case CURLOPT_INFILE:
+#endif
                /*
                 * Always set the file size for the specified INFILE
                 */

Lines 4-10 Link Here

(-)./pkg-plist (-1 lines)
4	lib/librexxcurl.so	4	lib/librexxcurl.so
5	%%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png	5	%%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png
6	%%PORTDOCS%%%%DOCSDIR%%/index.html	6	%%PORTDOCS%%%%DOCSDIR%%/index.html
7	%%PORTDOCS%%%%DOCSDIR%%/CPLv1.0.txt
8	%%DATADIR%%/README.txt	7	%%DATADIR%%/README.txt
9	%%DATADIR%%/getmail-pop3.rexx	8	%%DATADIR%%/getmail-pop3.rexx
10	%%DATADIR%%/getright.rexx	9	%%DATADIR%%/getright.rexx

Return to bug 212271

Lines 1-14 Link Here

(-)./files/patch-Makefile.in (-31 / +31 lines)
1	--- Makefile.in.orig 2012-04-29 00:23:57 UTC	1	--- Makefile.in.orig 2015-04-12 10:29:42 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -118,7 +118,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)	3	@@ -120,7 +120,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
4	$(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \	4	$(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \
5	$(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \	5	$(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \
6	$(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \	6	$(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \
7	-$(PACKAGE_DIR)/doc/.html $(PACKAGE_DIR)/doc/images/.png \	7	-$(PACKAGE_DIR)/doc/.html $(PACKAGE_DIR)/doc/images/.png \
8	$(PACKAGE_DIR)/rxcurl64.xpm $(PACKAGE_DIR)/RexxCURL.spec.in \	8	$(PACKAGE_DIR)/RexxCURL.spec \
9	$(PACKAGE_DIR)/debian/.regina $(PACKAGE_DIR)/debian/.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat	9	$(PACKAGE_DIR)/debian/.rexxtrans $(PACKAGE_DIR)/debian/.regina $(PACKAGE_DIR)/debian/*.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules $(PACKAGE_DIR)/debian/control
10		10
11	@@ -229,8 +228,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w	11	@@ -231,8 +230,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w
12		12
13	doco:	13	doco:
14	mkdir images	14	mkdir images
Lines 17-31 Link Here
17		17
18	zip:	18	zip:
19	zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES)	19	zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES)
20	@@ -239,7 +236,6 @@ zip:	20	@@ -241,7 +238,6 @@ zip:
21	zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx	21	zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx
22	zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx	22	zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx
23	zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex	23	zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex
24	- zip rexxcurl$(VER) doc/.html doc/images/.png	24	- zip rexxcurl$(VER) doc/.html doc/images/.png
25	zip rexxcurl$(VER) debian/.regina debian/.oorexx debian/copyright debian/compat	25	zip rexxcurl$(VER) debian/.regina debian/.oorexx debian/copyright debian/compat
26	zip rexxcurl$(VER) RexxCURL.spec.in rxcurl64.xpm	26	zip rexxcurl$(VER) RexxCURL.spec
27		27
28	@@ -265,8 +261,6 @@ installbase: all	28	@@ -259,8 +255,6 @@ installbase: all
29	$(INSTALL) -d $(DESTDIR)$(bindir)	29	$(INSTALL) -d $(DESTDIR)$(bindir)
30	$(INSTALL) -d $(DESTDIR)$(libdir)	30	$(INSTALL) -d $(DESTDIR)$(libdir)
31	$(INSTALL) -d $(DESTDIR)$(sharedir)	31	$(INSTALL) -d $(DESTDIR)$(sharedir)
Lines 34-50 Link Here
34	$(INSTALL) -c -m 755 ./$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)	34	$(INSTALL) -c -m 755 ./$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
35	$(INSTALL) -c -m 755 ./rexxcurl-config $(DESTDIR)$(bindir)/rexxcurl-config	35	$(INSTALL) -c -m 755 ./rexxcurl-config $(DESTDIR)$(bindir)/rexxcurl-config
36	-$(INSTALL) -c -m 755 ./$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST)	36	-$(INSTALL) -c -m 755 ./$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST)
37	@@ -286,9 +280,6 @@ installbase: all	37	@@ -273,9 +267,6 @@ installbase: all
38	$(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(srcdir)/preinst.rexx $(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(srcdir)/demo/getright.rexx $(DESTDIR)$(sharedir)/getright.rexx	38	$(INSTALL) -c -m 755 $(srcdir)/demo/upload.rexx $(DESTDIR)$(sharedir)/upload.rexx
39	-chmod 755 $(DESTDIR)$(sharedir)/getright.rexx	39	$(INSTALL) -c -m 755 $(srcdir)/demo/getright.rexx $(DESTDIR)$(sharedir)/getright.rexx
40	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt $(DESTDIR)$(sharedir)/README.txt	40	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt $(DESTDIR)$(sharedir)/README.txt
41	- $(INSTALL) -c -m 644 $(srcdocdir)/index.html $(DESTDIR)$(docdir)/index.html	41	- $(INSTALL) -c -m 644 $(srcdocdir)/index.html $(DESTDIR)$(docdir)/index.html
42	- $(INSTALL) -c -m 644 $(srcdocdir)/images/rxcurl64.png $(DESTDIR)$(docdir)/images/rxcurl64.png	42	- $(INSTALL) -c -m 644 $(srcdocdir)/images/rxcurl64.png $(DESTDIR)$(docdir)/images/rxcurl64.png
43	- $(INSTALL) -c -m 644 $(srcdir)/CPLv1.0.txt $(DESTDIR)$(docdir)/CPLv1.0.txt	43	- $(INSTALL) -c -m 644 $(srcdir)/CPLv1.0.txt $(DESTDIR)$(docdir)/CPLv1.0.txt
44		44
45	cygwininstall: installbase	45	uninstall:
46	mv $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(bindir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST)	46	rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
47	@@ -318,8 +309,6 @@ beosinstall: all	47	@@ -313,8 +304,6 @@ beosinstall: all
48	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt	48	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt
49	#	49	#
50	# where to put doc for BeOS ?	50	# where to put doc for BeOS ?
Lines 53-76 Link Here
53	#	53	#
54		54
55	binary: $(BASE_BINARY)	55	binary: $(BASE_BINARY)
56	@@ -330,7 +319,6 @@ binarybase: all	56	@@ -324,7 +313,6 @@ binarybase: all
		57	-mkdir -p ./tmpdir/bin
57	-mkdir -p ./tmpdir/lib	58	-mkdir -p ./tmpdir/lib
58	-mkdir -p ./tmpdir/rexx	59	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
59	-mkdir -p ./tmpdir/doc/rexxcurl	60	- -mkdir -p ./tmpdir/share/doc/rexxcurl/images
60	- -mkdir -p ./tmpdir/doc/rexxcurl/images
61	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin	61	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
62	cp $(PACKAGE_NAME)-config ./tmpdir/bin	62	cp $(PACKAGE_NAME)-config ./tmpdir/bin
63	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib	63	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
64	@@ -340,8 +328,6 @@ binarybase: all	64	@@ -334,8 +322,6 @@ binarybase: all
65	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl	65	cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl
66	cp $(srcdir)/README ./tmpdir/doc/rexxcurl	66	cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl
67	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl	67	cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl
68	- cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl	68	- cp $(srcdir)/doc/index.html ./tmpdir/share/doc/rexxcurl
69	- cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images	69	- cp $(srcdir)/doc/images/*.png ./tmpdir/share/doc/rexxcurl/images
70	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx	70	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx
71	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx	71	cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx
72	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx	72	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx
73	@@ -359,7 +345,6 @@ cygwinbinary: all	73	@@ -353,7 +339,6 @@ cygwinbinary: all
74	-mkdir -p ./tmpdir/lib	74	-mkdir -p ./tmpdir/lib
75	-mkdir -p ./tmpdir/rexx	75	-mkdir -p ./tmpdir/rexx
76	-mkdir -p ./tmpdir/doc/rexxcurl	76	-mkdir -p ./tmpdir/doc/rexxcurl
Lines 78-84 Link Here
78	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin	78	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
79	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin	79	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
80	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib	80	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
81	@@ -368,8 +353,6 @@ cygwinbinary: all	81	@@ -362,8 +347,6 @@ cygwinbinary: all
82	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl	82	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
83	cp $(srcdir)/README ./tmpdir/doc/rexxcurl	83	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
84	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl	84	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
Lines 87-93 Link Here
87	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx	87	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
88	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx	88	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
89	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx	89	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
90	@@ -387,7 +370,6 @@ beosbinary: all	90	@@ -381,7 +364,6 @@ beosbinary: all
91	-mkdir -p ./tmpdir/lib	91	-mkdir -p ./tmpdir/lib
92	-mkdir -p ./tmpdir/add-ons/rexx	92	-mkdir -p ./tmpdir/add-ons/rexx
93	-mkdir -p ./tmpdir/doc/rexxcurl	93	-mkdir -p ./tmpdir/doc/rexxcurl
Lines 95-101 Link Here
95	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin	95	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
96	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx	96	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
97	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib	97	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
98	@@ -396,8 +378,6 @@ beosbinary: all	98	@@ -390,8 +372,6 @@ beosbinary: all
99	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl	99	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
100	cp $(srcdir)/README ./tmpdir/doc/rexxcurl	100	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
101	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl	101	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl

Lines 1-61 Link Here

(-)./files/patch-rexxcurl.c (-89 / +23 lines)
1	--- rexxcurl.c.orig 2012-04-26 09:56:03 UTC	1	--- rexxcurl.c.orig 2015-04-11 22:53:39 UTC
2	+++ rexxcurl.c	2	+++ rexxcurl.c
3	@@ -384,7 +384,9 @@ static curl_options RexxCurlOptions[] =	3	@@ -53,6 +53,8 @@
4	#if LIBCURL_VERSION_NUM >= 0x071301	4	* internal error set N/A
5	{ "CERTINFO" ,CURLOPT_CERTINFO ,RXCURLOPT_LONG , NULL },	5	* cURL runtime errors -1 set
6	#endif	6	*/
7	+#if 0	7	+#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
8	{ "CLOSEPOLICY" ,CURLOPT_CLOSEPOLICY ,RXCURLOPT_POLICY , NULL },	8	+
9	+#endif	9	#ifdef HAVE_CONFIG_H
10	#if LIBCURL_VERSION_NUM >= 0x070f02	10	# include "config.h"
11	{ "CONNECTONLY" ,CURLOPT_CONNECT_ONLY ,RXCURLOPT_LONG , NULL },	11	#else
12	#endif	12	@@ -1366,7 +1368,7 @@ void RexxCURLSetVersionInfoConstants( Rx
13	@@ -489,8 +491,13 @@ static curl_options RexxCurlOptions[] =
14	{ "GSSAPIDELEGATION",CURLOPT_GSSAPI_DELEGATION,RXCURLOPT_GSSAPI_DELEGATION , NULL },
15	#endif
16	{ "HEADER" ,CURLOPT_HEADER ,RXCURLOPT_BOOL , NULL },
17	+#if LIBCURL_VERSION_NUM >= 0x070907
18	+ { "HEADERFILE" ,CURLOPT_HEADERDATA ,RXCURLOPT_OUTFILE , NULL },
19	+ { "HEADERSTEM" ,CURLOPT_HEADERDATA ,RXCURLOPT_HEADERSTEM , NULL },
20	+#else
21	{ "HEADERFILE" ,CURLOPT_WRITEHEADER ,RXCURLOPT_OUTFILE , NULL },
22	{ "HEADERSTEM" ,CURLOPT_WRITEHEADER ,RXCURLOPT_HEADERSTEM , NULL },
23	+#endif
24	#if LIBCURL_VERSION_NUM >= 0x070a03
25	{ "HTTP200ALIASES" ,CURLOPT_HTTP200ALIASES ,RXCURLOPT_LIST , NULL },
26	#endif
27	@@ -517,9 +524,17 @@ static curl_options RexxCurlOptions[] =
28	#if LIBCURL_VERSION_NUM >= 0x070e01
29	{ "IGNORECONTENTLENGTH",CURLOPT_IGNORE_CONTENT_LENGTH,RXCURLOPT_LONG, NULL },
30	#endif
31	+#if LIBCURL_VERSION_NUM >= 0x070907
32	+ { "INFILE" ,CURLOPT_READDATA ,RXCURLOPT_INFILE , NULL },
33	+#else
34	{ "INFILE" ,CURLOPT_INFILE ,RXCURLOPT_INFILE , NULL },
35	+#endif
36	{ "INTERFACE" ,CURLOPT_INTERFACE ,RXCURLOPT_STRING , NULL },
37	+#if LIBCURL_VERSION_NUM >= 0x070907
38	+ { "INSTEM" ,CURLOPT_READDATA ,RXCURLOPT_INSTEM , NULL },
39	+#else
40	{ "INSTEM" ,CURLOPT_INFILE ,RXCURLOPT_INSTEM , NULL },
41	+#endif
42	#if LIBCURL_VERSION_NUM >= 0x070a08
43	{ "IPRESOLVE" ,CURLOPT_IPRESOLVE ,RXCURLOPT_IPRESOLVE , NULL },
44	#endif
45	@@ -576,8 +591,10 @@ static curl_options RexxCurlOptions[] =
46	#if LIBCURL_VERSION_NUM >= 0x070a02
47	{ "NOSIGNAL" ,CURLOPT_NOSIGNAL ,RXCURLOPT_BOOL , NULL },
48	#endif
49	- { "OUTFILE" ,CURLOPT_FILE ,RXCURLOPT_OUTFILE , NULL },
50	- { "OUTSTEM" ,CURLOPT_FILE ,RXCURLOPT_OUTSTEM , NULL },
51	+#if LIBCURL_VERSION_NUM >= 0x070907
52	+ { "OUTFILE" ,CURLOPT_WRITEDATA ,RXCURLOPT_OUTFILE , NULL },
53	+ { "OUTSTEM" ,CURLOPT_WRITEDATA ,RXCURLOPT_OUTSTEM , NULL },
54	+#endif
55	#if LIBCURL_VERSION_NUM >= 0x071301
56	{ "PASSWORD" ,CURLOPT_PASSWORD ,RXCURLOPT_STRING , NULL },
57	#endif
58	@@ -1269,7 +1286,7 @@ void RexxCURLSetVersionInfoConstants( Rx
59	valuelen = 0;	13	valuelen = 0;
60	namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) );	14	namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) );
61	#if LIBCURL_VERSION_NUM >= 0x071001	15	#if LIBCURL_VERSION_NUM >= 0x071001
Lines 64-98 Link Here
64	valuelen = (version_info->libssh_version) ? strlen( version_info->libssh_version ) : 0;	18	valuelen = (version_info->libssh_version) ? strlen( version_info->libssh_version ) : 0;
65	#endif	19	#endif
66	SetRexxVariable( RxPackageGlobalData, name, namelen, support, valuelen );	20	SetRexxVariable( RxPackageGlobalData, name, namelen, support, valuelen );
67	@@ -2273,9 +2290,10 @@ rxfunc( CurlSetopt )	21	@@ -1841,9 +1843,9 @@ int rexxcurl_sshkey_callback( CURL *easy
68	SetCURLError( RxPackageGlobalData, curl_rc, curl_errors[rc] );	22	if ( argv == NULL )
69	break;	23	return -1;
70	}	24
71	+#if LIBCURL_VERSION_NUMBER > 0x070907	25	- rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", knownkey->len );
72	switch ( RexxCurlOptions[opt].number )	26	+ rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", (unsigned long) knownkey->len );
73	{	27	rx_knownkeytype_len = sprintf( rx_knownkeytype, "%u", knownkey->keytype );
74	- case CURLOPT_FILE:	28	- rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", foundkey->len );
75	+ case CURLOPT_WRITEDATA:	29	+ rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", (unsigned long) foundkey->len );
76	if ( argv[2].strlength )	30	rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
77	{	31	rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
78	/*	32
79	@@ -2293,6 +2311,7 @@ rxfunc( CurlSetopt )
80	default:
81	break;
82	}
83	+#endif
84	break;
85	case RXCURLOPT_INFILE:
86	/* parameter must be the name of a file to read from or blank to turn it off */
87	@@ -2317,7 +2336,11 @@ rxfunc( CurlSetopt )
88	*/
89	switch ( RexxCurlOptions[opt].number )
90	{
91	+#if LIBCURL_VERSION_NUM >= 0x070907
92	+ case CURLOPT_READDATA:
93	+#else
94	case CURLOPT_INFILE:
95	+#endif
96	/*
97	* Always set the file size for the specified INFILE
98	*/