Bug 262693 - irc/scrollz: Update to 2.3.1
Summary: irc/scrollz: Update to 2.3.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Many People
Assignee: Fernando Apesteguía
URL: https://www.scrollz.info/download/Cha...
Keywords: security
Depends on:
Blocks:
 
Reported: 2022-03-20 23:19 UTC by Chris Petrik
Modified: 2022-04-12 10:21 UTC (History)
4 users (show)

See Also:
bugzilla: maintainer-feedback? (freebsd)
fernape: merge-quarterly+


Attachments
update to 2.3.1 (1.75 KB, patch)
2022-03-20 23:25 UTC, Chris Petrik
no flags Details | Diff
Patch to update to 2.3.1 without USE_GCC (8.37 KB, patch)
2022-04-07 09:27 UTC, Fernando Apesteguía
no flags Details | Diff
Patch to update to 2.3.1 without USE_GCC and distribution patch (8.24 KB, patch)
2022-04-07 10:47 UTC, Fernando Apesteguía
fernape: maintainer-approval? (freebsd)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Petrik 2022-03-20 23:19:47 UTC
This update mainly fixes a CVE
Comment 1 Chris Petrik 2022-03-20 23:25:01 UTC
Created attachment 232596 [details]
update to 2.3.1

Patch file to update to 2.3.1
Comment 2 Mikael Urankar freebsd_committer freebsd_triage 2022-04-01 12:18:50 UTC
why do you need gcc?
Comment 3 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-07 09:00:26 UTC
^Triage: Simplifying title                                                                                                                                                                                                                                                     
                                                                                                                                                                                                                                                                               
^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field.                                                                                                                                                              
                                                                                                                                                                                                                                                                               
Q/A: Some patches do not follow proper format
                                                                                                                                                                                                                                                                              
Q/A: PORTREVISION should be removed                                                                                                                                                                                                                                            

Running build testing without USE_GCC... 
                                                                                                                                                                                                                                           
Thanks!
Comment 4 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-07 09:27:08 UTC
Created attachment 233019 [details]
Patch to update to 2.3.1 without USE_GCC

This patch removes the need for USE_GCC by applying a patch to properly return a value in a non-void function.

In addition, it fixes pkg-plist.

^Triage: Please confirm this change passes QA (portlint, poudriere at least)

For details and instructions, see:

https://docs.freebsd.org/en/books/porters-handbook/#testing
Comment 5 Mikael Urankar freebsd_committer freebsd_triage 2022-04-07 09:42:05 UTC
(In reply to Fernando Apesteguía from comment #4)
Can you use upstream patch instead:
https://github.com/ScrollZ/ScrollZ/commit/c0dfa140341cf9a848a6e5f926392623d03d2c28
Comment 6 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-07 10:47:58 UTC
Created attachment 233022 [details]
Patch to update to 2.3.1 without USE_GCC and distribution patch

Use distribution patch.
Comment 7 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-07 10:48:20 UTC
(In reply to Mikael Urankar from comment #5)
Nice.

Thanks for pointing this out.
Comment 8 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-12 10:17:32 UTC
This update fixes https://nvd.nist.gov/vuln/detail/CVE-2021-29376
Comment 9 commit-hook freebsd_committer freebsd_triage 2022-04-12 10:18:53 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c4a37205059c6f8e365b50ee29e82e15a3e41221

commit c4a37205059c6f8e365b50ee29e82e15a3e41221
Author:     Chris Petrik <Christopher.petrik@usm.edu>
AuthorDate: 2022-04-07 08:55:18 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-04-12 10:05:26 +0000

    irc/scrollz: Update to version 2.3.1

    ChangeLog: https://www.scrollz.info/download/ChangeLog.2.3.1.txt

    Use online commit to avoid gcc.

    PR:     262693
    Reported by:    Christopher.petrik@usm.edu
    Approved by:    freebsd@bitchx.org (maintainer, timeout > 2 weeks)
    Reviewed by:    mikael@
    MFH:    2022Q2 (bugfix release, security)
    Security:       CVE-2021-29376

 irc/scrollz/Makefile                       |  9 ++++++---
 irc/scrollz/distinfo                       |  7 +++++--
 irc/scrollz/files/patch-Makefile.in        | 14 +++++++-------
 irc/scrollz/files/patch-a8b05aab (gone)    | 16 ----------------
 irc/scrollz/files/patch-include-screen.h   |  4 ++--
 irc/scrollz/files/patch-include-window.h   |  4 ++--
 irc/scrollz/files/patch-source-Makefile.in | 14 +++++++-------
 irc/scrollz/files/patch-source-screen.c    | 16 ++++++++--------
 irc/scrollz/pkg-plist                      |  1 +
 9 files changed, 38 insertions(+), 47 deletions(-)
Comment 10 commit-hook freebsd_committer freebsd_triage 2022-04-12 10:20:54 UTC
A commit in branch 2022Q2 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2bd6d7151e1339c6d17db55cf5db020ed5e45243

commit 2bd6d7151e1339c6d17db55cf5db020ed5e45243
Author:     Chris Petrik <Christopher.petrik@usm.edu>
AuthorDate: 2022-04-07 08:55:18 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-04-12 10:17:00 +0000

    irc/scrollz: Update to version 2.3.1

    ChangeLog: https://www.scrollz.info/download/ChangeLog.2.3.1.txt

    Use online commit to avoid gcc.

    PR:     262693
    Reported by:    Christopher.petrik@usm.edu
    Approved by:    freebsd@bitchx.org (maintainer, timeout > 2 weeks)
    Reviewed by:    mikael@
    MFH:    2022Q2 (bugfix release, security)
    Security:       CVE-2021-29376

    (cherry picked from commit c4a37205059c6f8e365b50ee29e82e15a3e41221)

 irc/scrollz/Makefile                       |  9 ++++++---
 irc/scrollz/distinfo                       |  7 +++++--
 irc/scrollz/files/patch-Makefile.in        | 14 +++++++-------
 irc/scrollz/files/patch-a8b05aab (gone)    | 16 ----------------
 irc/scrollz/files/patch-include-screen.h   |  4 ++--
 irc/scrollz/files/patch-include-window.h   |  4 ++--
 irc/scrollz/files/patch-source-Makefile.in | 14 +++++++-------
 irc/scrollz/files/patch-source-screen.c    | 16 ++++++++--------
 irc/scrollz/pkg-plist                      |  1 +
 9 files changed, 38 insertions(+), 47 deletions(-)
Comment 11 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-12 10:21:15 UTC
Committed and merged to 2022Q2