diff options
Diffstat (limited to 'redhat/applications/kftpgrabber')
-rw-r--r-- | redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch | 39 | ||||
-rw-r--r-- | redhat/applications/kftpgrabber/kftpgrabber.spec (renamed from redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec) | 4 |
2 files changed, 1 insertions, 42 deletions
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.spec index 75cb03836..37bc55def 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec +++ b/redhat/applications/kftpgrabber/kftpgrabber.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.0.7 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity @@ -55,7 +55,6 @@ 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} @@ -124,7 +123,6 @@ Requires: %{name} = %{version}-%{release} %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" |