From a2eab02a4d86f347ac25419f6497968d17a5cbe5 Mon Sep 17 00:00:00 2001 From: iigs <2274777+iigs@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:12:04 +0000 Subject: [PATCH] gftp: update to 2.9.1b; switch to openssl 3.1 --- components/desktop/gftp/Makefile | 40 ++++++------- components/desktop/gftp/gftp.p5m | 43 +++++++------ .../desktop/gftp/manifests/sample-manifest.p5m | 43 +++++++------ .../desktop/gftp/patches/01-solaris-in-trunk.patch | 8 --- .../desktop/gftp/patches/02-profile-dir.patch | 22 +++---- .../desktop/gftp/patches/03-g11n-charset.patch | 70 ---------------------- .../desktop/gftp/patches/04-g11n-lc-time.patch | 64 +++++++------------- ...11n-lc-time.patch => 04-g11n-lc-time.patch.old} | 0 .../desktop/gftp/patches/05-g11n-im-filter.patch | 14 ++--- .../desktop/gftp/patches/06-g11n-ssh-login.patch | 17 +++--- .../desktop/gftp/patches/07-g11n-cli-utf8.patch | 12 ++-- components/desktop/gftp/pkg5 | 9 +-- 12 files changed, 131 insertions(+), 211 deletions(-) delete mode 100644 components/desktop/gftp/patches/01-solaris-in-trunk.patch rewrite components/desktop/gftp/patches/02-profile-dir.patch (93%) delete mode 100644 components/desktop/gftp/patches/03-g11n-charset.patch copy components/desktop/gftp/patches/{04-g11n-lc-time.patch => 04-g11n-lc-time.patch.old} (100%) diff --git a/components/desktop/gftp/Makefile b/components/desktop/gftp/Makefile index a862d31a5d..bf50302162 100644 --- a/components/desktop/gftp/Makefile +++ b/components/desktop/gftp/Makefile @@ -12,41 +12,41 @@ # Copyright (c) 2015 Alexander Pyhalov # +OPENSSL_VERSION= 3.1 PREFERRED_BITS= 64 include ../../../make-rules/shared-macros.mk COMPONENT_NAME= gftp -COMPONENT_VERSION= 2.0.19 -COMPONENT_REVISION= 2 +COMPONENT_VERSION= 2.9.1 +COMPONENT_VERSION_MNR= b COMPONENT_PROJECT_URL= https://www.gftp.org/ -COMPONENT_SUMMARY= Multithreaded FTP client for *NIX based machines -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 +COMPONENT_SUMMARY= Multithreaded file transfer client for *NIX based machines +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)$(COMPONENT_VERSION_MNR) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd -COMPONENT_ARCHIVE_URL= http://gftp.seul.org//$(COMPONENT_ARCHIVE) -COMPONENT_FMRI= desktop/gftp -COMPONENT_LICENSE_FILE= COPYING -COMPONENT_LICENSE= GPLv2 + sha256:79c727a0c7720e0e49dac4fc760a686d10ff78a496e1e3e644b45d3e76e1eecd +COMPONENT_ARCHIVE_URL= https://github.com/masneyb/$(COMPONENT_NAME)/releases/download/$(COMPONENT_VERSION)$(COMPONENT_VERSION_MNR)/$(COMPONENT_ARCHIVE) +COMPONENT_FMRI= desktop/$(COMPONENT_NAME) +COMPONENT_LICENSE_FILE= LICENSE +COMPONENT_LICENSE= MIT COMPONENT_CLASSIFICATION= Applications/System Utilities -include $(WS_MAKE_RULES)/prep.mk -include $(WS_MAKE_RULES)/configure.mk -include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/common.mk PATH=$(PATH.gnu) -build: $(BUILD_64) +CFLAGS += -I$(OPENSSL_INCDIR) +LDFLAGS += -L$(OPENSSL_LIBDIR) -install: $(INSTALL_64) - -test: $(NO_TESTS) +COMPONENT_PRE_CONFIGURE_ACTION = \ + ($(CLONEY) $(SOURCE_DIR) $(@D)) # Auto-generated dependencies -REQUIRED_PACKAGES += SUNWcs +REQUIRED_PACKAGES += $(OPENSSL_PKG) +REQUIRED_PACKAGES += $(READLINE_PKG) +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf REQUIRED_PACKAGES += library/desktop/gtk2 REQUIRED_PACKAGES += library/glib2 -REQUIRED_PACKAGES += library/readline -REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += shell/ksh93 REQUIRED_PACKAGES += system/library diff --git a/components/desktop/gftp/gftp.p5m b/components/desktop/gftp/gftp.p5m index 2171b49e3b..7ec5c7066b 100644 --- a/components/desktop/gftp/gftp.p5m +++ b/components/desktop/gftp/gftp.p5m @@ -14,6 +14,7 @@ # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) @@ -26,78 +27,85 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' default restart_fmri svc:/application/desktop-cache/mime-types-cache:default> default facet.locale.%<\1> true> +file usr/share/icons/hicolor/48x48/apps/gftp.png path=usr/share/pixmaps/gftp.png + file path=usr/bin/gftp file path=usr/bin/gftp-gtk file path=usr/bin/gftp-text file path=usr/share/applications/gftp.desktop -file path=usr/share/gftp/COPYING +file path=usr/share/doc/gftp/AUTHORS +file path=usr/share/doc/gftp/ChangeLog +file path=usr/share/doc/gftp/LICENSE +file path=usr/share/doc/gftp/README.md +file path=usr/share/doc/gftp/USERS-GUIDE file path=usr/share/gftp/bookmarks -file path=usr/share/gftp/connect.xpm file path=usr/share/gftp/deb.xpm file path=usr/share/gftp/diff.xpm file path=usr/share/gftp/dir.xpm file path=usr/share/gftp/doc.xpm file path=usr/share/gftp/dotdot.xpm -file path=usr/share/gftp/down.xpm file path=usr/share/gftp/exe.xpm -file path=usr/share/gftp/gftp-16x16.png -file path=usr/share/gftp/gftp-22x22.png -file path=usr/share/gftp/gftp-24x24.png -file path=usr/share/gftp/gftp-32x32.png -file path=usr/share/gftp/gftp-48x48.png file path=usr/share/gftp/gftp-logo.xpm -file path=usr/share/gftp/gftp-scalable.svg -file path=usr/share/gftp/gftp.xpm +file path=usr/share/gftp/gftp.png file path=usr/share/gftp/gftprc file path=usr/share/gftp/img.xpm -file path=usr/share/gftp/left.xpm file path=usr/share/gftp/linkdir.xpm file path=usr/share/gftp/linkfile.xpm file path=usr/share/gftp/man.xpm file path=usr/share/gftp/open_dir.xpm -file path=usr/share/gftp/right.xpm file path=usr/share/gftp/rpm.xpm file path=usr/share/gftp/sound.xpm -file path=usr/share/gftp/stop.xpm file path=usr/share/gftp/tar.xpm file path=usr/share/gftp/txt.xpm -file path=usr/share/gftp/up.xpm file path=usr/share/gftp/world.xpm +file path=usr/share/icons/hicolor/16x16/apps/gftp.png +file path=usr/share/icons/hicolor/22x22/apps/gftp.png +file path=usr/share/icons/hicolor/32x32/apps/gftp.png +file path=usr/share/icons/hicolor/48x48/apps/gftp.png +file path=usr/share/icons/hicolor/scalable/apps/gftp.svg file path=usr/share/locale/am/LC_MESSAGES/gftp.mo file path=usr/share/locale/ar/LC_MESSAGES/gftp.mo +file path=usr/share/locale/as/LC_MESSAGES/gftp.mo file path=usr/share/locale/az/LC_MESSAGES/gftp.mo file path=usr/share/locale/be/LC_MESSAGES/gftp.mo file path=usr/share/locale/bg/LC_MESSAGES/gftp.mo file path=usr/share/locale/bn/LC_MESSAGES/gftp.mo +file path=usr/share/locale/bn_IN/LC_MESSAGES/gftp.mo +file path=usr/share/locale/bs/LC_MESSAGES/gftp.mo file path=usr/share/locale/ca/LC_MESSAGES/gftp.mo +file path=usr/share/locale/ca@valencia/LC_MESSAGES/gftp.mo file path=usr/share/locale/cs/LC_MESSAGES/gftp.mo file path=usr/share/locale/da/LC_MESSAGES/gftp.mo file path=usr/share/locale/de/LC_MESSAGES/gftp.mo file path=usr/share/locale/dz/LC_MESSAGES/gftp.mo file path=usr/share/locale/el/LC_MESSAGES/gftp.mo -file path=usr/share/locale/en_CA/LC_MESSAGES/gftp.mo -file path=usr/share/locale/en_GB/LC_MESSAGES/gftp.mo +file path=usr/share/locale/eo/LC_MESSAGES/gftp.mo file path=usr/share/locale/es/LC_MESSAGES/gftp.mo +file path=usr/share/locale/eu/LC_MESSAGES/gftp.mo file path=usr/share/locale/fi/LC_MESSAGES/gftp.mo file path=usr/share/locale/fr/LC_MESSAGES/gftp.mo file path=usr/share/locale/ga/LC_MESSAGES/gftp.mo file path=usr/share/locale/gl/LC_MESSAGES/gftp.mo file path=usr/share/locale/gu/LC_MESSAGES/gftp.mo file path=usr/share/locale/he/LC_MESSAGES/gftp.mo +file path=usr/share/locale/hi/LC_MESSAGES/gftp.mo file path=usr/share/locale/hr/LC_MESSAGES/gftp.mo file path=usr/share/locale/hu/LC_MESSAGES/gftp.mo file path=usr/share/locale/it/LC_MESSAGES/gftp.mo file path=usr/share/locale/ja/LC_MESSAGES/gftp.mo +file path=usr/share/locale/kn/LC_MESSAGES/gftp.mo file path=usr/share/locale/ko/LC_MESSAGES/gftp.mo file path=usr/share/locale/lt/LC_MESSAGES/gftp.mo file path=usr/share/locale/lv/LC_MESSAGES/gftp.mo file path=usr/share/locale/mk/LC_MESSAGES/gftp.mo file path=usr/share/locale/ml/LC_MESSAGES/gftp.mo +file path=usr/share/locale/mr/LC_MESSAGES/gftp.mo file path=usr/share/locale/ms/LC_MESSAGES/gftp.mo file path=usr/share/locale/nb/LC_MESSAGES/gftp.mo file path=usr/share/locale/ne/LC_MESSAGES/gftp.mo file path=usr/share/locale/nl/LC_MESSAGES/gftp.mo file path=usr/share/locale/oc/LC_MESSAGES/gftp.mo +file path=usr/share/locale/or/LC_MESSAGES/gftp.mo file path=usr/share/locale/pa/LC_MESSAGES/gftp.mo file path=usr/share/locale/pl/LC_MESSAGES/gftp.mo file path=usr/share/locale/pt/LC_MESSAGES/gftp.mo @@ -106,11 +114,13 @@ file path=usr/share/locale/ro/LC_MESSAGES/gftp.mo file path=usr/share/locale/ru/LC_MESSAGES/gftp.mo file path=usr/share/locale/rw/LC_MESSAGES/gftp.mo file path=usr/share/locale/sk/LC_MESSAGES/gftp.mo +file path=usr/share/locale/sl/LC_MESSAGES/gftp.mo file path=usr/share/locale/sq/LC_MESSAGES/gftp.mo file path=usr/share/locale/sr/LC_MESSAGES/gftp.mo file path=usr/share/locale/sr@Latn/LC_MESSAGES/gftp.mo file path=usr/share/locale/sv/LC_MESSAGES/gftp.mo file path=usr/share/locale/ta/LC_MESSAGES/gftp.mo +file path=usr/share/locale/te/LC_MESSAGES/gftp.mo file path=usr/share/locale/th/LC_MESSAGES/gftp.mo file path=usr/share/locale/tr/LC_MESSAGES/gftp.mo file path=usr/share/locale/uk/LC_MESSAGES/gftp.mo @@ -118,4 +128,3 @@ file path=usr/share/locale/zh_CN/LC_MESSAGES/gftp.mo file path=usr/share/locale/zh_HK/LC_MESSAGES/gftp.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/gftp.mo file path=usr/share/man/man1/gftp.1 -file path=usr/share/pixmaps/gftp.png diff --git a/components/desktop/gftp/manifests/sample-manifest.p5m b/components/desktop/gftp/manifests/sample-manifest.p5m index 6ca82b35c4..a705501f82 100644 --- a/components/desktop/gftp/manifests/sample-manifest.p5m +++ b/components/desktop/gftp/manifests/sample-manifest.p5m @@ -10,10 +10,11 @@ # # -# Copyright 2018 +# Copyright 2024 # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) @@ -26,74 +27,79 @@ file path=usr/bin/gftp file path=usr/bin/gftp-gtk file path=usr/bin/gftp-text file path=usr/share/applications/gftp.desktop -file path=usr/share/gftp/COPYING +file path=usr/share/doc/gftp/AUTHORS +file path=usr/share/doc/gftp/ChangeLog +file path=usr/share/doc/gftp/LICENSE +file path=usr/share/doc/gftp/README.md +file path=usr/share/doc/gftp/USERS-GUIDE file path=usr/share/gftp/bookmarks -file path=usr/share/gftp/connect.xpm file path=usr/share/gftp/deb.xpm file path=usr/share/gftp/diff.xpm file path=usr/share/gftp/dir.xpm file path=usr/share/gftp/doc.xpm file path=usr/share/gftp/dotdot.xpm -file path=usr/share/gftp/down.xpm file path=usr/share/gftp/exe.xpm -file path=usr/share/gftp/gftp-16x16.png -file path=usr/share/gftp/gftp-22x22.png -file path=usr/share/gftp/gftp-24x24.png -file path=usr/share/gftp/gftp-32x32.png -file path=usr/share/gftp/gftp-48x48.png file path=usr/share/gftp/gftp-logo.xpm -file path=usr/share/gftp/gftp-scalable.svg -file path=usr/share/gftp/gftp.xpm +file path=usr/share/gftp/gftp.png file path=usr/share/gftp/gftprc file path=usr/share/gftp/img.xpm -file path=usr/share/gftp/left.xpm file path=usr/share/gftp/linkdir.xpm file path=usr/share/gftp/linkfile.xpm file path=usr/share/gftp/man.xpm file path=usr/share/gftp/open_dir.xpm -file path=usr/share/gftp/right.xpm file path=usr/share/gftp/rpm.xpm file path=usr/share/gftp/sound.xpm -file path=usr/share/gftp/stop.xpm file path=usr/share/gftp/tar.xpm file path=usr/share/gftp/txt.xpm -file path=usr/share/gftp/up.xpm file path=usr/share/gftp/world.xpm +file path=usr/share/icons/hicolor/16x16/apps/gftp.png +file path=usr/share/icons/hicolor/22x22/apps/gftp.png +file path=usr/share/icons/hicolor/32x32/apps/gftp.png +file path=usr/share/icons/hicolor/48x48/apps/gftp.png +file path=usr/share/icons/hicolor/scalable/apps/gftp.svg file path=usr/share/locale/am/LC_MESSAGES/gftp.mo file path=usr/share/locale/ar/LC_MESSAGES/gftp.mo +file path=usr/share/locale/as/LC_MESSAGES/gftp.mo file path=usr/share/locale/az/LC_MESSAGES/gftp.mo file path=usr/share/locale/be/LC_MESSAGES/gftp.mo file path=usr/share/locale/bg/LC_MESSAGES/gftp.mo file path=usr/share/locale/bn/LC_MESSAGES/gftp.mo +file path=usr/share/locale/bn_IN/LC_MESSAGES/gftp.mo +file path=usr/share/locale/bs/LC_MESSAGES/gftp.mo file path=usr/share/locale/ca/LC_MESSAGES/gftp.mo +file path=usr/share/locale/ca@valencia/LC_MESSAGES/gftp.mo file path=usr/share/locale/cs/LC_MESSAGES/gftp.mo file path=usr/share/locale/da/LC_MESSAGES/gftp.mo file path=usr/share/locale/de/LC_MESSAGES/gftp.mo file path=usr/share/locale/dz/LC_MESSAGES/gftp.mo file path=usr/share/locale/el/LC_MESSAGES/gftp.mo -file path=usr/share/locale/en_CA/LC_MESSAGES/gftp.mo -file path=usr/share/locale/en_GB/LC_MESSAGES/gftp.mo +file path=usr/share/locale/eo/LC_MESSAGES/gftp.mo file path=usr/share/locale/es/LC_MESSAGES/gftp.mo +file path=usr/share/locale/eu/LC_MESSAGES/gftp.mo file path=usr/share/locale/fi/LC_MESSAGES/gftp.mo file path=usr/share/locale/fr/LC_MESSAGES/gftp.mo file path=usr/share/locale/ga/LC_MESSAGES/gftp.mo file path=usr/share/locale/gl/LC_MESSAGES/gftp.mo file path=usr/share/locale/gu/LC_MESSAGES/gftp.mo file path=usr/share/locale/he/LC_MESSAGES/gftp.mo +file path=usr/share/locale/hi/LC_MESSAGES/gftp.mo file path=usr/share/locale/hr/LC_MESSAGES/gftp.mo file path=usr/share/locale/hu/LC_MESSAGES/gftp.mo file path=usr/share/locale/it/LC_MESSAGES/gftp.mo file path=usr/share/locale/ja/LC_MESSAGES/gftp.mo +file path=usr/share/locale/kn/LC_MESSAGES/gftp.mo file path=usr/share/locale/ko/LC_MESSAGES/gftp.mo file path=usr/share/locale/lt/LC_MESSAGES/gftp.mo file path=usr/share/locale/lv/LC_MESSAGES/gftp.mo file path=usr/share/locale/mk/LC_MESSAGES/gftp.mo file path=usr/share/locale/ml/LC_MESSAGES/gftp.mo +file path=usr/share/locale/mr/LC_MESSAGES/gftp.mo file path=usr/share/locale/ms/LC_MESSAGES/gftp.mo file path=usr/share/locale/nb/LC_MESSAGES/gftp.mo file path=usr/share/locale/ne/LC_MESSAGES/gftp.mo file path=usr/share/locale/nl/LC_MESSAGES/gftp.mo file path=usr/share/locale/oc/LC_MESSAGES/gftp.mo +file path=usr/share/locale/or/LC_MESSAGES/gftp.mo file path=usr/share/locale/pa/LC_MESSAGES/gftp.mo file path=usr/share/locale/pl/LC_MESSAGES/gftp.mo file path=usr/share/locale/pt/LC_MESSAGES/gftp.mo @@ -102,11 +108,13 @@ file path=usr/share/locale/ro/LC_MESSAGES/gftp.mo file path=usr/share/locale/ru/LC_MESSAGES/gftp.mo file path=usr/share/locale/rw/LC_MESSAGES/gftp.mo file path=usr/share/locale/sk/LC_MESSAGES/gftp.mo +file path=usr/share/locale/sl/LC_MESSAGES/gftp.mo file path=usr/share/locale/sq/LC_MESSAGES/gftp.mo file path=usr/share/locale/sr/LC_MESSAGES/gftp.mo file path=usr/share/locale/sr@Latn/LC_MESSAGES/gftp.mo file path=usr/share/locale/sv/LC_MESSAGES/gftp.mo file path=usr/share/locale/ta/LC_MESSAGES/gftp.mo +file path=usr/share/locale/te/LC_MESSAGES/gftp.mo file path=usr/share/locale/th/LC_MESSAGES/gftp.mo file path=usr/share/locale/tr/LC_MESSAGES/gftp.mo file path=usr/share/locale/uk/LC_MESSAGES/gftp.mo @@ -114,4 +122,3 @@ file path=usr/share/locale/zh_CN/LC_MESSAGES/gftp.mo file path=usr/share/locale/zh_HK/LC_MESSAGES/gftp.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/gftp.mo file path=usr/share/man/man1/gftp.1 -file path=usr/share/pixmaps/gftp.png diff --git a/components/desktop/gftp/patches/01-solaris-in-trunk.patch b/components/desktop/gftp/patches/01-solaris-in-trunk.patch deleted file mode 100644 index c02f5b5bd9..0000000000 --- a/components/desktop/gftp/patches/01-solaris-in-trunk.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gftp-2.0.19/lib/fsplib/lock.c.orig 2008-12-08 23:44:54.166233888 +0900 -+++ gftp-2.0.19/lib/fsplib/lock.c 2008-12-08 23:45:35.642737527 +0900 -@@ -1,3 +1,5 @@ -+#include "config.h" -+ - #include - #include - #include "lock.h" diff --git a/components/desktop/gftp/patches/02-profile-dir.patch b/components/desktop/gftp/patches/02-profile-dir.patch dissimilarity index 93% index f0afc1217c..7b22565f93 100644 --- a/components/desktop/gftp/patches/02-profile-dir.patch +++ b/components/desktop/gftp/patches/02-profile-dir.patch @@ -1,11 +1,11 @@ ---- gftp-2.0.18/lib/gftp.h.orig 2008-11-21 15:22:37.740720956 +0800 -+++ gftp-2.0.18/lib/gftp.h 2008-11-21 15:22:56.292234508 +0800 -@@ -198,7 +198,7 @@ - #define GFTP_ETIMEDOUT -5 /* Connected timed out */ - - /* Some general settings */ --#define BASE_CONF_DIR "~/.gftp" -+#define BASE_CONF_DIR "~/.gnome2/gftp" - #define CONFIG_FILE BASE_CONF_DIR "/gftprc" - #define BOOKMARKS_FILE BASE_CONF_DIR "/bookmarks" - #define LOG_FILE BASE_CONF_DIR "/gftp.log" +--- gftp-2.9.1b/lib/gftp.h.old 2024-07-01 21:38:26.823654703 -0400 ++++ gftp-2.9.1b/lib/gftp.h 2024-07-01 21:39:09.621126094 -0400 +@@ -183,7 +183,7 @@ + #define GFTP_ECANIGNORE -6 /* Error that can be ignored */ + + /* Some general settings */ +-#define BASE_CONF_DIR "~/.gftp" ++#define BASE_CONF_DIR "~/.config/gftp" + #define CONFIG_FILE BASE_CONF_DIR "/gftprc" + #define BOOKMARKS_FILE BASE_CONF_DIR "/bookmarks" + #define LOG_FILE BASE_CONF_DIR "/gftp.log" diff --git a/components/desktop/gftp/patches/03-g11n-charset.patch b/components/desktop/gftp/patches/03-g11n-charset.patch deleted file mode 100644 index e6de8e7077..0000000000 --- a/components/desktop/gftp/patches/03-g11n-charset.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- gftp-2.0.19/lib/charset-conv.c.orig 2008-12-09 16:23:18.656150736 +0900 -+++ gftp-2.0.19/lib/charset-conv.c 2008-12-09 16:32:03.088367844 +0900 -@@ -35,7 +35,7 @@ _gftp_get_next_charset (char **curpos) - for (; **curpos == ' ' || **curpos == '\t'; (*curpos)++); - - if ((endpos = strchr (*curpos, ',')) == NULL) -- len = strlen (*curpos) - 1; /* the trailing ',' should be omitted */ -+ len = strlen (*curpos); - else - len = endpos - *curpos; - -@@ -46,6 +46,7 @@ _gftp_get_next_charset (char **curpos) - retlen++; /* Needed due to the len - 1 above... */ - ret = g_malloc0 (retlen + 1); - memcpy (ret, *curpos, retlen); -+ ret[retlen] = '\0'; - - for (*curpos += len; **curpos == ','; (*curpos)++); - -@@ -70,7 +71,7 @@ _do_show_iconv_error (const char *str, c - toset = "UTF-8"; - } - -- printf (_("Error converting string '%s' from character set %s to character set %s: %s\n"), -+ g_print (_("Error converting string '%s' from character set %s to character set %s: %s\n"), - str, fromset, toset, error->message); - } - -@@ -80,13 +81,15 @@ _do_convert_string (gftp_request * reque - const char *str, size_t *dest_len, int from_utf8) - { - char *remote_charsets, *ret, *fromset, *toset, *stpos, *cur_charset; -+ static const char *local_charset = NULL; - GError * error; - gsize bread; - - if (request == NULL) - return (NULL); - -- if (g_utf8_validate (str, -1, NULL) != from_utf8) -+ if (g_utf8_validate (str, -1, NULL) != from_utf8 && -+ request->use_local_encoding == 0) - return (NULL); - - error = NULL; -@@ -110,7 +113,11 @@ _do_convert_string (gftp_request * reque - } - - if (ret == NULL) -- _do_show_iconv_error (str, request->iconv_charset, from_utf8, error); -+ { -+ if (local_charset == NULL) -+ g_get_charset (&local_charset); -+ _do_show_iconv_error (str, (char*)local_charset, from_utf8, error); -+ } - - return (ret); - } ---- gftp-2.0.19/src/gtk/misc-gtk.c.orig 2008-12-09 16:23:18.675261644 +0900 -+++ gftp-2.0.19/src/gtk/misc-gtk.c 2008-12-09 16:30:16.958142944 +0900 -@@ -71,7 +71,8 @@ ftp_log (gftp_logging_level level, gftp_ - va_end (argp); - - #if GTK_MAJOR_VERSION > 1 -- if ((utf8_str = gftp_string_to_utf8 (request, logstr, &destlen)) != NULL) -+ if (g_utf8_validate (logstr, -1, NULL) != TRUE && -+ (utf8_str = gftp_string_to_utf8 (request, logstr, &destlen)) != NULL) - { - if (free_logstr) - g_free (logstr); diff --git a/components/desktop/gftp/patches/04-g11n-lc-time.patch b/components/desktop/gftp/patches/04-g11n-lc-time.patch index b49a89c086..3f78dac02f 100644 --- a/components/desktop/gftp/patches/04-g11n-lc-time.patch +++ b/components/desktop/gftp/patches/04-g11n-lc-time.patch @@ -1,6 +1,6 @@ ---- gftp-2.0.19/lib/parse-dir-listing.c.orig 2008-12-09 11:58:27.338209964 +0900 -+++ gftp-2.0.19/lib/parse-dir-listing.c 2008-12-09 12:06:12.492612579 +0900 -@@ -97,7 +97,7 @@ parse_time (char *str, char **endpos) +--- gftp-2.9.1b/lib/ftp-dir-listing.c.old 2024-07-01 21:03:44.877313412 -0400 ++++ gftp-2.9.1b/lib/ftp-dir-listing.c 2024-07-01 21:07:51.201734399 -0400 +@@ -140,7 +140,7 @@ { struct tm curtime, *loctime; time_t t, ret; @@ -9,12 +9,13 @@ size_t slen; int i, num; -@@ -131,7 +131,18 @@ parse_time (char *str, char **endpos) - +@@ -170,7 +170,18 @@ + /* Jul 06 12:57 or Jul 6 1999 */ if (strchr (str, ':') != NULL) { +- tmppos = strptime (str, "%h %d %H:%M", &curtime); +#ifndef __sun - tmppos = strptime (str, "%h %d %H:%M", &curtime); ++ tmppos = strptime (str, "%h %d %H:%M", &curtime); +#else +# if ENABLE_NLS + format = dcgettext ("SUNW_OST_OSCMD", " %b %e %H:%M", LC_TIME); @@ -28,47 +29,26 @@ t = time (NULL); loctime = localtime (&t); -@@ -141,7 +152,20 @@ parse_time (char *str, char **endpos) - curtime.tm_year = loctime->tm_year; - } - else -- tmppos = strptime (str, "%h %d %Y", &curtime); -+ { -+#ifndef __sun -+ tmppos = strptime (str, "%h %d %Y", &curtime); -+#else -+# if ENABLE_NLS -+ format = dcgettext ("SUNW_OST_OSCMD", " %b %e %Y", LC_TIME); -+ if (format && *format == ' ') -+ format++; -+ tmppos = strptime (str, format, &curtime); -+# else -+ tmppos = strptime (str, "%b %e %Y", &curtime); -+# endif -+#endif -+ } - } - - if (tmppos != NULL) -@@ -387,6 +411,7 @@ gftp_parse_ls_unix (gftp_request * reque - gftp_file * fle) +@@ -417,6 +428,7 @@ { + //DEBUG_TRACE("LSUNIX: %s\n", str); char *endpos, *startpos, *pos, *attribs; + char *backup_lc_time, *remote_lc_time; int cols; + ftp_protocol_data * ftpdat = request->protocol_data; - /* If there is no space between the attribs and links field, just make one */ -@@ -494,7 +519,17 @@ gftp_parse_ls_unix (gftp_request * reque +@@ -525,7 +537,17 @@ while (*startpos == ' ') startpos++; +- fle->datetime = parse_time (startpos, &startpos); +#if ENABLE_NLS + backup_lc_time = setlocale (LC_TIME, NULL); + gftp_lookup_request_option (request, "remote_lc_time", &remote_lc_time); + if (backup_lc_time && remote_lc_time != NULL && *remote_lc_time != '\0') + setlocale (LC_TIME, remote_lc_time); +#endif - fle->datetime = parse_time (startpos, &startpos); ++ fle->datetime = parse_time (startpos, &startpos); +#if ENABLE_NLS + if (backup_lc_time && remote_lc_time != NULL && *remote_lc_time != '\0') + setlocale (LC_TIME, backup_lc_time); @@ -76,12 +56,12 @@ /* Skip the blanks till we get to the next entry */ startpos = goto_next_token (startpos); ---- gftp-2.0.19/lib/protocols.c.orig 2008-12-09 11:42:25.720946263 +0900 -+++ gftp-2.0.19/lib/protocols.c 2008-12-09 14:18:02.831821587 +0900 -@@ -362,12 +362,13 @@ gftp_stat_filename (gftp_request * reque - int +--- gftp-2.9.1b/lib/protocols.c.old 2024-07-01 21:08:53.175365431 -0400 ++++ gftp-2.9.1b/lib/protocols.c 2024-07-01 21:12:17.445866678 -0400 +@@ -352,12 +352,13 @@ gftp_list_files (gftp_request * request) { + DEBUG_PRINT_FUNC - char *remote_lc_time, *locret; - int fd; + char *backup_lc_time, *remote_lc_time, *locret; @@ -94,7 +74,7 @@ gftp_lookup_request_option (request, "remote_lc_time", &remote_lc_time); if (remote_lc_time != NULL && *remote_lc_time != '\0') locret = setlocale (LC_TIME, remote_lc_time); -@@ -394,6 +395,9 @@ gftp_list_files (gftp_request * request) +@@ -384,6 +385,9 @@ request->cachefd = fd; request->cached = 1; @@ -104,7 +84,7 @@ return (0); } else if (request->use_cache) -@@ -407,9 +411,18 @@ gftp_list_files (gftp_request * request) +@@ -397,9 +401,18 @@ } if (request->list_files == NULL) @@ -125,10 +105,10 @@ } -@@ -795,6 +808,12 @@ gftp_set_account (gftp_request * request - int +@@ -809,6 +822,12 @@ gftp_set_directory (gftp_request * request, const char *directory) { + DEBUG_PRINT_FUNC + mode_t st_mode; + off_t linksize; + char *locale_directory = NULL; @@ -138,7 +118,7 @@ g_return_val_if_fail (request != NULL, GFTP_EFATAL); g_return_val_if_fail (directory != NULL, GFTP_EFATAL); -@@ -809,6 +828,29 @@ gftp_set_directory (gftp_request * reque +@@ -822,6 +841,29 @@ } return (0); } diff --git a/components/desktop/gftp/patches/04-g11n-lc-time.patch b/components/desktop/gftp/patches/04-g11n-lc-time.patch.old similarity index 100% copy from components/desktop/gftp/patches/04-g11n-lc-time.patch copy to components/desktop/gftp/patches/04-g11n-lc-time.patch.old diff --git a/components/desktop/gftp/patches/05-g11n-im-filter.patch b/components/desktop/gftp/patches/05-g11n-im-filter.patch index 4b82c6014c..3e58cd8d38 100644 --- a/components/desktop/gftp/patches/05-g11n-im-filter.patch +++ b/components/desktop/gftp/patches/05-g11n-im-filter.patch @@ -1,9 +1,9 @@ ---- gftp/src/gtk/misc-gtk.c.orig 2008-12-09 16:47:32.828689000 +0900 -+++ gftp/src/gtk/misc-gtk.c 2008-12-09 16:50:13.096878000 +0900 -@@ -864,6 +864,15 @@ dialog_response (GtkWidget * widget, gin - static gint +--- gftp-2.9.1b/src/gtk/misc-gtk.c.old 2024-07-01 22:19:57.182100428 -0400 ++++ gftp-2.9.1b/src/gtk/misc-gtk.c 2024-07-01 22:20:45.592240469 -0400 +@@ -632,6 +632,15 @@ dialog_keypress (GtkWidget * widget, GdkEventKey * event, gpointer data) { + DEBUG_PRINT_FUNC + if (GTK_ENTRY (widget)->editable) + { + if (gtk_im_context_filter_keypress (GTK_ENTRY (widget)->im_context, event)) @@ -13,6 +13,6 @@ + } + } + - if (event->type != GDK_KEY_PRESS) - return (FALSE); - + if (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return) + { + dialog_response (NULL, GTK_RESPONSE_YES, data); diff --git a/components/desktop/gftp/patches/06-g11n-ssh-login.patch b/components/desktop/gftp/patches/06-g11n-ssh-login.patch index 74753710ed..84c94e8cb1 100644 --- a/components/desktop/gftp/patches/06-g11n-ssh-login.patch +++ b/components/desktop/gftp/patches/06-g11n-ssh-login.patch @@ -1,11 +1,12 @@ ---- gftp-2.0.19/lib/sshv2.c.orig 2008-01-25 08:28:32.000000000 +0900 -+++ gftp-2.0.19/lib/sshv2.c 2008-12-09 14:32:52.172140155 +0900 -@@ -379,6 +379,7 @@ sshv2_start_login_sequence (gftp_request - N_("Enter passphrase for key '"), - N_("Password"), - N_("password"), -+ N_("Password: "), - NULL}; +--- gftp-2.9.1b/lib/sshv2.c.old 2024-07-01 22:23:14.745126840 -0400 ++++ gftp-2.9.1b/lib/sshv2.c 2024-07-01 22:23:49.182914494 -0400 +@@ -390,7 +390,7 @@ + static char *pwstrs[] = { "Enter passphrase for RSA key", + "Enter passphrase for key '", + "Password", +- "password", ++ "Password:", + NULL }; char *tempstr, *temp1str, *pwstr, *yesstr = "yes\n", *securid_pass; int wrotepw, ok, maxfd, ret, clear_tempstr, pwidx; @@ -463,15 +464,26 @@ sshv2_start_login_sequence (gftp_request diff --git a/components/desktop/gftp/patches/07-g11n-cli-utf8.patch b/components/desktop/gftp/patches/07-g11n-cli-utf8.patch index 42b939a6c6..04e7baa0d8 100644 --- a/components/desktop/gftp/patches/07-g11n-cli-utf8.patch +++ b/components/desktop/gftp/patches/07-g11n-cli-utf8.patch @@ -1,6 +1,6 @@ ---- gftp-2.0.19/src/text/gftp-text.c.orig 2007-03-13 10:56:43.000000000 +0900 -+++ gftp-2.0.19/src/text/gftp-text.c 2008-12-09 14:38:09.675539069 +0900 -@@ -58,13 +58,16 @@ gftp_text_write_string (gftp_request * r +--- gftp-2.9.1b/src/text/gftp-text.c.~1~ 2022-02-15 01:37:55.000000000 -0500 ++++ gftp-2.9.1b/src/text/gftp-text.c 2024-07-01 22:45:13.402115453 -0400 +@@ -61,13 +61,16 @@ savechar = *endpos; *endpos = '\0'; @@ -17,11 +17,11 @@ } else { -@@ -79,6 +82,7 @@ gftp_text_write_string (gftp_request * r +@@ -82,6 +85,7 @@ printf ("%s\n", stpos); stpos = endpos + 1; } +#endif - - sw = sw; } + while (stpos != endpos); + diff --git a/components/desktop/gftp/pkg5 b/components/desktop/gftp/pkg5 index b220f3deb6..ccd8e59fe7 100644 --- a/components/desktop/gftp/pkg5 +++ b/components/desktop/gftp/pkg5 @@ -1,14 +1,15 @@ { "dependencies": [ - "SUNWcs", + "library/desktop/gdk-pixbuf", "library/desktop/gtk2", "library/glib2", - "library/readline", - "library/security/openssl", + "library/readline-8", + "library/security/openssl-31", + "shell/ksh93", "system/library" ], "fmris": [ "desktop/gftp" ], "name": "gftp" -} \ No newline at end of file +} -- 2.11.4.GIT