security update

5 files changed, 175 insertions, 4 deletions

diff --git a/app-emulation/atari800/ChangeLog b/app-emulation/atari800/ChangeLog
index 3f1c9f04dd23..32d7d7b506c2 100644
--- a/app-emulation/atari800/ChangeLog
+++ b/app-emulation/atari800/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/atari800
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/atari800/ChangeLog,v 1.9 2003/07/11 05:39:47 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/atari800/ChangeLog,v 1.10 2003/09/02 13:05:44 aliz Exp $
+
+*atari800-1.3.0-r1 (02 Sep 2003)
+
+  02 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> atari800-1.3.0-r1.ebuild :
+  Security update.
 
   10 Jul 2003; Michael Sterrett <msterret@gentoo.org> atari800-1.3.0.ebuild,
   files/1.3.0/atari800.cfg:
diff --git a/app-emulation/atari800/Manifest b/app-emulation/atari800/Manifest
index 6ddf5c551aa2..918247212199 100644
--- a/app-emulation/atari800/Manifest
+++ b/app-emulation/atari800/Manifest
@@ -1,14 +1,14 @@
-MD5 a149ec30bc8537c8cd77e8734b4238ab ChangeLog 1476
+MD5 46037dfe0663878ef107638761a375ee ChangeLog 1602
 MD5 c5bf64554932c20c82274ffa4da1e657 atari800-1.2.2.ebuild 3346
 MD5 42b378ca93f05136b76feed30454a761 atari800-1.2.5.ebuild 3161
 MD5 d6367a6430215ead5cdf775e1547b609 atari800-1.3.0.ebuild 2770
-MD5 2a00d67c51a0d5910dd7253efeec43f0 atari800-1.3.0-r1.ebuild 2851
+MD5 7cf23383e393b50c1bf6185a55abdc6d atari800-1.3.0-r1.ebuild 2842
 MD5 eb8a8b62973cd8789aad8dee8a839842 files/atari800-1.2.2-gentoo.diff 378
 MD5 51143eeb7bd76c8cca8a80bbf5ab7e88 files/atari800-1.2.5-gentoo.diff 1876
 MD5 39a9ab82d0c6639ee234c9d422aa6fb2 files/digest-atari800-1.2.2 119
 MD5 a6366b321577c3ea381f387be52f4212 files/digest-atari800-1.2.5 119
 MD5 f85f4f8f75bb8202fb9d720a73b99365 files/digest-atari800-1.3.0 119
-MD5 eb61f200edd5f1bcae4c8c64bed2609b files/atari800-1.3.0-security.patch 3710
+MD5 72addfdd20ffd541c060e56e25e1268f files/atari800-1.3.0-security.patch 2512
 MD5 f85f4f8f75bb8202fb9d720a73b99365 files/digest-atari800-1.3.0-r1 119
 MD5 1d6cdbf0913428f3ace81314e78fb9e5 files/1.2.2/atari800.1 11812
 MD5 888bd3ecb979f2095569f1dd8c95a2f8 files/1.2.2/atari800.cfg 449
