Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libyajl for openSUSE:Factory checked
in at 2025-07-23 16:31:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyajl (Old)
and /work/SRC/openSUSE:Factory/.libyajl.new.8875 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyajl"
Wed Jul 23 16:31:43 2025 rev:27 rq:1295119 version:2.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyajl/libyajl.changes 2023-07-19
19:09:45.872261010 +0200
+++ /work/SRC/openSUSE:Factory/.libyajl.new.8875/libyajl.changes
2025-07-23 16:31:48.935631662 +0200
@@ -1,0 +2,10 @@
+Fri Jul 18 21:13:32 UTC 2025 - Christoph G <f...@grueninger.de>
+
+- Re-add removed braces for variables in spec file
+
+-------------------------------------------------------------------
+Fri Apr 25 12:34:56 UTC 2025 - o...@aepfle.de
+
+- handle cmake 4 with libyajl.patch (bsc#1239788)
+
+-------------------------------------------------------------------
New:
----
libyajl.patch
----------(New B)----------
New:
- handle cmake 4 with libyajl.patch (bsc#1239788)
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyajl.spec ++++++
--- /var/tmp/diff_new_pack.3dc07m/_old 2025-07-23 16:31:49.839667713 +0200
+++ /var/tmp/diff_new_pack.3dc07m/_new 2025-07-23 16:31:49.843667873 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libyajl
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,18 +29,18 @@
Source2: json_reformat.1
Source3: json_verify.1
Source99: %{name}-rpmlintrc
+Patch0: %{name}.patch
Patch1: libyajl-optflags.patch
Patch2: libyajl-lib_suffix.patch
Patch3: libyajl-pkgconfig.patch
Patch4: libyajl-CVE-2022-24795.patch
Patch5: libyajl-CVE-2023-33460.patch
BuildRequires: bison
-BuildRequires: cmake
+BuildRequires: cmake >= 3.10
BuildRequires: doxygen
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: pkg-config
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a
@@ -105,29 +105,23 @@
%check
make %{?_smp_mflags} test
-%post -n %{name}%{sover} -p /sbin/ldconfig
-
-%postun -n %{name}%{sover} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %{name}%{sover}
%files -n %{name}%{sover}
-%defattr(-,root,root)
%license COPYING
%{_libdir}/libyajl.so.%{sover}
%{_libdir}/libyajl.so.%{sover}.*
%files -n %{name}-devel
-%defattr(-,root,root)
%doc README TODO
%{_includedir}/yajl
%{_libdir}/libyajl.so
%{_libdir}/pkgconfig/yajl.pc
%files -n %{name}-devel-static
-%defattr(-,root,root)
%{_libdir}/libyajl_s.a
%files -n yajl
-%defattr(-,root,root)
%{_mandir}/man1/json_reformat.1*
%{_mandir}/man1/json_verify.1*
%{_bindir}/json_reformat
++++++ libyajl.patch ++++++
---
CMakeLists.txt | 2 +-
reformatter/CMakeLists.txt | 6 ------
reformatter/json_reformat.c | 7 ++++---
src/CMakeLists.txt | 2 +-
src/yajl_parser.c | 3 ++-
verify/CMakeLists.txt | 6 ------
6 files changed, 8 insertions(+), 18 deletions(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
PROJECT(YetAnotherJSONParser C)
--- a/reformatter/CMakeLists.txt
+++ b/reformatter/CMakeLists.txt
@@ -34,10 +34,4 @@ IF (NOT WIN32)
TARGET_LINK_LIBRARIES(json_reformat m)
ENDIF (NOT WIN32)
-# copy the binary into the output directory
-GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
-
-ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
-
INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin)
--- a/reformatter/json_reformat.c
+++ b/reformatter/json_reformat.c
@@ -188,9 +188,10 @@ main(int argc, char ** argv)
{
const unsigned char * buf;
size_t len;
- yajl_gen_get_buf(g, &buf, &len);
- fwrite(buf, 1, len, stdout);
- yajl_gen_clear(g);
+ if (yajl_gen_get_buf(g, &buf, &len) == yajl_gen_status_ok) {
+ fwrite(buf, 1, len, stdout);
+ yajl_gen_clear(g);
+ }
}
}
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,7 +67,7 @@ CONFIGURE_FILE(yajl.pc.cmake ${shareDir}
FOREACH (header ${PUB_HDRS})
SET (header ${CMAKE_CURRENT_SOURCE_DIR}/${header})
- EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir})
+ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header}
${incDir})
ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir})
--- a/src/yajl_parser.c
+++ b/src/yajl_parser.c
@@ -342,8 +342,8 @@ yajl_do_parse(yajl_handle hand, const un
yajl_bs_pop(hand->stateStack);
goto around_again;
}
- /* intentional fall-through */
}
+ /* fall through */
case yajl_tok_colon:
case yajl_tok_comma:
case yajl_tok_right_bracket:
@@ -411,6 +411,7 @@ yajl_do_parse(yajl_handle hand, const un
yajl_bs_pop(hand->stateStack);
goto around_again;
}
+ /* fall through */
default:
yajl_bs_set(hand->stateStack, yajl_state_parse_error);
hand->parseError =
--- a/verify/CMakeLists.txt
+++ b/verify/CMakeLists.txt
@@ -28,10 +28,4 @@ ADD_EXECUTABLE(json_verify ${SRCS})
TARGET_LINK_LIBRARIES(json_verify yajl_s)
-# copy in the binary
-GET_TARGET_PROPERTY(binPath json_verify LOCATION)
-
-ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
-
INSTALL(TARGETS json_verify RUNTIME DESTINATION bin)
