diff -Nru sope-5.8.2/ChangeLog sope-5.8.4/ChangeLog --- sope-5.8.2/ChangeLog 2023-03-28 08:16:06.000000000 +0000 +++ sope-5.8.4/ChangeLog 2023-06-20 10:08:43.000000000 +0000 @@ -1,3 +1,114 @@ +commit a1b624b +Author: smizrahi +Date: Tue Jun 13 16:55:22 2023 +0200 + + chore(packaging): Add rhel9 support + +M packaging/rhel/sope.spec + +commit 45b1e83 +Author: Hivert Quentin +Date: Tue May 30 12:21:32 2023 +0200 + + Update ChangeLog + +M ChangeLog + +commit aba7159 +Author: smizrahi +Date: Tue May 2 17:47:18 2023 +0200 + + core(sql): Avoid adding \ when % is in sql expression + +M sope-gdl1/GDLAccess/EOSQLExpression.m + +commit 879cfd1 +Author: smizrahi +Date: Mon Apr 17 23:30:09 2023 +0200 + + fix(core): Fix buffer overflow in http status. Closes #5734. + +M sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m + +commit 25d692e +Author: smizrahi +Date: Mon Feb 27 22:01:49 2023 +0100 + + fix(packaging): Specify compression format for dpkg-deb + +M packaging/debian/rules + +commit eaf3a0a +Author: smizrahi +Date: Mon Feb 27 18:38:13 2023 +0100 + + fix(packaging): Specify compression format for dpkg-deb + +M packaging/debian/source/options + +commit 64b7372 +Author: smizrahi +Date: Mon Feb 27 18:33:56 2023 +0100 + + fix(packaging): Specify compression format for dpkg-deb + +A packaging/debian/source/options + +commit 89f8252 +Author: smizrahi +Date: Wed Feb 22 11:28:36 2023 +0100 + + Increase debian compat version + +M packaging/debian/compat + +commit c26c6b3 +Author: smizrahi +Date: Wed Jan 25 19:51:53 2023 +0100 + + fix(imap): Fix invalid quota size. Fix #5683 + +M sope-mime/NGImap4/NGImap4ResponseParser.m + +commit 9540c11 +Author: Janne Heß +Date: Wed Jan 11 15:14:07 2023 +0100 + + fix(smtp): Fix -Wformat + + Rather than treating the SMTP output as a format string, explicitly + specify a format string. This is more secure and allows building with + `-Wformat -Wformat-security -Werror=format-security` + +M sope-mime/NGMail/NGSmtpClient.m + +commit 9707cb8 +Author: Janne Heß +Date: Wed Jan 11 14:55:10 2023 +0100 + + fix(configure): Prevent pulling in unnecessary vars + + Things like `NIX_GNUSTEP_BASE` would get pulled in without this patch + which causes the build to fail. + +M configure + +commit 5f9cb49 +Author: Nicolas Höft +Date: Mon Dec 5 10:14:29 2022 +0100 + + fix(smtp): Format ipv6 correctly for SMTP EHLO + +M sope-mime/NGMail/NGSmtpClient.m + +commit bd7d986 +Author: smizrahi +Date: Wed Nov 30 17:25:56 2022 +0100 + + Update ChangeLog + +M ChangeLog + commit 1ecf46b Author: smizrahi Date: Wed Aug 17 16:24:35 2022 +0200 diff -Nru sope-5.8.2/configure sope-5.8.4/configure --- sope-5.8.2/configure 2023-03-28 08:16:07.000000000 +0000 +++ sope-5.8.4/configure 2023-06-20 10:08:43.000000000 +0000 @@ -423,7 +423,7 @@ cfgwrite "" cfgwrite "# GNUstep environment variables:"; - for i in `env | grep GNUSTEP_ | sort`; do + for i in `env | grep ^GNUSTEP_ | sort`; do MAKE_ASSI="`echo $i | sed s/=/:=/`" cfgwrite "${MAKE_ASSI}"; done diff -Nru sope-5.8.2/debian/changelog sope-5.8.4/debian/changelog --- sope-5.8.2/debian/changelog 2023-05-11 13:21:21.000000000 +0000 +++ sope-5.8.4/debian/changelog 2023-06-25 22:04:52.000000000 +0000 @@ -1,3 +1,20 @@ +sope (5.8.4-1) unstable; urgency=medium + + * New upstream release. + + -- Jordi Mallach Mon, 26 Jun 2023 00:04:52 +0200 + +sope (5.8.3-1) unstable; urgency=medium + + [ Jordi Mallach ] + * New upstream release. + * Update Standards-Version to 4.6.2, with no changes needed. + + [ Yavor Doganov ] + * Fix FTBFS with gnustep-base/1.29.0. Closes: #1028579 + + -- Jordi Mallach Mon, 19 Jun 2023 01:07:38 +0200 + sope (5.8.2-1) unstable; urgency=medium * New upstream bugfix release. diff -Nru sope-5.8.2/debian/control sope-5.8.4/debian/control --- sope-5.8.2/debian/control 2022-06-16 10:22:53.000000000 +0000 +++ sope-5.8.4/debian/control 2023-06-18 23:06:54.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13), gnustep-make, gobjc, - libgnustep-base-dev, + libgnustep-base-dev (>= 1.29), libxml2-dev, libldap2-dev, libpq-dev, @@ -16,7 +16,7 @@ pkg-config, zlib1g-dev Rules-Requires-Root: no -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Homepage: https://sogo.nu/ Vcs-Browser: https://salsa.debian.org/debian/sope Vcs-Git: https://salsa.debian.org/debian/sope.git diff -Nru sope-5.8.2/debian/patches/base-1.29.patch sope-5.8.4/debian/patches/base-1.29.patch --- sope-5.8.2/debian/patches/base-1.29.patch 1970-01-01 00:00:00.000000000 +0000 +++ sope-5.8.4/debian/patches/base-1.29.patch 2023-06-18 23:06:14.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Fix FTBFS with gnustep-base/1.29.0 +Bug-Debian: https://bugs.debian.org/1028579 +Author: Yavor Doganov +Forwarded: no +Last-Update: 2023-01-13 +--- + +--- sope-5.8.0.orig/sope-mime/NGMime/NGMimeType.m ++++ sope-5.8.0/sope-mime/NGMime/NGMimeType.m +@@ -125,13 +125,13 @@ + encoding = NSKoreanEUCStringEncoding; + } + else if ([charset isEqualToString:@"big5"]) { +- encoding = NSBIG5StringEncoding; ++ encoding = NSBig5StringEncoding; + } + else if ([charset isEqualToString:@"iso-2022-jp"]) { + encoding = NSISO2022JPStringEncoding; + } + else if ([charset isEqualToString:@"gb2312"]) { +- encoding = NSGB2312StringEncoding; ++ encoding = NSChineseEUCStringEncoding; + } + else if ([charset isEqualToString:@"koi8-r"]) { + encoding = NSKOI8RStringEncoding; diff -Nru sope-5.8.2/debian/patches/series sope-5.8.4/debian/patches/series --- sope-5.8.2/debian/patches/series 2020-11-26 13:24:55.000000000 +0000 +++ sope-5.8.4/debian/patches/series 2023-06-18 23:06:14.000000000 +0000 @@ -1,3 +1,4 @@ 0001-do-not-build-json.patch 0002-Do-not-build-xmlrpc-and-stxsaxdriver.patch 0003-Unset-MAKEFLAGS-and-MFLAGS-in-configure.patch +base-1.29.patch diff -Nru sope-5.8.2/packaging/rhel/sope.spec sope-5.8.4/packaging/rhel/sope.spec --- sope-5.8.2/packaging/rhel/sope.spec 2023-03-28 08:16:06.000000000 +0000 +++ sope-5.8.4/packaging/rhel/sope.spec 2023-06-20 10:08:43.000000000 +0000 @@ -3,6 +3,7 @@ %define oracle_support 1 %{?el7:%define oracle_support 1} %{?el8:%define oracle_support 0} +%{?el9:%define oracle_support 0} Summary: SOPE Name: sope%{sope_major_version}%{sope_minor_version} @@ -23,6 +24,7 @@ %{?el6:BuildRequires: mysql-devel} %{?el7:BuildRequires: mariadb-devel} %{?el8:BuildRequires: mariadb-devel} +%{?el9:BuildRequires: mariadb-devel} %description sope diff -Nru sope-5.8.2/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m sope-5.8.4/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m --- sope-5.8.2/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m 2023-03-28 08:16:06.000000000 +0000 +++ sope-5.8.4/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m 2023-06-20 10:08:43.000000000 +0000 @@ -738,7 +738,7 @@ if (isok) { unsigned int slen, rlen; const unsigned char *r; - int s; + int s, size; s = [_response status]; t1 = [_response httpVersion]; @@ -747,9 +747,10 @@ // TBD: replace -cStringLength/-getCString: slen = [t1 cStringLength]; rlen = strlen((const char *)r); - if ((slen + rlen + 8) < 1000) { + size = 8 + rlen; // Size of status (e.g. : 200 OK \r\n) - 1 space, 3 digits for status code, 1 space, X for status, 2 end of line, 1 for zero-byte + if ((slen + size) < sizeof(buf)) { [t1 getCString:(char *)buf]; // HTTP status - snprintf((char *)&(buf[slen]), sizeof(buf), " %i %s\r\n", s, r); + snprintf((char *)&(buf[slen]), size, " %i %s\r\n", s, r); isok = [_out safeWriteBytes:buf count:strlen((char *)buf)]; } else diff -Nru sope-5.8.2/sope-gdl1/GDLAccess/EOSQLExpression.m sope-5.8.4/sope-gdl1/GDLAccess/EOSQLExpression.m --- sope-5.8.2/sope-gdl1/GDLAccess/EOSQLExpression.m 2023-03-28 08:16:06.000000000 +0000 +++ sope-5.8.4/sope-gdl1/GDLAccess/EOSQLExpression.m 2023-06-20 10:08:44.000000000 +0000 @@ -1121,7 +1121,6 @@ break; case '%': - buf[i] = '\\'; i++; buf[i] = '%'; i++; didSomething = YES; break; diff -Nru sope-5.8.2/sope-mime/NGMail/NGSmtpClient.m sope-5.8.4/sope-mime/NGMail/NGSmtpClient.m --- sope-5.8.2/sope-mime/NGMail/NGSmtpClient.m 2023-03-28 08:16:07.000000000 +0000 +++ sope-5.8.4/sope-mime/NGMail/NGSmtpClient.m 2023-06-20 10:08:44.000000000 +0000 @@ -727,7 +727,8 @@ { NSLog(@"SMTP(MAIL FROM) error: %@", [reply text]); [NSException raise: @"SMTPException" - format: [reply text]]; + format: @"%@", + [reply text]]; } return NO; } @@ -752,7 +753,8 @@ { NSLog(@"SMTP(RCPT TO) error: %@", [reply text]); [NSException raise: @"SMTPException" - format: [reply text]]; + format: @"%@", + [reply text]]; } return NO; } @@ -846,7 +848,8 @@ { NSLog(@"SMTP(DATA) error: %@", [reply text]); [NSException raise: @"SMTPException" - format: [reply text]]; + format: @"%@", + [reply text]]; } return NO; }