February 2018 - CRUX - lists.crux.nu

ports/opt (3.4): [notify] vte-gtk3 renamed to vte3
by crux＠crux.nu 10 Feb '18

10 Feb '18

commit bbb2881db3e382bc29578056f1bf0dc164a41618 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 10 11:45:37 2018 +1100 [notify] vte-gtk3 renamed to vte3 diff --git a/vte-gtk3/.footprint b/vte3/.footprint similarity index 100% rename from vte-gtk3/.footprint rename to vte3/.footprint diff --git a/vte-gtk3/.md5sum b/vte3/.md5sum similarity index 100% rename from vte-gtk3/.md5sum rename to vte3/.md5sum diff --git a/vte-gtk3/.signature b/vte3/.signature similarity index 100% rename from vte-gtk3/.signature rename to vte3/.signature diff --git a/vte-gtk3/Pkgfile b/vte3/Pkgfile similarity index 69% rename from vte-gtk3/Pkgfile rename to vte3/Pkgfile index de2939535..7ac596c99 100644 --- a/vte-gtk3/Pkgfile +++ b/vte3/Pkgfile @@ -1,10 +1,9 @@ -# Description: Virtual Terminal Emulator -# URL: http://developer.gnome.org/arch/gnome/widgets/vte.html -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Juergen Daubert, jue at crux dot nu +# Description: Virtual Terminal Emulator widget for use with GTK3 +# URL: https://wiki.gnome.org/action/show/Apps/Terminal/VTE +# Maintainer: Danny Rawlins, crux at romster dot me # Depends on: gtk3 gnutls libpcre2 -name=vte-gtk3 +name=vte3 version=0.48.2 release=1 source=(ftp://ftp.gnome.org/pub/gnome/sources/vte/${version%.*}/vte-$versio… \ diff --git a/vte-gtk3/vte-metamask.patch b/vte3/vte-metamask.patch similarity index 100% rename from vte-gtk3/vte-metamask.patch rename to vte3/vte-metamask.patch

1 0

ports/opt (3.4): [notify] vte: fix CVE-2012-2738 and various ther bugs and improvments
by crux＠crux.nu 10 Feb '18

10 Feb '18