diff --git a/app-emulation/atari800/atari800-1.3.0-r1.ebuild b/app-emulation/atari800/atari800-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..1c44471207da
--- /dev/null
+++ b/app-emulation/atari800/atari800-1.3.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/atari800/atari800-1.3.0-r1.ebuild,v 1.1 2003/09/02 13:05:45 aliz Exp $
+
+DESCRIPTION="Atari 800 emulator"
+HOMEPAGE="http://atari800.sourceforge.net/"
+SRC_URI="mirror://sourceforge/atari800/${P}.tar.gz
+	mirror://sourceforge/atari800/xf25.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE="sdl"
+
+RDEPEND="virtual/x11
+	sdl? ( >=media-libs/libsdl-1.2.0 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}/src
+	epatch ${FILESDIR}/${P}-security.patch
+}
+
+# The configure script in 1.2.5 changed syntax, but the change wasn't
+# updated in the atari800.spec file as in the previous versions.
+src_compile() {
+	local target
+	target="x11"
+	use sdl && target="sdl"
+
+	local myconf
+	myconf="--enable-crashmenu --enable-break --enable-hints \
+	--enable-asm --enable-cursorblk --enable-led --enable-displayled \
+	--enable-sndclip --enable-linuxjoy --enable-sound"
+
+	cd src
+	./configure --prefix=/usr --target=$target ${myconf}
+	emake || die "emake failed"
+	mv atari800.man atari800.1
+}
+
+# The makefile doesn't supply an install routine, so we have to do it
+# ourselves.
+src_install () {
+	into /usr
+	dodir /usr/bin /usr/share/man/man1 /usr/share/atari800
+	dobin src/atari800
+	doman src/atari800.1
+	dodoc COPYING README.1ST DOC/USAGE DOC/README DOC/NEWS DOC/FAQ DOC/CREDITS DOC/BUGS DOC/LPTjoy.txt DOC/cart.txt DOC/pokeysnd.txt
+	insinto /usr/share/atari800
+	doins ${WORKDIR}/*.ROM
+
+	# Basic config file for /etc directory.  An atari800.cfg file
+	# in the current directory will be loaded instead of the
+	# global file, if it exists.  Run "atari800 -configure" to
+	# have the emulator prompt for new values
+	insinto /etc
+	doins ${FILESDIR}/${PVR}/atari800.cfg
+}
+
+pkg_postinst() {
+	if [ "`use sdl`" ] ; then
+		echo
+		echo
+		einfo 'The emulator has been compiled using the SDL libraries.  By default,'
+		einfo 'atari800 switches to fullscreen mode, so a 400x300 entry in your'
+		einfo 'XF86Config-4 file is recommended.  Otherwise, the emulated Atari'
+		einfo 'screen is postage-stamp sized in the middle of your display.'
+		echo
+		einfo 'For example, in the "Screen" section of your /etc/XF86Config-4 file,'
+		einfo 'add the entry "400x300" to the end of the list of modes:'
+		echo
+		einfo '  Section "Screen"'
+		einfo '    [...]'
+		einfo
+		einfo '      Subsection "Display"'
+		einfo '          Depth       16'
+		einfo '          Modes       "1600x1200" "1024x768" "400x300"'
+		einfo '          ViewPort    0 0'
+		einfo '      EndSubsection'
+		einfo '  EndSection'
+		echo
+		einfo 'You should not need to specify a modeline for this mode,'
+		einfo 'since in most cases it is a standard mode calculated by'
+		einfo 'the X server.'
+		echo
+		echo
+		echo
+	fi
+}
diff --git a/app-emulation/atari800/files/atari800-1.3.0-security.patch b/app-emulation/atari800/files/atari800-1.3.0-security.patch
new file mode 100644
index 000000000000..4f25ab684a6f
--- /dev/null
+++ b/app-emulation/atari800/files/atari800-1.3.0-security.patch
@@ -0,0 +1,73 @@
+--- atari.c-orig	2003-02-10 11:22:32.000000000 +0000
++++ atari.c	2003-07-31 23:58:35.000000000 +0100
+@@ -389,16 +389,57 @@
+ 			tv_mode = TV_PAL;
+ 		else if (strcmp(argv[i], "-ntsc") == 0)
+ 			tv_mode = TV_NTSC;
+-		else if (strcmp(argv[i], "-osa_rom") == 0)
+-			strcpy(atari_osa_filename, argv[++i]);
+-		else if (strcmp(argv[i], "-osb_rom") == 0)
+-			strcpy(atari_osb_filename, argv[++i]);
+-		else if (strcmp(argv[i], "-xlxe_rom") == 0)
+-			strcpy(atari_xlxe_filename, argv[++i]);
+-		else if (strcmp(argv[i], "-5200_rom") == 0)
+-			strcpy(atari_5200_filename, argv[++i]);
+-		else if (strcmp(argv[i], "-basic_rom") == 0)
+-			strcpy(atari_basic_filename, argv[++i]);
++		else if (strcmp(argv[i], "-osa_rom") == 0) {
++ 		        if ( (i+1) < *argc ) {
++			          memset(atari_osa_filename,'\0',sizeof(atari_osa_filename));
++			          strncpy(atari_osa_filename, argv[++i], sizeof(atari_osa_filename)-1);
++			}
++			else {
++			          printf("Missing argument for '-osa_rom'\n");
++				  return( 1 );
++			}
++
++		}
++		else if (strcmp(argv[i], "-osb_rom") == 0) {
++ 		        if ( (i+1) < *argc ) {
++			          memset(atari_osb_filename,'\0',sizeof(atari_osb_filename));
++			          strncpy(atari_osb_filename, argv[++i],sizeof(atari_osb_filename)-1);
++			}
++			else {
++			          printf("Missing argument for '-osb_rom'\n");
++				  return( 1 );
++			}
++		}
++		else if (strcmp(argv[i], "-xlxe_rom") == 0) {
++ 		        if ( (i+1) < *argc ) {
++			          memset(atari_xlxe_filename,'\0',sizeof(atari_xlxe_filename));
++			          strncpy(atari_xlxe_filename, argv[++i], sizeof(atari_xlxe_filename)-1);
++			}
++			else {
++			          printf("Missing argument for '-xlxe_rom'\n");
++				  return( 1 );
++			}
++		}
++		else if (strcmp(argv[i], "-5200_rom") == 0) {
++ 		        if ( (i+1) < *argc ) {
++			          memset(atari_5200_filename,'\0',sizeof(atari_5200_filename));
++			          strncpy(atari_5200_filename, argv[++i], sizeof(atari_5200_filename)-1);
++			}
++			else {
++			          printf("Missing argument for '-5200_rom'\n");
++				  return( 1 );
++			}
++		}
++		else if (strcmp(argv[i], "-basic_rom") == 0) {
++ 		        if ( (i+1) < *argc ) {
++			          memset(atari_basic_filename,'\0',sizeof(atari_basic_filename));
++			          strncpy(atari_basic_filename, argv[++i], sizeof(atari_basic_filename)-1);
++			}
++			else {
++			          printf("Missing argument for '-basic_rom'\n");
++				  return( 1 );
++			}
++		}
+ 		else if (strcmp(argv[i], "-cart") == 0) {
+ 			rom_filename = argv[++i];
+ 		}
+
+
+
diff --git a/app-emulation/atari800/files/digest-atari800-1.3.0-r1 b/app-emulation/atari800/files/digest-atari800-1.3.0-r1
new file mode 100644
index 000000000000..3a9b403feff4
--- /dev/null
+++ b/app-emulation/atari800/files/digest-atari800-1.3.0-r1
@@ -0,0 +1,2 @@
+MD5 2998586f3c69f8a7e50439722e30ffc6 atari800-1.3.0.tar.gz 671467
+MD5 4dc3b6b4313e9596c4d474785a37b94d xf25.zip 188942