From 6581dc50b83f203d65eac61c00a159ab2a6ddb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 14:34:02 +0100 Subject: RPM: massive update and cleanup --- .../kftpgrabber/kftpgrabber-14.0.0.patch | 39 ---- .../kftpgrabber/kftpgrabber-14.0.0.spec | 202 --------------------- redhat/applications/kftpgrabber/kftpgrabber.spec | 200 ++++++++++++++++++++ 3 files changed, 200 insertions(+), 241 deletions(-) delete mode 100644 redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch delete mode 100644 redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec create mode 100644 redhat/applications/kftpgrabber/kftpgrabber.spec (limited to 'redhat/applications/kftpgrabber') diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch deleted file mode 100644 index f8e019e63..000000000 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp -index 981d0b6..71e2cd2 100644 ---- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp -+++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp -@@ -421,6 +421,8 @@ bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, Direc - if (permissions[9] == 't' || permissions[9] == 'T') p |= S_ISVTX; - - entry.setPermissions(p); -+ -+ return(p); - } - - bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry) -diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp -index 126fad7..fac681f 100644 ---- a/kftpgrabber/src/misc/desencryptor.cpp -+++ b/kftpgrabber/src/misc/desencryptor.cpp -@@ -65,8 +65,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode) - char *o_message = (char*) malloc(8); - char *o_output = (char*) malloc(8); - -- memset(o_message, 0, 9); -- memset(o_output, 0, 9); -+ memset(o_message, 0, sizeof o_message); -+ memset(o_output, 0, sizeof o_output); - //out.resize(in.size() * 2); - - while (i < in.size()) { -@@ -79,8 +79,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode) - i += 8; - - // Clear everything -- memset(o_message, 0, 9); -- memset(o_output, 0, 9); -+ memset(o_message, 0, sizeof o_message); -+ memset(o_output, 0, sizeof o_output); - } - - free(o_message); diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec deleted file mode 100644 index 75cb03836..000000000 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec +++ /dev/null @@ -1,202 +0,0 @@ -# -# spec file for package kftprgrabber (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg kftpgrabber -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.8.1 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: A FTP client for TDE -Group: Applications/Internet -URL: http://www.kftp.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-14.0.0.patch - - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# SUSE desktop files utility -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif - -%if 0%{?opensuse_bs} && 0%{?suse_version} -# for xdg-menu script -BuildRequires: brp-check-trinity -%endif - -# OPENSSL support -BuildRequires: openssl-devel - - -%description -KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It -implements many features required for usable FTP interaction. - -Feature list: -- Multiple simultaneous FTP sessions in separate tabs -- A tree-oriented transfer queue -- TLS/SSL support for the control connection and the data channel -- X509 certificate support for authentication -- FXP site-to-site transfer support -- One-time password (OTP) support using S/KEY, MD5, RMD160 or SHA1 -- Site bookmarks with many options configurable per-site -- Distributed FTP daemon support (implementing the PRET command) -- Can use Zeroconf for local site discovery -- Bookmark import plugins from other FTP clients -- Support for the SFTP protocol -- A nice traffic graph -- Ability to limit upload and download speed -- Priority and skip lists -- Integrated SFV checksum verifier -- Direct viewing/editing of remote files -- Advanced default "on file exists" action configuration -- Filter displayed files/directories as you type - - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .orig - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTDIR -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} - - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog -%{tde_bindir}/kftpgrabber -%{tde_libdir}/libkftpinterfaces.so.0 -%{tde_libdir}/libkftpinterfaces.so.0.0.0 -%{tde_tdelibdir}/kftpimportplugin_filezilla3.la -%{tde_tdelibdir}/kftpimportplugin_filezilla3.so -%{tde_tdelibdir}/kftpimportplugin_gftp.la -%{tde_tdelibdir}/kftpimportplugin_gftp.so -%{tde_tdelibdir}/kftpimportplugin_kftp.la -%{tde_tdelibdir}/kftpimportplugin_kftp.so -%{tde_tdelibdir}/kftpimportplugin_ncftp.la -%{tde_tdelibdir}/kftpimportplugin_ncftp.so -%{tde_tdeappdir}/kftpgrabber.desktop -%{tde_datadir}/apps/kftpgrabber/ -%{tde_datadir}/config.kcfg/kftpgrabber.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kftpgrabber.png -%{tde_datadir}/services/kftpimportplugin_filezilla3.desktop -%{tde_datadir}/services/kftpimportplugin_gftp.desktop -%{tde_datadir}/services/kftpimportplugin_kftp.desktop -%{tde_datadir}/services/kftpimportplugin_ncftp.desktop -%{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop -%{tde_tdedocdir}/HTML/en/kftpgrabber/ - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kftpgrabber/ -%{tde_libdir}/libkftpinterfaces.la -%{tde_libdir}/libkftpinterfaces.so - - -%changelog diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec new file mode 100644 index 000000000..07c03d26e --- /dev/null +++ b/redhat/applications/kftpgrabber/kftpgrabber.spec @@ -0,0 +1,200 @@ +# +# spec file for package kftprgrabber (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg kftpgrabber +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.8.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A FTP client for TDE +Group: Applications/Internet +URL: http://www.kftp.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +# OPENSSL support +BuildRequires: openssl-devel + + +%description +KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It +implements many features required for usable FTP interaction. + +Feature list: +- Multiple simultaneous FTP sessions in separate tabs +- A tree-oriented transfer queue +- TLS/SSL support for the control connection and the data channel +- X509 certificate support for authentication +- FXP site-to-site transfer support +- One-time password (OTP) support using S/KEY, MD5, RMD160 or SHA1 +- Site bookmarks with many options configurable per-site +- Distributed FTP daemon support (implementing the PRET command) +- Can use Zeroconf for local site discovery +- Bookmark import plugins from other FTP clients +- Support for the SFTP protocol +- A nice traffic graph +- Ability to limit upload and download speed +- Priority and skip lists +- Integrated SFV checksum verifier +- Direct viewing/editing of remote files +- Advanced default "on file exists" action configuration +- Filter displayed files/directories as you type + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary} + + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR QTINC QTDIR +export PATH="%{tde_bindir}:${PATH}" + +# Warning: --enable-final causes FTBFS +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --disable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} + + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README ChangeLog +%{tde_bindir}/kftpgrabber +%{tde_libdir}/libkftpinterfaces.so.0 +%{tde_libdir}/libkftpinterfaces.so.0.0.0 +%{tde_tdelibdir}/kftpimportplugin_filezilla3.la +%{tde_tdelibdir}/kftpimportplugin_filezilla3.so +%{tde_tdelibdir}/kftpimportplugin_gftp.la +%{tde_tdelibdir}/kftpimportplugin_gftp.so +%{tde_tdelibdir}/kftpimportplugin_kftp.la +%{tde_tdelibdir}/kftpimportplugin_kftp.so +%{tde_tdelibdir}/kftpimportplugin_ncftp.la +%{tde_tdelibdir}/kftpimportplugin_ncftp.so +%{tde_tdeappdir}/kftpgrabber.desktop +%{tde_datadir}/apps/kftpgrabber/ +%{tde_datadir}/config.kcfg/kftpgrabber.kcfg +%{tde_datadir}/icons/hicolor/*/apps/kftpgrabber.png +%{tde_datadir}/services/kftpimportplugin_filezilla3.desktop +%{tde_datadir}/services/kftpimportplugin_gftp.desktop +%{tde_datadir}/services/kftpimportplugin_kftp.desktop +%{tde_datadir}/services/kftpimportplugin_ncftp.desktop +%{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop +%{tde_tdedocdir}/HTML/en/kftpgrabber/ + + +%files devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/kftpgrabber/ +%{tde_libdir}/libkftpinterfaces.la +%{tde_libdir}/libkftpinterfaces.so + + +%changelog -- cgit v1.2.1