CVS commit: pkgsrc/misc/gkrellm-weather

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Aug 18 09:11:14 UTC 2025

Modified Files:
        pkgsrc/misc/gkrellm-weather: Makefile PLIST distinfo
        pkgsrc/misc/gkrellm-weather/patches: patch-aa
Added Files:
        pkgsrc/misc/gkrellm-weather/patches: patch-GrabWeather

Log Message:
misc/gkrellm-weather: Update to 2.0.8

pkgsrc changes:
    * Updated NOAA link to weather information [PR pkg/51463]
    * Removed HOMEPAGE and MASTER_SITES. The upstream has once moved to
      https://sites.google.com/site/makovick/gkrellm-plugins but it has
      disappeared again along with the original distfile. I took a backup
      tarball from Debian, audited it, and put it in LOCAL_PORTS.

upstream changes:
2.0.8
    * fixed sprintf buffer overflows


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/misc/gkrellm-weather/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/gkrellm-weather/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/gkrellm-weather/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/gkrellm-weather/patches/patch-GrabWeather
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/gkrellm-weather/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/gkrellm-weather/Makefile
diff -u pkgsrc/misc/gkrellm-weather/Makefile:1.101 pkgsrc/misc/gkrellm-weather/Makefile:1.102
--- pkgsrc/misc/gkrellm-weather/Makefile:1.101  Thu Apr 24 14:15:04 2025
+++ pkgsrc/misc/gkrellm-weather/Makefile        Mon Aug 18 09:11:14 2025
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.101 2025/04/24 14:15:04 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2025/08/18 09:11:14 pho Exp $
 
-DISTNAME=      gkrellweather-2.0.7
-PKGNAME=       gkrellm-weather-2.0.7
-PKGREVISION=   71
+DISTNAME=      gkrellweather-2.0.8
+PKGNAME=       ${DISTNAME:S/gkrellweather/gkrellm-weather/}
 CATEGORIES=    misc
-#MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
-EXTRACT_SUFX=  .tgz
+MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
 MAINTAINER=    tripledes%eslack.org@localhost
-#HOMEPAGE=     http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 COMMENT=       Gkrellm2 weather plugin
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      wget>=1.8:../../net/wget
+DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=      p5-LWP-Protocol-https-[0-9]*:../../www/p5-LWP-Protocol-https
 
 USE_TOOLS+=            gmake msgfmt perl:run pkg-config
 USE_PKGLOCALEDIR=      YES
@@ -20,13 +18,13 @@ REPLACE_PERL=               GrabWeather
 BUILD_TARGET=          gkrellweather.so
 
 LOCALEDIR=             ${PREFIX}/${PKGLOCALEDIR}/locale
-INSTALLATION_DIRS=     bin lib lib/gkrellm2/plugins
+INSTALLATION_DIRS=     lib libexec lib/gkrellm2/plugins
 
 MAKE_ENV+=     LOCALEDIR=${LOCALEDIR}
 MAKE_ENV+=     enable_nls=1
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${DESTDIR}${PREFIX}/libexec
        ${INSTALL_LIB} ${WRKSRC}/gkrellweather.so \
            ${DESTDIR}${PREFIX}/lib/gkrellm2/plugins
        set -e; cd ${WRKSRC}/po && for f in *.mo; do \

Index: pkgsrc/misc/gkrellm-weather/PLIST
diff -u pkgsrc/misc/gkrellm-weather/PLIST:1.3 pkgsrc/misc/gkrellm-weather/PLIST:1.4
--- pkgsrc/misc/gkrellm-weather/PLIST:1.3       Mon Apr 17 07:07:25 2006
+++ pkgsrc/misc/gkrellm-weather/PLIST   Mon Aug 18 09:11:14 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:25 jlam Exp $
-bin/GrabWeather
+@comment $NetBSD: PLIST,v 1.4 2025/08/18 09:11:14 pho Exp $
 lib/gkrellm2/plugins/gkrellweather.so
+libexec/GrabWeather
 share/locale/ru/LC_MESSAGES/gkrellweather.mo

Index: pkgsrc/misc/gkrellm-weather/distinfo
diff -u pkgsrc/misc/gkrellm-weather/distinfo:1.10 pkgsrc/misc/gkrellm-weather/distinfo:1.11
--- pkgsrc/misc/gkrellm-weather/distinfo:1.10   Sat Nov 27 05:58:50 2021
+++ pkgsrc/misc/gkrellm-weather/distinfo        Mon Aug 18 09:11:14 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2021/11/27 05:58:50 pho Exp $
+$NetBSD: distinfo,v 1.11 2025/08/18 09:11:14 pho Exp $
 
