Hello community, here is the log from the commit of package deutex for openSUSE:Factory checked in at 2018-09-17 14:27:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deutex (Old) and /work/SRC/openSUSE:Factory/.deutex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deutex" Mon Sep 17 14:27:45 2018 rev:8 rq:635965 version:5.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/deutex/deutex.changes 2018-01-19 11:52:43.265029864 +0100 +++ /work/SRC/openSUSE:Factory/.deutex.new/deutex.changes 2018-09-17 14:28:21.811683400 +0200 @@ -1,0 +2,7 @@ +Sun Sep 16 18:07:30 UTC 2018 - Avindra Goolcharan <[email protected]> + +- update to 5.1.2 + * fix segfault with --help +- partial cleanup with spec-cleaner + +------------------------------------------------------------------- Old: ---- deutex-5.1.1.tar.xz deutex-5.1.1.tar.xz.sig New: ---- deutex-5.1.2.tar.xz deutex-5.1.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deutex.spec ++++++ --- /var/tmp/diff_new_pack.tHf4pC/_old 2018-09-17 14:28:22.263683014 +0200 +++ /var/tmp/diff_new_pack.tHf4pC/_new 2018-09-17 14:28:22.267683010 +0200 @@ -12,19 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: deutex -Version: 5.1.1 +Version: 5.1.2 Release: 0 Summary: WAD composer for Doom and related games -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Other #Historic-Url: http://www.teaser.fr/~amajorel/deutex/ URL: https://github.com/Doom-Utils/deutex - Source: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.xz Source2: https://github.com/Doom-Utils/deutex/releases/download/v%version/%name-%version.tar.xz.sig BuildRequires: asciidoc @@ -54,8 +53,8 @@ %make_install %files +%license COPYING COPYING.LIB %_bindir/* %_mandir/man6/%name.6%ext_man -%doc COPYING COPYING.LIB %changelog ++++++ deutex-5.1.1.tar.xz -> deutex-5.1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deutex-5.1.1/NEWS.adoc new/deutex-5.1.2/NEWS.adoc --- old/deutex-5.1.1/NEWS.adoc 2018-01-08 05:36:03.000000000 +0100 +++ new/deutex-5.1.2/NEWS.adoc 2018-08-12 21:19:06.000000000 +0200 @@ -1,6 +1,13 @@ DeuTex release notes ==================== +5.1.2 (2018-08-12) +------------------ + +General +~~~~~~~ + * `--help` no longer causes a segfault (thanks andwj). + 5.1.1 (2018-01-08) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deutex-5.1.1/aclocal.m4 new/deutex-5.1.2/aclocal.m4 --- old/deutex-5.1.1/aclocal.m4 2018-01-08 05:36:03.000000000 +0100 +++ new/deutex-5.1.2/aclocal.m4 2018-08-12 21:19:06.000000000 +0200 @@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 12 (pkg-config-0.29.2) +# serial 11 (pkg-config-0.29.1) dnl Copyright © 2004 Scott James Remnant <[email protected]>. dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.2]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $2]) +AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -296,6 +296,74 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + # Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deutex-5.1.1/configure new/deutex-5.1.2/configure --- old/deutex-5.1.1/configure 2018-01-08 05:36:03.000000000 +0100 +++ new/deutex-5.1.2/configure 2018-08-12 21:19:06.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for DeuTex 5.1.1. +# Generated by GNU Autoconf 2.69 for DeuTex 5.1.2. # # Report bugs to <https://github.com/Doom-Utils/deutex/issues>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='DeuTex' PACKAGE_TARNAME='deutex' -PACKAGE_VERSION='5.1.1' -PACKAGE_STRING='DeuTex 5.1.1' +PACKAGE_VERSION='5.1.2' +PACKAGE_STRING='DeuTex 5.1.2' PACKAGE_BUGREPORT='https://github.com/Doom-Utils/deutex/issues' PACKAGE_URL='' @@ -1238,7 +1238,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 DeuTex 5.1.1 to adapt to many kinds of systems. +\`configure' configures DeuTex 5.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1304,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of DeuTex 5.1.1:";; + short | recursive ) echo "Configuration of DeuTex 5.1.2:";; esac cat <<\_ACEOF @@ -1406,7 +1406,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -DeuTex configure 5.1.1 +DeuTex configure 5.1.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1461,7 +1461,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by DeuTex $as_me 5.1.1, which was +It was created by DeuTex $as_me 5.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2325,7 +2325,7 @@ # Define the identity of the package. PACKAGE='deutex' - VERSION='5.1.1' + VERSION='5.1.2' cat >>confdefs.h <<_ACEOF @@ -3852,8 +3852,8 @@ if test "$with_libpng" != no; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng >= 1.6.0" >&5 -$as_echo_n "checking for libpng >= 1.6.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG" >&5 +$as_echo_n "checking for PNG... " >&6; } if test -n "$PNG_CFLAGS"; then pkg_cv_PNG_CFLAGS="$PNG_CFLAGS" @@ -3893,7 +3893,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -3917,7 +3917,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "$with_libpng" != check; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -4475,7 +4475,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by DeuTex $as_me 5.1.1, which was +This file was extended by DeuTex $as_me 5.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4541,7 +4541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -DeuTex config.status 5.1.1 +DeuTex config.status 5.1.2 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/deutex-5.1.1/configure.ac new/deutex-5.1.2/configure.ac --- old/deutex-5.1.1/configure.ac 2018-01-08 05:36:03.000000000 +0100 +++ new/deutex-5.1.2/configure.ac 2018-08-12 21:19:06.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([DeuTex], [5.1.1], [https://github.com/Doom-Utils/deutex/issues]) +AC_INIT([DeuTex], [5.1.2], [https://github.com/Doom-Utils/deutex/issues]) AC_PACKAGE_URL([https://github.com/Doom-Utils/deutex]) AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deutex-5.1.1/src/deutex.c new/deutex-5.1.2/src/deutex.c --- old/deutex-5.1.1/src/deutex.c 2018-01-08 05:36:03.000000000 +0100 +++ new/deutex-5.1.2/src/deutex.c 2018-08-12 21:19:06.000000000 +0200 @@ -710,6 +710,8 @@ comfun_t exec; char *use; char *help; + uint16_t width1; + uint16_t width2; } comdef_t; /* FIXME should be at the top of the file but we need comdef_t */ @@ -1124,14 +1126,11 @@ /* Do a first pass on all the options for this section. Find out how wide the left and right columns need to be. */ if (d->type == SEC) { - uint16_t tmp; if (section++) putchar('\n'); printf("%s:\n", d->help); - memcpy(&tmp, d->exec, sizeof(tmp)); - width1 = tmp + OPTINDENT; - memcpy(&tmp, d->use, sizeof(tmp)); - width2 = tmp; + width1 = d->width1 + OPTINDENT; + width2 = d->width2; if (width1 + 1 + width2 > TTYCOL) width1 = TTYCOL - width2 - COLSPACING; } @@ -1241,17 +1240,16 @@ if (tmp != width2r) /* Can't happen */ tmp = SHRT_MAX; - memcpy(current_section->com, &tmp, sizeof(tmp)); tmp = width1t; if (tmp != width1t) tmp = SHRT_MAX; - memcpy(current_section->exec, &tmp, sizeof(tmp)); + current_section->width1 = tmp; tmp = width2t; if (tmp != width2t) tmp = SHRT_MAX; - memcpy(current_section->use, &tmp, sizeof(tmp)); + current_section->width2 = tmp; } }