commit 22e4cac6db2a3791179d03b7c03fa4e0d787aba3 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 10 11:28:14 2018 +1100 [notify] vte: fix CVE-2012-2738 and various ther bugs and improvments diff --git a/vte/.footprint b/vte/.footprint index ecefa87a3..f65bdd15a 100644 --- a/vte/.footprint +++ b/vte/.footprint @@ -20,7 +20,6 @@ lrwxrwxrwx root/root usr/lib/libvte.so.9 -> libvte.so.9.2800.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vte.pc drwxr-xr-x root/root usr/lib/vte/ --rwxr-sr-x root/root usr/lib/vte/gnome-pty-helper drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/vte/ drwxr-xr-x root/root usr/share/vte/termcap-0.0/ diff --git a/vte/.md5sum b/vte/.md5sum index 0be02b3cb..2ddab1c1d 100644 --- a/vte/.md5sum +++ b/vte/.md5sum @@ -1,2 +1,5 @@ +2a70b691fe04d76f7b03c56925d6fa61 vte-0.28.2-interix.patch +a132b015831efe30c929728f29cdf7b2 vte-0.28.2-limit-arguments.patch +d590b31ae2a8f14bc9ad584711c491f6 vte-0.28.2-repaint-after-change-scroll-region.patch 497f26e457308649e6ece32b3bb142ff vte-0.28.2.tar.xz -90efc55c080484424464ad928929f642 vte-metamask.patch +6bf2c631a5f51a29d46d63e5333082ce vte-0.30.1-alt-meta.patch diff --git a/vte/.signature b/vte/.signature index 421d5f84c..af9d10820 100644 --- a/vte/.signature +++ b/vte/.signature @@ -1,6 +1,9 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aLbWcPyU1lRZJF04uQnMwHaU3rs2Wc96vnZ0isW/12QOQCmqyha2bEPT4CfqeD4jUwDrIi2HdXUag3NzyZ7qAk= -SHA256 (Pkgfile) = a8e1fa361925cc77de761802581a1d1bcd0b37cbfb16d7a6b2d3d593edcd9a0f -SHA256 (.footprint) = 061347c728371b4107946c3893b88e4669542dea420607a33e301160cbbeeb9d +RWSE3ohX2g5d/dQ0eGAbB3cEP+s8ck6F7RMkk4yohSk955qkYnXN6ak6r+HQEj6qjQZZLopOdiFuDt79oKFu9U+iMFo9l+m3mQw= +SHA256 (Pkgfile) = 3b1661d470de10ed1f8d8e7396ffc2c4835bef08f0febae7358306e1ce491b80 +SHA256 (.footprint) = 11f2a585afcf0f939ea666b375e0d123bef960ca92d2a7bf806e6c2421dc98ec SHA256 (vte-0.28.2.tar.xz) = 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae -SHA256 (vte-metamask.patch) = 0432074528c49f5399e45c774274332d06e28f5668e116093c3aaebddf31c381 +SHA256 (vte-0.30.1-alt-meta.patch) = 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 +SHA256 (vte-0.28.2-interix.patch) = 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 +SHA256 (vte-0.28.2-limit-arguments.patch) = 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 +SHA256 (vte-0.28.2-repaint-after-change-scroll-region.patch) = 95ff6eb5d17e7c209aa4751dfd150a1baa97d8b5d1b31658d7645751eb38cad6 diff --git a/vte/Pkgfile b/vte/Pkgfile index 2efb1f5bc..76ffc3387 100644 --- a/vte/Pkgfile +++ b/vte/Pkgfile @@ -1,30 +1,52 @@ -# Description: Virtual Terminal Emulator -# URL: http://developer.gnome.org/arch/gnome/widgets/vte.html -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Juergen Daubert, jue at crux dot nu -# Depends on: gtk xorg-libxdamage +# Description: Virtual Terminal Emulator widget for use with GTK2 +# URL: https://wiki.gnome.org/Apps/Terminal/VTE +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: gtk util-linux name=vte version=0.28.2 -release=2 -source=(ftp://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz \ - $name-metamask.patch) +release=3 +source=(https://download.gnome.org/sources/$name/${version%%.*}/$name-$version.tar.xz + $name-0.30.1-alt-meta.patch + $name-0.28.2-interix.patch + $name-0.28.2-limit-arguments.patch + $name-0.28.2-repaint-after-change-scroll-region.patch) build() { - cd $name-$version - - patch -R -p1 -i $SRC/$name-metamask.patch - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/$name \ - --disable-static \ - --disable-debugging \ - --disable-python \ - --disable-gtk-doc \ - --with-xft2 \ - --with-pangox - - make - make DESTDIR=$PKG install - - rm -rf $PKG/usr/share/{gtk-doc,locale} + cd $name-$version + + # https://bugzilla.gnome.org/show_bug.cgi?id=663779 + patch -p1 -i $SRC/$name-0.30.1-alt-meta.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=652290 + patch -p1 -i $SRC/$name-0.28.2-interix.patch + + # Fix CVE-2012-2738, upstream bug #676090 + patch -p1 -i $SRC/$name-0.28.2-limit-arguments.patch + + # Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087 + # Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823d… + patch -p1 -i $SRC/$name-0.28.2-repaint-after-change-scroll-region.patch + + export CFLAGS="$CFLAGS -Wno-deprecated-declarations" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/$name \ + --disable-deprecation \ + --disable-static \ + --disable-debugging \ + --disable-python \ + --disable-gtk-doc \ + --with-xft2 \ + --with-pangox \ + --with-gtk=2.0 + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make + make DESTDIR=$PKG install + + rm -r $PKG/usr/share/{gtk-doc,locale} + rm $PKG/usr/lib/vte/gnome-pty-helper } 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 diff --git a/vte/vte-0.28.2-limit-arguments.patch b/vte/vte-0.28.2-limit-arguments.patch new file mode 100644 index 000000000..fd4540793 --- /dev/null +++ b/vte/vte-0.28.2-limit-arguments.patch @@ -0,0 +1,40 @@ +From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe(a)gnome.org> +Date: Sat, 19 May 2012 17:36:09 +0000 +Subject: emulation: Limit integer arguments to 65535 + +To guard against malicious sequences containing excessively big numbers, +limit all parsed numbers to 16 bit range. Doing this here in the parsing +routine is a catch-all guard; this doesn't preclude enforcing +more stringent limits in the handlers themselves. + +https://bugzilla.gnome.org/show_bug.cgi?id=676090 +--- +diff --git a/src/table.c b/src/table.c +index 140e8c8..85cf631 100644 +--- a/src/table.c ++++ b/src/table.c +@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array, + if (G_UNLIKELY (*array == NULL)) { + *array = g_value_array_new(1); + } +- g_value_set_long(&value, total); ++ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); + g_value_array_append(*array, &value); + } while (i++ < arginfo->length); + g_value_unset(&value); +diff --git a/src/vteseq.c b/src/vteseq.c +index 457c06a..46def5b 100644 +--- a/src/vteseq.c ++++ b/src/vteseq.c +@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal, + GValueArray *params, + VteTerminalSequenceHandler handler) + { +- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); ++ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); + } + + static void +-- +cgit v0.9.0.2 diff --git a/vte/vte-0.28.2-repaint-after-change-scroll-region.patch b/vte/vte-0.28.2-repaint-after-change-scroll-region.patch new file mode 100644 index 000000000..86e547103 --- /dev/null +++ b/vte/vte-0.28.2-repaint-after-change-scroll-region.patch @@ -0,0 +1,86 @@ +https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd + +From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001 +From: Micah Cowan <micah(a)cowan.name> +Date: Tue, 22 Oct 2013 23:30:43 +0200 +Subject: widget: Fix invalidation region + +When the sequence handler moves the cursor into the restricted scrolling region, +the bbox needs to be reset, too. +Fixes glitches with interspersing writes to the bottom line with scrolls of the +upper region, and also fixes missing screen redraws when using mosh. + +https://bugzilla.gnome.org/show_bug.cgi?id=542087 +https://bugzilla.gnome.org/show_bug.cgi?id=686097 + +diff --git a/src/vte.c b/src/vte.c +index 9f6d7d8..a4d9d25 100644 +--- a/src/vte.c ++++ b/src/vte.c +@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal) + long wcount, start, delta; + gboolean leftovers, modified, bottom, again; + gboolean invalidated_text; ++ gboolean in_scroll_region; + GArray *unichars; + struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; + +@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal) + cursor = screen->cursor_current; + cursor_visible = terminal->pvt->cursor_visible; + ++ in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ + /* We should only be called when there's data to process. */ + g_assert(terminal->pvt->incoming || + (terminal->pvt->pending->len > 0)); +@@ -4194,6 +4199,8 @@ skip_chunk: + * points to the first character which isn't part of this + * sequence. */ + if ((match != NULL) && (match[0] != '\0')) { ++ gboolean new_in_scroll_region; ++ + /* Call the right sequence handler for the requested + * behavior. */ + _vte_terminal_handle_sequence(terminal, +@@ -4204,12 +4211,21 @@ skip_chunk: + start = (next - wbuf); + modified = TRUE; + +- /* if we have moved during the sequence handler, restart the bbox */ ++ new_in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ ++ delta = screen->scroll_delta; /* delta may have changed from sequence. */ ++ ++ /* if we have moved greatly during the sequence handler, or moved ++ * into a scroll_region from outside it, restart the bbox. ++ */ + if (invalidated_text && +- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { ++ ((new_in_scroll_region && !in_scroll_region) || ++ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { + /* Clip off any part of the box which isn't already on-screen. */ + bbox_topleft.x = MAX(bbox_topleft.x, 0); + bbox_topleft.y = MAX(bbox_topleft.y, delta); +@@ -4229,6 +4245,8 @@ skip_chunk: + bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; + bbox_topleft.x = bbox_topleft.y = G_MAXINT; + } ++ ++ in_scroll_region = new_in_scroll_region; + } else + /* Second, we have a NULL match, and next points to the very + * next character in the buffer. Insert the character which +-- +cgit v0.10.2 + diff --git a/vte/vte-0.30.1-alt-meta.patch b/vte/vte-0.30.1-alt-meta.patch new file mode 100644 index 000000000..bd364be58 --- /dev/null +++ b/vte/vte-0.30.1-alt-meta.patch @@ -0,0 +1,74 @@ +From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino(a)gentoo.org> +Date: Tue, 15 Nov 2011 03:06:40 -0500 +Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2 + compatibility + +Also, since VTE_META_MASK is now a mask with multiple bits set, code that +compares gdk key modifiers to VTE_META_MASK by numerical equality is no +longer guaranteed to work. Therefore, for such comparisons a new function, +vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits +matching matching VTE_META_MASK are set, then all are set. + +https://bugzilla.gnome.org/show_bug.cgi?id=663779 +--- + src/keymap.c | 15 +++++++++++++-- + src/keymap.h | 2 +- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/keymap.c b/src/keymap.c +index 9a21669..95b4c5b 100644 +--- a/src/keymap.c ++++ b/src/keymap.c +@@ -990,6 +990,17 @@ static const struct _vte_keymap_group { + {GDK_KEY (F35), _vte_keymap_GDK_F35}, + }; + ++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK, ++ * despite being a compound mask, is treated as indivisible. */ ++GdkModifierType ++_vte_keymap_fixup_modifiers(GdkModifierType modifiers, ++ GdkModifierType mask) ++{ ++ if (modifiers & VTE_META_MASK) ++ modifiers |= VTE_META_MASK; ++ return modifiers & mask; ++} ++ + /* Map the specified keyval/modifier setup, dependent on the mode, to either + * a literal string or a capability name. */ + void +@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval, + } else { + fkey_mode = fkey_default; + } +- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); ++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); + + /* Search for the conditions. */ + for (i = 0; entries[i].normal_length || entries[i].special[0]; i++) +@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval, + return; + } + +- switch (modifiers & significant_modifiers) { ++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) { + case 0: + modifier = 0; + break; +diff --git a/src/keymap.h b/src/keymap.h +index 243e22e..21d9b8e 100644 +--- a/src/keymap.h ++++ b/src/keymap.h +@@ -27,7 +27,7 @@ + + G_BEGIN_DECLS + +-#define VTE_META_MASK GDK_META_MASK ++#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK) + #define VTE_NUMLOCK_MASK GDK_MOD2_MASK + + /* Map the specified keyval/modifier setup, dependent on the mode, to either +-- +1.7.8.rc3 + diff --git a/vte/vte-metamask.patch b/vte/vte-metamask.patch deleted file mode 100644 index 9423d94f8..000000000 --- a/vte/vte-metamask.patch +++ /dev/null @@ -1,20 +0,0 @@ -From b73782a28894e25ed146271f9d6c6775a6836199 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad(a)behdad.org> -Date: Fri, 04 Jun 2010 18:36:45 +0000 -Subject: Bug 601926 - Don't hardcode meta to alt - ---- -diff --git a/src/keymap.h b/src/keymap.h -index 3a4cefe..243e22e 100644 ---- a/src/keymap.h -+++ b/src/keymap.h -@@ -27,7 +27,7 @@ - - G_BEGIN_DECLS - --#define VTE_META_MASK GDK_MOD1_MASK -+#define VTE_META_MASK GDK_META_MASK - #define VTE_NUMLOCK_MASK GDK_MOD2_MASK - - /* Map the specified keyval/modifier setup, dependent on the mode, to either ---

1 0

