August 2020 - openSUSE Commits - openSUSE Mailing Lists

commit aaa_base for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2020-08-02 12:27:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Sun Aug 2 12:27:34 2020 rev:470 rq:822172 version:84.87+git20200708.f5e90d7 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2020-06-24 15:47:33.628089545 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.3592/aaa_base.changes 2020-08-02 12:27:45.887820552 +0200 @@ -1,0 +2,9 @@ +Wed Jul 08 10:00:41 UTC 2020 - ro(a)suse.de + +- Update to version 84.87+git20200708.f5e90d7: + * check for Packages.db and use this instead of Packages + (boo#1171762) + * Add also support for /usr/etc/profile.d for tcsh + * Do add some support for /usr/etc/profile.d + +------------------------------------------------------------------- @@ -22,0 +32,5 @@ + +------------------------------------------------------------------- +Thu May 07 08:26:51 UTC 2020 - werner(a)suse.de + +- Better support of Midnight Commander (bsc#1170527) Old: ---- aaa_base-84.87+git20200507.e2243a4.tar.xz New: ---- aaa_base-84.87+git20200708.f5e90d7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.WQCGEJ/_old 2020-08-02 12:27:46.839821531 +0200 +++ /var/tmp/diff_new_pack.WQCGEJ/_new 2020-08-02 12:27:46.843821535 +0200 @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20200507.e2243a4 +Version: 84.87+git20200708.f5e90d7 Release: 0 URL: https://github.com/openSUSE/aaa_base # do not require systemd - aaa_base is in the build environment and we don't ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.WQCGEJ/_old 2020-08-02 12:27:46.899821593 +0200 +++ /var/tmp/diff_new_pack.WQCGEJ/_new 2020-08-02 12:27:46.899821593 +0200 @@ -1,4 +1,6 @@ <servicedata> <service name="tar_scm"> - <param name="url">https://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">e2243a4b9f47fa4a51de471811fc32da925a2ffe</param></service></servicedata> \ No newline at end of file + <param name="url">https://github.com/openSUSE/aaa_base.git</param> + <param name="changesrevision">f5e90d70d119b6aa12d019947029f9337aec378d</param> +</service> +</servicedata> ++++++ aaa_base-84.87+git20200507.e2243a4.tar.xz -> aaa_base-84.87+git20200708.f5e90d7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/bash.bashrc new/aaa_base-84.87+git20200708.f5e90d7/files/etc/bash.bashrc --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/bash.bashrc 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/bash.bashrc 2020-07-08 11:57:32.000000000 +0200 @@ -89,7 +89,11 @@ test -z "$UID" && readonly UID=`path id -ur 2> /dev/null` test -z "$EUID" && readonly EUID=`path id -u 2> /dev/null` -test -s /etc/profile.d/ls.bash && . /etc/profile.d/ls.bash +if test -s /etc/profile.d/ls.bash +then . /etc/profile.d/ls.bash +elif test -s /usr/etc/profile.d/ls.bash +then . /usr/etc/profile.d/ls.bash +fi # # Avoid trouble with Emacs shell mode @@ -282,9 +286,17 @@ # therefore we use functions here. This is a seperate # file because other shells may run into trouble # if they parse this even if they do not expand. - test -s /etc/profile.d/alias.ash && . /etc/profile.d/alias.ash + if test -s /etc/profile.d/alias.ash + then . /etc/profile.d/alias.ash + elif test -s /usr/etc/profile.d/alias.ash + then . /usr/etc/profile.d/alias.ash + fi else - test -s /etc/profile.d/alias.bash && . /etc/profile.d/alias.bash + if test -s /etc/profile.d/alias.bash + then . /etc/profile.d/alias.bash + elif -s /usr/etc/profile.d/alias.bash + then . /usr/etc/profile.d/alias.bash + fi test -s $HOME/.alias && . $HOME/.alias fi @@ -302,20 +314,30 @@ . /etc/bash_completion elif test -s /etc/profile.d/bash_completion.sh ; then . /etc/profile.d/bash_completion.sh + elif test -s /usr/etc/profile.d/bash_completion.sh ; then + . /usr/etc/profile.d/bash_completion.sh elif test -s /etc/profile.d/complete.bash ; then . /etc/profile.d/complete.bash + elif test -s /usr/etc/profile.d/complete.bash ; then + . /usr/etc/profile.d/complete.bash fi # Do not source twice if already handled by bash-completion if [[ -n $BASH_COMPLETION_COMPAT_DIR && $BASH_COMPLETION_COMPAT_DIR != /etc/bash_completion.d ]]; then for s in /etc/bash_completion.d/*.sh ; do test -r $s && . $s done + elif [[ -n $BASH_COMPLETION_COMPAT_DIR && $BASH_COMPLETION_COMPAT_DIR != /usr/etc/bash_completion.d ]]; then + for s in /usr/etc/bash_completion.d/*.sh ; do + test -r $s && . $s + done fi if test -e $HOME/.bash_completion ; then . $HOME/.bash_completion fi - if test -f /etc/bash_command_not_found ; then - . /etc/bash_command_not_found + if test -f /etc/bash_command_not_found + then . /etc/bash_command_not_found + elif test -f /usr/etc/bash_command_not_found + then . /usr/etc/bash_command_not_found fi ;; *) ;; @@ -335,8 +357,10 @@ fi # command not found handler in zsh version if test "$is" = "zsh" ; then - if test -f /etc/zsh_command_not_found ; then - . /etc/zsh_command_not_found + if test -f /etc/zsh_command_not_found + then . /etc/zsh_command_not_found + elif test -f /usr/etc/zsh_command_not_found + then . /usr/etc/zsh_command_not_found fi fi ;; @@ -345,8 +369,10 @@ # Source /etc/profile.d/vte.sh, which improvies usage of VTE based terminals. # It is vte.sh's responsibility to 'not load' when it's not applicable (not inside a VTE term) # If you want to 'disable' this functionality, set the sticky bit on /etc/profile.d/vte.sh -if test -r /etc/profile.d/vte.sh -a ! -k /etc/profile.d/vte.sh; then - . /etc/profile.d/vte.sh +if test -r /etc/profile.d/vte.sh -a ! -k /etc/profile.d/vte.sh +then . /etc/profile.d/vte.sh +elif test -r /usr/etc/profile.d/vte.sh -a ! -k /usr/etc/profile.d/vte.sh +then . /usr/etc/profile.d/vte.sh fi if test "$_is_save" = "unset" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.cshrc new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.cshrc --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.cshrc 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.cshrc 2020-07-08 11:57:32.000000000 +0200 @@ -2,15 +2,15 @@ # (c) System csh.cshrc for tcsh, Werner Fink '93 # and Jörg Stadler '94 # -# This file sources /etc/profile.d/complete.tcsh and -# /etc/profile.d/bindkey.tcsh used especially by tcsh. +# This file sources /(usr/)etc/profile.d/complete.tcsh and +# /(usr/)etc/profile.d/bindkey.tcsh used especially by tcsh. # # PLEASE DO NOT CHANGE /etc/csh.cshrc. There are chances that your changes # will be lost during system upgrades. Instead use /etc/csh.cshrc.local for # your local settings, favourite global aliases, VISUAL and EDITOR # variables, etc ... # USERS may write their own $HOME/.csh.expert to skip sourcing of -# /etc/profile.d/complete.tcsh and most parts oft this file. +# /(usr/)etc/profile.d/complete.tcsh and most parts oft this file. # # @@ -79,7 +79,13 @@ # # Now read in the key bindings of the tcsh # -if ($?tcsh && -r /etc/profile.d/bindkey.tcsh) source /etc/profile.d/bindkey.tcsh +if ($?tcsh) then + if ( -r /etc/profile.d/bindkey.tcsh ) then + source /etc/profile.d/bindkey.tcsh + else if ( -r /usr/etc/profile.d/bindkey.tcsh ) then + source /usr/etc/profile.d/bindkey.tcsh + endif +endif # # Some useful settings @@ -105,9 +111,15 @@ unset autologout unset ignoreeof -if (-r /etc/profile.d/ls.tcsh) source /etc/profile.d/ls.tcsh +foreach _s (ls.tcsh alias.tcsh) + if (-r /etc/profile.d/$_s) then + source /etc/profile.d/$_s + continue + endif + if (-r /usr/etc/profile.d/$_s) source /usr/etc/profile.d/$_s +end +unset _s -if (-r /etc/profile.d/alias.tcsh) source /etc/profile.d/alias.tcsh # # Prompting and Xterm title # @@ -173,8 +185,12 @@ set _rev=${tcsh:r} set _rel=${_rev:e} set _rev=${_rev:r} - if (($_rev > 6 || ($_rev == 6 && $_rel > 1)) && -r /etc/profile.d/complete.tcsh) then - source /etc/profile.d/complete.tcsh + if ($_rev > 6 || ($_rev == 6 && $_rel > 1)) then + if (-r /etc/profile.d/complete.tcsh) then + source /etc/profile.d/complete.tcsh + else if (-r /usr/etc/profile.d/complete.tcsh) then + source /usr/etc/profile.d/complete.tcsh + endif endif # # Enable editing in multibyte encodings for the locales diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.login new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.login --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/csh.login 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/csh.login 2020-07-08 11:57:32.000000000 +0200 @@ -233,21 +233,27 @@ # overriding locale variables already present in the environment # if (! ${?CSHRCREAD} ) then - if ( -r /etc/profile.d/csh.ssh ) source /etc/profile.d/csh.ssh + if ( -r /etc/profile.d/csh.ssh ) then + source /etc/profile.d/csh.ssh + else if ( -r /usr/etc/profile.d/csh.ssh ) then + source /usr/etc/profile.d/csh.ssh + endif endif # # Source profile extensions for certain packages, the super # may disable some of them by setting the sticky bit. # -if ( -d /etc/profile.d && ! ${?CSHRCREAD} ) then +if ((-d /etc/profile.d || -d /usr/etc/profile.d ) && ! ${?CSHRCREAD} ) then set _tmp=${?nonomatch} set nonomatch unset noglob + foreach _s ( /usr/etc/profile.d/*.csh ) + if ( -e /etc/profile.d/${_s:t} ) continue + if ( -r $_s && ! -k $_s ) source $_s + end foreach _s ( /etc/profile.d/*.csh ) - if ( -r $_s && ! -k $_s ) then - source $_s - endif + if ( -r $_s && ! -k $_s ) source $_s end set noglob if ( ! ${_tmp} ) unset nonomatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/etc/profile new/aaa_base-84.87+git20200708.f5e90d7/files/etc/profile --- old/aaa_base-84.87+git20200507.e2243a4/files/etc/profile 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/etc/profile 2020-07-08 11:57:32.000000000 +0200 @@ -291,14 +291,22 @@ # overriding locale variables already present in the environment # if test -z "$PROFILEREAD" ; then - test -r /etc/profile.d/sh.ssh && . /etc/profile.d/sh.ssh + if test -r /etc/profile.d/sh.ssh + then . /etc/profile.d/sh.ssh + elif test -r /usr/etc/profile.d/sh.ssh + then . /usr/etc/profile.d/sh.ssh + fi fi # # Source profile extensions for certain packages, the super # may disable some of them by setting the sticky bit. # -if test -d /etc/profile.d -a -z "$PROFILEREAD" ; then +if test $ -d /etc/profile.d -o -d /usr/etc/profile.d $ -a -z "$PROFILEREAD" ; then + for s in /usr/etc/profile.d/*.sh ; do + test -e /etc/profile.d/${s##*/} && continue + test -r $s -a ! -k $s && . $s + done for s in /etc/profile.d/*.sh ; do test -r $s -a ! -k $s && . $s done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200507.e2243a4/files/usr/lib/base-scripts/backup-rpmdb new/aaa_base-84.87+git20200708.f5e90d7/files/usr/lib/base-scripts/backup-rpmdb --- old/aaa_base-84.87+git20200507.e2243a4/files/usr/lib/base-scripts/backup-rpmdb 2020-05-07 14:43:18.000000000 +0200 +++ new/aaa_base-84.87+git20200708.f5e90d7/files/usr/lib/base-scripts/backup-rpmdb 2020-07-08 11:57:32.000000000 +0200 @@ -27,7 +27,9 @@ # # PACKAGEDBFILE=packages.rpm -if test -e ${RPMDB_PATH}/Packages ; then +if test -e ${RPMDB_PATH}/Packages.db ; then + PACKAGEDBFILE=Packages.db +elif test -e ${RPMDB_PATH}/Packages ; then PACKAGEDBFILE=Packages fi #

1 0

commit automake for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package automake for openSUSE:Factory checked in at 2020-08-02 12:27:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/automake (Old) and /work/SRC/openSUSE:Factory/.automake.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "automake" Sun Aug 2 12:27:31 2020 rev:53 rq:822036 version:1.16.2 Changes: -------- --- /work/SRC/openSUSE:Factory/automake/automake.changes 2019-11-18 19:56:59.149996673 +0100 +++ /work/SRC/openSUSE:Factory/.automake.new.3592/automake.changes 2020-08-02 12:27:38.887813358 +0200 @@ -1,0 +2,51 @@ +Fri Jul 17 09:03:35 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com> + +- Fix name tag for multibuild + +------------------------------------------------------------------- +Fri Jul 10 14:54:32 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com> + +- Add etags to BuildRequires for testsuite +- Add automake-testsuite-vala-gcc10.patch: fixes testsuite + +------------------------------------------------------------------- +Sun Jul 5 16:19:34 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com> + +- Changed automake-SuSE.patch: updated for new version +- Update to 1.16.2. Changes since 1.16.1: + * New features added + + - add zstd support and the automake option, dist-zstd. + + - support for Python 3: py-compile now supports both Python 3 + and Python 2; tests do not require .pyo files, and uninstall + deletes __pycache__ correctly (automake bug #32088). + + * Miscellaneous changes + + - automake no longer requires a @setfilename in each .texi file + + * Bugs fixed + + - When cleaning the compiled python files, '\n' is not used anymore in the + substitution text of 'sed' transformations. This is done to preserve + compatibility with the 'sed' implementation provided by macOS which + considers '\n' as the 'n' character instead of a newline. + (automake bug#31222) + + - For make tags, lisp_LISP is followed by the necessary space when + used with CONFIG_HEADERS. + (automake bug#38139) + + - The automake test txinfo-vtexi4.sh no longer fails when localtime + and UTC cross a day boundary. + + - Emacsen older than version 25, which require use of + byte-compile-dest-file, are supported again. + +------------------------------------------------------------------- +Sun Mar 22 14:00:34 UTC 2020 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- convert testsuite to singlespec + +------------------------------------------------------------------- Old: ---- automake-1.16.1.tar.xz automake-1.16.1.tar.xz.sig automake-testsuite.changes automake-testsuite.spec pre_checkin.sh New: ---- _multibuild automake-1.16.2.tar.xz automake-1.16.2.tar.xz.sig automake-testsuite-vala-gcc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automake.spec ++++++ --- /var/tmp/diff_new_pack.Yho7nW/_old 2020-08-02 12:27:39.751814245 +0200 +++ /var/tmp/diff_new_pack.Yho7nW/_new 2020-08-02 12:27:39.755814250 +0200 @@ -1,7 +1,7 @@ # # spec file for package automake # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,23 @@ # -# PLEASE run pre_checkin.sh in this directory before submitting -# this package. Otherwise the .spec and .changes for automake-testsuite -# aren't updated. - -Name: automake -Version: 1.16.1 +# remove bogus Automake perl dependencies and provides +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake:: +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake:: +%define flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "testsuite" +%define nsuffix -testsuite +%else +%define nsuffix %{nil} +%endif +Name: automake%{nsuffix} +Version: 1.16.2 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT License: GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT Group: Development/Tools/Building -Url: https://www.gnu.org/software/automake +URL: https://www.gnu.org/software/automake Source0: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=automake&down… @@ -37,6 +42,7 @@ Patch2: automake-require_file.patch Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch +Patch6: automake-testsuite-vala-gcc10.patch Patch100: automake-SuSE.patch BuildRequires: autoconf >= 2.69 BuildRequires: bison @@ -50,7 +56,7 @@ Requires(post): info Requires(preun): info BuildArch: noarch -%if "%{name}" == "automake-testsuite" +%if "%{flavor}" == "testsuite" BuildRequires: cscope BuildRequires: dejagnu BuildRequires: expect @@ -59,22 +65,19 @@ BuildRequires: libtool BuildRequires: makedepend BuildRequires: makeinfo -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python BuildRequires: sharutils -%if 0%{suse_version} >= 1500 -BuildRequires: vala -BuildRequires: pkgconfig(gobject-2.0) -%endif BuildRequires: zip +BuildRequires: etags Requires: expect Requires: flex Requires: libtool +%if 0%{?suse_version} >= 1500 +BuildRequires: vala +BuildRequires: pkgconfig(gobject-2.0) +%endif %endif - -# remove bogus Automake perl dependencies and provides -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake:: -%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake:: %description Automake is a tool for automatically generating "Makefile.in" files @@ -87,25 +90,26 @@ %patch2 -p1 %patch3 -p1 %patch5 -p1 +%patch6 -p1 %patch100 %build sh bootstrap %configure --docdir=%{_docdir}/%{name} -make #%%{?_smp_mflags} +%make_build #%%{?_smp_mflags} -%if "%{name}" == "automake-testsuite" +%if "%{flavor}" == "testsuite" %check # Some architectures can't keep up the pace. %ifnarch alpha %{arm} -make %{?_smp_mflags} check VERBOSE=1 +%make_build check %endif %install %else %install %make_install -mkdir %{buildroot}/etc +mkdir %{buildroot}%{_sysconfdir} echo %{_prefix}/local/share/aclocal >%{buildroot}%{_sysconfdir}/aclocal_dirlist ln -s %{_sysconfdir}/aclocal_dirlist %{buildroot}%{_datadir}/aclocal/dirlist install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} @@ -120,9 +124,8 @@ %preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info%{ext_info} -%if "%{name}" == "automake" +%if "%{flavor}" == "" %files -%defattr(-,root,root) %doc %{_docdir}/%{name} %{_bindir}/* %{_infodir}/*%{ext_info} ++++++ _multibuild ++++++ <multibuild> <package>testsuite</package> </multibuild> ++++++ automake-1.16.1.tar.xz -> automake-1.16.2.tar.xz ++++++ ++++ 34788 lines of diff (skipped) ++++++ automake-SuSE.patch ++++++ --- /var/tmp/diff_new_pack.Yho7nW/_old 2020-08-02 12:27:40.367814879 +0200 +++ /var/tmp/diff_new_pack.Yho7nW/_new 2020-08-02 12:27:40.367814879 +0200 @@ -36,53 +36,62 @@ esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. -@@ -241,36 +251,36 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM - exit ;; +@@ -245,42 +245,42 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM + exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" + echo "$UNAME_MACHINE_ARCH"-${VENDOR}-bitrig"$UNAME_RELEASE" - exit ;; + exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE_ARCH"-${VENDOR}-openbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE_ARCH"-${VENDOR}-libertybsd"$UNAME_RELEASE" - exit ;; + exit ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-midnightbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-ekkobsd"$UNAME_RELEASE" - exit ;; + exit ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-solidbsd"$UNAME_RELEASE" - exit ;; + exit ;; + *:OS108:*:*) +- echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE"-${VENDOR}-os108_"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" + echo powerpc-${VENDOR}-mirbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-mirbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix + echo "$UNAME_MACHINE"-${VENDOR}-sortix - exit ;; + exit ;; + *:Twizzler:*:*) +- echo "$UNAME_MACHINE"-unknown-twizzler ++ echo "$UNAME_MACHINE"-${VENDOR}-twizzler + exit ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox + echo "$UNAME_MACHINE"-${VENDOR}-redox - exit ;; + exit ;; mips:OSF1:*.*) - echo mips-dec-osf1 + echo mips-dec-osf1 + @@ -332,13 +342,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM trap '' 0 exit $exitcode ;; @@ -493,24 +502,24 @@ =================================================================== --- lib/config.sub.orig 2018-03-21 12:19:25.009766883 +0100 +++ lib/config.sub 2018-03-21 12:19:27.861785205 +0100 -@@ -1071,12 +1071,18 @@ case $basic_machine in - rtpc | rtpc-*) - basic_machine=romp-ibm +@@ -1138,13 +1138,19 @@ + cpu=nsx + vendor=tandem ;; -- s390 | s390-*) + s390) - basic_machine=s390-ibm - ;; -- s390x | s390x-*) -+ s390-*) -+ basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'` ++ cpu=s390 ++ vendor=ibm ++ ;; + s390-*) + cpu=s390 + ;; + s390x) - basic_machine=s390x-ibm ++ cpu=s390x + vendor=ibm ;; -+ s390x-*) -+ basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sa29200) - basic_machine=a29k-amd - os=-udi + s390x-*) + cpu=s390x +- vendor=ibm + ;; + tile*-*) + os=${os:-linux-gnu} ++++++ automake-testsuite-vala-gcc10.patch ++++++ https://lists.gnu.org/archive/html/bug-automake/2020-06/msg00003.html diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh index 8e6a214..933a3ff 100644 --- a/t/vala-mix2.sh +++ b/t/vala-mix2.sh @@ -44,7 +44,7 @@ int main () END cat > foo.h <<'END' -int foo; +extern int foo; int bar (void); int baz (void); END @@ -56,7 +56,7 @@ END cat > baz.c <<'END' #include "foo.h" -extern int foo = 0; +int foo = 0; int baz (void) { return 0; } END ++++++ automake.keyring ++++++ --- /var/tmp/diff_new_pack.Yho7nW/_old 2020-08-02 12:27:40.415814928 +0200 +++ /var/tmp/diff_new_pack.Yho7nW/_new 2020-08-02 12:27:40.415814928 +0200 @@ -1,3 +1,38 @@ +GPG keys of Karl Berry <karl> +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBE/Xfl8BCACfn5680mdbi33bAoPmsuOiKguiQ8/q/mMhk6GjuM28F/ahp72P +baGZP2hv6D/DTYeJVlbZPeACkbFQe758AOhoEs8pqDq4JMC4jzNPUSGYH7joaZjc +mMCUUqzG6qDfajW4M2iRI+US/Dozd++shQ18kKJKNY4ZrFEFXUsiHLDHQk/rmrj3 +lAcrcf7zLwJSKKXLmAvz+vu+i9F5/Xt7TSasszrG6AqqSl3aZn5RGmU4DSiAFh3x +U4t21t6KbiQ4gUS0VkbyqrDVhUs64H/fzcFOVVT4dq51nQAAb5mxTFCpyAMuJDQ0 +lh32iKNWM5iKDk1Wdmg2EsnJho7EAbqcEOI7ABEBAAG0IUthcmwgQmVycnkgPGth +cmxAZnJlZWZyaWVuZHMub3JnPokBOAQTAQIAIgUCT9d+XwIbAwYLCQgHAwIGFQgC +CQoLBBYCAwECHgECF4AACgkQBxZ0ijDRVa2xQgf/T1SWK9wbMn44uYIqyPzSAQ7E +m6Xqno07CMJH8DD5T7CidxfH3V1DX7OCRqkljc34QzIdZ0HR5HUSpvfwBYHTXzgH +yiZPVysIb2mx6X//fO16jxi5wj2+mkslGXwrgwzop5InFu6Zl/Q4HDTItthaCYAR +WZvImf0L/1vySWegonoZp/9eUeRld+6Bc/z5kvt6K9hHZt1G11c3+3zlrFydJHL/ +vuXPLXr8w2nkuX+VsXKIT4VgjVn4LvDF55BphfGteaYqSofYPczynoEh1QtU2Qyh +4IXt8lgaEPQADa7wUL7HqhzyJMxHTHG/WLzBRJMfNrr2ow6KiCOfIuBkEa7FnohG +BBARAgAGBQJP14N2AAoJEJ3rRsDWefbPKfIAmgONqRipIzLSUC/FrjSZyV4CO7xu +AJ9qaqLVib0v9xMWU+8UpHcF5jwbBbkBDQRP135fAQgA+Uhd1N4R9nqhfDLQXuKD +IhTals5RMhOXy+fG7uDUSaV9HD/XY4JHfli0r5r/WcG0MGm67T3j0p6YhLCqhkai +x+cZpUwtokw39l5ztT2Smi//WW7wZPIAe4XLUV1TvpoVeoDeoGY9onAdJMEBw+oq +dMoPVyIRmjw7ID3uF2DfU3QnTSYt64AbsHSPp7imeD4gW3aY7r4OmI1vqz4y5pQm +cItwc8rudS9s3uiiGCia34M0yRM64ewwAY3eTAK9fA4FOamVgt8YvNdCZBXvcHAh +amR2BUrt+01+8iqcuX6VEn39srHEutGg8GXcC+7tMncUmlWPUfpy0vTdor/HkxpX +lQARAQABiQEfBBgBAgAJBQJP135fAhsMAAoJEAcWdIow0VWt9RAH/i+Kxkr/R2xJ +WcOvWvn6NVLUo0cChc0SaMjuWAk4KlqOQJT0i5xTkMWVQ8PQonUVkzloLkCqRs61 +9rLoB3mNFzGqP5Jm3dSoqvTFCTMGeQEsX0e6kjnsydgtgkeYNT6yO5hrakfzlKvG +i1KJ7Kwh+8zQtubHQI8/A1IlNyp9WJrWP2Xj1rS3f7SN3QillOhoh8HNkpN4MHZ3 +7moelhQ3XJ+UOUTHv+bNZHVilofbrX5S5LXcPeE/p+DaNNp+oGwPJppGAzKWKQy9 +hA8rKE+HnaSHr/0k0i9Uxmf2c4nLCCeZuxz+TUUZq06Ohco7ullX6MshUhCX+21P +KLEPtgs1HkI= +=5dqZ +-----END PGP PUBLIC KEY BLOCK----- + +GPG keys of Stefano Lattarini <slattarini> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1 @@ -51,10 +86,75 @@ =Oc4j -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Alexandre Duret-Lutz <adl> FCA0 8615 0211 941A 2AB9 FA66 3859 C03B 2E23 6E47 +GPG keys of Tom Tromey <tromey> +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=0nGS +-----END PGP PUBLIC KEY BLOCK----- - +GPG keys of Ralf Wildenhues <rwild> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.10 (GNU/Linux) @@ -631,6 +731,7 @@ qX7ec//CFmTgtaK6KA== =oMI0 -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Eric Blake <ericb> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg @@ -886,6 +987,7 @@ =FC1k -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Benoit Sigoure <tsuna> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.7 (Darwin) @@ -926,6 +1028,7 @@ =GMn/ -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Jim Meyering <meyering> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.16 (GNU/Linux) @@ -1297,6 +1400,7 @@ L7lK987RIZayL0odb+oCJv+R9I5fu9Tt =+qse -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Akim Demaille <akim> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.12 (Darwin) @@ -1341,61 +1445,73 @@ =2vaA -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Bruno Haible <haible> -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (GNU/Linux) +Version: GnuPG v2 -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 -fBVUDvSsJHDvpaM= -=BuIp +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 +Dw== +=MDRR -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Paul Eggert <eggert> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.10 (GNU/Linux) @@ -1449,6 +1565,7 @@ =AL6o -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Mathieu Lirzin <mthl> -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1

1 0

commit coreutils for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package coreutils for openSUSE:Factory checked in at 2020-08-02 12:27:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coreutils (Old) and /work/SRC/openSUSE:Factory/.coreutils.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "coreutils" Sun Aug 2 12:27:29 2020 rev:135 rq:821545 version:8.32 Changes: -------- --- /work/SRC/openSUSE:Factory/coreutils/coreutils.changes 2020-06-27 23:20:22.213386316 +0200 +++ /work/SRC/openSUSE:Factory/.coreutils.new.3592/coreutils.changes 2020-08-02 12:27:34.451808798 +0200 @@ -1,0 +2,7 @@ +Thu Jul 16 11:23:47 UTC 2020 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Drop suse-module-tools BuildRequires: this was used for the macro + regenerate_initrd_post/posttrans, which have been moved to + rpm-config-SUSE in Jan 2019. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.4jFl4d/_old 2020-08-02 12:27:35.291809661 +0200 +++ /var/tmp/diff_new_pack.4jFl4d/_new 2020-08-02 12:27:35.295809665 +0200 @@ -45,7 +45,6 @@ BuildRequires: libselinux-devel BuildRequires: makeinfo BuildRequires: perl -BuildRequires: suse-module-tools BuildRequires: xz %if %{suse_version} > 1320 BuildRequires: gcc-PIE

1 0

commit readline for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package readline for openSUSE:Factory checked in at 2020-08-02 12:27:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/readline (Old) and /work/SRC/openSUSE:Factory/.readline.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "readline" Sun Aug 2 12:27:26 2020 rev:8 rq:821442 version:8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/readline/readline.changes 2020-02-21 16:39:57.337745039 +0100 +++ /work/SRC/openSUSE:Factory/.readline.new.3592/readline.changes 2020-08-02 12:27:28.631802815 +0200 @@ -1,0 +2,7 @@ +Thu Jul 16 19:13:54 UTC 2020 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- add upstream keyring and verify source signature +- change custom handling of official upstream patches to standard, + and verify signatures on official patches + +------------------------------------------------------------------- Old: ---- readline-8.0-patches.tar.bz2 New: ---- readline-8.0.tar.gz.sig readline.keyring readline80-001 readline80-001.sig readline80-002 readline80-002.sig readline80-003 readline80-003.sig readline80-004 readline80-004.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ readline.spec ++++++ --- /var/tmp/diff_new_pack.MnMM80/_old 2020-08-02 12:27:31.871806146 +0200 +++ /var/tmp/diff_new_pack.MnMM80/_new 2020-08-02 12:27:31.875806150 +0200 @@ -16,51 +16,61 @@ # +%define rl_major 8 Name: readline -BuildRequires: autoconf -BuildRequires: fdupes -%if %suse_version > 1220 -BuildRequires: makeinfo -%endif -BuildRequires: ncurses-devel -BuildRequires: patchutils -BuildRequires: pkg-config -BuildRequires: sed -%define rextend %nil Version: 8.0 Release: 0 Summary: The readline library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -URL: http://www.gnu.org/software/readline/ +URL: https://www.gnu.org/software/readline/ # Git: http://git.savannah.gnu.org/cgit/bash.git -Source0: ftp://ftp.gnu.org/gnu/readline/readline-%{version}%{rextend}.tar.gz -Source1: readline-%{version}-patches.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz.sig Source2: baselibs.conf -Patch0: readline-%{version}.dif -Patch1: readline-6.3-input.dif -Patch2: readline-5.2-conf.patch -Patch3: readline-6.2-metamode.patch -Patch5: readline-6.2-xmalloc.dif -Patch6: readline-6.3-destdir.patch -Patch7: readline-6.3-rltrace.patch -Patch8: readline-7.0-screen.patch -%{expand: %%global rl_major %(echo %{version} | sed -r 's/.[0-9]+//g')} +Source4: https://tiswww.case.edu/php/chet/gpgkey.asc#/%{name}.keyring +# signatures for official patches +Source101: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-001.s… +Source102: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-002.s… +Source103: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-003.s… +Source104: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-004.s… +# official patches +Patch101: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-001 +Patch102: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-002 +Patch103: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-003 +Patch104: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-004 +# local patches +Patch200: readline-%{version}.dif +Patch201: readline-6.3-input.dif +Patch202: readline-5.2-conf.patch +Patch203: readline-6.2-metamode.patch +Patch205: readline-6.2-xmalloc.dif +Patch206: readline-6.3-destdir.patch +Patch207: readline-6.3-rltrace.patch +Patch208: readline-7.0-screen.patch +BuildRequires: autoconf +BuildRequires: fdupes +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +# +%if 0%{?suse_version} > 1220 +BuildRequires: makeinfo +%endif %description The readline library is used by the Bourne Again Shell (bash, the standard command interpreter) for easy editing of command lines. This includes history and search functionality. -%package -n libreadline8 +%package -n libreadline%{rl_major} Summary: The Readline Library Group: System/Libraries -Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Suggests: readline-doc = %{version} +Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Provides: readline = %{version} Obsoletes: readline <= 6.3 -%description -n libreadline8 +%description -n libreadline%{rl_major} The readline library is used by the Bourne Again Shell (bash, the standard command interpreter) for easy editing of command lines. This includes history and search functionality. @@ -68,7 +78,7 @@ %package devel Summary: Development files for readline Group: Development/Libraries/C and C++ -Requires: libreadline8 = %{version} +Requires: libreadline%{rl_major} = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -88,9 +98,10 @@ %package doc Summary: Documentation how to Use and Program with the Readline Library Group: Documentation/Other +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} +Supplements: (libreadline%{rl_major} and patterns-base-documentation) Provides: readline:%{_infodir}/readline.info.gz -Supplements: packageand(libreadline8:patterns-base-documentation) -PreReq: %install_info_prereq BuildArch: noarch %description doc @@ -98,27 +109,21 @@ as well as programming with the interface of the readline library. %prep -%setup -q -n readline-%{version}%{rextend} -b1 -for patch in ../readline-%{version}-patches/*; do - test -e $patch || break - let level=0 || true - file=$(lsdiff --files=1 $patch) - if test ! -e $file ; then - file=${file#*/} - let level++ || true - fi - sed -ri '/^\*\*\* \.\./{ s@\.\./readline-%{version}[^/]*/@@ }' $patch - echo Patch $patch - patch -s -p$level < $patch -done -%patch1 -p2 -b .zerotty -%patch2 -p2 -b .conf -%patch3 -p2 -b .metamode -%patch5 -p0 -b .xm -%patch6 -p0 -b .destdir -%patch7 -p2 -b .tmp -%patch8 -p2 -b .screen -%patch0 -p0 -b .0 +%setup -q +# official patches +%patch101 -b .001 +%patch102 -b .002 +%patch103 -b .003 +%patch104 -b .004 +# local patches +%patch201 -p2 -b .zerotty +%patch202 -p2 -b .conf +%patch203 -p2 -b .metamode +%patch205 -b .xm +%patch206 -b .destdir +%patch207 -p2 -b .tmp +%patch208 -p2 -b .screen +%patch200 -b .0 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -193,6 +198,7 @@ CFLAGS_FOR_BUILD="$CFLAGS" LDFLAGS_FOR_BUILD="$LDFLAGS" export CC_FOR_BUILD CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD CFLAGS LDFLAGS CC +# FIXME: you should use the %%configure macro ./configure --build=%{_target_cpu}-suse-linux \ --enable-static \ --enable-shared \ @@ -203,8 +209,8 @@ --infodir=%{_infodir} \ --docdir=%{_docdir}/%{name} \ --libdir=%{_libdir} -make -make documentation +%make_build +%make_build documentation %install %make_install htmldir=%{_docdir}/%{name} installdir=%{_docdir}/%{name}/examples \ @@ -224,10 +230,8 @@ %{buildroot}/%{_libdir}/pkgconfig/readline.pc rm -vrf %{buildroot}%{_datadir}/readline/ -%post -n libreadline8 -p /sbin/ldconfig - -%postun -n libreadline8 -p /sbin/ldconfig - +%post -n libreadline%{rl_major} -p /sbin/ldconfig +%postun -n libreadline%{rl_major} -p /sbin/ldconfig %post doc %install_info --info-dir=%{_infodir} %{_infodir}/history.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/readline.info.gz @@ -238,7 +242,7 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/readline.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/rluserman.info.gz -%files -n libreadline8 +%files -n libreadline%{rl_major} %license COPYING /%{_lib}/libhistory.so.%{rl_major} /%{_lib}/libhistory.so.%{version} @@ -256,11 +260,11 @@ %{_libdir}/libreadline.a %files doc -%doc %{_infodir}/history.info* -%doc %{_infodir}/readline.info* -%doc %{_infodir}/rluserman.info* -%doc %{_mandir}/man3/history.3* -%doc %{_mandir}/man3/readline.3* +%{_infodir}/history.info%{?ext_info} +%{_infodir}/readline.info%{?ext_info} +%{_infodir}/rluserman.info%{?ext_info} +%{_mandir}/man3/history.3%{?ext_man} +%{_mandir}/man3/readline.3%{?ext_man} %doc %{_docdir}/%{name}/ %changelog ++++++ readline-8.0-patches.tar.bz2 -> readline80-001 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-001 differ ++++++ readline-8.0-patches.tar.bz2 -> readline80-002 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-002 differ ++++++ readline-8.0-patches.tar.bz2 -> readline80-003 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-003 differ ++++++ readline-8.0-patches.tar.bz2 -> readline80-004 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-004 differ

1 0

commit bash for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at 2020-08-02 12:27:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash (Old) and /work/SRC/openSUSE:Factory/.bash.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bash" Sun Aug 2 12:27:22 2020 rev:164 rq:820865 version:5.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/bash/bash.changes 2020-05-19 14:43:36.095444413 +0200 +++ /work/SRC/openSUSE:Factory/.bash.new.3592/bash.changes 2020-08-02 12:27:26.347800468 +0200 @@ -1,0 +2,8 @@ +Tue Jul 14 07:20:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de> + +- Add official patch bash50-018 + * In certain cases, bash does not perform quoted null removal on patterns + that are used as part of word expansions such as ${parameter##pattern}, so + empty patterns are treated as non-empty. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.8sptwK/_old 2020-08-02 12:27:27.195801340 +0200 +++ /var/tmp/diff_new_pack.8sptwK/_new 2020-08-02 12:27:27.199801343 +0200 @@ -201,6 +201,7 @@ %endif %setup -q -n bash-%{bversion}%{bextend} -b1 typeset -i level +set +x for patch in ../bash-%{bversion}-patches/*; do test -e $patch || break let level=0 || true @@ -214,6 +215,7 @@ echo Patch $patch patch -s -p$level < $patch done +set -x %patch1 -p0 -b .manual %patch2 -p0 -b .security %patch3 -p0 -b .2.4.4 ++++++ bash-5.0-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-5.0-patches/bash50-018 new/bash-5.0-patches/bash50-018 --- old/bash-5.0-patches/bash50-018 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-5.0-patches/bash50-018 2020-07-10 17:21:59.000000000 +0200 @@ -0,0 +1,45 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-018 + +Bug-Reported-by: oguzismailuysal(a)gmail.com +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-10/msg00098.html + +Bug-Description: + +In certain cases, bash does not perform quoted null removal on patterns +that are used as part of word expansions such as ${parameter##pattern}, so +empty patterns are treated as non-empty. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0.17/subst.c 2020-04-02 17:14:58.000000000 -0400 +--- subst.c 2020-07-09 15:28:19.000000000 -0400 +*************** +*** 5113,5116 **** +--- 5113,5118 ---- + (int *)NULL, (int *)NULL) + : (WORD_LIST *)0; ++ if (l) ++ word_list_remove_quoted_nulls (l); + pat = string_list (l); + dispose_words (l); + +*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */

1 0

commit mpfr for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package mpfr for openSUSE:Factory checked in at 2020-08-02 12:27:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpfr (Old) and /work/SRC/openSUSE:Factory/.mpfr.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mpfr" Sun Aug 2 12:27:20 2020 rev:53 rq:820814 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mpfr/mpfr.changes 2020-04-05 20:49:03.228924800 +0200 +++ /work/SRC/openSUSE:Factory/.mpfr.new.3592/mpfr.changes 2020-08-02 12:27:22.667796686 +0200 @@ -1,0 +2,26 @@ +Mon Jul 13 07:05:45 UTC 2020 - Richard Biener <rguenther(a)suse.com> + +- Update to mpfr 4.1.0 + * New function mpfr_get_str_ndigits about conversion to a string of digits. + * New function mpfr_dot for the dot product (incomplete, experimental). + * New functions mpfr_get_decimal128 and mpfr_set_decimal128 (available only + when MPFR has been built with decimal float support). + * New function mpfr_cmpabs_ui. + * New function mpfr_total_order_p for the IEEE 754 totalOrder predicate. + * The mpfr_out_str function now accepts bases from -2 to -36, in order to + follow mpfr_get_str and GMP's mpf_out_str functions (these cases gave an + assertion failure, as with other invalid bases). + * Shared caches: cleanup; really detect lock failures (abort in this case). + * The behavior of the formatted output functions (mpfr_printf, etc.) with + an empty precision field has improved: trailing zeros are kept in a way + similar to the formatted output functions from C. + * Improved mpfr_add and mpfr_sub when all operands have a precision equal to + twice the number of bits per word, e.g., 128 bits on a 64-bit platform. + * Optimized the tuning parameters for various architectures. + * Improved test coverage to 98.6% of code for x86_64. + * Bug fixes. + * MPFR manual: corrected/completed the mpfr_get_str description in order to + follow the historical behavior and GMP's mpf_get_str function. +- Remove mpfr-4.0.2-p6.patch and floating-point-format-no-lto.patch + +------------------------------------------------------------------- Old: ---- floating-point-format-no-lto.patch mpfr-4.0.2-p6.patch mpfr-4.0.2.tar.bz2 mpfr-4.0.2.tar.bz2.asc New: ---- mpfr-4.1.0.tar.xz mpfr-4.1.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpfr.spec ++++++ --- /var/tmp/diff_new_pack.XaNr6c/_old 2020-08-02 12:27:23.379797417 +0200 +++ /var/tmp/diff_new_pack.XaNr6c/_new 2020-08-02 12:27:23.383797421 +0200 @@ -17,18 +17,16 @@ Name: mpfr -Version: 4.0.2 +Version: 4.1.0 Release: 0 Summary: The GNU multiple-precision floating-point library License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ -URL: http://www.mpfr.org/ -Source0: http://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.bz2 -Source1: http://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.bz2.asc +URL: https://www.mpfr.org/ +Source0: https://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.xz +Source1: https://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.xz.asc Source2: %{name}.keyring Source3: baselibs.conf -Patch0: floating-point-format-no-lto.patch -Patch1: mpfr-4.0.2-p6.patch BuildRequires: gmp-devel BuildRequires: pkgconfig @@ -69,8 +67,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure \

1 0

commit libeconf for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package libeconf for openSUSE:Factory checked in at 2020-08-02 12:27:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libeconf (Old) and /work/SRC/openSUSE:Factory/.libeconf.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libeconf" Sun Aug 2 12:27:18 2020 rev:8 rq:820744 version:0.3.8+git20200710.5126fff Changes: -------- --- /work/SRC/openSUSE:Factory/libeconf/libeconf.changes 2020-06-07 21:34:07.132651373 +0200 +++ /work/SRC/openSUSE:Factory/.libeconf.new.3592/libeconf.changes 2020-08-02 12:27:21.455795440 +0200 @@ -1,0 +2,7 @@ +Fri Jul 10 21:15:09 UTC 2020 - rbrown(a)suse.com + +- Update to version 0.3.8+git20200710.5126fff: + * Add CMake build scripts, remove autotools support + * Move C++ ABI compatibility section + +------------------------------------------------------------------- Old: ---- libeconf-0.3.7+git20200605.c67ef9a.tar.xz New: ---- libeconf-0.3.8+git20200710.5126fff.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libeconf.spec ++++++ --- /var/tmp/diff_new_pack.tAeLEA/_old 2020-08-02 12:27:22.079796081 +0200 +++ /var/tmp/diff_new_pack.tAeLEA/_new 2020-08-02 12:27:22.083796086 +0200 @@ -18,7 +18,7 @@ %define lname libeconf0 Name: libeconf -Version: 0.3.7+git20200605.c67ef9a +Version: 0.3.8+git20200710.5126fff Release: 0 Summary: Enhanced config file parser ala systemd License: LGPL-2.1-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.tAeLEA/_old 2020-08-02 12:27:22.107796110 +0200 +++ /var/tmp/diff_new_pack.tAeLEA/_new 2020-08-02 12:27:22.107796110 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.3.7</param> - <param name="versionformat">0.3.7+git%cd.%h</param> + <param name="version">0.3.8</param> + <param name="versionformat">0.3.8+git%cd.%h</param> <param name="url">git://github.com/openSUSE/libeconf.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.tAeLEA/_old 2020-08-02 12:27:22.123796126 +0200 +++ /var/tmp/diff_new_pack.tAeLEA/_new 2020-08-02 12:27:22.123796126 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/libeconf.git</param> - <param name="changesrevision">37e14ba22a59b94ab2d43cdf2ffcb8e8732c9577</param> + <param name="changesrevision">5126fff683752fd640af10557214a5e50ad7b2ca</param> </service> </servicedata> \ No newline at end of file ++++++ libeconf-0.3.7+git20200605.c67ef9a.tar.xz -> libeconf-0.3.8+git20200710.5126fff.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/.github/workflows/ccpp.yml new/libeconf-0.3.8+git20200710.5126fff/.github/workflows/ccpp.yml --- old/libeconf-0.3.7+git20200605.c67ef9a/.github/workflows/ccpp.yml 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/.github/workflows/ccpp.yml 2020-07-10 23:13:49.000000000 +0200 @@ -9,16 +9,9 @@ steps: - uses: actions/checkout@v2 - - name: autogen.sh - run: ./autogen.sh - - name: configure with checks - run: ./configure --enable-compiler-checks - - name: make with compiler checks - run: make + - name: cmake configure with asan checks + run: cmake -B build -DCMAKE_BUILD_TYPE=SanitizeAddress + - name: make with asan checks + run: make -C build - name: make check - run: make check - - name: check_failure - if: failure() - run: cat tests/test-suite.log - - name: make distcheck - run: make distcheck + run: make -C build check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/CMakeLists.txt new/libeconf-0.3.8+git20200710.5126fff/CMakeLists.txt --- old/libeconf-0.3.7+git20200605.c67ef9a/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/CMakeLists.txt 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,71 @@ +cmake_minimum_required(VERSION 3.12) + +# Ensure built-in policies from CMake are used, (e.g. improved policies for macOS) +cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) + +project(libeconf VERSION 0.3.8 + DESCRIPTION "Enhanced config file parser, which merges config files placed in several locations into one." + LANGUAGES C + ) + +# Set up GNU conventions and standard FHS paths +include(GNUInstallDirs) + +# Activate CMake package configuration helpers +include(CMakePackageConfigHelpers) + +# Ensure _GNU_SOURCE is available +include(CheckSymbolExists) + +# check if _GNU_SOURCE is available + +if (NOT _GNU_SOURCE) + check_symbol_exists(__GNU_LIBRARY__ "features.h" _GNU_SOURCE) + + if (NOT _GNU_SOURCE) + unset(_GNU_SOURCE CACHE) + check_symbol_exists(_GNU_SOURCE "features.h" _GNU_SOURCE) + endif () +endif () + +if (_GNU_SOURCE) + add_definitions(-D_GNU_SOURCE) +endif () + + +# set the minimum C standard +set(CMAKE_C_STANDARD 11) + +# Build Types +set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} + CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel SanitizeAddress RelWithDebInfoStrict" + FORCE + ) + +# AddressSanitize +set(CMAKE_C_FLAGS_SANITIZEADDRESS + "-O2 -g -Wall -fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer" + CACHE STRING "Flags used by the C compiler during AddressSanitizer builds." + FORCE + ) + +set(CMAKE_LINK_FLAGS_SANITIZEADDRESS + "-fsanitize=address" + CACHE STRING "Flags used by the linker during AddressSanitizer builds." + FORCE + ) + +# RelWithDebInfoStrict +set(CMAKE_C_FLAGS_RELWITHDEBINFOSTRICT + "-O2 -g -Werror -W -Wall -DXTSTRINGDEFINES -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=8 -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef" + CACHE STRING "Flags used by the C compiler during strict RelWithDebInfo builds." + FORCE + ) + +add_subdirectory(lib) +add_subdirectory(example) + +# Enable testing +include(CTest) +enable_testing() +add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/INSTALL.md new/libeconf-0.3.8+git20200710.5126fff/INSTALL.md --- old/libeconf-0.3.7+git20200605.c67ef9a/INSTALL.md 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/INSTALL.md 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,33 @@ +# Building and installing libeconf + +libeconf supports two options to build it: Meson (preferred) or CMake (alternate) + +## Building with Meson + +libeconf requires a relatively recent version of Meson, version 0.49 or newer. + +Building with Meson is quite simple: + +```shell +$ meson build +$ ninja -C build +$ ninja -C build test +``` + +If you want to build with the address sanitizer enabled, add +`-Db_sanitize=address` as an argument to `meson build`. + +## Building with CMake + +libeconf requires CMake 3.12 or newer. + +Building with CMake is straightforward: + +```shell +$ cmake -B build +$ make -C build +$ make -C build check +``` + +If you want to build with the address sanitizer enabled, add +`-DCMAKE_BUILD_TYPE=SanitizeAddress` as an argument to `cmake -B build`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/Makefile.am new/libeconf-0.3.8+git20200710.5126fff/Makefile.am --- old/libeconf-0.3.7+git20200605.c67ef9a/Makefile.am 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.6 foreign check-news dist-xz - -SUBDIRS = lib include bin tests - -ACLOCAL_AMFLAGS = -I m4 - -CLEANFILES = *~ - -EXTRA_DIST = LICENSE README.md TODO.md meson.build README.meson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/NEWS new/libeconf-0.3.8+git20200710.5126fff/NEWS --- old/libeconf-0.3.7+git20200605.c67ef9a/NEWS 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/NEWS 2020-07-10 23:13:49.000000000 +0200 @@ -1,3 +1,12 @@ +Version 0.3.8 +* Convert the build to include CMake as an option, remove autotools + +Version 0.3.7 +* Fix issues identified with i586 build thanks to the move to meson + +Version 0.3.6 +* Add C++ compatibility and Add support for Meson + Version 0.3.5 * Initial Haiku Port * Bugfix: helpers.c - Check for empty value (NULL pointer) before calling strdup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/README.meson new/libeconf-0.3.8+git20200710.5126fff/README.meson --- old/libeconf-0.3.7+git20200605.c67ef9a/README.meson 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/README.meson 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -This project is using meson to build everything. - -Requirements: meson >= 0.49 - -To build and compile: - -# meson build -# ninja -C build -# ninja -C build test - -Compiler checks: - -The replacement for the old "configure --enable-compiler-checks" is -now: "meson <build> -Db_sanitize=address" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/autogen.sh new/libeconf-0.3.8+git20200710.5126fff/autogen.sh --- old/libeconf-0.3.7+git20200605.c67ef9a/autogen.sh 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#!/bin/sh -x - -rm -fv ltmain.sh config.sub config.guess config.h.in aclocal.m4 -mkdir -p m4 -aclocal -I m4 -#autoheader -libtoolize --automake --copy -# Fix ltmain.sh for -fsanitize -sed -i -e 's/-stdlib=\*)/-stdlib=\*|-fsanitize=\*)/g' ltmain.sh -automake --add-missing --copy --force -autoreconf -chmod 755 configure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/bin/Makefile.am new/libeconf-0.3.8+git20200710.5126fff/bin/Makefile.am --- old/libeconf-0.3.7+git20200605.c67ef9a/bin/Makefile.am 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/bin/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -noinst_PROGRAMS = example -example_SOURCES = ../example/example.c -example_CFLAGS = @CFLAGS_CHECKS@ @CFLAGS_WARNINGS@ -I $(top_srcdir)/include -example_LDADD = @LDFLAGS_CHECKS@ @LDFLAGS_WARNINGS@ $(top_builddir)/lib/libeconf.la - -CLEANFILES = example diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/cmake/libeconf.pc.in new/libeconf-0.3.8+git20200710.5126fff/cmake/libeconf.pc.in --- old/libeconf-0.3.7+git20200605.c67ef9a/cmake/libeconf.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/cmake/libeconf.pc.in 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + +Name: @PROJECT_NAME@ +Description: @PROJECT_DESCRIPTION@ +Version: @PROJECT_VERSION@ + +Libs: -L${libdir} -leconf -lm +Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/cmake/libeconfConfig.cmake.in new/libeconf-0.3.8+git20200710.5126fff/cmake/libeconfConfig.cmake.in --- old/libeconf-0.3.7+git20200605.c67ef9a/cmake/libeconfConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/cmake/libeconfConfig.cmake.in 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include ("${CMAKE_CURRENT_LIST_DIR}/libeconfTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/configure.ac new/libeconf-0.3.8+git20200710.5126fff/configure.ac --- old/libeconf-0.3.7+git20200605.c67ef9a/configure.ac 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/configure.ac 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -AC_INIT([libeconf], [0.3.5]) -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) - -AM_INIT_AUTOMAKE([subdir-objects]) - -AC_CONFIG_SRCDIR([lib/libeconf.c]) -AC_CONFIG_MACRO_DIRS([m4]) - -AC_PROG_CC -AC_GNU_SOURCE -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL -LT_INIT([disable-static]) - -PKG_PROG_PKG_CONFIG -PKG_INSTALLDIR - -dnl enable additional compiler checks -AC_ARG_ENABLE([compiler-checks], - AS_HELP_STRING([--enable-compiler-checks],[enables additional compiler checks, not for production])) - -if test x"$enable_compiler_checks" = x"yes" ; then - CFLAGS_CHECKS="-Wall -O2 -fsanitize=address -fno-omit-frame-pointer -g" - LDFLAGS_CHECKS="-fsanitize=address" -fi - -dnl enable additional compiler warnings -AC_ARG_ENABLE([compiler-warnings], - AS_HELP_STRING([--enable-compiler-warnings],[enables additional compiler warnings])) - -if test x"$enable_compiler_warnings" = x"yes" ; then - if test x"$enable_compiler_checks" = x"yes" ; then - AC_MSG_ERROR([Conflicting options: --enable-compiler-warnings cannot be used together with --eanble-compiler-checks]) - fi - CFLAGS_WARNINGS="-O2 -g -Werror -W -Wall -DXTSTRINGDEFINES -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=8 -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef" - LDFLAGS_WARNINGS="" -fi - -AC_SUBST(CFLAGS_CHECKS) -AC_SUBST(LDFLAGS_CHECKS) -AC_SUBST(CFLAGS_WARNINGS) -AC_SUBST(LDFLAGS_WARNINGS) -AC_CONFIG_FILES([Makefile lib/Makefile include/Makefile bin/Makefile tests/Makefile lib/libeconf.pc]) -AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/example/CMakeLists.txt new/libeconf-0.3.8+git20200710.5126fff/example/CMakeLists.txt --- old/libeconf-0.3.7+git20200605.c67ef9a/example/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/example/CMakeLists.txt 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,3 @@ +# Create the binary/executable +add_executable(example EXCLUDE_FROM_ALL example.c) +target_link_libraries(example PRIVATE econf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/include/Makefile.am new/libeconf-0.3.8+git20200710.5126fff/include/Makefile.am --- old/libeconf-0.3.7+git20200605.c67ef9a/include/Makefile.am 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/include/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -include_HEADERS = libeconf.h - -EXTRA_DIST = defines.h getfilecontents.h helpers.h keyfile.h mergefiles.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/include/defines.h new/libeconf-0.3.8+git20200710.5126fff/include/defines.h --- old/libeconf-0.3.7+git20200605.c67ef9a/include/defines.h 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/include/defines.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -/* - Copyright (C) 2019 LLC - Author: Pascal Arlt <parlt(a)suse.com> - - 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 without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#pragma once - -/* --- defines.h --- */ - -#include "../include/helpers.h" - -/* Defines default values used in the library */ - -/* Default econf_file length on creation */ -#define KEY_FILE_DEFAULT_LENGTH 8 - -/* NULL value */ -#define KEY_FILE_NULL_VALUE "_none_" -#define KEY_FILE_NULL_VALUE_HASH hashstring(KEY_FILE_NULL_VALUE) - -/* Bool values */ -#define YES hashstring("yes") -#define NO hashstring("no") -#define TRUE hashstring("true") -#define FALSE hashstring("false") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/include/getfilecontents.h new/libeconf-0.3.8+git20200710.5126fff/include/getfilecontents.h --- old/libeconf-0.3.7+git20200605.c67ef9a/include/getfilecontents.h 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/include/getfilecontents.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -/* - Copyright (C) 2019 SUSE LLC - Author: Pascal Arlt <parlt(a)suse.com> - - 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 without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#pragma once - -#include "libeconf.h" -#include "keyfile.h" - -/* Fill the econf_file struct with values from the given file */ -extern econf_err read_file(econf_file *read_file, const char *file, - const char *delim, const char *comment); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/include/helpers.h new/libeconf-0.3.8+git20200710.5126fff/include/helpers.h --- old/libeconf-0.3.7+git20200605.c67ef9a/include/helpers.h 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/include/helpers.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - Copyright (C) 2019 SUSE LLC - Author: Pascal Arlt <parlt(a)suse.com> - - 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 without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#pragma once - -/* -- helpers.h --- */ - -#include "keyfile.h" - -/* This file contains the declaration of functions used by other functions to - perform certain basic tasks on multiple instances. */ - - -/* Combine the two given strings with the given delimiter and return the - resulting string. */ -char *combine_strings(const char *string_one, const char *string_two, - const char delimiter); - -/* Remove whitespace from beginning and end, append string terminator */ -char *clearblank(size_t *vlen, char *string); - -/* Returns the absolute path of a given path */ -char *get_absolute_path(const char *path, econf_err *error); - -/* Remove '[' and ']' from beginning and end */ -/* TODO: Function is currently not in use. But needs to be used to strip - the brackets from group elements before returning them to the user */ -char *stripbrackets(char *string); - -/* Add '[' and ']' to the given string */ -char *addbrackets(const char *string); - -/* Set default value defined in include/defines.h */ -void initialize(econf_file *key_file, size_t num); - -/* Return the lower case version of a string */ -char *toLowerCase(char *str); - -/* Turn given string into a hash value */ -size_t hashstring(const char *str); - -/* Look for a matching key in the given econf_file. - If the key is found num will point to the number of the array which contains - the key, if not it will point to -1. */ -econf_err find_key(econf_file key_file, const char *group, const char *key, size_t *num); - -/* Set value for the given group, key combination. If the combination - does not exist it is created. */ -econf_err setKeyValue(econf_err (*function) (econf_file*, size_t, const void*), - econf_file *kf, const char *group, const char *key, - const void *value); - -/* Copy the contents of a file_entry struct */ -struct file_entry cpy_file_entry(struct file_entry fe); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/include/keyfile.h new/libeconf-0.3.8+git20200710.5126fff/include/keyfile.h --- old/libeconf-0.3.7+git20200605.c67ef9a/include/keyfile.h 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/include/keyfile.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -/* - Copyright (C) 2019 SUSE LLC - Author: Pascal Arlt <parlt(a)suse.com> - - 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 without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#pragma once - -/* --- keyfile.h --- */ - -#include <stdint.h> -#include <stdbool.h> -#include <stdlib.h> - -/* This file contains the definition of the econf_file struct declared in - libeconf.h as well as the functions to get and set a specified element - of the struct. All functions return an error code != 0 on error defined - in libeconf.h. */ - - -/* Definition of the econf_file struct and its inner file_entry struct. */ -typedef struct econf_file { - /* The file_entry struct contains the group, key and value of every - key/value entry found in a config file or set via the set functions. If no - group is found or provided the group is set to KEY_FILE_NULL_VALUE. */ - struct file_entry { - char *group, *key, *value; - uint64_t line_number; - } * file_entry; - /* length represents the current amount of key/value entries in econf_file and - alloc_length the the amount of currently allocated file_entry elements - within the struct. If length would exceed alloc_length it's increased. */ - size_t length, alloc_length; - /* delimiter: char used to assign a value to a key - comment: Used to specify which char to regard as comment indicator. */ - /* TODO: Should eventually be of type *char to allow multiple character - delimiters and comment indicators. - Alternatively they could be removed from the struct and be passed - as parameters to the read/write functions for config files */ - char delimiter, comment; - /* Binary variable to determine whether econf_file should be freed after - being merged with another econf_file. */ - bool on_merge_delete; - char *path; -} econf_file; - -/* Increases both length and alloc_length of key_file by one and initializes - new elements of struct file_entry. */ -econf_err key_file_append(econf_file *key_file); - -/* GETTERS */ - -/* Functions used to get a set value from key_file depending on num. - Expects a pointer of fitting type and writes the result into the pointer. - num corresponds to the respective instance of the file_entry array. - TODO: Error checking and defining return value on error needs to done. */ -econf_err getIntValueNum(econf_file key_file, size_t num, int32_t *result); -econf_err getInt64ValueNum(econf_file key_file, size_t num, int64_t *result); -econf_err getUIntValueNum(econf_file key_file, size_t num, uint32_t *result); -econf_err getUInt64ValueNum(econf_file key_file, size_t num, uint64_t *result); -econf_err getFloatValueNum(econf_file key_file, size_t num, float *result); -econf_err getDoubleValueNum(econf_file key_file, size_t num, double *result); -econf_err getStringValueNum(econf_file key_file, size_t num, char **result); -econf_err getBoolValueNum(econf_file key_file, size_t num, bool *result); - -/* SETTERS */ - -/* Set the group of the file_entry element number num */ -econf_err setGroup(econf_file *key_file, size_t num, const char *value); -/* Set the key of the file_entry element number num */ -econf_err setKey(econf_file *key_file, size_t num, const char *value); - -/* Functions used to set a value from key_file depending on num. - Expects a void pointer to the value which is cast to the corresponding - type inside the function. num corresponds to the respective instance of the - file_entry array. */ -econf_err setIntValueNum(econf_file *key_file, size_t num, const void *value); -econf_err setInt64ValueNum(econf_file *key_file, size_t num, const void *value); -econf_err setUIntValueNum(econf_file *key_file, size_t num, const void *value); -econf_err setUInt64ValueNum(econf_file *key_file, size_t num, const void *value); -econf_err setFloatValueNum(econf_file *key_file, size_t num, const void *value); -econf_err setDoubleValueNum(econf_file *key_file, size_t num, const void *value); -econf_err setStringValueNum(econf_file *key_file, size_t num, const void *value); -econf_err setBoolValueNum(econf_file *key_file, size_t num, const void *value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/include/libeconf.h new/libeconf-0.3.8+git20200710.5126fff/include/libeconf.h --- old/libeconf-0.3.7+git20200605.c67ef9a/include/libeconf.h 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/include/libeconf.h 2020-07-10 23:13:49.000000000 +0200 @@ -25,14 +25,14 @@ /* libeconf.h */ -#ifdef __cplusplus -extern "C" { -#endif - #include <stdbool.h> #include <stdint.h> #include <stdlib.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Public API for the econf library */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/include/mergefiles.h new/libeconf-0.3.8+git20200710.5126fff/include/mergefiles.h --- old/libeconf-0.3.7+git20200605.c67ef9a/include/mergefiles.h 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/include/mergefiles.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -/* - Copyright (C) 2019 SUSE LLC - Author: Pascal Arlt <parlt(a)suse.com> - - 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 without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#pragma once - -#include "keyfile.h" - -#include <stddef.h> - -/* This file contains the declaration of the functions used by econf_mergeFiles - to merge the contents of two econf_files. */ - - -/* Insert the content of "etc_file.file_entry" into "fe" if there is no - group specified. */ -size_t insert_nogroup(struct file_entry **fe, econf_file *ef); - -/* Merge contents from existing usr_file groups */ -size_t merge_existing_groups(struct file_entry **fe, econf_file *uf, econf_file *ef, - const size_t etc_start); - -/* Add entries from etc_file exclusive groups */ -size_t add_new_groups(struct file_entry **fe, econf_file *uf, econf_file *ef, - const size_t merge_length); - -/* Returns the default dirs to iterate through when merging */ -char **get_default_dirs(const char *usr_conf_dir, const char *etc_conf_dir); - -/* Receives a list of config directories to look for and calls 'check_conf_dir' */ -econf_file **traverse_conf_dirs(econf_file **key_files, const char *conf_dirs[], - size_t *size, const char *path, - const char *config_suffix, - const char *delim, const char *comment); - -/* Merge an array of given econf_files into one */ -econf_err merge_econf_files(econf_file **key_files, econf_file **merged_files); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/CMakeLists.txt new/libeconf-0.3.8+git20200710.5126fff/lib/CMakeLists.txt --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/CMakeLists.txt 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,72 @@ +# Create the library +set(econf_SRCS libeconf.c + getfilecontents.c + mergefiles.c + helpers.c + keyfile.c + econf_errString.c + get_value_def.c + ) + +set(econf_HDRS defines.h + getfilecontents.h + mergefiles.h + helpers.h + keyfile.h + ) + +add_library(econf SHARED ${econf_SRCS} ${econf_HDRS} "${PROJECT_SOURCE_DIR}/include/libeconf.h") + +target_include_directories(econf PUBLIC + $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> +) + +set_target_properties(econf PROPERTIES + SOVERSION ${PROJECT_VERSION_MAJOR} + VERSION ${PROJECT_VERSION} + COMPILE_FLAGS "-D_REENTRANT=1" + C_STANDARD 11 + C_STANDARD_REQUIRED ON + PUBLIC_HEADER "${PROJECT_SOURCE_DIR}/include/libeconf.h" + LINK_FLAGS "-Wl,--no-undefined -Wl,--version-script,\"${PROJECT_SOURCE_DIR}/lib/libeconf.map\"" +) + +# Install the library +configure_file(${PROJECT_SOURCE_DIR}/cmake/libeconf.pc.in ${CMAKE_BINARY_DIR}/libeconf.pc @ONLY) +install(FILES ${CMAKE_BINARY_DIR}/libeconf.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +) +install(TARGETS econf + EXPORT libeconfTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +) + +# Generate and install the exports +export(EXPORT libeconfTargets + FILE ${CMAKE_BINARY_DIR}/libeconfTargets.cmake +) +install(EXPORT libeconfTargets + FILE libeconfTargets.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libeconf +) +configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/libeconfConfig.cmake.in + ${CMAKE_BINARY_DIR}/libeconfConfig.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libeconf + NO_SET_AND_CHECK_MACRO + NO_CHECK_REQUIRED_COMPONENTS_MACRO +) +install(FILES + ${CMAKE_BINARY_DIR}/libeconfConfig.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libeconf +) +write_basic_package_version_file( + ${CMAKE_BINARY_DIR}/libeconfConfigVersion.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMinorVersion +) +install(FILES + ${CMAKE_BINARY_DIR}/libeconfConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libeconf +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/Makefile.am new/libeconf-0.3.8+git20200710.5126fff/lib/Makefile.am --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/Makefile.am 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -lib_LTLIBRARIES = libeconf.la -libeconf_la_SOURCES = libeconf.c getfilecontents.c mergefiles.c \ - helpers.c keyfile.c econf_errString.c get_value_def.c -libeconf_la_CFLAGS = -D_REENTRANT=1 @CFLAGS_CHECKS@ @CFLAGS_WARNINGS@ -libeconf_la_CPPFLAGS = -I$(top_srcdir)/include -libeconf_la_LDFLAGS = @LDFLAGS_CHECKS@ @CFLAGS_WARNINGS@ \ - -version-info 3:1:3 -Wl,--no-undefined \ - -Wl,--version-script=$(top_srcdir)/lib/libeconf.map - -CLEANFILES = *~ -DISTCLEANFILES = *.pc -EXTRA_DIST = libeconf.map -pkgconfig_DATA = libeconf.pc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/defines.h new/libeconf-0.3.8+git20200710.5126fff/lib/defines.h --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/defines.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/defines.h 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,43 @@ +/* + Copyright (C) 2019 LLC + Author: Pascal Arlt <parlt(a)suse.com> + + 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 without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#pragma once + +/* --- defines.h --- */ + +#include "helpers.h" + +/* Defines default values used in the library */ + +/* Default econf_file length on creation */ +#define KEY_FILE_DEFAULT_LENGTH 8 + +/* NULL value */ +#define KEY_FILE_NULL_VALUE "_none_" +#define KEY_FILE_NULL_VALUE_HASH hashstring(KEY_FILE_NULL_VALUE) + +/* Bool values */ +#define YES hashstring("yes") +#define NO hashstring("no") +#define TRUE hashstring("true") +#define FALSE hashstring("false") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/getfilecontents.c new/libeconf-0.3.8+git20200710.5126fff/lib/getfilecontents.c --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/getfilecontents.c 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/getfilecontents.c 2020-07-10 23:13:49.000000000 +0200 @@ -22,9 +22,9 @@ */ #include "libeconf.h" -#include "../include/defines.h" -#include "../include/getfilecontents.h" -#include "../include/helpers.h" +#include "defines.h" +#include "getfilecontents.h" +#include "helpers.h" #include <errno.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/getfilecontents.h new/libeconf-0.3.8+git20200710.5126fff/lib/getfilecontents.h --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/getfilecontents.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/getfilecontents.h 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,31 @@ +/* + Copyright (C) 2019 SUSE LLC + Author: Pascal Arlt <parlt(a)suse.com> + + 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 without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#pragma once + +#include "libeconf.h" +#include "keyfile.h" + +/* Fill the econf_file struct with values from the given file */ +extern econf_err read_file(econf_file *read_file, const char *file, + const char *delim, const char *comment); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/helpers.c new/libeconf-0.3.8+git20200710.5126fff/lib/helpers.c --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/helpers.c 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/helpers.c 2020-07-10 23:13:49.000000000 +0200 @@ -22,8 +22,8 @@ */ #include "libeconf.h" -#include "../include/defines.h" -#include "../include/helpers.h" +#include "defines.h" +#include "helpers.h" #include <ctype.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/helpers.h new/libeconf-0.3.8+git20200710.5126fff/lib/helpers.h --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/helpers.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/helpers.h 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,74 @@ +/* + Copyright (C) 2019 SUSE LLC + Author: Pascal Arlt <parlt(a)suse.com> + + 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 without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#pragma once + +/* -- helpers.h --- */ + +#include "keyfile.h" + +/* This file contains the declaration of functions used by other functions to + perform certain basic tasks on multiple instances. */ + + +/* Combine the two given strings with the given delimiter and return the + resulting string. */ +char *combine_strings(const char *string_one, const char *string_two, + const char delimiter); + +/* Remove whitespace from beginning and end, append string terminator */ +char *clearblank(size_t *vlen, char *string); + +/* Returns the absolute path of a given path */ +char *get_absolute_path(const char *path, econf_err *error); + +/* Remove '[' and ']' from beginning and end */ +/* TODO: Function is currently not in use. But needs to be used to strip + the brackets from group elements before returning them to the user */ +char *stripbrackets(char *string); + +/* Add '[' and ']' to the given string */ +char *addbrackets(const char *string); + +/* Set default value defined in include/defines.h */ +void initialize(econf_file *key_file, size_t num); + +/* Return the lower case version of a string */ +char *toLowerCase(char *str); + +/* Turn given string into a hash value */ +size_t hashstring(const char *str); + +/* Look for a matching key in the given econf_file. + If the key is found num will point to the number of the array which contains + the key, if not it will point to -1. */ +econf_err find_key(econf_file key_file, const char *group, const char *key, size_t *num); + +/* Set value for the given group, key combination. If the combination + does not exist it is created. */ +econf_err setKeyValue(econf_err (*function) (econf_file*, size_t, const void*), + econf_file *kf, const char *group, const char *key, + const void *value); + +/* Copy the contents of a file_entry struct */ +struct file_entry cpy_file_entry(struct file_entry fe); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/keyfile.c new/libeconf-0.3.8+git20200710.5126fff/lib/keyfile.c --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/keyfile.c 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/keyfile.c 2020-07-10 23:13:49.000000000 +0200 @@ -22,9 +22,9 @@ */ #include "libeconf.h" -#include "../include/defines.h" -#include "../include/helpers.h" -#include "../include/keyfile.h" +#include "defines.h" +#include "helpers.h" +#include "keyfile.h" #include <errno.h> #include <float.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/keyfile.h new/libeconf-0.3.8+git20200710.5126fff/lib/keyfile.h --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/keyfile.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/keyfile.h 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,101 @@ +/* + Copyright (C) 2019 SUSE LLC + Author: Pascal Arlt <parlt(a)suse.com> + + 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 without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#pragma once + +/* --- keyfile.h --- */ + +#include <stdint.h> +#include <stdbool.h> +#include <stdlib.h> + +/* This file contains the definition of the econf_file struct declared in + libeconf.h as well as the functions to get and set a specified element + of the struct. All functions return an error code != 0 on error defined + in libeconf.h. */ + + +/* Definition of the econf_file struct and its inner file_entry struct. */ +typedef struct econf_file { + /* The file_entry struct contains the group, key and value of every + key/value entry found in a config file or set via the set functions. If no + group is found or provided the group is set to KEY_FILE_NULL_VALUE. */ + struct file_entry { + char *group, *key, *value; + uint64_t line_number; + } * file_entry; + /* length represents the current amount of key/value entries in econf_file and + alloc_length the the amount of currently allocated file_entry elements + within the struct. If length would exceed alloc_length it's increased. */ + size_t length, alloc_length; + /* delimiter: char used to assign a value to a key + comment: Used to specify which char to regard as comment indicator. */ + /* TODO: Should eventually be of type *char to allow multiple character + delimiters and comment indicators. + Alternatively they could be removed from the struct and be passed + as parameters to the read/write functions for config files */ + char delimiter, comment; + /* Binary variable to determine whether econf_file should be freed after + being merged with another econf_file. */ + bool on_merge_delete; + char *path; +} econf_file; + +/* Increases both length and alloc_length of key_file by one and initializes + new elements of struct file_entry. */ +econf_err key_file_append(econf_file *key_file); + +/* GETTERS */ + +/* Functions used to get a set value from key_file depending on num. + Expects a pointer of fitting type and writes the result into the pointer. + num corresponds to the respective instance of the file_entry array. + TODO: Error checking and defining return value on error needs to done. */ +econf_err getIntValueNum(econf_file key_file, size_t num, int32_t *result); +econf_err getInt64ValueNum(econf_file key_file, size_t num, int64_t *result); +econf_err getUIntValueNum(econf_file key_file, size_t num, uint32_t *result); +econf_err getUInt64ValueNum(econf_file key_file, size_t num, uint64_t *result); +econf_err getFloatValueNum(econf_file key_file, size_t num, float *result); +econf_err getDoubleValueNum(econf_file key_file, size_t num, double *result); +econf_err getStringValueNum(econf_file key_file, size_t num, char **result); +econf_err getBoolValueNum(econf_file key_file, size_t num, bool *result); + +/* SETTERS */ + +/* Set the group of the file_entry element number num */ +econf_err setGroup(econf_file *key_file, size_t num, const char *value); +/* Set the key of the file_entry element number num */ +econf_err setKey(econf_file *key_file, size_t num, const char *value); + +/* Functions used to set a value from key_file depending on num. + Expects a void pointer to the value which is cast to the corresponding + type inside the function. num corresponds to the respective instance of the + file_entry array. */ +econf_err setIntValueNum(econf_file *key_file, size_t num, const void *value); +econf_err setInt64ValueNum(econf_file *key_file, size_t num, const void *value); +econf_err setUIntValueNum(econf_file *key_file, size_t num, const void *value); +econf_err setUInt64ValueNum(econf_file *key_file, size_t num, const void *value); +econf_err setFloatValueNum(econf_file *key_file, size_t num, const void *value); +econf_err setDoubleValueNum(econf_file *key_file, size_t num, const void *value); +econf_err setStringValueNum(econf_file *key_file, size_t num, const void *value); +econf_err setBoolValueNum(econf_file *key_file, size_t num, const void *value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/libeconf.c new/libeconf-0.3.8+git20200710.5126fff/lib/libeconf.c --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/libeconf.c 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/libeconf.c 2020-07-10 23:13:49.000000000 +0200 @@ -21,13 +21,13 @@ SOFTWARE. */ -#include "../include/libeconf.h" +#include "libeconf.h" -#include "../include/defines.h" -#include "../include/getfilecontents.h" -#include "../include/helpers.h" -#include "../include/keyfile.h" -#include "../include/mergefiles.h" +#include "defines.h" +#include "getfilecontents.h" +#include "helpers.h" +#include "keyfile.h" +#include "mergefiles.h" #include <dirent.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/libeconf.pc.in new/libeconf-0.3.8+git20200710.5126fff/lib/libeconf.pc.in --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/libeconf.pc.in 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/libeconf.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE@ -Description: TODO -Version: @VERSION@ - -Libs: -L${libdir} -leconf -lm -Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/mergefiles.c new/libeconf-0.3.8+git20200710.5126fff/lib/mergefiles.c --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/mergefiles.c 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/mergefiles.c 2020-07-10 23:13:49.000000000 +0200 @@ -22,9 +22,9 @@ */ #include "libeconf.h" -#include "../include/defines.h" -#include "../include/helpers.h" -#include "../include/mergefiles.h" +#include "defines.h" +#include "helpers.h" +#include "mergefiles.h" #include <dirent.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/lib/mergefiles.h new/libeconf-0.3.8+git20200710.5126fff/lib/mergefiles.h --- old/libeconf-0.3.7+git20200605.c67ef9a/lib/mergefiles.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/lib/mergefiles.h 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,56 @@ +/* + Copyright (C) 2019 SUSE LLC + Author: Pascal Arlt <parlt(a)suse.com> + + 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 without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#pragma once + +#include "keyfile.h" + +#include <stddef.h> + +/* This file contains the declaration of the functions used by econf_mergeFiles + to merge the contents of two econf_files. */ + + +/* Insert the content of "etc_file.file_entry" into "fe" if there is no + group specified. */ +size_t insert_nogroup(struct file_entry **fe, econf_file *ef); + +/* Merge contents from existing usr_file groups */ +size_t merge_existing_groups(struct file_entry **fe, econf_file *uf, econf_file *ef, + const size_t etc_start); + +/* Add entries from etc_file exclusive groups */ +size_t add_new_groups(struct file_entry **fe, econf_file *uf, econf_file *ef, + const size_t merge_length); + +/* Returns the default dirs to iterate through when merging */ +char **get_default_dirs(const char *usr_conf_dir, const char *etc_conf_dir); + +/* Receives a list of config directories to look for and calls 'check_conf_dir' */ +econf_file **traverse_conf_dirs(econf_file **key_files, const char *conf_dirs[], + size_t *size, const char *path, + const char *config_suffix, + const char *delim, const char *comment); + +/* Merge an array of given econf_files into one */ +econf_err merge_econf_files(econf_file **key_files, econf_file **merged_files); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/meson.build new/libeconf-0.3.8+git20200710.5126fff/meson.build --- old/libeconf-0.3.7+git20200605.c67ef9a/meson.build 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/meson.build 2020-07-10 23:13:49.000000000 +0200 @@ -7,7 +7,7 @@ 'b_pie=true', 'warning_level=3',], license : 'MIT', - version : '0.3.5', + version : '0.3.8', ) cc = meson.get_compiler('c') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/tests/CMakeLists.txt new/libeconf-0.3.8+git20200710.5126fff/tests/CMakeLists.txt --- old/libeconf-0.3.7+git20200605.c67ef9a/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libeconf-0.3.8+git20200710.5126fff/tests/CMakeLists.txt 2020-07-10 23:13:49.000000000 +0200 @@ -0,0 +1,55 @@ +# Set make check target +add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) + +# Set up macro for building and adding tests +macro(BuildAndAddTest TESTNAME) + if (${TESTNAME} STREQUAL "tst-getconfdirs2") + add_executable(${TESTNAME} EXCLUDE_FROM_ALL tst-getconfdirs1.c) + else() + add_executable(${TESTNAME} EXCLUDE_FROM_ALL ${TESTNAME}.c) + endif() + target_link_libraries(${TESTNAME} PRIVATE econf) + if (${TESTNAME} STREQUAL "tst-getconfdirs1") + target_compile_options(${TESTNAME} PRIVATE -DTESTSDIR=\"${PROJECT_SOURCE_DIR}/tests/\" -DSUFFIX=\".conf\") + elseif (${TESTNAME} STREQUAL "tst-getconfdirs2") + target_compile_options(${TESTNAME} PRIVATE -DTESTSDIR=\"${PROJECT_SOURCE_DIR}/tests/\" -DSUFFIX=\"conf\") + else() + target_compile_options(${TESTNAME} PRIVATE -DTESTSDIR=\"${PROJECT_SOURCE_DIR}/tests/\") + endif() + add_test(NAME ${TESTNAME} COMMAND ${TESTNAME}) + add_dependencies(check ${TESTNAME}) +endmacro() + +set(TESTS tst-filedoesnotexit1 + tst-merge1 + tst-merge2 + tst-merge3 + tst-merge4 + tst-merge5 + tst-logindefs1 + tst-logindefs2 + tst-arguments1 + tst-arguments2 + tst-arguments3 + tst-arguments4 + tst-arguments5 + tst-getconfdirs1 + tst-getconfdirs2 + tst-getconfdirs3 + tst-getconfdirs4 + tst-getconfdirs5 + tst-getconfdirs6 + tst-getconfdirs7 + tst-econf_errstring1 + tst-setgetvalues1 + tst-groups1 + tst-groups2 + tst-groups3 + tst-groups4 + tst-parseconfig1 + tst-quote1 + ) + +foreach (TESTCASE ${TESTS}) + BuildAndAddTest(${TESTCASE}) +endforeach() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libeconf-0.3.7+git20200605.c67ef9a/tests/Makefile.am new/libeconf-0.3.8+git20200710.5126fff/tests/Makefile.am --- old/libeconf-0.3.7+git20200605.c67ef9a/tests/Makefile.am 2020-06-05 17:55:16.000000000 +0200 +++ new/libeconf-0.3.8+git20200710.5126fff/tests/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ - -AM_CFLAGS = @CFLAGS_CHECKS@ @CFLAGS_WARNINGS@ -I$(top_srcdir)/include -DTESTSDIR=\"$(top_srcdir)/tests/\" -LDADD = @LDFLAGS_CHECKS@ @LDFLAGS_WARNINGS@ $(top_builddir)/lib/libeconf.la - -CLEANFILES = *~ - -EXTRA_DIST = meson.build \ - tst-arguments-data tst-logindefs1-data tst-logindefs2-data \ - tst-merge1-data tst-merge2-data tst-merge3-data tst-merge4-data \ - tst-merge5-data \ - tst-getconfdirs1-data tst-getconfdirs3-data \ - tst-getconfdirs4-data tst-getconfdirs5-data tst-getconfdirs6-data \ - tst-getconfdirs7-data \ - tst-arguments5-data tst-groups3-data tst-parseconfig-data \ - tst-quote1-data - -TESTS = tst-filedoesnotexit1 tst-merge1 tst-merge2 tst-merge3 tst-merge4 \ - tst-merge5 \ - tst-logindefs1 tst-logindefs2 \ - tst-arguments1 tst-arguments2 tst-arguments3 tst-arguments4 \ - tst-arguments5 \ - tst-getconfdirs1 tst-getconfdirs2 tst-getconfdirs3 \ - tst-getconfdirs4 tst-getconfdirs5 tst-getconfdirs6 \ - tst-getconfdirs7 \ - tst-econf_errstring1 \ - tst-setgetvalues1 \ - tst-groups1 tst-groups2 tst-groups3 tst-groups4 \ - tst-parseconfig1 \ - tst-quote1 - -XFAIL_TESTS = - -check_PROGRAMS = ${TESTS} - -tst_getconfdirs1_CFLAGS = $(AM_CFLAGS) -DSUFFIX=\".conf\" -tst_getconfdirs2_CFLAGS = $(AM_CFLAGS) -DSUFFIX=\"conf\" - -tst_getconfdirs2_SOURCES = tst-getconfdirs1.c

1 0

commit gama for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package gama for openSUSE:Factory checked in at 2020-08-02 12:20:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gama (Old) and /work/SRC/openSUSE:Factory/.gama.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gama" Sun Aug 2 12:20:42 2020 rev:13 rq:823903 version:2.09 Changes: -------- --- /work/SRC/openSUSE:Factory/gama/gama.changes 2020-06-30 21:59:27.563314892 +0200 +++ /work/SRC/openSUSE:Factory/.gama.new.3592/gama.changes 2020-08-02 12:21:12.115415033 +0200 @@ -1,0 +2,7 @@ +Sat Aug 1 14:34:08 UTC 2020 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- update to 2.09: + * Implicit value of XML parameter update_constrained_coordinates + was changed to yes + +------------------------------------------------------------------- Old: ---- gama-2.08.tar.gz gama-2.08.tar.gz.sig New: ---- gama-2.09.tar.gz gama-2.09.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gama.spec ++++++ --- /var/tmp/diff_new_pack.6VtlyH/_old 2020-08-02 12:21:12.655415610 +0200 +++ /var/tmp/diff_new_pack.6VtlyH/_new 2020-08-02 12:21:12.659415615 +0200 @@ -17,7 +17,7 @@ Name: gama -Version: 2.08 +Version: 2.09 Release: 0 Summary: Adjustment of geodetic networks License: GPL-3.0-or-later ++++++ gama-2.08.tar.gz -> gama-2.09.tar.gz ++++++ ++++ 2399 lines of diff (skipped)

1 0

commit arping2 for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package arping2 for openSUSE:Factory checked in at 2020-08-02 12:20:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arping2 (Old) and /work/SRC/openSUSE:Factory/.arping2.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arping2" Sun Aug 2 12:20:30 2020 rev:20 rq:823905 version:2.21 Changes: -------- --- /work/SRC/openSUSE:Factory/arping2/arping2.changes 2019-08-22 10:58:49.253647962 +0200 +++ /work/SRC/openSUSE:Factory/.arping2.new.3592/arping2.changes 2020-08-02 12:21:10.243413031 +0200 @@ -1,0 +2,10 @@ +Thu Jul 30 21:02:18 UTC 2020 - Matthias Eliasson <elimat(a)opensuse.org> + +- Update to version 2.21 + * Use more modern pcap API calls, when available + * Add payload data to mac ping + * chdir(/) after chroot() + * Misc minor cleanup +- Run spec-cleaner + +------------------------------------------------------------------- Old: ---- arping-2.20.tar.gz arping-2.20.tar.gz.asc New: ---- arping-2.21.tar.gz arping-2.21.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arping2.spec ++++++ --- /var/tmp/diff_new_pack.MDK2tK/_old 2020-08-02 12:21:10.719413540 +0200 +++ /var/tmp/diff_new_pack.MDK2tK/_new 2020-08-02 12:21:10.719413540 +0200 @@ -1,7 +1,7 @@ # # spec file for package arping2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,17 @@ Name: arping2 -Version: 2.20 +Version: 2.21 Release: 0 Summary: Layer-2 Ethernet pinger License: GPL-2.0-or-later Group: Productivity/Networking/Diagnostic -Url: http://www.habets.pp.se/synscan/programs.php?prog=arping - +URL: http://www.habets.pp.se/synscan/programs.php?prog=arping #Git-Clone: git://github.com/ThomasHabets/arping Source0: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz Source1: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz.asc Source2: %name.keyring Patch1: arping-setgroups.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libnet-devel BuildRequires: libpcap-devel @@ -39,22 +37,20 @@ unrouted networks and with ICMP-blocking hosts. %prep -%setup -n arping-%version -%patch -P 1 -p1 +%autosetup -n arping-%version -p1 %build %configure -make %{?_smp_mflags} +%make_build %install -b="%buildroot"; +b="%buildroot" %make_install # Avoid collision with iputils's inferior arping. -mv "$b/%_sbindir"/{arping,%name}; -mv "$b/%_mandir/man8"/{arping.8,%name.8}; +mv "$b/%_sbindir/arping" "$b/%_sbindir/%name" +mv "$b/%_mandir/man8/arping.8" "$b/%_mandir/man8/arping2.8" %files -%defattr(-,root,root) %_sbindir/arping2 %_mandir/man8/arping2.8* %doc README ++++++ arping-2.20.tar.gz -> arping-2.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/HACKING.md new/arping-2.21/HACKING.md --- old/arping-2.20/HACKING.md 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/HACKING.md 2020-03-08 15:23:37.000000000 +0100 @@ -1,5 +1,17 @@ # Hacking on Arping +## Coding style + +* C99 to retain portability for the widest range of platforms +* Approximately [Linux kernel coding style][1], except: + * Line break before function name, in function definitions. + * Curly braces are mandatory. + * Place `*` next to the type, not the name. E.g. `char* p` + +Don't make style-only changes, but fix the style on the line you're touching anyway. + +[1]: https://github.com/torvalds/linux/blob/master/Documentation/process/coding-… + ## Make release 1. Up version in configure.ac. Commit. 2. Run `./extra/mktarball HEAD` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/INSTALL new/arping-2.21/INSTALL --- old/arping-2.20/INSTALL 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/INSTALL 2020-03-08 15:23:37.000000000 +0100 @@ -4,8 +4,8 @@ Dependencies ------------ -libnet 1.1.x - https://github.com/sam-github/libnet +libnet 1.1 or newer + https://github.com/libnet/libnet or http://ftp.debian.org/debian/pool/main/libn/libnet/libnet_1.1.2.1.orig.tar.… Note: Libnet 1.1.5 or later needed for Linux capability support. @@ -29,9 +29,9 @@ Installing, longer version -------------------------- -Note that arping 2.x requires libnet 1.1.x to work. It will NOT work with -libnet 1.0.x. Arping 1.x works with libnet 1.0.x, but it's not included in the -same package anymore. +Note that arping 2.x requires libnet 1.1 or newer to work. It will NOT +work with libnet 1.0.x. Arping 1.x works with libnet 1.0.x, but it's +not included in the same package anymore. Standard autotools: ./configure && make && make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/README new/arping-2.21/README --- old/arping-2.20/README 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/README 2020-03-08 15:23:37.000000000 +0100 @@ -43,15 +43,15 @@ * Latest Debian stable x86 and amd64 * Linux (Debian or Ubuntu) on arm * Latest OpenBSD x86 or amd64 -* FreeBSD x86 -* Solaris 10 sparc -I don't have these systems up and runnig 24/7, but I try to get them tested -every now and then: +Systems that it should still work on, but I don't personally regularly test: +* Debian Alpha +* FreeBSD +* IRIX 6.5 mips (last test 2009-09-27) * MacOS X -* Debian alpha +* NetBSD * OpenBSD sparc64 (last test: 2009-10-02) -* IRIX 6.5 mips (last test 2009-09-27) +* Solaris Mailing list ------------ @@ -122,20 +122,12 @@ --- Q: ./configure says I need libnet and/or libpcap -A: Arping depends on libnet 1.1.x and libpcap, get libnet at: - http://packetfactory.openwall.net/projects/libnet/ - and libpcap from http://www.tcpdump.org. +A: Arping depends on libnet 1.1 or newer, and libpcap. Get libnet from + https://github.com/libnet/libnet and libpcap from http://www.tcpdump.org. Or more likely they were both included in your Linux distribution. - Lately www.packetfactory.net seems to be down, so you can get the original - tarball from the Debian archives: - http://ftp.debian.org/debian/pool/main/libn/libnet/libnet_1.1.4.orig.tar.gz - If that exact file doesn't exist there probably is one with a higher - version number. - - Or github.com: - http://github.com/sam-github/libnet - http://github.com/ThomasHabets/libnet + The original libnet site + was http://packetfactory.openwall.net/projects/libnet/, but is not updated. --- Q: I get bus error on my non-x86 box diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/config.h.in new/arping-2.21/config.h.in --- old/arping-2.20/config.h.in 2019-08-18 13:17:06.000000000 +0200 +++ new/arping-2.21/config.h.in 2020-03-08 15:23:39.000000000 +0100 @@ -15,6 +15,9 @@ /* Define to 1 if you have the <getopt.h> header file. */ #undef HAVE_GETOPT_H +/* Define to 1 if you have the `getrandom' function. */ +#undef HAVE_GETRANDOM + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -69,6 +72,9 @@ /* Define to 1 if you have the `pcap_create' function. */ #undef HAVE_PCAP_CREATE +/* Define to 1 if you have the `pcap_findalldevs' function. */ +#undef HAVE_PCAP_FINDALLDEVS + /* Define to 1 if you have the `pcap_list_tstamp_types' function. */ #undef HAVE_PCAP_LIST_TSTAMP_TYPES @@ -114,6 +120,9 @@ /* Define to 1 if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H +/* Define to 1 if you have the <sys/random.h> header file. */ +#undef HAVE_SYS_RANDOM_H + /* Define to 1 if you have the <sys/select.h> header file. */ #undef HAVE_SYS_SELECT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/configure new/arping-2.21/configure --- old/arping-2.20/configure 2019-08-18 13:17:06.000000000 +0200 +++ new/arping-2.21/configure 2020-03-08 15:23:39.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for arping 2.20. +# Generated by GNU Autoconf 2.69 for arping 2.21. # # Report bugs to <thomas(a)habets.se>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='arping' PACKAGE_TARNAME='arping' -PACKAGE_VERSION='2.20' -PACKAGE_STRING='arping 2.20' +PACKAGE_VERSION='2.21' +PACKAGE_STRING='arping 2.21' PACKAGE_BUGREPORT='thomas(a)habets.se' PACKAGE_URL='' @@ -1297,7 +1297,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 arping 2.20 to adapt to many kinds of systems. +\`configure' configures arping 2.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1369,7 +1369,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of arping 2.20:";; + short | recursive ) echo "Configuration of arping 2.21:";; esac cat <<\_ACEOF @@ -1465,7 +1465,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -arping configure 2.20 +arping configure 2.21 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1934,7 +1934,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by arping $as_me 2.20, which was +It was created by arping $as_me 2.21, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2909,7 +2909,7 @@ # Define the identity of the package. PACKAGE='arping' - VERSION='2.20' + VERSION='2.21' cat >>confdefs.h <<_ACEOF @@ -4372,7 +4372,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_net_libnet_name_resolve" >&5 $as_echo "$ac_cv_lib_net_libnet_name_resolve" >&6; } if test "x$ac_cv_lib_net_libnet_name_resolve" = xyes; then : - as_fn_error $? "libnet 1.0.x found. Arping 2.x requires libnet 1.1.x" "$LINENO" 5 + as_fn_error $? "libnet 1.0.x found. Arping 2.x requires libnet 1.1 or newer" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnet_init in -lnet" >&5 @@ -4939,6 +4939,7 @@ stdint.h \ libnet.h \ win32/libnet.h \ +sys/random.h \ net/bpf.h \ pwd.h \ unistd.h @@ -5326,7 +5327,7 @@ for ac_func in gettimeofday memset select strchr strdup strerror strstr \ getifaddrs cap_init pcap_create pcap_list_tstamp_types pcap_set_immediate_mode \ -pledge unveil +pledge unveil pcap_findalldevs getrandom do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -6037,7 +6038,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by arping $as_me 2.20, which was +This file was extended by arping $as_me 2.21, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6103,7 +6104,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -arping config.status 2.20 +arping config.status 2.21 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/arping-2.20/configure.ac new/arping-2.21/configure.ac --- old/arping-2.20/configure.ac 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/configure.ac 2020-03-08 15:23:37.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(arping, 2.20, thomas(a)habets.se) +AC_INIT(arping, 2.21, thomas(a)habets.se) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([src/arping.c]) AM_INIT_AUTOMAKE @@ -28,7 +28,7 @@ AC_CHECK_LIB([cap], [cap_init]) AC_CHECK_LIB([rt], [clock_gettime]) AC_CHECK_LIB([net], [libnet_name_resolve], - [AC_MSG_ERROR([libnet 1.0.x found. Arping 2.x requires libnet 1.1.x])]) + [AC_MSG_ERROR([libnet 1.0.x found. Arping 2.x requires libnet 1.1 or newer])]) AC_CHECK_LIB([net], [libnet_init], ,[AC_MSG_ERROR([libnet 1.1.x not found])]) AC_CHECK_LIB([pcap], [pcap_open_live], ,[AC_MSG_ERROR([libpcap not found])]) AC_SEARCH_LIBS([clock_gettime], [rt]) @@ -50,6 +50,7 @@ stdint.h \ libnet.h \ win32/libnet.h \ +sys/random.h \ net/bpf.h \ pwd.h \ unistd.h]) @@ -75,7 +76,7 @@ AC_TYPE_SIGNAL AC_CHECK_FUNCS([gettimeofday memset select strchr strdup strerror strstr \ getifaddrs cap_init pcap_create pcap_list_tstamp_types pcap_set_immediate_mode \ -pledge unveil]) +pledge unveil pcap_findalldevs getrandom]) if test x$ac_cv_func_getifaddrs = xyes; then AC_LIBOBJ([findif_getifaddrs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/extra/build-test.sh new/arping-2.21/extra/build-test.sh --- old/arping-2.20/extra/build-test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/arping-2.21/extra/build-test.sh 2020-03-08 15:23:37.000000000 +0100 @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +set -e + +./bootstrap.sh + +for std in c99 c11 c18; do + for cc in gcc clang; do + cppflags="-I$HOME/opt/libnet/include" + ldflags="-L$HOME/opt/libnet/lib -Wl,-rpath -Wl,$HOME/opt/libnet/lib" + cflags="-std=$std -Wall -Wextra -pedantic -O3 -march=native" + ./configure --prefix="$HOME/opt/arping" \ + CPPFLAGS="$cppflags" \ + CFLAGS="$cflags" \ + LDFLAGS="$ldflags" \ + CC=$cc + make clean + make -j8 EXTRA_CFLAGS="-Werror" + make check 2>/dev/null || (echo "Test failed" && exit 1) + done +done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/src/Makefile.am new/arping-2.21/src/Makefile.am --- old/arping-2.20/src/Makefile.am 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/src/Makefile.am 2020-03-08 15:23:37.000000000 +0100 @@ -1,6 +1,7 @@ # arping/src/Makefile.am include $(top_srcdir)/Makefile.am.common +CFLAGS+= $(EXTRA_CFLAGS) sbin_PROGRAMS = arping noinst_PROGRAMS = fuzz_pingip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/src/Makefile.in new/arping-2.21/src/Makefile.in --- old/arping-2.20/src/Makefile.in 2019-08-18 13:17:06.000000000 +0200 +++ new/arping-2.21/src/Makefile.in 2020-03-08 15:23:39.000000000 +0100 @@ -401,7 +401,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS) CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/src/arping.c new/arping-2.21/src/arping.c --- old/arping-2.20/src/arping.c 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/src/arping.c 2020-03-08 15:23:37.000000000 +0100 @@ -73,6 +73,10 @@ #include <sys/param.h> #endif +#if HAVE_SYS_RANDOM_H +#include <sys/random.h> +#endif + #if HAVE_GRP_H #include <grp.h> #endif @@ -165,6 +169,9 @@ */ static uint8_t dstmac[ETH_ALEN]; +static char* payload_suffix = NULL; +static ssize_t payload_suffix_size = -1; + uint32_t srcip; /* autodetected, override with -S/-b/-0 */ uint8_t srcmac[ETH_ALEN]; /* autodetected, override with -s */ @@ -212,6 +219,40 @@ /* Doesn't really need to be volatile, but doesn't hurt. */ static volatile sig_atomic_t time_to_die = 0; +static ssize_t +xgetrandom(void *buf, const size_t buflen, const unsigned int flags) +{ +#ifdef HAVE_GETRANDOM + return getrandom(buf, buflen, flags); +#else + char* p = buf; + for (int n = 0; n < buflen; n++) { + p[n] = random() & 0xff; + } + return buflen; +#endif +} + +static long int +xrandom() { + const int maxtry = 10; + for (int c = 0; c < maxtry; c++) { + long int ret; + const ssize_t rc = xgetrandom(&ret, sizeof(ret), 0); + if (rc == -1) { + fprintf(stderr, "arping: failed to get random bytes: %s\n", strerror(errno)); + continue; + } + if (sizeof(ret) != rc) { + fprintf(stderr, "arping: got too few random bytes %zd, want %zd\n", rc, sizeof(ret)); + continue; + } + return ret; + } + fprintf(stderr, "arping: failed to get random bytes after %d tries\n", maxtry); + exit(1); +} + /** * If possible, chroot. * @@ -245,6 +286,12 @@ } return; } + if (chdir("/")) { + if (verbose) { + printf("arping: chdir(/): %s\n", strerror(errno)); + } + return; + } if (verbose > 1) { printf("arping: Successfully chrooted to %s\n", pw->pw_dir); } @@ -905,7 +952,7 @@ if (max_wait < 0) { return 0; } - if (max_wait > packetwait / 1000000) { + if (max_wait > packetwait / 1000000.0) { return packetwait; } return max_wait * 1000000; @@ -952,8 +999,6 @@ return buf; } - - /** Send directed IPv4 ICMP echo request. * * \param id IP id @@ -968,7 +1013,16 @@ // Without this padding some systems (e.g. Raspberry Pi 3 // wireless interface) failed. dmesg said: // arping: packet size is too short (42 <= 50) - const uint8_t padding[16] = {0}; + const size_t padding_size = sizeof(struct timespec) + payload_suffix_size; + uint8_t padding[padding_size]; + memset(padding, 0, padding_size); + { + struct timespec ts; + getclock(&ts); + memcpy(padding, &ts, sizeof(struct timespec)); + memcpy(&padding[sizeof(struct timespec)], + payload_suffix, payload_suffix_size); + } int c; @@ -987,7 +1041,8 @@ } if (-1==(ipv4 = libnet_build_ipv4(LIBNET_IPV4_H - + LIBNET_ICMPV4_ECHO_H + 0, + + LIBNET_ICMPV4_ECHO_H + + sizeof padding, 0, /* ToS */ id, /* id */ 0, /* frag */ @@ -1340,6 +1395,10 @@ return; } + if (verbose > 3) { + printf("arping: ... right dst mac\n"); + } + // Source MAC must match, if set. if (memcmp(dstmac, ethxmas, ETH_ALEN)) { if (memcmp(pkt_srcmac, dstmac, ETH_ALEN)) { @@ -1347,6 +1406,10 @@ } } + if (verbose > 3) { + printf("arping: ... right src mac\n"); + } + // IPv4 Address must be me (maybe). if (addr_must_be_same) { uint32_t tmp; @@ -1356,11 +1419,48 @@ } } - // Must be ICMP echo reply. + if (verbose > 3) { + printf("arping: ... src IP acceptable\n"); + } + + // Must be ICMP echo reply type. if (htons(hicmp->icmp_type) != ICMP_ECHOREPLY) { return; } + if (verbose > 3) { + printf("arping: ... is echo reply type\n"); + } + + // Must be ICMP echo reply code 0. + if (htons(hicmp->icmp_code) != 0) { + return; + } + + if (verbose > 3) { + printf("arping: ... is echo reply code\n"); + } + + const char* payload = (char*)hicmp + LIBNET_ICMPV4_ECHO_H; + const ssize_t payload_size = h->len - (payload - (char*)packet); + if (payload_size < 0) { + return; + } + if (payload_size < sizeof(struct timespec) + payload_suffix_size) { + return; + } + if (verbose > 3) { + printf("arping: ... correct payload size (%zd)\n", + payload_size); + } + if (memcmp(&payload[sizeof(struct timespec)], + payload_suffix, payload_suffix_size)) { + return; + } + if (verbose > 3) { + printf("arping: ... correct payload suffix\n"); + } + update_stats(timespec2dbl(&arrival) - timespec2dbl(&lastpacketsent)); if (beep) { printf("\a"); @@ -1605,6 +1705,7 @@ double deadline = -1; char bpf_filter[64]; ebuf[0] = 0; + srandom(time(NULL)); for (c = 1; c < argc; c++) { if (!strcmp(argv[c], "--help")) { @@ -1658,6 +1759,7 @@ break; case 'h': usage(0); + exit(0); // Needless but shuts up compiler warnings. case 'g': drop_group = optarg; break; @@ -1671,7 +1773,9 @@ "purpose)\n"); exit(1); } - case 'I': /* FALL THROUGH */ + ifname = optarg; + break; + case 'I': ifname = optarg; break; case 'm': @@ -1756,6 +1860,37 @@ exit(1); } + // Generate random payload suffix for MAC pings, to be able to + // differentiate from unrelated ping replies. + if (payload_suffix_size < 0) { + payload_suffix_size = 4; + payload_suffix = malloc(payload_suffix_size); + if (payload_suffix) { + const ssize_t rc = xgetrandom(payload_suffix, payload_suffix_size, 0); + if (rc == -1) { + fprintf(stderr, + "arping: failed to get %zd random bytes: %s\n", + payload_suffix_size, + strerror(errno)); + free(payload_suffix); + payload_suffix = NULL; + } else if (payload_suffix_size != rc) { + fprintf(stderr, + "arping: only got %zd out of %zd bytes for random suffix\n", + rc, payload_suffix_size); + } + } else { + fprintf(stderr, "arping: failed to allocate %zd bytes for payload suffix.\n", + payload_suffix_size); + } + + if (!payload_suffix) { + fprintf(stderr, "arping: Using constant suffix.\n"); + payload_suffix = "arping"; + payload_suffix_size = strlen(payload_suffix); + } + } + if (((mode == PINGIP) && opt_T) || ((mode == PINGMAC) && (opt_B || dstmac_opt || opt_U))) { fprintf(stderr, "arping: -T can only be used to ping MAC" @@ -1857,7 +1992,7 @@ * Handle dstip_given instead of ip address after parms (-B really) */ if (mode == NONE) { - if (optind + 1 == argc) { + if (parm) { mode = is_mac_addr(parm)?PINGMAC:PINGIP; } else if (dstip_given) { mode = PINGIP; @@ -2098,7 +2233,7 @@ } else { /* PINGMAC */ int c; for (c = 0; (maxcount < 0 || c < maxcount) && !time_to_die; c++) { - pingmac_send(rand(), c); + pingmac_send(xrandom(), c); const uint32_t w = wait_time(deadline, packetwait); if (w == 0) { break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/src/findif_linux.c new/arping-2.21/src/findif_linux.c --- old/arping-2.20/src/findif_linux.c 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/src/findif_linux.c 2020-03-08 15:23:37.000000000 +0100 @@ -33,6 +33,8 @@ #include "arping.h" +#error "This code should never be chosen. If you just want to use it then uncomment this error line" + /** * WARNING: non-reentrant */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/src/mock_libnet.c new/arping-2.21/src/mock_libnet.c --- old/arping-2.20/src/mock_libnet.c 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/src/mock_libnet.c 2020-03-08 15:23:37.000000000 +0100 @@ -24,7 +24,7 @@ UNUSED(err_buf); if (device == NULL) { if (mock_libnet_null_ok) { - return malloc(1); + return malloc(sizeof(libnet_t)); } return NULL; } @@ -32,10 +32,10 @@ return NULL; } if (!strcmp(device, "good")) { - return malloc(1); + return malloc(sizeof(libnet_t)); } if (mock_libnet_lo_ok && !strcmp(device, "lo")) { - return malloc(1); + return malloc(sizeof(libnet_t)); } return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.20/src/unix.c new/arping-2.21/src/unix.c --- old/arping-2.20/src/unix.c 2019-08-18 13:17:04.000000000 +0200 +++ new/arping-2.21/src/unix.c 2020-03-08 15:23:37.000000000 +0100 @@ -20,7 +20,17 @@ #include "config.h" #endif +#include <errno.h> #include <signal.h> +#include <string.h> + +#if HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +#if HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #include <pcap.h> @@ -34,9 +44,59 @@ const char * arping_lookupdev_default(uint32_t srcip, uint32_t dstip, char *ebuf) { +#ifdef HAVE_PCAP_FINDALLDEVS + UNUSED(srcip); + pcap_if_t *ifs = NULL; + int rc = pcap_findalldevs(&ifs, ebuf); + if (rc) { + return NULL; + } + + pcap_if_t *t; + char* ifname = NULL; + for (t = ifs; !ifname && t; t = t->next) { +#ifdef PCAP_IF_LOOPBACK + if (t->flags & PCAP_IF_LOOPBACK) { + continue; + } +#endif +#ifdef PCAP_IF_UP + if (!(t->flags & PCAP_IF_UP)) { + continue; + } +#endif + + // This code is only called when using -F, which is "don't try + // to be smart". If we wanted to be smart we would have used + // findif_*.c. + if (1) { + ifname = strdup(t->name); // Memory leak. + break; + } + + // UNREACHABLE + pcap_addr_t *a; + for (a = t->addresses; !ifname && a; a = a->next) { + if (a->addr->sa_family != AF_INET) { + continue; + } + const struct sockaddr_in* sa = (struct sockaddr_in*)a->addr; + const struct sockaddr_in* smask = (struct sockaddr_in*)a->netmask; + const uint32_t addr = sa->sin_addr.s_addr; + const uint32_t mask = smask->sin_addr.s_addr; + if ((addr & mask) != (dstip & mask)) { + // Not optimal: memory leak. + ifname = strdup(t->name); + } + } + } + pcap_freealldevs(ifs); + return ifname; +#else UNUSED(srcip); UNUSED(dstip); return pcap_lookupdev(ebuf); +#endif } /** @@ -45,7 +105,10 @@ void do_signal_init() { - signal(SIGINT, sigint); + if (SIG_ERR == signal(SIGINT, sigint)) { + fprintf(stderr, "arping: failed to set SIGINT handler: %s\n", + strerror(errno)); + } } /* ---- Emacs Variables ---- * Local Variables:

