Hello community, here is the log from the commit of package wumpus for openSUSE:Leap:15.2 checked in at 2020-04-05 17:07:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/wumpus (Old) and /work/SRC/openSUSE:Leap:15.2/.wumpus.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wumpus" Sun Apr 5 17:07:17 2020 rev:10 rq:789989 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/wumpus/wumpus.changes 2020-01-15 16:29:35.824793116 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.wumpus.new.3248/wumpus.changes 2020-04-05 17:07:25.658236196 +0200 @@ -1,0 +2,12 @@ +Fri Mar 27 21:55:04 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 1.7: + * license change from BSD-3-Clause to BSD-2-Clause + * Minor bug fix for suprhack + * Added a logo and a historical note about it +- Run spec-cleaner +- Update wumpus-Makefile.patch +- Drop wumpus-superhack.c.patch, merged upstream. +- Drop wumpus-wumpus.c.patch, merged upstream. + +------------------------------------------------------------------- Old: ---- wumpus-1.6.tar.gz wumpus-superhack.c.patch wumpus-wumpus.c.patch New: ---- wumpus-1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wumpus.spec ++++++ --- /var/tmp/diff_new_pack.mzdUbl/_old 2020-04-05 17:07:26.194236767 +0200 +++ /var/tmp/diff_new_pack.mzdUbl/_new 2020-04-05 17:07:26.194236767 +0200 @@ -1,7 +1,7 @@ # # spec file for package wumpus # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define oname superhack - Name: wumpus -Version: 1.6 +Version: 1.7 Release: 0 Summary: Faithful transcription of the 1974 Atari Wumpus game -License: BSD-3-Clause +License: BSD-2-Clause Group: Amusements/Games/Action/Race -Url: http://www.catb.org/~esr/wumpus/ +URL: http://www.catb.org/~esr/wumpus/ Source0: http://www.catb.org/~esr/%{name}/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: %{name}.desktop @@ -32,16 +31,9 @@ Source4: %{name}.png # PATCH-FIX-UPSTREAM - wumpus-Makefile.patch -- Fix paths and installation Patch0: %{name}-Makefile.patch -# PATCH-FIX-UPSTREAM - wumpus-superhack.c.patch -- Fix bad C++ code -Patch1: %{name}-superhack.c.patch -# PATCH-FIX-UPSTREAM - wumpus-wumpus.c.patch -- Fix bad C++ code -Patch2: %{name}-wumpus.c.patch -%if 0%{?suse_version} BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files -%endif BuildRequires: ncurses-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: update-desktop-files %description WUMPUS is a bit of retrocomputing nostalgia. It is an *exact* clone, @@ -52,16 +44,14 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 - -cp -af %{S:2} . -cp -af %{S:3} . -cp -af %{S:4} . +%patch0 -p1 + +cp -af %{SOURCE2} . +cp -af %{SOURCE3} . +cp -af %{SOURCE4} . %build -make %{?_smp_mflags} CFLAGS="%{optflags}" +%make_build CFLAGS="%{optflags}" %install %make_install @@ -69,17 +59,16 @@ # Symlink Manpage ln -sf %{_mandir}/man6/%{name}.6%{ext_man} %{buildroot}%{_mandir}/man6/%{oname}.6%{ext_man} -%if 0%{?suse_version} - %suse_update_desktop_file %{name} -%endif +%suse_update_desktop_file %{name} +%suse_update_desktop_file %{oname} %files -%defattr(-,root,root,-) -%doc COPYING README +%license COPYING +%doc README %{_bindir}/%{name} %{_bindir}/%{oname} -%{_mandir}/man6/%{name}.6%{ext_man} -%{_mandir}/man6/%{oname}.6%{ext_man} +%{_mandir}/man6/%{name}.6%{?ext_man} +%{_mandir}/man6/%{oname}.6%{?ext_man} %dir %{_datadir}/appdata %{_datadir}/appdata/%{name}.xml %{_datadir}/applications/%{name}.desktop ++++++ wumpus-1.6.tar.gz -> wumpus-1.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/COPYING new/wumpus-1.7/COPYING --- old/wumpus-1.6/COPYING 2015-04-04 12:31:47.000000000 +0200 +++ new/wumpus-1.7/COPYING 2019-03-26 03:37:13.000000000 +0100 @@ -1,28 +1,27 @@ BSD LICENSE +Copyright (c) 2015, Eric S. Raymond +All rights reserved. + Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +modification, are permitted provided that the following conditions are +met: -Redistributions of source code must retain the above copyright +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither name of the this project nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/Makefile new/wumpus-1.7/Makefile --- old/wumpus-1.6/Makefile 2015-04-04 12:38:03.000000000 +0200 +++ new/wumpus-1.7/Makefile 2019-03-26 03:37:13.000000000 +0100 @@ -1,7 +1,11 @@ # # Makefile for `Hunt the Wumpus' and `Superhack' games # -VERS=1.6 +VERS=1.7 + +prefix?=/usr + +CFLAGS = -Wall all: wumpus superhack @@ -24,15 +28,17 @@ wumpus.html: wumpus.xml xmlto html-nochunks wumpus.xml -SOURCES = README COPYING NEWS Makefile wumpus.c superhack.c wumpus.xml +SOURCES = README COPYING NEWS control Makefile wumpus.c superhack.c wumpus.xml wumpus.png wumpus.desktop superhack.desktop -install: wumpus.6 - cp wumpus superhack /usr/bin/ - cp wumpus.6 /usr/share/man/man6/ +install: wumpus superhack wumpus.6 + mkdir -p $(prefix)/bin + mkdir -p $(prefix)/share/man/man6 + cp wumpus superhack $(prefix)/bin/ + cp wumpus.6 $(prefix)/share/man/man6/ uninstall: - rm /usr/bin/wumpus /usr/bin/superhack - rm /usr/share/man/man6/wumpus.6 + rm $(prefix)/bin/wumpus $(prefix)/bin/superhack + rm $(prefix)/share/man/man6/wumpus.6 CPPCHECKOPTS = cppcheck: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/NEWS new/wumpus-1.7/NEWS --- old/wumpus-1.6/NEWS 2015-04-04 12:35:15.000000000 +0200 +++ new/wumpus-1.7/NEWS 2019-03-26 03:37:13.000000000 +0100 @@ -1,16 +1,21 @@ - wumpus project news += wumpus project news = -1.6: 2015-04-04 +1.6: 2019-03-25:: + Added the logo and a historical note about it. + Minor bug fix for suprhack. + Change license from 3-clause BSD to 2-clause BSD and add SPDX tags. + +1.6: 2015-04-04:: Code audited with cppcheck. Changed to modern packaging. -1.5: 2011-03-09 +1.5: 2011-03-09:: Fixed a minor bug in the superhack starlet check. -1.4: 2010-10-21 +1.4: 2010-10-21:: Ported to modern C. License changed to BSD. -1.3: 2003-12-28 +1.3: 2003-12-28:: Changing the .spec file so that it installs under a build-root. Changes so that the RPM can be built as a non-root user. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/README new/wumpus-1.7/README --- old/wumpus-1.6/README 2015-04-04 12:31:47.000000000 +0200 +++ new/wumpus-1.7/README 2015-06-14 22:30:12.000000000 +0200 @@ -4,6 +4,9 @@ down to the godawful user interface, of an ancient classic game. This version fixes two minor bugs in my original USENET posting of the source. +One historical liberty has been taken; the logo of this project is from a +latter version on the TI-99/4A with a graphical interface. + SUPERHACK is a satire, structurally quite similar to WUMPUS. For updates and related resources, see http://www.catb.org/~esr/wumpus/. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/control new/wumpus-1.7/control --- old/wumpus-1.6/control 1970-01-01 01:00:00.000000000 +0100 +++ new/wumpus-1.7/control 2015-07-19 16:24:05.000000000 +0200 @@ -0,0 +1,22 @@ +# This is not a real Debian control file, though the syntax is compatible. +# It's project metadata for the shipper tool + +Package: wumpus + +Description: Exact clone of the ancient BASIC Hunt the Wumpus game + WUMPUS is a bit of retrocomputing nostalgia. It is an *exact* clone, even + down to the godawful user interface, of an ancient classic game. This version + fixes two minor bugs in my original USENET posting of the source. + +#XBS-Destinations: freshcode + +Homepage: http://www.catb.org/~esr/wumpus + +XBS-HTML-Target: index.html + +XBS-Repository-URL: https://gitlab.com/esr/wumpus + +XBS-Logo: wumpus.png + +XBS-VC-Tag-Template: %(version)s + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/superhack.c new/wumpus-1.7/superhack.c --- old/wumpus-1.6/superhack.c 2015-04-04 12:36:55.000000000 +0200 +++ new/wumpus-1.7/superhack.c 2019-03-26 03:37:13.000000000 +0100 @@ -8,16 +8,23 @@ * * Any resemblance to persons living or dead is strictly coincidental. And * if you believe *that*... + * + * SPDX-License-Identifier: BSD-2-Clause */ #include <stdio.h> #include <ctype.h> #include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <time.h> +#include <sys/socket.h> static int path[5]; static int j, k, scratchloc, pies; static char inp[BUFSIZ]; /* common input buffer */ +#define NUMBERS "0123456789" #define YOU 0 #define RMS 1 #define STARLET1 2 @@ -34,6 +41,8 @@ #define LOSE -1 static int finished; +#define IGNORE(r) do{if(r);}while(0) + static int cave[20][3] = { {1,4,7}, @@ -68,7 +77,7 @@ char *prompt; { (void) printf("%s? ", prompt); - if(fgets(inp, sizeof(inp), stdin)) + if (fgets(inp, sizeof(inp), stdin)) return(tolower(inp[0])); else { fputs("\n",stdout); @@ -80,8 +89,6 @@ void print_instructions() { - char ebuf[BUFSIZ]; - PM("Welcome to `Hunt the Superhack'\n") PM(" The superhack lives on the 9th floor of 45 Technology Square in"); @@ -104,7 +111,7 @@ PM(" If a pie hits the superhack, you win. If it hits you, you lose!\n"); (void) fputs("<Press return to continue>", stdout); - (void) fgets(inp, sizeof(inp), stdin); + IGNORE(fgets(inp, sizeof(inp), stdin)); (void) putchar('\n'); PM("Hazards:"); @@ -222,8 +229,9 @@ extern void check_shot(), move_superhack(); int j9; - j9 = sscanf(inp + isalpha(inp[0]), "%d %d %d %d %d", + j9 = sscanf(inp + strcspn(inp, NUMBERS), "%d %d %d %d %d", &path[0], &path[1], &path[2], &path[3], &path[4]); + if (j9 < 1) { PM("Sorry, I didn't see any room numbers after your throw command."); @@ -261,7 +269,6 @@ } - ammo: if (finished == NOT) { (void) puts("You missed."); @@ -309,7 +316,7 @@ void move() { - if (sscanf(inp + isalpha(inp[0]), "%d", &scratchloc) < 1) + if (sscanf(inp + strcspn(inp, NUMBERS), "%d", &scratchloc) < 1) { PM("Sorry, I didn't see a room number after your `m' command."); return; @@ -350,9 +357,7 @@ } } -main(argc, argv) -int argc; -char *argv[]; +int main(int argc, char *argv[]) { if (argc >= 2 && strcmp(argv[1], "-s") == 0) srand(atoi(argv[2])); @@ -423,6 +428,7 @@ break; } } + return 0; } /* superhack.c ends here */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/superhack.desktop new/wumpus-1.7/superhack.desktop --- old/wumpus-1.6/superhack.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/wumpus-1.7/superhack.desktop 2019-03-26 03:37:13.000000000 +0100 @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Superhack +GenericName=Wumpus satire +Comment=Superhack is a satire, structurally quite similar to Wumpus +Icon=wumpus +Exec=superhack +Type=Application +Categories=Game;StrategyGame; +Terminal=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/wumpus.c new/wumpus-1.7/wumpus.c --- old/wumpus-1.6/wumpus.c 2015-04-04 12:31:47.000000000 +0200 +++ new/wumpus-1.7/wumpus.c 2019-03-26 03:37:13.000000000 +0100 @@ -25,11 +25,17 @@ * * So, pretend for a little while that your workstation is an ASR-33 and * limber up your fingers for a trip to nostalgia-land... + * + * SPDX-License-Identifier: BSD-2-Clause */ #include <stdio.h> #include <ctype.h> #include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <time.h> +#include <sys/socket.h> /* 5 REM *** HUNT THE WUMPUS *** */ @@ -123,8 +129,6 @@ void print_instructions() { - char ebuf[BUFSIZ]; - /* 375 REM *** INSTRUCTIONS *** */ /* 380 PRINT "WELCOME TO 'HUNT THE WUMPUS'" */ puts("WELCOME TO 'HUNT THE WUMPUS'"); @@ -366,7 +370,6 @@ /* 840 NEXT K */ } -ammo: if (finished == NOT) { /* 845 PRINT "MISSED" */ @@ -521,7 +524,7 @@ } } -main(argc, argv) +int main(argc, argv) int argc; char *argv[]; { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wumpus-1.6/wumpus.desktop new/wumpus-1.7/wumpus.desktop --- old/wumpus-1.6/wumpus.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/wumpus-1.7/wumpus.desktop 2019-03-26 03:37:13.000000000 +0100 @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Wumpus +GenericName=Hunt the Wumpus +Comment=The classic game of Hunt the Wumpus +Icon=wumpus +Exec=wumpus +Type=Application +Categories=Game;StrategyGame; +Terminal=true Binary files old/wumpus-1.6/wumpus.png and new/wumpus-1.7/wumpus.png differ ++++++ wumpus-Makefile.patch ++++++ --- /var/tmp/diff_new_pack.mzdUbl/_old 2020-04-05 17:07:26.274236852 +0200 +++ /var/tmp/diff_new_pack.mzdUbl/_new 2020-04-05 17:07:26.274236852 +0200 @@ -1,11 +1,15 @@ ---- Makefile.orig 2015-04-04 12:38:03.000000000 +0200 -+++ Makefile 2015-06-08 20:36:13.445880866 +0200 -@@ -27,12 +27,25 @@ - SOURCES = README COPYING NEWS Makefile wumpus.c superhack.c wumpus.xml +diff --git a/Makefile b/Makefile +index ef8bddd..39b0a4d 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,14 +31,25 @@ wumpus.html: wumpus.xml + SOURCES = README COPYING NEWS control Makefile wumpus.c superhack.c wumpus.xml wumpus.png wumpus.desktop superhack.desktop - install: wumpus.6 -- cp wumpus superhack /usr/bin/ -- cp wumpus.6 /usr/share/man/man6/ + install: wumpus superhack wumpus.6 +- mkdir -p $(prefix)/bin +- mkdir -p $(prefix)/share/man/man6 +- cp wumpus superhack $(prefix)/bin/ +- cp wumpus.6 $(prefix)/share/man/man6/ + install -m 0755 -d $(DESTDIR)/usr/bin/ + install -m 0755 -d $(DESTDIR)/usr/share/man/man6/ + install -m 0755 -d $(DESTDIR)//usr/share/applications/ @@ -19,8 +23,8 @@ + install -m 0644 wumpus.xml $(DESTDIR)/usr/share/appdata/ uninstall: -- rm /usr/bin/wumpus /usr/bin/superhack -- rm /usr/share/man/man6/wumpus.6 +- rm $(prefix)/bin/wumpus $(prefix)/bin/superhack +- rm $(prefix)/share/man/man6/wumpus.6 + rm -f /usr/bin/superhack /usr/bin/wumpus + rm -f /usr/share/man/man6/wumpus.6 + rm -f /usr/share/applications/wumpus.desktop
