Page MenuHomeFreeBSD

irc/ircd-ratbox: Fix OpenSSL linking and simplify
ClosedPublic

Authored by brnrd on Feb 15 2016, 2:02 PM.

Details

Summary

Proposed commit log

irc/ircd-ratbox: Fix OpenSSL linking and simplify

  - Fix linking with ports' ssl libs
  - Fix `contrib` build (used base openssl headers)
  - Re-work EGD detection
  - Use options helpers
  - Simplify REINPLACE with :U defaults

PR:		195796
Reviewed_by:	feld (mentor), koobs (mentor)
Approved by:	(mentor)
Differential_Revision:	D5???
Test Plan
  • portlint -AC (one line reduced)
  • poudriere testport

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

brnrd updated this revision to Diff 13317.Feb 15 2016, 2:02 PM
brnrd retitled this revision from to irc/ircd-ratbox: Fix OpenSSL linking and simplify.
brnrd updated this object.
brnrd edited the test plan for this revision. (Show Details)
brnrd added reviewers: feld, koobs.
brnrd updated this object.Feb 15 2016, 2:03 PM
brnrd updated this object.Feb 15 2016, 2:11 PM
brnrd added inline comments.
irc/ircd-ratbox/Makefile
69 ↗(On Diff #13317)

Honor WITH_OPENSSL_PORT

123 ↗(On Diff #13317)

Duplicate line, already fixed in my local repo, part of next arc diff --update

125 ↗(On Diff #13317)

Use default values for the replacement. Same effect but simpler.
i.e. if not defined ALIS_SERV, replace ALIS with ALIS.

irc/ircd-ratbox/files/patch-configure
1 ↗(On Diff #13317)

No longer needed due to OPENSSL_NO_EGD addition to opensslfeatures.h

irc/ircd-ratbox/files/patch-configure.ac
1 ↗(On Diff #13317)

No longer needed due to OPENSSL_NO_EGD addition to opensslfeatures.h

irc/ircd-ratbox/files/patch-libratbox_src_openssl.c
7 ↗(On Diff #13317)

Change to OPENSSL_NO_EGD after addition to opensslfeatures.h

brnrd added inline comments.Feb 15 2016, 2:13 PM
irc/ircd-ratbox/files/patch-contrib_Makefile.in
11 ↗(On Diff #13317)

contrib was using /usr/include for the openssl headers even when WITH_OPENSSL_PORT was defined.

feld accepted this revision.Feb 15 2016, 5:56 PM
feld edited edge metadata.
This revision is now accepted and ready to land.Feb 15 2016, 5:56 PM
This revision was automatically updated to reflect the committed changes.