ports/opt (3.3): [notify] vte3: 0.48.2 -> 0.50.2 closes FS#1584
by crux＠crux.nu 10 Feb '18

10 Feb '18

commit 90495776fdafd898bb399b7a4a0339b082605f9e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 10 12:20:54 2018 +1100 [notify] vte3: 0.48.2 -> 0.50.2 closes FS#1584 diff --git a/vte3/.footprint b/vte3/.footprint index 604fc841c..346ce0ee0 100644 --- a/vte3/.footprint +++ b/vte3/.footprint @@ -19,9 +19,9 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Vte-2.91.typelib -rwxr-xr-x root/root usr/lib/libvte-2.91.la -lrwxrwxrwx root/root usr/lib/libvte-2.91.so -> libvte-2.91.so.0.4800.2 -lrwxrwxrwx root/root usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.4800.2 --rwxr-xr-x root/root usr/lib/libvte-2.91.so.0.4800.2 +lrwxrwxrwx root/root usr/lib/libvte-2.91.so -> libvte-2.91.so.0.5000.2 +lrwxrwxrwx root/root usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.5000.2 +-rwxr-xr-x root/root usr/lib/libvte-2.91.so.0.5000.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vte-2.91.pc drwxr-xr-x root/root usr/share/ diff --git a/vte3/.md5sum b/vte3/.md5sum index 44ff4e5c5..7a32079f3 100644 --- a/vte3/.md5sum +++ b/vte3/.md5sum @@ -1,2 +1,4 @@ -bc0601624af5668df5cd37e3fe1237b2 vte-0.48.2.tar.xz -90efc55c080484424464ad928929f642 vte-metamask.patch +1912cfd1d9cdd30cebeb908507acadc5 vte-0.50.2.tar.xz +8ff05b81c3990226dcae181061ecc0f1 vte3-790536.patch +163e1c353661948ab0084ff98c7f42a8 vte3-790539.patch +c37be9686f948b553947a57abf2435de vte3-pty_memory_leak.patch diff --git a/vte3/.signature b/vte3/.signature index 18fccdb73..8a916e877 100644 --- a/vte3/.signature +++ b/vte3/.signature @@ -1,6 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YulPh555LNty+FIPcmsM0fU5lyjNLnTRIfT9u5jYkZUEYO5c+44YsCsidPUr82+W/E+C8uaErXpj0mGyuGSuww= -SHA256 (Pkgfile) = 46ffeabdb5adde3258572353154e222d88e3a9ca12f0afa920826589e5c2252d -SHA256 (.footprint) = d56c6b068bb60fbf729019017be83d03081c373702583313e32e12c95c6faf3d -SHA256 (vte-0.48.2.tar.xz) = c278b301edfe38b43baec1bccc86e225dacea5b670a96ca7ea55ca9a4b030690 -SHA256 (vte-metamask.patch) = 0432074528c49f5399e45c774274332d06e28f5668e116093c3aaebddf31c381 +RWSE3ohX2g5d/V5YEX87WUO0Xm5C7QyMihZttUb9YYAZn/5pk1MipBaK3YkoxBCzjQnJFO907tJcBP6NsSIv1COm5bHLKeuB2QA= +SHA256 (Pkgfile) = cd2e804445aba24a0dd8d4e17dfd385648832565cb03349ba89e1d325c3526ff +SHA256 (.footprint) = b2debc514eaa50397750caa45b88dfad49a31daa00cd7d999fd41aafde53ce08 +SHA256 (vte-0.50.2.tar.xz) = 79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf +SHA256 (vte3-790539.patch) = bd3aaec0ceaa47948160a016f1eaaabf783df7771932a335448a060882ec97e4 +SHA256 (vte3-pty_memory_leak.patch) = b7e57d7e5e40a75eb5f409f163adc649f1c040d4f9c0594ddc1369aea45df291 +SHA256 (vte3-790536.patch) = 9d0561dc8e8bb46b936d31b8265a42bed0d112d36a734ebe11fcff7aa9be1be4 diff --git a/vte3/Pkgfile b/vte3/Pkgfile index 7ac596c99..52e5c4bc6 100644 --- a/vte3/Pkgfile +++ b/vte3/Pkgfile @@ -1,27 +1,40 @@ # Description: Virtual Terminal Emulator widget for use with GTK3 # URL: https://wiki.gnome.org/action/show/Apps/Terminal/VTE # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gtk3 gnutls libpcre2 +# Depends on: gnutls gtk3 libgmp libpcre2 util-linux name=vte3 -version=0.48.2 +version=0.50.2 release=1 -source=(ftp://ftp.gnome.org/pub/gnome/sources/vte/${version%.*}/vte-$version.tar.xz \ - vte-metamask.patch) +source=(https://download.gnome.org/sources/vte/${version%.*}/vte-$version.tar.xz + $name-790539.patch + $name-pty_memory_leak.patch + $name-790536.patch) build() { - cd vte-$version + cd vte-$version - patch -R -p1 -i $SRC/vte-metamask.patch + # https://bugzilla.gnome.org/show_bug.cgi?id=790539 + # https://git.gnome.org/browse/vte/commit/?h=vte-0-50&id=1d200a63ac4e39035af3… + patch -p1 -i $SRC/$name-790539.patch - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/vte \ - --disable-static \ - --disable-gtk-doc \ - --enable-vala=no + # pty: Fix memory leak + # https://git.gnome.org/browse/vte/commit/?h=vte-0-50&id=ddd6dc998d9842369ec2… + patch -p1 -i $SRC/$name-pty_memory_leak.patch - make - make DESTDIR=$PKG install + # https://bugzilla.gnome.org/show_bug.cgi?id=790536 + # https://git.gnome.org/browse/vte/commit/?h=vte-0-50&id=504db1b97f684778ee52… + patch -p1 -i $SRC/$name-790536.patch - rm -rf $PKG/usr/share/{gtk-doc,locale} + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/vte \ + --disable-static \ + --disable-gtk-doc \ + --enable-vala=no + + make + make DESTDIR=$PKG install + + rm -r $PKG/usr/share/{gtk-doc,locale} } diff --git a/vte3/vte-metamask.patch b/vte3/vte-metamask.patch deleted file mode 100644 index 9423d94f8..000000000 --- a/vte3/vte-metamask.patch +++ /dev/null @@ -1,20 +0,0 @@ -From b73782a28894e25ed146271f9d6c6775a6836199 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad(a)behdad.org> -Date: Fri, 04 Jun 2010 18:36:45 +0000 -Subject: Bug 601926 - Don't hardcode meta to alt - ---- -diff --git a/src/keymap.h b/src/keymap.h -index 3a4cefe..243e22e 100644 ---- a/src/keymap.h -+++ b/src/keymap.h -@@ -27,7 +27,7 @@ - - G_BEGIN_DECLS - --#define VTE_META_MASK GDK_MOD1_MASK -+#define VTE_META_MASK GDK_META_MASK - #define VTE_NUMLOCK_MASK GDK_MOD2_MASK - - /* Map the specified keyval/modifier setup, dependent on the mode, to either --- diff --git a/vte3/vte3-790536.patch b/vte3/vte3-790536.patch new file mode 100644 index 000000000..097ee775f --- /dev/null +++ b/vte3/vte3-790536.patch @@ -0,0 +1,27 @@ +From 504db1b97f684778ee52f6e280a9e734936be20f Mon Sep 17 00:00:00 2001 +From: Egmont Koblinger <egmont(a)gmail.com> +Date: Sat, 18 Nov 2017 20:50:06 +0100 +Subject: widget: Reset might need to start blinking the cursor + +https://bugzilla.gnome.org/show_bug.cgi?id=790536 +(cherry picked from commit f6678e7e938aaf6f4fd72ceb8f1bb71b2bf3e69e) +--- + src/vte.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vte.cc b/src/vte.cc +index 6f28670..a9f73e2 100644 +--- a/src/vte.cc ++++ b/src/vte.cc +@@ -10349,7 +10349,7 @@ VteTerminalPrivate::reset(bool clear_tabstops, + adjust_adjustments_full(); + } + /* DECSCUSR cursor style */ +- m_cursor_style = VTE_CURSOR_STYLE_TERMINAL_DEFAULT; ++ set_cursor_style(VTE_CURSOR_STYLE_TERMINAL_DEFAULT); + /* Do more stuff we refer to as a "full" reset. */ + if (clear_tabstops) { + set_default_tabstops(); +-- +cgit v0.12 + diff --git a/vte3/vte3-790539.patch b/vte3/vte3-790539.patch new file mode 100644 index 000000000..ebcfa0f8a --- /dev/null +++ b/vte3/vte3-790539.patch @@ -0,0 +1,91 @@ +From 1d200a63ac4e39035af35e80881aa4fdae5556c6 Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe(a)src.gnome.org> +Date: Sat, 18 Nov 2017 18:40:03 +0100 +Subject: matcher: Fix memory leak + +Don't leak the GValueArray. + +https://bugzilla.gnome.org/show_bug.cgi?id=790539 +(cherry picked from commit dda73cc07250ea324b4227907197c39b93fcd365) +--- + src/matcher.cc | 12 +++++++----- + src/table.cc | 19 +++++++++++-------- + 2 files changed, 18 insertions(+), 13 deletions(-) + +diff --git a/src/matcher.cc b/src/matcher.cc +index 10f3bc7..a4f7584 100644 +--- a/src/matcher.cc ++++ b/src/matcher.cc +@@ -202,14 +202,16 @@ _vte_matcher_print(struct _vte_matcher *matcher) + * we need to free those ourselves. */ + void + _vte_matcher_free_params_array(struct _vte_matcher *matcher, +- GValueArray *params) ++ GValueArray *params) + { + guint i; + for (i = 0; i < params->n_values; i++) { +- GValue *value = &params->values[i]; +- if (G_UNLIKELY (g_type_is_a (value->g_type, G_TYPE_POINTER))) { +- g_free (g_value_get_pointer (value)); +- } ++ auto value = g_value_array_get_nth(params, i); ++ if (G_UNLIKELY (G_VALUE_HOLDS_POINTER(value))) { ++ g_free(g_value_get_pointer(value)); ++ } else if (G_UNLIKELY (G_VALUE_HOLDS_BOXED(value))) { ++ g_value_array_free((GValueArray*)g_value_get_boxed(value)); ++ } + } + if (G_UNLIKELY (matcher == NULL || matcher->free_params != NULL)) { + g_value_array_free (params); +diff --git a/src/table.cc b/src/table.cc +index 3c78f3a..09a6172 100644 +--- a/src/table.cc ++++ b/src/table.cc +@@ -516,18 +516,14 @@ static void + _vte_table_extract_numbers(GValueArray **array, + struct _vte_table_arginfo *arginfo) + { +- GValue value = {0,}; +- GValue subvalue = {0,}; +- GValueArray *subarray = NULL; +- gssize i; +- + if (G_UNLIKELY (*array == NULL)) { + *array = g_value_array_new(1); + } + ++ GValue value = {0,}; + g_value_init(&value, G_TYPE_LONG); +- g_value_init(&subvalue, G_TYPE_VALUE_ARRAY); +- i = 0; ++ gssize i = 0; ++ GValueArray *subarray = nullptr; + do { + long total = 0; + for (; i < arginfo->length && arginfo->start[i] != ';' && arginfo->start[i] != ':'; i++) { +@@ -546,13 +542,20 @@ _vte_table_extract_numbers(GValueArray **array, + g_value_array_append(*array, &value); + } else { + g_value_array_append(subarray, &value); +- g_value_set_boxed(&subvalue, subarray); ++ ++ GValue subvalue = {0,}; ++ g_value_init(&subvalue, G_TYPE_VALUE_ARRAY); ++ g_value_take_boxed(&subvalue, subarray); + g_value_array_append(*array, &subvalue); ++ g_value_unset(&subvalue); ++ + subarray = NULL; + } + } + } while (i++ < arginfo->length); + g_value_unset(&value); ++ if (subarray != nullptr) ++ g_value_array_free(subarray); + } + + static void +-- +cgit v0.12 + diff --git a/vte3/vte3-pty_memory_leak.patch b/vte3/vte3-pty_memory_leak.patch new file mode 100644 index 000000000..e82ec89ee --- /dev/null +++ b/vte3/vte3-pty_memory_leak.patch @@ -0,0 +1,25 @@ +From ddd6dc998d9842369ec20f8e83c380401a8aed02 Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe(a)src.gnome.org> +Date: Sat, 18 Nov 2017 19:10:10 +0100 +Subject: pty: Fix mem leak + +(cherry picked from commit 304e29d8a603828f42410ceac39ad803fcac475b) +--- + src/pty.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pty.cc b/src/pty.cc +index c1741d2..0c0b001 100644 +--- a/src/pty.cc ++++ b/src/pty.cc +@@ -1200,5 +1200,7 @@ vte_pty_spawn_finish(VtePty *pty, + *child_pid = *(GPid*)pidptr; + if (error) + *error = nullptr; ++ ++ g_free(pidptr); + return TRUE; + } +-- +cgit v0.12 +

