Attachment #253306 for bug #279775




PORTNAME=	curl
PORTVERSION=	2.1.1
CATEGORIES=	ftp
MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX=	rexx-
DISTNAME=	rexxcurl-${PORTVERSION}

MAINTAINER=	bob@eager.cx
COMMENT=	External function package providing an interface to the cURL package

		libregina.so:lang/rexx-regina
RUN_DEPENDS=	rexx:lang/rexx-regina

USES=		gmake pkgconfig

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-rexx=regina LDFLAGS=-L/usr/lib

Lines 1-3 Link Here

(-)b/ftp/rexx-curl/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1554585945	1	TIMESTAMP = 1725394061
2	SHA256 (RexxCURL-2.1.0.tar.gz) = 734b7d733ceda0f2c189f99b54f0a86e98cb5f04269c726a4b6873c94f1a46a5	2	SHA256 (rexxcurl-2.1.1.tar.gz) = f95566a3236a2e42d677be5abf2047e057b1c089ae01aa98fbcff9b4181dc0c5
3	SIZE (RexxCURL-2.1.0.tar.gz) = 461774	3	SIZE (rexxcurl-2.1.1.tar.gz) = 941256




--- Makefile.in.orig	2019-02-10 22:01:43 UTC
+++ Makefile.in
@@ -123,7 +123,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/control.rexxtrans $(PACKAGE_DIR)/debian/control.regina $(PACKAGE_DIR)/debian/control.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules.in
 
@@ -243,7 +242,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
 
@@ -331,8 +329,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 ?
-#	$(INSTALL) -c -m 644 $(docdir)/index.html $(DESTDIR)$(sharedir)/index.html
-#	$(INSTALL) -c -m 644 $(docdir)/images/rxcurl64.png $(DESTDIR)$(sharedir)/images/rxcurl64.png
 #
 
 binary: $(BASE_BINARY)
@@ -342,7 +338,6 @@ binarybase: all
 	-mkdir -p ./tmpdir/bin
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
-	-mkdir -p ./tmpdir/share/doc/rexxcurl/images
 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(PACKAGE_NAME)-config ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
@@ -352,8 +347,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
@@ -371,7 +364,6 @@ cygwinbinary: all
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/rexx
 	-mkdir -p ./tmpdir/doc/rexxcurl
-	-mkdir -p ./tmpdir/doc/rexxcurl/images
 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -380,8 +372,6 @@ cygwinbinary: all
 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
-	cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl
-	cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images
 	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
@@ -399,7 +389,6 @@ beosbinary: all
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/add-ons/rexx
 	-mkdir -p ./tmpdir/doc/rexxcurl
-	-mkdir -p ./tmpdir/doc/rexxcurl/images
 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -408,8 +397,6 @@ beosbinary: all
 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
-	cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl
-	cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images
 	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




--- rexxcurl.c.orig	2019-02-10 22:51:41 UTC
+++ rexxcurl.c
@@ -52,6 +52,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
@@ -480,8 +482,13 @@ static curl_options RexxCurlOptions[] =
    { "FTPLISTONLY"     ,CURLOPT_FTPLISTONLY     ,RXCURLOPT_BOOL        , NULL },
 #endif
    { "FTPPORT"         ,CURLOPT_FTPPORT         ,RXCURLOPT_STRING      , NULL },
