Compare commits

...
Sign in to create a new pull request.

21 commits

Author SHA1 Message Date
Maxwell G
00a3899fef Orphaned for 6+ weeks 2025-03-29 16:58:47 -05:00
Fedora Release Engineering
a75c99811a Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 15:10:54 +00:00
Miroslav Suchý
5ccb5168da convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:42:01 +02:00
Fedora Release Engineering
bf333f6496 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:28:46 +00:00
Software Management Team
1006da1dcc Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:49 +02:00
Fedora Release Engineering
935c90eb35 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 09:01:03 +00:00
Fedora Release Engineering
ddf5e2b658 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:18:53 +00:00
Fedora Release Engineering
4bebc818f4 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:56:00 +00:00
Fedora Release Engineering
c2cdd5437e Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:33:26 +00:00
Petr Písař
09e59ef7e3 Reupload sources with SHA-512 2022-07-04 20:15:59 +02:00
Fedora Release Engineering
4af336a19e - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 04:36:09 +00:00
Fedora Release Engineering
d2b0a0cfdb - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 21:04:14 +00:00
Fedora Release Engineering
9688af67a9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 23:36:28 +00:00
Fedora Release Engineering
452ee425bb - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 14:15:19 +00:00
Fedora Release Engineering
2f4cc2a877 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 03:50:51 +00:00
Petr Písař
a46461565b Fix building with GCC 10 2020-01-21 17:19:48 +01:00
Fedora Release Engineering
4e107e3f6d - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 03:37:05 +00:00
Fedora Release Engineering
82b5695abc - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 11:50:48 +00:00
1d0d14ee0a Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:55 +01:00
Fedora Release Engineering
5d40c63215 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:56:07 +00:00
Fedora Release Engineering
45b4036434 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 21:03:58 +00:00
6 changed files with 1 additions and 321 deletions

3
.gitignore vendored
View file

@ -1,3 +0,0 @@
wmfrog-0.2.1.tgz
/wmfrog-0.2.2.tgz
/wmfrog-0.3.1.tgz

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphaned for 6+ weeks

View file

@ -1 +0,0 @@
de4975f2c6a7931fdf5faa3c263aaf5f wmfrog-0.3.1.tgz

View file

