Projects
Kolab:16
cyrus-imapd
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 20
View file
cyrus-imapd.spec
Changed
@@ -63,6 +63,8 @@ ## ## Patches ## +Patch0001: 0001-dlist-Use-int8_t-in-dlist_parsemap.patch +Patch0002: 0002-Avoid-returning-1-as-255.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -263,6 +265,11 @@ sed -r -i -e 's/"berkeley(|-[a-z-]+)", //g' lib/imapoptions %endif +%if %{_arch} == "ppc64le" +%patch0001 -p1 +%patch0002 -p1 +%endif + # only to update config.* files autoreconf -vi || (libtoolize --force && autoreconf -vi)
View file
0001-dlist-Use-int8_t-in-dlist_parsemap.patch
Added
@@ -0,0 +1,35 @@ +From 18077fc3c77ab9d62e8691d853e5516a7a765281 Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Fri, 25 Aug 2017 15:17:27 +0200 +Subject: [PATCH 1/2] [dlist]: Use int8_t in dlist_parsemap() + +Resolves #2119 +--- + imap/dlist.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/imap/dlist.c b/imap/dlist.c +index c93b85c..83ae73d 100644 +--- a/imap/dlist.c ++++ b/imap/dlist.c +@@ -843,7 +843,7 @@ EXPORTED char dlist_parse(struct dlist **dlp, int parsekey, struct protstream *i + struct dlist *dl = NULL; + static struct buf kbuf; + static struct buf vbuf; +- int c; ++ int8_t c; + + /* handle the key if wanted */ + if (parsekey) { +@@ -957,7 +957,7 @@ EXPORTED int dlist_parsemap(struct dlist **dlp, int parsekey, + const char *base, unsigned len) + { + struct protstream *stream; +- char c; ++ int8_t c; + struct dlist *dl = NULL; + + stream = prot_readmap(base, len); +-- +1.8.3.1 +
View file
0002-Avoid-returning-1-as-255.patch
Added
@@ -0,0 +1,35 @@ +From 11ca677bada174536fa1f7074892b1aa0f04091a Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Fri, 25 Aug 2017 15:43:35 +0200 +Subject: [PATCH 2/2] Avoid returning -1 as 255 + +Resolves #2122 +--- + cunit/parse.testc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cunit/parse.testc b/cunit/parse.testc +index 281b249..dcaf920 100644 +--- a/cunit/parse.testc ++++ b/cunit/parse.testc +@@ -23,7 +23,7 @@ int wrap_getint32(const char *s, int32_t *valp) + { + struct protstream *prot; + char *b; +- int c; ++ int8_t c; + + b = xstrdup(s); /* work around bug in prot_ungetc */ + prot = prot_readmap(b, strlen(b)); +@@ -101,7 +101,7 @@ int wrap_getsint32(const char *s, int32_t *valp) + { + struct protstream *prot; + char *b; +- int c; ++ int8_t c; + + b = xstrdup(s); /* work around bug in prot_ungetc */ + prot = prot_readmap(b, strlen(b)); +-- +1.8.3.1 +
View file
cyr_systemd_helper
Changed
@@ -2,6 +2,18 @@ # get_config [config default] # extracts config option from config file +if [ ! -c /dev/null ]; then + exit 1 +fi + +if [ ! -r /dev/null -o ! -w /dev/null ]; then + exit 1 +fi + +if [ "$(stat -c %a /dev/null)" != "666" ]; then + chmod 666 /dev/null +fi + if [ -f /etc/sysconfig/cyrus-imapd ]; then . /etc/sysconfig/cyrus-imapd elif [ -f /etc/default/cyrus-imapd ]; then @@ -14,14 +26,6 @@ fi fi -if [ ! -b /dev/null ]; then - exit 1 -fi - -if [ ! -r /dev/null -o ! -w /dev/null ]; then - exit 1 -fi - get_config() { if conf=$(grep "^$1" /etc/imapd.conf); then echo $conf | cut -d: -f2
View file
cyrus-imapd.cvt_cyrusdb_all
Changed
@@ -6,6 +6,18 @@ exit 1 } +if [ ! -c /dev/null ]; then + exit 1 +fi + +if [ ! -r /dev/null -o ! -w /dev/null ]; then + exit 1 +fi + +if [ "$(stat -c %a /dev/null)" != "666" ]; then + chmod 666 /dev/null +fi + if [ -f /etc/sysconfig/cyrus-imapd ]; then . /etc/sysconfig/cyrus-imapd elif [ -f /etc/default/cyrus-imapd ]; then @@ -18,14 +30,6 @@ fi fi -if [ ! -b /dev/null ]; then - exit 1 -fi - -if [ ! -r /dev/null -o ! -w /dev/null ]; then - exit 1 -fi - # Ensure this script is run as the cyrus user. if [ -x "$(which runuser 2>/dev/null)" ]; then SWITCHUSER=runuser
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
.