From 2eb2ee2e19f3b6ef216c52971ff5057468001d4c3e110fd27d0bcd2e8b941cd8 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Thu, 7 Jun 2018 07:42:05 +0000 Subject: [PATCH] Accepting request 614734 from home:jengelh:branches:utilities - Remove schily-2018-05-25_star_bufferoverflow.patch (the bug is long gone, the patch has no effect) OBS-URL: https://build.opensuse.org/request/show/614734 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=30 --- schily-2018-05-25_star_bufferoverflow.patch | 29 --------------------- schily.changes | 6 +++++ schily.spec | 2 -- 3 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 schily-2018-05-25_star_bufferoverflow.patch diff --git a/schily-2018-05-25_star_bufferoverflow.patch b/schily-2018-05-25_star_bufferoverflow.patch deleted file mode 100644 index 5c8d8ba..0000000 --- a/schily-2018-05-25_star_bufferoverflow.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Kristyna Streitova -Date: Wed, 06 Jun 2018 14:51:57 +0000 -References: http://bugzilla.opensuse.org/625527 -X-Upstream: PATCH-FIX-UPSTREAM - -fix bufferoverflow - -Index: schily-2018-05-25/star/longnames.c -=================================================================== ---- schily-2018-05-25.orig/star/longnames.c -+++ schily-2018-05-25/star/longnames.c -@@ -167,7 +167,7 @@ name_to_tcb(info, ptb) - if (add) - strcatl(ptb->ndbuf.t_name, name, "/", (char *)NULL); - else -- strcpy(ptb->ndbuf.t_name, name); -+ strncpy(ptb->ndbuf.t_name, name, props.pr_maxsname); - return (TRUE); - } - -@@ -210,7 +210,7 @@ name_to_tcb(info, ptb) - if (add) - strcatl(ptb->ndbuf.t_name, &np[1], "/", (char *)NULL); - else -- strcpy(ptb->ndbuf.t_name, &np[1]); -+ strncpy(ptb->ndbuf.t_name, &np[1], props.pr_maxsname); - strncpy(ptb->dbuf.t_prefix, name, np - name); - info->f_flags |= F_SPLIT_NAME; - return (TRUE); diff --git a/schily.changes b/schily.changes index 324198b..d9b9a4e 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 6 20:23:02 UTC 2018 - jengelh@inai.de + +- Remove schily-2018-05-25_star_bufferoverflow.patch + (the bug is long gone, the patch has no effect) + ------------------------------------------------------------------- Tue Jun 5 08:21:16 UTC 2018 - kstreitova@suse.com diff --git a/schily.spec b/schily.spec index 5cad1fd..cec6e51 100644 --- a/schily.spec +++ b/schily.spec @@ -39,7 +39,6 @@ Patch2: schily-2018-05-25_star_configuration.patch Patch3: schily-2018-05-25_star_no_fsync.patch Patch4: schily-2018-05-25_star_lock.patch Patch5: schily-2018-05-25_star_detect_gzip_failures.patch -Patch6: schily-2018-05-25_star_bufferoverflow.patch Patch7: schily-2018-05-25_star_use_ssh_by_default.patch Patch8: schily-2018-05-25_star_mk.patch Patch9: schily-2018-05-25_star_selinux.patch @@ -418,7 +417,6 @@ Features: %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1