1 0

ports/opt (3.3): [notify] vte-gtk3 renamed to vte3
by crux＠crux.nu 10 Feb '18

10 Feb '18

commit bbb2881db3e382bc29578056f1bf0dc164a41618 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 10 11:45:37 2018 +1100 [notify] vte-gtk3 renamed to vte3 diff --git a/vte-gtk3/.footprint b/vte3/.footprint similarity index 100% rename from vte-gtk3/.footprint rename to vte3/.footprint diff --git a/vte-gtk3/.md5sum b/vte3/.md5sum similarity index 100% rename from vte-gtk3/.md5sum rename to vte3/.md5sum diff --git a/vte-gtk3/.signature b/vte3/.signature similarity index 100% rename from vte-gtk3/.signature rename to vte3/.signature diff --git a/vte-gtk3/Pkgfile b/vte3/Pkgfile similarity index 69% rename from vte-gtk3/Pkgfile rename to vte3/Pkgfile index de2939535..7ac596c99 100644 --- a/vte-gtk3/Pkgfile +++ b/vte3/Pkgfile @@ -1,10 +1,9 @@ -# Description: Virtual Terminal Emulator -# URL: http://developer.gnome.org/arch/gnome/widgets/vte.html -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Juergen Daubert, jue at crux dot nu +# Description: Virtual Terminal Emulator widget for use with GTK3 +# URL: https://wiki.gnome.org/action/show/Apps/Terminal/VTE +# Maintainer: Danny Rawlins, crux at romster dot me # Depends on: gtk3 gnutls libpcre2 -name=vte-gtk3 +name=vte3 version=0.48.2 release=1 source=(ftp://ftp.gnome.org/pub/gnome/sources/vte/${version%.*}/vte-$versio… \ diff --git a/vte-gtk3/vte-metamask.patch b/vte3/vte-metamask.patch similarity index 100% rename from vte-gtk3/vte-metamask.patch rename to vte3/vte-metamask.patch

1 0

ports/opt (3.3): [notify] vte: fix CVE-2012-2738 and various ther bugs and improvments
by crux＠crux.nu 10 Feb '18

10 Feb '18

commit 22e4cac6db2a3791179d03b7c03fa4e0d787aba3 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 10 11:28:14 2018 +1100 [notify] vte: fix CVE-2012-2738 and various ther bugs and improvments diff --git a/vte/.footprint b/vte/.footprint index ecefa87a3..f65bdd15a 100644 --- a/vte/.footprint +++ b/vte/.footprint @@ -20,7 +20,6 @@ lrwxrwxrwx root/root usr/lib/libvte.so.9 -> libvte.so.9.2800.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vte.pc drwxr-xr-x root/root usr/lib/vte/ --rwxr-sr-x root/root usr/lib/vte/gnome-pty-helper drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/vte/ drwxr-xr-x root/root usr/share/vte/termcap-0.0/ diff --git a/vte/.md5sum b/vte/.md5sum index 0be02b3cb..2ddab1c1d 100644 --- a/vte/.md5sum +++ b/vte/.md5sum @@ -1,2 +1,5 @@ +2a70b691fe04d76f7b03c56925d6fa61 vte-0.28.2-interix.patch +a132b015831efe30c929728f29cdf7b2 vte-0.28.2-limit-arguments.patch +d590b31ae2a8f14bc9ad584711c491f6 vte-0.28.2-repaint-after-change-scroll-region.patch 497f26e457308649e6ece32b3bb142ff vte-0.28.2.tar.xz -90efc55c080484424464ad928929f642 vte-metamask.patch +6bf2c631a5f51a29d46d63e5333082ce vte-0.30.1-alt-meta.patch diff --git a/vte/.signature b/vte/.signature index 421d5f84c..af9d10820 100644 --- a/vte/.signature +++ b/vte/.signature @@ -1,6 +1,9 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aLbWcPyU1lRZJF04uQnMwHaU3rs2Wc96vnZ0isW/12QOQCmqyha2bEPT4CfqeD4jUwDrIi2HdXUag3NzyZ7qAk= -SHA256 (Pkgfile) = a8e1fa361925cc77de761802581a1d1bcd0b37cbfb16d7a6b2d3d593edcd9a0f -SHA256 (.footprint) = 061347c728371b4107946c3893b88e4669542dea420607a33e301160cbbeeb9d +RWSE3ohX2g5d/dQ0eGAbB3cEP+s8ck6F7RMkk4yohSk955qkYnXN6ak6r+HQEj6qjQZZLopOdiFuDt79oKFu9U+iMFo9l+m3mQw= +SHA256 (Pkgfile) = 3b1661d470de10ed1f8d8e7396ffc2c4835bef08f0febae7358306e1ce491b80 +SHA256 (.footprint) = 11f2a585afcf0f939ea666b375e0d123bef960ca92d2a7bf806e6c2421dc98ec SHA256 (vte-0.28.2.tar.xz) = 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae -SHA256 (vte-metamask.patch) = 0432074528c49f5399e45c774274332d06e28f5668e116093c3aaebddf31c381 +SHA256 (vte-0.30.1-alt-meta.patch) = 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 +SHA256 (vte-0.28.2-interix.patch) = 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 +SHA256 (vte-0.28.2-limit-arguments.patch) = 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 +SHA256 (vte-0.28.2-repaint-after-change-scroll-region.patch) = 95ff6eb5d17e7c209aa4751dfd150a1baa97d8b5d1b31658d7645751eb38cad6 diff --git a/vte/Pkgfile b/vte/Pkgfile index 2efb1f5bc..76ffc3387 100644 --- a/vte/Pkgfile +++ b/vte/Pkgfile @@ -1,30 +1,52 @@ -# Description: Virtual Terminal Emulator -# URL: http://developer.gnome.org/arch/gnome/widgets/vte.html -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Juergen Daubert, jue at crux dot nu -# Depends on: gtk xorg-libxdamage +# Description: Virtual Terminal Emulator widget for use with GTK2 +# URL: https://wiki.gnome.org/Apps/Terminal/VTE +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: gtk util-linux name=vte version=0.28.2 -release=2 -source=(ftp://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz \ - $name-metamask.patch) +release=3 +source=(https://download.gnome.org/sources/$name/${version%%.*}/$name-$version.tar.xz + $name-0.30.1-alt-meta.patch + $name-0.28.2-interix.patch + $name-0.28.2-limit-arguments.patch + $name-0.28.2-repaint-after-change-scroll-region.patch) build() { - cd $name-$version - - patch -R -p1 -i $SRC/$name-metamask.patch - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/$name \ - --disable-static \ - --disable-debugging \ - --disable-python \ - --disable-gtk-doc \ - --with-xft2 \ - --with-pangox - - make - make DESTDIR=$PKG install - - rm -rf $PKG/usr/share/{gtk-doc,locale} + cd $name-$version + + # https://bugzilla.gnome.org/show_bug.cgi?id=663779 + patch -p1 -i $SRC/$name-0.30.1-alt-meta.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=652290 + patch -p1 -i $SRC/$name-0.28.2-interix.patch + + # Fix CVE-2012-2738, upstream bug #676090 + patch -p1 -i $SRC/$name-0.28.2-limit-arguments.patch + + # Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087 + # Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823d… + patch -p1 -i $SRC/$name-0.28.2-repaint-after-change-scroll-region.patch + + export CFLAGS="$CFLAGS -Wno-deprecated-declarations" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/$name \ + --disable-deprecation \ + --disable-static \ + --disable-debugging \ + --disable-python \ + --disable-gtk-doc \ + --with-xft2 \ + --with-pangox \ + --with-gtk=2.0 + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make + make DESTDIR=$PKG install + + rm -r $PKG/usr/share/{gtk-doc,locale} + rm $PKG/usr/lib/vte/gnome-pty-helper } 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 diff --git a/vte/vte-0.28.2-limit-arguments.patch b/vte/vte-0.28.2-limit-arguments.patch new file mode 100644 index 000000000..fd4540793 --- /dev/null +++ b/vte/vte-0.28.2-limit-arguments.patch @@ -0,0 +1,40 @@ +From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe(a)gnome.org> +Date: Sat, 19 May 2012 17:36:09 +0000 +Subject: emulation: Limit integer arguments to 65535 + +To guard against malicious sequences containing excessively big numbers, +limit all parsed numbers to 16 bit range. Doing this here in the parsing +routine is a catch-all guard; this doesn't preclude enforcing +more stringent limits in the handlers themselves. + +https://bugzilla.gnome.org/show_bug.cgi?id=676090 +--- +diff --git a/src/table.c b/src/table.c +index 140e8c8..85cf631 100644 +--- a/src/table.c ++++ b/src/table.c +@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array, + if (G_UNLIKELY (*array == NULL)) { + *array = g_value_array_new(1); + } +- g_value_set_long(&value, total); ++ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); + g_value_array_append(*array, &value); + } while (i++ < arginfo->length); + g_value_unset(&value); +diff --git a/src/vteseq.c b/src/vteseq.c +index 457c06a..46def5b 100644 +--- a/src/vteseq.c ++++ b/src/vteseq.c +@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal, + GValueArray *params, + VteTerminalSequenceHandler handler) + { +- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); ++ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); + } + + static void +-- +cgit v0.9.0.2 diff --git a/vte/vte-0.28.2-repaint-after-change-scroll-region.patch b/vte/vte-0.28.2-repaint-after-change-scroll-region.patch new file mode 100644 index 000000000..86e547103 --- /dev/null +++ b/vte/vte-0.28.2-repaint-after-change-scroll-region.patch @@ -0,0 +1,86 @@ +https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd + +From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001 +From: Micah Cowan <micah(a)cowan.name> +Date: Tue, 22 Oct 2013 23:30:43 +0200 +Subject: widget: Fix invalidation region + +When the sequence handler moves the cursor into the restricted scrolling region, +the bbox needs to be reset, too. +Fixes glitches with interspersing writes to the bottom line with scrolls of the +upper region, and also fixes missing screen redraws when using mosh. + +https://bugzilla.gnome.org/show_bug.cgi?id=542087 +https://bugzilla.gnome.org/show_bug.cgi?id=686097 + +diff --git a/src/vte.c b/src/vte.c +index 9f6d7d8..a4d9d25 100644 +--- a/src/vte.c ++++ b/src/vte.c +@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal) + long wcount, start, delta; + gboolean leftovers, modified, bottom, again; + gboolean invalidated_text; ++ gboolean in_scroll_region; + GArray *unichars; + struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; + +@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal) + cursor = screen->cursor_current; + cursor_visible = terminal->pvt->cursor_visible; + ++ in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ + /* We should only be called when there's data to process. */ + g_assert(terminal->pvt->incoming || + (terminal->pvt->pending->len > 0)); +@@ -4194,6 +4199,8 @@ skip_chunk: + * points to the first character which isn't part of this + * sequence. */ + if ((match != NULL) && (match[0] != '\0')) { ++ gboolean new_in_scroll_region; ++ + /* Call the right sequence handler for the requested + * behavior. */ + _vte_terminal_handle_sequence(terminal, +@@ -4204,12 +4211,21 @@ skip_chunk: + start = (next - wbuf); + modified = TRUE; + +- /* if we have moved during the sequence handler, restart the bbox */ ++ new_in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ ++ delta = screen->scroll_delta; /* delta may have changed from sequence. */ ++ ++ /* if we have moved greatly during the sequence handler, or moved ++ * into a scroll_region from outside it, restart the bbox. ++ */ + if (invalidated_text && +- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { ++ ((new_in_scroll_region && !in_scroll_region) || ++ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { + /* Clip off any part of the box which isn't already on-screen. */ + bbox_topleft.x = MAX(bbox_topleft.x, 0); + bbox_topleft.y = MAX(bbox_topleft.y, delta); +@@ -4229,6 +4245,8 @@ skip_chunk: + bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; + bbox_topleft.x = bbox_topleft.y = G_MAXINT; + } ++ ++ in_scroll_region = new_in_scroll_region; + } else + /* Second, we have a NULL match, and next points to the very + * next character in the buffer. Insert the character which +-- +cgit v0.10.2 + diff --git a/vte/vte-0.30.1-alt-meta.patch b/vte/vte-0.30.1-alt-meta.patch new file mode 100644 index 000000000..bd364be58 --- /dev/null +++ b/vte/vte-0.30.1-alt-meta.patch @@ -0,0 +1,74 @@ +From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino(a)gentoo.org> +Date: Tue, 15 Nov 2011 03:06:40 -0500 +Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2 + compatibility + +Also, since VTE_META_MASK is now a mask with multiple bits set, code that +compares gdk key modifiers to VTE_META_MASK by numerical equality is no +longer guaranteed to work. Therefore, for such comparisons a new function, +vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits +matching matching VTE_META_MASK are set, then all are set. + +https://bugzilla.gnome.org/show_bug.cgi?id=663779 +--- + src/keymap.c | 15 +++++++++++++-- + src/keymap.h | 2 +- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/keymap.c b/src/keymap.c +index 9a21669..95b4c5b 100644 +--- a/src/keymap.c ++++ b/src/keymap.c +@@ -990,6 +990,17 @@ static const struct _vte_keymap_group { + {GDK_KEY (F35), _vte_keymap_GDK_F35}, + }; + ++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK, ++ * despite being a compound mask, is treated as indivisible. */ ++GdkModifierType ++_vte_keymap_fixup_modifiers(GdkModifierType modifiers, ++ GdkModifierType mask) ++{ ++ if (modifiers & VTE_META_MASK) ++ modifiers |= VTE_META_MASK; ++ return modifiers & mask; ++} ++ + /* Map the specified keyval/modifier setup, dependent on the mode, to either + * a literal string or a capability name. */ + void +@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval, + } else { + fkey_mode = fkey_default; + } +- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); ++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); + + /* Search for the conditions. */ + for (i = 0; entries[i].normal_length || entries[i].special[0]; i++) +@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval, + return; + } + +- switch (modifiers & significant_modifiers) { ++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) { + case 0: + modifier = 0; + break; +diff --git a/src/keymap.h b/src/keymap.h +index 243e22e..21d9b8e 100644 +--- a/src/keymap.h ++++ b/src/keymap.h +@@ -27,7 +27,7 @@ + + G_BEGIN_DECLS + +-#define VTE_META_MASK GDK_META_MASK ++#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK) + #define VTE_NUMLOCK_MASK GDK_MOD2_MASK + + /* Map the specified keyval/modifier setup, dependent on the mode, to either +-- +1.7.8.rc3 + diff --git a/vte/vte-metamask.patch b/vte/vte-metamask.patch deleted file mode 100644 index 9423d94f8..000000000 --- a/vte/vte-metamask.patch +++ /dev/null @@ -1,20 +0,0 @@ -From b73782a28894e25ed146271f9d6c6775a6836199 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad(a)behdad.org> -Date: Fri, 04 Jun 2010 18:36:45 +0000 -Subject: Bug 601926 - Don't hardcode meta to alt - ---- -diff --git a/src/keymap.h b/src/keymap.h -index 3a4cefe..243e22e 100644 ---- a/src/keymap.h -+++ b/src/keymap.h -@@ -27,7 +27,7 @@ - - G_BEGIN_DECLS - --#define VTE_META_MASK GDK_MOD1_MASK -+#define VTE_META_MASK GDK_META_MASK - #define VTE_NUMLOCK_MASK GDK_MOD2_MASK - - /* Map the specified keyval/modifier setup, dependent on the mode, to either ---