1 0

commit libosmo-sccp for openSUSE:Factory
by root 02 Aug '20

02 Aug '20

Hello community, here is the log from the commit of package libosmo-sccp for openSUSE:Factory checked in at 2020-08-02 12:20:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmo-sccp (Old) and /work/SRC/openSUSE:Factory/.libosmo-sccp.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libosmo-sccp" Sun Aug 2 12:20:23 2020 rev:13 rq:823901 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libosmo-sccp/libosmo-sccp.changes 2020-06-07 21:38:45.749534577 +0200 +++ /work/SRC/openSUSE:Factory/.libosmo-sccp.new.3592/libosmo-sccp.changes 2020-08-02 12:21:07.475410071 +0200 @@ -1,0 +2,6 @@ +Sat Aug 1 14:07:01 UTC 2020 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.2.1 + * sccp_internal.h: fix compilation with gcc-10 + +------------------------------------------------------------------- Old: ---- libosmo-sccp-1.2.0.tar.xz New: ---- libosmo-sccp-1.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmo-sccp.spec ++++++ --- /var/tmp/diff_new_pack.C0Kbzw/_old 2020-08-02 12:21:09.007411709 +0200 +++ /var/tmp/diff_new_pack.C0Kbzw/_new 2020-08-02 12:21:09.011411714 +0200 @@ -17,7 +17,7 @@ Name: libosmo-sccp -Version: 1.2.0 +Version: 1.2.1 Release: 0 %define libversion %(echo "%version" | sed 's/\\./_/g') Summary: Osmocom library for the A-bis interface between BTS and BSC ++++++ _service ++++++ --- /var/tmp/diff_new_pack.C0Kbzw/_old 2020-08-02 12:21:09.039411744 +0200 +++ /var/tmp/diff_new_pack.C0Kbzw/_new 2020-08-02 12:21:09.039411744 +0200 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">git://git.osmocom.org/libosmo-sccp</param> - <param name="revision">1.2.0</param> - <param name="versionformat">1.2.0</param> + <param name="revision">1.2.1</param> + <param name="versionformat">1.2.1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ libosmo-sccp-1.2.0.tar.xz -> libosmo-sccp-1.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-sccp-1.2.0/debian/changelog new/libosmo-sccp-1.2.1/debian/changelog --- old/libosmo-sccp-1.2.0/debian/changelog 2020-01-02 21:24:11.000000000 +0100 +++ new/libosmo-sccp-1.2.1/debian/changelog 2020-07-26 11:05:26.000000000 +0200 @@ -1,3 +1,9 @@ +libosmo-sccp (1.2.1) unstable; urgency=medium + + * sccp_internal.h: fix compilation with gcc-10 + + -- Harald Welte <laforge(a)osmocom.org> Sun, 26 Jul 2020 11:05:25 +0200 + libosmo-sccp (1.2.0) unstable; urgency=medium [ Kira Obrezkova ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-sccp-1.2.0/src/sccp_internal.h new/libosmo-sccp-1.2.1/src/sccp_internal.h --- old/libosmo-sccp-1.2.0/src/sccp_internal.h 2020-01-02 21:24:11.000000000 +0100 +++ new/libosmo-sccp-1.2.1/src/sccp_internal.h 2020-07-26 11:05:26.000000000 +0200 @@ -120,7 +120,7 @@ struct msgb *sccp_msgb_alloc(const char *name); -struct osmo_fsm sccp_scoc_fsm; +extern struct osmo_fsm sccp_scoc_fsm; void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst);

1 0