[pkgsrc/trunk]: pkgsrc/x11/eterm Update Eterm to 0.9.5.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed00523a1b07
branches:  trunk
changeset: 399505:ed00523a1b07
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Sep 21 07:29:30 2009 +0000

description:
Update Eterm to 0.9.5.
Changes in pkgsrc:
 * remove patch-ac.
     It is noted for CVE-2008-1142. but the CVE is for rxvt.
     CVE-2008-1692 is for Eterm and fixed by this release.
 * add xim option and enabled by default
 * enable mult-charset and auto-encoding
 * replace bg images with currently distributed one.

Changes in upsteram:
Wed Oct 18 13:35:18 2006                        Michael Jennings (mej)

Fixed a typo and some logic errors in libscream located by Mike
Frysinger <vapier%gentoo.org@localhost>.
----------------------------------------------------------------------
Mon Oct 30 16:11:47 2006                        Michael Jennings (mej)

Patch from Jason McCarver <slam%parasite.cc@localhost> to support -S/--sticky
option for "sticky" (i.e., present on all desktops) startup.
----------------------------------------------------------------------
Tue Jul  3 20:48:46 2007                        Michael Jennings (mej)

Remove some cruft from kEsetroot.
----------------------------------------------------------------------
Wed May 14 12:42:51 2008                        Michael Jennings (mej)

Patch from Kim Woelders <kim%woelders.dk@localhost>:

    There is a race problem with Eterm during startup related to the
    shell LINES/COLUMNS env vars.

    If the WM changes the window size (e.g. due to saved settings)
    before mapping the window, sometimes the shell will set LINES and
    COLUMNS according to the old/incorrect size and sometimes to the
    new/correct size, depending on wheter the call to tt_winsize() at
    command.c line 2322 (by the shell child process) or the
    tt_resize() (by the Eterm process) due to the ConfigureNotify
    caused by the resize (or WM ICCCM ConfigureNotify) operation
    happens first.

The call in question was added by Azundris for Escreen.  So far
Escreen seems to be behaving properly with this patch applied, but all
my Eterm windows (Escreen and otherwise) are pre-sized with -g anyway.
So I'm going to keep my eye on it for awhile.  In case of trouble,
change the "#if 0" to "#ifdef ESCREEN" to revert to previous behavior
when in Escreen mode.  Normal operation should not require the call in
question.
----------------------------------------------------------------------
Wed May 14 14:54:16 2008                        Michael Jennings (mej)

Modified patch from hsim%gmx.li@localhost to allow setting of the "Urgent" hint
on beep.
----------------------------------------------------------------------
Wed May 14 15:26:13 2008                        Michael Jennings (mej)

Patch from Emmanuel Anne <emmanuel.anne%gmail.com@localhost> to fix cut/paste
with KDE applications.
----------------------------------------------------------------------
Wed May 14 16:09:04 2008                        Michael Jennings (mej)

(Correct) fix for CVE-2008-1692.  Eterm no longer defaults to using
":0" for $DISPLAY due to the possibility that an attacker can create a
fake X server on a shared system, intercept the Eterm X connection,
and send fake keystrokes to the victim's Eterm to execute arbitrary
commands as that user.

The previous fix, while it did indeed correct the vulnerability, broke
the --display option.  The original fix from Bernhard Link was more
correct, albeit not quite on target.

diffstat:

 x11/eterm/Makefile         |   19 +--
 x11/eterm/PLIST            |  231 ++++++++++----------------------------------
 x11/eterm/distinfo         |   21 +--
 x11/eterm/options.mk       |    9 +-
 x11/eterm/patches/patch-ac |   30 -----
 5 files changed, 73 insertions(+), 237 deletions(-)

diffs (truncated from 388 to 300 lines):

