Attachment 203445 Details for Bug 237076 – Patches to files in port tree: ftp/rexx-curl

[patch] Patches to files in port tree: ftp/rexx-curl

rexxcurl.diff (text/plain), 11.80 KB, created by Bob Eager on 2019-04-07 18:03:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Eager

Created: 2019-04-07 18:03:52 UTC

Size: 11.80 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with cdiff -s -w 0
>diff -ruN ../rexx-curl.orig/Makefile ./Makefile
>--- ../rexx-curl.orig/Makefile	2019-04-07 18:52:37.378426000 +0100
>+++ ./Makefile	2019-04-07 13:35:40.640394000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/ftp/rexx-curl/Makefile 485910 2018-11-26 01:48:42Z swills $
> 
> PORTNAME=	curl
>-PORTVERSION=	2.0.1
>-PORTREVISION=	1
>+PORTVERSION=	2.1.0
> CATEGORIES=	ftp
> MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
> PKGNAMEPREFIX=	rexx-
>@@ -23,37 +22,34 @@
> RUN_DEPENDS=	rexx:lang/rexx-regina
> 
> USES=		gmake
>+
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-rexx=regina
>+CONFIGURE_ARGS=	--with-rexx=regina LDFLAGS=-L/usr/lib
> USE_LDCONFIG=	yes
>-LLD_UNSAFE=	yes
> 
>-DOCSDIR=	${PREFIX}/share/doc/rexx${PORTNAME}
>-DATADIR=	${PREFIX}/share/rexx${PORTNAME}
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-OPTIONS_DEFINE=	DOCS
>+DATADIR=	${PREFIX}/share/rexx${PORTNAME}
>+DOCSDIR=	${PREFIX}/share/doc/rexx${PORTNAME}
>+EXAMPLESDIR=	${PREFIX}/share/examples/rexx${PORTNAME}
> 
>-do-extract:
>-	# avoid extracting circular hard links in distfile!
>-	@${MKDIR} ${WRKDIR}
>-	@tar -x -C ${WRKDIR} --exclude='*common/filterexports*' --exclude='*common/fixrc*' \
>-		-f ${DISTDIR}/${DISTNAME}.tar.gz
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e "s| -lc | |g" \
>-		-e "/$$.sharedir)\/images/d" \
>-		-e "/index.html/d" \
>-		-e "/rxcurl64.png/d" \
>-		${WRKSRC}/Makefile.in
>-
>-post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rexxcurl
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librexxcurl.so
>+DOCFILES=	getright.rexx getmail-pop3.rexx httppost.rexx scp.rexx \
>+		sendmail-smtp.rexx testcurl.rexx upload.rexx README.txt
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/rexxcurl ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_LIB} ${WRKSRC}/librexxcurl.so ${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_DATA} ${WRKSRC}/librexxcurl.a ${STAGEDIR}${PREFIX}/lib
> 
>-post-install-DOCS-on:
>+do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${STAGEDIR}${DOCSDIR}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
> 	${INSTALL_DATA} ${WRKSRC}/doc/images/rxcurl64.png ${STAGEDIR}${DOCSDIR}/images
> 
>+do-install-EXAMPLES-on:
>+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+.for f in ${DOCFILES}
>+	${INSTALL_DATA} ${WRKSRC}/demo/$f ${STAGEDIR}${EXAMPLESDIR}
>+.endfor
>+
> .include <bsd.port.mk>
>diff -ruN ../rexx-curl.orig/distinfo ./distinfo
>--- ../rexx-curl.orig/distinfo	2019-04-07 18:52:37.378693000 +0100
>+++ ./distinfo	2019-04-06 22:25:45.252819000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1472503050
>-SHA256 (RexxCURL-2.0.1.tar.gz) = 83b857686af41323f238722dccbb0ded85d1317e7fe95410ebe8978daadaa51a
>-SIZE (RexxCURL-2.0.1.tar.gz) = 455919
>+TIMESTAMP = 1554585945
>+SHA256 (RexxCURL-2.1.0.tar.gz) = 734b7d733ceda0f2c189f99b54f0a86e98cb5f04269c726a4b6873c94f1a46a5
>+SIZE (RexxCURL-2.1.0.tar.gz) = 461774
>diff -ruN ../rexx-curl.orig/files/patch-Makefile.in ./files/patch-Makefile.in
>--- ../rexx-curl.orig/files/patch-Makefile.in	2019-04-07 18:52:37.378884000 +0100
>+++ ./files/patch-Makefile.in	2019-04-06 22:53:48.326914000 +0100
>@@ -1,23 +1,14 @@
>---- Makefile.in.orig	2015-04-12 10:29:42 UTC
>+--- Makefile.in.orig	2019-02-10 22:01:43 UTC
> +++ Makefile.in
>-@@ -120,7 +120,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
>+@@ -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/*.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
>+ $(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
>  
>-@@ -231,8 +230,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w
>- 
>- doco:
>- 	mkdir images
>--	cp $(srcdocdir)/index.html .
>--	cp $(srcdocdir)/images/*.png images
>- 
>- zip:
>- 	zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES)
>-@@ -241,7 +238,6 @@ zip:
>+@@ -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
>@@ -25,26 +16,7 @@
>  	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) -d $(DESTDIR)$(docdir)
>--	$(INSTALL) -d $(DESTDIR)$(docdir)/images
>- 	$(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
>+@@ -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 ?
>@@ -53,7 +25,7 @@
>  #
>  
>  binary: $(BASE_BINARY)
>-@@ -324,7 +313,6 @@ binarybase: all
>+@@ -342,7 +338,6 @@ binarybase: all
>  	-mkdir -p ./tmpdir/bin
>  	-mkdir -p ./tmpdir/lib
>  	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
>@@ -61,7 +33,7 @@
>  	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
>+@@ -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
>@@ -70,7 +42,7 @@
>  	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
>+@@ -371,7 +364,6 @@ cygwinbinary: all
>  	-mkdir -p ./tmpdir/lib
>  	-mkdir -p ./tmpdir/rexx
>  	-mkdir -p ./tmpdir/doc/rexxcurl
>@@ -78,7 +50,7 @@
>  	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
>+@@ -380,8 +372,6 @@ cygwinbinary: all
>  	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
>  	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
>  	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
>@@ -87,7 +59,7 @@
>  	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
>+@@ -399,7 +389,6 @@ beosbinary: all
>  	-mkdir -p ./tmpdir/lib
>  	-mkdir -p ./tmpdir/add-ons/rexx
>  	-mkdir -p ./tmpdir/doc/rexxcurl
>@@ -95,7 +67,7 @@
>  	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
>+@@ -408,8 +397,6 @@ beosbinary: all
>  	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
>  	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
>  	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
>diff -ruN ../rexx-curl.orig/files/patch-common_loader.c ./files/patch-common_loader.c
>--- ../rexx-curl.orig/files/patch-common_loader.c	2019-04-07 18:52:37.379058000 +0100
>+++ ./files/patch-common_loader.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- common/loader.c.orig	2012-08-14 01:16:58 UTC
>-+++ common/loader.c
>-@@ -225,6 +225,7 @@ int main
>-    /*
>-     * Get any program options.
>-     */
>-+   optind = 1;  /* Previously clobbered by regina */
>-    while ((c = getopt(argc, argv, "Dudivh?f:")) != EOF)
>-    {
>-       switch (c)
>diff -ruN ../rexx-curl.orig/files/patch-rexxcurl.c ./files/patch-rexxcurl.c
>--- ../rexx-curl.orig/files/patch-rexxcurl.c	2019-04-07 18:52:37.379232000 +0100
>+++ ./files/patch-rexxcurl.c	2019-04-06 23:04:03.821909000 +0100
>@@ -1,6 +1,6 @@
>---- rexxcurl.c.orig	2015-04-11 22:53:39 UTC
>+--- rexxcurl.c.orig	2019-02-10 22:51:41 UTC
> +++ rexxcurl.c
>-@@ -53,6 +53,8 @@
>+@@ -52,6 +52,8 @@
>   * internal error                   set                 N/A
>   * cURL runtime errors              -1                  set
>   */
>@@ -9,16 +9,7 @@
>  #ifdef HAVE_CONFIG_H
>  # include "config.h"
>  #else
>-@@ -1366,7 +1368,7 @@ void RexxCURLSetVersionInfoConstants( Rx
>-    valuelen = 0;
>-    namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) );
>- #if LIBCURL_VERSION_NUM >= 0x071001
>--   support = version_info->libssh_version;
>-+   support = (char *) version_info->libssh_version;
>-    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
>+@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy
>        if ( argv == NULL )
>           return -1;
>  
>@@ -30,3 +21,18 @@
>        rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
>        rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
>  
>+@@ -1964,11 +1966,11 @@ int debug_function( CURL *handle, curl_i
>+    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: " );
>diff -ruN ../rexx-curl.orig/pkg-plist ./pkg-plist
>--- ../rexx-curl.orig/pkg-plist	2019-04-07 18:52:37.380388000 +0100
>+++ ./pkg-plist	2019-04-07 01:10:36.464108000 +0100
>@@ -1,14 +1,13 @@
> bin/rexxcurl
>-bin/rexxcurl-config
> lib/librexxcurl.a
> lib/librexxcurl.so
> %%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>-%%DATADIR%%/README.txt
>-%%DATADIR%%/getmail-pop3.rexx
>-%%DATADIR%%/getright.rexx
>-%%DATADIR%%/httppost.rexx
>-%%DATADIR%%/scp.rexx
>-%%DATADIR%%/sendmail-smtp.rexx
>-%%DATADIR%%/testcurl.rexx
>-%%DATADIR%%/upload.rexx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getmail-pop3.rexx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getright.rexx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httppost.rexx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scp.rexx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendmail-smtp.rexx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testcurl.rexx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.rexx
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 237076: 203445