Hello community, here is the log from the commit of package libical for openSUSE:Factory checked in at 2020-08-19 18:43:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libical (Old) and /work/SRC/openSUSE:Factory/.libical.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libical" Wed Aug 19 18:43:40 2020 rev:48 rq:826857 version:3.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/libical/libical.changes 2020-01-02 14:40:11.772884640 +0100 +++ /work/SRC/openSUSE:Factory/.libical.new.3399/libical.changes 2020-08-19 18:44:18.355448037 +0200 @@ -1,0 +2,12 @@ +Sat Apr 11 19:46:49 UTC 2020 - Bjørn Lie <[email protected]> + +- Update to version 3.0.8: + * Fix for icalattach_new_from_data() and the 'free_fn' argument. + * Fix if recurrencetype contains both COUNT and UNTIL (only + output UNTIL in the RRULE). +- Replace gcc-c++ with generic c++_compiler BuildRequires. +- Use cmake_build macro, forcing single thread building is no + longer needed. This breaks support for SLE12SP4, but that one is + superseeded by SP5 anyway. + +------------------------------------------------------------------- Old: ---- libical-3.0.7.tar.gz New: ---- libical-3.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libical.spec ++++++ --- /var/tmp/diff_new_pack.2TP3Rx/_old 2020-08-19 18:44:19.859448836 +0200 +++ /var/tmp/diff_new_pack.2TP3Rx/_new 2020-08-19 18:44:19.863448838 +0200 @@ -1,7 +1,7 @@ # # spec file for package libical # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -25,8 +25,9 @@ %define name_ext %{nil} %bcond_with glib %endif + Name: libical%{name_ext} -Version: 3.0.7 +Version: 3.0.8 Release: 0 %if %{without glib} Summary: An Implementation of Basic iCAL Protocols @@ -38,16 +39,18 @@ Group: Development/Libraries/C and C++ %endif URL: https://github.com/libical/libical -Source: https://github.com/libical/libical/releases/download/v%{version}/libical-%{version}.tar.gz +Source: %{url}/releases/download/v%{version}/libical-%{version}.tar.gz Source2: baselibs.conf Source3: libical-rpmlintrc + Patch1: 0001-vcc.y-factor-out-hexdigit-conversion.patch Patch2: 0002-vcc.y-fix-infinite-loop-with-lower-case-hex-digits.patch Patch3: 0003-vcc.y-fix-infinite-loop-with-non-hex-digits.patch Patch4: 0004-vobject.c-vCard-Unicode-reading-support.patch Patch5: 0005-vcc.y-do-not-ignore-field-separator-in-QUOTED-PRINTA.patch + +BuildRequires: c++_compiler BuildRequires: cmake >= 3.1 -BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(icu-i18n) %if %{with glib} @@ -164,7 +167,7 @@ -DICAL_GLIB=false \ %endif -DSHARED_ONLY=true -make -j1 +%cmake_build %install %cmake_install ++++++ libical-3.0.7.tar.gz -> libical-3.0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/CMakeLists.txt new/libical-3.0.8/CMakeLists.txt --- old/libical-3.0.7/CMakeLists.txt 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/CMakeLists.txt 2020-03-07 15:42:42.000000000 +0100 @@ -107,7 +107,7 @@ set(LIBICAL_LIB_MAJOR_VERSION "3") set(LIBICAL_LIB_MINOR_VERSION "0") -set(LIBICAL_LIB_PATCH_VERSION "7") +set(LIBICAL_LIB_PATCH_VERSION "8") set(LIBICAL_LIB_VERSION_STRING "${LIBICAL_LIB_MAJOR_VERSION}.${LIBICAL_LIB_MINOR_VERSION}.${LIBICAL_LIB_PATCH_VERSION}" ) @@ -118,6 +118,27 @@ # library build types set(LIBRARY_TYPE SHARED) +######################################################## + +option(WITH_CXX_BINDINGS "Build the C++ bindings." True) +if(WITH_CXX_BINDINGS) + enable_language(CXX) + if(CMAKE_CXX_COMPILER) + add_definitions(-DWITH_CXX_BINDINGS) + else() + message(STATUS + "Warning: Building the C++ bindings is not possible since a C++ compiler could not be found. " + "Turning-off C++ bindings" + ) + set(WITH_CXX_BINDINGS False) + endif() +endif() +add_feature_info( + "Option WITH_CXX_BINDINGS" + WITH_CXX_BINDINGS + "build the C++ bindings. Requires a C++ compiler" +) + option(STATIC_ONLY "Build static libraries only.") add_feature_info( "Option STATIC_ONLY" @@ -206,6 +227,7 @@ ) if(BDB_FOUND) set(HAVE_BDB True) + add_definitions(-DDB_DBM_HSEARCH=0) #set to 1 if hsearch support is needed endif() # MSVC specific definitions @@ -544,27 +566,6 @@ endif() endif() -######################################################## - -option(WITH_CXX_BINDINGS "Build the C++ bindings." True) -if(WITH_CXX_BINDINGS) - enable_language(CXX) - if(CMAKE_CXX_COMPILER) - add_definitions(-DWITH_CXX_BINDINGS) - else() - message(STATUS - "Warning: Building the C++ bindings is not possible since a C++ compiler could not be found. " - "Turning-off C++ bindings" - ) - set(WITH_CXX_BINDINGS False) - endif() -endif() -add_feature_info( - "Option WITH_CXX_BINDINGS" - WITH_CXX_BINDINGS - "build the C++ bindings. Requires a C++ compiler" -) - #some test programs need to know if we are using 32-bit time if(SIZEOF_TIME_T EQUAL 4) set(USE_32BIT_TIME_T TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/ReleaseNotes.txt new/libical-3.0.8/ReleaseNotes.txt --- old/libical-3.0.7/ReleaseNotes.txt 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/ReleaseNotes.txt 2020-03-07 15:42:42.000000000 +0100 @@ -1,8 +1,14 @@ Release Highlights ================== +Version 3.0.8 (07 March 2020): +------------------------------ + * Fix for icalattach_new_from_data() and the 'free_fn' argument + * Fix if recurrencetype contains both COUNT and UNTIL (only output UNTIL in the RRULE) + * libical-glib now requires glib 2.38 or higher + Version 3.0.7 (15 December 2019): ---------------------------- +--------------------------------- * libical-glib: Fix ICalAttach handling of the icalattach native structure * Let icalattach_new_from_data() use the 'free_fn' argument again * Fix memory leaks in attachment handling and elsewhere diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/scripts/buildtests.sh new/libical-3.0.8/scripts/buildtests.sh --- old/libical-3.0.7/scripts/buildtests.sh 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/scripts/buildtests.sh 2020-03-07 15:42:42.000000000 +0100 @@ -94,7 +94,7 @@ # print warnings found in the compile-stage output # $1 = file with the compile-stage output COMPILE_WARNINGS() { - whitelist='\(no[[:space:]]link[[:space:]]for:\|Value[[:space:]]descriptions\|unused[[:space:]]declarations\|g_type_class_add_private.*is[[:space:]]deprecated\|g-ir-scanner:\|clang.*argument[[:space:]]unused[[:space:]]during[[:space:]]compilation\|U_PLATFORM_HAS_WINUWP_API\|DB_DBM_HSEARCH\|const[[:space:]]DBT\|db\.h\)' + whitelist='\(no[[:space:]]link[[:space:]]for:\|Value[[:space:]]descriptions\|unused[[:space:]]declarations\|G_ADD_PRIVATE\|g_type_class_add_private.*is[[:space:]]deprecated\|g-ir-scanner:\|clang.*argument[[:space:]]unused[[:space:]]during[[:space:]]compilation\|U_PLATFORM_HAS_WINUWP_API\|const[[:space:]]DBT\)' CHECK_WARNINGS $1 "warning:" "$whitelist" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/libical/icalattach.c new/libical-3.0.8/src/libical/icalattach.c --- old/libical-3.0.7/src/libical/icalattach.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/libical/icalattach.c 2020-03-07 15:42:42.000000000 +0100 @@ -51,6 +51,12 @@ return attach; } +static void attach_data_free(char *data, void *free_fn_data) +{ + _unused(free_fn_data); + free(data); +} + icalattach *icalattach_new_from_data(const char *data, icalattach_free_fn_t free_fn, void *free_fn_data) { @@ -63,6 +69,16 @@ return NULL; } + if (!free_fn) { + data = strdup(data); + if (!data) { + free(attach); + errno = ENOMEM; + return NULL; + } + free_fn = attach_data_free; + } + attach->refcount = 1; attach->is_url = 0; attach->u.data.data = (char *) data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/libical/icalcomponent.c new/libical-3.0.8/src/libical/icalcomponent.c --- old/libical-3.0.7/src/libical/icalcomponent.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/libical/icalcomponent.c 2020-03-07 15:42:42.000000000 +0100 @@ -30,6 +30,7 @@ #include <assert.h> #include <stdlib.h> +#include <limits.h> struct icalcomponent_impl { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/libical/icalrecur.c new/libical-3.0.8/src/libical/icalrecur.c --- old/libical-3.0.7/src/libical/icalrecur.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/libical/icalrecur.c 2020-03-07 15:42:42.000000000 +0100 @@ -733,10 +733,6 @@ return 0; } - if (recur->until.year != 0 && recur->count != 0) { - return 0; - } - str = (char *)icalmemory_new_buffer(buf_sz); str_p = str; @@ -763,7 +759,7 @@ icalmemory_append_string(&str, &str_p, &buf_sz, temp); } - if (recur->count != 0) { + else if (recur->count != 0) { snprintf(temp, sizeof(temp), "%d", recur->count); icalmemory_append_string(&str, &str_p, &buf_sz, ";COUNT="); icalmemory_append_string(&str, &str_p, &buf_sz, temp); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/libical/icaltimezone.c new/libical-3.0.8/src/libical/icaltimezone.c --- old/libical-3.0.7/src/libical/icaltimezone.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/libical/icaltimezone.c 2020-03-07 15:42:42.000000000 +0100 @@ -36,6 +36,7 @@ #include <ctype.h> #include <stddef.h> /* for ptrdiff_t */ #include <stdlib.h> +#include <limits.h> #if defined(HAVE_PTHREAD) #include <pthread.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/libical/icaltz-util.c new/libical-3.0.8/src/libical/icaltz-util.c --- old/libical-3.0.7/src/libical/icaltz-util.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/libical/icaltz-util.c 2020-03-07 15:42:42.000000000 +0100 @@ -26,6 +26,7 @@ #include "icaltimezone.h" #include <stdlib.h> +#include <limits.h> #if defined(sun) && defined(__SVR4) #include <sys/types.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/libical-glib/api/i-cal-attach.xml new/libical-3.0.8/src/libical-glib/api/i-cal-attach.xml --- old/libical-3.0.7/src/libical-glib/api/i-cal-attach.xml 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/libical-glib/api/i-cal-attach.xml 2020-03-07 15:42:42.000000000 +0100 @@ -19,12 +19,6 @@ <returns type="ICalAttach *" annotation="transfer full" comment="The newly created #ICalAttach from the @url" /> <comment xml:space="preserve">Create a new #ICalAttach from the url</comment> </method> - <declaration position="body"> -static void icalglib_free_attach_data(gpointer data, gpointer user_data) -{ - _unused(user_data); - g_free (data); -}</declaration> <method name="i_cal_attach_new_from_data" corresponds="CUSTOM" kind="constructor" since="1.0"> <parameter type="const gchar *" name="data" comment="The data used to create the #ICalAttach"/> <parameter type="GFunc" name="free_fn" translator="(icalattach_free_fn_t)" annotation="scope call, allow-none" comment="The function used to free the data when the create #ICalAttach is detroyed."/> @@ -33,11 +27,6 @@ <comment xml:space="preserve">Create a new #ICalAttach from the data.</comment> <custom> g_return_val_if_fail (data != NULL, NULL); - if (!free_fn) { - data = g_strdup(data); - free_fn = icalglib_free_attach_data; - } - return i_cal_attach_new_full (icalattach_new_from_data (data, (icalattach_free_fn_t) (free_fn), free_fn_data), NULL);</custom> </method> <declaration position="body"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/libical-glib/tools/generator.c new/libical-3.0.8/src/libical-glib/tools/generator.c --- old/libical-3.0.7/src/libical-glib/tools/generator.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/libical-glib/tools/generator.c 2020-03-07 15:42:42.000000000 +0100 @@ -22,17 +22,16 @@ static FILE *open_file(const gchar *dir, const gchar *filename) { gchar *path; - FILE *tmpl; + FILE *tmpl = NULL; path = g_build_filename(dir, filename, NULL); - g_return_val_if_fail(path != NULL, NULL); - - tmpl = fopen(path, "rb"); - if (!tmpl) - fprintf(stderr, "Failed to open '%s'\n", path); - - g_free(path); + if (path) { + tmpl = fopen(path, "rb"); + if (!tmpl) + fprintf(stderr, "generator: Failed to open %s: %s\n", path, strerror(errno)); + g_free(path); + } return tmpl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/test/regression.c new/libical-3.0.8/src/test/regression.c --- old/libical-3.0.7/src/test/regression.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/test/regression.c 2020-03-07 15:42:42.000000000 +0100 @@ -2593,15 +2593,10 @@ rt = icalrecurrencetype_from_string(str); str_is(str, icalrecurrencetype_as_string(&rt), str); - str = "FREQ=DAILY;COUNT=3;BYDAY=-1TU,3WE,-4FR,SA,SU;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8"; - - rt = icalrecurrencetype_from_string(str); + /* Add COUNT and make sure its ignored in lieu of UNTIL */ + rt.count = 3; str_is(str, icalrecurrencetype_as_string(&rt), str); - /* Add UNTIL and make sure we output a NULL string */ - rt.until = icaltime_today(); - ok("COUNT + UNTIL not allowed", icalrecurrencetype_as_string(&rt) == NULL); - /* Try to create a new RRULE value with UNTIL + COUNT */ es = icalerror_supress("BADARG"); v = icalvalue_new_recur(rt); @@ -2609,6 +2604,11 @@ icalerror_restore("BADARG", es); ok("COUNT + UNTIL not allowed", rt.freq == ICAL_NO_RECURRENCE); + str = "FREQ=DAILY;COUNT=3;BYDAY=-1TU,3WE,-4FR,SA,SU;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8"; + + rt = icalrecurrencetype_from_string(str); + str_is(str, icalrecurrencetype_as_string(&rt), str); + /* Try to parse an RRULE value with UNTIL + COUNT */ str = "FREQ=YEARLY;UNTIL=20000131T090000Z;COUNT=3"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libical-3.0.7/src/test/testmime.c new/libical-3.0.8/src/test/testmime.c --- old/libical-3.0.7/src/test/testmime.c 2019-12-15 13:29:18.000000000 +0100 +++ new/libical-3.0.8/src/test/testmime.c 2020-03-07 15:42:42.000000000 +0100 @@ -86,7 +86,7 @@ int stress; int base64; int qp; - int sleep; + int sleepy; int count; char *input_file; } opt; @@ -138,7 +138,7 @@ } case 'S':{ /* sleep at end of run */ - opt.sleep = atoi(optarg); + opt.sleepy = atoi(optarg); break; } @@ -292,8 +292,8 @@ } } - if (opt.sleep != 0) { - sleep((unsigned int)opt.sleep); + if (opt.sleepy != 0) { + sleep((unsigned int)opt.sleepy); } if (opt.input_file != 0) {