diff -r ddd885c06fe7 -r ed00523a1b07 x11/eterm/Makefile
--- a/x11/eterm/Makefile        Mon Sep 21 06:44:12 2009 +0000
+++ b/x11/eterm/Makefile        Mon Sep 21 07:29:30 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.58 2009/09/20 12:51:42 obache Exp $
+# $NetBSD: Makefile,v 1.59 2009/09/21 07:29:30 obache Exp $
 
-DISTNAME=      Eterm-0.9.4
+DISTNAME=      Eterm-0.9.5
 PKGNAME=       ${DISTNAME:S/^E/e/}
-PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=eterm/}
-DISTFILES=     ${DEFAULT_DISTFILES} ${PIXMAP_FILES}
+DISTFILES=     ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/Eterm-/Eterm-bg-/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.eterm.org/
@@ -13,17 +12,13 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-SITES.Eterm-bg-scale-1.tar.gz= ${MASTER_SITE_BACKUP}
-SITES.Eterm-bg-scale-2.tar.gz= ${MASTER_SITE_BACKUP}
-SITES.Eterm-bg-tile.tar.gz=    ${MASTER_SITE_BACKUP}
-
-PIXMAP_FILES=          Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
-                       Eterm-bg-tile.tar.gz
-
 USE_TOOLS+=            perl:run
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
+
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --enable-multi-charset=unicode
+CONFIGURE_ARGS+=       --enable-auto-encoding
 
 PKG_SYSCONFSUBDIR=     Eterm
 OWN_DIRS=              ${PKG_SYSCONFDIR}/themes
@@ -44,7 +39,7 @@
 .include "options.mk"
 
 pre-extract:
-       ${LN} -sf ${WRKSRC} ${WRKDIR}/Eterm
+       ${LN} -sf ${WRKSRC}/bg ${WRKDIR}/bg
 
 .include "../../devel/libast/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
diff -r ddd885c06fe7 -r ed00523a1b07 x11/eterm/PLIST
--- a/x11/eterm/PLIST   Mon Sep 21 06:44:12 2009 +0000
+++ b/x11/eterm/PLIST   Mon Sep 21 07:29:30 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:24:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/09/21 07:29:30 obache Exp $
 bin/Esetroot
 bin/Etbg
 bin/Etbg_update_list
@@ -28,189 +28,62 @@
 share/Eterm/pix/menu2.png
 share/Eterm/pix/menu3.png
 share/Eterm/pix/pixmaps.list
-share/Eterm/pix/scale/Bladerunner-bg.png
-share/Eterm/pix/scale/Building.jpg
-share/Eterm/pix/scale/Canyon.jpg
-share/Eterm/pix/scale/Cavefire-bg.png
-share/Eterm/pix/scale/Daughter.jpg
-share/Eterm/pix/scale/Dragon.jpg
-share/Eterm/pix/scale/Evocation.jpg
-share/Eterm/pix/scale/Gas_Station.jpg
-share/Eterm/pix/scale/Hall_of_Mirrors.jpg
 share/Eterm/pix/scale/Neopolis-horizon.jpg
