Hello community, here is the log from the commit of package rzsz for openSUSE:Factory checked in at 2018-04-10 10:54:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rzsz (Old) and /work/SRC/openSUSE:Factory/.rzsz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rzsz" Tue Apr 10 10:54:12 2018 rev:3 rq:593726 version:0.12.21~rc Changes: -------- --- /work/SRC/openSUSE:Factory/rzsz/rzsz.changes 2018-01-22 16:20:54.459229034 +0100 +++ /work/SRC/openSUSE:Factory/.rzsz.new/rzsz.changes 2018-04-10 10:54:17.542049745 +0200 @@ -1,0 +2,11 @@ +Thu Apr 5 07:51:03 UTC 2018 - [email protected] + +- Update to 0.12.21~rc bsc#1086416: + * RC candidate from 1999 containing bunch of trivial fxies that + most other distributions ship +- Rebase patches: + * lrzsz-0.12.20-automake-1.13.patch + * lrzsz-autotools.patch + * lrzsz-po.patch + +------------------------------------------------------------------- Old: ---- lrzsz-0.12.20.tar.gz New: ---- lrzsz-0.12.21rc.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rzsz.spec ++++++ --- /var/tmp/diff_new_pack.wbOLTs/_old 2018-04-10 10:54:18.042031688 +0200 +++ /var/tmp/diff_new_pack.wbOLTs/_new 2018-04-10 10:54:18.046031543 +0200 @@ -16,14 +16,15 @@ # +%define realver 0.12.21rc Name: rzsz -Version: 0.12.20 +Version: 0.12.21~rc Release: 0 Summary: X-, Y-, and Z-Modem Data Transfer Protocols -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Hardware/Modem -Url: http://www.ohse.de/uwe/software/lrzsz.html -Source: http://www.ohse.de/uwe/releases/lrzsz-%{version}.tar.gz +URL: http://www.ohse.de/uwe/software/lrzsz.html +Source: http://www.ohse.de/uwe/testing/lrzsz-%{realver}.tar.gz Patch1: lrzsz-po.patch Patch2: lrzsz-0.12.20-use-after-free.patch Patch4: lrzsz-autotools.patch @@ -42,7 +43,7 @@ system. %prep -%setup -q -n lrzsz-%{version} +%setup -q -n lrzsz-%{realver} %patch1 %patch2 -p1 %patch4 -p1 @@ -59,9 +60,9 @@ # Broken header rm -f acconfig.h -autoreconf -fvi %build +autoreconf -fvi %configure make %{?_smp_mflags} @@ -88,7 +89,8 @@ %files -f lrzsz.lang %{_mandir}/man1/* -%doc README.* ABOUT-NLS AUTHORS COMPATABILITY COPYING ChangeLog NEWS THANKS TODO +%license COPYING +%doc README.* ABOUT-NLS AUTHORS COMPATABILITY ChangeLog NEWS THANKS TODO %{_bindir}/rb %{_bindir}/rx %{_bindir}/rz ++++++ lrzsz-0.12.20-automake-1.13.patch ++++++ --- /var/tmp/diff_new_pack.wbOLTs/_old 2018-04-10 10:54:18.078030388 +0200 +++ /var/tmp/diff_new_pack.wbOLTs/_new 2018-04-10 10:54:18.078030388 +0200 @@ -1,10 +1,11 @@ -diff -urN lrzsz-0.12.20/configure.in lrzsz-0.12.20-new/configure.in ---- lrzsz-0.12.20/configure.in 1998-12-30 16:50:07.000000000 +0900 -+++ lrzsz-0.12.20-new/configure.in 2013-04-26 18:53:29.020100620 +0900 +Index: lrzsz-0.12.21rc/configure.in +=================================================================== +--- lrzsz-0.12.21rc.orig/configure.in ++++ lrzsz-0.12.21rc/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/crctab.c) - AM_INIT_AUTOMAKE(lrzsz, 0.12.20) + AM_INIT_AUTOMAKE(lrzsz, 0.12.21rc) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) ++++++ lrzsz-autotools.patch ++++++ --- /var/tmp/diff_new_pack.wbOLTs/_old 2018-04-10 10:54:18.110029232 +0200 +++ /var/tmp/diff_new_pack.wbOLTs/_new 2018-04-10 10:54:18.110029232 +0200 @@ -1,7 +1,8 @@ -diff -Nru lrzsz-0.12.20.orig/acinclude.m4 lrzsz-0.12.20/acinclude.m4 ---- lrzsz-0.12.20.orig/acinclude.m4 1998-12-27 23:08:59.000000000 +0100 -+++ lrzsz-0.12.20/acinclude.m4 2010-09-25 00:43:43.000000000 +0200 -@@ -13,7 +13,7 @@ +Index: lrzsz-0.12.21rc/acinclude.m4 +=================================================================== +--- lrzsz-0.12.21rc.orig/acinclude.m4 ++++ lrzsz-0.12.21rc/acinclude.m4 +@@ -13,7 +13,7 @@ AC_CACHE_VAL(lrzsz_cv_decl_errno, lrzsz_cv_decl_errno=yes, lrzsz_cv_decl_errno=no)]) AC_MSG_RESULT($lrzsz_cv_decl_errno) if test $lrzsz_cv_decl_errno = yes; then @@ -10,7 +11,7 @@ fi ]) -@@ -57,7 +57,7 @@ +@@ -57,7 +57,7 @@ AC_CACHE_VAL(ac_cv_type_speed_t, ], ac_cv_type_speed_t=yes, ac_cv_type_speed_t=no)])dnl AC_MSG_RESULT($ac_cv_type_speed_t) if test $ac_cv_type_speed_t = no; then @@ -19,7 +20,7 @@ fi ]) -@@ -69,7 +69,7 @@ +@@ -69,7 +69,7 @@ AC_DEFUN(lrzsz_HEADER_SYS_SELECT, #include <sys/select.h>], [struct tm *tp;], lrzsz_cv_header_sys_select=yes, lrzsz_cv_header_sys_select=no)]) if test $lrzsz_cv_header_sys_select = no; then @@ -28,10 +29,19 @@ fi ]) -diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in ---- lrzsz-0.12.20.orig/configure.in 1998-12-30 08:50:07.000000000 +0100 -+++ lrzsz-0.12.20/configure.in 2010-09-25 00:45:10.000000000 +0200 -@@ -20,6 +20,11 @@ +@@ -90,6 +90,6 @@ if test $ac_cv_type_socklen_t = no; then + cat >> confdefs.h <<\EOF + #define socklen_t int + EOF +- AC_DEFINE([socklen_t],int) ++ AC_DEFINE([socklen_t],int, [socklen_t]) + fi + ]) dnl DEFUN +Index: lrzsz-0.12.21rc/configure.in +=================================================================== +--- lrzsz-0.12.21rc.orig/configure.in ++++ lrzsz-0.12.21rc/configure.in +@@ -20,6 +20,11 @@ ALL_LINGUAS="de" AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -43,7 +53,7 @@ changequote(,)dnl case $VERSION in [0-9]*.[0-9]*.[0-9]*) README_ALPHA="README-alpha";; -@@ -33,25 +38,25 @@ +@@ -33,25 +38,25 @@ AC_ARG_ENABLE(timesync, [if test "$enableval" = "no" ; then : else @@ -74,7 +84,7 @@ AC_ARG_ENABLE(syslog, [--enable-syslog=FACILITY,{force,default,optional} include syslogsupport], [ -@@ -62,7 +67,7 @@ +@@ -62,7 +67,7 @@ AC_ARG_ENABLE(syslog, *,*) level=`echo $enableval|sed -e 's/^.*,//'` fac=`echo $enableval|sed -e 's/,.*$//'` @@ -83,7 +93,7 @@ ;; *) lookup_facility=LOG_UUCP -@@ -70,16 +75,16 @@ +@@ -70,16 +75,16 @@ AC_ARG_ENABLE(syslog, ;; esac if test "$level" = "force" ; then @@ -103,7 +113,7 @@ lookup_facility=LOG_UUCP ]) -@@ -90,8 +95,8 @@ +@@ -101,8 +106,8 @@ dnl AC_PROG_INSTALL included in AM_INIT dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE AC_PROG_RANLIB AC_ISC_POSIX @@ -114,7 +124,7 @@ AM_C_PROTOTYPES AC_C_CONST AC_C_INLINE -@@ -113,7 +118,7 @@ +@@ -124,7 +129,7 @@ if test `hostname` = tirka.ohse.de -a "$ fi case "$CFLAGS" in *-Wstrict-prototypes*) @@ -123,7 +133,7 @@ ;; esac -@@ -131,7 +136,7 @@ +@@ -142,7 +147,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/io LRZSZ_HEADERS_TERM_IO AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h) AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h) @@ -132,16 +142,26 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_SIZE_T -@@ -153,7 +158,7 @@ +@@ -165,7 +170,8 @@ dnl suggested by autoscan, but not reall dnl AC_FUNC_UTIME_NULL AC_FUNC_MMAP AC_FUNC_ALLOCA -AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF)) +AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [HAVE_STRUCT_UTIMBUF])) ++ AC_CHECK_FUNCS(gettimeofday settimeofday) AC_CHECK_FUNCS(strchr memcpy select vprintf) -@@ -206,10 +211,10 @@ +@@ -176,7 +182,7 @@ AC_REPLACE_FUNCS(stpcpy strftime vasprin + AC_REPLACE_GNU_GETOPT + + dnl for lib/error.c +-AC_DEFINE(HAVE_STRERROR) ++AC_DEFINE(HAVE_STRERROR, 1, HAVE_STRERROR) + + + dnl special tests +@@ -218,10 +224,10 @@ lrzsz_cv_sys_ftime_ok=yes, lrzsz_cv_sys_ftime_ok=no, lrzsz_cv_sys_ftime_ok=runtime)]) case $lrzsz_cv_sys_ftime_ok in @@ -154,7 +174,7 @@ AC_MSG_RESULT(will check at run time) ;; esac ]) -@@ -223,7 +228,7 @@ +@@ -235,7 +241,7 @@ AC_TRY_LINK([#include <time.h>],[return( ]) if test $libquark_cv_var_timezone = yes ; then AC_MSG_RESULT(yes) @@ -163,7 +183,7 @@ else AC_MSG_RESULT(no) fi -@@ -245,9 +250,9 @@ +@@ -257,9 +263,9 @@ ihave$lookup_facility ]) if test $lrzsz_cv_lookup_facility = yes ; then AC_MSG_RESULT(yes) @@ -175,30 +195,32 @@ AC_MSG_RESULT(no) fi fi -@@ -257,9 +262,8 @@ +@@ -269,9 +275,7 @@ AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(LIBS) -AM_GNU_GETTEXT - +- -AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME") +AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR]) - AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \ -diff -Nru lrzsz-0.12.20.orig/lib/Makefile.am lrzsz-0.12.20/lib/Makefile.am ---- lrzsz-0.12.20.orig/lib/Makefile.am 1998-12-27 17:25:26.000000000 +0100 -+++ lrzsz-0.12.20/lib/Makefile.am 2010-09-25 00:43:43.000000000 +0200 +Index: lrzsz-0.12.21rc/lib/Makefile.am +=================================================================== +--- lrzsz-0.12.21rc.orig/lib/Makefile.am ++++ lrzsz-0.12.21rc/lib/Makefile.am @@ -1,5 +1,4 @@ noinst_LIBRARIES=libzmodem.a -CFLAGS=@CFLAGS@ AUTOMAKE_OPTIONS=ansi2knr EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \ -diff -Nru lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in ---- lrzsz-0.12.20.orig/po/Makefile.in.in 1998-04-26 15:22:40.000000000 +0200 -+++ lrzsz-0.12.20/po/Makefile.in.in 2010-09-25 00:43:43.000000000 +0200 -@@ -51,7 +51,7 @@ +Index: lrzsz-0.12.21rc/po/Makefile.in.in +=================================================================== +--- lrzsz-0.12.21rc.orig/po/Makefile.in.in ++++ lrzsz-0.12.21rc/po/Makefile.in.in +@@ -51,7 +51,7 @@ stamp-cat-id $(POFILES) $(GMOFILES) $(SO POTFILES = \ @@ -207,7 +229,7 @@ CATOBJEXT = @CATOBJEXT@ INSTOBJEXT = @INSTOBJEXT@ -@@ -118,8 +118,8 @@ +@@ -118,8 +118,8 @@ install-data-yes: all for cat in $$catalogs; do \ cat=`basename $$cat`; \ case "$$cat" in \ @@ -218,10 +240,11 @@ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$$destdir/$$lang/LC_MESSAGES; \ -diff -Nru lrzsz-0.12.20.orig/src/Makefile.am lrzsz-0.12.20/src/Makefile.am ---- lrzsz-0.12.20.orig/src/Makefile.am 1998-12-28 09:38:47.000000000 +0100 -+++ lrzsz-0.12.20/src/Makefile.am 2010-09-25 00:43:43.000000000 +0200 -@@ -4,7 +4,6 @@ +Index: lrzsz-0.12.21rc/src/Makefile.am +=================================================================== +--- lrzsz-0.12.21rc.orig/src/Makefile.am ++++ lrzsz-0.12.21rc/src/Makefile.am +@@ -4,7 +4,6 @@ lsz_SOURCES=lsz.c timing.c zperr.c zread noinst_HEADERS = timing.h zglobal.h zmodem.h datadir = $(prefix)/@DATADIRNAME@ localedir = $(datadir)/locale @@ -229,7 +252,7 @@ DISTCLEAN_FILES=lrzszbug LDADD = ../lib/libzmodem.a @INTLLIBS@ -@@ -14,22 +13,16 @@ +@@ -14,22 +13,16 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcd #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\" DEFS = -DNFGVMIN @DEFS@ -DLOCALEDIR=\"$(localedir)\" ++++++ lrzsz-po.patch ++++++ --- /var/tmp/diff_new_pack.wbOLTs/_old 2018-04-10 10:54:18.122028798 +0200 +++ /var/tmp/diff_new_pack.wbOLTs/_new 2018-04-10 10:54:18.126028654 +0200 @@ -1,11 +1,13 @@ ---- po/de.po -+++ po/de.po 2001/01/22 09:52:51 1.3 -@@ -258,7 +258,7 @@ - #: src/lsz.c:1380 +Index: po/de.po +=================================================================== +--- po/de.po.orig ++++ po/de.po +@@ -254,7 +254,7 @@ msgstr "Keine Best�tigung f�r �bertragun + #: src/lsz.c:1361 #, c-format msgid "Xmodem sectors/kbytes sent: %3d/%2dk" -msgstr "Ymodem Sektoren/Kilobytes gesendet: %3d/%2dk" +msgstr "Xmodem Sektoren/Kilobytes gesendet: %3d/%2dk" - #: src/lsz.c:1382 + #: src/lsz.c:1363 #, c-format