1 0

ports/contrib (3.3): [notify] sakura: 2.4.2 -> 3.5.0 changed dependency vte -> vte3 closes FS#1128
by crux＠crux.nu 10 Feb '18

10 Feb '18

commit d9d00d85886a4a0434464208545ca46dff63d0db Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 10 12:59:30 2018 +1100 [notify] sakura: 2.4.2 -> 3.5.0 changed dependency vte -> vte3 closes FS#1128 diff --git a/sakura/.footprint b/sakura/.footprint index ed23f403..ff5c530c 100644 --- a/sakura/.footprint +++ b/sakura/.footprint @@ -1,11 +1,11 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/sakura -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/sakura.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/sakura.desktop +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/sakura.1.gz drwxr-xr-x root/root usr/share/pixmaps/ -rw-r--r-- root/root usr/share/pixmaps/terminal-tango.svg diff --git a/sakura/.md5sum b/sakura/.md5sum index 948c81af..b4033770 100644 --- a/sakura/.md5sum +++ b/sakura/.md5sum @@ -1 +1 @@ -46669519c77f7402b2de24cdefe251bb sakura-2.4.2.tar.bz2 +5ac5229d2c9eb65bf42062ea41fec9c9 sakura-3.5.0.tar.bz2 diff --git a/sakura/.signature b/sakura/.signature index bb5e6164..c458b64d 100644 --- a/sakura/.signature +++ b/sakura/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3888074NgK3VqvzEQPCZN/G+Isw7opTX12O1ynpUPx/anaJAbH+CM8wGC1slQ6xX7EWyNY2OJanlNA7rMDJFfwI= -SHA256 (Pkgfile) = d23c05f859758b4e3290cf18cf9e07cf9e70fb5a44f55971405a81090495c2d8 -SHA256 (.footprint) = ca8496e7ca74f35b62de20e81de57578d92d7b6d839f332c48fa0404abf643f4 -SHA256 (sakura-2.4.2.tar.bz2) = c5e6242ca4afba3ad43731939f7d2a728bd40056a93de50f34e5bf76a696fad6 +RWSagIOpLGJF3yCQZ5DOzzayjWzc6cZ0YzllJFUaWymWWxrGYNeTma1exZRASFpa54vad/o/a3vSE27GjTteAh00KsrhXPFpkwI= +SHA256 (Pkgfile) = 2e8d087ae1b1a546153d6281209cfe9c480527820910641d6c1f1ef6faf05ade +SHA256 (.footprint) = 329496cfa310c07f4b8f63ec1a6a69e2dbcc82825f430df777108d134d8a6979 +SHA256 (sakura-3.5.0.tar.bz2) = eb30ede41083fda2b07c6a3b7393150f48867e81d28ef70b15824740cab00c3a diff --git a/sakura/Pkgfile b/sakura/Pkgfile index 2bdfab10..022ec5fb 100644 --- a/sakura/Pkgfile +++ b/sakura/Pkgfile @@ -1,19 +1,20 @@ # Description: A terminal emulator based on GTK and VTE. # URL: http://www.pleyades.net/david/projects/sakura # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me -# Depends on: vte cmake libidn +# Depends on: vte3 cmake libidn name=sakura -version=2.4.2 +version=3.5.0 release=1 -source=(http://launchpad.net/sakura/trunk/$version/+download/$name-$version.tar.bz2) +source=(https://launchpad.net/sakura/trunk/$version/+download/$name-$version.tar.bz2) build() { cd $name-$version + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . + make make DESTDIR=$PKG install - mv $PKG/usr/share/man $PKG/usr/man + rm -r $PKG/usr/share/{locale,doc} }

