Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ugrep for openSUSE:Factory checked in at 2024-01-07 21:39:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ugrep (Old) and /work/SRC/openSUSE:Factory/.ugrep.new.28375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ugrep" Sun Jan 7 21:39:40 2024 rev:62 rq:1137283 version:4.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ugrep/ugrep.changes 2024-01-06 17:30:13.977933909 +0100 +++ /work/SRC/openSUSE:Factory/.ugrep.new.28375/ugrep.changes 2024-01-07 21:39:56.419229065 +0100 @@ -1,0 +2,7 @@ +Sat Jan 6 17:59:29 UTC 2024 - Andreas Stieger <andreas.stie...@gmx.de> + +- update to 4.5.1: + * fix bzip3 build failures (previously patched) +- drop ugrep-4.5.0-fix-bzip3-configure.patch + +------------------------------------------------------------------- Old: ---- ugrep-4.5.0-fix-bzip3-configure.patch ugrep-4.5.0.tar.gz New: ---- ugrep-4.5.1.tar.gz BETA DEBUG BEGIN: Old: * fix bzip3 build failures (previously patched) - drop ugrep-4.5.0-fix-bzip3-configure.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ugrep.spec ++++++ --- /var/tmp/diff_new_pack.JXiHeu/_old 2024-01-07 21:39:57.395264569 +0100 +++ /var/tmp/diff_new_pack.JXiHeu/_new 2024-01-07 21:39:57.399264714 +0100 @@ -17,18 +17,13 @@ Name: ugrep -Version: 4.5.0 +Version: 4.5.1 Release: 0 Summary: Universal grep: a feature-rich grep implementation with focus on speed License: BSD-3-Clause Group: Productivity/File utilities URL: https://github.com/Genivia/ugrep Source: https://github.com/Genivia/ugrep/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: ugrep-4.5.0-fix-bzip3-configure.patch -# for ugrep-4.5.0-fix-bzip3-configure.patch -BuildRequires: autoconf -BuildRequires: automake -# BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -88,8 +83,6 @@ %autosetup -p1 %build -# for ugrep-4.5.0-fix-bzip3-configure.patch -autoreconf -fiv %configure \ --disable-avx \ --enable-color \ ++++++ ugrep-4.5.0.tar.gz -> ugrep-4.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/README.md new/ugrep-4.5.1/README.md --- old/ugrep-4.5.0/README.md 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/README.md 2024-01-06 15:02:32.000000000 +0100 @@ -5353,7 +5353,7 @@ - ugrep 4.5.0 January 5, 2024 UGREP(1) + ugrep 4.5.1 January 6, 2024 UGREP(1) ð [Back to table of contents](#toc) Binary files old/ugrep-4.5.0/bin/win32/ug.exe and new/ugrep-4.5.1/bin/win32/ug.exe differ Binary files old/ugrep-4.5.0/bin/win32/ugrep.exe and new/ugrep-4.5.1/bin/win32/ugrep.exe differ Binary files old/ugrep-4.5.0/bin/win64/ug.exe and new/ugrep-4.5.1/bin/win64/ug.exe differ Binary files old/ugrep-4.5.0/bin/win64/ugrep.exe and new/ugrep-4.5.1/bin/win64/ugrep.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/configure new/ugrep-4.5.1/configure --- old/ugrep-4.5.0/configure 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/configure 2024-01-06 15:02:32.000000000 +0100 @@ -796,8 +796,8 @@ with_lz4 with_zstd with_brotli -enable_7zip with_bzip3 +enable_7zip with_bash_completion_dir with_fish_completion_dir with_zsh_completion_dir @@ -8764,28 +8764,6 @@ fi -# Check whether --enable-7zip was given. -if test ${enable_7zip+y} -then : - enableval=$enable_7zip; with_no_7zip="yes" -else $as_nop - with_no_7zip="no" -fi - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --disable-7zip" >&5 -printf %s "checking for --disable-7zip... " >&6; } -if test "x$with_no_7zip" = "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - CPPFLAGS="$CPPFLAGS -I../lzma/C" - LDFLAGS="$LDFLAGS -L../lzma/C" - LIBS="-lviiz $LIBS" -else - EXTRA_CFLAGS="-DWITH_NO_7ZIP ${EXTRA_CFLAGS}" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -fi - # Check whether --with-bzip3 was given. if test ${with_bzip3+y} @@ -8933,6 +8911,28 @@ fi +# Check whether --enable-7zip was given. +if test ${enable_7zip+y} +then : + enableval=$enable_7zip; with_7zip="$enableval" +else $as_nop + with_7zip="yes" +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --disable-7zip" >&5 +printf %s "checking for --disable-7zip... " >&6; } +if test "x$with_7zip" = "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + CPPFLAGS="$CPPFLAGS -I../lzma/C" + LDFLAGS="$LDFLAGS -L../lzma/C" + LIBS="-lviiz $LIBS" +else + EXTRA_CFLAGS="-DWITH_NO_7ZIP ${EXTRA_CFLAGS}" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi + fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/configure.ac new/ugrep-4.5.1/configure.ac --- old/ugrep-4.5.0/configure.ac 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/configure.ac 2024-01-06 15:02:32.000000000 +0100 @@ -82,13 +82,25 @@ AX_CHECK_BROTLILIB([], [echo "optional brotli library not found: install if you want ugrep option -z to search .br files"]) +AC_ARG_WITH(bzip3, + [AS_HELP_STRING([--with-bzip3], + [to enable bzip3 library to decompress .bz3 files])], + [with_bzip3_library="$withval"], + [with_bzip3_library=""]) +if test "x$with_bzip3_library" != "x"; then + if test "x$with_bzip3" = "xyes"; then + unset with_bzip3 + fi + AX_CHECK_BZIP3LIB([], [echo "optional libbzip3 not found: install if you want ugrep option -z to search .bz3 files"]) +fi + AC_ARG_ENABLE(7zip, [AS_HELP_STRING([--disable-7zip], [to disable 7zip and no longer search .7z files (7z requires more memory and takes long to decompress)])], - [with_no_7zip="yes"], - [with_no_7zip="no"]) + [with_7zip="$enableval"], + [with_7zip="yes"]) AC_MSG_CHECKING(for --disable-7zip) -if test "x$with_no_7zip" = "xno"; then +if test "x$with_7zip" = "xyes"; then AC_MSG_RESULT(no) CPPFLAGS="$CPPFLAGS -I../lzma/C" LDFLAGS="$LDFLAGS -L../lzma/C" @@ -98,18 +110,6 @@ AC_MSG_RESULT(yes) fi -AC_ARG_WITH(bzip3, - [AS_HELP_STRING([--with-bzip3], - [to enable bzip3 library to decompress .bz3 files])], - [with_bzip3_library="$withval"], - [with_bzip3_library=""]) -if test "x$with_bzip3_library" != "x"; then - if test "x$with_bzip3" = "xyes"; then - unset with_bzip3 - fi - AX_CHECK_BZIP3LIB([], [echo "optional libbzip3 not found: install if you want ugrep option -z to search .bz3 files"]) -fi - fi AC_ARG_WITH([bash-completion-dir], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/include/reflex/fuzzymatcher.h new/ugrep-4.5.1/include/reflex/fuzzymatcher.h --- old/ugrep-4.5.0/include/reflex/fuzzymatcher.h 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/include/reflex/fuzzymatcher.h 2024-01-06 15:02:32.000000000 +0100 @@ -154,6 +154,11 @@ bin_ = (max & BIN); bpt_.resize(max_); } + /// Get the fuzzy distance parameters, the max is stored in the lower byte and INS, DEL, SUB are hi byte bits + uint16_t distance() + { + return max_; + } protected: /// Save state to restore fuzzy matcher state after a second pass struct SaveState { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/man/ugrep.1 new/ugrep-4.5.1/man/ugrep.1 --- old/ugrep-4.5.0/man/ugrep.1 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/man/ugrep.1 2024-01-06 15:02:32.000000000 +0100 @@ -1,4 +1,4 @@ -.TH UGREP "1" "January 05, 2024" "ugrep 4.5.0" "User Commands" +.TH UGREP "1" "January 06, 2024" "ugrep 4.5.1" "User Commands" .SH NAME \fBugrep\fR, \fBug\fR -- file pattern searcher .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/src/output.cpp new/ugrep-4.5.1/src/output.cpp --- old/ugrep-4.5.0/src/output.cpp 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/src/output.cpp 2024-01-06 15:02:32.000000000 +0100 @@ -1243,11 +1243,22 @@ break; case 'Z': - if (flag_fuzzy > 0 && !flag_files_with_matches && !flag_count) + if (flag_fuzzy > 0) { - // -Z: we used the fuzzy matcher to search, so a dynamic cast is fine - reflex::FuzzyMatcher *fuzzy_matcher = dynamic_cast<reflex::FuzzyMatcher*>(matcher); - num(fuzzy_matcher->edits()); + if (!flag_match) + { + // -Z: we used the fuzzy matcher to search, so a dynamic cast is fine + reflex::FuzzyMatcher *fuzzy_matcher = dynamic_cast<reflex::FuzzyMatcher*>(matcher); + if (!flag_files_with_matches && !flag_count) + num(fuzzy_matcher->edits()); + else + num(fuzzy_matcher->distance() & 0xff); + } + else + { + // --match all + chr('0'); + } } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/src/ugrep.cpp new/ugrep-4.5.1/src/ugrep.cpp --- old/ugrep-4.5.0/src/ugrep.cpp 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/src/ugrep.cpp 2024-01-06 15:02:32.000000000 +0100 @@ -9884,7 +9884,7 @@ void Grep::search(const char *pathname, uint16_t cost) { // -Zbest (or --best-match) without --match: compute cost if not yet computed by --sort=best - if (flag_best_match && flag_fuzzy > 0 && !flag_match && !flag_quiet && !flag_files_with_matches && matchers == NULL && pathname != Static::LABEL_STANDARD_INPUT) + if (flag_best_match && flag_fuzzy > 0 && !flag_match && !flag_quiet && (!flag_files_with_matches || flag_format != NULL) && matchers == NULL && pathname != Static::LABEL_STANDARD_INPUT) { // -Z: matcher is a FuzzyMatcher for sure reflex::FuzzyMatcher *fuzzy_matcher = dynamic_cast<reflex::FuzzyMatcher*>(matcher); @@ -9911,8 +9911,7 @@ } // combine max distance cost (lower byte) with INS, DEL, SUB and BIN fuzzy flags (upper byte) - cost = (cost & 0xff) | (flag_fuzzy & 0xff00); - fuzzy_matcher->distance(cost); + fuzzy_matcher->distance((cost & 0xff) | (flag_fuzzy & 0xff00)); } // stop when output is blocked @@ -14360,8 +14359,8 @@ %J matching line, as JSON \n\ %k line number \n\ %K %[...]K ... + column number, if -k \n\ - %m match number Fields that require -P for captures:\n\ - %M match number, per line \n\ + %m number of matches Fields that require -P for captures:\n\ + %M number of matching lines \n\ %n line number field output\n\ %N %[...]N ... + line number, if -n ---------- --------------------------\n\ %o matching pattern, also %0 %1 %2...%9 group capture\n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/src/ugrep.hpp new/ugrep-4.5.1/src/ugrep.hpp --- old/ugrep-4.5.0/src/ugrep.hpp 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/src/ugrep.hpp 2024-01-06 15:02:32.000000000 +0100 @@ -38,7 +38,7 @@ #define UGREP_HPP // ugrep version -#define UGREP_VERSION "4.5.0" +#define UGREP_VERSION "4.5.1" // disable mmap because mmap is almost always slower than the file reading speed improvements since 3.0.0 #define WITH_NO_MMAP Binary files old/ugrep-4.5.0/tests/archive.7z and new/ugrep-4.5.1/tests/archive.7z differ Binary files old/ugrep-4.5.0/tests/archive.gz and new/ugrep-4.5.1/tests/archive.gz differ Binary files old/ugrep-4.5.0/tests/archive.tar.zip and new/ugrep-4.5.1/tests/archive.tar.zip differ Binary files old/ugrep-4.5.0/tests/archive.tgz and new/ugrep-4.5.1/tests/archive.tgz differ Binary files old/ugrep-4.5.0/tests/archive2.tgz and new/ugrep-4.5.1/tests/archive2.tgz differ Binary files old/ugrep-4.5.0/tests/archive3.tgz and new/ugrep-4.5.1/tests/archive3.tgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/tests/gen.sh new/ugrep-4.5.1/tests/gen.sh --- old/ugrep-4.5.0/tests/gen.sh 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/tests/gen.sh 2024-01-06 15:02:32.000000000 +0100 @@ -160,6 +160,7 @@ bzip3 -c archive.tar > archive.tar.bz3 zip -9 -q archive.tar.zip archive.tar zip -9 -q archive.zip $FILES +7z a archive.7z $FILES > /dev/null tar cfz archive2.tgz archive.tar $FILES archive.tgz tar cfz archive3.tgz archive.tgz $FILES archive2.tgz @@ -171,6 +172,7 @@ $UG -z -c Hello archive.tZ > out/archive.tZ.out $UG -z -c Hello archive.tar.zip > out/archive.tar.zip.out $UG -z -c Hello archive.zip > out/archive.zip.out +$UG -z -c Hello archive.7z > out/archive.7z.out $UG -z -c Hello archive.tbz > out/archive.tbz.out $UG -z -c Hello archive.tlz > out/archive.tlz.out $UG -z -c Hello archive.txz > out/archive.txz.out @@ -186,6 +188,7 @@ $UG -z -c -tShell Hello archive.tZ > out/archive-t.tZ.out $UG -z -c -tShell Hello archive.tar.zip > out/archive-t.tar.zip.out $UG -z -c -tShell Hello archive.zip > out/archive-t.zip.out +$UG -z -c -tShell Hello archive.7z > out/archive-t.7z.out $UG -z -c -tShell Hello archive.tbz > out/archive-t.tbz.out $UG -z -c -tShell Hello archive.tlz > out/archive-t.tlz.out $UG -z -c -tShell Hello archive.txz > out/archive-t.txz.out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/tests/out/archive.7z.out new/ugrep-4.5.1/tests/out/archive.7z.out --- old/ugrep-4.5.0/tests/out/archive.7z.out 1970-01-01 01:00:00.000000000 +0100 +++ new/ugrep-4.5.1/tests/out/archive.7z.out 2024-01-06 15:02:32.000000000 +0100 @@ -0,0 +1,8 @@ +[1;35marchive.7z{empty.txt}[m[1;36m:[m0 +[1;35marchive.7z{Hello.bat}[m[1;36m:[m1 +[1;35marchive.7z{Hello.class}[m[1;36m:[m1 +[1;35marchive.7z{Hello.java}[m[1;36m:[m2 +[1;35marchive.7z{Hello.pdf}[m[1;36m:[m1 +[1;35marchive.7z{Hello.sh}[m[1;36m:[m1 +[1;35marchive.7z{Hello.txt}[m[1;36m:[m1 +[1;35marchive.7z{emptyline.txt}[m[1;36m:[m0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-4.5.0/tests/verify.sh new/ugrep-4.5.1/tests/verify.sh --- old/ugrep-4.5.0/tests/verify.sh 2024-01-05 17:07:34.000000000 +0100 +++ new/ugrep-4.5.1/tests/verify.sh 2024-01-06 15:02:32.000000000 +0100 @@ -384,6 +384,8 @@ $UG -z -c Hello archive.tar.zip | $DIFF out/archive.tar.zip.out || ERR "-z -c Hello archive.tar.zip" printf . $UG -z -c Hello archive.zip | $DIFF out/archive.zip.out || ERR "-z -c Hello archive.zip" +printf . +$UG -z -c Hello archive.7z | $DIFF out/archive.7z.out || ERR "-z -c Hello archive.7z" if [ "$have_libbz2" == yes ]; then printf . $UG -z -c Hello archive.tbz | $DIFF out/archive.tbz.out || ERR "-z -c Hello archive.tbz" @@ -427,6 +429,8 @@ $UG -z -c -tShell Hello archive.tar.zip | $DIFF out/archive-t.tar.zip.out || ERR "-z -c -tShell Hello archive.tar.zip" printf . $UG -z -c -tShell Hello archive.zip | $DIFF out/archive-t.zip.out || ERR "-z -c -tShell Hello archive.zip" +printf . +$UG -z -c -tShell Hello archive.7z | $DIFF out/archive-t.7z.out || ERR "-z -c -tShell Hello archive.7z" if [ "$have_libbz2" == yes ]; then printf . $UG -z -c -tShell Hello archive.tbz | $DIFF out/archive-t.tbz.out || ERR "-z -c -tShell Hello archive.tbz"
