Attachment 224962 Details for Bug 255835 – Update SOGo to version 5.1.0

[patch] Update SOGo to version 5.1.0

sogo-5.1.0_1.diff (text/plain), 13.70 KB, created by Martin Waschbüsch on 2021-05-15 08:45:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Waschbüsch

Created: 2021-05-15 08:45:37 UTC

Size: 13.70 KB

patch

obsolete

>diff --git a/www/sogo/Makefile b/www/sogo/Makefile
>index 98c113e0c..4ace56124 100644
>--- a/www/sogo/Makefile
>+++ b/www/sogo/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=		sogo
>-PORTVERSION=		5.0.1
>+PORTVERSION=		5.1.0
> PORTREVISION=		1
> CATEGORIES=		www gnustep
> MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
>diff --git a/www/sogo/distinfo b/www/sogo/distinfo
>index 84c5f798a..f53b35990 100644
>--- a/www/sogo/distinfo
>+++ b/www/sogo/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1606284903
>-SHA256 (SOGo-5.0.1.tar.gz) = e2af4b0b1642dc6094043360bb4b3f3a653d63029139d5c41ed0585ac1b944ed
>-SIZE (SOGo-5.0.1.tar.gz) = 34678734
>+TIMESTAMP = 1620893722
>+SHA256 (SOGo-5.1.0.tar.gz) = dd4780be9aaa4c197e4c489c7a13280401c11fc4483b0a5da505cb6c8f1f5ca3
>+SIZE (SOGo-5.1.0.tar.gz) = 34365333
>diff --git a/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartEncryptedViewer.m b/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartEncryptedViewer.m
>index af912631d..67cb587c6 100644
>--- a/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartEncryptedViewer.m
>+++ b/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartEncryptedViewer.m
>@@ -1,5 +1,5 @@
>---- UI/MailPartViewers/UIxMailPartEncryptedViewer.m	2019-12-09 16:41:38.841316000 -0500
>-+++ UI/MailPartViewers/UIxMailPartEncryptedViewer.m	2019-12-09 16:42:17.792368000 -0500
>+--- UI/MailPartViewers/UIxMailPartEncryptedViewer.m.orig	2021-03-31 02:00:31 UTC
>++++ UI/MailPartViewers/UIxMailPartEncryptedViewer.m
> @@ -171,13 +171,13 @@
>        if (err)
>          {
>@@ -9,7 +9,7 @@
>  	  ERR_load_crypto_strings();
>            SSL_load_error_strings();
>            sslError = ERR_reason_error_string(err);
>-           validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
>+           validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain];
>  #elif OPENSSL_VERSION_NUMBER < 0x10100000L
> -          const char* sslError;
> +          NSString* sslError;
>diff --git a/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m b/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m
>index 507a2be2e..5989ee1a5 100644
>--- a/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m
>+++ b/www/sogo/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m
>@@ -1,5 +1,5 @@
>---- UI/MailPartViewers/UIxMailPartSignedViewer.m	2018-10-23 14:22:36.000000000 -0500
>-+++ UI/MailPartViewers/UIxMailPartSignedViewer.m	2018-11-06 13:02:05.090224000 -0500
>+--- UI/MailPartViewers/UIxMailPartSignedViewer.m.orig	2021-03-31 02:00:31 UTC
>++++ UI/MailPartViewers/UIxMailPartSignedViewer.m
> @@ -169,13 +169,13 @@
>        if (err)
>          {
>@@ -9,7 +9,7 @@
>  	  ERR_load_crypto_strings();
>            SSL_load_error_strings();
>            sslError = ERR_reason_error_string(err);
>-           validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
>+           validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain];
>  #elif OPENSSL_VERSION_NUMBER < 0x10100000L
> -          const char* sslError;
> +          NSString* sslError;
>diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist
>index 3ad55f97c..750c72b91 100644
>--- a/www/sogo/pkg-plist
>+++ b/www/sogo/pkg-plist
>@@ -308,6 +308,7 @@ GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/Noronha.ics
> GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/North_Dakota/Beulah.ics
> GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/North_Dakota/Center.ics
> GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/North_Dakota/New_Salem.ics
>+GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/Nuuk.ics
> GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/Ojinaga.ics
> GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/Panama.ics
> GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/America/Pangnirtung.ics
>@@ -736,8 +737,8 @@ GNUstep/Local/Library/Libraries/sogo/libSOGo.so
> GNUstep/Local/Library/Libraries/sogo/libSOGo.so.5
> GNUstep/Local/Library/Libraries/sogo/libSOGo.so.%%VERSION%%
> GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so
>-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.0
>-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.0.0
>+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.1
>+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.1.0
> GNUstep/Local/Library/OCSTypeModels/appointment-oracle.ocs
> GNUstep/Local/Library/OCSTypeModels/appointment.ocs
> GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs
>@@ -778,6 +779,7 @@ GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Portuguese.lproj/Loca
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -823,6 +825,7 @@ GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Portuguese.lproj/Localiza
> GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -865,6 +868,7 @@ GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Portuguese.lproj/Localizable.
> GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -908,6 +912,7 @@ GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Portuguese.lproj/Localizable.
> GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -950,6 +955,7 @@ GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Portuguese.lproj/Localizabl
> GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -993,6 +999,7 @@ GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Portuguese.lproj/Local
> GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -1150,6 +1157,10 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianForward.wo/SOGoM
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianForward.wo/SOGoMailSerbianForward.wod
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianReply.wo/SOGoMailSerbianReply.html
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianReply.wo/SOGoMailSerbianReply.wod
>+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianLatinForward.wo/SOGoMailSerbianLatinForward.html
>+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianLatinForward.wo/SOGoMailSerbianLatinForward.wod
>+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianLatinReply.wo/SOGoMailSerbianLatinReply.html
>+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianLatinReply.wo/SOGoMailSerbianLatinReply.wod
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.html
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.wod
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSlovakReply.wo/SOGoMailSlovakReply.html
>@@ -1183,6 +1194,7 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshForward.wo/SOGoMai
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.html
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.wod
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -1225,6 +1237,7 @@ GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Portuguese.lproj/Localizable.
> GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -1311,6 +1324,8 @@ GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/SOGoProfile-oracle.sql
> GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/SOGoProfile.sql
> GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Serbian.lproj/Locale
> GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/SerbianLatin.lproj/Locale
>+GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Locale
> GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Slovenian.lproj/Locale
>@@ -1361,6 +1376,7 @@ GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Portuguese.lproj/Localiz
> GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
>@@ -1403,6 +1419,7 @@ GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Portuguese.lproj/Localizab
> GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Romanian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Russian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Serbian.lproj/Localizable.strings
>+GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/SerbianLatin.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Slovak.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
> GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings

Flags:

martin: maintainer-approval? (acm)

Actions: View | Diff

Attachments on bug 255835: 224896 | 224962