openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2021
- 1 participants
- 2358 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package util-macros for openSUSE:Factory checked in at 2021-02-01 13:25:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/util-macros (Old)
and /work/SRC/openSUSE:Factory/.util-macros.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-macros"
Mon Feb 1 13:25:06 2021 rev:6 rq:866561 version:1.19.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/util-macros/util-macros.changes 2019-08-27 15:20:19.244873042 +0200
+++ /work/SRC/openSUSE:Factory/.util-macros.new.28504/util-macros.changes 2021-02-01 13:25:06.389813320 +0100
@@ -1,0 +2,8 @@
+Mon Jan 25 11:21:22 UTC 2021 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- update to release 1.19.3
+ * Update README for gitlab migration
+ * Update configure.ac bug URL for gitlab migration
+ * XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find preprocessor
+
+-------------------------------------------------------------------
Old:
----
util-macros-1.19.2.tar.bz2
New:
----
util-macros-1.19.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ util-macros.spec ++++++
--- /var/tmp/diff_new_pack.Rr7uci/_old 2021-02-01 13:25:06.929814167 +0100
+++ /var/tmp/diff_new_pack.Rr7uci/_new 2021-02-01 13:25:06.933814173 +0100
@@ -1,7 +1,7 @@
#
# spec file for package util-macros
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: util-macros
-Version: 1.19.2
+Version: 1.19.3
Release: 0
Summary: The X Protocol
#Source URL: http://xorg.freedesktop.org/releases/individual/util/
++++++ util-macros-1.19.2.tar.bz2 -> util-macros-1.19.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/ChangeLog new/util-macros-1.19.3/ChangeLog
--- old/util-macros-1.19.2/ChangeLog 2018-03-05 02:41:59.000000000 +0100
+++ new/util-macros-1.19.3/ChangeLog 2021-01-24 15:41:31.000000000 +0100
@@ -1,3 +1,41 @@
+commit b8766308d2f78bc572abe5198007cf7aeec9b761
+Author: Matt Turner <mattst88(a)gmail.com>
+Date: Sun Jan 24 09:41:00 2021 -0500
+
+ Version bump: 1.19.3
+
+ Signed-off-by: Matt Turner <mattst88(a)gmail.com>
+
+commit 334c9750017426a12b5018ec27201758c1b83a7f
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Dec 7 20:34:07 2018 -0800
+
+ Update configure.ac bug URL for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 0883f6fa6e0dd40ddcec7c0675b0bd0d660f5ed6
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 19 23:37:25 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit bd66ce3ba4a9d1d1490cb5775a2fdd0b408879b6
+Author: Marvin Schmidt <marv(a)exherbo.org>
+Date: Fri May 27 15:13:56 2016 +0200
+
+ XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find preprocessor
+
+ On some distributions tools like cpp are prefixed with the host-triple,
+ to check for this prefixed version first AC_PATH_TOOL should be used. If
+ no prefixed cpp, it will fallback to the unprefixed name.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=96257
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
commit 771b773b50717884b37f6b2473166b4be4670076
Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
Date: Sun Mar 4 17:40:10 2018 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/Makefile.am new/util-macros-1.19.3/Makefile.am
--- old/util-macros-1.19.2/Makefile.am 2018-03-05 02:41:55.000000000 +0100
+++ new/util-macros-1.19.3/Makefile.am 2021-01-24 15:41:26.000000000 +0100
@@ -38,3 +38,5 @@
$(CHANGELOG_CMD)
dist-hook: ChangeLog
+
+EXTRA_DIST = README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/Makefile.in new/util-macros-1.19.3/Makefile.in
--- old/util-macros-1.19.2/Makefile.in 2018-03-05 02:41:58.000000000 +0100
+++ new/util-macros-1.19.3/Makefile.in 2021-01-24 15:41:30.000000000 +0100
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -172,7 +172,7 @@
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/xorg-macros.m4.in \
$(srcdir)/xorg-macros.pc.in $(srcdir)/xorgversion.m4 COPYING \
- ChangeLog INSTALL README install-sh missing
+ ChangeLog INSTALL install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -256,6 +256,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -269,6 +270,7 @@
dist_pkgdata_DATA = INSTALL
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = xorg-macros.pc
+EXTRA_DIST = README.md
all: all-am
.SUFFIXES:
@@ -293,8 +295,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -379,7 +381,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -422,7 +427,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -436,6 +441,10 @@
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
+dist-zstd: distdir
+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+ $(am__post_remove_distdir)
+
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@@ -447,7 +456,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -465,7 +474,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -475,9 +484,11 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
+ *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -658,9 +669,9 @@
.PHONY: all all-am am--refresh check check-am clean clean-generic \
cscopelist-am ctags-am dist dist-all dist-bzip2 dist-gzip \
dist-hook dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-aclocalDATA install-am install-data \
+ dist-zstd distcheck distclean distclean-generic distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-aclocalDATA install-am install-data \
install-data-am install-data-hook install-dist_pkgdataDATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/README new/util-macros-1.19.3/README
--- old/util-macros-1.19.2/README 2018-03-05 02:41:55.000000000 +0100
+++ new/util-macros-1.19.3/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-This is a set of autoconf macros used by the configure.ac scripts in
-other Xorg modular packages, and is needed to generate new versions
-of their configure scripts with autoconf.
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/util/macros
-
- http://cgit.freedesktop.org/xorg/util/macros/
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/README.md new/util-macros-1.19.3/README.md
--- old/util-macros-1.19.2/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/util-macros-1.19.3/README.md 2021-01-24 15:41:26.000000000 +0100
@@ -0,0 +1,19 @@
+This is a set of autoconf macros used by the configure.ac scripts in
+other Xorg modular packages, and is needed to generate new versions
+of their configure scripts with autoconf.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ https://gitlab.freedesktop.org/xorg/util/macros
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/aclocal.m4 new/util-macros-1.19.3/aclocal.m4
--- old/util-macros-1.19.2/aclocal.m4 2018-03-05 02:41:57.000000000 +0100
+++ new/util-macros-1.19.3/aclocal.m4 2021-01-24 15:41:29.000000000 +0100
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.16.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.16.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -197,8 +197,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -265,7 +265,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -307,7 +307,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -328,7 +328,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -349,7 +349,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -388,7 +388,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -419,7 +419,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -500,7 +500,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -560,7 +560,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -588,7 +588,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -607,7 +607,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/configure new/util-macros-1.19.3/configure
--- old/util-macros-1.19.2/configure 2018-03-05 02:41:57.000000000 +0100
+++ new/util-macros-1.19.3/configure 2021-01-24 15:41:29.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for util-macros 1.19.2.
+# Generated by GNU Autoconf 2.69 for util-macros 1.19.3.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/issues>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -266,7 +266,7 @@
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf(a)gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: https://gitlab.freedesktop.org/xorg/util/macros/issues
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -580,9 +580,9 @@
# Identity of this package.
PACKAGE_NAME='util-macros'
PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.19.2'
-PACKAGE_STRING='util-macros 1.19.2'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_VERSION='1.19.3'
+PACKAGE_STRING='util-macros 1.19.3'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/util/macros/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@@ -635,6 +635,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -700,6 +701,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -952,6 +954,15 @@
| -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=* \
@@ -1089,7 +1100,7 @@
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.
@@ -1202,7 +1213,7 @@
# 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 util-macros 1.19.2 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.19.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1242,6 +1253,7 @@
--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]
@@ -1268,7 +1280,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of util-macros 1.19.2:";;
+ short | recursive ) echo "Configuration of util-macros 1.19.3:";;
esac
cat <<\_ACEOF
@@ -1279,7 +1291,7 @@
--enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0")
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/issues>.
_ACEOF
ac_status=$?
fi
@@ -1342,7 +1354,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-util-macros configure 1.19.2
+util-macros configure 1.19.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1359,7 +1371,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by util-macros $as_me 1.19.2, which was
+It was created by util-macros $as_me 1.19.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1708,7 +1720,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2223,7 +2235,7 @@
# Define the identity of the package.
PACKAGE='util-macros'
- VERSION='1.19.2'
+ VERSION='1.19.3'
cat >>confdefs.h <<_ACEOF
@@ -2253,8 +2265,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -2305,7 +2317,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -2927,7 +2939,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by util-macros $as_me 1.19.2, which was
+This file was extended by util-macros $as_me 1.19.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2974,13 +2986,13 @@
Configuration files:
$config_files
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/util/macros/issues>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-util-macros config.status 1.19.2
+util-macros config.status 1.19.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/configure.ac new/util-macros-1.19.3/configure.ac
--- old/util-macros-1.19.2/configure.ac 2018-03-05 02:41:55.000000000 +0100
+++ new/util-macros-1.19.3/configure.ac 2021-01-24 15:41:26.000000000 +0100
@@ -23,8 +23,8 @@
AC_PREREQ([2.62])
AC_INIT([util-macros],
- [1.19.2],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [1.19.3],
+ [https://gitlab.freedesktop.org/xorg/util/macros/issues],
[util-macros])
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/install-sh new/util-macros-1.19.3/install-sh
--- old/util-macros-1.19.2/install-sh 2018-03-05 02:41:58.000000000 +0100
+++ new/util-macros-1.19.3/install-sh 2021-01-24 15:41:30.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -324,34 +332,43 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
+ # here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p' feature.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
@@ -427,14 +444,25 @@
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask &&
+ { test -z "$stripcmd" || {
+ # Create $dsttmp read-write so that cp doesn't create it read-only,
+ # which would cause strip to fail.
+ if test -z "$doit"; then
+ : >"$dsttmp" # No need to fork-exec 'touch'.
+ else
+ $doit touch "$dsttmp"
+ fi
+ }
+ } &&
+ $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -493,9 +521,9 @@
done
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/missing new/util-macros-1.19.3/missing
--- old/util-macros-1.19.2/missing 2018-03-05 02:41:58.000000000 +0100
+++ new/util-macros-1.19.3/missing 2021-01-24 15:41:30.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/util-macros-1.19.2/xorg-macros.m4.in new/util-macros-1.19.3/xorg-macros.m4.in
--- old/util-macros-1.19.2/xorg-macros.m4.in 2018-03-05 02:41:55.000000000 +0100
+++ new/util-macros-1.19.3/xorg-macros.m4.in 2021-01-24 15:41:26.000000000 +0100
@@ -57,7 +57,7 @@
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
AC_REQUIRE([AC_PROG_CPP])
-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
+AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
# Check for flag to avoid builtin definitions - assumes unix is predefined,
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libXt for openSUSE:Factory checked in at 2021-02-01 13:25:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libXt (Old)
and /work/SRC/openSUSE:Factory/.libXt.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXt"
Mon Feb 1 13:25:04 2021 rev:12 rq:866558 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libXt/libXt.changes 2019-07-08 15:02:08.670636118 +0200
+++ /work/SRC/openSUSE:Factory/.libXt.new.28504/libXt.changes 2021-02-01 13:25:04.689810653 +0100
@@ -1,0 +2,14 @@
+Sun Jan 24 20:26:56 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 1.2.1:
+ * _XtCalloc actually uses a Cardinal, not size_t
+ * add errorhandling to _XtVaToTypedArgList()
+ * refactoring, reduce indent level
+ * work within existing interface which attempts to obtain the
+ display-pointer from the screen-pointer but fails when the screen-pointer
+ itself is invalid. Ensure that the screen-pointer is valid by checking
+ the default_screen value against the valid range, and forcing it to zero
+ if it is out of bounds.
+ * indent
+
+-------------------------------------------------------------------
Old:
----
libXt-1.2.0.tar.bz2
New:
----
libXt-1.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libXt.spec ++++++
--- /var/tmp/diff_new_pack.AfcUyR/_old 2021-02-01 13:25:05.325811651 +0100
+++ /var/tmp/diff_new_pack.AfcUyR/_new 2021-02-01 13:25:05.329811657 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libXt
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
Name: libXt
%define lname libXt6
-Version: 1.2.0
+Version: 1.2.1
Release: 0
Summary: X Toolkit Intrinsics library
License: MIT
Group: Development/Libraries/C and C++
-Url: http://xorg.freedesktop.org/
+URL: http://xorg.freedesktop.org/
#Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXt
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libXt/
++++++ libXt-1.2.0.tar.bz2 -> libXt-1.2.1.tar.bz2 ++++++
++++ 62760 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package toolbox for openSUSE:Factory checked in at 2021-02-01 13:25:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/toolbox (Old)
and /work/SRC/openSUSE:Factory/.toolbox.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "toolbox"
Mon Feb 1 13:25:02 2021 rev:9 rq:866535 version:2.0+git20210125.50611db
Changes:
--------
--- /work/SRC/openSUSE:Factory/toolbox/toolbox.changes 2021-01-22 21:50:07.633662146 +0100
+++ /work/SRC/openSUSE:Factory/.toolbox.new.28504/toolbox.changes 2021-02-01 13:25:03.249808395 +0100
@@ -1,0 +2,12 @@
+Mon Jan 25 10:24:32 UTC 2021 - kukuk(a)suse.com
+
+- Update to version 2.0+git20210125.50611db:
+ * Document configuration files, add /usr/etc/toolboxrc
+ * Update README to include commands
+ * Update the README
+ * Be even more compatible with Silverblue Toolbox
+ * Introduce commands, for compatibility with Silverblue's toolbox
+ * Mount /run/media and and /tmp inside a user toolbox
+ * Export more env variables inside (user) toolboxes
+
+-------------------------------------------------------------------
Old:
----
microos-toolbox-1.0+git20210119.b5acdcf.tar.xz
toolboxrc
New:
----
microos-toolbox-2.0+git20210125.50611db.tar.xz
toolboxrc.sle-micro
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ toolbox.spec ++++++
--- /var/tmp/diff_new_pack.yp5ONl/_old 2021-02-01 13:25:04.073809687 +0100
+++ /var/tmp/diff_new_pack.yp5ONl/_new 2021-02-01 13:25:04.077809693 +0100
@@ -17,14 +17,14 @@
Name: toolbox
-Version: 1.0+git20210119.b5acdcf
+Version: 2.0+git20210125.50611db
Release: 0
Summary: Script to start a toolbox container for system debugging
License: Apache-2.0
Group: System/Management
URL: https://github.com/thkukuk/microos-toolbox
Source: microos-toolbox-%{version}.tar.xz
-Source1: toolboxrc
+Source1: toolboxrc.sle-micro
Requires: podman
BuildArch: noarch
++++++ _service ++++++
--- /var/tmp/diff_new_pack.yp5ONl/_old 2021-02-01 13:25:04.105809737 +0100
+++ /var/tmp/diff_new_pack.yp5ONl/_new 2021-02-01 13:25:04.105809737 +0100
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">1.0</param>
- <param name="versionformat">1.0+git%cd.%h</param>
+ <param name="version">2.0</param>
+ <param name="versionformat">2.0+git%cd.%h</param>
<param name="url">git://github.com/thkukuk/microos-toolbox.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.yp5ONl/_old 2021-02-01 13:25:04.125809768 +0100
+++ /var/tmp/diff_new_pack.yp5ONl/_new 2021-02-01 13:25:04.125809768 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/thkukuk/microos-toolbox.git</param>
- <param name="changesrevision">b5acdcfad5dd3f09536bd312790015f61c27f40a</param>
+ <param name="changesrevision">50611dbcda36b1e7da6770ee498bd38bf4ab607a</param>
</service>
</servicedata>
\ No newline at end of file
++++++ microos-toolbox-1.0+git20210119.b5acdcf.tar.xz -> microos-toolbox-2.0+git20210125.50611db.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-toolbox-1.0+git20210119.b5acdcf/README.md new/microos-toolbox-2.0+git20210125.50611db/README.md
--- old/microos-toolbox-1.0+git20210119.b5acdcf/README.md 2021-01-19 11:01:40.000000000 +0100
+++ new/microos-toolbox-2.0+git20210125.50611db/README.md 2021-01-25 11:23:20.000000000 +0100
@@ -1,105 +1,129 @@
# toolbox - bring your own tools with you
On systems using `transactional-update` it is not really possible - due to the read-only root filesystem - to install tools to analyze problems in the currently running system as a reboot is always required. This makes it next to impossible to debug such problems.
-`toolbox` is a small script that launches a podman container in a rootless or rootfull state to let you bring in your favorite debugging or admin tools in such a system. You can also install and run GUI applications in your `toolbox` container. The root filesystem can be found at `/media/root`.
+`toolbox` is a small script that launches a podman container in a rootless or rootfull state to let you bring in your favorite debugging or admin tools in such a system.
+
+You can also install and run GUI applications in your `toolbox` container. The root filesystem can be found at `/media/root`. In a "user toolbox" (i.e., one started with `toolbox -u`) the user's home directory is available in the usual place (`/home/$USER`).
+
+## Usage
-## Usage
-
The following options are avialbe in `toolbox`:
* `-h` or `--help`: Shows the help message
* `-u` or `--user`: Run as the current user inside the container
-* `-R` or `--registry` `<registry>`: Explicitly specify the registry to use
-* `-I` or `--image` `<image>`: Explicitly specify the image to pull
+* `-R` or `--reg` `<registry>`: Explicitly specify the registry to use
+* `-I` or `--img` `<image>`: Explicitly specify the image to pull
+* `-i` or `--image` `<image>`: Full URI of the image to pull (alternative to `-R` & `-I`)
* `-r` or `--root`: Runs podman via sudo as root
-* `-t` or `--tag` <tag>: Add <tag> to the toolbox name
-
-You may override the following variables by setting them in ${TOOLBOXRC}:
-* REGISTRY: The registry to pull from. Default value is: `registry.opensuse.org`.
-* IMAGE: The image and tag from the registry to pull. Default value is: `opensuse/toolbox`.
-* TOOLBOX_NAME: The name to use for the local container. Default value is: `"${HOME}"/.toolboxrc`.
-* TOOLBOX_SHELL: Standard shell if no other commands are given. Default value is: `/bin/bash`.
-
-Example toolboxrc:
-* `REGISTRY`=my.special.registry.example.com
-* `IMAGE`=debug:latest
-* `TOOLBOX_NAME`=special-debug-container
-* `TOOLBOX_SHELL`=/bin/bash"
-
-If a config file is found, with REGISTRY and IMAGE defined, "${REGISTRY}/${IMAGE}" is used, overriding the default.
-If -R and/or -I is/are used they override both the defaults and the content of REGISTRY and/or IMAGE from the config file.
-
-### Rootfull Usage Example
-
-```
-$ /usr/bin/toolbox
-Spawning a container 'toolbox-root' with image 'registry.opensuse.org/opensuse/toolbox'
-51e475f05d8bb8a5bf110bbecd960383bf8cfade1569587edef92076215f0eba
-toolbox-root
-Container started successfully. To exit, type 'exit'.
-sh-5.0# ls -alF /media/root
-...
-sh-5.0# tcpdump -i ens3
-tcpdump: verbose output suppressed, use -v or -vv for full protocol decode
-listening on ens3, link-type EN10MB (Ethernet), capture size 65535 bytes
-...
-sh-5.0# zypper in vim
-Loading repository data...
-Reading installed packages...
-Resolving package dependencies...
+* `-t` or `--tag` `<tag>`: Add `<tag>` to the toolbox name
+* `-c` or `--container` `<name>`: Fully replace the toolbox name with `<name>` (alternative to `-t`)
-The following 5 NEW packages are going to be installed:
- libgdbm6 libgdbm_compat4 perl vim vim-data-common
+You may override the following variables by setting them in `${HOME}/.toolboxrc`:
+* `REGISTRY`: The registry to pull from. Default value is: `registry.opensuse.org`.
+* `IMAGE`: The image and tag from the registry to pull. Default value is: `opensuse/toolbox`.
+* `TOOLBOX_NAME`: The name to use for the local container. Default value is: `toolbox-${USER}`.
+* `TOOLBOX_SHELL`: Standard shell if no other commands are given. Default value is: `/bin/bash`.
-5 new packages to install.
-Overall download size: 9.0 MiB. Already cached: 0 B. After the operation,
-additional 49.4 MiB will be used.
-Continue? [y/n/v/...? shows all options] (y):
+Example `.toolboxrc` file:
+```
+REGISTRY=my.special.registry.example.com
+IMAGE=debug:latest
+TOOLBOX_NAME=special-debug-container
+TOOLBOX_SHELL=/bin/bash
+```
+
+If a config file is found, with `REGISTRY` and `IMAGE` defined, `${REGISTRY}/${IMAGE}` is used, overriding the default.
+If `-R` and/or `-I` (or `-i`) is/are used they override both the defaults and the content of `REGISTRY` and/or `IMAGE` from the config file.
+
+### Configuration files
+
+Beside the user configuration file, there are two additional system wide
+configuration files:
+* `/usr/etc/toolboxrc`: distribution specific configuration file
+* `/etc/toolboxrc`: system specific configuration file created by a system administrator
+
+The configuration files are read in the order: `/usr/etc/toolboxrc`,
+`/etc/toolboxrc`, `~/.toolboxrc`. The last value is used.
+
+### Alternative UI
+
+It is possible to interact with `toolbox` using an interface which is similar to the one of [containers/toolbox](https://github.com/containers/toolbox). That is based on commands, such as:
+* `create`: Creates a toolbox, but does not "enter" inside of it
+* `enter`: Enter a toolbox (creating it, if it does not exist, in our case)
+* `run`: Run a command / start a program inside a toolbox
+* `list`: Show existing toolboxes, although for now it is basically an alias to `podman ps -a`
+
+### Rootless Usage
+
+By default a toolbox is a rootless container. This means that being root inside the toolbox itself does not map with being root on the host,
+e.g., as far as file permissions, access to special files, etc go.
+
+#### Rootless Usage Example
+
+```
+$ id
+uid=1000(dario) gid=100(users) groups=100(users),496(wheel),1000(dario)
+$ toolbox
+.toolboxrc file detected, overriding defaults...
+Container 'toolbox-dario' already exists. Trying to start...
+(To remove the container and start with a fresh toolbox, run: podman rm 'toolbox-dario')
+toolbox-dario
+Container started.
+Entering container. To exit, type 'exit'.
+...
+toolbox-dario:/ # id
+uid=0(root) gid=0(root) groups=0(root)
+toolbox-dario:/ # ls -alF /media/root
+total 88
+drwxr-xr-x 1 65534 65534 256 Sep 12 10:33 ./
+drwxr-xr-x 3 root root 48 Jan 20 14:06 ../
+drwxr-xr-x 1 65534 65534 1674 Dec 17 02:17 bin/
+drwxr-xr-x 1 65534 65534 554 Jan 18 10:44 boot/
+drwxr-xr-x 22 65534 65534 4300 Jan 19 22:22 dev/
+...
+toolbox-dario:/ # tcpdump -i em1
+tcpdump: em1: You don't have permission to capture on that device
+(socket: Operation not permitted)
...
-sh-5.0# vi /media/root/etc/passwd
+toolbox-dario:/ # touch /media/root/etc/foo
+touch: cannot touch '/media/root/etc/foo': Permission denied
```
-## Rootless Usage
+#### Rootless Usage Example, With User Setup
In case a proper user environment is what one wants (e.g., for development), the `-u` (or `--user`) option can be used:
-### Rootless Usage Example
-
```
$ id -a
uid=1000(dario) gid=1000(dario) groups=1000(dario),...
-$ ./toolbox -u
-Spawning a container 'toolbox-dario-user' with image 'registry.opensuse.org/opensuse/toolbox'
-a0a5a332ee6d2a8dff6d8fb68a9ac70aeaacc9d531cf82f610ae48bec9e93ea1
+$ toolbox -u
+.toolboxrc file detected, overriding defaults...
+Container 'toolbox-dario-user' already exists. Trying to start...
+(To remove the container and start with a fresh toolbox, run: podman rm 'toolbox-dario-user')
toolbox-dario-user
-Setting up user 'dario' inside the container...
-(NOTE that, if 'sudo' and related packages are not present in the image already,
-this may take some time. But this will only happen now that the toolbox is being created)
-Container started successfully. To exit, type 'exit'.
-dario@toolbox:~>
+Container started.
+Entering container. To exit, type 'exit'.
+dario@toolbox-dario-user:~> id
+uid=1000(dario) gid=100(users) groups=100(users)
...
-dario@toolbox:~> id -a
-uid=1000(dario) gid=1000(dario) groups=1000(dario)
-dario@toolbox:~> echo $HOME
+dario@toolbox-dario-user:~> echo $HOME
/home/dario
-dario@toolbox:~> ls $HOME/.. -l
+dario@toolbox-dario-user:~> ls -l /home
total 0
-drwxr-xr-x 1 dario dario 2422 Feb 14 10:22 dario
+drwxr-xr-x 1 dario users 2290 Jan 20 14:33 dario
```
The user will have (paswordless) `sudo` access so, e.g., packages can be installed, etc:
```
$ ./toolbox -u
-Spawning a container 'toolbox-dario-user' with image 'registry.opensuse.org/opensuse/toolbox'
-4a05e36edb55776ae5f32cb736529ba94bdea4a39a8e5d6258ca230f646da733
+.toolboxrc file detected, overriding defaults...
+Container 'toolbox-dario-user' already exists. Trying to start...
+(To remove the container and start with a fresh toolbox, run: podman rm 'toolbox-dario-user')
toolbox-dario-user
-Setting up user 'dario' (with 'sudo' access) inside the container...
-(NOTE that, if 'sudo' and related packages are not present in the image already,
-this may take some time. But this will only happen now that the toolbox is being created)
-Container started successfully. To exit, type 'exit'.
-dario@toolbox:~>
+Container started.
+Entering container. To exit, type 'exit'.
...
-dario@toolbox:~> sudo zypper install gcc
+dario@toolbox-dario-user:~> sudo zypper in gcc
Loading repository data...
Reading installed packages...
Resolving package dependencies...
@@ -111,28 +135,134 @@
Overall download size: 42.6 MiB. Already cached: 0 B. After the operation, additional 179.7 MiB will be used.
Continue? [y/n/v/...? shows all options] (y):
...
-dario@toolbox:~> gcc
-gcc: fatal error: no input files
-compilation terminated.
+dario@toolbox-dario-user:~> which gcc
+/usr/bin/gcc
+...
+dario@toolbox-dario-user:~> sudo tcpdump -i em1
+tcpdump: em1: You don't have permission to capture on that device
+(socket: Operation not permitted)
+```
+
+### Rootful Usage
+
+In fact, toolbox called by a normal user will start the toolbox container but the root filesystem of the host cannot be modified, special devices cannot be accessed, etc.
+Running toolbox with sudo has the disadvantage, that the `.toolboxrc` in the `root` user home directory, and not the user's, is used.
+To run the toolbox container with root rights, `toolbox --root` (or `-r`) has to be used.
+
+#### Rootfull Usage Example
+
+```
+$ id
+uid=1000(dario) gid=100(users) groups=100(users),496(wheel),1000(dario)
+$ toolbox -r
+.toolboxrc file detected, overriding defaults...
+Spawning a container 'toolbox-dario' with image 'registry.opensuse.org/opensuse/toolbox'
+08a8b984be2430a5d2cb38d55b26a93ddda3e5e5d183fbb75ac7287421a3f8be
+toolbox-dario
+Container created.
+Entering container. To exit, type 'exit'.
+...
+toolbox-dario:/ # id
+uid=0(root) gid=0(root) groups=0(root)
+toolbox-dario:/ # ls -alF /media/root
+total 88
+drwxr-xr-x 1 root root 256 Sep 12 10:33 ./
+drwxr-xr-x 1 root root 8 Jan 20 13:51 ../
+drwxr-xr-x 1 root root 1674 Dec 17 02:17 bin/
+drwxr-xr-x 1 root root 554 Jan 18 10:44 boot/
+drwxr-xr-x 22 root root 4300 Jan 19 22:22 dev/
+...
+toolbox-dario:/ # tcpdump -i em1
+tcpdump: verbose output suppressed, use -v or -vv for full protocol decode
+listening on em1, link-type EN10MB (Ethernet), capture size 262144 bytes
+13:54:52.843421 IP 192.168.0.9.46690 > 192.168.0.255.32412: UDP, length 21
+13:54:52.843655 IP 192.168.0.9.59404 > 192.168.0.255.32414: UDP, length 21
+...
+toolbox-dario:/ # touch /media/root/etc/foo
+toolbox-dario:/ # ls -la /media/root/etc/foo
+-rw-r--r-- 1 root root 0 Jan 20 14:09 /media/root/etc/foo
```
## Advanced Usage
+### Running a command/program inside a toolbox
+
+By default, toolbox drops the user into a shell, inside the container. It is possible, instead, to launch a specific command or program inside of the container:
+
+```
+$ toolbox -u sudo zypper in figlet
+.toolboxrc file detected, overriding defaults...
+Container 'toolbox-dario-user' already exists. Trying to start...
+(To remove the container and start with a fresh toolbox, run: podman rm 'toolbox-dario-user')
+toolbox-dario-user
+Container started.
+Entering container. To exit, type 'exit'.
+Loading repository data...
+Reading installed packages...
+Resolving package dependencies...
+
+The following NEW package is going to be installed:
+ figlet
+
+1 new package to install.
+Overall download size: 3.0 MiB. Already cached: 0 B. After the operation, additional 75.2 MiB will be used.
+Continue? [y/n/v/...? shows all options] (y):
+...
+...
+$ toolbox -u figlet Hey from toolbox!
+.toolboxrc file detected, overriding defaults...
+Container 'toolbox-dario-user' already exists. Trying to start...
+(To remove the container and start with a fresh toolbox, run: podman rm 'toolbox-dario-user')
+toolbox-dario-user
+Container started.
+Entering container. To exit, type 'exit'.
+ _ _ __
+| | | | ___ _ _ / _|_ __ ___ _ __ ___
+| |_| |/ _ \ | | | | |_| '__/ _ \| '_ ` _ \
+| _ | __/ |_| | | _| | | (_) | | | | | |
+|_| |_|\___|\__, | |_| |_| \___/|_| |_| |_|
+ |___/
+ _ _ _ _
+| |_ ___ ___ | | |__ _____ _| |
+| __/ _ \ / _ \| | '_ \ / _ \ \/ / |
+| || (_) | (_) | | |_) | (_) > <|_|
+ \__\___/ \___/|_|_.__/ \___/_/\_(_)
+```
+
+Of course, the command to run could even be a shell. However, for using a different shell than the default one inside of the toolbox, it is also possible to change the value of the `TOOLBOX_SHELL` variable within the config file.
+
### Use a custom image
toolbox uses an openSUSE-based userspace environment called `opensuse/toolbox` by default, but this can be changed to any container image. Simply override environment variables in `$HOME/.toolboxrc`:
-#### toolbox
-
```
# cat ~/.toolboxrc
REGISTRY=registry.opensuse.org
IMAGE=opensuse/toolbox:latest
```
-### Root container as normal user
+Alternatively, either the `-R` and `-I` parameters can be used, like this:
+```
+$ toolbox -u -R registry.opensuse.org -I opensuse/tumbleweed:latest
+.toolboxrc file detected, overriding defaults...
+Spawning a container 'toolbox-dario-user' with image 'registry.opensuse.org/opensuse/tumbleweed:latest'
+b9b79fda84f1022112c0841f6b3711511a640391a9379adb4257b81a26887c0f
+toolbox-dario-user
+Setting up user 'dario' (with 'sudo' access) inside the container...
+(NOTE that, if 'sudo' and related packages are not present in the image already,
+this may take some time. But this will only happen now that the toolbox is being created)
+Container created.
+Entering container. To exit, type 'exit'.
+dario@toolbox-dario-user:~> exit
+...
+dario@toolbox-dario-user:~>
+exit
+dario@Wayrath:~/Documents/Work/Dario/SUSE> podman ps -a
+CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
+b9b79fda84f1 registry.opensuse.org/opensuse/tumbleweed:latest sleep +Inf About a minute ago Exited (143) 3 seconds ago toolbox-dario-user
+```
-toolbox called by a normal user will start the toolbox container, too, but the root filesystem cannot be modified. Running toolbox with sudo has the disadvantage, that the .toolboxrc from root and not the user is used. To run the toolbox container with root rights, `toolbox --root` has to be used.
+Or just put the full URI under the `-i` parameter, such as `toolbox -u -i registry.opensuse.org/opensuse/tumbleweed:latest`.
### Multiple Toolboxes
@@ -148,6 +278,9 @@
(To remove the container and start with a fresh toolbox, run: podman rm 'toolbox-dario-user')
toolbox-dario-user
Container started successfully. To exit, type 'exit'.
+dario@toolbox-dario-user:~>
+...
+dario@toolbox-dario-user:~> exit
...
$ ./toolbox -u -t virt
Spawning a container 'toolbox-dario-user-virt' with image 'registry.opensuse.org/opensuse/toolbox'
@@ -157,14 +290,55 @@
(NOTE that, if 'sudo' and related packages are not present in the image already,
this may take some time. But this will only happen now that the toolbox is being created)
Container started successfully. To exit, type 'exit'.
-dario@toolbox:~>
+dario@toolbox-dario-user-virt:~>
...
-dario@toolbox:~> exit
+dario@toolbox-dario-user-virt:~> exit
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
0dbfbe02b020 registry.opensuse.org/opensuse/toolbox:latest /bin/bash 8 minutes ago Exited (0) 6 minutes ago toolbox-dario-user-virt
b20985e6de68 registry.opensuse.org/opensuse/toolbox:latest /bin/bash 10 minutes ago Exited (0) 7 minutes ago toolbox-dario-user
```
+### Alternative (Command Based) UI
+
+If wanting to use the commands-based interface, this is the basic operations
+are performed:
+* Creating a user toolbox and entering inside it (equivalent of `toolbox -u`):
+```
+toolbox create
+toolbox enter
+```
+* Running a command inside a toolbox (equivalent of `toolbox -u /usr/bin/foo`):
+```
+toolbox run ls /home/
+```
+* Creating (and entering) a toolbox tagged as `devel` (equivalent of `toolbox -u -t devel`):
+```
+toolbox create -t devel
+toolbox enter -t devel
+```
+* Creating (and entering) a toolbox called `tbx-apps` (equivalent of `toolbox -u -c tbx-apps`):
+```
+toolbox create -c tbx-apps
+toolbox enter -c tbx-apps
+```
+
+Option `-r` can be used together with commands as well, like this:
+* Creating a toolbox running as root, with your user inside (equivalent of `toolbox -u -r`):
+```
+toolbox create -r
+toolbox enter -r
+```
+* Running a command inside a toolbox that runs as root on the host and has your
+user configured in it (equivalent of `toolbox -u -r /usr/bin/foo`):
+```
+toolbox create -r
+toolbox run -r ls /home/
+```
+
+Note that this latter working mode has no equivalent in containers/toolbox where, if
+wanting to start a toolbox that runs as the root user on the host, it must be started
+with `sudo`.
+
### Automatically enter toolbox on login
Set an `/etc/passwd` entry for one of the users to `/usr/bin/toolbox`:
@@ -183,16 +357,19 @@
(To remove the container and start with a fresh toolbox, run: podman rm 'toolbox-bob')
toolbox-bob
Container started successfully. To exit, type 'exit'.
-sh-5.0#
+toolbox-bob:/ #
```
## Troubleshooting
-#### Podman can't pull/run images with user
-If you want to run a rootless `toolbox` setup you might need to add a range of UID and GID for the user you want to run `toolbox` with. Before adding UID and GID ranges check if `/etc/subuid` and `/etc/subgid` are actually empty. If empty you can run this as root to populate them:
+### Podman can't pull/run images with user
+If you want to run a rootless `toolbox` setup you might need to add a range of UID and GID for the user you want to run `toolbox` with. Before adding UID and GID ranges check if `/etc/subuid` and `/etc/subgid` are actually empty. If empty you can run this as root to populate them:
+
```
echo "podman_user:100000:65536" > /etc/subuid
echo "podman_user:100000:65536" > /etc/subgid
```
-#### GUI application can't connect to display
-This happens if you run the container as root - with sudo for example - while you're logged in as user to the desktop environment. The easiest way is to use `toolbox -u` with your user to setup a `rootless toolbox` container for such cases.
+
+### GUI application can't connect to display
+
+This happens if you run the container as root - with sudo for example - while you're logged in as user to the desktop environment. The easiest way is to use `toolbox -u` with your user to setup a "rootless toolbox" container for such cases.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-toolbox-1.0+git20210119.b5acdcf/toolbox new/microos-toolbox-2.0+git20210125.50611db/toolbox
--- old/microos-toolbox-1.0+git20210119.b5acdcf/toolbox 2021-01-19 11:01:40.000000000 +0100
+++ new/microos-toolbox-2.0+git20210125.50611db/toolbox 2021-01-25 11:23:20.000000000 +0100
@@ -26,8 +26,31 @@
TOOLBOX_SHELL="/bin/bash"
SUDO=
+test -f /usr/etc/toolboxrc && . /usr/etc/toolboxrc
test -f /etc/toolboxrc && . /etc/toolboxrc
+MODE="system"
+
+USER_ENV="DBUS_SESSION_BUS_ADDRESS \
+ DBUS_SYSTEM_BUS_ADDRESS \
+ DESKTOP_SESSION \
+ SESSION_MANAGER \
+ DISPLAY \
+ LANG \
+ SSH_AUTH_SOCK \
+ USER \
+ USERNAME \
+ WAYLAND_DISPLAY \
+ XAUTHORITY \
+ XAUTHLOCALHOSTNAME \
+ XDG_CURRENT_DESKTOP \
+ XDG_DATA_DIRS \
+ XDG_MENU_PREFIX \
+ XDG_RUNTIME_DIR \
+ XDG_SESSION_CLASS \
+ XDG_SESSION_DESKTOP \
+ XDG_SESSION_TYPE"
+
setup() {
# Allow user overrides
if [ -f "${TOOLBOXRC}" ]; then
@@ -37,11 +60,12 @@
TOOLBOX_IMAGE="${REGISTRY}"/"${IMAGE}"
}
-run() {
+create() {
if ! image_exists; then
image_pull
fi
+ local msg="creat"
local runlabel=$(image_runlabel)
if ! container_exists; then
echo "Spawning a container '$TOOLBOX_NAME' with image '$TOOLBOX_IMAGE'"
@@ -57,6 +81,7 @@
else
echo "Container '$TOOLBOX_NAME' already exists. Trying to start..."
echo "(To remove the container and start with a fresh toolbox, run: podman rm '$TOOLBOX_NAME')"
+ msg="start"
fi
local state=$(container_state)
@@ -85,7 +110,13 @@
${SUDO} podman exec --user root ${TOOLBOX_NAME} rm ${tmp_user_setup}
fi
- echo "Container started successfully. To exit, type 'exit'."
+ echo "Container ${msg}ed."
+}
+
+run() {
+ create
+
+ echo "Entering container. To exit, type 'exit'."
container_exec "$@"
}
@@ -113,6 +144,10 @@
${SUDO} podman pull "$TOOLBOX_IMAGE"
}
+list() {
+ ${SUDO} podman ps --all
+}
+
container_create() {
if ! ${SUDO} podman create \
--hostname "$TOOLBOX_NAME" \
@@ -153,16 +188,30 @@
}
show_help() {
- echo "USAGE: toolbox [[-h/--help] | [-r/--root] [-u/--user] [-t/--tag <tag>] [command]]
+ echo "USAGE: toolbox [[-h/--help] | [command] [-r/--root] [-u/--user]
+ [[-R/--reg <registry>] [-I/--img <image>]|[-i/--image <image_URI>]]
+ [[-t/--tag <tag>]|[-c/--container <name>]] [command_to_run]]
toolbox is a small script that launches a container to let you bring in your favorite debugging or admin tools.
The toolbox container is a pet container and will be restarted on following runs.
To remove the container and start fresh, do podman rm ${TOOLBOX_NAME}.
+Commands are optional. The supported ones are:
+ list: List existing toolboxes
+ create: Just create the toolbox
+ enter: Enter inside a toolbox (if it does not exist, it is created)
+ run: Run command_to_run inside a toolbox (if it does not exist, it is created)
+
Options:
-h/--help: Shows this help message
-u/--user: Run as the current user inside the container
-r/--root: Runs podman via sudo as root
-t/--tag <tag>: Add <tag> to the toolbox name
+ -c/--container <name>: Set the name of the toolbox to be equal to <name>
+ (use this alternatively to -t)
+ -R/--reg <registry>: Pulls the container image from <registry>
+ -I/--img <image>: Pulls the image called <image>
+ -i/--image <image_URI>: Pulls <image_URI> as a container image (use this
+ alternatively to -R and -I)
You may override the following variables by setting them in ${TOOLBOXRC}:
- REGISTRY: The registry to pull from. Default: $REGISTRY
@@ -177,15 +226,43 @@
TOOLBOX_SHELL=/bin/bash"
}
+is_option() {
+ if [ "${1:0:1}" = "-" ]; then
+ return 1
+ fi
+ return 0
+}
+
main() {
# Execute setup first so we get proper variables
setup
- # If we are passed a help switch, show help and exit
- ARGS=`getopt -o hrut:R:I: --long help,root,user,tag:,registry:,image: -n toolbox -- "$@"`
+
+ # Deal with commands first. We want to support both "command mode"
+ # (compatible with Silverblue's toolbox) and the current "command-less"
+ # mode of operation. If wanting to use a command, that has to be the
+ # first argument. If no command is provided, we basically default to
+ # 'run', which is 'create, start and fire a shell inside the toolbox'.
+ #
+ # Note that, if a command is used, we set "user" mode by default (i.e.,
+ # even if `-u` is not specified later). This is again for compatibility
+ # with https://github.com/containers/toolbox).
+ COMMAND=run
+ if [ ! -z $1 ] && is_option $1 ; then
+ case $1 in
+ create | list | enter | run )
+ MODE="user"
+ COMMAND=$1
+ shift
+ ;;
+ esac
+ fi
+
+ ARGS=`getopt -o hrut:R:I:c:i: --long help,root,user,tag:,reg:,img:,container:,image: -n toolbox -- "$@"`
eval set -- "$ARGS"
while true; do
case "$1" in
-h|--help)
+ # If we are passed a help switch, show help and exit
show_help
exit 0
;;
@@ -195,31 +272,38 @@
;;
-u|--user)
shift
- USER_ID=`id -u`; USER_GID=`id -g`
- USER_NAME=`id -un` ; USER_GNAME=`id -gn`
- USER_HOME=$HOME
- TOOLBOX_NAME="${TOOLBOX_NAME}-user"
-
- # We want to keep the pid namespace of the running user.
- # We, however, use root:root while creating, so that later we
- # can modify the user's name, groups, etc, within the container.
- CREATE_AS_USER="--pid host --userns=keep-id -v ${HOME}:${HOME} --user root:root --volume /run/user/${USER_ID}:/run/user/${USER_ID}:rslave "
- EXEC_AS_USER="--user ${USER_ID}:${USER_GID} -w `pwd` --env SSH_AUTH_SOCK=$SSH_AUTH_SOCK --env DISPLAY=$DISPLAY --env XAUTHORITY=$XAUTHORITY"
+ MODE="user"
+ ;;
+ -c|--container)
+ if [ ! -z $TAG ]; then
+ echo "ERROR: Don't use both -c and -t!"
+ show_help
+ exit 1
+ fi
+ CHANGE_NAME="true"
+ TOOLBOX_NAME="$2"
+ shift 2
;;
-t|--tag)
- TOOLBOX_NAME="${TOOLBOX_NAME}-$2"
+ if [ ! -z $CHANGE_NAME ]; then
+ echo "ERROR: Don't use both -c and -t!"
+ show_help
+ exit 1
+ fi
+ TAG="$2"
shift 2
;;
- -R|--registry)
+ -R|--reg)
REGISTRY=$2
- # Let's rebuild the image URI (this means that command
- # line, if present, overrides config file)
- TOOLBOX_IMAGE="${REGISTRY}"/"${IMAGE}"
shift 2
;;
- -I|--image)
+ -I|--img)
+ IMAGE=$2
+ shift 2
+ ;;
+ -i|--image)
+ REGISTRY=""
IMAGE=$2
- TOOLBOX_IMAGE="${REGISTRY}"/"${IMAGE}"
shift 2
;;
--)
@@ -234,12 +318,53 @@
esac
done
- if [ -z "$*" ]; then
- run ${TOOLBOX_SHELL}
- else
- run "$@"
+ # Let's rebuild the image URI (this means that command
+ # line, if present, overrides config file)
+ TOOLBOX_IMAGE=`echo "${REGISTRY}"/"${IMAGE}" | sed 's/^\///g'`
+
+ if [ "$MODE" = "user" ]; then
+ USER_ID=`id -u`; USER_GID=`id -g`
+ USER_NAME=`id -un` ; USER_GNAME=`id -gn`
+ USER_HOME=$HOME
+ if [ -z $CHANGE_NAME ]; then
+ TOOLBOX_NAME="${TOOLBOX_NAME}-user"
+ fi
+
+ # We want to keep the pid namespace of the running user.
+ # We, however, use root:root while creating, so that later we
+ # can modify the user's name, groups, etc, within the container.
+ CREATE_AS_USER="--pid host --userns=keep-id -v ${HOME}:${HOME} --user root:root --volume /run/user/${USER_ID}:/run/user/${USER_ID}:rslave --volume /run/media/:/run/media/:rslave --volume /tmp:/tmp:rslave"
+ for ENV in $USER_ENV ; do
+ eval VAL="$""$ENV"
+ [[ ! -z $VAL ]] && USER_ENV_STR="$USER_ENV_STR --env $ENV=$VAL"
+ done
+ EXEC_AS_USER="--user ${USER_ID}:${USER_GID} -w `pwd` $USER_ENV_STR"
fi
- cleanup
+
+ if [ ! -z $TAG ]; then
+ TOOLBOX_NAME="${TOOLBOX_NAME}-$TAG"
+ fi
+
+ case $COMMAND in
+ list)
+ list
+ ;;
+ create)
+ create
+ ;;
+ enter|run)
+ if [ -z "$*" ]; then
+ run ${TOOLBOX_SHELL}
+ else
+ run "$@"
+ fi
+ cleanup
+ ;;
+ *)
+ echo "unknown command: '$COMMAND'"
+ exit 1
+ ;;
+ esac
}
main "$@"
++++++ toolboxrc.sle-micro ++++++
REGISTRY=registry.suse.com
IMAGE=suse/toolbox
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked in at 2021-02-01 13:25:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm"
Mon Feb 1 13:25:00 2021 rev:123 rq:866528 version:363
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2020-09-21 17:10:44.123316480 +0200
+++ /work/SRC/openSUSE:Factory/.xterm.new.28504/xterm.changes 2021-02-01 13:25:00.993804856 +0100
@@ -1,0 +2,89 @@
+Tue Jan 12 02:57:05 UTC 2021 - Avindra Goolcharan <avindra(a)opensuse.org>
+
+- Update to Patch#363 - 2020/12/26
+ * disable groff hyphenation in generated html when using man2html.
+ * change SCS ���&4��� Cyrillic to non-NRCS, per VT520 manual.
+ * amend fix for SCS in patch #198 to remove DEL rather than converting
+ it to a space (report by Thomas Wolff).
+ * modify state transitions for selecting character sets to eliminate
+ an ambiguity between the ���A��� used in VT220 versus VT320.
+ improve error recovery when selecting characters by resetting to US
+ ASCII when no suitable encoding is found, e.g., attempting to use
+ an NRCS sequence when NRCS is not enabled.
+ * turn off hyphenation in ���.txt��� conversion, prompted by groff changes.
+ * add VT5xx ISO Latin-2 (prompted by discussion with Thomas Wolff).
+ * amend change from patch #361 to event-handling in CopyWait to handle
+ active-icon as a special case (Debian #975687).
+ * add call to loadColorTable to get the visual information needed to
+ decode BE RGBA32 color format (patch by Leandro Lupori).
+ * modify the resource-parsing for disallowedPasteControls and similar
+ lists of names/numbers to recognize ���~;��� (tilde) for cancelling a given name/number.
+ * add ENQ, EOT and NUL to default for disallowedPasteControls.
+ * change default for disallowedPasteControls to omit the tab character
+ (suggested by Harald Dunkel).
+ * fix swapped height/width in regisScreenSize and maxGraphicSize resources
+ using "auto" value, from patch #314 (report by Anton Lavrentiev)
+ * revise patch #362 change for shift-modifier versus mouse protocol
+ and select/paste by adding resource shiftEscape, which can be enabled
+ via a control sequence (prompted by discussion with Matthijs van Duin).
+ * simplify/improve ifdef in trace code for using a separate set of files
+ for each run of xterm.
+ * add options -r and -t to vttests/query-color.pl to show the 6-digit
+ RGB code and actual colors.
+ * add nel to xterm-basic terminfo.
+ * alter vttests/modify-keys.pl to omit HTML reference links to the
+ modified-keys table where no keycode was available.
+- includes Patch #361 - 2020/10/14
+ * treat the return value of strerror as readonly (patch by Philipp
+ Klaus Krause).
+ * modify event-handling in CopyWait to work around hanging while writing
+ large amounts of text to an active icon and at the same time iconifying/
+ deiconifying (report by Dave Kemper).
+ * initialize double-buffer for active-icon window.
+ * improve manual page description of scrollbar resources (report by Brian Lindholm).
+ correct ifdef for menu entry for active-icon, when initializing
+ it with toolbar configuration.
+ * add preprocessor option to makefile to set internal definition of
+ pixmaps directory to match the install-configuration (FreeBSD #250036)
+ * cleanup of calls to free, removing checks for null (Walter Harms)
+ * add fallback actions pointer-button and pointer-motion which handle
+ events for the mouse control-sequences protocol if the select-related
+ translations are omitted with *omitTranslation:select (prompted by
+ discussion with "Ergus")
+ * amend rule for using shift-key to override mouse-protocol for select/
+ paste to limit that feature to mouse-buttons which are actually
+ bound to select/paste actions (prompted by discussion with "Ergus").
+ * corrected mapping in special case for repainting wrap-marks when viewing
+ the scrollback area.
+ * use separate GCs for showWrapMarks feature, to work around cursor
+ coloring change in patch #345 (report by Paulo Silva de Al��bano).
+- includes Patch #360 - 2020/09/20
+ * mention decGraphicsID in ctlseqs.ms (suggested by Thomas Wolff).
+ * modify pixel-coordinate mouse reponse to use as origin the VT100-
+ window rather than the underlying widget, which includes the scrollbar (report by Thomas Wolff).
+ * add configure option --disable-print-graphics (Ross Combs).
+ * add test_ptydata to ���make check��� rule.
+ * minor fixes for ctlseqs.ms (report by Jean-Marc Bourguet).
+ * minor fixes for manpage style (report/patch by "a1346054").
+ * correct cleanup from switch between italics/normal font in the show/
+ hide cursor functions (report/testcase by Peter Fabinski)
+ * integrated patch by Ross Combs:
+ internal renaming of GraphicsID symbols, for readability.
+ adjust logic for VT125, treating it as a ReGIS terminal.
+ * update configure macros, for compiler-warning fixes.
+ * integrated patch by Ross Combs:
+ add control sequence modes for graphics printing.
+ improve conversion to bitmaps for TrueType fonts in ReGIS
+ add font7 resource, for an ���enormous��� bitmap font.
+ do not reset graphics in a soft-reset.
+ add pointerFont resource, and -pf command-line option.
+ * improve typography of manual page (patch by Branden Robinson).
+ * amend patch #359 change to df-install.in to ignore a command-line
+ assignment to DESTDIR if followed by an explicit --dir (report by Sven Joachim)
+- merged 2 patches to form xterm-suse.patch
+- remove xterm-settings.patch
+- remove xterm-better-fonts.patch
+- rebase xterm-sigwinch.patch
+- cleanup spec
+
+-------------------------------------------------------------------
Old:
----
xterm-359.tgz
xterm-359.tgz.asc
xterm-better-fonts.patch
xterm-settings.patch
New:
----
xterm-363.tgz
xterm-363.tgz.asc
xterm-suse.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.FXvjHL/_old 2021-02-01 13:25:02.025806474 +0100
+++ /var/tmp/diff_new_pack.FXvjHL/_new 2021-02-01 13:25:02.029806481 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xterm
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define splitbin 0%{?suse_version} >= 1300
Name: xterm
-Version: 359
+Version: 363
Release: 0
Summary: The basic X terminal program
License: MIT
@@ -37,7 +37,7 @@
Source11: xterm.keyring
# Snoop for the escape sequence assignment of the keypad
Source20: snooper.tar.bz2
-Patch1: xterm-settings.patch
+Patch1: xterm-suse.patch
Patch2: xterm-sigwinch.patch
Patch3: xterm-double_width_fonts.patch
Patch4: xterm-desktop_file_icon.patch
@@ -46,7 +46,6 @@
Patch7: xterm-allow_iso-utf_fonts_in_menu.patch
Patch8: xterm-decomposed_bitmaps.patch
Patch9: xterm-desktop-item-in-gnome-utilities-appfolder.patch
-Patch10: xterm-better-fonts.patch
BuildRequires: groff
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
@@ -85,17 +84,7 @@
This package contains the basic X.Org terminal program.
%prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%autosetup -p1
cp -t . %{SOURCE8} %{SOURCE9}
bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}}
@@ -120,7 +109,7 @@
#ensure we do not lose FreeType support (boo#911683)
grep "#define XRENDERFONT 1" xtermcfg.h
-make %{?_smp_mflags}
+%make_build
if ! which bdftopcf &> /dev/null; then exit 1; fi
for i in *.bdf
++++++ xterm-359.tgz -> xterm-363.tgz ++++++
++++ 26301 lines of diff (skipped)
++++++ xterm-sigwinch.patch ++++++
--- /var/tmp/diff_new_pack.FXvjHL/_old 2021-02-01 13:25:02.445807133 +0100
+++ /var/tmp/diff_new_pack.FXvjHL/_new 2021-02-01 13:25:02.445807133 +0100
@@ -2,24 +2,14 @@
# Parent 547d2ea5029c2c3edd129a9d23e424877c6f29f0
diff --git a/screen.c b/screen.c
+index 6fb6b3b..238591f 100644
--- a/screen.c
+++ b/screen.c
-@@ -2229,17 +2229,17 @@ ScreenResize(XtermWidget xw,
- XConfigureWindow(XtDisplay(xw), screen->iconVwin.window,
- CWWidth | CWHeight | CWBorderWidth, &changes);
- }
- #endif /* NO_ACTIVE_ICON */
+@@ -2330,7 +2330,7 @@ ScreenResize(XtermWidget xw,
#ifdef TTYSIZE_STRUCT
- update_winsize(screen->respond, rows, cols, height, width);
-
+ if (update_winsize(screen->respond, rows, cols, height, width) == 0) {
-#if defined(SIGWINCH) && defined(TIOCGPGRP)
+#if defined(SIGWINCH) && (defined(TIOCGPGRP) || defined(linux))
- if (screen->pid > 1) {
- int pgrp;
-
- TRACE(("getting process-group\n"));
- if (ioctl(screen->respond, TIOCGPGRP, &pgrp) != -1) {
- TRACE(("sending SIGWINCH to process group %d\n", pgrp));
- kill_process_group(pgrp, SIGWINCH);
- }
+ if (screen->pid > 1) {
+ int pgrp;
++++++ xterm-suse.patch ++++++
# from c7753810ca3026190c5da0536ecf86e9b13800d3
# various distribution configuration tweaks
# from 7ecf75281e09a29875b61f38bb66920529368050:
# improve display of chinese letters (bsc#1089049)
diff --git a/UXTerm.ad.1 b/UXTerm.ad
index 0eac2dd..2ba471d 100644
--- a/UXTerm.ad.1
+++ b/UXTerm.ad
@@ -35,10 +35,20 @@
! to set resources for UTF-8 mode with corresponding fonts.
! See the uxterm script for an example.
+! You need to have efont-unicode.rpm installed in order to use the
+! efont-fixed fonts!
#include "XTerm"
*fontMenu.Label: Unicode Fonts
*VT100.utf8: 1
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
+*locale: true
+
+! don't use the compiled in default of "*" for ximFont because this
+! leads to very slow startup times for zh_CN.UTF-8 and zh_HK.UTF-8 locales
+! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930):
+*ximFont: fixed
+
! This includes "XTerm-color" which includes "XTerm", which defines fonts.
! Why set them here?
@@ -60,13 +70,28 @@
! Making the wide fonts associated with *VT100.font in this file allows uxterm
! to skip that step. It will use the fonts that the XTerm file gives for the
! *VT100.uft8Fonts.font pattern.
-*VT100.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-*VT100.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-*VT100.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
-*VT100.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-*VT100.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
-*VT100.font7: -adobe-courier-medium-r-normal--24-240-75-75-m-150-iso10646-1
+*VT100.fontMenu*fontdefault*Label: Default
+*VT100.font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100.wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
+
+*fontMenu*font1.Label: efont 10 pixel
+*VT100.font1: -efont-fixed-medium-r-normal--10-100-75-75-c-50-iso10646-1
+*VT100.wideFont1: -efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1
+*fontMenu*font2.Label: efont 12 pixel
+*VT100.font2: -efont-fixed-medium-r-normal-*-12-120-75-75-c-60-iso10646-1
+*VT100.wideFont2: -efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1
+*fontMenu*font3.Label: efont 14 pixel
+*VT100.font3: -efont-fixed-medium-r-normal-*-14-140-75-75-c-70-iso10646-1
+*VT100.wideFont3: -efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1
+*fontMenu*font4.Label: efont 16 pixel
+*VT100.font4: -efont-fixed-medium-r-normal-*-16-160-75-75-c-80-iso10646-1
+*VT100.wideFont4: -efont-fixed-medium-r-normal-*-16-160-75-75-c-160-iso10646-1
+*fontMenu*font5.Label: misc 18 pixel
+*VT100.font5: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100.wideFont5: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
+*fontMenu*font6.Label: efont 24 pixel
+*VT100.font6: -efont-fixed-medium-r-normal-*-24-240-75-75-c-120-iso10646-1
+*VT100.wideFont6: -efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1
! Here is an alternate set of fonts with better support for bold:
!*VT100.font2: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
diff --git a/XTerm-col.ad b/XTerm-col.ad
--- a/XTerm-col.ad
+++ b/XTerm-col.ad
@@ -71,25 +71,25 @@
! These are the 8 ANSI colors and their bright equivalents. Depending on
! other resource settings, xterm may use the bright colors when displaying
! bold text (see the boldColors resource).
*VT100*color0: black
*VT100*color1: red3
*VT100*color2: green3
*VT100*color3: yellow3
-*VT100*color4: blue2
+*VT100*color4: blue3
*VT100*color5: magenta3
*VT100*color6: cyan3
*VT100*color7: gray90
-*VT100*color8: gray50
+*VT100*color8: gray30
*VT100*color9: red
*VT100*color10: green
*VT100*color11: yellow
-*VT100*color12: rgb:5c/5c/ff
+*VT100*color12: blue
*VT100*color13: magenta
*VT100*color14: cyan
*VT100*color15: white
! Disclaimer: there are no standard colors used in terminal emulation.
!
! The choice for color4 and color12 is a tradeoff between contrast, depending
! on whether they are used for text or backgrounds. Note that either color4 or
diff --git a/XTerm.ad.1 b/XTerm.ad
index dd6ef52..69aac16 100644
--- a/XTerm.ad.1
+++ b/XTerm.ad
@@ -105,21 +105,37 @@
*vtMenu*sixelScrolling*Label: Sixel Scrolling
*vtMenu*privateColorRegisters*Label: Private Color Registers
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
+*locale: checkfont
+*localeFilter: /usr/bin/luitx
+
+! don't use the compiled in default of "*" for ximFont because this
+! leads to very slow startup times for zh_CN.UTF-8 and zh_HK.UTF-8 locales
+! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930):
+*ximFont: fixed
+
*fontMenu.Label: VT Fonts
*fontMenu*fontdefault*Label: Default
-*fontMenu*font1*Label: Unreadable
-*VT100.font1: nil2
+*VT100*font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100*boldfont: -misc-fixed-bold-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100*wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
+
+*fontMenu*font1*Label: Unicode Best
+*VT100.font1: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100.wideFont1: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
*IconFont: nil2
*fontMenu*font2*Label: Tiny
-*VT100.font2: 5x7
+*VT100.font2: -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
*fontMenu*font3*Label: Small
-*VT100.font3: 6x10
+*VT100.font3: -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
*fontMenu*font4*Label: Medium
-*VT100.font4: 7x13
+*VT100.font4: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1
+*VT100.wideFont4: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1
*fontMenu*font5*Label: Large
-*VT100.font5: 9x15
+*VT100.font5: -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
*fontMenu*font6*Label: Huge
-*VT100.font6: 10x20
+*VT100.font6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-100-iso10646-1
+*VT100.wideFont6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-200-iso10646-1
*fontMenu*font7*Label: Enormous
!*VT100.font7: 12x24
*VT100.font7: -adobe-courier-medium-r-normal--24-240-75-75-m-150-iso10646-1
@@ -252,6 +268,59 @@
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+!! We want a 8bit clean xterm
+*eightBitInput: true
+*eightBitOutput: true
+
+!! Default Settings
+*termName: xterm
+*pointerShape: top_left_arrow
+*scrollKey: true
+
+!! Newer XTerms can guess the value of the BackarrowKey by
+!! reading the terminfo or the pty initial value.
+!! We use the terminfo value.
+*backarrowKeyIsErase: true
+*ptyInitialErase: true
+*deleteIsDEL: false
+
+!! To be compatible with the original X Consortium XTerm.
+!! *oldXtermFKeys: true
+
+!! Some symbol mappings of the keyboard for foreign Motif. Some of these
+!! mappings are virtual osfKeySym's. Extend this list if necessary,
+!! more information in VirtualBindings(3) and /usr/include/Xm/XmStrDefs.h.
+*defaultVirtualBindings: #override \
+ Help : osfHelp\n\
+ DRemove : osfCut\n\
+ Prior : osfPageUp\n\
+ Next : osfPageDown\n\
+ Select : osfSelect\n\
+ Insert : osfPaste\
+
+!! If Alt is not Meta use it for emacs line editing of e.g. bash,
+!! define Pause key, and ignore DRemove on foreign displays.
+*altIsNotMeta: true
+*altSendsEscape: true
+*metaSendsEscape: true
+*VT100.Translations: #override \
+ <Key>Pause: string("\033[P") \n\
+ <Key>DRemove: ignore()
+
+*multiScroll: on
+*jumpScroll: on
+*ScrollBar: on
+*Scrollbar*width: 16
+*Scrollbar*height: 16
+*Scrollbar*shadowWidth: 2
+*Scrollbar*borderWidth: 3
+*SaveLines: 2000
+
+!! Fix broken charClass, the doubleclick separators
+*charClass: 33:48,37:48,43:48,45-47:48,64:48,126:48,95:48
+!! Bug #52655
+*utf8Title: true
+
! VT100s and similar terminals recognize escape sequences and control
! characters to which they reply to the host with other escape sequences,
! to provide information. The "resize" program uses this feature.
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -4815,19 +4815,23 @@ This option specifies the font to be use
in the \*(``OverTheSpot\*('' input method.
.IP
In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion)
string is displayed at the position of the cursor.
It is the XIM server's responsibility to display the preedit string.
The XIM client must inform the XIM server of the cursor position.
For best results, the preedit string must be displayed with a proper font.
Therefore, \fI\*n\fP informs the XIM server of the proper font.
-The font is be supplied by a "fontset", whose default value is \*(``*\*(''.
-This matches every font, the X library automatically chooses fonts with
-proper charsets.
+The font is to be supplied by a "fontset", whose default value is
+"fixed" on openSUSE. The upstream default value is \*(``*\*(''
+which matches every font, the X library automatically chooses fonts with
+proper charsets. But this can be extremely slow in some locales and
+at least for the XIM servers "scim" and "kinput2" it doesn't improve
+anything, it just slows down the startup time of xterm.
+
The \fBximFont\fP resource is provided to override this default font setting.
.\"
.SS Tek4014 Widget Resources
.PP
The following resources are specified
as part of the \fItek4014\fP widget (class \fITek4014\fP).
These are specified by patterns
such as \*(``\fB__default_class__.tek4014.\fP\fINAME\fP\*('':
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package socat for openSUSE:Factory checked in at 2021-02-01 13:24:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/socat (Old)
and /work/SRC/openSUSE:Factory/.socat.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "socat"
Mon Feb 1 13:24:57 2021 rev:42 rq:866524 version:1.7.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/socat/socat.changes 2020-04-25 20:07:09.203402884 +0200
+++ /work/SRC/openSUSE:Factory/.socat.new.28504/socat.changes 2021-02-01 13:24:59.117801913 +0100
@@ -1,0 +2,10 @@
+Mon Jan 11 22:24:07 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 1.7.4.1:
+ Security:
+ * Buffer size option (-b) is internally doubled for CR-CRLF conversion,
+ but not checked for integer overflow. This could lead to heap based buffer
+ overflow, assuming the attacker could provide this parameter.
+ * Many further bugfixes and new features, see the CHANGES file
+
+-------------------------------------------------------------------
Old:
----
socat-1.7.3.4.tar.bz2
New:
----
socat-1.7.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ socat.spec ++++++
--- /var/tmp/diff_new_pack.TflE6f/_old 2021-02-01 13:24:59.805802992 +0100
+++ /var/tmp/diff_new_pack.TflE6f/_new 2021-02-01 13:24:59.809802999 +0100
@@ -1,7 +1,7 @@
#
# spec file for package socat
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2010 Pascal Bleser <pascal.bleser(a)opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: socat
-Version: 1.7.3.4
+Version: 1.7.4.1
Release: 0
Summary: Multipurpose relay for bidirectional data transfer
License: SUSE-GPL-2.0-with-openssl-exception AND MIT
++++++ socat-1.7.3.4.tar.bz2 -> socat-1.7.4.1.tar.bz2 ++++++
++++ 17175 lines of diff (skipped)
++++++ socat-common-fixes.patch ++++++
--- /var/tmp/diff_new_pack.TflE6f/_old 2021-02-01 13:25:00.285803745 +0100
+++ /var/tmp/diff_new_pack.TflE6f/_new 2021-02-01 13:25:00.285803745 +0100
@@ -1,7 +1,7 @@
-Index: socat-1.7.3.4/filan.c
+Index: socat-1.7.4.1/filan.c
===================================================================
---- socat-1.7.3.4.orig/filan.c
-+++ socat-1.7.3.4/filan.c
+--- socat-1.7.4.1.orig/filan.c
++++ socat-1.7.4.1/filan.c
@@ -20,6 +20,10 @@
#include "filan.h"
@@ -13,21 +13,10 @@
struct sockopt {
int so;
-@@ -28,10 +32,6 @@ struct sockopt {
-
- static int filan_streams_analyze(int fd, FILE *outfile);
-
--/* dirty workaround so we dont get an error on AIX when being linked with
-- libwrap */
--int allow_severity, deny_severity;
--
- /* global variables for configuring filan */
- bool filan_followsymlinks;
- bool filan_rawoutput;
-Index: socat-1.7.3.4/procan.c
+Index: socat-1.7.4.1/procan.c
===================================================================
---- socat-1.7.3.4.orig/procan.c
-+++ socat-1.7.3.4/procan.c
+--- socat-1.7.4.1.orig/procan.c
++++ socat-1.7.4.1/procan.c
@@ -16,6 +16,9 @@
#include "filan.h"
@@ -38,10 +27,10 @@
#include "procan.h"
-Index: socat-1.7.3.4/xio-tcpwrap.c
+Index: socat-1.7.4.1/xio-tcpwrap.c
===================================================================
---- socat-1.7.3.4.orig/xio-tcpwrap.c
-+++ socat-1.7.3.4/xio-tcpwrap.c
+--- socat-1.7.4.1.orig/xio-tcpwrap.c
++++ socat-1.7.4.1/xio-tcpwrap.c
@@ -13,6 +13,7 @@
#include "xio-tcpwrap.h"
++++++ socat-ignore-tests-failure-boo1078346.patch ++++++
--- /var/tmp/diff_new_pack.TflE6f/_old 2021-02-01 13:25:00.297803764 +0100
+++ /var/tmp/diff_new_pack.TflE6f/_new 2021-02-01 13:25:00.297803764 +0100
@@ -10,12 +10,12 @@
test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: socat-1.7.3.4/test.sh
+Index: socat-1.7.4.1/test.sh
===================================================================
---- socat-1.7.3.4.orig/test.sh
-+++ socat-1.7.3.4/test.sh
-@@ -13224,7 +13224,7 @@ echo "summary: $((N-1)) tests, $((numOK+
-
+--- socat-1.7.4.1.orig/test.sh
++++ socat-1.7.4.1/test.sh
+@@ -15042,7 +15042,7 @@ if [ "$numCANT" -gt 0 ]; then
+ fi
if [ "$numFAIL" -gt 0 ]; then
echo "FAILED: $listFAIL"
- exit 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zstd for openSUSE:Factory checked in at 2021-02-01 13:24:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zstd (Old)
and /work/SRC/openSUSE:Factory/.zstd.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zstd"
Mon Feb 1 13:24:55 2021 rev:22 rq:866512 version:1.4.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/zstd/zstd.changes 2021-01-08 17:31:51.773145367 +0100
+++ /work/SRC/openSUSE:Factory/.zstd.new.28504/zstd.changes 2021-02-01 13:24:56.817798305 +0100
@@ -1,0 +2,5 @@
+Fri Jan 22 14:34:28 UTC 2021 - Bernhard Wiedemann <bwiedemann(a)suse.com>
+
+- Add libzstd-devel-32bit (boo#1181272)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.yBMhtn/_old 2021-02-01 13:24:57.493799366 +0100
+++ /var/tmp/diff_new_pack.yBMhtn/_new 2021-02-01 13:24:57.497799372 +0100
@@ -1 +1,6 @@
libzstd1
+ obsoletes "libzstd-<targettype> < <version>"
+ provides "libzstd-<targettype> = <version>"
+libzstd-devel
+ requires -libzstd-<targettype>
+ requires "libzstd1-<targettype> = <version>"
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-JSON for openSUSE:Factory checked in at 2021-02-01 13:24:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-JSON (Old)
and /work/SRC/openSUSE:Factory/.perl-JSON.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-JSON"
Mon Feb 1 13:24:53 2021 rev:26 rq:866505 version:4.03
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-JSON/perl-JSON.changes 2019-02-28 21:25:03.397899930 +0100
+++ /work/SRC/openSUSE:Factory/.perl-JSON.new.28504/perl-JSON.changes 2021-02-01 13:24:53.657793349 +0100
@@ -1,0 +2,7 @@
+Sun Jan 24 18:07:39 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 4.03:
+ - corrected one typo in POD (James E Keenan)
+ - updated backportPP with JSON::PP 4.06
+
+-------------------------------------------------------------------
Old:
----
JSON-4.02.tar.gz
New:
----
JSON-4.03.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-JSON.spec ++++++
--- /var/tmp/diff_new_pack.OTFG8N/_old 2021-02-01 13:24:54.201794202 +0100
+++ /var/tmp/diff_new_pack.OTFG8N/_new 2021-02-01 13:24:54.205794208 +0100
@@ -1,7 +1,7 @@
#
# spec file for package perl-JSON
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,16 @@
Name: perl-JSON
-Version: 4.02
+Version: 4.03
Release: 0
%define cpan_name JSON
Summary: JSON (JavaScript Object Notation) encoder/decoder
License: Artistic-1.0 OR GPL-1.0-or-later
Group: Development/Libraries/Perl
-Url: https://metacpan.org/release/%{cpan_name}
+URL: https://metacpan.org/release/%{cpan_name}
Source0: https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/%{cpan_name}-%{version}.…
Source1: cpanspec.yml
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
Recommends: perl(JSON::XS) >= 2.34
++++++ JSON-4.02.tar.gz -> JSON-4.03.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/.travis.yml new/JSON-4.03/.travis.yml
--- old/JSON-4.02/.travis.yml 2018-12-03 15:04:39.000000000 +0100
+++ new/JSON-4.03/.travis.yml 2021-01-17 19:27:58.000000000 +0100
@@ -1,3 +1,4 @@
+dist: trusty
language: perl
perl:
- "5.8"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/Changes new/JSON-4.03/Changes
--- old/JSON-4.02/Changes 2019-02-23 03:22:11.000000000 +0100
+++ new/JSON-4.03/Changes 2021-01-24 01:10:16.000000000 +0100
@@ -1,5 +1,9 @@
Revision history for Perl extension JSON.
+4.03 2021-01-24
+ - corrected one typo in POD (James E Keenan)
+ - updated backportPP with JSON::PP 4.06
+
4.02 2019-02-23
- fixed a test that breaks if perl is compiled with -Dquadmath
(RT-128589)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/META.json new/JSON-4.03/META.json
--- old/JSON-4.02/META.json 2019-02-23 03:25:22.000000000 +0100
+++ new/JSON-4.03/META.json 2021-01-24 01:11:02.000000000 +0100
@@ -4,7 +4,7 @@
"Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+ "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
"license" : [
"perl_5"
],
@@ -48,6 +48,6 @@
"url" : "https://github.com/makamaka/JSON"
}
},
- "version" : "4.02",
- "x_serialization_backend" : "JSON version 4.02"
+ "version" : "4.03",
+ "x_serialization_backend" : "JSON version 4.03"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/META.yml new/JSON-4.03/META.yml
--- old/JSON-4.02/META.yml 2019-02-23 03:25:22.000000000 +0100
+++ new/JSON-4.03/META.yml 2021-01-24 01:11:02.000000000 +0100
@@ -7,7 +7,7 @@
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,5 +24,5 @@
resources:
bugtracker: https://github.com/makamaka/JSON/issues
repository: https://github.com/makamaka/JSON
-version: '4.02'
-x_serialization_backend: 'CPAN::Meta::YAML version 0.012'
+version: '4.03'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/lib/JSON/backportPP/Boolean.pm new/JSON-4.03/lib/JSON/backportPP/Boolean.pm
--- old/JSON-4.02/lib/JSON/backportPP/Boolean.pm 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/lib/JSON/backportPP/Boolean.pm 2021-01-24 00:58:20.000000000 +0100
@@ -11,7 +11,7 @@
fallback => 1,
);
-$JSON::backportPP::Boolean::VERSION = '4.02';
+$JSON::backportPP::Boolean::VERSION = '4.06';
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/lib/JSON/backportPP.pm new/JSON-4.03/lib/JSON/backportPP.pm
--- old/JSON-4.02/lib/JSON/backportPP.pm 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/lib/JSON/backportPP.pm 2021-01-24 00:58:20.000000000 +0100
@@ -15,7 +15,7 @@
use Carp ();
#use Devel::Peek;
-$JSON::backportPP::VERSION = '4.02';
+$JSON::backportPP::VERSION = '4.06';
@JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json);
@@ -202,12 +202,11 @@
my ($false, $true) = @_;
$self->{false} = $false;
$self->{true} = $true;
- return ($false, $true);
} else {
delete $self->{false};
delete $self->{true};
- return;
}
+ return $self;
}
sub get_boolean_values {
@@ -1776,7 +1775,7 @@
=head1 VERSION
- 4.02
+ 4.05
=head1 DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/lib/JSON.pm new/JSON-4.03/lib/JSON.pm
--- old/JSON-4.02/lib/JSON.pm 2019-02-23 03:23:12.000000000 +0100
+++ new/JSON-4.03/lib/JSON.pm 2021-01-24 01:09:53.000000000 +0100
@@ -9,7 +9,7 @@
@JSON::EXPORT = qw(from_json to_json jsonToObj objToJson encode_json decode_json);
BEGIN {
- $JSON::VERSION = '4.02';
+ $JSON::VERSION = '4.03';
$JSON::DEBUG = 0 unless (defined $JSON::DEBUG);
$JSON::DEBUG = $ENV{ PERL_JSON_DEBUG } if exists $ENV{ PERL_JSON_DEBUG };
}
@@ -943,7 +943,7 @@
$enabled = $json->get_allow_nonref
-Unlike other boolean options, this opotion is enabled by default beginning
+Unlike other boolean options, this option is enabled by default beginning
with version C<4.0>.
If C<$enable> is true (or missing), then the C<encode> method can convert a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/00_load.t new/JSON-4.03/t/00_load.t
--- old/JSON-4.02/t/00_load.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/00_load.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,5 +1,9 @@
# copied over from JSON::XS and modified to use JSON
+use strict;
+use warnings;
+
+my $loaded;
BEGIN { $| = 1; print "1..1\n"; }
END {print "not ok 1\n" unless $loaded;}
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/01_utf8.t new/JSON-4.03/t/01_utf8.t
--- old/JSON-4.02/t/01_utf8.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/01_utf8.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 9 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/02_error.t new/JSON-4.03/t/02_error.t
--- old/JSON-4.02/t/02_error.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/02_error.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 35 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/03_types.t new/JSON-4.03/t/03_types.t
--- old/JSON-4.02/t/03_types.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/03_types.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 76 + 2 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/04_dwiw_encode.t new/JSON-4.03/t/04_dwiw_encode.t
--- old/JSON-4.02/t/04_dwiw_encode.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/04_dwiw_encode.t 2021-01-24 00:58:20.000000000 +0100
@@ -6,6 +6,7 @@
# Authors: don
use strict;
+use warnings;
use Test;
# main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/06_pc_pretty.t new/JSON-4.03/t/06_pc_pretty.t
--- old/JSON-4.02/t/06_pc_pretty.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/06_pc_pretty.t 2021-01-24 00:58:20.000000000 +0100
@@ -2,6 +2,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 9 };
@@ -10,7 +11,7 @@
use JSON;
my ($js,$obj,$json);
-my $pc = new JSON;
+my $pc = JSON->new;
$obj = {foo => "bar"};
$js = $pc->encode($obj);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/07_pc_esc.t new/JSON-4.03/t/07_pc_esc.t
--- old/JSON-4.02/t/07_pc_esc.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/07_pc_esc.t 2021-01-24 00:58:20.000000000 +0100
@@ -7,6 +7,7 @@
use Test::More;
use strict;
+use warnings;
use utf8;
BEGIN { plan tests => 17 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
@@ -16,7 +17,7 @@
#########################
my ($js,$obj,$str);
-my $pc = new JSON;
+my $pc = JSON->new;
$obj = {test => qq|abc"def|};
$str = $pc->encode($obj);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/08_pc_base.t new/JSON-4.03/t/08_pc_base.t
--- old/JSON-4.02/t/08_pc_base.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/08_pc_base.t 2021-01-24 00:58:20.000000000 +0100
@@ -4,6 +4,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
BEGIN { plan tests => 20 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
@@ -11,7 +12,7 @@
my ($js,$obj);
-my $pc = new JSON;
+my $pc = JSON->new;
$js = q|{}|;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/09_pc_extra_number.t new/JSON-4.03/t/09_pc_extra_number.t
--- old/JSON-4.02/t/09_pc_extra_number.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/09_pc_extra_number.t 2021-01-24 00:58:20.000000000 +0100
@@ -3,6 +3,7 @@
use Test::More;
use strict;
+use warnings;
BEGIN { plan tests => 6 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
@@ -11,7 +12,7 @@
#########################
my ($js,$obj);
-my $pc = new JSON;
+my $pc = JSON->new;
$js = '{"foo":0}';
$obj = $pc->decode($js);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/104_sortby.t new/JSON-4.03/t/104_sortby.t
--- old/JSON-4.02/t/104_sortby.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/104_sortby.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
use Test::More;
use strict;
+use warnings;
BEGIN { plan tests => 3 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
use JSON -support_by_pp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/105_esc_slash.t new/JSON-4.03/t/105_esc_slash.t
--- old/JSON-4.02/t/105_esc_slash.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/105_esc_slash.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
use Test::More;
-use strict;
+use strict;
+use warnings;
BEGIN { plan tests => 2 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
use JSON -support_by_pp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/106_allow_barekey.t new/JSON-4.03/t/106_allow_barekey.t
--- old/JSON-4.02/t/106_allow_barekey.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/106_allow_barekey.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
use Test::More;
-use strict;
+use strict;
+use warnings;
BEGIN { plan tests => 2 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
use JSON -support_by_pp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/107_allow_singlequote.t new/JSON-4.03/t/107_allow_singlequote.t
--- old/JSON-4.02/t/107_allow_singlequote.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/107_allow_singlequote.t 2021-01-24 00:58:58.000000000 +0100
@@ -1,6 +1,7 @@
use Test::More;
use strict;
+use warnings;
BEGIN { plan tests => 4 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
use JSON -support_by_pp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/108_decode.t new/JSON-4.03/t/108_decode.t
--- old/JSON-4.02/t/108_decode.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/108_decode.t 2021-01-24 00:58:20.000000000 +0100
@@ -2,6 +2,7 @@
# decode on Perl 5.005, 5.6, 5.8 or later
#
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 6 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/109_encode.t new/JSON-4.03/t/109_encode.t
--- old/JSON-4.02/t/109_encode.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/109_encode.t 2021-01-24 00:58:20.000000000 +0100
@@ -2,6 +2,7 @@
# decode on Perl 5.005, 5.6, 5.8 or later
#
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 7 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/10_pc_keysort.t new/JSON-4.03/t/10_pc_keysort.t
--- old/JSON-4.02/t/10_pc_keysort.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/10_pc_keysort.t 2021-01-24 00:58:20.000000000 +0100
@@ -3,6 +3,7 @@
use Test::More;
use strict;
+use warnings;
BEGIN { plan tests => 1 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/110_bignum.t new/JSON-4.03/t/110_bignum.t
--- old/JSON-4.02/t/110_bignum.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/110_bignum.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,5 +1,6 @@
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 9 };
@@ -20,7 +21,7 @@
: '';
-my $json = new JSON;
+my $json = JSON->new;
$json->allow_nonref->allow_bignum(1);
$json->convert_blessed->allow_blessed;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/112_upgrade.t new/JSON-4.03/t/112_upgrade.t
--- old/JSON-4.02/t/112_upgrade.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/112_upgrade.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 3 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/113_overloaded_eq.t new/JSON-4.03/t/113_overloaded_eq.t
--- old/JSON-4.02/t/113_overloaded_eq.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/113_overloaded_eq.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More tests => 4;
BEGIN {
@@ -28,6 +29,7 @@
package Foo;
use strict;
+use warnings;
use overload (
'eq' => sub { 0 },
'""' => sub { $_[0] },
@@ -41,6 +43,7 @@
package Bar;
use strict;
+use warnings;
use overload (
'eq' => sub { 0 },
'""' => sub { $_[0] },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/114_decode_prefix.t new/JSON-4.03/t/114_decode_prefix.t
--- old/JSON-4.02/t/114_decode_prefix.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/114_decode_prefix.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More tests => 8;
BEGIN {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/115_tie_ixhash.t new/JSON-4.03/t/115_tie_ixhash.t
--- old/JSON-4.02/t/115_tie_ixhash.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/115_tie_ixhash.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,5 +1,6 @@
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 2 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/116_incr_parse_fixed.t new/JSON-4.03/t/116_incr_parse_fixed.t
--- old/JSON-4.02/t/116_incr_parse_fixed.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/116_incr_parse_fixed.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More tests => 4;
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/117_numbers.t new/JSON-4.03/t/117_numbers.t
--- old/JSON-4.02/t/117_numbers.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/117_numbers.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,5 +1,6 @@
use Test::More;
use strict;
+use warnings;
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
BEGIN { $ENV{PERL_JSON_PP_USE_B} = 0 }
use JSON;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/118_boolean_values.t new/JSON-4.03/t/118_boolean_values.t
--- old/JSON-4.02/t/118_boolean_values.t 2019-02-23 03:22:32.000000000 +0100
+++ new/JSON-4.03/t/118_boolean_values.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More;
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
use JSON;
@@ -38,13 +39,14 @@
push @tests, [Types::Serialiser::true(), Types::Serialiser::false(), 'Types::Serialiser::BooleanBase', 'Types::Serialiser::BooleanBase'];
}
-plan tests => 13 * @tests;
+plan tests => 15 * @tests;
my $json = JSON->new;
for my $test (@tests) {
my ($true, $false, $true_class, $false_class, $incompat) = @$test;
- $json->boolean_values($false, $true);
+ my $ret = $json->boolean_values($false, $true);
+ is $ret => $json, "returns the same object";
my ($new_false, $new_true) = $json->get_boolean_values;
ok defined $new_true, "new true class is defined";
ok defined $new_false, "new false class is defined";
@@ -71,7 +73,8 @@
is $should_false_json => 'false', "A $false_class object turns into JSON false";
}
- $json->boolean_values();
+ $ret = $json->boolean_values();
+ is $ret => $json, "returns the same object";
ok !$json->get_boolean_values, "reset boolean values";
$should_true = $json->allow_nonref(1)->decode('true');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/11_pc_expo.t new/JSON-4.03/t/11_pc_expo.t
--- old/JSON-4.02/t/11_pc_expo.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/11_pc_expo.t 2021-01-24 00:58:20.000000000 +0100
@@ -3,6 +3,7 @@
use Test::More;
use strict;
+use warnings;
BEGIN { plan tests => 8 + 2 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
@@ -10,7 +11,7 @@
#########################
my ($js,$obj);
-my $pc = new JSON;
+my $pc = JSON->new;
$js = q|[-12.34]|;
$obj = $pc->decode($js);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/12_blessed.t new/JSON-4.03/t/12_blessed.t
--- old/JSON-4.02/t/12_blessed.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/12_blessed.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 16 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/13_limit.t new/JSON-4.03/t/13_limit.t
--- old/JSON-4.02/t/13_limit.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/13_limit.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 11 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/14_latin1.t new/JSON-4.03/t/14_latin1.t
--- old/JSON-4.02/t/14_latin1.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/14_latin1.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 4 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/15_prefix.t new/JSON-4.03/t/15_prefix.t
--- old/JSON-4.02/t/15_prefix.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/15_prefix.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 4 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/16_tied.t new/JSON-4.03/t/16_tied.t
--- old/JSON-4.02/t/16_tied.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/16_tied.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 2 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/17_relaxed.t new/JSON-4.03/t/17_relaxed.t
--- old/JSON-4.02/t/17_relaxed.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/17_relaxed.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 8 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/19_incr.t new/JSON-4.03/t/19_incr.t
--- old/JSON-4.02/t/19_incr.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/19_incr.t 2021-01-24 00:58:20.000000000 +0100
@@ -45,7 +45,7 @@
{
my $text = '[5],{"":1} , [ 1,2, 3], {"3":null}';
- my $coder = new JSON;
+ my $coder = JSON->new;
for (0 .. length $text) {
my $a = substr $text, 0, $_;
my $b = substr $text, $_;
@@ -69,7 +69,7 @@
{
my $text = '[x][5]';
- my $coder = new JSON;
+ my $coder = JSON->new;
$coder->incr_parse ($text);
ok (!eval { $coder->incr_parse }, "sparse1");
ok (!eval { $coder->incr_parse }, "sparse2");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/20_unknown.t new/JSON-4.03/t/20_unknown.t
--- old/JSON-4.02/t/20_unknown.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/20_unknown.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,11 +1,10 @@
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 10 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
-
-use strict;
use JSON;
my $json = JSON->new;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/21_evans.t new/JSON-4.03/t/21_evans.t
--- old/JSON-4.02/t/21_evans.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/21_evans.t 2021-01-24 00:58:20.000000000 +0100
@@ -14,7 +14,7 @@
my $data = ["\x{53f0}\x{6240}\x{306e}\x{6d41}\x{3057}",
"\x{6c60}\x{306e}\x{30ab}\x{30a8}\x{30eb}"];
my $js = JSON->new->encode ($data);
-my $j = new JSON;
+my $j = JSON->new;
my $object = $j->incr_parse ($js);
die "no object" if !$object;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/52_object.t new/JSON-4.03/t/52_object.t
--- old/JSON-4.02/t/52_object.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/52_object.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,17 @@
# copied over from JSON::XS and modified to use JSON
+package JSON::freeze;
+
+1;
+
+package JSON::tojson;
+
+1;
+
+package main;
+
use strict;
+use warnings;
use Test::More;
BEGIN { $^W = 0 } # hate
@@ -52,8 +63,8 @@
777
}
-my $obj = bless { k => 1 }, JSON::freeze::;
-my $enc = $json->encode ($obj);
+$obj = bless { k => 1 }, JSON::freeze::;
+$enc = $json->encode ($obj);
ok ($enc eq '("JSON::freeze")[3,1,2]');
my $dec = $json->decode ($enc);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/99_binary.t new/JSON-4.03/t/99_binary.t
--- old/JSON-4.02/t/99_binary.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/99_binary.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,6 +1,7 @@
# copied over from JSON::XS and modified to use JSON
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 24576 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/gh_28_json_test_suite.t new/JSON-4.03/t/gh_28_json_test_suite.t
--- old/JSON-4.02/t/gh_28_json_test_suite.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/gh_28_json_test_suite.t 2021-01-24 00:58:20.000000000 +0100
@@ -2,6 +2,7 @@
# by Nicolas Seriot (https://github.com/nst/JSONTestSuite)
use strict;
+use warnings;
use Test::More;
BEGIN { plan skip_all => 'this test is for Perl 5.8 or later' if $] < 5.008; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/gh_29_trailing_false_value.t new/JSON-4.03/t/gh_29_trailing_false_value.t
--- old/JSON-4.02/t/gh_29_trailing_false_value.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/gh_29_trailing_false_value.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 1 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/rt_116998_wrong_character_offset.t new/JSON-4.03/t/rt_116998_wrong_character_offset.t
--- old/JSON-4.02/t/rt_116998_wrong_character_offset.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/rt_116998_wrong_character_offset.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 4 };
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/rt_90071_incr_parse.t new/JSON-4.03/t/rt_90071_incr_parse.t
--- old/JSON-4.02/t/rt_90071_incr_parse.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/rt_90071_incr_parse.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More;
BEGIN { $ENV{PERL_JSON_BACKEND} ||= "JSON::backportPP"; }
use JSON;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-4.02/t/zero-mojibake.t new/JSON-4.03/t/zero-mojibake.t
--- old/JSON-4.02/t/zero-mojibake.t 2019-02-23 03:20:26.000000000 +0100
+++ new/JSON-4.03/t/zero-mojibake.t 2021-01-24 00:58:20.000000000 +0100
@@ -1,4 +1,5 @@
use strict;
+use warnings;
use Test::More;
BEGIN { plan tests => 1 };
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package timezone for openSUSE:Factory checked in at 2021-02-01 13:24:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/timezone (Old)
and /work/SRC/openSUSE:Factory/.timezone.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timezone"
Mon Feb 1 13:24:51 2021 rev:133 rq:866493 version:2021a
Changes:
--------
--- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2021-01-02 21:30:18.263393826 +0100
+++ /work/SRC/openSUSE:Factory/.timezone.new.28504/timezone-java.changes 2021-02-01 13:24:51.797790431 +0100
@@ -1,0 +2,6 @@
+Mon Jan 25 07:59:56 UTC 2021 - Mark��ta Machov�� <mmachova(a)suse.com>
+
+- timezone update 2021a (bsc#1177460)
+ * South Sudan changes from +03 to +02 on 2021-02-01 at 00:00.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/timezone/timezone.changes 2021-01-02 21:30:18.707394303 +0100
+++ /work/SRC/openSUSE:Factory/.timezone.new.28504/timezone.changes 2021-02-01 13:24:51.849790513 +0100
@@ -1,0 +2,6 @@
+Mon Jan 25 07:59:56 UTC 2021 - Mark��ta Machov�� <mmachova(a)suse.com>
+
+- timezone update 2021a (bsc#1177460)
+ * South Sudan changes from +03 to +02 on 2021-02-01 at 00:00.
+
+-------------------------------------------------------------------
Old:
----
tzcode2020f.tar.gz
tzcode2020f.tar.gz.asc
tzdata2020f.tar.gz
tzdata2020f.tar.gz.asc
New:
----
tzcode2021a.tar.gz
tzcode2021a.tar.gz.asc
tzdata2021a.tar.gz
tzdata2021a.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ timezone-java.spec ++++++
--- /var/tmp/diff_new_pack.k7DHoi/_old 2021-02-01 13:24:52.997792313 +0100
+++ /var/tmp/diff_new_pack.k7DHoi/_new 2021-02-01 13:24:53.001792320 +0100
@@ -1,7 +1,7 @@
#
# spec file for package timezone-java
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
# COMMON-BEGIN
License: BSD-3-Clause AND SUSE-Public-Domain
Group: System/Base
-Version: 2020f
+Version: 2021a
Release: 0
Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
++++++ timezone.spec ++++++
--- /var/tmp/diff_new_pack.k7DHoi/_old 2021-02-01 13:24:53.025792357 +0100
+++ /var/tmp/diff_new_pack.k7DHoi/_new 2021-02-01 13:24:53.029792364 +0100
@@ -1,7 +1,7 @@
#
# spec file for package timezone
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
Group: System/Base
URL: http://www.iana.org/time-zones
# COMMON-BEGIN
-Version: 2020f
+Version: 2021a
Release: 0
Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
++++++ tzcode2020f.tar.gz -> tzcode2021a.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NEWS new/NEWS
--- old/NEWS 2020-12-29 09:18:57.000000000 +0100
+++ new/NEWS 2021-01-24 20:06:02.000000000 +0100
@@ -1,5 +1,13 @@
News for the tz database
+Release 2021a - 2021-01-24 10:54:57 -0800
+
+ Changes to future timestamps
+
+ South Sudan changes from +03 to +02 on 2021-02-01 at 00:00.
+ (Thanks to Steffen Thorsen.)
+
+
Release 2020f - 2020-12-29 00:17:46 -0800
Change to build procedure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tz-link.html new/tz-link.html
--- old/tz-link.html 2020-11-12 23:52:22.000000000 +0100
+++ new/tz-link.html 2021-01-24 20:03:28.000000000 +0100
@@ -352,12 +352,7 @@
<a href="https://devguide.calconnect.org/Time-Zones/TZDS/">TZDIST
implementations</a> are available.
The <a href="https://www.ietf.org/mailman/listinfo/tzdist-bis">tzdist-bis
-mailing list</a> discussed the Internet draft <a
-id="TZDIST-Geolocate"
-href="https://tools.ietf.org/html/draft-murchison-tzdist-geolocate">TZDIST
-Geolocate Extension</a> (now expired), which let a client determine its timezone
-from its geographic location using a <a
-href="https://tools.ietf.org/html/rfc5870">'geo' URI</a>.</li>
+mailing list</a> discusses possible extensions.</li>
<li>The <a href="https://tools.ietf.org/html/rfc5545">
Internet Calendaring and Scheduling Core Object Specification
(iCalendar)</a> (Internet <abbr>RFC</abbr> 5445)
@@ -410,11 +405,11 @@
<li>The <a href="https://howardhinnant.github.io/date/tz.html">Time Zone
Database Parser</a> is a
<a href="https://en.wikipedia.org/wiki/C%2B%2B">C++</a> parser and
-runtime library with API <a
-href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0355r7.html">adopted
-into the draft standard</a> for
+runtime library with <a
+href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0355r7.html">API</a>
+adopted by
<a href="https://en.wikipedia.org/wiki/C++20">C++20</a>,
-the next iteration of the C++ standard.
+the current iteration of the C++ standard.
It is freely available under the
<abbr title="Massachusetts Institute of Technology">MIT</abbr> license.</li>
<li><a id="ICU" href="http://site.icu-project.org">International Components for
@@ -627,11 +622,6 @@
implementations contain a copy of a 32-bit subset of a recent
<code><abbr>tz</abbr></code> database in a
Go-specific format.</li>
-<li><a
-href="http://users.skynet.be/Peter.Verthez/projects/intclock/">International
-clock (intclock)</a> is a clock that displays multiple time zones on
-<abbr>GNU</abbr>/Linux and similar systems. It is freely available
-under the <abbr>GPL</abbr>.</li>
<li>Microsoft Windows 8.1
and later has <code><abbr>tz</abbr></code> data and <abbr>CLDR</abbr>
data (mentioned <a href="#CLDR">below</a>) used by the
@@ -677,10 +667,7 @@
is Astrodienst's Web version of Shanks and Pottenger's out-of-print
time zone history atlases
<a href="https://www.worldcat.org/oclc/468828649">for the US</a> and
-<a href="https://www.worldcat.org/oclc/76950459">for the world</a>,
-now published in <a
-href="https://astrocom.com/astrology-products/software/acs-atlas-software">software</a>
-form by <a href="https://astrocom.com">ACS-Starcrafts</a>.
+<a href="https://www.worldcat.org/oclc/76950459">for the world</a>.
Although these extensive atlases
<a href="https://astrologynewsservice.com/opinion/how-astrologers-contributed-to-the…">were
sources for much of the older <code><abbr>tz</abbr></code> data</a>,
@@ -704,11 +691,13 @@
<section>
<h2 id="maps">Maps</h2>
<ul>
-<li>The <a href="https://www.cia.gov/index.html">United States Central
-Intelligence Agency (<abbr
-title="Central Intelligence Agency">CIA</abbr>)</a> publishes a <a
-href="https://www.cia.gov/library/publications/the-world-factbook/graphics/ref_ma…">time
-zone map</a>; the
+<li>The <a
+href="https://www.cia.gov/the-world-factbook/maps/world-regional/">World
+and Regional Maps section</a> of <em>The World Factbook</em>, published by the
+<a href="https://www.cia.gov">US Central Intelligence
+Agency (<abbr
+title="Central Intelligence Agency">CIA</abbr>)</a>, contains a time
+zone map; the
<a
href="https://legacy.lib.utexas.edu/maps/world.html">Perry–Castañeda
Library Map Collection</a>
@@ -734,7 +723,9 @@
<section>
<h2 id="boundaries">Time zone boundaries</h2>
<p>Geographical boundaries between timezones are available
-from several <a href="https://en.wikipedia.org/wiki/Geolocation">geolocation</a>
+from several <a
+href="https://en.wikipedia.org/wiki/Internet_geolocation">Internet
+geolocation</a>
services and other sources.</p>
<ul>
<li><a href="https://github.com/evansiroky/timezone-boundary-builder">Timezone
@@ -883,10 +874,6 @@
<dd>The Interior Ministry periodically issues <a
href="ftp://ftp.cs.huji.ac.il/pub/tz/announcements"
hreflang="he">announcements (in Hebrew)</a>.</dd>
-<dt>Italy</dt>
-<dd>The National Institute of Metrological Research publishes a
-<a href="http://oldsite.inrim.it/res/tf/ora_legale_i.shtml" hreflang="it">table
-of civil time (in Italian)</a>.</dd>
<dt>Malaysia</dt>
<dd>See Singapore <a href="#Singapore">below</a>.</dd>
<dt>Mexico</dt>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/version new/version
--- old/version 2020-12-29 09:18:58.000000000 +0100
+++ new/version 2021-01-24 20:06:03.000000000 +0100
@@ -1 +1 @@
-2020f
+2021a
++++++ tzdata2020f.tar.gz -> tzdata2021a.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NEWS new/NEWS
--- old/NEWS 2020-12-29 09:18:57.000000000 +0100
+++ new/NEWS 2021-01-24 20:06:02.000000000 +0100
@@ -1,5 +1,13 @@
News for the tz database
+Release 2021a - 2021-01-24 10:54:57 -0800
+
+ Changes to future timestamps
+
+ South Sudan changes from +03 to +02 on 2021-02-01 at 00:00.
+ (Thanks to Steffen Thorsen.)
+
+
Release 2020f - 2020-12-29 00:17:46 -0800
Change to build procedure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/africa new/africa
--- old/africa 2020-12-11 04:39:46.000000000 +0100
+++ new/africa 2021-01-19 22:17:42.000000000 +0100
@@ -1527,11 +1527,17 @@
3:00 - EAT 2017 Nov 1
2:00 - CAT
+# From Steffen Thorsen (2021-01-18):
+# "South Sudan will change its time zone by setting the clock back 1
+# hour on February 1, 2021...."
+# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/
+
# South Sudan
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Juba 2:06:28 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00
- 3:00 - EAT
+ 3:00 - EAT 2021 Feb 1 00:00
+ 2:00 - CAT
# Tanzania
# See Africa/Nairobi.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leap-seconds.list new/leap-seconds.list
--- old/leap-seconds.list 2020-07-09 21:59:05.000000000 +0200
+++ new/leap-seconds.list 2021-01-09 19:59:02.000000000 +0100
@@ -204,10 +204,10 @@
# current -- the update time stamp, the data and the name of the file
# will not change.
#
-# Updated through IERS Bulletin C60
-# File expires on: 28 June 2021
+# Updated through IERS Bulletin C61
+# File expires on: 28 December 2021
#
-#@ 3833827200
+#@ 3849638400
#
2272060800 10 # 1 Jan 1972
2287785600 11 # 1 Jul 1972
@@ -252,4 +252,4 @@
# the hash line is also ignored in the
# computation.
#
-#h 064356a8 39268b92 76e4d5ef 3e22fae1 0cca529c
+#h 2ab8253d d4380d28 75f01343 381504f8 8f8a4bfc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leapseconds new/leapseconds
--- old/leapseconds 2020-10-25 22:43:49.000000000 +0100
+++ new/leapseconds 2021-01-09 19:59:03.000000000 +0100
@@ -72,11 +72,11 @@
# Any additional leap seconds will come after this.
# This Expires line is commented out for now,
# so that pre-2020a zic implementations do not reject this file.
-#Expires 2021 Jun 28 00:00:00
+#Expires 2021 Dec 28 00:00:00
# POSIX timestamps for the data in this file:
#updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1624838400 (2021-06-28 00:00:00 UTC)
+#expires 1640649600 (2021-12-28 00:00:00 UTC)
-# Updated through IERS Bulletin C60
-# File expires on: 28 June 2021
+# Updated through IERS Bulletin C61
+# File expires on: 28 December 2021
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/version new/version
--- old/version 2020-12-29 09:18:58.000000000 +0100
+++ new/version 2021-01-24 20:06:03.000000000 +0100
@@ -1 +1 @@
-2020f
+2021a
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package diffstat for openSUSE:Factory checked in at 2021-02-01 13:24:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diffstat (Old)
and /work/SRC/openSUSE:Factory/.diffstat.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffstat"
Mon Feb 1 13:24:49 2021 rev:30 rq:866492 version:1.64
Changes:
--------
--- /work/SRC/openSUSE:Factory/diffstat/diffstat.changes 2020-01-01 14:56:42.901881475 +0100
+++ /work/SRC/openSUSE:Factory/.diffstat.new.28504/diffstat.changes 2021-02-01 13:24:50.601788555 +0100
@@ -1,0 +2,7 @@
+Sun Jan 24 18:43:30 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 1.64:
+ + recognize binary files mentioned in "git diff --binary", and
+ "git log -p --binary" formatted files (report by Faheem Mitha).
+
+-------------------------------------------------------------------
Old:
----
diffstat-1.63.tgz
diffstat-1.63.tgz.asc
New:
----
diffstat-1.64.tgz
diffstat-1.64.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diffstat.spec ++++++
--- /var/tmp/diff_new_pack.tINERN/_old 2021-02-01 13:24:51.293789640 +0100
+++ /var/tmp/diff_new_pack.tINERN/_new 2021-02-01 13:24:51.297789647 +0100
@@ -1,7 +1,7 @@
#
# spec file for package diffstat
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: diffstat
-Version: 1.63
+Version: 1.64
Release: 0
Summary: Utility That Provides Statistics Based on the Output of diff
License: MIT
@@ -27,7 +27,6 @@
Source1: https://invisible-mirror.net/archives/diffstat/diffstat-%{version}.tgz.asc
Source2: %{name}.keyring
Patch0: %{name}.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
diffstat reads the output of the diff command and displays a histogram
@@ -39,18 +38,18 @@
%build
%configure
-make %{?_smp_mflags} CFLAGS="%{optflags}"
+%make_build CFLAGS="%{optflags}"
%install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
%check
-make %{?_smp_mflags} check
+%make_build check
%files
-%defattr(-,root,root)
-%doc README CHANGES COPYING
+%doc README CHANGES
+%license COPYING
%{_bindir}/diffstat
-%{_mandir}/man1/diffstat.1%{ext_man}
+%{_mandir}/man1/diffstat.1%{?ext_man}
%changelog
++++++ diffstat-1.63.tgz -> diffstat-1.64.tgz ++++++
++++ 10048 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/CHANGES new/diffstat-1.64/CHANGES
--- old/diffstat-1.63/CHANGES 2019-11-29 21:59:03.000000000 +0100
+++ new/diffstat-1.64/CHANGES 2021-01-13 01:18:10.000000000 +0100
@@ -1,4 +1,12 @@
--- $Id: CHANGES,v 1.101 2019/11/29 20:59:03 tom Exp $
+-- $Id: CHANGES,v 1.105 2021/01/13 00:18:10 tom Exp $
+
+2021/01/12 (diffstat 1.64)
+ + recognize binary files mentioned in "git diff --binary", and
+ "git log -p --binary" formatted files (report by Faheem Mitha).
+
+ + update configure macros
+
+ + update config.guess, config.sub
2019/11/29 (diffstat 1.63)
+ eliminate fixed buffer when decoding range.
@@ -61,7 +69,7 @@
+ add -E option to filter escape-sequences, e.g., from colordiff
(Ubuntu #1304262).
- + merge/adapt improvments to makefile and configure script from
+ + merge/adapt improvements to makefile and configure script from
openembedded.org (forwarded by Ross Burton).
+ remove unused $(libdir) from makefile "installdirs" target
+ amend definition in CF_POPEN_TEST to permit use of autoheader.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/COPYING new/diffstat-1.64/COPYING
--- old/diffstat-1.63/COPYING 2019-11-25 01:11:49.000000000 +0100
+++ new/diffstat-1.64/COPYING 2021-01-11 10:14:02.000000000 +0100
@@ -1,4 +1,4 @@
-Copyright 1994-2018,2019 by Thomas E. Dickey
+Copyright 1994-2019,2021 by Thomas E. Dickey
All Rights Reserved.
Permission to use, copy, modify, and distribute this software and its
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/COPYING.asc new/diffstat-1.64/COPYING.asc
--- old/diffstat-1.63/COPYING.asc 2019-11-25 01:12:11.000000000 +0100
+++ new/diffstat-1.64/COPYING.asc 2021-01-11 10:22:08.000000000 +0100
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Comment: See https://invisible-island.net/public/public.html for info
-iF0EABECAB0WIQTFIEjAwHSP7iJ9R6JwI1Pg9+SO2wUCXdscWAAKCRBwI1Pg9+SO
-24dNAJ4hDPY290kWxNaNZr0kpa28rcjcPACfRPhb5QwpTXimfJCSDCVSPy/gq94=
-=Xglp
+iF0EABECAB0WIQTFIEjAwHSP7iJ9R6JwI1Pg9+SO2wUCX/wYwAAKCRBwI1Pg9+SO
+28GiAKCaa1uPos1Ekd2QSZo9mPdUwwoMcgCg0laa5RYFVaELMP9Z37Ctq0FVYfo=
+=zujp
-----END PGP SIGNATURE-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/diffstat.c new/diffstat-1.64/diffstat.c
--- old/diffstat-1.63/diffstat.c 2019-11-29 21:39:01.000000000 +0100
+++ new/diffstat-1.64/diffstat.c 2021-01-13 01:28:32.000000000 +0100
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright 1994-2018,2019 by Thomas E. Dickey *
+ * Copyright 1994-2019,2021 by Thomas E. Dickey *
* All Rights Reserved. *
* *
* Permission to use, copy, modify, and distribute this software and its *
@@ -20,7 +20,7 @@
******************************************************************************/
#ifndef NO_IDENT
-static const char *Id = "$Id: diffstat.c,v 1.63 2019/11/29 20:39:01 tom Exp $";
+static const char *Id = "$Id: diffstat.c,v 1.64 2021/01/13 00:28:32 tom Exp $";
#endif
/*
@@ -28,6 +28,7 @@
* Author: T.E.Dickey
* Created: 02 Feb 1992
* Modified:
+ * 12 Jan 2021, check for git --binary diffs.
* 29 Nov 2019, eliminate fixed buffer when decoding range.
* 28 Nov 2019, use locale in computing filename column-width.
* improve parsing for git diffs.
@@ -854,7 +855,8 @@
int count = 0;
int value[2];
- value[count] = 0;
+ value[0] = 0;
+ value[1] = 0;
while (*s != EOS) {
int ch = UC(*s);
if (isdigit(ch)) {
@@ -1013,7 +1015,7 @@
if (reverse_opt) {
TRACE((".. no action @%d\n", __LINE__));
} else {
- target = trim_datapath(&data, len1 = len2, &local);
+ target = trim_datapath(&data, len2, &local);
}
}
} else if (len1 < len2) {
@@ -1091,7 +1093,7 @@
}
} else {
if (can_be_merged(source)) {
- TRACE(("** merge @%d\n", __LINE__));
+ TRACE(("** %smerge @%d\n", merge_names ? "" : "do not ", __LINE__));
if (merge_names
&& *target != EOS
&& prefix_opt < 0) {
@@ -1653,6 +1655,9 @@
int context = 1;
int either = 0;
+ int first_ch;
+ int git_diff = 0;
+
char *s;
#if OPT_TRACE
int line_no = 0;
@@ -1760,7 +1765,9 @@
finish_chunk(that);
unified = 0;
if (*buffer == '@') {
- int old_base, new_base, old_size, new_size;
+ int old_base, new_base;
+ int old_size = 0;
+ int new_size = 0;
char *sp;
old_unify = new_unify = 0;
@@ -1768,7 +1775,7 @@
&& (sp = decode_range(sp, &old_base, &old_size)) != NULL
&& (sp = match(sp, " +")) != NULL
&& (sp = decode_range(sp, &new_base, &new_size)) != NULL
- && (sp = match(sp, " @")) != NULL) {
+ && match(sp, " @") != NULL) {
old_unify = old_size;
new_unify = new_size;
unified = -1;
@@ -1871,11 +1878,51 @@
(void) memcpy(buffer, "***", (size_t) 3);
}
+ first_ch = *buffer;
+
+ /*
+ * GIT binary diffs can contain blocks of data that might be confused
+ * with the ordinary line-oriented sections in diff output. Skip the
+ * case statement if we are processing a GIT binary diff.
+ */
+ switch (git_diff) {
+ default:
+ break;
+ case 1:
+ /* expect "index" */
+ if (match(buffer, "index") != 0) {
+ git_diff = 2;
+ continue;
+ } else {
+ git_diff = 0;
+ }
+ break;
+ case 2:
+ /* perhaps "GIT binary patch" */
+ if (match(buffer, "GIT binary patch") != 0) {
+ git_diff = 3;
+ that->cmt = Binary;
+ continue;
+ } else if (match(buffer, "Binary files ") != 0) {
+ git_diff = 0;
+ that->cmt = Binary;
+ continue;
+ } else {
+ git_diff = 0;
+ }
+ break;
+ case 3:
+ /* had "GIT binary patch", wait for next "diff" line */
+ if (first_ch != 'd')
+ continue;
+ break;
+ }
+
/*
* Use the first character of the input line to determine its
* type:
*/
- switch (*buffer) {
+ switch (first_ch) {
case 'O': /* Only */
CASE_TRACE();
if (match(buffer, "Only in ")) {
@@ -1934,6 +1981,11 @@
s = do_merging(that, s, &freed);
that = find_data(s);
ok = begin_data(that);
+ if (match(buffer, "diff --git ") != 0) {
+ git_diff = 1;
+ } else {
+ git_diff = 0;
+ }
}
break;
@@ -1972,7 +2024,7 @@
&& (sp = match(sp, "\t")) != NULL
&& (sp = need_parens(sp)) != NULL
&& (sp = match(sp, "\t")) != NULL
- && (sp = need_parens(sp)) != NULL
+ && need_parens(sp) != NULL
&& !version_num(b_fname))
|| ((sp = copy_notabs(b_fname, stars, length)) != NULL
&& (sp = match(sp, "\t")) != NULL
@@ -2026,11 +2078,11 @@
&& (bars = match(bars, "#")) != NULL
&& (bars = copy_integer(&rev, bars)) != NULL
&& (((sp = match(bars, " - ")) != NULL
- && (sp = need_graphs(sp)) != NULL)
+ && need_graphs(sp) != NULL)
|| (((sp = match(bars, " ")) != NULL
&& (sp = need_parens(sp)) != NULL
&& (sp = match(sp, " - ")) != NULL
- && (sp = need_graphs(sp)) != NULL)))
+ && need_graphs(sp) != NULL)))
&& !version_num(b_fname)
&& !contain_any(b_fname, "*")
&& !edit_range(b_fname)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/package/debian/changelog new/diffstat-1.64/package/debian/changelog
--- old/diffstat-1.63/package/debian/changelog 2019-11-24 19:02:47.000000000 +0100
+++ new/diffstat-1.64/package/debian/changelog 2021-01-11 10:10:59.000000000 +0100
@@ -1,3 +1,9 @@
+diffstat (1.64) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dickey(a)invisible-island.net> Mon, 11 Jan 2021 04:10:59 -0500
+
diffstat (1.63) unstable; urgency=low
* maintenance updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/package/debian/compat new/diffstat-1.64/package/debian/compat
--- old/diffstat-1.63/package/debian/compat 2019-11-29 21:08:39.000000000 +0100
+++ new/diffstat-1.64/package/debian/compat 2021-01-13 00:56:07.000000000 +0100
@@ -1 +1 @@
-9
+11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/package/debian/copyright new/diffstat-1.64/package/debian/copyright
--- old/diffstat-1.63/package/debian/copyright 2019-11-25 01:13:42.000000000 +0100
+++ new/diffstat-1.64/package/debian/copyright 2021-01-11 10:14:42.000000000 +0100
@@ -1,7 +1,7 @@
Upstream source http://invisible-island.net/diffstat/diffstat.html
/******************************************************************************
- * Copyright 1994-2018,2019 by Thomas E. Dickey *
+ * Copyright 1994-2019,2021 by Thomas E. Dickey *
* All Rights Reserved. *
* *
* Permission to use, copy, modify, and distribute this software and its *
@@ -25,7 +25,7 @@
Files: aclocal.m4
Licence: other-BSD
-Copyright: 2003-2018,2019 by Thomas E. Dickey
+Copyright: 2003-2019,2021 by Thomas E. Dickey
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -86,7 +86,7 @@
shared with many OS's install programs.
Files: debian/*
-Copyright: 2010-2018,2019 Thomas E. Dickey
+Copyright: 2010-2019,2021 Thomas E. Dickey
Licence: other-BSD
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/package/debian/rules new/diffstat-1.64/package/debian/rules
--- old/diffstat-1.63/package/debian/rules 2018-08-15 01:04:47.000000000 +0200
+++ new/diffstat-1.64/package/debian/rules 2021-01-13 00:55:45.000000000 +0100
@@ -66,7 +66,7 @@
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/diffstat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/package/diffstat.spec new/diffstat-1.64/package/diffstat.spec
--- old/diffstat-1.63/package/diffstat.spec 2019-11-24 19:02:47.000000000 +0100
+++ new/diffstat-1.64/package/diffstat.spec 2021-01-11 10:10:59.000000000 +0100
@@ -1,7 +1,7 @@
Summary: diffstat - make histogram from diff-output
%define AppProgram diffstat
-%define AppVersion 1.63
-# $XTermId: diffstat.spec,v 1.14 2019/11/24 18:02:47 tom Exp $
+%define AppVersion 1.64
+# $XTermId: diffstat.spec,v 1.15 2021/01/11 09:10:59 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case32.pat new/diffstat-1.64/testing/case32.pat
--- old/diffstat-1.63/testing/case32.pat 2009-08-31 11:24:46.000000000 +0200
+++ new/diffstat-1.64/testing/case32.pat 2009-08-31 11:24:46.000000000 +0200
@@ -1,7 +1,7 @@
--- README 2001-10-10 20:23:46.000000000 -0400
+++ README.new 2009-08-31 05:24:30.000000000 -0400
@@ -1,7 +1,7 @@
- $Id: case32.pat,v 1.1 2009/08/31 09:24:46 tom Exp $
+ $Id: README,v 1.5 2001/10/11 00:23:46 tom Exp $
-Readme file for DiffStat.
+Readme file for dIFFsTAT.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case33.pat new/diffstat-1.64/testing/case33.pat
--- old/diffstat-1.63/testing/case33.pat 2009-08-31 11:24:52.000000000 +0200
+++ new/diffstat-1.64/testing/case33.pat 2009-08-31 11:24:52.000000000 +0200
@@ -1,7 +1,7 @@
--- README.new 2009-08-31 05:24:30.000000000 -0400
+++ README 2001-10-10 20:23:46.000000000 -0400
@@ -1,7 +1,7 @@
- $Id: case33.pat,v 1.1 2009/08/31 09:24:52 tom Exp $
+ $Id: README,v 1.5 2001/10/11 00:23:46 tom Exp $
-Readme file for dIFFsTAT.
+Readme file for DiffStat.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39.pat new/diffstat-1.64/testing/case39.pat
--- old/diffstat-1.63/testing/case39.pat 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39.pat 2021-01-12 10:08:32.000000000 +0100
@@ -0,0 +1,19 @@
+diff --git a/diffstat b/diffstat
+index 70d0e90..9d24fbd 100755
+Binary files a/diffstat and b/diffstat differ
+diff --git a/diffstat.c b/diffstat.c
+index b9cbe0a..26ce142 100644
+--- a/diffstat.c
++++ b/diffstat.c
+@@ -20,7 +20,7 @@
+ ******************************************************************************/
+
+ #ifndef NO_IDENT
+-static const char *Id = "$Id: diffstat.c,v 1.63 2019/11/29 20:39:01 tom Exp $";
++static const char *Id = "$Id: diffstat.c,v 1.64 2019/11/29 20:39:01 tom Exp $";
+ #endif
+
+ /*
+diff --git a/diffstat.o b/diffstat.o
+index c98d6ff..4368a92 100644
+Binary files a/diffstat.o and b/diffstat.o differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39.ref new/diffstat-1.64/testing/case39.ref
--- old/diffstat-1.63/testing/case39.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39R.ref new/diffstat-1.64/testing/case39R.ref
--- old/diffstat-1.63/testing/case39R.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39R.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39Rp0.ref new/diffstat-1.64/testing/case39Rp0.ref
--- old/diffstat-1.63/testing/case39Rp0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39Rp0.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ a/diffstat |binary
+ a/diffstat.c | 2 +-
+ a/diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39b.ref new/diffstat-1.64/testing/case39b.ref
--- old/diffstat-1.63/testing/case39b.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39b.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,2 @@
+ diffstat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39f0.ref new/diffstat-1.64/testing/case39f0.ref
--- old/diffstat-1.63/testing/case39f0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39f0.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 1 + 1 - 0 !
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39k.ref new/diffstat-1.64/testing/case39k.ref
--- old/diffstat-1.63/testing/case39k.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39k.ref 2021-01-13 00:52:54.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39p1.ref new/diffstat-1.64/testing/case39p1.ref
--- old/diffstat-1.63/testing/case39p1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39p1.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39p9.ref new/diffstat-1.64/testing/case39p9.ref
--- old/diffstat-1.63/testing/case39p9.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39p9.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39r1.ref new/diffstat-1.64/testing/case39r1.ref
--- old/diffstat-1.63/testing/case39r1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39r1.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39r2.ref new/diffstat-1.64/testing/case39r2.ref
--- old/diffstat-1.63/testing/case39r2.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39r2.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case39u.ref new/diffstat-1.64/testing/case39u.ref
--- old/diffstat-1.63/testing/case39u.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case39u.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40.pat new/diffstat-1.64/testing/case40.pat
--- old/diffstat-1.63/testing/case40.pat 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40.pat 2021-01-12 10:08:44.000000000 +0100
@@ -0,0 +1,33 @@
+diff --git a/diffstat b/diffstat
+index 70d0e907ea8b868938d35671d4a06bfa8fd2f766..9d24fbd5884652ae2ba2b0c6fa5fea9320d22390 100755
+GIT binary patch
+delta 42
+zcmV+_0M-AXtOKB|1F+Nr6vwUx^<?p;g)End;HK$Zt;8VLEwktXosI!CvxbqHM9_^D
+Ac>n+a
+
+delta 42
+zcmV+_0M-AXtOKB|1F+Nr6jCdhHOT;q0Pkhm-7LEF*vB&P^t0#!osI!BvxbqHM6o0l
+A6#xJL
+
+diff --git a/diffstat.c b/diffstat.c
+index b9cbe0a..26ce142 100644
+--- a/diffstat.c
++++ b/diffstat.c
+@@ -20,7 +20,7 @@
+ ******************************************************************************/
+
+ #ifndef NO_IDENT
+-static const char *Id = "$Id: diffstat.c,v 1.63 2019/11/29 20:39:01 tom Exp $";
++static const char *Id = "$Id: diffstat.c,v 1.64 2019/11/29 20:39:01 tom Exp $";
+ #endif
+
+ /*
+diff --git a/diffstat.o b/diffstat.o
+index c98d6ff866bb903861512512556145acd1604197..4368a92ee91c71f0f3cee94582b478b27543d849 100644
+GIT binary patch
+delta 16
+WcmdmRf@K2`#fCGQY>o@RbOr!G1P7P^
+
+delta 16
+WcmdmRf@K2`#fCE)Z;lJUbOr!F{s)%;
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40.ref new/diffstat-1.64/testing/case40.ref
--- old/diffstat-1.63/testing/case40.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40.ref 2021-01-12 22:33:11.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40R.ref new/diffstat-1.64/testing/case40R.ref
--- old/diffstat-1.63/testing/case40R.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40R.ref 2021-01-12 22:33:13.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40Rp0.ref new/diffstat-1.64/testing/case40Rp0.ref
--- old/diffstat-1.63/testing/case40Rp0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40Rp0.ref 2021-01-12 22:33:15.000000000 +0100
@@ -0,0 +1,4 @@
+ a/diffstat |binary
+ a/diffstat.c | 2 +-
+ a/diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40b.ref new/diffstat-1.64/testing/case40b.ref
--- old/diffstat-1.63/testing/case40b.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40b.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,2 @@
+ diffstat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40f0.ref new/diffstat-1.64/testing/case40f0.ref
--- old/diffstat-1.63/testing/case40f0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40f0.ref 2021-01-12 22:33:16.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 1 + 1 - 0 !
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40k.ref new/diffstat-1.64/testing/case40k.ref
--- old/diffstat-1.63/testing/case40k.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40k.ref 2021-01-13 00:48:21.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40p1.ref new/diffstat-1.64/testing/case40p1.ref
--- old/diffstat-1.63/testing/case40p1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40p1.ref 2021-01-12 22:33:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40p9.ref new/diffstat-1.64/testing/case40p9.ref
--- old/diffstat-1.63/testing/case40p9.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40p9.ref 2021-01-12 22:33:18.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40r1.ref new/diffstat-1.64/testing/case40r1.ref
--- old/diffstat-1.63/testing/case40r1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40r1.ref 2021-01-12 22:33:19.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40r2.ref new/diffstat-1.64/testing/case40r2.ref
--- old/diffstat-1.63/testing/case40r2.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40r2.ref 2021-01-12 22:33:19.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case40u.ref new/diffstat-1.64/testing/case40u.ref
--- old/diffstat-1.63/testing/case40u.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case40u.ref 2021-01-12 22:33:20.000000000 +0100
@@ -0,0 +1,4 @@
+ diffstat |binary
+ diffstat.c | 2 +-
+ diffstat.o |binary
+ 3 files changed, 1 insertion(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41.pat new/diffstat-1.64/testing/case41.pat
--- old/diffstat-1.63/testing/case41.pat 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41.pat 2021-01-12 10:21:17.000000000 +0100
@@ -0,0 +1,114 @@
+commit 05ca23d0002c378ac5db76b17410183ef50297bc
+Author: Thomas E. Dickey <dickey(a)invisible-island.net>
+Date: Tue Jan 12 04:19:41 2021 -0500
+
+ Hello world!
+
+diff --git a/hello.c b/hello.c
+index a9f911c..4a42a83 100644
+--- a/hello.c
++++ b/hello.c
+@@ -2,6 +2,6 @@
+
+ int main(void)
+ {
+- printf("Hello!\n");
++ printf("Hello world!\n");
+ return 0;
+ }
+diff --git a/hello.o b/hello.o
+index 9d2a05c4da9fcefaf858c82ec387095ba477da5a..718ae91813f694202302d3fe812c9ff340dd4743 100644
+GIT binary patch
+delta 28
+kcmeyt^MhxCE4xB@eo;<};zpk{%#6Gf4+?MAVew%C0G)vez5oCK
+
+delta 28
+gcmeyt^MhxCE4v~C7;N-8!_3G&@u2W#9Tp!Z0Cac<Z~y=R
+
+
+commit 99719336611ba5bf241d046f028efe3be4a70ea1
+Author: Thomas E. Dickey <dickey(a)invisible-island.net>
+Date: Tue Jan 12 04:19:08 2021 -0500
+
+ Hello!
+
+diff --git a/hello.c b/hello.c
+index 1e562d6..a9f911c 100644
+--- a/hello.c
++++ b/hello.c
+@@ -2,5 +2,6 @@
+
+ int main(void)
+ {
++ printf("Hello!\n");
+ return 0;
+ }
+diff --git a/hello.o b/hello.o
+index abce3cfeafc342a523b2930d499d2ce200f3ad5e..9d2a05c4da9fcefaf858c82ec387095ba477da5a 100644
+GIT binary patch
+literal 1656
+zcmbVL&ubG=5T0$+uGofH1%)c4CoR}VQbCHMY@6oCVQEXPcw9E=YKqyUWVceiDAa=&
+z!9T~Npnr@9FWx)|b-wHy^L)F#bl|<2`R1GVW_IVjYx=Dj#~~4ip3u}2l<4=&)b=K(
+zM`fC)PBa*dmZq`J$xpZQ=`nyG*y>+9C*R#~)NV8$R_|^`-GgvgT~qf}ZRNpoW`IW5
+zCp(ezc9)#vinBO3>we}!fZx)w8_=8O%5K@!NM51#3-s$WA0a9gb_U#N&PXhAq)1A9
+zLy?r|ViC-z6xUm#%Q=3AoOS+ej$dYE!MJzwjTpPetCC|AEuVo?A3sv{NcoK##o@t_
+zg0{cCvF-=kt=7}#Ua+^m;Wq<1JW3NjLn^_SL(P9qGnr!>f)3_+30`Fz0{*3mr8kwl
+ziPNx4DoMwg?u(U1$0@1(Fbzp{lZ4cG1P9Ezs<RsnLIn~d;W#}yB-I<maWv$t;V6w%
+zd+XT>hkCCxH|hs3#$g<p_n*^V<UGvUf4#8p@hTE<O<7_Gm_1>hNiu9Z{|?76Rp-sW
+z$GJFjm6s`=cI5v`OzsyA9&Ee+9i1R^sNLKwKH>mo#1n$nYZwrgTBhg<YrHCXK{qwN
+z#TxeuPs8+58@C0}TIv@4oN=*D>Ic&?Y@0jK`MTVH%#Yf#>yr9~h&qe<@9P7lPxO!X
+zCHaD*9{X;F=nFQM9bGWqBhIk%ai%>x43Vo3Rd5Wk`@hPuqWt$d|Fw||)6V}3ek*9U
+
+delta 329
+zcmeytGl6S@hLivk0~|PjSq=<54BQNc2PUS;P3%x%WS-2(tUU2T9U~i%Av$>tqsSy6
+z(~nVT@&rZ}Lm>thxOQe3D<d^0Ctoj_AvZBI4=APp6$jbGI=Pg|V)8+z@=1&=lP#D}
+zOm<+F09p~rA}?tLlx75C1E_Ks<vjT!i#n?_NOs~!Va9~Xfz0ZX5g;xQBe@=|9w^JI
+zt{V(wgWTl+7DEsdKw5x60zxrx0%`WiOIfuACqP9$KxwYY3t7b{|6rBiY=G+Fn|M%o
+SvJRUH=L)Dm5=bD2nFj#lz%LpA
+
+
+commit 13e725c303e02fa9a57f1b6e189a904dd8cf7c1a
+Author: Thomas E. Dickey <dickey(a)invisible-island.net>
+Date: Tue Jan 12 04:18:36 2021 -0500
+
+ fix permissions
+
+diff --git a/hello.c b/hello.c
+old mode 100755
+new mode 100644
+
+commit 304b535d7ca93538ca800e6a3a5d7f0b75b3fd00
+Author: Thomas E. Dickey <dickey(a)invisible-island.net>
+Date: Tue Jan 12 04:18:09 2021 -0500
+
+ just return
+
+diff --git a/hello.c b/hello.c
+new file mode 100755
+index 0000000..1e562d6
+--- /dev/null
++++ b/hello.c
+@@ -0,0 +1,6 @@
++#include <stdio.h>
++
++int main(void)
++{
++ return 0;
++}
+diff --git a/hello.o b/hello.o
+new file mode 100644
+index 0000000000000000000000000000000000000000..abce3cfeafc342a523b2930d499d2ce200f3ad5e
+GIT binary patch
+literal 1296
+zcmbtT!AiqG5S=t?s}`x^L8wAKsbH6iAku>bs`ert6v3O_)Rh*Sv?LL#7yX2OhMyt$
+zL;3|eV|LSZ-Fnc0WM<yHH#2NDk4GoRImZEI4jjNZQz$?wH;%op(1Rk(!_LbqG#ib2
+zW%E$@T^?5U*)FS9_qNgimZi*jI0I)`a>~VgVT1z+UzIgi`rjPwGzIS;HjZoE7{CQ>
+zX-(*2#bz!}u$c=pHW<6)C*adR@L5EbwEo!!9ntIcSsMc04UtokO4|He7Z%?K3HO1;
+zNtF7IiV`tQfL-&11M}k;7y-!RQF1o`*6s&^2$2!?6TzCN7ga2^Z-GUk$C>C{-9$VP
+za_)a!85_{IGEdB#(3rTotz$x1c0RJ`NpCt+zk!4TK7ZA3qn3J3+TZM3LauIgOh{kT
+zL5v$RUo&vEzw*RWu}*F2i58pOORN!Q-u#x-n0wJ#>2{6@{RN&5Vod)m*-Gkw?lawf
+wrB}FZHc3YGLVHUc%%P_qrk*hKj7jn&=PyvAnS?WB5hI)aSrYw>nFgl*6QE~3d;kCd
+
+literal 0
+HcmV?d00001
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41.ref new/diffstat-1.64/testing/case41.ref
--- old/diffstat-1.63/testing/case41.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,4 @@
+ b/hello.c | 8 +++++++-
+ b/hello.o |binary
+ hello.c | 1 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41R.ref new/diffstat-1.64/testing/case41R.ref
--- old/diffstat-1.63/testing/case41R.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41R.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,5 @@
+ /dev/null | 6 ------
+ a/hello.c | 2 +-
+ a/hello.o |binary
+ b/hello.c | 1 -
+ 4 files changed, 1 insertion(+), 8 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41Rp0.ref new/diffstat-1.64/testing/case41Rp0.ref
--- old/diffstat-1.63/testing/case41Rp0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41Rp0.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,5 @@
+ /dev/null | 6 ------
+ a/hello.c | 2 +-
+ a/hello.o |binary
+ b/hello.c | 1 -
+ 4 files changed, 1 insertion(+), 8 deletions(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41b.ref new/diffstat-1.64/testing/case41b.ref
--- old/diffstat-1.63/testing/case41b.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41b.ref 2021-01-12 21:57:18.000000000 +0100
@@ -0,0 +1,3 @@
+ b/hello.c | 8 +++++++-
+ hello.c | 1 +
+ 2 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41f0.ref new/diffstat-1.64/testing/case41f0.ref
--- old/diffstat-1.63/testing/case41f0.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41f0.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,4 @@
+ b/hello.c | 8 7 + 1 - 0 !
+ b/hello.o |binary
+ hello.c | 1 1 + 0 - 0 !
+ 3 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41k.ref new/diffstat-1.64/testing/case41k.ref
--- old/diffstat-1.63/testing/case41k.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41k.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,8 @@
+ hello.c | 2 +-
+ hello.c | 1 +
+ hello.c | 0
+ hello.c | 6 ++++++
+ hello.o |binary
+ hello.o |binary
+ hello.o | 0
+ 7 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41p1.ref new/diffstat-1.64/testing/case41p1.ref
--- old/diffstat-1.63/testing/case41p1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41p1.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,3 @@
+ hello.c | 9 ++++++++-
+ hello.o |binary
+ 2 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41p9.ref new/diffstat-1.64/testing/case41p9.ref
--- old/diffstat-1.63/testing/case41p9.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41p9.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,3 @@
+ hello.c | 9 ++++++++-
+ hello.o |binary
+ 2 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41r1.ref new/diffstat-1.64/testing/case41r1.ref
--- old/diffstat-1.63/testing/case41r1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41r1.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,4 @@
+ b/hello.c | 8 +++++++-
+ b/hello.o |binary
+ hello.c | 1 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41r2.ref new/diffstat-1.64/testing/case41r2.ref
--- old/diffstat-1.63/testing/case41r2.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41r2.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,4 @@
+ b/hello.c | 8 +++++++-
+ b/hello.o |binary
+ hello.c | 1 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.63/testing/case41u.ref new/diffstat-1.64/testing/case41u.ref
--- old/diffstat-1.63/testing/case41u.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/diffstat-1.64/testing/case41u.ref 2021-01-12 23:30:55.000000000 +0100
@@ -0,0 +1,4 @@
+ b/hello.c | 8 +++++++-
+ b/hello.o |binary
+ hello.c | 1 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2021-02-01 13:24:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old)
and /work/SRC/openSUSE:Factory/.ImageMagick.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick"
Mon Feb 1 13:24:46 2021 rev:223 rq:866491 version:7.0.10.59
Changes:
--------
--- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2021-01-19 16:01:17.991298841 +0100
+++ /work/SRC/openSUSE:Factory/.ImageMagick.new.28504/ImageMagick.changes 2021-02-01 13:24:49.237786416 +0100
@@ -1,0 +2,9 @@
+Sun Jan 24 20:17:48 UTC 2021 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 7.0.10.59:
+ * strip EXIF marker from profile
+ * add --enable-opencl to the configure command-line to enable OpenCL
+ support.
+ * generate histograms by comparing pixel components rather than color
+
+-------------------------------------------------------------------
Old:
----
ImageMagick-7.0.10-58.tar.bz2
ImageMagick-7.0.10-58.tar.bz2.asc
New:
----
ImageMagick-7.0.10-59.tar.bz2
ImageMagick-7.0.10-59.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ImageMagick.spec ++++++
--- /var/tmp/diff_new_pack.d7KbFO/_old 2021-02-01 13:24:50.033787664 +0100
+++ /var/tmp/diff_new_pack.d7KbFO/_new 2021-02-01 13:24:50.037787670 +0100
@@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.0.10
-%define mfr_revision 58
+%define mfr_revision 59
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 8
++++++ ImageMagick-7.0.10-58.tar.bz2 -> ImageMagick-7.0.10-59.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-7.0.10-58.tar.bz2 /work/SRC/openSUSE:Factory/.ImageMagick.new.28504/ImageMagick-7.0.10-59.tar.bz2 differ: char 11, line 1
1
0