@ -1,163 +0,0 @@
From 529c79dcfb0dc20c123865d1caf1142b085080d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 15 Feb 2017 15:05:35 +0100
Subject: [PATCH] Fix parsing wmfrog arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
A command like "wmfrog -s KSEA -o 7 -tmp /home/stela010/tmp/wmfrog"
crashed because the -tmp argument was bigger than a static buffer used
for storing the argument value. There were similar issues with other
argument values.
This patch fixes it. It also fixes the fact that -tmp argument was
always ignored and user's home directory was used instead.
<https://bugzilla.redhat.com/show_bug.cgi?id=1422319>
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
Src/wmFrog.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 54 insertions(+), 12 deletions(-)
diff --git a/Src/wmFrog.c b/Src/wmFrog.c
index 24f795c..c422e55 100644
--- a/Src/wmFrog.c
+++ b/Src/wmFrog.c
@@ -12,6 +12,7 @@
/*
* Includes
*/
+#define _XOPEN_SOURCE 500 /* For strdup(3) */
#include <signal.h>
#include <stdio.h>
#include <math.h>
@@ -74,7 +75,7 @@ int NeedsUpdate = 1;
int maxWind = MAX_WIND;
int timeOffset = TIME_OFFSET;
long UpdateDelay;
-char* folder;
+char* folder = NULL;
int needsUpdate = 1;
/*
@@ -91,7 +92,9 @@ int main(int argc, char *argv[]) {
*/
ParseCMDLine(argc, argv);
- folder = GetTempDir(".wmapps");
+ if (NULL == folder) {
+ folder = GetTempDir(".wmapps");
+ }
initXwindow(argc, argv);
@@ -343,7 +346,11 @@ void ParseCMDLine(int argc, char *argv[]) {
print_usage();
exit(-1);
}
- strcpy(folder, argv[++i]);
+ folder = strdup(argv[++i]);
+ if (NULL == folder) {
+ fprintf(stderr, "Not enough memory to copy -tmp argument.\n");
+ exit(-1);
+ }
} else if ((!strcmp(argv[i], "-station")) || (!strcmp(argv[i], "-s"))) {
@@ -352,6 +359,10 @@ void ParseCMDLine(int argc, char *argv[]) {
print_usage();
exit(-1);
}
+ if (strlen(argv[i + 1]) >= sizeof(StationID)/sizeof(*StationID) - 1) {
+ fprintf(stderr, "METAR station ID is too long.\n");
+ exit(-1);
+ }
strcpy(StationID, StringToUpper(argv[++i]));
strcpy(Label, StationID);
} else if (!strcmp(argv[i], "-delay")) {
@@ -377,6 +388,10 @@ void ParseCMDLine(int argc, char *argv[]) {
print_usage();
exit(-1);
}
+ if (strlen(argv[i + 1]) >= sizeof(Label)/sizeof(*Label) - 1) {
+ fprintf(stderr, "Station label is too long.\n");
+ exit(-1);
+ }
strcpy(Label, StringToUpper(argv[++i]));
}
}
@@ -454,7 +469,8 @@ double UT;
// Will be called at regular interval to update the weather data (alarm)
void UpdateData() {
- char command[1024], Line[512], FileName[128];
+ char *command, Line[512], *FileName;
+ const char weatherPlScript[] = "/usr/lib/wmfrog/weather.pl";
int ign;
char* igns;
igns = (char*) malloc(512);
@@ -492,13 +508,29 @@ void UpdateData() {
/*
* Execute Perl script to grab the Latest METAR Report
*/
- snprintf(command, 1024, "/usr/lib/wmfrog/weather.pl %s %s", StationID, folder);
- //printf("Retrieveing data\n");
- ign = system(command);
- snprintf(FileName, 128, "%s/%s", folder, StationID);
- //fprintf(stderr,"%s\n\n",FileName);
+ command = malloc(strlen(weatherPlScript) + 1 + strlen(StationID) + 1
+ + strlen(folder) + 1);
+ if (NULL == command) {
+ fprintf(stderr, "Not enough memory to build wheater.pl command.\n");
+ } else {
+ sprintf(command, "%s %s %s", weatherPlScript, StationID, folder);
+ //printf("Retrieveing data\n");
+ ign = system(command);
+ free(command);
+ }
+
+ FileName = malloc(strlen(folder) + 1 + strlen(StationID) + 1);
+ if (NULL == FileName) {
+ fprintf(stderr, "Not enough memory to build staion ID file name.\n");
+ fp = NULL;
+ } else {
+ sprintf(FileName, "%s/%s", folder, StationID);
+ //fprintf(stderr,"%s\n\n",FileName);
+ fp = fopen(FileName, "r");
+ free(FileName);
+ }
- if ((fp = fopen(FileName, "r")) != NULL) {
+ if (fp != NULL) {
ign = fscanf(fp, "Hour:%d", &weather.hour);
igns = fgets(Line, 512, fp); //h
ign = fscanf(fp, "Minute:%d", &weather.min);
@@ -620,11 +652,21 @@ void UpdateData() {
char *GetTempDir(char *suffix) {
uid_t id;
struct passwd *userEntry;
- static char userHome[128];
+ char *userHome;
id = getuid();
userEntry = getpwuid(id);
- snprintf(userHome, 128, "%s/%s", userEntry->pw_dir, suffix);
+ if (NULL == userEntry) {
+ perror("Could not retrieve user's passwd entry");
+ exit(-1);
+ }
+
+ userHome = malloc(strlen(userEntry->pw_dir) + 1 + strlen(suffix) + 1);
+ if (NULL == userHome) {
+ fprintf(stderr, "Not enough memory for building temporary path.\n");
+ exit(-1);
+ }
+ sprintf(userHome, "%s/%s", userEntry->pw_dir, suffix);
return userHome;
}
--
2.7.4

View file

@ -1,28 +0,0 @@
From a1011efd4be1d960e2a145f15ad8e7aa92b31fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
Date: Tue, 15 May 2012 20:31:22 +0200
Subject: [PATCH] Skip warning
NOAA started to warn about redirect to new URL
<http://www.aviationweather.gov/adds/metars/>. This patch skips the warning.
We need to move to the new URL soon.
---
Src/weather.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Src/weather.pl b/Src/weather.pl
index 5ceeccd..c556950 100755
--- a/Src/weather.pl
+++ b/Src/weather.pl
@@ -40,7 +40,7 @@ if($mode eq "http")
$line=<DATA>;
}
$i=0;
- while($i!=12 && !eof(DATA))
+ while($i!=21 && !eof(DATA))
{
$line=<DATA>;
$i++;
--
1.7.3.4

View file

@ -1,126 +0,0 @@
Name: wmfrog
Version: 0.3.1
Release: 20%{?dist}
Summary: A weather application, it shows the weather in a graphical way
Group: Amusements/Graphics
License: GPLv2+
URL: http://wiki.colar.net/wmfrog_dockapp
Source0: http://bitbucket.org/tcolar/%{name}/downloads/%{name}-%{version}.tgz
# Bug 822219, submitted to upstream.
Patch0: %{name}-0.3.1-Skip-warning.patch
# Fix a crash with overlong wmfrog -tmp argument, bug #1422319,
# mailed to upstream.
Patch1: %{name}-0.3.1-Fix-parsing-wmfrog-arguments.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
BuildRequires: perl-generators
BuildRequires: sed
Requires: wget
%description
This is a weather application, it shows the weather in a graphical way. The
artwork looks like a kiddo did it, but that's part of the charm… Ok, I did it
when I was 25, I'm a programmer not a designer :)
%prep
%setup -q -c
%patch0 -p1 -b .warning
%patch1 -p1
sed -i -e 's|/lib/wmfrog|/libexec/wmfrog|' Src/Makefile
sed -i -e 's|/usr/lib/|%{_libexecdir}/|' Src/wmFrog.c
# Remove prebuilt binaries
make -C Src clean
%build
cd Src
make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
%install
cd Src
make install DESTDIR=$RPM_BUILD_ROOT
%files
%license COPYING
%doc CHANGES HINTS
%{_bindir}/%{name}
%{_libexecdir}/%{name}
%changelog
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Feb 15 2017 Petr Pisar <ppisar@redhat.com> - 0.3.1-18
- Fix a crash with overlong wmfrog -tmp argument (bug #1422319)
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 0.3.1-16
- Perl 5.24 rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 0.3.1-13
- Perl 5.22 rebuild
* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.3.1-12
- Perl 5.20 rebuild
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.3.1-8
- Perl 5.18 rebuild
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jun 08 2012 Petr Pisar <ppisar@redhat.com> - 0.3.1-5
- Perl 5.16 rebuild
* Thu May 17 2012 Petr Pisar <ppisar@redhat.com> - 0.3.1-4
- Adjust to NOAA web page change (bug #822219)
- Depend on perl ABI
- Clean spec file
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Dec 02 2010 Petr Pisar <ppisar@redhat.com> - 0.3.1-1
- 0.3.1 bump
- Fixed clouds/wind parsing issues
* Wed Sep 01 2010 Petr Pisar <ppisar@redhat.com> - 0.2.2-1
- 0.2.2 bump
* Mon Aug 09 2010 Petr Pisar <ppisar@redhat.com> - 0.2.1-2
- Change RPM group to Amusements/Graphics
* Thu Aug 05 2010 Petr Pisar <ppisar@redhat.com> - 0.2.1-1
- 0.2.1 bump
- Fix METAR parser
* Tue Aug 03 2010 Petr Pisar <ppisar@redhat.com> - 0.2.0-1
- 0.2.0 import