Projects
home:sicherha:branches:Kolab:16
guam
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 36
View file
guam.spec
Changed
@@ -31,6 +31,7 @@ Patch9991: make-it-very-easy-on-rebar3.patch Patch9992: guam-priv-no-delete.patch +Patch9993: use_iolist_to_binary.patch BuildRequires: erlang >= 17.4 BuildRequires: erlang-asn1 @@ -98,6 +99,7 @@ %patch9991 -p1 %patch9992 -p1 +%patch9993 -p1 sed -i 's/"0\.9\.0"/"%{version}"/' rebar.config @@ -228,6 +230,9 @@ %endif %changelog +* Sat Mar 21 2020 hede <kolab983@der-he.de> - 0.9.5-2 +- use iolist_to_binary() to convert iolist to binary + * Thu Dec 5 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.9.5-1 - Release of version 0.9.5
View file
use_iolist_to_binary.patch
Added
@@ -0,0 +1,26 @@ +Instead of converting the values from zlib:deflate to binary by hand we can use +the iolist_to_binary() function from erlang; this allows us to convert +also nested iolists. +diff -rupN guam-0.9.5.ori/apps/kolab_guam/src/kolab_guam_session.erl guam-0.9.5/apps/kolab_guam/src/kolab_guam_session.erl +--- guam-0.9.5.ori/apps/kolab_guam/src/kolab_guam_session.erl 2019-11-18 11:03:06.000000000 +0100 ++++ guam-0.9.5/apps/kolab_guam/src/kolab_guam_session.erl 2020-03-21 23:22:32.236604867 +0100 +@@ -238,17 +238,14 @@ process_client_data(Socket, Data, #state + preprocess_client_data(undefined, Data, #state{ buffered_client_data = Buffered }) -> + <<Buffered/binary, Data/binary>>; + preprocess_client_data(Z, Data, #state{ buffered_client_data = Buffered }) -> +- Inflated = joined(zlib:inflate(Z, Data), <<>>), ++ Inflated = iolist_to_binary(zlib:inflate(Z, Data)), + <<Buffered/binary, Inflated/binary>>. + + postprocess_server_data(undefined, Data) -> + %% we aren't compressing so there is nothing to do + Data; + postprocess_server_data(Z, Data) -> +- joined(zlib:deflate(Z, Data, sync), <<>>). +- +-joined([], Binary) -> Binary; +-joined([H|Rest], Binary) -> joined(Rest, <<Binary/binary, H/binary>>). ++ iolist_to_binary(zlib:deflate(Z, Data, sync)). + + init_rules(RuleConfig) -> init_rule(RuleConfig, []). + init_rule([], Acc) -> Acc;
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +guam (0.9.5-3) unstable; urgency=medium + + * use iolist_to_binary() to convert iolist to binary + + -- hede <kolab983@der-he.de> Sat, 21 Mar 2020 20:50:10 +0200 + guam (0.9.5-2) unstable; urgency=medium * Release of version 0.9.5
View file
debian.series
Changed
@@ -1,3 +1,4 @@ make-it-very-easy-on-rebar3.patch -p1 guam-priv-no-delete.patch -p1 use-vendorized-rebar3.patch -p1 +use_iolist_to_binary.patch -p1
View file
guam.dsc
Changed
@@ -2,7 +2,7 @@ Source: guam Binary: guam Architecture: any -Version: 0.9.5-2 +Version: 0.9.5-3 Maintainer: Christoph Erhardt <kolab@sicherha.de> Homepage: https://kolab.org/about/guam Standards-Version: 3.9.6
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.