diff -pruN 2.4.6-2/CHANGES 2.4.7-1/CHANGES --- 2.4.6-2/CHANGES 2016-08-07 16:48:37.000000000 +0000 +++ 2.4.7-1/CHANGES 2019-02-13 19:54:46.000000000 +0000 @@ -1,6 +1,11 @@ wmweather: CHANGES in version 2 ------------------------------- +2.4.7 - Feb 12, 2019 + + * Fixed NOAA download URL. Thanks to Tilmann Hentze, Werner, + Roman Dobosz, Cristian Ionescu-Idbohrn, and Faried Nawaz. + 2.4.6 - Jul 08, 2016 * Fixed NOAA download URL. diff -pruN 2.4.6-2/debian/changelog 2.4.7-1/debian/changelog --- 2.4.6-2/debian/changelog 2016-08-07 17:53:00.000000000 +0000 +++ 2.4.7-1/debian/changelog 2019-02-13 20:03:11.000000000 +0000 @@ -1,12 +1,21 @@ +wmweather (2.4.7-1) unstable; urgency=medium + + * New upstream release, fixed NOAA download URL, closes: #921841. + Thanks to Tilmann Hentze, Werner, Roman Dobosz, + Cristian Ionescu-Idbohrn, and Faried Nawaz. + * Updated standards version, added --strip-unneeded. + + -- Martin A. Godisch Wed, 13 Feb 2019 21:03:11 +0100 + wmweather (2.4.6-2) unstable; urgency=low - * Made build reproducible, closes: 828855. Thanks to Reiner Herrmann. + * Made build reproducible, closes: #828855. Thanks to Reiner Herrmann. -- Martin A. Godisch Sun, 07 Aug 2016 19:53:00 +0200 wmweather (2.4.6-1) unstable; urgency=low - * New upstream release, fixed NOAA download URL, closes: 833394. + * New upstream release, fixed NOAA download URL, closes: #833394. Thanks to Matthieu Weber and Cristian Ionescu-Idbohrn. * Replaced menu information with desktop file, updated standards version. diff -pruN 2.4.6-2/debian/control 2.4.7-1/debian/control --- 2.4.6-2/debian/control 2016-08-07 17:07:25.000000000 +0000 +++ 2.4.7-1/debian/control 2019-02-13 19:54:51.000000000 +0000 @@ -3,7 +3,7 @@ Section: gnustep Priority: optional Maintainer: Martin A. Godisch Build-Depends: libcurl4-gnutls-dev | libcurl-dev, libx11-dev, libxext-dev, libxpm-dev -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 Homepage: http://people.debian.org/~godisch/wmweather/ Package: wmweather diff -pruN 2.4.6-2/debian/copyright 2.4.7-1/debian/copyright --- 2.4.6-2/debian/copyright 2016-08-07 17:05:51.000000000 +0000 +++ 2.4.7-1/debian/copyright 2019-02-13 19:54:52.000000000 +0000 @@ -8,7 +8,7 @@ Upstream Author Version 1: Michael G. He Upstream Author Version 2: Martin A. Godisch Copyright (c) 1999 Michael G. Henderson -Copyright (c) 2002-2016 Martin A. Godisch +Copyright (c) 2002-2019 Martin A. Godisch This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -pruN 2.4.6-2/debian/ip-up 2.4.7-1/debian/ip-up --- 2.4.6-2/debian/ip-up 2013-12-30 15:10:15.000000000 +0000 +++ 2.4.7-1/debian/ip-up 2019-02-13 19:54:52.000000000 +0000 @@ -2,7 +2,8 @@ # # Let wmweather grab the latest weather report. -if pidlist="`pidof wmweather wmWeather`"; then +if pidlist="`pidof wmweather wmWeather`" +then kill -ALRM $pidlist fi diff -pruN 2.4.6-2/debian/postinst 2.4.7-1/debian/postinst --- 2.4.6-2/debian/postinst 2016-08-07 17:13:39.000000000 +0000 +++ 2.4.7-1/debian/postinst 2019-02-13 19:54:52.000000000 +0000 @@ -2,7 +2,8 @@ set -e -if [ "$1" = configure ] && [ -x "$(which update-desktop-database 2> /dev/null)" ]; then +if [ "$1" = configure ] && [ -x "$(which update-desktop-database 2> /dev/null)" ] +then update-desktop-database -q fi diff -pruN 2.4.6-2/debian/postrm 2.4.7-1/debian/postrm --- 2.4.6-2/debian/postrm 2016-08-07 17:13:58.000000000 +0000 +++ 2.4.7-1/debian/postrm 2019-02-13 19:54:52.000000000 +0000 @@ -2,13 +2,16 @@ set -e -if [ -x "$(which update-desktop-database 2> /dev/null)" ]; then +if [ -x "$(which update-desktop-database 2> /dev/null)" ] +then update-desktop-database -q fi -if [ "$1" = purge ]; then +if [ "$1" = purge ] +then rm -f /etc/wmweather.conf - if [ -e /usr/share/debconf/confmodule ]; then + if [ -e /usr/share/debconf/confmodule ] + then . /usr/share/debconf/confmodule db_purge fi diff -pruN 2.4.6-2/debian/rules 2.4.7-1/debian/rules --- 2.4.6-2/debian/rules 2016-08-07 17:52:12.000000000 +0000 +++ 2.4.7-1/debian/rules 2019-02-13 19:54:52.000000000 +0000 @@ -11,7 +11,7 @@ else endif CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -Wno-error=format-security +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) export CPPFLAGS export CFLAGS @@ -44,7 +44,7 @@ binary-arch: build $(MAKE) -C src install DESTDIR=$(CURDIR)/debian/wmweather ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - strip -R .comment -R .note debian/wmweather/usr/bin/wmweather + strip --strip-unneeded -R .comment -R .note debian/wmweather/usr/bin/wmweather endif gzip -9n debian/wmweather/usr/share/man/man1/wmweather.1 rm -f debian/wmweather/usr/share/man/man1/wmWeather.1 @@ -64,7 +64,7 @@ endif cd debian/wmweather && find usr -type f -print0 | LC_ALL=C sort -z | xargs -0 md5sum > DEBIAN/md5sums dpkg-shlibdeps debian/wmweather/usr/bin/wmweather - dpkg-gencontrol -isp -pwmweather -Pdebian/wmweather + dpkg-gencontrol -pwmweather -Pdebian/wmweather chmod -R u+w,go=u-w debian/wmweather dpkg --build debian/wmweather .. diff -pruN 2.4.6-2/src/autogen.sh 2.4.7-1/src/autogen.sh --- 2.4.6-2/src/autogen.sh 2016-08-07 17:04:26.000000000 +0000 +++ 2.4.7-1/src/autogen.sh 2019-02-13 19:54:47.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -e -# Copyright (c) 2002-2016 Martin A. Godisch +# Copyright (c) 2002-2019 Martin A. Godisch test -e wmweather.c umask 022 @@ -15,5 +15,5 @@ version="`pwd`" version="${version##*-}" fakeroot debian/rules clean cd .. -tar cvzf wmweather-$version.tar.gz --exclude CVS --exclude .cvsignore --exclude .hg --exclude .hgignore --exclude debian wmweather-$version -ln -s wmweather-$version.tar.gz wmweather_$version.orig.tar.gz +tar cvzf wmweather-$version.tar.gz --exclude CVS --exclude .cvsignore --exclude .hg --exclude .hgignore --exclude debian --exclude .pc wmweather-$version +ln -sf wmweather-$version.tar.gz wmweather_$version.orig.tar.gz diff -pruN 2.4.6-2/src/config.h.in 2.4.7-1/src/config.h.in --- 2.4.6-2/src/config.h.in 2016-08-07 16:42:11.000000000 +0000 +++ 2.4.7-1/src/config.h.in 2019-02-13 19:54:49.000000000 +0000 @@ -130,9 +130,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -pruN 2.4.6-2/src/configure 2.4.7-1/src/configure --- 2.4.6-2/src/configure 2016-08-07 17:04:44.000000000 +0000 +++ 2.4.7-1/src/configure 2019-02-13 20:03:20.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 1.60 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wmweather 2.4.6. +# Generated by GNU Autoconf 2.69 for wmweather 2.4.7. # # Report bugs to . # @@ -581,8 +581,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wmweather' PACKAGE_TARNAME='wmweather' -PACKAGE_VERSION='2.4.6' -PACKAGE_STRING='wmweather 2.4.6' +PACKAGE_VERSION='2.4.7' +PACKAGE_STRING='wmweather 2.4.7' PACKAGE_BUGREPORT='martin@godisch.de' PACKAGE_URL='' @@ -672,6 +672,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -745,6 +746,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -997,6 +999,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1134,7 +1145,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1247,7 +1258,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wmweather 2.4.6 to adapt to many kinds of systems. +\`configure' configures wmweather 2.4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1287,6 +1298,7 @@ Fine tuning of the installation director --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1312,7 +1324,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wmweather 2.4.6:";; + short | recursive ) echo "Configuration of wmweather 2.4.7:";; esac cat <<\_ACEOF @@ -1399,7 +1411,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wmweather configure 2.4.6 +wmweather configure 2.4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1822,7 +1834,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wmweather $as_me 2.4.6, which was +It was created by wmweather $as_me 2.4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4508,39 +4520,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if ${ac_cv_type_signal+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -int -main () -{ -return *(signal (0, 0)) (0) == 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int -else - ac_cv_type_signal=void -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes; then : @@ -6225,7 +6204,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wmweather $as_me 2.4.6, which was +This file was extended by wmweather $as_me 2.4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6287,7 +6266,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wmweather config.status 2.4.6 +wmweather config.status 2.4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -pruN 2.4.6-2/src/configure.ac 2.4.7-1/src/configure.ac --- 2.4.6-2/src/configure.ac 2016-08-07 17:02:21.000000000 +0000 +++ 2.4.7-1/src/configure.ac 2019-02-13 19:54:49.000000000 +0000 @@ -1,7 +1,7 @@ -# copyright (c) 2002-2016 Martin A. Godisch +# copyright (c) 2002-2019 Martin A. Godisch # ---------------------------------------------------------------------------- AC_PREREQ([2.69]) -AC_INIT([wmweather],[2.4.6],[martin@godisch.de]) +AC_INIT([wmweather],[2.4.7],[martin@godisch.de]) AC_REVISION([$Revision: 1.60 $]) AC_CONFIG_SRCDIR([wmweather.c]) AC_CONFIG_HEADERS([config.h]) @@ -23,18 +23,6 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) AC_TYPE_PID_T -AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void. -Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl -AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([#include -#include -], - [return *(signal (0, 0)) (0) == 1;])], - [ac_cv_type_signal=int], - [ac_cv_type_signal=void])]) -AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers - (`int' or `void').]) - AC_TYPE_SIZE_T AC_STRUCT_TM # ---------------------------------------------------------------------------- diff -pruN 2.4.6-2/src/wmweather.1.in 2.4.7-1/src/wmweather.1.in --- 2.4.6-2/src/wmweather.1.in 2016-08-07 17:02:32.000000000 +0000 +++ 2.4.7-1/src/wmweather.1.in 2019-02-13 19:54:49.000000000 +0000 @@ -2,9 +2,9 @@ @configure_input@ . Copyright (c) 1999 Michael G. Henderson -Copyright (c) 2002-2016 Martin A. Godisch +Copyright (c) 2002-2019 Martin A. Godisch .. -.TH WMWEATHER 1 "July 2016" "The Debian Project" "Version @PACKAGE_VERSION@" +.TH WMWEATHER 1 "February 2019" "The Debian Project" "Version @PACKAGE_VERSION@" . .SH NAME . @@ -46,7 +46,7 @@ This option tells which METAR station to show data for. .I id can be any four-letter ICAO location indicator, which can be found at -.IR http://www.nws.noaa.gov/tg/siteloc.php . +.IR https://en.wikipedia.org/wiki/ICAO_airport_code . .TP .B \-c, \-\-compat Switch into compatibility mode. The old monitor style will be used, default diff -pruN 2.4.6-2/src/wmweather.c 2.4.7-1/src/wmweather.c --- 2.4.6-2/src/wmweather.c 2016-08-07 17:02:35.000000000 +0000 +++ 2.4.7-1/src/wmweather.c 2019-02-13 19:54:49.000000000 +0000 @@ -1,7 +1,7 @@ /* vim: set noet ts=4: * * Copyright (c) 1999 Michael G. Henderson . - * Copyright (c) 2002-2016 Martin A. Godisch . + * Copyright (c) 2002-2019 Martin A. Godisch . * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software @@ -61,7 +61,7 @@ CURL static struct memory header = {NULL, 0}; char - url[] = "http://tgftp.nws.noaa.gov/data/observations/metar/decoded/\0\0\0\0.TXT", + url[] = "https://tgftp.nws.noaa.gov/data/observations/metar/decoded/\0\0\0\0.TXT", xtitle[] = "weather report for \0\0\0\0\0", *station = NULL, *report = NULL, @@ -519,12 +519,12 @@ static void do_opts(int argc, char *argv printf(" --wgc= gusty-wind (variable direction) color,\n"); printf(" --tc= station ID and time color.\n"); printf("System-wide configuration file is %s.\n", SYSCONFPATH); - printf("For ICAO location indicators visit http://www.nws.noaa.gov/tg/siteloc.php.\n"); + printf("For ICAO location indicators visit https://en.wikipedia.org/wiki/ICAO_airport_code.\n"); exit(0); case 'v': printf("%s\n", PACKAGE_STRING); printf("copyright (c) 1999 Michael G. Henderson \n"); - printf("copyright (c) 2002-2016 Martin A. Godisch \n"); + printf("copyright (c) 2002-2019 Martin A. Godisch \n"); exit(0); case 0: case 1: