<p>Mike Banon has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23852">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tint: upgrade the outdated tint payload from 0.03b to 0.04+nmu1<br><br>Fixes two buffer overflows and opens a road to further improvements.<br>All the previous adjustments to libpayload_tint.patch (including the<br>latest "use the current time as random seed") have been preserved<br><br>Change-Id: I22e65d18a0b1551f7049c4afe7f95868f584cf9b<br>Signed-off-by: Mike Banon <mikebdp2@gmail.com><br>---<br>M payloads/external/tint/Makefile<br>M payloads/external/tint/libpayload_tint.patch<br>2 files changed, 116 insertions(+), 634 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/23852/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/tint/Makefile b/payloads/external/tint/Makefile</span><br><span>index 0fba6e7..5ab8974 100644</span><br><span>--- a/payloads/external/tint/Makefile</span><br><span>+++ b/payloads/external/tint/Makefile</span><br><span>@@ -1,5 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-project_url=http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool/main/t/tint/tint_0.03b.tar.gz</span><br><span style="color: hsl(0, 100%, 40%);">-archive_name=tint_0.03b.tar.gz</span><br><span style="color: hsl(120, 100%, 40%);">+project_url=http://http.debian.net/debian/pool/main/t/tint/tint_0.04+nmu1.tar.gz</span><br><span style="color: hsl(120, 100%, 40%);">+archive_name=tint_0.04+nmu1.tar.gz</span><br><span> </span><br><span> unexport KCONFIG_AUTOHEADER</span><br><span> unexport KCONFIG_AUTOCONFIG</span><br><span>@@ -16,13 +16,17 @@</span><br><span> </span><br><span> patch: download</span><br><span> cd tint; \</span><br><span style="color: hsl(0, 100%, 40%);">- if [ -e debian ]; then patch -l -p1 < ../libpayload_tint.patch; fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -e debian ]; then \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm -rf debian typedefs.h Makefile; \</span><br><span style="color: hsl(120, 100%, 40%);">+ touch Makefile; \</span><br><span style="color: hsl(120, 100%, 40%);">+ patch -l -p1 < ../libpayload_tint.patch; \</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span> download:</span><br><span> test -d tint || { wget $(project_url); \</span><br><span> tar -xvf $(archive_name); \</span><br><span> rm $(archive_name); \</span><br><span style="color: hsl(0, 100%, 40%);">- mv tint-0.03b tint; }</span><br><span style="color: hsl(120, 100%, 40%);">+ mv tint-0.04+nmu1 tint; }</span><br><span> </span><br><span> clean:</span><br><span> test -d tint && $(MAKE) -C tint clean || exit 0</span><br><span>diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch</span><br><span>index 7c8a058..b743b2f 100644</span><br><span>--- a/payloads/external/tint/libpayload_tint.patch</span><br><span>+++ b/payloads/external/tint/libpayload_tint.patch</span><br><span>@@ -1,6 +1,6 @@</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/config.h tint/config.h</span><br><span>---- tint-0.03b/config.h 2001-12-08 00:03:24.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/config.h 2016-05-27 14:47:15.797402090 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/config.h tint/config.h</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/config.h 2001-12-08 00:03:24.000000000 +0100</span><br><span>++++ tint/config.h 2018-02-23 12:00:00.000000000 +0200</span><br><span> @@ -29,7 +29,15 @@</span><br><span> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span> */</span><br><span>@@ -17,439 +17,9 @@</span><br><span> +#endif</span><br><span> </span><br><span> #endif /* #ifndef CONFIG_H */</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/changelog tint/debian/changelog</span><br><span>---- tint-0.03b/debian/changelog 2005-07-17 13:32:20.000000000 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/changelog 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,53 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--tint (0.03b) unstable; urgency=low</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- * Added breaks at end of switch statements to keep gcc 3+ happy</span><br><span style="color: hsl(0, 100%, 40%);">-- (Closes: #316022)</span><br><span style="color: hsl(0, 100%, 40%);">-- * Added missing includes to engine.c</span><br><span style="color: hsl(0, 100%, 40%);">-- * Fixed spelling mistake in NOTES</span><br><span style="color: hsl(0, 100%, 40%);">-- * Updated debian policy version</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- -- Abraham van der Merwe <abz@debian.org> Sun, 17 Jul 2005 13:32:17 +0200</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--tint (0.03a) unstable; urgency=low</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- * Applied patch with some minor tweaks from Marcello Mamino which</span><br><span style="color: hsl(0, 100%, 40%);">-- adds a dotted background.</span><br><span style="color: hsl(0, 100%, 40%);">-- * Applied patches from Robert Lemmen which add support for user logins as</span><br><span style="color: hsl(0, 100%, 40%);">-- default name and an interactive mode for specifying the start level.</span><br><span style="color: hsl(0, 100%, 40%);">-- * Show player statistics.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- -- Abraham van der Merwe <abz@debian.org> Mon, 16 Jun 2003 23:07:37 +0200</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--tint (0.02d) unstable; urgency=low</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- * Install man page in correct directory (Closes: #128923)</span><br><span style="color: hsl(0, 100%, 40%);">-- * Created a postinst program that checks for old score files</span><br><span style="color: hsl(0, 100%, 40%);">-- before installing the default score file (Closes: #136466)</span><br><span style="color: hsl(0, 100%, 40%);">-- * Added a menu control file (Closes: #128924)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- -- Abraham van der Merwe <abz@debian.org> Wed, 19 Dec 2001 18:03:34 +0200</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--tint (0.02c) unstable; urgency=low</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- * Removed common-sense suggests from control file *g* (Closes: #123204)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- -- Abraham van der Merwe <abz@debian.org> Wed, 19 Dec 2001 18:03:34 +0200</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--tint (0.02b) unstable; urgency=low</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- * Changed the name from tclassic to tint (as in TINT Is Not Tetris(tm))</span><br><span style="color: hsl(0, 100%, 40%);">-- * Added a build dependancy on libncurses5-dev (Closes: #124241)</span><br><span style="color: hsl(0, 100%, 40%);">-- * Changed the location for the score file to /var/games (Closes: #124236)</span><br><span style="color: hsl(0, 100%, 40%);">-- * Made score file sgid games (Closes: #123595)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- -- Abraham van der Merwe <abz@debian.org> Wed, 19 Dec 2001 18:03:34 +0200</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--tclassic (0.02a) unstable; urgency=low</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- * Initial Release. (Closes: #122839)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- -- Abraham van der Merwe <abz@debian.org> Fri, 7 Dec 2001 17:59:25 +0200</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--Local variables:</span><br><span style="color: hsl(0, 100%, 40%);">--mode: debian-changelog</span><br><span style="color: hsl(0, 100%, 40%);">--End:</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/control tint/debian/control</span><br><span>---- tint-0.03b/debian/control 2005-07-17 13:31:13.000000000 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/control 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,19 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--Source: tint</span><br><span style="color: hsl(0, 100%, 40%);">--Section: games</span><br><span style="color: hsl(0, 100%, 40%);">--Priority: optional</span><br><span style="color: hsl(0, 100%, 40%);">--Maintainer: Abraham van der Merwe <abz@debian.org></span><br><span style="color: hsl(0, 100%, 40%);">--Build-Depends: debhelper (>> 3.0.0), libncurses5-dev</span><br><span style="color: hsl(0, 100%, 40%);">--Standards-Version: 3.6.1</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--Package: tint</span><br><span style="color: hsl(0, 100%, 40%);">--Architecture: any</span><br><span style="color: hsl(0, 100%, 40%);">--Depends: ${shlibs:Depends}</span><br><span style="color: hsl(0, 100%, 40%);">--Replaces: tclassic</span><br><span style="color: hsl(0, 100%, 40%);">--Conflicts: tclassic</span><br><span style="color: hsl(0, 100%, 40%);">--Description: TINT Is Not Tetris(tm) ...at least the name isn't</span><br><span style="color: hsl(0, 100%, 40%);">-- As the title suggests, this is a clone of the original tetris game</span><br><span style="color: hsl(0, 100%, 40%);">-- written by Alexey Pajitnov, Dmitry Pavlovsky, and Vadim Gerasimov.</span><br><span style="color: hsl(0, 100%, 40%);">-- .</span><br><span style="color: hsl(0, 100%, 40%);">-- I've tried to keep the game as close to the original as possible, but</span><br><span style="color: hsl(0, 100%, 40%);">-- there is a few differences. Nevertheless, it's probably the closest to</span><br><span style="color: hsl(0, 100%, 40%);">-- the original that you'll ever find in the UNIX world...</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/copyright tint/debian/copyright</span><br><span>---- tint-0.03b/debian/copyright 2001-12-19 17:08:42.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/copyright 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,39 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--This is the Debian GNU/Linux prepackaged version of tint. These</span><br><span style="color: hsl(0, 100%, 40%);">--files were written and packaged by Abraham van der Merwe <abz@debian.org></span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--The games is released under a derivative of the BSD license. For more</span><br><span style="color: hsl(0, 100%, 40%);">--information see http://www.opensource.org/licenses/bsd-license.html</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--The original source can be found at: http://oasis.frogfoot.net</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--Copyright:</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- Copyright (c) Abraham vd Merwe <abz@blio.net></span><br><span style="color: hsl(0, 100%, 40%);">-- All rights reserved.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- Redistribution and use in source and binary forms, with or without</span><br><span style="color: hsl(0, 100%, 40%);">-- modification, are permitted provided that the following conditions</span><br><span style="color: hsl(0, 100%, 40%);">-- are met:</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- 1. Redistributions of source code must retain the above copyright</span><br><span style="color: hsl(0, 100%, 40%);">-- notice, this list of conditions and the following disclaimer.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- 2. Redistributions in binary form must reproduce the above copyright</span><br><span style="color: hsl(0, 100%, 40%);">-- notice, this list of conditions and the following disclaimer in the</span><br><span style="color: hsl(0, 100%, 40%);">-- documentation and/or other materials provided with the distribution.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- 3. Neither the name of the author nor the names of other contributors</span><br><span style="color: hsl(0, 100%, 40%);">-- may be used to endorse or promote products derived from this software</span><br><span style="color: hsl(0, 100%, 40%);">-- without specific prior written permission.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</span><br><span style="color: hsl(0, 100%, 40%);">-- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,</span><br><span style="color: hsl(0, 100%, 40%);">-- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</span><br><span style="color: hsl(0, 100%, 40%);">-- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</span><br><span style="color: hsl(0, 100%, 40%);">-- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</span><br><span style="color: hsl(0, 100%, 40%);">-- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</span><br><span style="color: hsl(0, 100%, 40%);">-- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER</span><br><span style="color: hsl(0, 100%, 40%);">-- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</span><br><span style="color: hsl(0, 100%, 40%);">-- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</span><br><span style="color: hsl(0, 100%, 40%);">-- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/.depends tint/debian/.depends</span><br><span>---- tint-0.03b/debian/.depends 2002-03-16 17:26:42.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/.depends 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--tint.postinst.o: tint.postinst.c</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/dirs tint/debian/dirs</span><br><span>---- tint-0.03b/debian/dirs 2002-03-16 17:58:42.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/dirs 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--usr/games</span><br><span style="color: hsl(0, 100%, 40%);">--usr/share/man/man6</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/docs tint/debian/docs</span><br><span>---- tint-0.03b/debian/docs 2001-12-07 17:25:17.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/docs 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--NOTES</span><br><span style="color: hsl(0, 100%, 40%);">--CREDITS</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/Makefile tint/debian/Makefile</span><br><span>---- tint-0.03b/debian/Makefile 2002-03-16 18:41:18.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/Makefile 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,28 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--# -*- sh -*-</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--# Written by Abraham van der Merwe <abz@blio.net></span><br><span style="color: hsl(0, 100%, 40%);">--# Last updated: 2002-03-26</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--CC = gcc</span><br><span style="color: hsl(0, 100%, 40%);">--CFLAGS = -Wall -Os -pipe</span><br><span style="color: hsl(0, 100%, 40%);">--LDFLAGS = -s</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--STRIP = strip</span><br><span style="color: hsl(0, 100%, 40%);">--STRIPFLAGS = --strip-all --remove-section=.note --remove-section=.comment</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--OBJ =</span><br><span style="color: hsl(0, 100%, 40%);">--SRC = $(OBJ:%.o=%.c)</span><br><span style="color: hsl(0, 100%, 40%);">--PRG =</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--all: #$(PRG)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--$(PRG): $(OBJ)</span><br><span style="color: hsl(0, 100%, 40%);">-- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--clean:</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -rf tint</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -f *~ $(OBJ) $(PRG) *.substvars *.debhelper</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--.PHONY: all clean</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/menu tint/debian/menu</span><br><span>---- tint-0.03b/debian/menu 2002-03-16 18:31:13.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/menu 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--?package(tint):needs="text" section="Games/Tetris-like" \</span><br><span style="color: hsl(0, 100%, 40%);">-- title="TINT Is Not Tetris(tm)" \</span><br><span style="color: hsl(0, 100%, 40%);">-- command="sh -c '/usr/games/tint -l 5;echo;echo PRESS ENTER;read line'" \</span><br><span style="color: hsl(0, 100%, 40%);">-- hints="Text"</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/postinst tint/debian/postinst</span><br><span>---- tint-0.03b/debian/postinst 2002-03-16 18:44:34.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/postinst 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--#!/bin/sh -e</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--scorefile="/var/games/tint.scores"</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--if [ ! -e $scorefile ]</span><br><span style="color: hsl(0, 100%, 40%);">--then</span><br><span style="color: hsl(0, 100%, 40%);">-- touch $scorefile</span><br><span style="color: hsl(0, 100%, 40%);">-- chmod 0664 $scorefile</span><br><span style="color: hsl(0, 100%, 40%);">-- chown root:games $scorefile</span><br><span style="color: hsl(0, 100%, 40%);">--fi</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#DEBHELPER#</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/postinst.c tint/debian/postinst.c</span><br><span>---- tint-0.03b/debian/postinst.c 2002-03-16 18:15:32.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/postinst.c 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,143 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/*</span><br><span style="color: hsl(0, 100%, 40%);">-- * Hacked up postinst program to install the default score file. We have to do it this</span><br><span style="color: hsl(0, 100%, 40%);">-- * way, since the old score file is overwritten if the score file already exists in the</span><br><span style="color: hsl(0, 100%, 40%);">-- * package - abz</span><br><span style="color: hsl(0, 100%, 40%);">-- */</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#include <sys/types.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <sys/stat.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <fcntl.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <pwd.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <grp.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <inttypes.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <stdlib.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <stdio.h></span><br><span style="color: hsl(0, 100%, 40%);">--#include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/* location of score file */</span><br><span style="color: hsl(0, 100%, 40%);">--static const char filename[] = "/var/games/tint.scores";</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/* user name of default score file */</span><br><span style="color: hsl(0, 100%, 40%);">--static const char user[] = "root";</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/* group name of default score file */</span><br><span style="color: hsl(0, 100%, 40%);">--static const char group[] = "games";</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/* contents of default score file */</span><br><span style="color: hsl(0, 100%, 40%);">--static const uint8_t contents[] =</span><br><span style="color: hsl(0, 100%, 40%);">--{</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x54, 0x69, 0x6e, 0x74, 0x20, 0x30, 0x2e, 0x30,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x32, 0x62, 0x20, 0x28, 0x63, 0x29, 0x20, 0x41,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x62, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x20, 0x76,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x64, 0x20, 0x4d, 0x65, 0x72, 0x77, 0x65, 0x20,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x2d, 0x20, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x73,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x74, 0x00, 0x10, 0x5f, 0x00, 0x00, 0xb7, 0xc8,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x20, 0x3c, 0x41, 0x62, 0x7a, 0x00, 0x80, 0x3a,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x00, 0x00, 0x94, 0xc5, 0x20, 0x3c, 0x52, 0x69,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x65,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68, 0x74, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x66, 0x21, 0x00, 0x00, 0x31, 0xc9, 0x20, 0x3c,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x74, 0x00, 0xdc, 0x1a, 0x00, 0x00, 0x79, 0xc6,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x20, 0x3c, 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x45, 0x6e, 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x63, 0x68, 0x74, 0x00, 0x2f, 0x16, 0x00, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0xf9, 0xc5, 0x20, 0x3c, 0x52, 0x69, 0x61, 0x61,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x65, 0x6c, 0x62,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x72, 0x65, 0x63, 0x68, 0x74, 0x00, 0x8b, 0x11,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x00, 0x00, 0x82, 0xc7, 0x20, 0x3c, 0x41, 0x62,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x7a, 0x00, 0x23, 0x10, 0x00, 0x00, 0xa9, 0xc9,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x20, 0x3c, 0x44, 0x6f, 0x70, 0x70, 0x65, 0x6c,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x67, 0x61, 0x6e, 0x67, 0x65, 0x72, 0x00, 0x13,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x0b, 0x00, 0x00, 0x21, 0xc7, 0x20, 0x3c, 0x4a,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x6f, 0x68, 0x61, 0x6e, 0x6e, 0x20, 0x42, 0x6f,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0x74, 0x68, 0x61, 0x00, 0x5a, 0x09, 0x00, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0xef, 0xc6, 0x20, 0x3c, 0x41, 0x62, 0x7a, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-- 0xd7, 0x07, 0x00, 0x00, 0xad, 0xc6, 0x20, 0x3c</span><br><span style="color: hsl(0, 100%, 40%);">--};</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--static void debhelper_stuff()</span><br><span style="color: hsl(0, 100%, 40%);">--{</span><br><span style="color: hsl(0, 100%, 40%);">-- /* dh_installdocs */</span><br><span style="color: hsl(0, 100%, 40%);">-- system ("if [ -d /usr/doc -a ! -e /usr/doc/tint -a -d /usr/share/doc/tint ]; then\n"</span><br><span style="color: hsl(0, 100%, 40%);">-- " ln -sf ../share/doc/tint /usr/doc/tint\n"</span><br><span style="color: hsl(0, 100%, 40%);">-- "fi\n");</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- /* dh_installmenu */</span><br><span style="color: hsl(0, 100%, 40%);">-- system ("if [ -x /usr/bin/update-menus ]; then update-menus ; fi");</span><br><span style="color: hsl(0, 100%, 40%);">--}</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--int main (int argc,char *argv[])</span><br><span style="color: hsl(0, 100%, 40%);">--{</span><br><span style="color: hsl(0, 100%, 40%);">-- struct stat sb;</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- /* we only do something if we're called as <program> configure ... */</span><br><span style="color: hsl(0, 100%, 40%);">-- if (argc < 2 || strcmp (argv[1],"configure")) exit (EXIT_SUCCESS);</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- /* if the score file doesn't exist, create it */</span><br><span style="color: hsl(0, 100%, 40%);">-- if (stat (filename,&sb) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-- {</span><br><span style="color: hsl(0, 100%, 40%);">-- int fd,result;</span><br><span style="color: hsl(0, 100%, 40%);">-- struct passwd *u;</span><br><span style="color: hsl(0, 100%, 40%);">-- struct group *g;</span><br><span style="color: hsl(0, 100%, 40%);">-- uid_t uid;</span><br><span style="color: hsl(0, 100%, 40%);">-- gid_t gid;</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- /* get uid */</span><br><span style="color: hsl(0, 100%, 40%);">-- if ((u = getpwnam (user)) == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-- {</span><br><span style="color: hsl(0, 100%, 40%);">-- fprintf (stderr,"Couldn't obtain uid for %s: %m\n",user);</span><br><span style="color: hsl(0, 100%, 40%);">-- exit (EXIT_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">-- }</span><br><span style="color: hsl(0, 100%, 40%);">-- uid = u->pw_uid;</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- /* get gid */</span><br><span style="color: hsl(0, 100%, 40%);">-- if ((g = getgrnam (group)) == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-- {</span><br><span style="color: hsl(0, 100%, 40%);">-- fprintf (stderr,"Couldn't obtain gid for %s: %m\n",group);</span><br><span style="color: hsl(0, 100%, 40%);">-- exit (EXIT_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">-- }</span><br><span style="color: hsl(0, 100%, 40%);">-- gid = g->gr_gid;</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- /* create default score file */</span><br><span style="color: hsl(0, 100%, 40%);">-- if ((fd = creat (filename,0664)) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-- {</span><br><span style="color: hsl(0, 100%, 40%);">-- fprintf (stderr,"Couldn't create score file %s: %m\n",filename);</span><br><span style="color: hsl(0, 100%, 40%);">-- exit (EXIT_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">-- }</span><br><span style="color: hsl(0, 100%, 40%);">-- result = write (fd,contents,sizeof (contents));</span><br><span style="color: hsl(0, 100%, 40%);">-- if (result < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-- {</span><br><span style="color: hsl(0, 100%, 40%);">-- fprintf (stderr,"Unable to write to %s: %m\n",filename);</span><br><span style="color: hsl(0, 100%, 40%);">-- close (fd);</span><br><span style="color: hsl(0, 100%, 40%);">-- unlink (filename);</span><br><span style="color: hsl(0, 100%, 40%);">-- exit (EXIT_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">-- }</span><br><span style="color: hsl(0, 100%, 40%);">-- if (result < sizeof (contents))</span><br><span style="color: hsl(0, 100%, 40%);">-- {</span><br><span style="color: hsl(0, 100%, 40%);">-- fprintf (stderr,"Short write count. %d/%d bytes written to %s\n",result,sizeof (contents),filename);</span><br><span style="color: hsl(0, 100%, 40%);">-- close (fd);</span><br><span style="color: hsl(0, 100%, 40%);">-- unlink (filename);</span><br><span style="color: hsl(0, 100%, 40%);">-- exit (EXIT_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">-- }</span><br><span style="color: hsl(0, 100%, 40%);">-- close (fd);</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- /* change ownership of score file */</span><br><span style="color: hsl(0, 100%, 40%);">-- if (chown (filename,uid,gid) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-- {</span><br><span style="color: hsl(0, 100%, 40%);">-- fprintf (stderr,"Couldn't change ownership of %s to %s:%s: %m\n",filename,user,group);</span><br><span style="color: hsl(0, 100%, 40%);">-- unlink (filename);</span><br><span style="color: hsl(0, 100%, 40%);">-- exit (EXIT_FAILURE);</span><br><span style="color: hsl(0, 100%, 40%);">-- }</span><br><span style="color: hsl(0, 100%, 40%);">-- }</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- debhelper_stuff ();</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- exit (EXIT_SUCCESS);</span><br><span style="color: hsl(0, 100%, 40%);">--}</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/debian/rules tint/debian/rules</span><br><span>---- tint-0.03b/debian/rules 2002-03-16 18:00:11.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/debian/rules 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,82 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--#!/usr/bin/make -f</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--# -*- sh -*-</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--# Uncomment this to turn on verbose mode.</span><br><span style="color: hsl(0, 100%, 40%);">--export DH_VERBOSE=1</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--# This is the debhelper compatability version to use.</span><br><span style="color: hsl(0, 100%, 40%);">--export DH_COMPAT=3</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--configure: configure-stamp</span><br><span style="color: hsl(0, 100%, 40%);">--configure-stamp:</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testdir</span><br><span style="color: hsl(0, 100%, 40%);">-- # Add here commands to configure the package.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- touch configure-stamp</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--build: configure-stamp build-stamp</span><br><span style="color: hsl(0, 100%, 40%);">--build-stamp:</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testdir</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- # Add here commands to compile the package.</span><br><span style="color: hsl(0, 100%, 40%);">-- $(MAKE)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- touch build-stamp</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--clean:</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testdir</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testroot</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -f build-stamp configure-stamp</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- # Add here commands to clean up after the build process.</span><br><span style="color: hsl(0, 100%, 40%);">-- -$(MAKE) clean</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_clean</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--install: build</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testdir</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testroot</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_clean -k</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_installdirs</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- # Add here commands to install the package into debian/tint.</span><br><span style="color: hsl(0, 100%, 40%);">-- $(MAKE) install DESTDIR=$(CURDIR)/debian/tint</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--# Build architecture-independent files here.</span><br><span style="color: hsl(0, 100%, 40%);">--binary-indep: build install</span><br><span style="color: hsl(0, 100%, 40%);">--# We have nothing to do by default.</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--# Build architecture-dependent files here.</span><br><span style="color: hsl(0, 100%, 40%);">--binary-arch: build install</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testdir</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_testroot</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installdebconf</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_installdocs</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installexamples</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_installmenu</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installlogrotate</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installemacsen</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installpam</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installmime</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installinit</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installcron</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_installman</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_installinfo</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_undocumented</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_installchangelogs</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_link</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_strip</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_compress</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_fixperms --exclude /usr/games/tint</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_makeshlibs</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_installdeb</span><br><span style="color: hsl(0, 100%, 40%);">--# dh_perl</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_shlibdeps</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_gencontrol</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_md5sums</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_builddeb</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--binary: binary-indep binary-arch</span><br><span style="color: hsl(0, 100%, 40%);">--.PHONY: build clean binary-indep binary-arch binary install configure</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/engine.c tint/engine.c</span><br><span>---- tint-0.03b/engine.c 2005-07-17 13:26:22.000000000 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/engine.c 2016-05-27 19:05:21.681035752 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/engine.c tint/engine.c</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/engine.c 2005-07-17 13:26:22.000000000 +0200</span><br><span>++++ tint/engine.c 2018-02-23 12:00:00.000000000 +0200</span><br><span> @@ -27,10 +27,13 @@</span><br><span> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span> */</span><br><span>@@ -465,9 +35,9 @@</span><br><span> #include "utils.h"</span><br><span> #include "io.h"</span><br><span> #include "engine.h"</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/engine.h tint/engine.h</span><br><span>---- tint-0.03b/engine.h 2001-12-07 16:48:08.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/engine.h 2016-05-27 19:04:32.456828081 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/engine.h tint/engine.h</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/engine.h 2001-12-07 16:48:08.000000000 +0100</span><br><span>++++ tint/engine.h 2018-02-23 12:00:00.000000000 +0200</span><br><span> @@ -29,7 +29,7 @@</span><br><span> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span> */</span><br><span>@@ -477,9 +47,9 @@</span><br><span> </span><br><span> /*</span><br><span> * Macros</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/io.c tint/io.c</span><br><span>---- tint-0.03b/io.c 2001-12-07 16:48:20.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/io.c 2016-05-27 14:47:15.798402053 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/io.c tint/io.c</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/io.c 2010-06-23 15:05:12.000000000 +0100</span><br><span>++++ tint/io.c 2018-02-23 12:00:00.000000000 +0200</span><br><span> @@ -27,9 +27,13 @@</span><br><span> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span> */</span><br><span>@@ -492,9 +62,9 @@</span><br><span> #include <unistd.h> /* gettimeofday() */</span><br><span> +#endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- #include <curses.h></span><br><span style="color: hsl(120, 100%, 40%);">+ #include "io.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-@@ -70,7 +74,11 @@ static int in_timeleft;</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -68,7 +72,11 @@ static int in_timeleft;</span><br><span> /* Initialize screen */</span><br><span> void io_init ()</span><br><span> {</span><br><span>@@ -506,7 +76,7 @@</span><br><span> start_color ();</span><br><span> curs_set (CURSOR_INVISIBLE);</span><br><span> out_attr = A_NORMAL;</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -176,11 +184,17 @@ void out_beep ()</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -177,11 +185,17 @@ void out_beep ()</span><br><span> /* Read a character. Please note that you MUST call in_timeout() before in_getch() */</span><br><span> int in_getch ()</span><br><span> {</span><br><span>@@ -524,7 +94,7 @@</span><br><span> gettimeofday (&endtv,NULL);</span><br><span> /* Timeout? */</span><br><span> if (ch == ERR)</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -198,6 +212,7 @@ int in_getch ()</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -199,6 +213,7 @@ int in_getch ()</span><br><span> in_timeleft -= endtv.tv_usec;</span><br><span> if (in_timeleft <= 0) in_timeleft = in_timetotal;</span><br><span> }</span><br><span>@@ -532,26 +102,55 @@</span><br><span> return ch;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/Makefile tint/Makefile</span><br><span>---- tint-0.03b/Makefile 2005-07-17 13:30:54.000000000 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/Makefile 2016-05-27 21:04:02.374391088 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -28,85 +28,79 @@</span><br><span style="color: hsl(0, 100%, 40%);">- # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</span><br><span style="color: hsl(0, 100%, 40%);">- # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">--#CROSS = arm-linux-</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/io.h tint/io.h</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/io.h 2010-06-23 14:55:03.000000000 +0100</span><br><span>++++ tint/io.h 2018-02-23 12:00:00.000000000 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -29,9 +29,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">--bindir = $(DESTDIR)/usr/games</span><br><span style="color: hsl(0, 100%, 40%);">--mandir = $(DESTDIR)/usr/share/man</span><br><span style="color: hsl(0, 100%, 40%);">--localstatedir = $(DESTDIR)/var/games</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">+ #include <curses.h></span><br><span style="color: hsl(120, 100%, 40%);">+-#include <wchar.h></span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">--ifeq ($(CC),)</span><br><span style="color: hsl(0, 100%, 40%);">--CC = gcc</span><br><span style="color: hsl(0, 100%, 40%);">--else</span><br><span style="color: hsl(0, 100%, 40%);">--ifeq ($(CC),colorgcc)</span><br><span style="color: hsl(0, 100%, 40%);">-- ifneq ($(CROSS),)</span><br><span style="color: hsl(0, 100%, 40%);">-- CC = gcc</span><br><span style="color: hsl(0, 100%, 40%);">-- endif</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Colors</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/Makefile tint/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/Makefile 2010-06-23 15:06:11.000000000 +0200</span><br><span>++++ tint/Makefile 2018-02-23 12:00:00.000000000 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -1,0 +1,106 @@</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">++# -*- sh -*-</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">++# Copyright (c) Abraham vd Merwe <abz@blio.net></span><br><span style="color: hsl(120, 100%, 40%);">++# All rights reserved.</span><br><span style="color: hsl(120, 100%, 40%);">++#</span><br><span style="color: hsl(120, 100%, 40%);">++# Redistribution and use in source and binary forms, with or without</span><br><span style="color: hsl(120, 100%, 40%);">++# modification, are permitted provided that the following conditions</span><br><span style="color: hsl(120, 100%, 40%);">++# are met:</span><br><span style="color: hsl(120, 100%, 40%);">++# 1. Redistributions of source code must retain the above copyright</span><br><span style="color: hsl(120, 100%, 40%);">++# notice, this list of conditions and the following disclaimer.</span><br><span style="color: hsl(120, 100%, 40%);">++#</span><br><span style="color: hsl(120, 100%, 40%);">++# 2. Redistributions in binary form must reproduce the above copyright</span><br><span style="color: hsl(120, 100%, 40%);">++# notice, this list of conditions and the following disclaimer in the</span><br><span style="color: hsl(120, 100%, 40%);">++# documentation and/or other materials provided with the distribution.</span><br><span style="color: hsl(120, 100%, 40%);">++# 3. Neither the name of the author nor the names of other contributors</span><br><span style="color: hsl(120, 100%, 40%);">++# may be used to endorse or promote products derived from this software</span><br><span style="color: hsl(120, 100%, 40%);">++# without specific prior written permission.</span><br><span style="color: hsl(120, 100%, 40%);">++#</span><br><span style="color: hsl(120, 100%, 40%);">++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</span><br><span style="color: hsl(120, 100%, 40%);">++# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,</span><br><span style="color: hsl(120, 100%, 40%);">++# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</span><br><span style="color: hsl(120, 100%, 40%);">++# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</span><br><span style="color: hsl(120, 100%, 40%);">++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</span><br><span style="color: hsl(120, 100%, 40%);">++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</span><br><span style="color: hsl(120, 100%, 40%);">++# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER</span><br><span style="color: hsl(120, 100%, 40%);">++# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</span><br><span style="color: hsl(120, 100%, 40%);">++# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</span><br><span style="color: hsl(120, 100%, 40%);">++# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span> +# in addition to the dependency below, create the file if it doesn't exist</span><br><span> +# to silence warnings about a file that would be generated anyway.</span><br><span> +$(if $(wildcard .xcompile),,$(eval $(shell ../../../../util/xcompile/xcompile $(XGCCPATH) > .xcompile || rm -f .xcompile)))</span><br><span>@@ -588,32 +187,8 @@</span><br><span> +# Make is silent per default, but 'make V=1' will show all compiler calls.</span><br><span> +ifneq ($(V),1)</span><br><span> +Q := @</span><br><span style="color: hsl(0, 100%, 40%);">- endif</span><br><span style="color: hsl(0, 100%, 40%);">--endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--CFLAGS = -Wall -Os -pipe</span><br><span style="color: hsl(0, 100%, 40%);">--CPPFLAGS = -DSCOREFILE=\"$(localstatedir)/$(PRG).scores\" #-DUSE_RAND</span><br><span style="color: hsl(0, 100%, 40%);">--LDFLAGS = -s</span><br><span style="color: hsl(0, 100%, 40%);">--LDLIBS = -lncurses</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--STRIP = strip</span><br><span style="color: hsl(0, 100%, 40%);">--STRIPFLAGS = --strip-all --remove-section=.note --remove-section=.comment</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--INSTALL = install</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--OBJ = engine.o utils.o io.o tint.o</span><br><span style="color: hsl(0, 100%, 40%);">--SRC = $(OBJ:%.o=%.c)</span><br><span style="color: hsl(0, 100%, 40%);">--PRG = tint</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">-- ########### NOTHING TO EDIT BELOW THIS ###########</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--.PHONY: all clean do-it-all depend with-depends without-depends debian postinst</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--all: do-it-all postinst</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">--ifeq (.depends,$(wildcard .depends))</span><br><span style="color: hsl(0, 100%, 40%);">--include .depends</span><br><span style="color: hsl(0, 100%, 40%);">--do-it-all: with-depends</span><br><span style="color: hsl(120, 100%, 40%);">++endif</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span> +all: $(TARGET).elf</span><br><span> +# printf" CC $(CC)\n"</span><br><span> +</span><br><span>@@ -635,63 +210,26 @@</span><br><span> +ifneq ($(strip $(HAVE_LIBPAYLOAD)),)</span><br><span> +libpayload:</span><br><span> + $(Q)printf "Found Libpayload $(LIBPAYLOAD_DIR).\n"</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">--do-it-all: without-depends</span><br><span style="color: hsl(0, 100%, 40%);">--endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--without-depends: depend with-depends</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--depend:</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -f .depends</span><br><span style="color: hsl(0, 100%, 40%);">-- set -e; for F in $(SRC); do $(CC) -MM $(CFLAGS) $(CPPFLAGS) $$F >> .depends; done</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--with-depends: $(PRG)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--$(PRG): $(OBJ)</span><br><span style="color: hsl(0, 100%, 40%);">-- $(CROSS)$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)</span><br><span style="color: hsl(0, 100%, 40%);">-- $(CROSS)$(STRIP) $(STRIPFLAGS) $@</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--ifneq ($(DESTDIR),)</span><br><span style="color: hsl(0, 100%, 40%);">--install: $(PRG)</span><br><span style="color: hsl(0, 100%, 40%);">-- $(INSTALL) -d $(bindir) $(mandir) $(localstatedir)</span><br><span style="color: hsl(0, 100%, 40%);">-- $(INSTALL) -s -g games -o root -m 2755 $(PRG) $(bindir)</span><br><span style="color: hsl(0, 100%, 40%);">-- $(INSTALL) -g games -o root -m 0644 $(PRG).6 $(mandir)/man6</span><br><span style="color: hsl(0, 100%, 40%);">--# cp tint.scores $(localstatedir)/$(PRG).scores</span><br><span style="color: hsl(0, 100%, 40%);">--# chown root.games $(localstatedir)/$(PRG).scores</span><br><span style="color: hsl(0, 100%, 40%);">--# chmod 0664 $(localstatedir)/$(PRG).scores</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--uninstall:</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -f $(bindir)/$(PRG) $(mandir)/man6/$(PRG).6 $(localstatedir)/$(PRG).scores</span><br><span style="color: hsl(120, 100%, 40%);">++else</span><br><span> +libpayload:</span><br><span> + $(Q)printf "Building libpayload @ $(LIBCONFIG_PATH).\n"</span><br><span> + $(Q)make -C $(LIBCONFIG_PATH) distclean</span><br><span> + $(Q)make -C $(LIBCONFIG_PATH) defconfig KBUILD_DEFCONFIG=$(LIB_CONFIG)</span><br><span> + $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(tint_obj) install</span><br><span style="color: hsl(0, 100%, 40%);">- endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">--postinst:</span><br><span style="color: hsl(0, 100%, 40%);">-- $(MAKE) -C debian</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--debian:</span><br><span style="color: hsl(0, 100%, 40%);">-- dpkg-buildpackage -rfakeroot -k2B555AEE</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">- clean:</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -f .depends *~ $(OBJ) $(PRG) {configure,build}-stamp gmon.out a.out</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -rf debian/$(PRG)</span><br><span style="color: hsl(0, 100%, 40%);">-- rm -f debian/*.{debhelper,substvars} debian/files debian/*~</span><br><span style="color: hsl(120, 100%, 40%);">++endif</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">++clean:</span><br><span> + $(Q)rm -f $(TARGET).elf $(TARGET).debug *.o</span><br><span> + $(Q)rm .xcompile</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- distclean: clean</span><br><span style="color: hsl(0, 100%, 40%);">-- $(MAKE) -C debian clean</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">++distclean: clean</span><br><span> + $(Q)rm -rf $(tint_obj)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span> +</span><br><span> +.PHONY: all clean do-it-all depend with-depends without-depends debian postinst</span><br><span style="color: hsl(0, 100%, 40%);">-Binary files tint-0.03b/.Makefile.swp and tint/.Makefile.swp differ</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/tint.c tint/tint.c</span><br><span>---- tint-0.03b/tint.c 2005-07-17 13:26:43.000000000 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/tint.c 2016-05-27 18:59:53.838346317 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/tint.c tint/tint.c</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/tint.c 2010-08-08 19:42:50.000000000 +0200</span><br><span>++++ tint/tint.c 2018-02-23 12:00:00.000000000 +0200</span><br><span> @@ -1,4 +1,3 @@</span><br><span> -</span><br><span> /*</span><br><span>@@ -715,7 +253,14 @@</span><br><span> #include "utils.h"</span><br><span> #include "io.h"</span><br><span> #include "config.h"</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -321,6 +321,7 @@ typedef struct</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -306,4 +306,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Header for scorefile */</span><br><span style="color: hsl(120, 100%, 40%);">+-#define SCORE_HEADER "Tint 0.02b (c) Abraham vd Merwe - Scores"</span><br><span style="color: hsl(120, 100%, 40%);">++#define SCORE_HEADER "Tint 0.04+nmu1 (c) Abraham vd Merwe - Scores"</span><br><span style="color: hsl(120, 100%, 40%);">+-</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Header for score title */</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -322,6 +322,7 @@ typedef struct</span><br><span> time_t timestamp;</span><br><span> } score_t;</span><br><span> </span><br><span>@@ -723,7 +268,7 @@</span><br><span> static void getname (char *name)</span><br><span> {</span><br><span> struct passwd *pw = getpwuid (geteuid ());</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -337,7 +338,9 @@ static void getname (char *name)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -338,7 +339,9 @@ static void getname (char *name)</span><br><span> name[NAMELEN - 1] = '\0';</span><br><span> }</span><br><span> }</span><br><span>@@ -733,7 +278,7 @@</span><br><span> static void err1 ()</span><br><span> {</span><br><span> fprintf (stderr,"Error creating %s\n",scorefile);</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -349,10 +352,11 @@ static void err2 ()</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -350,10 +353,11 @@ static void err2 ()</span><br><span> fprintf (stderr,"Error writing to %s\n",scorefile);</span><br><span> exit (EXIT_FAILURE);</span><br><span> }</span><br><span>@@ -746,7 +291,7 @@</span><br><span> "\n\t PLAYER STATISTICS\n\n\t"</span><br><span> "Score %11d\n\t"</span><br><span> "Efficiency %11d\n\t"</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -360,6 +364,7 @@ void showplayerstats (engine_t *engine)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -361,6 +365,7 @@ void showplayerstats (engine_t *engine)</span><br><span> GETSCORE (engine->score),engine->status.efficiency,GETSCORE (engine->score) / getsum ());</span><br><span> }</span><br><span> </span><br><span>@@ -754,7 +299,7 @@</span><br><span> static void createscores (int score)</span><br><span> {</span><br><span> FILE *handle;</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -394,7 +399,9 @@ static void createscores (int score)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -395,7 +400,9 @@ static void createscores (int score)</span><br><span> fprintf (stderr,"%s",scoretitle);</span><br><span> fprintf (stderr,"\t 1* %7d %s\n\n",score,scores[0].name);</span><br><span> }</span><br><span>@@ -764,7 +309,7 @@</span><br><span> static int cmpscores (const void *a,const void *b)</span><br><span> {</span><br><span> int result;</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -412,7 +419,9 @@ static int cmpscores (const void *a,cons</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -413,7 +420,9 @@ static int cmpscores (const void *a,cons</span><br><span> /* timestamps is equal */</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -774,7 +319,7 @@</span><br><span> static void savescores (int score)</span><br><span> {</span><br><span> FILE *handle;</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -490,11 +499,13 @@ static void savescores (int score)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -491,11 +500,13 @@ static void savescores (int score)</span><br><span> }</span><br><span> fprintf (stderr,"\n");</span><br><span> }</span><br><span>@@ -787,9 +332,9 @@</span><br><span> +#if 0</span><br><span> static void showhelp ()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf (stderr,"USAGE: tint [-h] [-l level] [-n]\n");</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -504,9 +515,11 @@ static void showhelp ()</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf (stderr," -d Draw vertical dotted lines\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf (stderr,"USAGE: tint [-h] [-l level] [-n] [-d] [-b char]\n");</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -506,9 +517,11 @@ static void showhelp ()</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf (stderr," -b <char> Use this character to draw blocks instead of spaces\n");</span><br><span> exit (EXIT_FAILURE);</span><br><span> }</span><br><span> +#endif</span><br><span>@@ -800,7 +345,7 @@</span><br><span> int i = 1;</span><br><span> while (i < argc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -536,10 +549,12 @@ static void parse_options (int argc,char</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -544,10 +557,12 @@ static void parse_options (int argc,char</span><br><span> }</span><br><span> i++;</span><br><span> }</span><br><span>@@ -813,7 +358,7 @@</span><br><span> char buf[NAMELEN];</span><br><span> </span><br><span> do</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -549,6 +564,8 @@ static void choose_level ()</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -557,6 +572,8 @@ static void choose_level ()</span><br><span> buf[strlen (buf) - 1] = '\0';</span><br><span> }</span><br><span> while (!str2int (&level,buf) || level < MINLEVEL || level > MAXLEVEL);</span><br><span>@@ -822,7 +367,7 @@</span><br><span> }</span><br><span> </span><br><span> /***************************************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -561,6 +578,8 @@ int main (int argc,char *argv[])</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -569,6 +586,8 @@ int main (int argc,char *argv[])</span><br><span> int ch;</span><br><span> engine_t engine;</span><br><span> /* Initialize */</span><br><span>@@ -831,14 +376,19 @@</span><br><span> rand_init (); /* must be called before engine_init () */</span><br><span> engine_init (&engine,score_function); /* must be called before using engine.curshape */</span><br><span> finished = shownext = FALSE;</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -663,8 +682,15 @@</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -673,11 +692,20 @@ int main (int argc,char *argv[])</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Restore console settings and exit */</span><br><span style="color: hsl(120, 100%, 40%);">+ io_close ();</span><br><span style="color: hsl(120, 100%, 40%);">++#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Don't bother the player if he want's to quit */</span><br><span> if (ch != 'q')</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">++#endif</span><br><span> showplayerstats (&engine);</span><br><span> +#if 0</span><br><span> savescores (GETSCORE (engine.score));</span><br><span style="color: hsl(0, 100%, 40%);">-+#endif</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">++#endif</span><br><span> + printf("Bye.\n");</span><br><span> + refresh();</span><br><span> + for(;;); //halt();</span><br><span>@@ -847,81 +397,9 @@</span><br><span> +#endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/typedefs.h tint/typedefs.h</span><br><span>---- tint-0.03b/typedefs.h 2001-12-07 16:49:06.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/typedefs.h 1970-01-01 01:00:00.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1,68 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">--#ifndef TYPEDEFS_H</span><br><span style="color: hsl(0, 100%, 40%);">--#define TYPEDEFS_H</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/*</span><br><span style="color: hsl(0, 100%, 40%);">-- * Copyright (c) Abraham vd Merwe <abz@blio.net></span><br><span style="color: hsl(0, 100%, 40%);">-- * All rights reserved.</span><br><span style="color: hsl(0, 100%, 40%);">-- *</span><br><span style="color: hsl(0, 100%, 40%);">-- * Redistribution and use in source and binary forms, with or without</span><br><span style="color: hsl(0, 100%, 40%);">-- * modification, are permitted provided that the following conditions</span><br><span style="color: hsl(0, 100%, 40%);">-- * are met:</span><br><span style="color: hsl(0, 100%, 40%);">-- * 1. Redistributions of source code must retain the above copyright</span><br><span style="color: hsl(0, 100%, 40%);">-- * notice, this list of conditions and the following disclaimer.</span><br><span style="color: hsl(0, 100%, 40%);">-- * 2. Redistributions in binary form must reproduce the above copyright</span><br><span style="color: hsl(0, 100%, 40%);">-- * notice, this list of conditions and the following disclaimer in the</span><br><span style="color: hsl(0, 100%, 40%);">-- * documentation and/or other materials provided with the distribution.</span><br><span style="color: hsl(0, 100%, 40%);">-- * 3. Neither the name of the author nor the names of other contributors</span><br><span style="color: hsl(0, 100%, 40%);">-- * may be used to endorse or promote products derived from this software</span><br><span style="color: hsl(0, 100%, 40%);">-- * without specific prior written permission.</span><br><span style="color: hsl(0, 100%, 40%);">-- *</span><br><span style="color: hsl(0, 100%, 40%);">-- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</span><br><span style="color: hsl(0, 100%, 40%);">-- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,</span><br><span style="color: hsl(0, 100%, 40%);">-- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</span><br><span style="color: hsl(0, 100%, 40%);">-- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</span><br><span style="color: hsl(0, 100%, 40%);">-- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</span><br><span style="color: hsl(0, 100%, 40%);">-- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</span><br><span style="color: hsl(0, 100%, 40%);">-- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER</span><br><span style="color: hsl(0, 100%, 40%);">-- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,</span><br><span style="color: hsl(0, 100%, 40%);">-- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</span><br><span style="color: hsl(0, 100%, 40%);">-- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span style="color: hsl(0, 100%, 40%);">-- */</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/*</span><br><span style="color: hsl(0, 100%, 40%);">-- * Boolean definitions</span><br><span style="color: hsl(0, 100%, 40%);">-- */</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#ifndef bool</span><br><span style="color: hsl(0, 100%, 40%);">--#define bool int</span><br><span style="color: hsl(0, 100%, 40%);">--#endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#if !defined(false) || (false != 0)</span><br><span style="color: hsl(0, 100%, 40%);">--#define false 0</span><br><span style="color: hsl(0, 100%, 40%);">--#endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#if !defined(true) || (true != 0)</span><br><span style="color: hsl(0, 100%, 40%);">--#define true 1</span><br><span style="color: hsl(0, 100%, 40%);">--#endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#if !defined(FALSE) || (FALSE != false)</span><br><span style="color: hsl(0, 100%, 40%);">--#define FALSE false</span><br><span style="color: hsl(0, 100%, 40%);">--#endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#if !defined(TRUE) || (TRUE != true)</span><br><span style="color: hsl(0, 100%, 40%);">--#define TRUE true</span><br><span style="color: hsl(0, 100%, 40%);">--#endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--/*</span><br><span style="color: hsl(0, 100%, 40%);">-- * Error flags</span><br><span style="color: hsl(0, 100%, 40%);">-- */</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#if !defined(ERR) || (ERR != -1)</span><br><span style="color: hsl(0, 100%, 40%);">--#define ERR -1</span><br><span style="color: hsl(0, 100%, 40%);">--#endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#if !defined(OK) || (OK != 0)</span><br><span style="color: hsl(0, 100%, 40%);">--#define OK 0</span><br><span style="color: hsl(0, 100%, 40%);">--#endif</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(0, 100%, 40%);">--#endif /* #ifndef TYPEDEFS_H */</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/utils.c tint/utils.c</span><br><span>---- tint-0.03b/utils.c 2001-12-07 16:49:19.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/utils.c 2016-05-27 19:05:40.313351887 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/utils.c tint/utils.c</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/utils.c 2001-12-07 16:49:19.000000000 +0100</span><br><span>++++ tint/utils.c 2018-02-23 12:00:00.000000000 +0200</span><br><span> @@ -27,11 +27,13 @@</span><br><span> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span> */</span><br><span>@@ -951,9 +429,9 @@</span><br><span> }</span><br><span> </span><br><span> +#endif</span><br><span style="color: hsl(0, 100%, 40%);">-diff -rupN tint-0.03b/utils.h tint/utils.h</span><br><span>---- tint-0.03b/utils.h 2001-12-07 16:49:35.000000000 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-+++ tint/utils.h 2016-05-27 19:00:34.120754123 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+diff -rupN tint-0.04+nmu1/utils.h tint/utils.h</span><br><span style="color: hsl(120, 100%, 40%);">+--- tint-0.04+nmu1/utils.h 2001-12-07 16:49:35.000000000 +0100</span><br><span>++++ tint/utils.h 2018-02-23 12:00:00.000000000 +0200</span><br><span> @@ -29,7 +29,7 @@</span><br><span> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span><br><span> */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23852">change 23852</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23852"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I22e65d18a0b1551f7049c4afe7f95868f584cf9b </div>
<div style="display:none"> Gerrit-Change-Number: 23852 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Mike Banon <mikebdp2@gmail.com> </div>