Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qore-mysql-module for openSUSE:Factory checked in at 2021-11-23 22:10:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qore-mysql-module (Old) and /work/SRC/openSUSE:Factory/.qore-mysql-module.new.1895 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qore-mysql-module" Tue Nov 23 22:10:25 2021 rev:7 rq:928310 version:2.0.2.1+qore1.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/qore-mysql-module/qore-mysql-module.changes 2021-08-01 21:51:39.439234662 +0200 +++ /work/SRC/openSUSE:Factory/.qore-mysql-module.new.1895/qore-mysql-module.changes 2021-11-23 22:12:38.174467989 +0100 @@ -1,0 +2,6 @@ +Thu Oct 28 18:58:40 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to version 2.0.2.1 for qore 1.0.10 + * Use supported APIs for string operations + +------------------------------------------------------------------- Old: ---- module-mysql-release-0.9.15.tar.gz New: ---- module-mysql-release-1.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qore-mysql-module.spec ++++++ --- /var/tmp/diff_new_pack.1sNGWu/_old 2021-11-23 22:12:38.722466177 +0100 +++ /var/tmp/diff_new_pack.1sNGWu/_new 2021-11-23 22:12:38.726466165 +0100 @@ -16,7 +16,7 @@ # -%define qore_version 0.9.15 +%define qore_version 1.0.10 %define src_name module-mysql-release-%{qore_version} %define module_api %(qore --latest-module-api 2>/dev/null) Name: qore-mysql-module @@ -33,7 +33,7 @@ BuildRequires: gcc-c++ BuildRequires: libmysqlclient-devel BuildRequires: qore -BuildRequires: qore-devel >= 0.9 +BuildRequires: qore-devel >= %{qore_version} Requires: %{_bindir}/env Requires: qore-module(abi)%{?_isa} = %{module_api} @@ -57,8 +57,7 @@ %build %cmake -%cmake_build -make %{?_smp_mflags} docs +%make_build docs %install %cmake_install ++++++ module-mysql-release-0.9.15.tar.gz -> module-mysql-release-1.0.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/module-mysql-release-0.9.15/.gitlab-ci.yml new/module-mysql-release-1.0.10/.gitlab-ci.yml --- old/module-mysql-release-0.9.15/.gitlab-ci.yml 2021-01-23 18:09:50.000000000 +0100 +++ new/module-mysql-release-1.0.10/.gitlab-ci.yml 2021-04-11 13:50:36.000000000 +0200 @@ -1,27 +1,48 @@ stages: - test -test: - stage: test - image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:5.0 +default: tags: - docker-exec services: - name: dnhsoft/mysql-utf8:5.7-mb4 alias: mysql - variables: - MYSQL_DATABASE: omq - MYSQL_ROOT_PASSWORD: omq - QORE_DB_CONNSTR_MYSQL: 'mysql:root/omq@omq(UTF8)%mysql' - REPO_NAME: module-mysql - script: + before_script: - | curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \ -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \ -d "{\"state\": \"pending\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}" + - set +e + +variables: + MYSQL_DATABASE: omq + MYSQL_ROOT_PASSWORD: omq + QORE_DB_CONNSTR_MYSQL: 'mysql:root/omq@omq(UTF8)%mysql' + REPO_NAME: module-mysql + +test-ubuntu: + stage: test + image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:develop + script: + - | + if test/docker_test/test-ubuntu.sh; then + curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \ + -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \ + -d "{\"state\": \"success\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}" + exit 0 + else + curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \ + -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \ + -d "{\"state\": \"failure\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}" + exit 1 + fi + +test-alpine: + stage: test + image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:develop-alpine + script: - | - set +e - if test/docker_test/test.sh; then + if test/docker_test/test-alpine.sh; then curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \ -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \ -d "{\"state\": \"success\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/module-mysql-release-0.9.15/CMakeLists.txt new/module-mysql-release-1.0.10/CMakeLists.txt --- old/module-mysql-release-0.9.15/CMakeLists.txt 2021-01-23 18:09:50.000000000 +0100 +++ new/module-mysql-release-1.0.10/CMakeLists.txt 2021-04-11 13:50:36.000000000 +0200 @@ -63,7 +63,7 @@ set(module_name "mysql") -add_library(${module_name} SHARED ${CPP_SRC}) +add_library(${module_name} MODULE ${CPP_SRC}) qore_binary_module(${module_name} ${PROJECT_VERSION} ${MySQL_LIBS_R} Threads::Threads) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/module-mysql-release-0.9.15/src/mysql.cpp new/module-mysql-release-1.0.10/src/mysql.cpp --- old/module-mysql-release-0.9.15/src/mysql.cpp 2021-01-23 18:09:50.000000000 +0100 +++ new/module-mysql-release-1.0.10/src/mysql.cpp 2021-04-11 13:50:36.000000000 +0200 @@ -676,7 +676,7 @@ p++; if ((*p) == 'd') { DBI_concat_numeric(&tmp, v); - str->replace(offset, 2, &tmp); + str->replace(offset, 2, tmp.c_str()); p = str->getBuffer() + offset + tmp.strlen(); tmp.clear(); continue; @@ -684,7 +684,7 @@ if ((*p) == 's') { if (DBI_concat_string(&tmp, v, xsink)) return -1; - str->replace(offset, 2, &tmp); + str->replace(offset, 2, tmp.c_str()); p = str->getBuffer() + offset + tmp.strlen(); tmp.clear(); continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/module-mysql-release-0.9.15/test/docker_test/test-alpine.sh new/module-mysql-release-1.0.10/test/docker_test/test-alpine.sh --- old/module-mysql-release-0.9.15/test/docker_test/test-alpine.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/module-mysql-release-1.0.10/test/docker_test/test-alpine.sh 2021-04-11 13:50:36.000000000 +0200 @@ -0,0 +1,52 @@ +#!/bin/bash + +set -e +set -x + +ENV_FILE=/tmp/env.sh + +. ${ENV_FILE} + +# setup MODULE_SRC_DIR env var +cwd=`pwd` +if [ -z "${MODULE_SRC_DIR}" ]; then + if [ -e "$cwd/src/qore-mysql-module.h" ] || [ -e "$cwd/src/mysql.cpp" ]; then + MODULE_SRC_DIR=$cwd + else + MODULE_SRC_DIR=$WORKDIR/module-mysql + fi +fi +echo "export MODULE_SRC_DIR=${MODULE_SRC_DIR}" >> ${ENV_FILE} + +echo "export QORE_UID=1000" >> ${ENV_FILE} +echo "export QORE_GID=1000" >> ${ENV_FILE} + +. ${ENV_FILE} + +export MAKE_JOBS=4 + +# build module and install +echo && echo "-- building module --" +mkdir -p ${MODULE_SRC_DIR}/build +cd ${MODULE_SRC_DIR}/build +cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} +make -j${MAKE_JOBS} +make install + +# add Qore user and group +if ! grep -q "^qore:x:${QORE_GID}" /etc/group; then + addgroup -g ${QORE_GID} qore +fi +if ! grep -q "^qore:x:${QORE_UID}" /etc/passwd; then + adduser -u ${QORE_UID} -D -G qore -h /home/qore -s /bin/bash qore +fi + +# own everything by the qore user +chown -R qore:qore ${MODULE_SRC_DIR} + +# run the tests +export QORE_MODULE_DIR=${MODULE_SRC_DIR}/qlib:${QORE_MODULE_DIR} +cd ${MODULE_SRC_DIR} +for test in test/*.qtest; do + gosu qore:qore qore $test -vv +done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/module-mysql-release-0.9.15/test/docker_test/test-ubuntu.sh new/module-mysql-release-1.0.10/test/docker_test/test-ubuntu.sh --- old/module-mysql-release-0.9.15/test/docker_test/test-ubuntu.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/module-mysql-release-1.0.10/test/docker_test/test-ubuntu.sh 2021-04-11 13:50:36.000000000 +0200 @@ -0,0 +1,48 @@ +#!/bin/bash + +set -e +set -x + +ENV_FILE=/tmp/env.sh + +. ${ENV_FILE} + +# setup MODULE_SRC_DIR env var +cwd=`pwd` +if [ -z "${MODULE_SRC_DIR}" ]; then + if [ -e "$cwd/src/qore-mysql-module.h" ] || [ -e "$cwd/src/mysql.cpp" ]; then + MODULE_SRC_DIR=$cwd + else + MODULE_SRC_DIR=$WORKDIR/module-mysql + fi +fi +echo "export MODULE_SRC_DIR=${MODULE_SRC_DIR}" >> ${ENV_FILE} + +echo "export QORE_UID=999" >> ${ENV_FILE} +echo "export QORE_GID=999" >> ${ENV_FILE} + +. ${ENV_FILE} + +export MAKE_JOBS=4 + +# build module and install +echo && echo "-- building module --" +cd ${MODULE_SRC_DIR} +./reconf.sh +./configure --enable-debug --prefix=${INSTALL_PREFIX} +make -j${MAKE_JOBS} +make install + +# add Qore user and group +groupadd -o -g ${QORE_GID} qore +useradd -o -m -d /home/qore -u ${QORE_UID} -g ${QORE_GID} qore + +# own everything by the qore user +chown -R qore:qore ${MODULE_SRC_DIR} + +# run the tests +export QORE_MODULE_DIR=${MODULE_SRC_DIR}/qlib:${QORE_MODULE_DIR} +cd ${MODULE_SRC_DIR} +for test in test/*.qtest; do + gosu qore:qore qore $test -vv +done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/module-mysql-release-0.9.15/test/docker_test/test.sh new/module-mysql-release-1.0.10/test/docker_test/test.sh --- old/module-mysql-release-0.9.15/test/docker_test/test.sh 2021-01-23 18:09:50.000000000 +0100 +++ new/module-mysql-release-1.0.10/test/docker_test/test.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -#!/bin/bash - -set -e -set -x - -ENV_FILE=/tmp/env.sh - -. ${ENV_FILE} - -# setup MODULE_SRC_DIR env var -cwd=`pwd` -if [ "${MODULE_SRC_DIR}" = "" ]; then - if [ -e "$cwd/src/qore-mysql-module.h" ] || [ -e "$cwd/src/mysql.cpp" ]; then - MODULE_SRC_DIR=$cwd - else - MODULE_SRC_DIR=$WORKDIR/module-mysql - fi -fi -echo "export MODULE_SRC_DIR=${MODULE_SRC_DIR}" >> ${ENV_FILE} - -echo "export QORE_UID=999" >> ${ENV_FILE} -echo "export QORE_GID=999" >> ${ENV_FILE} - -. ${ENV_FILE} - -export MAKE_JOBS=4 - -# build module and install -echo && echo "-- building module --" -cd ${MODULE_SRC_DIR} -./reconf.sh -./configure --enable-debug --prefix=${INSTALL_PREFIX} -make -j${MAKE_JOBS} -make install - -# add Qore user and group -groupadd -o -g ${QORE_GID} qore -useradd -o -m -d /home/qore -u ${QORE_UID} -g ${QORE_GID} qore - -# own everything by the qore user -chown -R qore:qore ${MODULE_SRC_DIR} - -# run the tests -export QORE_MODULE_DIR=${MODULE_SRC_DIR}/qlib:${QORE_MODULE_DIR} -cd ${MODULE_SRC_DIR} -for test in test/*.qtest; do - gosu qore:qore qore $test -vv -done \ No newline at end of file