1 0

ports/core (3.4): [notify] bzip2: fix for CVE-2016-3189. closes FS#1585
by crux＠crux.nu 09 Feb '18

09 Feb '18

commit 0c7977b67da2af83fa278a8e38ca043aa4618ee1 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Feb 9 17:43:17 2018 +0100 [notify] bzip2: fix for CVE-2016-3189. closes FS#1585 diff --git a/bzip2/.md5sum b/bzip2/.md5sum index 134efa59..dc8c7f33 100644 --- a/bzip2/.md5sum +++ b/bzip2/.md5sum @@ -1,2 +1,3 @@ +3b17081b71204ddfaa1cef6f5f9d8747 CVE-2016-3189.patch 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz ab2b0d7367fc6f14a3d943a3861ad2c1 bzip2.patch diff --git a/bzip2/.signature b/bzip2/.signature index ebf2ccb8..2e185d6a 100644 --- a/bzip2/.signature +++ b/bzip2/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqqfPftfIF0ivBJPCnvaKfb3TRTwhrHN2HwJzwZnalx90xUtEQ05eddc+wTr4TBkDpfdlnZ8wHaz4+pZOxRRSZQU= -SHA256 (Pkgfile) = b5093f1b2cdc92c7773a0eb48bd20aa058fa677b9fc053f2ba1b4c82afe83b2e +RWRJc1FUaeVeqm1TQVFfW0gKA8At/dPhtV6NvWErI7K10qCoVdy+G3YMe2g5Zlh1u5pYju9Ph8byE7Uxm6vIntJdAWeV8x219w0= +SHA256 (Pkgfile) = fa4a0928f6530d495d431e37ba880d2359cf96da3cd3b64d68dc5f49b0428ebd SHA256 (.footprint) = bd0f9e3ca456b7ff1fcc5440865dc233e263307cb4b59f5d3c5d7ccfdadfcd6d SHA256 (bzip2-1.0.6.tar.gz) = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA256 (bzip2.patch) = b8aa64ff17bc5704cbaf2b7012086575acfa6557c89fafdcc6dcd847fb29b5cf +SHA256 (CVE-2016-3189.patch) = 5c1cce66d2d1dfa61a627734c1a00bf0441c5ab6be0458676e20787705a14a6b diff --git a/bzip2/CVE-2016-3189.patch b/bzip2/CVE-2016-3189.patch new file mode 100644 index 00000000..d947130e --- /dev/null +++ b/bzip2/CVE-2016-3189.patch @@ -0,0 +1,10 @@ +--- a/bzip2recover.c ++++ b/bzip2recover.c +@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); ++ outFile = NULL; + } + if (wrBlock >= rbCtr) break; + wrBlock++; diff --git a/bzip2/Pkgfile b/bzip2/Pkgfile index 5c399f1a..8e44892a 100644 --- a/bzip2/Pkgfile +++ b/bzip2/Pkgfile @@ -4,14 +4,15 @@ name=bzip2 version=1.0.6 -release=2 +release=3 source=(http://www.bzip.org/$version/$name-$version.tar.gz \ - $name.patch) + $name.patch CVE-2016-3189.patch) build() { cd $name-$version patch -Np1 -i $SRC/$name.patch + patch -p1 -i $SRC/CVE-2016-3189.patch make make PREFIX=$PKG/usr install

1 0

ports/core (3.3): [notify] bzip2: fix for CVE-2016-3189. closes FS#1585
by crux＠crux.nu 09 Feb '18

09 Feb '18

commit 0c7977b67da2af83fa278a8e38ca043aa4618ee1 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Feb 9 17:43:17 2018 +0100 [notify] bzip2: fix for CVE-2016-3189. closes FS#1585 diff --git a/bzip2/.md5sum b/bzip2/.md5sum index 134efa59..dc8c7f33 100644 --- a/bzip2/.md5sum +++ b/bzip2/.md5sum @@ -1,2 +1,3 @@ +3b17081b71204ddfaa1cef6f5f9d8747 CVE-2016-3189.patch 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz ab2b0d7367fc6f14a3d943a3861ad2c1 bzip2.patch diff --git a/bzip2/.signature b/bzip2/.signature index ebf2ccb8..2e185d6a 100644 --- a/bzip2/.signature +++ b/bzip2/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqqfPftfIF0ivBJPCnvaKfb3TRTwhrHN2HwJzwZnalx90xUtEQ05eddc+wTr4TBkDpfdlnZ8wHaz4+pZOxRRSZQU= -SHA256 (Pkgfile) = b5093f1b2cdc92c7773a0eb48bd20aa058fa677b9fc053f2ba1b4c82afe83b2e +RWRJc1FUaeVeqm1TQVFfW0gKA8At/dPhtV6NvWErI7K10qCoVdy+G3YMe2g5Zlh1u5pYju9Ph8byE7Uxm6vIntJdAWeV8x219w0= +SHA256 (Pkgfile) = fa4a0928f6530d495d431e37ba880d2359cf96da3cd3b64d68dc5f49b0428ebd SHA256 (.footprint) = bd0f9e3ca456b7ff1fcc5440865dc233e263307cb4b59f5d3c5d7ccfdadfcd6d SHA256 (bzip2-1.0.6.tar.gz) = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA256 (bzip2.patch) = b8aa64ff17bc5704cbaf2b7012086575acfa6557c89fafdcc6dcd847fb29b5cf +SHA256 (CVE-2016-3189.patch) = 5c1cce66d2d1dfa61a627734c1a00bf0441c5ab6be0458676e20787705a14a6b diff --git a/bzip2/CVE-2016-3189.patch b/bzip2/CVE-2016-3189.patch new file mode 100644 index 00000000..d947130e --- /dev/null +++ b/bzip2/CVE-2016-3189.patch @@ -0,0 +1,10 @@ +--- a/bzip2recover.c ++++ b/bzip2recover.c +@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); ++ outFile = NULL; + } + if (wrBlock >= rbCtr) break; + wrBlock++; diff --git a/bzip2/Pkgfile b/bzip2/Pkgfile index 5c399f1a..8e44892a 100644 --- a/bzip2/Pkgfile +++ b/bzip2/Pkgfile @@ -4,14 +4,15 @@ name=bzip2 version=1.0.6 -release=2 +release=3 source=(http://www.bzip.org/$version/$name-$version.tar.gz \ - $name.patch) + $name.patch CVE-2016-3189.patch) build() { cd $name-$version patch -Np1 -i $SRC/$name.patch + patch -p1 -i $SRC/CVE-2016-3189.patch make make PREFIX=$PKG/usr install

1 0

ports/contrib (3.3): [notify] go: updated to version 1.9.4
by crux＠crux.nu 09 Feb '18

09 Feb '18

