diff options
author | Danny Rawlins <monster.romster@gmail.com> | 2018-02-10 11:28:14 +1100 |
---|---|---|
committer | Danny Rawlins <monster.romster@gmail.com> | 2018-02-10 11:45:56 +1100 |
commit | 22e4cac6db2a3791179d03b7c03fa4e0d787aba3 (patch) | |
tree | dd02a6233f778c4d240cc7bc73b0ba04df86686f /vte/vte-0.28.2-interix.patch | |
parent | 7a684ca86e7cbff2a43b0a59aa685cc3f5ec256a (diff) | |
download | opt-22e4cac6db2a3791179d03b7c03fa4e0d787aba3.tar.gz opt-22e4cac6db2a3791179d03b7c03fa4e0d787aba3.tar.xz |
[notify] vte: fix CVE-2012-2738 and various ther bugs and improvments
Diffstat (limited to 'vte/vte-0.28.2-interix.patch')
-rw-r--r-- | vte/vte-0.28.2-interix.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/vte/vte-0.28.2-interix.patch b/vte/vte-0.28.2-interix.patch new file mode 100644 index 000000000..c54d46ebc --- /dev/null +++ b/vte/vte-0.28.2-interix.patch @@ -0,0 +1,51 @@ +reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290 + +diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in +--- vte-0.26.2.orig/configure.in 2011-08-17 08:30:55 +0200 ++++ vte-0.26.2/configure.in 2011-08-17 08:35:42 +0200 +@@ -362,7 +362,11 @@ + AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.]) + fi + AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) +-AC_CHECK_FUNCS([ceil floor]) ++dnl if the first check didn't find floor, it caches the "no" value, ++dnl and doesn't recheck. this makes the below check fail always on ++dnl systems with floor in -lm. thus we unset the chached result. ++unset ac_cv_func_floor ++AC_CHECK_FUNCS([ceil floor round]) + + # Look for tgetent + +--- vte-0.26.2.orig/configure 2012-04-30 20:02:55.000000000 +0200 ++++ vte-0.26.2/configure 2012-04-30 20:03:16.000000000 +0200 +@@ -13277,7 +13277,7 @@ + + fi + +-for ac_func in ceil floor ++for ac_func in ceil floor round + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c +--- vte-0.26.2.orig/src/vte.c 2011-08-17 08:30:58 +0200 ++++ vte-0.26.2/src/vte.c 2011-08-17 08:38:09 +0200 +@@ -63,6 +63,18 @@ + #include <locale.h> + #endif + ++#ifndef HAVE_ROUND ++# if defined(HAVE_CEIL) && defined(HAVE_FLOOR) ++static inline double round(double x) { ++ if(x - floor(x) < 0.5) { ++ return floor(x); ++ } else { ++ return ceil(x); ++ } ++} ++# endif ++#endif ++ + #if GTK_CHECK_VERSION (2, 90, 7) + #define GDK_KEY(symbol) GDK_KEY_##symbol + #else |