cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.0.8 fixing buffer overflows from sthen@

Browse Source 
small patch to GrabWeather by me.

ok sthen@
This commit is contained in:
dhill 2010-04-10 13:11:30 +00:00
parent d9010697e4
commit 722629cac3
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysutils/gkrellm/plugins/weather/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.17 2009/08/10 06:34:30 kili Exp $
# $OpenBSD: Makefile,v 1.18 2010/04/10 13:11:30 dhill Exp $
COMMENT= Weather plugin for GkrellM2
DISTNAME= gkrellweather-2.0.7
PKGNAME= ${DISTNAME}p1
DISTNAME= gkrellweather-2.0.8
CATEGORIES= x11
EXTRACT_SUFX= .tgz
HOMEPAGE= http://makovick.googlepages.com/gkrellmplugins
MASTER_SITES= http://makovick.googlepages.com/
HOMEPAGE= http://sites.google.com/site/makovick/gkrellm-plugins
MASTER_SITES= http://sites.google.com/site/makovick/projects/
ALL_TARGET= gkrellweather.so
PLUGIN= ${WRKSRC}/gkrellweather.so

10
sysutils/gkrellm/plugins/weather/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gkrellweather-2.0.7.tgz) = c/XsTpUPkzpZBDFwN9at0g==
RMD160 (gkrellweather-2.0.7.tgz) = qPkqReoEjBlJcPVhXlDEsIEg7+A=
SHA1 (gkrellweather-2.0.7.tgz) = U/YpmaSv8Bj2lDuLVt2eVJB3VMM=
SHA256 (gkrellweather-2.0.7.tgz) = rZAqzQ/7itsfDYOOV1RdH1KjGuM3Ebc9KJKcJ4anQMo=
SIZE (gkrellweather-2.0.7.tgz) = 19968
MD5 (gkrellweather-2.0.8.tgz) = sh7VXMmZjrcwfsU+mfm+6g==
RMD160 (gkrellweather-2.0.8.tgz) = 1GJaruwuzrBV2/YbdQ6NByWMqLY=
SHA1 (gkrellweather-2.0.8.tgz) = NV6ogsBRm6pm0QIYFFLGchdV/Yk=
SHA256 (gkrellweather-2.0.8.tgz) = BiNq1IkVEBnnG6tLpjtLiwbVjFiJDK7YsaKP3QXN4W0=
SIZE (gkrellweather-2.0.8.tgz) = 20227

10
sysutils/gkrellm/plugins/weather/patches/patch-GrabWeather
View File

@ -1,12 +1,14 @@
--- GrabWeather.orig Fri Jul 4 19:28:21 2008
+++ GrabWeather Fri Jul 4 19:29:05 2008
@@ -40,8 +40,7 @@
--- GrabWeather.orig Sun Jan 11 18:15:02 2009
+++ GrabWeather Sat Apr 10 10:46:54 2010
@@ -40,9 +40,8 @@ my $DataFileName = "$StationID.dat";
# Is LWP installed?
eval { require LWP::UserAgent };
if ($@) {
- my $cmd = qq{wget --proxy=off --passive-ftp --tries=0 --quiet } .
- qq{--output-document=$home/$ReportDir/$HTMLFileName $URL};
- `$cmd` == 0 or die "unable to fetch weather: $?";
+ my $cmd = qq{ftp -o $home/$ReportDir/$HTMLFileName $URL};
`$cmd` == 0 or die "unable to fetch weather: $?";
+ die "unable to fetch weather: $?" if `$cmd` == 0;
} else {
$ENV{FTP_PASSIVE} = 1; # LWP uses Net::FTP internally.
my $ua = new LWP::UserAgent;

8
sysutils/gkrellm/plugins/weather/patches/patch-Makefile
View File

@ -1,8 +1,8 @@
--- Makefile.orig Fri Jul 4 19:25:28 2008
+++ Makefile Fri Jul 4 19:24:57 2008
--- Makefile.orig Sun Jan 11 18:15:02 2009
+++ Makefile Sat Apr 10 10:38:33 2010
@@ -1,9 +1,8 @@
PKGNAME = gkrellweather
VERSION = 2.0.7
VERSION = 2.0.8
-CFLAGS = -O2 -std=gnu99 -Wall -fPIC `pkg-config gtk+-2.0 --cflags`
-LIBS = `pkg-config gtk+-2.0 --libs`
-LFLAGS = -shared
@ -13,7 +13,7 @@
LOCALEDIR := $(PREFIX)/share/locale
@@ -14,13 +13,11 @@
@@ -14,13 +13,11 @@ endif
CFLAGS += -DPACKAGE="\"$(PKGNAME)\""
export PKGNAME LOCALEDIR

26
sysutils/gkrellm/plugins/weather/patches/patch-gkrellweather_c
View File

@ -1,20 +1,20 @@
--- gkrellweather.c.orig Fri Jul 4 19:27:02 2008
+++ gkrellweather.c Fri Jul 4 19:27:51 2008
@@ -714,7 +714,7 @@
--- gkrellweather.c.orig Sun Jan 11 18:15:02 2009
+++ gkrellweather.c Sat Apr 10 10:39:52 2010
@@ -721,7 +721,7 @@ apply_air_config (void)
options.station[1] = c[1];
options.station[2] = c[2];
options.station[3] = c[3];
- sprintf(options.command, PREFIX "/bin/GrabWeather %s", options.station);
+ sprintf(options.command, PREFIX "/bin/gkrellm.GrabWeather %s", options.station);
sprintf(options.filename, "%s/.wmWeatherReports/%s.dat",
- snprintf(options.command, 512, PREFIX "/bin/GrabWeather %s", options.station);
+ snprintf(options.command, 512, PREFIX "/bin/gkrellm.GrabWeather %s", options.station);
options.command[511] = 0;
snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
getenv("HOME"), options.station);
net_update = FALSE;
@@ -977,7 +977,7 @@
@@ -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, PREFIX "/bin/gkrellm.GrabWeather %s", 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, PREFIX "/bin/gkrellm.GrabWeather %s", options.station);
options.command[511] = 0;
snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
getenv("HOME"), options.station);