commit d326a4ba9149632531cbcfa0af3dd3733220d452 Author: Matt Housh <jaeger(a)crux.ninja> Date: Thu Feb 8 23:48:42 2018 -0600 [notify] go: updated to version 1.9.4 Security fix for "go get", see https://github.com/golang/go/issues/23673 diff --git a/go/.footprint b/go/.footprint index cfdd0fbb..649b78d6 100644 --- a/go/.footprint +++ b/go/.footprint @@ -2114,6 +2114,8 @@ drwxr-xr-x root/root usr/lib/go/src/cmd/go/internal/web/ drwxr-xr-x root/root usr/lib/go/src/cmd/go/internal/work/ -rw-r--r-- root/root usr/lib/go/src/cmd/go/internal/work/build.go -rw-r--r-- root/root usr/lib/go/src/cmd/go/internal/work/build_test.go +-rw-r--r-- root/root usr/lib/go/src/cmd/go/internal/work/security.go +-rw-r--r-- root/root usr/lib/go/src/cmd/go/internal/work/security_test.go -rw-r--r-- root/root usr/lib/go/src/cmd/go/internal/work/testgo.go -rw-r--r-- root/root usr/lib/go/src/cmd/go/main.go -rwxr-xr-x root/root usr/lib/go/src/cmd/go/mkalldocs.sh diff --git a/go/.md5sum b/go/.md5sum index beb99b46..26a526d8 100644 --- a/go/.md5sum +++ b/go/.md5sum @@ -1,3 +1,3 @@ a121383b430da9050355544d132d8630 go-certpath.diff 814fad4ac7dedfb5e286df83cdc7fc21 go1.4.3.linux-amd64.tar.gz -dcb87e20c314ff08205afcb4ee048d71 go1.9.3.src.tar.gz +6816441fd6680c63865cdd5cb8bc1960 go1.9.4.src.tar.gz diff --git a/go/.signature b/go/.signature index 0deb5bf0..0c89aa0a 100644 --- a/go/.signature +++ b/go/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37EJyK3sCKZNvvlF5FfK6+YRNxBmnzSKHiONvY6CsHdK07jy5rcvDg/Wr82e78VCtKTPOGb9Mgvzq+DWIScVigI= -SHA256 (Pkgfile) = 484809b62aeee8fa8d259857b11cc9706bf4b3f3093fb77544239718401ef30e -SHA256 (.footprint) = 70916de2a012b0e1ae2342901b4030d6015aa4230ec5d1a15d69acc0cfb14860 +RWSagIOpLGJF360HLXusbweeoPBrS1djP2KZysE/G2P6uC4c1keSjMSSbQVcDbOv41STVkNAF337gruvfY6nsGv7sPVMB5qq2QY= +SHA256 (Pkgfile) = c728261af4686ac7c217b09e01b71c3027ea5195f069c78c87327a5c45673c0c +SHA256 (.footprint) = 89cb54f2c0d8d236f309d5bcc5e9d1dd7d641dcb4902e829d6be3f9ebcb06393 SHA256 (go1.4.3.linux-amd64.tar.gz) = ce3140662f45356eb78bc16a88fc7cfb29fb00e18d7c632608245b789b2086d2 -SHA256 (go1.9.3.src.tar.gz) = 4e3d0ad6e91e02efa77d54e86c8b9e34fbe1cbc2935b6d38784dca93331c47ae +SHA256 (go1.9.4.src.tar.gz) = 0573a8df33168977185aa44173305e5a0450f55213600e94541604b75d46dc06 SHA256 (go-certpath.diff) = 3907aed875a3d4e19dfb9aa2aa5b6c4aea821637c8d6f0dd0af54a4e99e8309f diff --git a/go/Pkgfile b/go/Pkgfile index 251a5718..86fa7353 100644 --- a/go/Pkgfile +++ b/go/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Matt Housh, jaeger at crux dot ninja name=go -version=1.9.3 +version=1.9.4 release=1 source=(https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz \ https://storage.googleapis.com/golang/${name}${version}.src.tar.gz \

1 0

ports/contrib (3.4): [notify] ffmpeg: CVE-2018-6621 closes FS#1581
by crux＠crux.nu 07 Feb '18

07 Feb '18

commit 91773e40ee9bfb477ee795ede30c2f58f6edbf72 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Feb 7 18:20:14 2018 +1100 [notify] ffmpeg: CVE-2018-6621 closes FS#1581 diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum index 8d389f99..19b11a71 100644 --- a/ffmpeg/.md5sum +++ b/ffmpeg/.md5sum @@ -1,2 +1,3 @@ +5e0c5cca88620751af75ce7a219b5b09 CVE-2018-6621.patch bbf3fcded80c33968c91bf323a744286 ffmpeg-3.4.1.tar.bz2 dae0c10c99399580c929fc100e79faef ffmpeg-x264-10bit.sh diff --git a/ffmpeg/.signature b/ffmpeg/.signature index 267c88cc..2ee8ffb1 100644 --- a/ffmpeg/.signature +++ b/ffmpeg/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/q/HTqDYuPVkPLXCqSg5s0Xlw/0KBw1nBtA13pgd0SYJ9Icm5OCEuTto6+vnUetzQtYLbcvRbKdTowr0/tLLwI= -SHA256 (Pkgfile) = 00461a23cccf3da23b382be6273ba844f794633976f2a3034d6059abc5e8d6bd +RWSagIOpLGJF3wYh+oQIJbx0WSoQpCT6i1GSDkuKl7IZOamNm4WWhu0zaBE2I5NJJpNYrxHmn5duvTE7aAuBZEpOHWHDx5KjtQo= +SHA256 (Pkgfile) = aef3aa9d55efc42256094b9d9c2fe6b8398910ee4f6d8387559f14fc85b85e9e SHA256 (.footprint) = 2b74837c5c830b52d0bb6f4258bdf7c2e4dd56982b9f9455248b8195b970d1cb SHA256 (ffmpeg-3.4.1.tar.bz2) = f3443e20154a590ab8a9eef7bc951e8731425efc75b44ff4bee31d8a7a574a2c SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3 +SHA256 (CVE-2018-6621.patch) = e3b9aff1fe9aef2d7153d7517f9c349beef27c2859bf1fb01076eeab263a445e diff --git a/ffmpeg/CVE-2018-6621.patch b/ffmpeg/CVE-2018-6621.patch new file mode 100644 index 00000000..8c9e4dd0 --- /dev/null +++ b/ffmpeg/CVE-2018-6621.patch @@ -0,0 +1,11 @@ +--- a/libavcodec/utvideodec.c 2017-12-11 05:35:09.000000000 +0800 ++++ b/libavcodec/utvideodec.c 2018-02-06 15:54:54.872000000 +0800 +@@ -561,7 +561,7 @@ static int decode_frame(AVCodecContext * + for (j = 0; j < c->slices; j++) { + slice_end = bytestream2_get_le32u(&gb); + if (slice_end < 0 || slice_end < slice_start || +- bytestream2_get_bytes_left(&gb) < slice_end) { ++ bytestream2_get_bytes_left(&gb) < slice_end + 1024LL) { + av_log(avctx, AV_LOG_ERROR, "Incorrect slice size\n"); + return AVERROR_INVALIDDATA; + } diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index ae6617e3..fa82cded 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -7,13 +7,17 @@ name=ffmpeg version=3.4.1 -release=1 +release=2 source=(https://ffmpeg.org/releases/$name-$version.tar.bz2 - ffmpeg-x264-10bit.sh) + ffmpeg-x264-10bit.sh + CVE-2018-6621.patch) build() { cd $name-$version + #https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6621 + patch -p1 -i $SRC/CVE-2018-6621.patch + [ -e '/usr/lib/pkgconfig/libwebp.pc' ] && PKGMK_FFMPEG+=' --enable-libwebp' [ -e '/usr/lib/pkgconfig/vdpau.pc' ] && PKGMK_FFMPEG+=' --enable-vdpau' [ -e '/usr/lib/pkgconfig/freetype2.pc' ] && PKGMK_FFMPEG+=' --enable-libfreetype'

1 0