Skip to content

Commit

Permalink
Fix CalDAV invalid encoding
Browse files Browse the repository at this point in the history 
See [1][2].

[1] https://www.sogo.nu/bugs/view.php?id=5416
[2] gnustep/libs-base#212
  • Loading branch information
@Frederick888
Frederick888 committed Oct 27, 2021
1 parent 0e52a20 commit 7e518ed
Show file tree
Hide file tree
Showing 3 changed files with 235 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Dockerfile
View file
Expand Up @@ -6,6 +6,11 @@ RUN useradd -r build -G wheel

RUN mkdir /build

COPY ./gnustep-base /build/gnustep-base
RUN chown -R build /build/gnustep-base
WORKDIR /build/gnustep-base
RUN sudo -u build makepkg -is --noconfirm && rm -rf /build/gnustep-base && yes | pacman -Sccq

WORKDIR /build
RUN git clone --depth 1 https://aur.archlinux.org/libwbxml.git
RUN chown -R build ./libwbxml
Expand Down
45 changes: 45 additions & 0 deletions gnustep-base/PKGBUILD
View file
@@ -0,0 +1,45 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Sebastian Sareyko <public@nooms.de>

pkgname=gnustep-base
pkgver=1.28.0
pkgrel=2
pkgdesc="The GNUstep base package"
arch=('x86_64')
url="http://www.gnustep.org/"
license=("GPL" "LGPL")
depends=(libxslt avahi gmp gcc-libs openssl libffi gnutls icu)
makedepends=(gcc-objc gnustep-make)
groups=('gnustep-core')
options=('!emptydirs' '!makeflags')
source=(https://github.com/gnustep/libs-base/releases/download/base-${pkgver//./_}/gnustep-base-${pkgver}.tar.gz
https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4.patch
icu68.patch)
sha256sums=('c7d7c6e64ac5f5d0a4d5c4369170fc24ed503209e91935eb0e2979d1601039ed'
'd78be9d4ed3b00b1622c94289335716133e53d1f68bf8cd755fa3fa3deeed1b5'
'0b38c3df1a150bc64fb4f37cd92cfc63fa7c0741a77eca940fb992942858d7d0')
validpgpkeys=('83AAE47CE829A4146EF83420CA868D4C99149679')

prepare() {
cd "$srcdir/$pkgname-$pkgver"
patch -Np0 -i ../icu68.patch
patch -RNp1 -i ../bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4.patch
}

build() {
cd "$srcdir/$pkgname-$pkgver"
source /usr/share/GNUstep/Makefiles/GNUstep.sh
./configure --prefix=/usr --sysconfdir=/etc/GNUstep \
--with-ffi-include=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/
# fix file ownership
sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble
sed -i 's|.*gnutls_transport_set_lowat.*||' Source/GSSocketStream.m
make
}

package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
chown -R root.root "$pkgdir/"
}
185 changes: 185 additions & 0 deletions gnustep-base/icu68.patch
View file
@@ -0,0 +1,185 @@
Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844

GSICUString.m:71:18: error: use of undeclared identifier 'TRUE'
return TRUE;
^
GSICUString.m:80:18: error: use of undeclared identifier 'FALSE'
return FALSE;
^
GSICUString.m:104:18: error: use of undeclared identifier 'TRUE'
return TRUE;
^
GSICUString.m:113:18: error: use of undeclared identifier 'FALSE'
return FALSE;
^
GSICUString.m:135:10: error: use of undeclared identifier 'TRUE'
return TRUE;
^
GSICUString.m:170:66: error: use of undeclared identifier 'TRUE'
UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE);
^
NSRegularExpression.m:185:29: error: use of undeclared identifier 'FALSE'
utext_clone(&str->txt, t, FALSE, TRUE, &s);
^
NSRegularExpression.m:185:36: error: use of undeclared identifier 'TRUE'
utext_clone(&str->txt, t, FALSE, TRUE, &s);
^
NSRegularExpression.m:842:34: error: use of undeclared identifier 'TRUE'
utext_clone(&ret->txt, output, TRUE, TRUE, &s);
^
NSRegularExpression.m:842:40: error: use of undeclared identifier 'TRUE'
utext_clone(&ret->txt, output, TRUE, TRUE, &s);
^
NSRegularExpression.m:876:34: error: use of undeclared identifier 'TRUE'
utext_clone(&ret->txt, output, TRUE, TRUE, &s);
^
NSRegularExpression.m:876:40: error: use of undeclared identifier 'TRUE'
utext_clone(&ret->txt, output, TRUE, TRUE, &s);
^
NSRegularExpression.m:914:34: error: use of undeclared identifier 'TRUE'
utext_clone(&ret->txt, output, TRUE, TRUE, &s);
^
NSRegularExpression.m:914:40: error: use of undeclared identifier 'TRUE'
utext_clone(&ret->txt, output, TRUE, TRUE, &s);
^
NSRegularExpression.m:291:14: error: use of undeclared identifier 'FALSE'
return FALSE;
^
NSRegularExpression.m:368:36: error: use of undeclared identifier 'FALSE'
uregex_useAnchoringBounds(r, FALSE, &s);
^
NSRegularExpression.m:372:38: error: use of undeclared identifier 'TRUE'
uregex_useTransparentBounds(r, TRUE, &s);
^

