Revision: 26367 http://sourceforge.net/p/gar/code/26367 Author: janholzh Date: 2018-02-22 12:22:25 +0000 (Thu, 22 Feb 2018) Log Message: ----------- lftp/trunk: fix build, remove dante socks because it's broken
Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch csw/mgar/pkg/lftp/trunk/files/fix-curses.patch csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch Removed Paths: ------------- csw/mgar/pkg/lftp/trunk/files/munmap.patch Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2018-02-22 09:37:26 UTC (rev 26366) +++ csw/mgar/pkg/lftp/trunk/Makefile 2018-02-22 12:22:25 UTC (rev 26367) @@ -28,9 +28,10 @@ RUNTIME_DEP_PKGS = CSWlibexpat1 RUNTIME_DEP_PKGS += CSWlibiconv2 RUNTIME_DEP_PKGS += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWlibsocks +#RUNTIME_DEP_PKGS += CSWlibsocks RUNTIME_DEP_PKGS += CSWlibintl9 -RUNTIME_DEP_PKGS += CSWlibreadline6 +RUNTIME_DEP_PKGS += CSWlibreadline7 +RUNTIME_DEP_PKGS += CSWlibncurses6 RUNTIME_DEP_PKGS += CSWlibz1 RUNTIME_DEP_PKGS += CSWlibidn2-0 # necessary when compiled with gcc @@ -46,11 +47,17 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWlftp.cswreleasenotes + +PATCHDIRLEVEL = 0 # do some type conversion before munmap call # so lftp can be compiled with sun cc # (patch only mandatory to compile with gnutls) -#PATCHFILES = munmap.patch +PATCHFILES += lftp_ssl.patch +# Fix to use only ncurses +PATCHFILES += fix-curses.patch +PATCHFILES += 0004-fix_ncuses_use.patch + # Update the system-wide lftp.conf path in the man page PATCHFILES += 0007-update-configuration-files-paths-in-documentation.patch @@ -75,7 +82,9 @@ # instead of gnutls, no need to change that CONFIGURE_ARGS += --without-gnutls --with-openssl=$(prefix) # Requested see https://www.opencsw.org/mantis/view.php?id=4481 -CONFIGURE_ARGS += --with-socksdante +# Broken on "modern" Solaris 10 and 11 disabled for now (socket error for ftp connection) +#CONFIGURE_ARGS += --with-socksdante + CONFIGURE_ARGS += --with-readline=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) @@ -86,7 +95,7 @@ # gcc has some header fixes for curses.h which are included and brake everything. #add this so the ncuses curses.h is included -EXTRA_CPPFLAGS = -I/opt/csw/include/ncurses +#EXTRA_CPPFLAGS = -I/opt/csw/include/ncurses # No test suite here TEST_SCRIPTS = Added: csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch =================================================================== --- csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch (rev 0) +++ csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch 2018-02-22 12:22:25 UTC (rev 26367) @@ -0,0 +1,25 @@ +From 98b6737891500c11923a22019c94dd66439094d1 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter <j...@opencsw.org> +Date: Thu, 22 Feb 2018 11:36:36 +0100 +Subject: [PATCH] fix_ncuses_use + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 6350fcd..e9cd9cb 100755 +--- a/configure ++++ b/configure +@@ -50253,7 +50253,7 @@ return tigetstr (); + return 0; + } + _ACEOF +-for ac_lib in '' tinfo curses ncurses; do ++for ac_lib in '' tinfo ncurses; do + if test -z "$ac_lib"; then + ac_res="none required" + else +-- +2.4.0 + Added: csw/mgar/pkg/lftp/trunk/files/fix-curses.patch =================================================================== --- csw/mgar/pkg/lftp/trunk/files/fix-curses.patch (rev 0) +++ csw/mgar/pkg/lftp/trunk/files/fix-curses.patch 2018-02-22 12:22:25 UTC (rev 26367) @@ -0,0 +1,30 @@ +Force lftp to use just ncurses (rather than both Solaris curses and ncurses) +because of the conflicting definition of setupterm: + +/usr/include/curses.h + extern int setupterm(char *, int, int *); + +/usr/include/ncurses/term.h + extern NCURSES_EXPORT(int) setupterm (NCURSES_CONST char *,int,int *); + +This appears to be a problem in the Solaris curses header file so not +sending upstream. + +--- src/lftp_tinfo.cc.orig 2017-05-09 07:17:26.390916385 +0000 ++++ src/lftp_tinfo.cc 2017-05-09 07:30:44.168086861 +0000 +@@ -20,14 +20,7 @@ + #include <config.h> + + extern "C" { +-#if defined(HAVE_CURSES_H) +-# include <curses.h> +-# if defined(HAVE_TERM_H) +-# include <term.h> +-# elif defined(HAVE_NCURSES_TERM_H) +-# include <ncurses/term.h> +-# endif +-#elif defined(HAVE_NCURSES_CURSES_H) ++#if defined(HAVE_NCURSES_CURSES_H) + # include <ncurses/curses.h> + # if defined(HAVE_NCURSES_TERM_H) + # include <ncurses/term.h> Added: csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch =================================================================== --- csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch (rev 0) +++ csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch 2018-02-22 12:22:25 UTC (rev 26367) @@ -0,0 +1,11 @@ +--- src/lftp_ssl.cc.old Tue Mar 4 04:55:14 2008 ++++ src/lftp_ssl.cc Tue Mar 4 04:55:42 2008 +@@ -95,7 +95,7 @@ + + static void munmap_file(gnutls_datum_t data) + { +- munmap(data.data, data.size); ++ munmap((char*)data.data, data.size); + } + + #if LFTP_LIBGNUTLS_VERSION_CODE < 0x010201 Deleted: csw/mgar/pkg/lftp/trunk/files/munmap.patch =================================================================== --- csw/mgar/pkg/lftp/trunk/files/munmap.patch 2018-02-22 09:37:26 UTC (rev 26366) +++ csw/mgar/pkg/lftp/trunk/files/munmap.patch 2018-02-22 12:22:25 UTC (rev 26367) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru lftp-3.4.6.orig/src/lftp_ssl.cc lftp-3.4.6/src/lftp_ssl.cc ---- lftp-3.4.6.orig/src/lftp_ssl.cc 2006-04-27 18:08:49.188205000 -0400 -+++ lftp-3.4.6/src/lftp_ssl.cc 2006-04-27 18:08:41.398203000 -0400 -@@ -107,7 +107,7 @@ - - static void munmap_file(gnutls_datum_t data) - { -- munmap(data.data, data.size); -+ munmap((caddr_t)data.data, data.size); - } - - #if LFTP_LIBGNUTLS_VERSION_CODE < 0x010201 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.