Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
f2242bf2ee !13 【LTS升级】update libical to 3.0.8
Merge pull request !13 from yu_boyun/openEuler-20.03-LTS
2020-08-29 17:25:51 +08:00
yu_boyun
d0174d7acc update 2020-08-29 16:42:56 +08:00
openeuler-ci-bot
866d6b49b6 !3 libical: bugfix in oss-fuzz
Merge pull request !3 from orange-snn/master
2020-03-10 19:46:31 +08:00
orange-snn
85564b60c5 bugfix in oss-fuzz 2020-03-10 17:16:46 +08:00
orange-snn
17635af0d5 bugfix in oss-fuzz 2020-03-10 17:14:31 +08:00
openeuler-ci-bot
62af6d8a51 !2 libical: update to 3.0.4
Merge pull request !2 from orange-snn/init
2020-01-11 20:47:18 +08:00
songnannan
6393b0790e update to 3.0.4 2020-01-10 19:42:43 +08:00
openeuler-ci-bot
0e5f2efcff !1 add require tzdata
Merge pull request !1 from openeuler-net/init
2019-12-26 20:43:32 +08:00
zhangrui
308342ae67 init 2019-12-26 19:20:57 +08:00
dogsheng
752d58b33a Package init 2019-12-13 15:36:49 +08:00
5 changed files with 85 additions and 20 deletions

View File

@ -1,11 +0,0 @@
diff -up libical-3.0.3/src/libical-glib/tools/generator.c.covscan libical-3.0.3/src/libical-glib/tools/generator.c
--- libical-3.0.3/src/libical-glib/tools/generator.c.covscan 2018-07-19 15:53:11.291351554 +0200
+++ libical-3.0.3/src/libical-glib/tools/generator.c 2018-07-19 15:53:25.200351362 +0200
@@ -1142,7 +1142,6 @@ void generate_forward_declarations_heade
if (c == '$') {
if ((c = fgetc(in)) != '{' && c != '^') {
printf("The following char is not {");
- g_free (buffer);
fclose(in);
fclose(out);
return;

Binary file not shown.

BIN
libical-3.0.8.tar.gz Normal file

Binary file not shown.

View File

@ -0,0 +1,52 @@
From 3eacf85ec9dd638c2023c89c2a6cdf61107fc617 Mon Sep 17 00:00:00 2001
From: Kent Sutherland <git@ksuther.com>
Date: Fri, 14 Jun 2019 15:21:59 -0500
Subject: [PATCH] Fix timeout found by fuzzer (oss-fuzz issue 14881) strspn is
really slow compared to doing direct comparisons
---
src/libical/icalparser.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c
index fa92495..0530a4b 100644
--- a/src/libical/icalparser.c
+++ b/src/libical/icalparser.c
@@ -221,21 +221,29 @@ static void parser_decode_param_value(char *value)
char *in, *out;
for (in = out = value; *in; in++, out++) {
- if (*in == '^' && strspn(in+1, "n^'")) {
- switch (*++in) {
- case 'n':
+ int found_escaped_char = 0;
+
+ if(*in == '^'){
+ switch (*(in + 1)) {
+ case 'n':
*out = '\n';
+ found_escaped_char = 1;
break;
-
case '^':
*out = '^';
+ found_escaped_char = 1;
break;
case '\'':
*out = '"';
+ found_escaped_char = 1;
break;
}
- } else {
+ }
+
+ if(found_escaped_char) {
+ ++in;
+ } else {
*out = *in;
}
}
--
2.19.1

View File

@ -1,18 +1,19 @@
Name: libical
Version: 3.0.3
Release: 8
Version: 3.0.8
Release: 1
Summary: An Open Source implementation of the iCalendar protocols and protocol data formats.
License: LGPLv2 or MPLv2.0
URL: https://libical.github.io/libical/
Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch1: libical-3.0.3-covscan.patch
BuildRequires: gcc-c++ cmake gtk-doc perl-interpreter vala pkgconfig
BuildRequires: python3 python3-pip python3-gobject
BuildRequires: python3 python3-pip python3-gobject libxslt
BuildRequires: pkgconfig(icu-uc) pkgconfig(gobject-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(libxml-2.0) pkgconfig(icu-i18n)
Provides: libical-glib
Obsoletes: libical-glib
Requires: tzdata
Provides: libical-glib = %{version}-%{release}
Obsoletes: libical-glib < %{version}-%{release}
Patch0: libical-bugfix-timeout-found-by-fuzzer.patch
%description
Libical is an open source implementation of the IETF's iCalendar calendaring
@ -23,8 +24,10 @@ the component properties, parameters, and subcomponents.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Provides: libical-glib-doc, libical-glib-devel
Obsoletes: libical-glib-doc, libical-glib-devel
Provides: libical-glib-doc = %{version}-%{release}
Provides: libical-glib-devel = %{version}-%{release}
Obsoletes: libical-glib-doc < %{version}-%{release}
Obsoletes: libical-glib-devel < %{version}-%{release}
%description devel
Contains libraries and header files for libical.
@ -73,5 +76,26 @@ make test ARGS="-V" -C %{_target_platform}
%{_datadir}/gtk-doc/html/%{name}-glib
%changelog
* Wed Aug 19 2020 yuboyun <yuboyun@huawei.com> - 3.0.8-1
- Type:update
- Id:NA
- SUG:NA
- DESC:update to 3.0.8
* Tue Mar 10 2020 songnannan <songnannan2@huawei.com> - 3.0.4-2
- bugfix in oss-fuzz
* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.0.4-1
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:updtae to 3.0.4
* Thu Dec 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.0.3-9
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:add require tzdata
* Sat Sep 14 2019 chenzhenyu <chenzhenyu13@huawei.com> - 3.0.3-8
- Package init