Hello community, here is the log from the commit of package ucpp for openSUSE:Factory checked in at 2018-06-13 15:15:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ucpp (Old) and /work/SRC/openSUSE:Factory/.ucpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ucpp" Wed Jun 13 15:15:34 2018 rev:9 rq:614490 version:1.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ucpp/ucpp.changes 2013-11-04 16:54:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ucpp.new/ucpp.changes 2018-06-13 15:15:40.276821949 +0200 @@ -1,0 +2,8 @@ +Wed Jun 6 08:22:17 UTC 2018 - [email protected] + +- Version update to 1.3.5: + * Few cppcheck fixes + * Move to gitlab + * Few manpage tweaks + +------------------------------------------------------------------- Old: ---- ucpp-1.3.4.tar.xz New: ---- ucpp-1.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ucpp.spec ++++++ --- /var/tmp/diff_new_pack.5QENrC/_old 2018-06-13 15:15:41.964760364 +0200 +++ /var/tmp/diff_new_pack.5QENrC/_new 2018-06-13 15:15:41.968760218 +0200 @@ -1,7 +1,7 @@ # # spec file for package ucpp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,18 @@ %define libname libucpp13 - Name: ucpp +Version: 1.3.5 +Release: 0 Summary: A quick and light preprocessor, but anyway fully compliant to C99 License: BSD-3-Clause Group: Development/Tools/Building -Version: 1.3.4 -Release: 0 -Url: http://code.google.com/p/ucpp/ -# http://github.com/scarabeusiv/ucpp -Source: http://dev.gentooexperimental.org/~scarabeus/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://gitlab.com/scarabeusiv/ucpp/ +Source: https://gitlab.com/scarabeusiv/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: xz %description A C preprocessor is a part of a C compiler responsible for macro @@ -72,9 +71,9 @@ must be called repeatedly, otherwise ucpp is a stand-alone binary. %package devel -Requires: %{libname} = %{version} Summary: Files for Developing with ucpp Group: Development/Libraries/C and C++ +Requires: %{libname} = %{version} %description devel Includes and definitions for developing with the ucpp library. @@ -83,31 +82,29 @@ %setup -q %build +autoreconf -fvi %configure \ + --disable-silent-rules \ --disable-werror \ - --disable-static \ - --docdir="%{_docdir}/%{name}" + --disable-static make %{?_smp_mflags} V=1 %install -make DESTDIR=%{buildroot} install -rm %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root,-) %{_bindir}/* -%{_mandir}/man1/ucpp.1.gz +%{_mandir}/man1/ucpp.1%{?ext_man} %files -n %{libname} -%defattr(-,root,root,-) +%license COPYING %{_libdir}/*.so.1* %files devel -%defattr(-,root,root,-) %{_includedir}/lib%{name} %{_libdir}/*.so %{_libdir}/pkgconfig/lib%{name}*.pc ++++++ ucpp-1.3.4.tar.xz -> ucpp-1.3.5.tar.bz2 ++++++ ++++ 40034 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/ucpp-1.3.4/.gitignore new/ucpp-1.3.5/.gitignore --- old/ucpp-1.3.4/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ucpp-1.3.5/.gitignore 2018-06-06 10:08:54.000000000 +0200 @@ -0,0 +1,43 @@ +# build objects +*.o +*.lo +*.la +.libs + +# http://www.gnu.org/software/automake + +Makefile.in +Makefile + +# http://www.gnu.org/software/autoconf + +.deps +/autom4te.cache +/aclocal.m4 +/compile +/configure +/config.guess +/config.h.in +/config.h +/config.log +/config.status +/config.sub +/depcomp +/install-sh +/ltmain.sh +/libtool +/missing +/m4 +/stamp-h1 + +# pc file +/libucpp.pc + +# created binary +/ucpp + +# generated tarballs +*.tar.* + +# builddir for oot +/build 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/ucpp-1.3.4/.gitlab-ci.yml new/ucpp-1.3.5/.gitlab-ci.yml --- old/ucpp-1.3.4/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/ucpp-1.3.5/.gitlab-ci.yml 2018-06-06 10:08:54.000000000 +0200 @@ -0,0 +1,25 @@ +image: opensuse/tumbleweed + +before_script: + - zypper in -y file which util-linux procps + - zypper in -y autoconf automake pkg-config libtool m4 autoconf-archive make + - zypper in -y gcc + - zypper in -y xz + +stages: + - build + +build-distcheck: + stage: build + script: + - mkdir build + - cd build + - ../autogen.sh + - ../configure + - make V=1 VERBOSE=1 + - make distcheck V=1 VERBOSE=1 + + # The files which are to be made available in GitLab + artifacts: + paths: + - build/* 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/ucpp-1.3.4/ChangeLog new/ucpp-1.3.5/ChangeLog --- old/ucpp-1.3.4/ChangeLog 2012-12-19 08:38:38.000000000 +0100 +++ new/ucpp-1.3.5/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,224 +0,0 @@ -2012-12-19 Tomas Chvatal <[email protected]> [4777833cc524479b55c109eb0574ce813cb5f054] - - Do not call exit but just abort, fixes issues with shared lib. - - -2012-12-08 Tomáš Chvátal <[email protected]> [5d6bdcd32221c2ee6e1d064080c8f7775857002a] - - Fix again the includes i messed up by accident. - - -2012-12-08 Tomáš Chvátal <[email protected]> [e66d96a07b9878a0e6e7808c02e1c89abffd0563] - - include arith.h - - -2012-12-08 Tomáš Chvátal <[email protected]> [d3bebe1c4ee1abbe899bdc7511e05bae27f840eb] - - We should not build the arith stuff as it is done only for the testapp and example. - - -2012-12-08 Tomáš Chvátal <[email protected]> [6373b38a6055ea87b5ea5998935764cbb1393093] - - introduce configure switches for all possible variables. - - -2012-12-08 Tomas Chvatal <[email protected]> [c41e7e089ed5cb2b8786423752ec7f7f3fd838de] - - Drop all mentions of LOW_MEM as the non LOW_MEM codepath is anyway buggy. - - -2012-12-08 Tomas Chvatal <[email protected]> [b4d8c31831c287489661f35f1430f855cbc7a096] - - Version bump post-release (i forgot after tag) - - -2012-12-08 Tomas Chvatal <[email protected]> [66c674433866b2b852c97c6afa4f3d60adb17f96] - - Fix warning about extra tokens after define. - - -2012-12-08 Tomas Chvatal <[email protected]> [87db9fdcf1ace1307a897049c4c1b7af02d018df] - - Add homepage to the ac init - - -2012-12-08 Tomas Chvatal <[email protected]> [dbb20a46748cec21a0a34dad334116002ece9e8f] - - Add missing brackets to lowmem define - - -2012-12-08 Tomas Chvatal <[email protected]> [10b9582865efbc6d29921a13b9d53730fb101436] - - Remove the need for UCPP_CONFIG define. - - -2012-12-08 Tomas Chvatal <[email protected]> [2ce44047a30d2fc0d24b98422d98c3b1d672309b] - - Add switch for lowmem features. - - -2012-12-08 Tomas Chvatal <[email protected]> [d99eef2a4d438daea6d9e557f813e8c36075df65] - - Add Wall to cflags. - - -2012-12-08 Tomas Chvatal <[email protected]> [ff028d763c5db1db29e12b92723e54052437b66b] - - Always enable memcheck feature. - - -2012-12-07 Tomas Chvatal <[email protected]> [32b24d8fcdcb12a8bd723be9677dbd86edf05503] - - Remove trailing whitespace. - - -2012-12-07 Joe Hermaszewski <[email protected]> [09b1c9c4733bad4548c46a6dadb3239de1b6e294] - - Added extern "C" - - -2012-12-07 Tomas Chvatal <[email protected]> [f89f54515951f508bb7ca6fe30be654cf849662b] - - Ignore builddir. - - -2012-12-07 Tomas Chvatal <[email protected]> [8f317d89c65e4291a14c0c1d869726964df529c6] - - Fix warnings here and there. - - -2012-11-21 Tomas Chvatal <[email protected]> [b42250d125ce9b9129454ebacb7dc28ffb7363e8] - - Fix dist command, missed manpage. - - -2012-09-27 Tomáš Chvátal <[email protected]> [3027f5de6c761c70e18e78992d4a0bd4a53f9db4] - - Update README.md - - -2012-09-27 Tomas Chvatal <[email protected]> [bd08141e353940206e6d5ae46f72368e6a442235] - - Handle the man more easily. - - -2012-09-27 Tomas Chvatal <[email protected]> [9dc2cedd68ac0982786516810cf2cc24e16f7a1d] - - Fix cmis copy&pasto. - - -2012-09-24 Tomas Chvatal <[email protected]> [6420e4f679bc2af015f5153535386fa7f999b307] - - Fix typo : => - - - -2012-09-24 Tomas Chvatal <[email protected]> [c695432c1f44eeb66d08c5eaccb34f7218cb7e0d] - - Sort out the soname for the library - - -2012-09-24 Tomas Chvatal <[email protected]> [35c20db32caca65a84b805faf0723543c267bc2d] - - Ingore tarballs - - -2012-09-24 Tomas Chvatal <[email protected]> [b8cce2edf4863fe7e2038f127459f46f44922aba] - - Add configure.ac and Makefile.am - - -2012-09-24 Tomas Chvatal <[email protected]> [9ce4bf5aa2f5d0113d6cf5bcece4937ac8c58f55] - - Ingore also the binary. - - -2012-09-24 Tomas Chvatal <[email protected]> [e80f90e98d0c8dd4760c3529793c506159a575fe] - - Fix header includes and defines so we do not clash and override each other. - - -2012-09-24 Tomas Chvatal <[email protected]> [f08f017ab5a37ee78f71dc6e3514ea808d1574ec] - - Ignore built objects. - - -2012-09-24 Tomas Chvatal <[email protected]> [e2eda6cbba8109246539ef6d6ccb2189d060233c] - - Remove clash with config.h generated by autotools. - - -2012-09-24 Tomas Chvatal <[email protected]> [272ef3a2f56cd2a0fc37e98dfebd7c7b0d8ff155] - - More ignored files - - -2012-09-24 Tomas Chvatal <[email protected]> [fb1c2f8a2a1614153b34d643a1a2fc32f6a53c38] - - More items to ignore - - -2012-09-24 Tomas Chvatal <[email protected]> [26765c47cff2e8d51ab79dd2b653e5861427b621] - - Add libucpp pc file. - - -2012-09-24 Tomas Chvatal <[email protected]> [9c0a3891f83cd10dc113be1055fc745e1b9b4414] - - Add todo file. - - -2012-09-24 Tomas Chvatal <[email protected]> [fca8fc4ef00adda8f3f396bb55a708c89929e9a5] - - Add AUTHORS file. - - -2012-09-24 Tomas Chvatal <[email protected]> [8b2b9663c66d76deb00ff8de979c745cd4f62b0e] - - Ingore more autotools generated files. - - -2012-09-24 Tomas Chvatal <[email protected]> [80bfbae660a4afa571a628473a92ac06eabed4e2] - - Drop Makefile as it will be generated from Makefile.am - - -2012-09-24 Tomas Chvatal <[email protected]> [ee43b07ec06c57d93013db4962a10ae89155f913] - - Rename CHANGELOG to ChangeLog.old as new will be autogenerated on dist hook. - - -2012-09-24 Tomas Chvatal <[email protected]> [143386445569f0f09dde1dabc646809a0cce198c] - - Move source files to src subfolder. - - -2012-09-24 Tomas Chvatal <[email protected]> [d826d168c91ecb748f10cf917ba2398445757e99] - - Add autogen script. - - -2012-09-24 Tomas Chvatal <[email protected]> [1e6b4c389c0170214f2d2b3b1ffdac1cb42dc8d7] - - Add license file as it is stated to be BSD license on upstream site. - - -2012-09-24 Tomas Chvatal <[email protected]> [8f5e6265d2104792a109c3c6789bf0cc5a8a4256] - - Include libreoffice patch. - - -2012-09-24 Tomas Chvatal <[email protected]> [e405f4e032f5be06886976ff567748948fd2ff9c] - - Add ucpp-1.3.2 release. - - -2012-09-24 Tomas Chvatal <[email protected]> [8e1a1852173edf8e718a7dbc705dc9c687e73077] - - Update readme a bit more. - - -2012-09-24 Tomáš Chvátal <[email protected]> [8c81dca403cf29a7c72ad251f7ee8cafa8ea7a87] - - Initial commit - 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/ucpp-1.3.4/README.md new/ucpp-1.3.5/README.md --- old/ucpp-1.3.4/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/ucpp-1.3.5/README.md 2018-06-06 10:08:54.000000000 +0200 @@ -0,0 +1,8 @@ +ucpp +==== + +A C preprocessor compliant to ISO-C99. + +Autotools based version with few cleanups, upstream at http://code.google.com/p/ucpp/. + +This version is based of 1.3.2 as upstream git repository is broken. 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/ucpp-1.3.4/TODO new/ucpp-1.3.5/TODO --- old/ucpp-1.3.4/TODO 2012-09-24 13:15:37.000000000 +0200 +++ new/ucpp-1.3.5/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Convert the manpage to xml file and generate it on the fly. 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/ucpp-1.3.4/autogen.sh new/ucpp-1.3.5/autogen.sh --- old/ucpp-1.3.4/autogen.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/ucpp-1.3.5/autogen.sh 2018-06-06 10:08:54.000000000 +0200 @@ -0,0 +1,38 @@ +#!/bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +olddir=`pwd` +cd $srcdir + +aclocal --version > /dev/null 2> /dev/null || { + echo "error: aclocal not found" + exit 1 +} +automake --version > /dev/null 2> /dev/null || { + echo "error: automake not found" + exit 1 +} + +rm -rf autom4te*.cache + +libtoolize --force --copy || { + echo "error: libtoolize failed" + exit 1 +} +aclocal || { + echo "error: aclocal failed" + exit 1 +} +autoheader || { + echo "error: autoheader failed" + exit 1 +} +automake -a -c --foreign || { + echo "warning: automake failed" +} +autoconf || { + echo "error: autoconf failed" + exit 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/ucpp-1.3.4/config.h.in new/ucpp-1.3.5/config.h.in --- old/ucpp-1.3.4/config.h.in 2012-12-19 08:38:55.000000000 +0100 +++ new/ucpp-1.3.5/config.h.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Amiga file paths (drive letters) */ -#undef AMIGA - -/* Perform arithmetic checks. It slows down calculations bit, but it is really - marginal */ -#undef ARITHMETIC_CHECKS - -/* Merge incompatible tokens. Note that this is REALLY REALY bad idea */ -#undef DSHARP_TOKEN_MERGE - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Include macro replacement flags for tokens in lexer_state */ -#undef INMACRO_FLAG - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* MsDOS file paths (backslashes) */ -#undef MSDOS - -/* Use the native types for #if arithmetic */ -#undef NATIVE_MATH - -/* Disable buffering of input and output streams over the standard libc - buffering (manageable with setbuf() and setvbuf()) */ -#undef NO_LIBC_BUF - -/* Disable buffering of input and output streams in ucpp, respectively - disabling INPUT_BUF_MEMG and OUTPUT_BUF_MEM */ -#undef NO_UCPP_BUF - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* This calls are not ANSI-C but they tend to be bit faster than their ANSI - counterpart */ -#undef POSIX_JMP - -/* It is unclear whether _Pragma() are evaluated inside directives such as - #if, #include and #line in C99. If you want to disable the evaluation of - _Pragma() inside such directives, disable the following macro */ -#undef PRAGMA_IN_DIRECTIVE - -/* Include pragma directives in output in non-lexer mode */ -#undef PRAGMA_TOKENIZE - -/* Record whitespace tokens. Without this option, whitespace tokens are not - even returned by the lex() function. */ -#undef SEMPER_FIDELIS - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if there is strftime function */ -#undef STRFTIME - -/* Use system mmap instead of internal ucpp on input buffering */ -#undef UCPP_MMAP - -/* Version number of package */ -#undef VERSION 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/ucpp-1.3.4/configure.ac new/ucpp-1.3.5/configure.ac --- old/ucpp-1.3.4/configure.ac 2012-12-19 08:37:38.000000000 +0100 +++ new/ucpp-1.3.5/configure.ac 2018-06-06 10:08:54.000000000 +0200 @@ -7,16 +7,16 @@ # ==================== m4_define([ucpp_version_major],[1]) m4_define([ucpp_version_minor],[3]) -m4_define([ucpp_version_micro],[4]) +m4_define([ucpp_version_micro],[5]) m4_define([ucpp_version],[ucpp_version_major.ucpp_version_minor.ucpp_version_micro]) # ============= # Automake init # ============= -AC_INIT([ucpp],[ucpp_version], [https://github.com/scarabeusiv/ucpp]) +AC_INIT([ucpp],[ucpp_version], [https://gitlab.com/scarabeusiv/ucpp]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.11 foreign dist-xz dist-bzip2]) +AM_INIT_AUTOMAKE([1.11 foreign subdir-objects dist-xz dist-bzip2]) AM_SILENT_RULES([yes]) AC_LANG([C]) @@ -52,7 +52,7 @@ # ================ # Check for cflags # ================ -CFLAGS="$CFLAGS -Wall -ansi" +CFLAGS="$CFLAGS -Wall -pedantic" CPPFLAGS="$CPPFLAGS -DMEM_CHECK" AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, useful for development])], 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/ucpp-1.3.4/missing new/ucpp-1.3.5/missing --- old/ucpp-1.3.4/missing 2012-09-24 13:08:55.000000000 +0200 +++ new/ucpp-1.3.5/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,331 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2012-01-06.13; # UTC - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# 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/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - -Send bug reports to <[email protected]>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: 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/ucpp-1.3.4/src/atest.c new/ucpp-1.3.5/src/atest.c --- old/ucpp-1.3.4/src/atest.c 2012-12-07 15:42:54.000000000 +0100 +++ new/ucpp-1.3.5/src/atest.c 2018-06-06 10:08:54.000000000 +0200 @@ -47,12 +47,12 @@ static inline void print_uz(u_zoinx x) { - printf("%u", x); + printf("%u", (unsigned)x); } static inline void print_sz(s_zoinx x) { - printf("%d", x); + printf("%d", (int)x); } #else 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/ucpp-1.3.4/src/cpp.c new/ucpp-1.3.5/src/cpp.c --- old/ucpp-1.3.4/src/cpp.c 2012-12-19 08:37:17.000000000 +0100 +++ new/ucpp-1.3.5/src/cpp.c 2018-06-06 10:08:54.000000000 +0200 @@ -456,7 +456,7 @@ static void pop_file_context(struct lexer_state *ls) { #ifdef AUDIT - if (ls_depth <= 0) ouch("prepare to meet thy creator"); + if (!ls_depth) ouch("prepare to meet thy creator"); #endif close_input(ls); restore_lexer_state(ls, &(ls_stack[-- ls_depth].ls)); @@ -1053,6 +1053,7 @@ freemem(tf.t); if (tf1.nt == 0) { error(l, "void condition (after expansion) for a #if/#elif"); + freemem(tf1.t); return -1; } @@ -1146,6 +1147,7 @@ freemem(tf1.t); if (tf2.nt == 0) { error(l, "void condition (after expansion) for a #if/#elif"); + freemem(tf2.t); return -1; } @@ -1174,6 +1176,7 @@ if (tf3.nt == 0) { error(l, "void condition (after expansion) for a #if/#elif"); + freemem(tf3.t); return -1; } eval_line = l; @@ -1443,7 +1446,7 @@ char *fname; long l = ls->line; struct token_fifo tf, tf2, *save_tf; - size_t nl, j; + size_t j; unsigned long z; tf.art = tf.nt = 0; @@ -1509,6 +1512,7 @@ ls->oline = ls->line = z; if ((++ tf2.art) < tf2.nt) { size_t i; + size_t nl; for (i = tf2.art; i < tf2.nt && ttMWS(tf2.t[i].type); i ++); if (i < tf2.nt) { @@ -1650,6 +1654,7 @@ } if (tf.nt == 0) { /* void pragma are silently ignored */ + freemem(tf.t); return; } buf = (compress_token_list(&tf)).t; @@ -1697,7 +1702,6 @@ unsigned long save_flags = ls->flags; int ret = 0; - save_flags = ls->flags; ls->flags |= LEXER; while (!next_token(ls)) { int t = ls->ctok->type; @@ -1989,7 +1993,6 @@ return ret; too_many_if: error(l, "too many levels of conditional inclusion (max 63)"); - ret = 1; goto handle_warp; #undef condfset #undef condfclr @@ -2201,26 +2204,8 @@ #endif time(&t); ct = localtime(&t); -#ifndef STRFTIME - /* we have a quite old compiler, that does not know the - (standard since 1990) strftime() function. */ - { - char *c = asctime(ct); - - compile_time[0] = '"'; - mmv(compile_time + 1, c + 11, 8); - compile_time[9] = '"'; - compile_time[10] = 0; - compile_date[0] = '"'; - mmv(compile_date + 1, c + 4, 7); - mmv(compile_date + 8, c + 20, 4); - compile_date[12] = '"'; - compile_date[13] = 0; - } -#else strftime(compile_time, 12, "\"%H:%M:%S\"", ct); strftime(compile_date, 24, "\"%b %d %Y\"", ct); -#endif init_macros(); if (with_assertions) init_assertions(); init_found_files(); 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/ucpp-1.3.4/src/macro.c new/ucpp-1.3.5/src/macro.c --- old/ucpp-1.3.4/src/macro.c 2012-12-08 11:55:17.000000000 +0100 +++ new/ucpp-1.3.5/src/macro.c 2018-06-06 10:08:54.000000000 +0200 @@ -521,8 +521,6 @@ if (mval.nt == 0) freemem(mval.t); } if (mval.nt != 0) { - size_t i; - /* some checks about the macro */ if (mval.t[0].type == DSHARP || mval.t[0].type == DIG_DSHARP @@ -532,19 +530,22 @@ "nor end a macro"); goto define_error; } - if (m->narg >= 0) for (i = 0; i < mval.nt; i ++) - if ((mval.t[i].type == SHARP - || mval.t[i].type == DIG_SHARP) && - (i == (mval.nt - 1) - || (ttMWS(mval.t[i + 1].type) && - (i == mval.nt - 2 - || mval.t[i + 2].type != MACROARG)) - || (!ttMWS(mval.t[i + 1].type) - && mval.t[i + 1].type != MACROARG))) { - error(l, "operator '#' not followed " - "by a macro argument"); - goto define_error; - } + if (m->narg >= 0) { + size_t i; + for (i = 0; i < mval.nt; i ++) + if ((mval.t[i].type == SHARP + || mval.t[i].type == DIG_SHARP) && + (i == (mval.nt - 1) + || (ttMWS(mval.t[i + 1].type) && + (i == mval.nt - 2 + || mval.t[i + 2].type != MACROARG)) + || (!ttMWS(mval.t[i + 1].type) + && mval.t[i + 1].type != MACROARG))) { + error(l, "operator '#' not followed " + "by a macro argument"); + goto define_error; + } + } } { size_t i, l; 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/ucpp-1.3.4/ucpp.1 new/ucpp-1.3.5/ucpp.1 --- old/ucpp-1.3.4/ucpp.1 2012-09-24 12:41:39.000000000 +0200 +++ new/ucpp-1.3.5/ucpp.1 2018-06-06 10:08:54.000000000 +0200 @@ -204,9 +204,8 @@ .PP .B ucpp is considered stable software. However improbable it is, please report -bugs to the author (possibly with a file that exhibits the problem) if -the latest version, available from this site: +a ticket if the latest version, available from this site: .TP -http://pornin.nerim.net/ucpp/ +https://gitlab.com/scarabeusiv/ucpp .PP has the bug.
