head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.60 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.58 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.56 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.54 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.52 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.50 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.48 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.46 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.44 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.42 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.40 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.38 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.36 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.34 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.32 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.30 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.28 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.26 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.24 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.22 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.20 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.18 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.16 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.14 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.10 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.12 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.8 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.6 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.4 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.2 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.6.0.22 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.20 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.18 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.16 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.14 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.10 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.8 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.6 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.4 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.2 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.5.0.68 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.66 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.64 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.62 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.60 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.58 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.56 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.54 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.52 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.50 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.48 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.46 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.44 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.42 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.40 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.38 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.36 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.34 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.32 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.30 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.28 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.26 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.24 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.22 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.20 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.18 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.16 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.14 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.12 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.10 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.8 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.6 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.4 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.2 pkgsrc-2008Q1:1.4.0.12 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.10 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.8 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.6 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.4 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.2 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2018.11.30.17.30.24; author nia; state Exp; branches; next 1.7; commitid HwSoMTWd8uA7zZ1B; 1.7 date 2018.11.30.17.25.05; author nia; state Exp; branches; next 1.6; commitid KC36Zugumb7UwZ1B; 1.6 date 2016.05.01.19.56.40; author dholland; state Exp; branches; next 1.5; commitid 2xvmdIkLb2VyGO4z; 1.5 date 2008.05.27.21.46.53; author tonnerre; state Exp; branches; next 1.4; 1.4 date 2006.12.11.12.23.24; author sketch; state Exp; branches 1.4.12.1; next 1.3; 1.3 date 2006.01.01.12.58.00; author xtraeme; state dead; branches; next 1.2; 1.2 date 2001.12.11.16.02.08; author wiz; state Exp; branches; next 1.1; 1.1 date 2001.01.14.02.30.00; author hubertf; state Exp; branches 1.1.1.1; next ; 1.4.12.1 date 2008.06.01.09.35.54; author spz; state Exp; branches; next ; 1.1.1.1 date 2001.01.14.02.30.00; author hubertf; state Exp; branches; next ; desc @@ 1.8 log @x11/aterm: Make these patch comments current. @ text @$NetBSD: patch-aa,v 1.7 2018/11/30 17:25:05 nia Exp $ - Use ctype.h functions properly. - Don't assume :0 if DISPLAY isn't set. --- src/main.c.orig 2007-08-01 14:08:29.000000000 +0000 +++ src/main.c @@@@ -196,7 +196,7 @@@@ xerror_handler (Display * dpy, XErrorEve void color_aliases(int idx) { - if (rs_color[idx] && isdigit(*rs_color[idx])) { + if (rs_color[idx] && isdigit((unsigned char)*rs_color[idx])) { int i = atoi(rs_color[idx]); if (i >= 8 && i <= 15) { /* bright colors */ @@@@ -1218,7 +1218,7 @@@@ set_window_color(int idx, const char *co return; /* handle color aliases */ - if (isdigit(*color)) { + if (isdigit((unsigned char)*color)) { i = atoi(color); if (i >= 8 && i <= 15) { /* bright colors */ i -= 8; @@@@ -1435,7 +1435,7 @@@@ change_font(int init, const char *fontna break; default: - if (fontname[1] != '\0' && !isdigit(fontname[1])) + if (fontname[1] != '\0' && !isdigit((unsigned char)fontname[1])) return; if (idx < 0 || idx >= (NFONTS)) return; @@@@ -2057,9 +2057,14 @@@@ main(int argc, char *argv[]) */ get_options(argc, argv); - if( display_name == NULL ) - if ((display_name = getenv("DISPLAY")) == NULL) - display_name = ":0"; + if( display_name == NULL ) + display_name = getenv("DISPLAY"); + + if( display_name == NULL ) + { + print_error("DISPLAY variable not set and none given"); + exit(EXIT_FAILURE); + } #ifdef HAVE_AFTERSTEP #ifdef MyArgs_IS_MACRO @ 1.7 log @x11/aterm: Update to 1.0.1. Bit over 11 years late, but at least we got there in the end! ChangeLog: 2007-08-01 vae * adding CL generation to makefiles * fixing configure bug * preparing configure for 1.0.1 * changed MWM HINTS, re gentoo bug #139554. 2006-06-26 sasha * fixed compile errors when no XLocale is available 2006-03-29 sasha * converted main.c back to unix mode * converted screen.c back to unix mode 2006-02-17 sasha * fixed bug preventing from pasting more then 16Kb into aterm 2006-02-13 sasha * minor cleanups * fix for the high-ascii pasting in screen.c - need to use XA_STRING ??? 2006-01-08 sasha * added patch for background refresh on desktop changes in ion3 when pixmap has not changed 2005-12-21 sasha * added uninstall target to the top Makefile 2005-12-06 sasha * Added patch for XIM support gratiously provided by calkin@@ieee.org 2005-09-19 sasha * updated mappings for F1-F4 to modern \033OP, etc. * possibly fixed pasting on 64bit systems 2005-09-06 sasha * updated contacts info in man page * applyed term size patch from daniel@@roe.ch 2005-07-11 sasha * fixed geometry printing into stderr @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2016/05/01 19:56:40 dholland Exp $ a3 1 - Silence debug prints. @ 1.6 log @Patch up some problems found by compiling with gcc. PKGREVISION -> 12. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2008/05/27 21:46:53 tonnerre Exp $ d7 1 a7 1 --- src/main.c.orig 2005-06-20 16:10:19.000000000 +0000 d18 1 a18 14 @@@@ -1037,12 +1037,10 @@@@ resize_window(XEvent* ev) XConfigureEvent *xconf = &(ev->xconfigure); while( XCheckTypedWindowEvent( Xdisplay, TermWin.parent, ConfigureNotify, ev ) ); - fprintf( stderr, "config_geom = %dx%d\n", xconf->width, xconf->height ); resize_window1(xconf->width, xconf->height); #if 1 XTranslateCoordinates (Xdisplay, TermWin.parent, Xroot, 0, 0, &root_x, &root_y, &wdumm); - fprintf( stderr, "root_geom = %dx%d%+d%+d, root_size = %dx%d\n", xconf->width, xconf->height, root_x, root_y, XdisplayWidth, XdisplayHeight ); TermWin.root_x = root_x ; TermWin.root_y = root_y ; TermWin.root_width = xconf->width ; @@@@ -1215,7 +1213,7 @@@@ set_window_color(int idx, const char *co d27 1 a27 1 @@@@ -1432,7 +1430,7 @@@@ change_font(int init, const char *fontna d36 1 a36 1 @@@@ -2047,9 +2045,14 @@@@ main(int argc, char *argv[]) @ 1.5 log @Don't make any assumptions about default displays in aterm. Fixes CVE-2008-1142. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 1 --- src/main.c.orig 2005-06-20 18:10:19.000000000 +0200 d9 9 d31 18 @ 1.4 log @Turn off pointless messages to stderr. @ text @d3 3 a5 3 --- src/main.c.orig 2006-12-11 12:19:55.000000000 +0000 +++ src/main.c 2006-12-11 12:20:28.000000000 +0000 @@@@ -1037,12 +1037,10 @@@@ d18 18 @ 1.4.12.1 log @Pullup ticket 2401 - requested by tonnerre fix security problem in aterm Revisions pulled up: - pkgsrc/x11/aterm/patches/patch-aa 1.5 - pkgsrc/x11/aterm/distinfo 1.13 - pkgsrc/x11/aterm/Makefile 1.35 Module Name: pkgsrc Committed By: tonnerre Date: Tue May 27 21:46:53 UTC 2008 Modified Files: pkgsrc/x11/aterm: Makefile distinfo pkgsrc/x11/aterm/patches: patch-aa Log Message: Don't make any assumptions about default displays in aterm. Fixes CVE-2008-1142. To generate a diff of this commit: cvs rdiff -r1.34 -r1.35 pkgsrc/x11/aterm/Makefile cvs rdiff -r1.12 -r1.13 pkgsrc/x11/aterm/distinfo cvs rdiff -r1.4 -r1.5 pkgsrc/x11/aterm/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2008/05/27 21:46:53 tonnerre Exp $ d3 3 a5 3 --- src/main.c.orig 2005-06-20 18:10:19.000000000 +0200 +++ src/main.c @@@@ -1037,12 +1037,10 @@@@ resize_window(XEvent* ev) a17 18 @@@@ -2047,9 +2045,14 @@@@ main(int argc, char *argv[]) */ get_options(argc, argv); - if( display_name == NULL ) - if ((display_name = getenv("DISPLAY")) == NULL) - display_name = ":0"; + if( display_name == NULL ) + display_name = getenv("DISPLAY"); + + if( display_name == NULL ) + { + print_error("DISPLAY variable not set and none given"); + exit(EXIT_FAILURE); + } #ifdef HAVE_AFTERSTEP #ifdef MyArgs_IS_MACRO @ 1.3 log @Update to 1.0.0. Too many changes to list, please see the Changelog file. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2001/12/11 16:02:08 wiz Exp $ d3 10 a12 3 --- configure.orig Thu Sep 6 18:38:07 2001 +++ configure @@@@ -1822,7 +1822,7 @@@@ d14 4 a17 28 # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" + X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . case "`(uname -sr) 2>/dev/null`" in @@@@ -1850,9 +1850,9 @@@@ rm -f conftest* if test $ac_R_nospace = yes; then echo "$ac_t""no" 1>&6 - X_LIBS="$X_LIBS -R$x_libraries" + X_LIBS="$X_LIBS -R$x_libraries -Wl,-R$x_libraries" else - LIBS="$ac_xsave_LIBS -R $x_libraries" + LIBS="$ac_xsave_LIBS -R $x_libraries -Wl,-R$x_libraries" cat > conftest.$ac_ext <&6 - X_LIBS="$X_LIBS -R $x_libraries" + X_LIBS="$X_LIBS -R $x_libraries -Wl,-R$x_libraries" else echo "$ac_t""neither works" 1>&6 fi @ 1.2 log @Updated to 0.4.2, per pkg/14467 by Jonathan Perkin. Changes since 0.4.0: *src/command: applied patch from Eric Benoit , which adds the "CSI 21 t" control sequence, for title handling. *command.c: fixed keypad Home and down keys being mixed up. Added code to allow scrolling up/down for just one line (shift+arrow) contributed by djerome) *command.c: Fixed possible buffer overflow when changing display name. *ximage_utils.c: updated shading code for better speed *screen.c: applyed reverse video cursor patch *ximage_utils.c: applyed Ren Scharfe 's patch for better shading approach. And bug fixes. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- configure.orig Sun Jan 14 02:20:09 2001 d5 1 a5 1 @@@@ -1808,7 +1808,7 @@@@ d14 1 a14 1 @@@@ -1836,9 +1836,9 @@@@ d24 1 a24 1 #line 1844 "configure" d26 1 a26 1 @@@@ -1859,7 +1859,7 @@@@ @ 1.1.1.1 log @aterm (Afterstep XVT) - a VT102 emulator for the X window system aterm, version 0.4.0, is a colour vt102 terminal emulator, based on rxvt 2.4.8 with Alfredo Kojima's additions of fast transparency, intended as an xterm(1) replacement for users who do not require features such as Tektronix 4014 emulation and toolkit-style configurability. As a result, aterm uses much less swap space -- a significant advantage on a machine serving many X sessions. It was created with AfterStep Window Manger users in mind, but is not tied to any libraries, and can be used anywhere. @ text @@