-BLAKE2s (gkrellweather-2.0.7.tgz) = 24eeb8b0719c502354e33899d7d43c30e4ee09623043cf062e5b12b7200d8a61
-SHA512 (gkrellweather-2.0.7.tgz) = 103212f5d8c66c512cf22689f5e64e886e2df57b963a2c01873f6d2044653653d2bd8d5804ed788f202e2bb2b7289090198434ddad363c124c047bcc530e04e3
-Size (gkrellweather-2.0.7.tgz) = 19968 bytes
-SHA1 (patch-aa) = 2c4850e84b873c3b3dbc2d1cf41123a9e2fffbce
+BLAKE2s (gkrellweather-2.0.8.tar.gz) = fa57ad05189efc5fe13a11b4b4c75ccf5a3f9d3556c5f8ee02dc2f382b325b89
+SHA512 (gkrellweather-2.0.8.tar.gz) = da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
+Size (gkrellweather-2.0.8.tar.gz) = 20227 bytes
+SHA1 (patch-GrabWeather) = b782e8db7e028d3e79e367b2b2ac9342627bbe7d
+SHA1 (patch-aa) = 0101c56585ca96304cbfb2c9e379fd23b719daf7
 SHA1 (patch-ab) = d223c10869a7c4ec6338ac39a56a4bc300857bea

Index: pkgsrc/misc/gkrellm-weather/patches/patch-aa
diff -u pkgsrc/misc/gkrellm-weather/patches/patch-aa:1.3 pkgsrc/misc/gkrellm-weather/patches/patch-aa:1.4
--- pkgsrc/misc/gkrellm-weather/patches/patch-aa:1.3    Sun Nov 28 20:52:44 2010
+++ pkgsrc/misc/gkrellm-weather/patches/patch-aa        Mon Aug 18 09:11:14 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2010/11/28 20:52:44 dholland Exp $
+$NetBSD: patch-aa,v 1.4 2025/08/18 09:11:14 pho Exp $
 
 Find GrabWeather where we install it.
 
---- gkrellweather.c.orig       2003-11-02 12:05:08.000000000 +0000
-+++ gkrellweather.c    2003-11-02 12:05:23.000000000 +0000
-@@ -983,7 +983,7 @@
+--- gkrellweather.c.orig       2009-01-11 18:15:02.000000000 +0000
++++ gkrellweather.c
+@@ -986,7 +986,7 @@ read_default(void)
      options.windspeed_unit = 1;
      options.pressure_unit = 1;
      strcpy(options.station, DEFAULT_STATION_ID);
--    sprintf(options.command, "/usr/share/gkrellm/GrabWeather %s", options.station);
-+    sprintf(options.command, "%s/bin/GrabWeather %s", PREFIX, options.station);
-     sprintf(options.filename, "%s/.wmWeatherReports/%s.dat",
-             getenv("HOME"), options.station);
- }
+-    snprintf(options.command, 512, "/usr/share/gkrellm/GrabWeather %s", options.station);
++    snprintf(options.command, 512, "%s/libexec/GrabWeather %s", PREFIX, options.station);
+     options.command[511] = 0;
+     snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
+              getenv("HOME"), options.station);

Added files:

Index: pkgsrc/misc/gkrellm-weather/patches/patch-GrabWeather
diff -u /dev/null pkgsrc/misc/gkrellm-weather/patches/patch-GrabWeather:1.1
--- /dev/null   Mon Aug 18 09:11:14 2025
+++ pkgsrc/misc/gkrellm-weather/patches/patch-GrabWeather       Mon Aug 18 09:11:14 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-GrabWeather,v 1.1 2025/08/18 09:11:14 pho Exp $
+
+Update NOAA link to weather information.
+
+--- GrabWeather.orig   2025-08-18 08:37:52.396300032 +0000
++++ GrabWeather
+@@ -12,7 +12,8 @@
+ 
+ $ReportDir  = '.wmWeatherReports';
+ #$WeatherSrc = 'ftp://weather.noaa.gov/data/observations/metar/decoded';
+-$WeatherSrc = 'http://weather.noaa.gov/pub/data/observations/metar/decoded';
++#$WeatherSrc = 'http://weather.noaa.gov/pub/data/observations/metar/decoded';
++$WeatherSrc = 'http://tgftp.nws.noaa.gov/data/observations/metar/decoded';
+ 
+ use strict; 
+ use vars qw( $ReportDir $WeatherSrc );