-share/Eterm/pix/scale/Neopolis-horizon.png
-share/Eterm/pix/scale/Piramid.jpg
-share/Eterm/pix/scale/Snow.jpg
-share/Eterm/pix/scale/Terraforming.jpg
-share/Eterm/pix/scale/The_Castle.jpg
-share/Eterm/pix/scale/The_New_Base.jpg
-share/Eterm/pix/scale/after_the_storm.jpg
-share/Eterm/pix/scale/alien_spheres.jpg
-share/Eterm/pix/scale/ascension.png
-share/Eterm/pix/scale/atlantis.jpg
-share/Eterm/pix/scale/back1.jpg
-share/Eterm/pix/scale/back3.jpg
-share/Eterm/pix/scale/beacon2.jpg
-share/Eterm/pix/scale/before_the_storm.jpg
-share/Eterm/pix/scale/bluerising.jpg
-share/Eterm/pix/scale/castle_verde.jpg
-share/Eterm/pix/scale/chamelea.jpg
-share/Eterm/pix/scale/citidel.jpg
-share/Eterm/pix/scale/city3.jpg
-share/Eterm/pix/scale/class_m.jpg
-share/Eterm/pix/scale/conjunction.jpg
-share/Eterm/pix/scale/coup_de_grace.jpg
-share/Eterm/pix/scale/crater_lake.jpg
-share/Eterm/pix/scale/cronus.jpg
-share/Eterm/pix/scale/distant_kin.jpg
-share/Eterm/pix/scale/dvxvb.jpg
-share/Eterm/pix/scale/elysium.jpg
-share/Eterm/pix/scale/enclosure.jpg
-share/Eterm/pix/scale/fossil.jpg
-share/Eterm/pix/scale/fourthday.jpg
-share/Eterm/pix/scale/gaia.jpg
-share/Eterm/pix/scale/gaia_station.jpg
-share/Eterm/pix/scale/galleon.jpg
-share/Eterm/pix/scale/gazebo.jpg
-share/Eterm/pix/scale/good_morning_sunshine.jpg
-share/Eterm/pix/scale/gorgon.jpg
-share/Eterm/pix/scale/holding.jpg
-share/Eterm/pix/scale/hour.jpg
-share/Eterm/pix/scale/hubbles_doorstep.jpg
-share/Eterm/pix/scale/icemoon.jpg
-share/Eterm/pix/scale/inlet.jpg
-share/Eterm/pix/scale/iron_temple.jpg
-share/Eterm/pix/scale/kingdom.jpg
-share/Eterm/pix/scale/lake_of_fire.jpg
-share/Eterm/pix/scale/legacy.jpg
-share/Eterm/pix/scale/lighthouse.jpg
-share/Eterm/pix/scale/lotus.jpg
-share/Eterm/pix/scale/nebula.jpg
-share/Eterm/pix/scale/neopolis.jpg
-share/Eterm/pix/scale/night_of_the_dragon.jpg
-share/Eterm/pix/scale/night_watchman.jpg
-share/Eterm/pix/scale/nocturne.jpg
-share/Eterm/pix/scale/observation_deck.jpg
-share/Eterm/pix/scale/planeta.png
-share/Eterm/pix/scale/pond.png
-share/Eterm/pix/scale/portal.jpg
-share/Eterm/pix/scale/poseidon.png
-share/Eterm/pix/scale/return_to_giza.jpg
-share/Eterm/pix/scale/ripple.png
-share/Eterm/pix/scale/rising.jpg
-share/Eterm/pix/scale/river_of_lead.jpg
-share/Eterm/pix/scale/roche_limit.jpg
-share/Eterm/pix/scale/sentinel.jpg
-share/Eterm/pix/scale/silence.jpg
-share/Eterm/pix/scale/sleepwalker.jpg
-share/Eterm/pix/scale/still_life_study.jpg
-share/Eterm/pix/scale/sun.png
-share/Eterm/pix/scale/the_forest_queen.jpg
-share/Eterm/pix/scale/the_taken_field.jpg
-share/Eterm/pix/scale/traveller.jpg
-share/Eterm/pix/scale/trinity.jpg
-share/Eterm/pix/scale/tunnel.jpg
-share/Eterm/pix/scale/unfriendly_terrain.jpg
-share/Eterm/pix/scale/urmane1.jpg
-share/Eterm/pix/scale/urmane2.jpg
-share/Eterm/pix/scale/urmane3.jpg
-share/Eterm/pix/scale/urmane4.jpg
+share/Eterm/pix/scale/day-night.jpg
+share/Eterm/pix/scale/midnight_sky.png
+share/Eterm/pix/scale/sailors_delight.png
 share/Eterm/pix/scale/wasteland.jpg
+share/Eterm/pix/scale/wintertree.jpg
 share/Eterm/pix/thumb_1.png
 share/Eterm/pix/thumb_2.png
