CVS commit: pkgsrc/www/SOGo

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Tue Jan 17 14:26:55 UTC 2023

Modified Files:
        pkgsrc/www/SOGo: Makefile distinfo
Added Files:
        pkgsrc/www/SOGo/patches: patch-SoObjects_SOGo_NSString+Utilities.m

Log Message:
Works around the CalDAV client breaking Byte-Order Mark that
gnustep-base adds starting with version 1.28


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/www/SOGo/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/SOGo/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/www/SOGo/patches/patch-SoObjects_SOGo_NSString+Utilities.m

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/SOGo/Makefile
diff -u pkgsrc/www/SOGo/Makefile:1.71 pkgsrc/www/SOGo/Makefile:1.72
--- pkgsrc/www/SOGo/Makefile:1.71       Wed Nov 23 16:21:17 2022
+++ pkgsrc/www/SOGo/Makefile    Tue Jan 17 14:26:54 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2022/11/23 16:21:17 adam Exp $
+# $NetBSD: Makefile,v 1.72 2023/01/17 14:26:54 manu Exp $
 #
 
 DISTNAME=      SOGo-2.3.23
-PKGREVISION=   25
+PKGREVISION=   26
 CATEGORIES=    www
 MASTER_SITES=  http://www.sogo.nu/files/downloads/SOGo/Sources/
 

Index: pkgsrc/www/SOGo/distinfo
diff -u pkgsrc/www/SOGo/distinfo:1.25 pkgsrc/www/SOGo/distinfo:1.26
--- pkgsrc/www/SOGo/distinfo:1.25       Tue Oct 26 11:29:16 2021
+++ pkgsrc/www/SOGo/distinfo    Tue Jan 17 14:26:54 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 11:29:16 nia Exp $
+$NetBSD: distinfo,v 1.26 2023/01/17 14:26:54 manu Exp $
 
 BLAKE2s (SOGo-2.3.23.tar.gz) = aecd571ec3401d41ccc392b51733e0e6697218c8f144c64858323f94ec5016a6
 SHA512 (SOGo-2.3.23.tar.gz) = abd2d0133b3e7db91e0e9426c76d65d32d9e47ab6a37dbc96213dabbd24d45f7bfc6835570c22355649d7651df9a36a6614d874b16dbd796bff4eabee0a48eb6
 Size (SOGo-2.3.23.tar.gz) = 12521303 bytes
 SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 2b121f06f409f9d8ddfb717e5b3d13547c7d18a0
+SHA1 (patch-SoObjects_SOGo_NSString+Utilities.m) = 56822bf44f52deed518716eba082433fe9467683
 SHA1 (patch-general.make) = d1517f3fc9133c7edb4293612b87674504d3ac5f

Added files:

Index: pkgsrc/www/SOGo/patches/patch-SoObjects_SOGo_NSString+Utilities.m
diff -u /dev/null pkgsrc/www/SOGo/patches/patch-SoObjects_SOGo_NSString+Utilities.m:1.3
--- /dev/null   Tue Jan 17 14:26:55 2023
+++ pkgsrc/www/SOGo/patches/patch-SoObjects_SOGo_NSString+Utilities.m   Tue Jan 17 14:26:54 2023
@@ -0,0 +1,32 @@
+$NetBSD: patch-SoObjects_SOGo_NSString+Utilities.m,v 1.3 2023/01/17 14:26:54 manu Exp $
+
+Works around the CalDAV client breaking Byte-Order Mark that 
+gnustep-base adds starting with version 1.28 
+
+From upstream
+https://github.com/Alinto/sogo/pull/324
+
+--- SoObjects/SOGo/NSString+Utilities.m.orig   2023-01-17 08:41:21.165930102 +0100
++++ SoObjects/SOGo/NSString+Utilities.m        2023-01-17 08:42:08.993684418 +0100
+@@ -346,9 +346,9 @@
+   unsigned escapeCount;
+ 
+   if ([self length] == 0) return @"";
+ 
+-  NSData *data = [self dataUsingEncoding:NSUTF32StringEncoding];
++  NSData *data = [self dataUsingEncoding:NSUTF32LittleEndianStringEncoding];
+   chars = [data bytes];
+   len = [data length]/4;
+ 
+   /* check for characters to escape ... */
+@@ -417,9 +417,9 @@
+   }
+ 
+   self = [[NSString alloc] initWithBytesNoCopy: buf
+                                         length: (j*sizeof(wchar_t))
+-                                      encoding: NSUTF32StringEncoding
++                                      encoding: NSUTF32LittleEndianStringEncoding
+                                   freeWhenDone: YES];
+ 
+   return [self autorelease];
+ }