+#if LIBCURL_VERSION_NUM >= 0x075500
+   { "FTPRESPONSETIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
+#endif
 #if LIBCURL_VERSION_NUM >= 0x070a08
+# if LIBCURL_VERSION_NUM < 0x075500
    { "FTPRESPONSETIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
+# endif
 #endif
 #if LIBCURL_VERSION_NUM >= 0x070e00
    { "FTPSKIPPASVIP"   ,CURLOPT_FTP_SKIP_PASV_IP,RXCURLOPT_BOOL        , NULL },
@@ -1879,9 +1886,9 @@ int rexxcurl_sshkey_callback( CURL *easy,     /* 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 );
 
@@ -1964,11 +1971,11 @@ int debug_function( CURL *handle, curl_infotype type, 
    int c;
    char *prefix = "*<><><>";
    if ( type == CURLINFO_TEXT )
-      fprintf( fp, "text: %c %.*s", prefix[type],size, data );
+      fprintf( fp, "text: %c %.*s", prefix[type],(int)size, data );
    if ( type == CURLINFO_HEADER_IN )
-      fprintf( fp, "header_in: %c %.*s", prefix[type],size, data );
+      fprintf( fp, "header_in: %c %.*s", prefix[type],(int)size, data );
    if ( type == CURLINFO_HEADER_OUT )
-      fprintf( fp, "header_out:%c %.*s", prefix[type],size, data );
+      fprintf( fp, "header_out:%c %.*s", prefix[type],(int)size, data );
    if ( type == CURLINFO_SSL_DATA_IN )
    {
       fprintf( fp, "ssl_data_in: " );

Return to bug 279775

Lines 1-9 Link Here

(-)b/ftp/rexx-curl/Makefile (-3 / +3 lines)
1	PORTNAME= curl	1	PORTNAME= curl
2	PORTVERSION= 2.1.0	2	PORTVERSION= 2.1.1
3	CATEGORIES= ftp	3	CATEGORIES= ftp
4	MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}	4	MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
5	PKGNAMEPREFIX= rexx-	5	PKGNAMEPREFIX= rexx-
6	DISTNAME= RexxCURL-${PORTVERSION}	6	DISTNAME= rexxcurl-${PORTVERSION}
7		7
8	MAINTAINER= bob@eager.cx	8	MAINTAINER= bob@eager.cx
9	COMMENT= External function package providing an interface to the cURL package	9	COMMENT= External function package providing an interface to the cURL package
Lines 19-25 LIB_DEPENDS= libcurl.so:ftp/curl \ Link Here
19	libregina.so:lang/rexx-regina	19	libregina.so:lang/rexx-regina
20	RUN_DEPENDS= rexx:lang/rexx-regina	20	RUN_DEPENDS= rexx:lang/rexx-regina
21		21
22	USES= gmake	22	USES= gmake pkgconfig
23		23
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --with-rexx=regina LDFLAGS=-L/usr/lib	25	CONFIGURE_ARGS= --with-rexx=regina LDFLAGS=-L/usr/lib

Removed Link Here

(-)a/ftp/rexx-curl/files/patch-Makefile.in (-78 lines)
1	--- Makefile.in.orig 2019-02-10 22:01:43 UTC
2	+++ Makefile.in
3	@@ -123,7 +123,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
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 \
6	$(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \
7	-$(PACKAGE_DIR)/doc/.html $(PACKAGE_DIR)/doc/images/.png \
8	$(PACKAGE_DIR)/RexxCURL.spec \
9	$(PACKAGE_DIR)/debian/control.rexxtrans $(PACKAGE_DIR)/debian/control.regina $(PACKAGE_DIR)/debian/control.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules.in
10
11	@@ -243,7 +242,6 @@ zip:
12	zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx
13	zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx
14	zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex
15	- zip rexxcurl$(VER) doc/.html doc/images/.png
16	zip rexxcurl$(VER) debian/.regina debian/.oorexx debian/copyright debian/compat
17	zip rexxcurl$(VER) RexxCURL.spec
18
19	@@ -331,8 +329,6 @@ beosinstall: all
20	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt
21	#
22	# where to put doc for BeOS ?
23	-# $(INSTALL) -c -m 644 $(docdir)/index.html $(DESTDIR)$(sharedir)/index.html
24	-# $(INSTALL) -c -m 644 $(docdir)/images/rxcurl64.png $(DESTDIR)$(sharedir)/images/rxcurl64.png
25	#
26
27	binary: $(BASE_BINARY)
28	@@ -342,7 +338,6 @@ binarybase: all
29	-mkdir -p ./tmpdir/bin
30	-mkdir -p ./tmpdir/lib
31	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
32	- -mkdir -p ./tmpdir/share/doc/rexxcurl/images
33	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
34	cp $(PACKAGE_NAME)-config ./tmpdir/bin
35	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
36	@@ -352,8 +347,6 @@ binarybase: all
37	cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl
38	cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl
39	cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl
40	- cp $(srcdir)/doc/index.html ./tmpdir/share/doc/rexxcurl
41	- cp $(srcdir)/doc/images/*.png ./tmpdir/share/doc/rexxcurl/images
42	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx
43	cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx
44	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx
45	@@ -371,7 +364,6 @@ cygwinbinary: all
46	-mkdir -p ./tmpdir/lib
47	-mkdir -p ./tmpdir/rexx
48	-mkdir -p ./tmpdir/doc/rexxcurl
49	- -mkdir -p ./tmpdir/doc/rexxcurl/images
50	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
51	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
52	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
53	@@ -380,8 +372,6 @@ cygwinbinary: all
54	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
55	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
56	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
57	- cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl
58	- cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images
59	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
60	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
61	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
62	@@ -399,7 +389,6 @@ beosbinary: all
63	-mkdir -p ./tmpdir/lib
64	-mkdir -p ./tmpdir/add-ons/rexx
65	-mkdir -p ./tmpdir/doc/rexxcurl
66	- -mkdir -p ./tmpdir/doc/rexxcurl/images
67	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
68	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
69	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
70	@@ -408,8 +397,6 @@ beosbinary: all
71	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
72	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
73	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
74	- cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl
75	- cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images
76	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
77	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
78	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx

Removed Link Here

(-)a/ftp/rexx-curl/files/patch-rexxcurl.c (-52 lines)
1	--- rexxcurl.c.orig 2019-02-10 22:51:41 UTC
2	+++ rexxcurl.c
3	@@ -52,6 +52,8 @@
4	* internal error set N/A
5	* cURL runtime errors -1 set
6	*/
7	+#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
8	+
9	#ifdef HAVE_CONFIG_H
10	# include "config.h"
11	#else
12	@@ -480,8 +482,13 @@ static curl_options RexxCurlOptions[] =
13	{ "FTPLISTONLY" ,CURLOPT_FTPLISTONLY ,RXCURLOPT_BOOL , NULL },
14	#endif
15	{ "FTPPORT" ,CURLOPT_FTPPORT ,RXCURLOPT_STRING , NULL },
16	+#if LIBCURL_VERSION_NUM >= 0x075500
17	+ { "FTPRESPONSETIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
18	+#endif
19	#if LIBCURL_VERSION_NUM >= 0x070a08
20	+# if LIBCURL_VERSION_NUM < 0x075500
21	{ "FTPRESPONSETIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
22	+# endif
23	#endif
24	#if LIBCURL_VERSION_NUM >= 0x070e00
25	{ "FTPSKIPPASVIP" ,CURLOPT_FTP_SKIP_PASV_IP,RXCURLOPT_BOOL , NULL },
26	@@ -1879,9 +1886,9 @@ int rexxcurl_sshkey_callback( CURL easy, / easy
27	if ( argv == NULL )
28	return -1;
29
30	- rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", knownkey->len );
31	+ rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", (unsigned long) knownkey->len );
32	rx_knownkeytype_len = sprintf( rx_knownkeytype, "%u", knownkey->keytype );
33	- rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", foundkey->len );
34	+ rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", (unsigned long) foundkey->len );
35	rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
36	rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
37
38	@@ -1964,11 +1971,11 @@ int debug_function( CURL *handle, curl_infotype type,
39	int c;
40	char prefix = "<><><>";
41	if ( type == CURLINFO_TEXT )
42	- fprintf( fp, "text: %c %.*s", prefix[type],size, data );
43	+ fprintf( fp, "text: %c %.*s", prefix[type],(int)size, data );
44	if ( type == CURLINFO_HEADER_IN )
45	- fprintf( fp, "header_in: %c %.*s", prefix[type],size, data );
46	+ fprintf( fp, "header_in: %c %.*s", prefix[type],(int)size, data );
47	if ( type == CURLINFO_HEADER_OUT )
48	- fprintf( fp, "header_out:%c %.*s", prefix[type],size, data );
49	+ fprintf( fp, "header_out:%c %.*s", prefix[type],(int)size, data );
50	if ( type == CURLINFO_SSL_DATA_IN )
51	{
52	fprintf( fp, "ssl_data_in: " );