-share/Eterm/pix/tile/004.png
-share/Eterm/pix/tile/014.png
-share/Eterm/pix/tile/015.png
-share/Eterm/pix/tile/017.png
-share/Eterm/pix/tile/021.png
-share/Eterm/pix/tile/024.png
-share/Eterm/pix/tile/026.png
-share/Eterm/pix/tile/033.png
-share/Eterm/pix/tile/15.png
-share/Eterm/pix/tile/22.png
-share/Eterm/pix/tile/35.png
-share/Eterm/pix/tile/36.png
-share/Eterm/pix/tile/4.png
-share/Eterm/pix/tile/40.png
-share/Eterm/pix/tile/43.png
-share/Eterm/pix/tile/45.png
-share/Eterm/pix/tile/47.png
-share/Eterm/pix/tile/50.png
-share/Eterm/pix/tile/53.png
-share/Eterm/pix/tile/54.png
-share/Eterm/pix/tile/55.png
-share/Eterm/pix/tile/59.png
-share/Eterm/pix/tile/6.png
-share/Eterm/pix/tile/7.png
-share/Eterm/pix/tile/70s_marble.png
-share/Eterm/pix/tile/7m.png
-share/Eterm/pix/tile/a10.png
-share/Eterm/pix/tile/a2.png
-share/Eterm/pix/tile/a8.png
-share/Eterm/pix/tile/atoms.png
-share/Eterm/pix/tile/atoms2.png
-share/Eterm/pix/tile/backwave.jpg
-share/Eterm/pix/tile/blackstone.png
-share/Eterm/pix/tile/blue_marble.png
-share/Eterm/pix/tile/blue_maze.png
-share/Eterm/pix/tile/blue_rock.png
-share/Eterm/pix/tile/blue_sandpaper.png
-share/Eterm/pix/tile/blue_water.png
-share/Eterm/pix/tile/blue_weave.png
-share/Eterm/pix/tile/blurock.png
-share/Eterm/pix/tile/bow-tiles.png
-share/Eterm/pix/tile/brushed_aluminum.png
-share/Eterm/pix/tile/button1.jpg
-share/Eterm/pix/tile/button5.jpg
-share/Eterm/pix/tile/c0de.jpg
+share/Eterm/pix/tile/a_distant_star.png
+share/Eterm/pix/tile/acid_chess.png
+share/Eterm/pix/tile/alpha_centauri.png
+share/Eterm/pix/tile/army_brat.png
+share/Eterm/pix/tile/bubbly1.jpg
+share/Eterm/pix/tile/bubbly2.jpg
+share/Eterm/pix/tile/bubbly3.jpg
+share/Eterm/pix/tile/bubbly4.jpg
 share/Eterm/pix/tile/circuit.jpg