--- Source/GSICUString.m.orig 2019-01-06 22:33:45 UTC
+++ Source/GSICUString.m
@@ -68,7 +68,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
* to match it.
*/
ut->chunkOffset = nativeIndex - nativeStart;
- return TRUE;
+ return true;
}

if (nativeIndex >= length && nativeLimit >= length)
@@ -77,7 +77,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
* Limit it to point just after the last character.
*/
ut->chunkOffset = ut->chunkLength;
- return FALSE;
+ return false;
}

/* Set up to fill the chunk with characters from the string
@@ -101,7 +101,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
* to match it.
*/
ut->chunkOffset = nativeIndex - nativeStart;
- return TRUE;
+ return true;
}

if (nativeIndex <= 0 && nativeStart <= 0)
@@ -110,7 +110,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
* Limit it to position of the first character.
*/
ut->chunkOffset = 0;
- return FALSE;
+ return false;
}

nativeLimit = nativeIndex;
@@ -132,7 +132,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
ut->chunkNativeStart = nativeStart;
ut->nativeIndexingLimit = r.length;
ut->chunkLength = r.length;
- return TRUE;
+ return true;
}

/**
@@ -167,7 +167,7 @@ UTextNSMutableStringReplace(UText *ut,
// Setting the chunk length to 0 here forces UTextNSStringAccess to fetch
// the data from the string object.
ut->chunkLength = 0;
- UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE);
+ UTextNSStringAccess(ut, r.location + [replacement length] + 1, true);
ut->chunkOffset++;

[replacement release];
--- Source/NSRegularExpression.m.orig 2019-01-06 22:33:45 UTC
+++ Source/NSRegularExpression.m
@@ -182,7 +182,7 @@ NSRegularExpressionOptionsToURegexpFlags(NSRegularExpr
return nil;
}
str = [GSUTextString new];
- utext_clone(&str->txt, t, FALSE, TRUE, &s);
+ utext_clone(&str->txt, t, false, true, &s);
return [str autorelease];
}
#else
@@ -288,7 +288,7 @@ callback(const void *context, int32_t steps)

if (NULL == context)
{
- return FALSE;
+ return false;
}
CALL_BLOCK(block, nil, NSMatchingProgress, &stop);
return stop;
@@ -365,11 +365,11 @@ setupRegex(URegularExpression *regex,
uregex_setRegion(r, range.location, range.location+range.length, &s);
if (options & NSMatchingWithoutAnchoringBounds)
{
- uregex_useAnchoringBounds(r, FALSE, &s);
+ uregex_useAnchoringBounds(r, false, &s);
}
if (options & NSMatchingWithTransparentBounds)
{
- uregex_useTransparentBounds(r, TRUE, &s);
+ uregex_useTransparentBounds(r, true, &s);
}
uregex_setTimeLimit(r, _workLimit, &s);
if (U_FAILURE(s))
@@ -401,11 +401,11 @@ setupRegex(URegularExpression *regex,
uregex_setRegion(r, range.location, range.location+range.length, &s);
if (options & NSMatchingWithoutAnchoringBounds)
{
- uregex_useAnchoringBounds(r, FALSE, &s);
+ uregex_useAnchoringBounds(r, false, &s);
}
if (options & NSMatchingWithTransparentBounds)
{
- uregex_useTransparentBounds(r, TRUE, &s);
+ uregex_useTransparentBounds(r, true, &s);
}
uregex_setTimeLimit(r, _workLimit, &s);
if (U_FAILURE(s))
@@ -839,7 +839,7 @@ prepareResult(NSRegularExpression *regex,
DESTROY(ret);
return 0;
}
- utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ utext_clone(&ret->txt, output, true, true, &s);
[string setString: ret];
[ret release];
uregex_close(r);
@@ -873,7 +873,7 @@ prepareResult(NSRegularExpression *regex,
DESTROY(ret);
return nil;
}
- utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ utext_clone(&ret->txt, output, true, true, &s);
uregex_close(r);

utext_close(&txt);
@@ -911,7 +911,7 @@ prepareResult(NSRegularExpression *regex,
DESTROY(ret);
return nil;
}
- utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ utext_clone(&ret->txt, output, true, true, &s);
uregex_close(r);

utext_close(&txt);

0 comments on commit 7e518ed

Please sign in to comment.