From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-editors/zile/files/zile-2.3.24-gets.patch | 30 ----------------------- app-editors/zile/files/zile-2.3.24-userhome.patch | 26 -------------------- 2 files changed, 56 deletions(-) delete mode 100644 app-editors/zile/files/zile-2.3.24-gets.patch delete mode 100644 app-editors/zile/files/zile-2.3.24-userhome.patch (limited to 'app-editors/zile/files') diff --git a/app-editors/zile/files/zile-2.3.24-gets.patch b/app-editors/zile/files/zile-2.3.24-gets.patch deleted file mode 100644 index 9060c4bcf921..000000000000 --- a/app-editors/zile/files/zile-2.3.24-gets.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/623218 -Backported from gnulib in zile-2.4.11. - ---- zile-2.3.24-orig/lib/stdio.in.h -+++ zile-2.3.24/lib/stdio.in.h -@@ -717,22 +717,11 @@ - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - diff --git a/app-editors/zile/files/zile-2.3.24-userhome.patch b/app-editors/zile/files/zile-2.3.24-userhome.patch deleted file mode 100644 index 37f605ccf610..000000000000 --- a/app-editors/zile/files/zile-2.3.24-userhome.patch +++ /dev/null @@ -1,26 +0,0 @@ -http://lists.gnu.org/archive/html/bug-zile/2011-08/msg00030.html - ---- zile-2.3.24-orig/src/file.c -+++ zile-2.3.24/src/file.c -@@ -177,14 +177,15 @@ compact_path (astr path) - { - /* Replace `/userhome/' (if found) with `~/'. */ - size_t homelen = strlen (pw->pw_dir); -- if (astr_len (path) >= homelen && -- !strncmp (pw->pw_dir, astr_cstr (path), homelen)) -+ if (homelen > 0 && pw->pw_dir[homelen - 1] == '/') -+ homelen--; -+ -+ if (astr_len (path) > homelen && -+ !strncmp (pw->pw_dir, astr_cstr (path), homelen) && -+ astr_get (path, homelen) == '/') - { - astr buf = astr_new_cstr ("~/"); -- if (STREQ (pw->pw_dir, "/")) -- astr_cat_cstr (buf, astr_cstr (path) + 1); -- else -- astr_cat_cstr (buf, astr_cstr (path) + homelen + 1); -+ astr_cat_cstr (buf, astr_cstr (path) + homelen + 1); - astr_cpy (path, buf); - astr_delete (buf); - } -- cgit v1.2.3