-share/Eterm/pix/tile/circuit.png
-share/Eterm/pix/tile/coarse_red.png
-share/Eterm/pix/tile/coral3.png
-share/Eterm/pix/tile/coral4.png
-share/Eterm/pix/tile/corrugated_metal.png
-share/Eterm/pix/tile/cyber_bg.png
-share/Eterm/pix/tile/dark_marble.png
-share/Eterm/pix/tile/dirt.png
-share/Eterm/pix/tile/ether.png
-share/Eterm/pix/tile/ether_blue.png
-share/Eterm/pix/tile/ether_green.png
-share/Eterm/pix/tile/firering.png
-share/Eterm/pix/tile/fond_mau.png
-share/Eterm/pix/tile/giger1.png
-share/Eterm/pix/tile/giger2.png
-share/Eterm/pix/tile/green_stucco.png
-share/Eterm/pix/tile/greenred.png
-share/Eterm/pix/tile/greybg.png
-share/Eterm/pix/tile/lava2.png
-share/Eterm/pix/tile/lightb1.png
-share/Eterm/pix/tile/maple1.png
-share/Eterm/pix/tile/money2.png
-share/Eterm/pix/tile/money3.png
-share/Eterm/pix/tile/moss.png
-share/Eterm/pix/tile/multicolor1_dots.png
-share/Eterm/pix/tile/multicolor3_rock.png
-share/Eterm/pix/tile/nebula.jpg
-share/Eterm/pix/tile/pebble1.png
-share/Eterm/pix/tile/plants.png
-share/Eterm/pix/tile/pool_blue.png
-share/Eterm/pix/tile/purpgls.png
-share/Eterm/pix/tile/purple_marble2.png
-share/Eterm/pix/tile/purple_stuff.png
-share/Eterm/pix/tile/qube25p.png
-share/Eterm/pix/tile/red_rock.png
-share/Eterm/pix/tile/red_stucco.png
-share/Eterm/pix/tile/redgray_marble.png
-share/Eterm/pix/tile/shale.png
-share/Eterm/pix/tile/sky2.png
-share/Eterm/pix/tile/soft.png
-share/Eterm/pix/tile/soft_blue.png
-share/Eterm/pix/tile/space.png
-share/Eterm/pix/tile/starry.png
-share/Eterm/pix/tile/strands1.png
-share/Eterm/pix/tile/waves.png
-share/Eterm/pix/tile/woodish1.png
-share/Eterm/pix/tile/wtrstone.jpg
+share/Eterm/pix/tile/cold_steel.png
+share/Eterm/pix/tile/conch.png
+share/Eterm/pix/tile/confusion.jpg
+share/Eterm/pix/tile/connect_the_dots.png
+share/Eterm/pix/tile/cyber_bg.jpg
+share/Eterm/pix/tile/darkness.png
+share/Eterm/pix/tile/falling.png
+share/Eterm/pix/tile/fascination.png
+share/Eterm/pix/tile/firestorm.png
+share/Eterm/pix/tile/for_a_moment.png
+share/Eterm/pix/tile/graffiti.png
+share/Eterm/pix/tile/gray_matter.png
+share/Eterm/pix/tile/lightning_crashes.png
+share/Eterm/pix/tile/marbles.png
+share/Eterm/pix/tile/moody_blues.png
+share/Eterm/pix/tile/murky_depths.png
+share/Eterm/pix/tile/oil_on_canvas.png
+share/Eterm/pix/tile/pebble_beach.png
+share/Eterm/pix/tile/ping-pong.png
+share/Eterm/pix/tile/plasma.png
+share/Eterm/pix/tile/pulse.png
+share/Eterm/pix/tile/rolling_meadows.png
+share/Eterm/pix/tile/shades_of_being.png
+share/Eterm/pix/tile/shale.jpg
+share/Eterm/pix/tile/shattered_windows.png
+share/Eterm/pix/tile/shock_and_awe.png
+share/Eterm/pix/tile/sitting_in_acid.png
+share/Eterm/pix/tile/spring_rain.png
+share/Eterm/pix/tile/stained_glass.png
+share/Eterm/pix/tile/tales_of_earthsea.png
+share/Eterm/pix/tile/tangled_web.png
+share/Eterm/pix/tile/the_wall.png
+share/Eterm/pix/tile/trees_are_leafy.png
+share/Eterm/pix/tile/veins.png
+share/Eterm/pix/tile/veins_2.png
+share/Eterm/pix/tile/violetta.png
+share/Eterm/pix/tile/water_into_wine.png
+share/Eterm/pix/tile/wormhole.png
+share/Eterm/pix/tile/woven_memories.png
 share/Eterm/themes/Escreen/menus.cfg
 share/Eterm/themes/Escreen/pixmaps.list
 share/Eterm/themes/Escreen/theme.cfg
diff -r ddd885c06fe7 -r ed00523a1b07 x11/eterm/distinfo
--- a/x11/eterm/distinfo        Mon Sep 21 06:44:12 2009 +0000