On Thu, Jan 13, 2022 at 12:51:53AM -0500, Daniel Dickman wrote: > On Mon, Oct 4, 2021 at 6:35 AM Mikhail <[email protected]> wrote: > > > > On Thu, Sep 16, 2021 at 12:18:36PM +0300, Mikhail wrote: > > > On Wed, Sep 15, 2021 at 11:48:18PM -0400, Daniel Dickman wrote: > > > > On Tue, Sep 14, 2021 at 6:39 AM Mikhail <[email protected]> wrote: > > > > > > > > > > On Mon, Sep 13, 2021 at 09:34:54PM +0300, Mikhail wrote: > > > > > > Hello, this is update for net/epic4 port from 2.10.5 to 2.10.10. > > > > > > > > > > > > patch-include_irc_h and patch-source_irc_c were incorporated > > > > > > upstream > > > > > > and should be rm'ed > > > > > > > > > > > > > > > > On IRC I was advised to remove REVISION, new patch is inline. > > > > > > > > > > The maintainer has been contacted, seem he ignores the updates. > > > > > > > > sometimes people take vacations or life comes up. I'd say wait at > > > > least a week or two to see if they will reply. > > > > > > > > If no reply in a week or two, they could be removed. > > > > > > He was contacted in 2019, he replied in 2020 and the reply was that he > > > would update the port, but he never did. > > > > > > Today the mail server reports that there is no such email address. > > > > > > New patch with MAINTAINER removed. > > > > ping > > > > I looked at doing this update again, but reading INSTALL it says the > following: > > You must not try to compile epic with "gcc -O2" because -O2 will > generate bad code that leads to random crashes. When you use -O2, > gcc assumes the source is conformant to ISO C99's requirements about > alias-safety, and EPIC, being a C90 program, does not conform, so the > result is undefined behavior (which means it crashes randomly.) This > is not a bug in EPIC. You must only compile epic with -O. > > The current port *does* build with -O2 although the warning seems a > bit... concerning? Doing the update may be no worse than the current > situation. Still, it might be good to verify if the comment is stale > and -O2 is ok, or whether we should switch to using -O. > > Also looking at WANTLIB following the update, is pthread still needed? > > For now, I've dropped MAINTAINER as we haven't heard from them in a few > months.
I missed this email while being unsubscribed from the list, it looks like Gmail filters archived it silently, because it contained '[email protected]'. The comment is correct, inlined patch updates Makefile to use -O, and also removes pthread. Two patches are incorporated in upstream and have to be rm'ed. This release also fixes https://www.openwall.com/lists/oss-security/2021/03/24/2 (the client isn't listed there, but it has roots in ircii and share the same ctcp codebase). diff --git a/net/epic4/Makefile b/net/epic4/Makefile index 1969933283d..7bfb4d9956b 100644 --- a/net/epic4/Makefile +++ b/net/epic4/Makefile @@ -1,19 +1,18 @@ COMMENT= (E)nhanced (P)rogrammable (I)RC-II (C)lient -VERSION= 2.10.5 -REVISION= 3 +VERSION= 2.10.10 HELP_DATE= 20050315 DISTNAME= epic4-${VERSION} CATEGORIES= net MASTER_SITES= http://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ -DISTFILES= epic4-${VERSION}.tar.bz2 epic4-help-${HELP_DATE}.tar.bz2 +DISTFILES= epic4-${VERSION}.tar.xz epic4-help-${HELP_DATE}.tar.bz2 HOMEPAGE= http://www.epicsol.org/ # BSD PERMIT_PACKAGE= Yes -WANTLIB= c crypto m curses perl pthread ssl +WANTLIB= c crypto m curses perl ssl FAKE_FLAGS= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" @@ -27,6 +26,13 @@ CONFIGURE_ENV= ac_cv_header_sys_sysctl_h=no INSTALL_TARGET= install installhelp +# You must not try to compile epic with "gcc -O2" because -O2 will +# generate bad code that leads to random crashes. When you use -O2, gcc +# assumes the source is conformant to ISO C99's requirements about +# alias-safety, and EPIC, being a C90 program, does not conform, so the +# result is undefined behavior (which means it crashes randomly.) +CFLAGS:= ${CFLAGS:C/-O2/-O/g} + NO_TEST= Yes SUBST_VARS= VERSION diff --git a/net/epic4/distinfo b/net/epic4/distinfo index bcabd3b06db..b00b971e5d9 100644 --- a/net/epic4/distinfo +++ b/net/epic4/distinfo @@ -1,4 +1,4 @@ -SHA256 (epic4-2.10.5.tar.bz2) = /KexeIveUmh/0BwzxedNDhb8xlanazh94YUE7adk/4A= +SHA256 (epic4-2.10.10.tar.xz) = 0SJxvL/YJ+nnWcMrumDs6AWul40z7ZHZIH3kNtBx+8U= SHA256 (epic4-help-20050315.tar.bz2) = p7cCbs/ACrcEDvXkNdcv00fUj6sShyLU4hPboZTNW74= -SIZE (epic4-2.10.5.tar.bz2) = 636364 +SIZE (epic4-2.10.10.tar.xz) = 587056 SIZE (epic4-help-20050315.tar.bz2) = 238390 diff --git a/net/epic4/patches/patch-include_irc_h b/net/epic4/patches/patch-include_irc_h deleted file mode 100644 index 42a5a32e059..00000000000 --- a/net/epic4/patches/patch-include_irc_h +++ /dev/null @@ -1,13 +0,0 @@ -fix -fno-common build - -Index: include/irc.h ---- include/irc.h.orig -+++ include/irc.h -@@ -166,6 +166,6 @@ const char * current_loader (void); /* XXX command.c - char * current_package (void); /* XXX command.c */ - - /* keep track of signals for scripted events */ --volatile int signals_caught[NSIG]; -+extern volatile int signals_caught[NSIG]; - - #endif /* __irc_h */ diff --git a/net/epic4/patches/patch-source_irc_c b/net/epic4/patches/patch-source_irc_c deleted file mode 100644 index 012c31934d0..00000000000 --- a/net/epic4/patches/patch-source_irc_c +++ /dev/null @@ -1,13 +0,0 @@ -This was not updated in 2.10.1 - 2.10.5. Reported upstream. - ---- source/irc.c.orig Mon Mar 31 09:57:22 2014 -+++ source/irc.c Wed Jul 30 22:22:02 2014 -@@ -47,7 +47,7 @@ const char useful_info[] = "epic4 2 10 5"; - * internal_version is what $V returns, its the integer-id for the - * version, and corresponds to the date of release, YYYYMMDD. - */ --const char internal_version[] = "20080904"; -+const char internal_version[] = "20140331"; - - /* - * In theory, this number is incremented for every commit.
