Bug 213627 - sysutils/condor: Update to 8.4.9
Summary: sysutils/condor: Update to 8.4.9
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Joseph Mingrone
URL:
Keywords: needs-patch, needs-qa, patch
Depends on:
Blocks:
 
Reported: 2016-10-19 21:28 UTC by Jason W. Bacon
Modified: 2016-10-21 20:24 UTC (History)
3 users (show)

See Also:
koobs: maintainer-feedback? (jwb)
koobs: merge-quarterly?


Attachments
Unified diff (19.85 KB, text/plain)
2016-10-19 21:28 UTC, Jason W. Bacon
jwb: maintainer-approval+
Details
Unified diff (18.71 KB, patch)
2016-10-20 19:38 UTC, Jason W. Bacon
jwb: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jason W. Bacon freebsd_committer freebsd_triage 2016-10-19 21:28:18 UTC
Created attachment 175948 [details]
Unified diff

Update to latest stables.

All patches moved upstream since 8.2.8.

portlint: OK (minor warnings)
testport: OK (poudriere: {9.3, 10.3, 11.0}, {i386, amd64}, DOCS, EXAMPLES)
Comment 1 Joseph Mingrone freebsd_committer freebsd_triage 2016-10-20 02:56:25 UTC
The build fails when /etc/make.conf includes DEFAULT_VERSIONS+=ssl=libressl.

http://pkg.awarnach.mathstat.dal.ca/data/11amd64-default/2016-10-19_23h48m05s/logs/errors/condor-8.4.9.log

Searching for the error [1] brings up hits specific to libressl on FreeBSD.  It sounds like a fix might be straightforward.  Do you want to take a shot at fixing it?

[1] error: unknown type name des_key_schedule; did you mean DES_key_schedule
Comment 2 Kubilay Kocak freebsd_committer freebsd_triage 2016-10-20 03:17:00 UTC
CC brnrd for feedback on potential libressl fix.

If the libressl fix can be attach/committed separately (before the update), it can also be merged to the quarterly branch (which is presumably fails to currently build with libressl?)
Comment 3 Jason W. Bacon freebsd_committer freebsd_triage 2016-10-20 03:44:52 UTC
Looks suspiciously like something that had been fixed previously.  I'm retesting with 2 of the 8.2.8 patches restored.  Will follow up ASAP...

Thanks,

   JB
Comment 4 Jason W. Bacon freebsd_committer freebsd_triage 2016-10-20 19:38:01 UTC
Created attachment 175990 [details]
Unified diff


I apparently misread something a while back and got the impression that the DES patches had been imported upstream.  I restored them along with one hunk of another patch to add support for FreeBSD 12.

How did you detect this issue?  Is there an automated check, or did you just manually edit your make.conf to test with each SSL option?  I'd like to build this into my poudriere testing process.  For now, it's another item on my checklist for future PRs.

Thanks,

   JB
Comment 5 Jason W. Bacon freebsd_committer freebsd_triage 2016-10-20 19:41:29 UTC
Kubilay,

Both the present (8.2.8) and new (8.4.9) ports should be good with libressl now.  They use the same DES patches for this.

Thanks,

    JB
Comment 6 commit-hook freebsd_committer freebsd_triage 2016-10-21 20:21:23 UTC
A commit references this bug:

Author: jrm
Date: Fri Oct 21 20:21:15 UTC 2016
New revision: 424436
URL: https://svnweb.freebsd.org/changeset/ports/424436

Log:
  sysutils/condor: Update to 8.4.9

  Release notes:
  http://research.cs.wisc.edu/htcondor/manual/v8.4.9/10_3Stable_Release.html

  - remove patches that have been incorporated upstream
  - add support for FreeBSD 12

  PR:		213627
  Submitted by:	bacon4000@gmail.com
  Approved by:	swills (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D8316

Changes:
  head/sysutils/condor/Makefile
  head/sysutils/condor/distinfo
  head/sysutils/condor/files/patch-build_cmake_CondorPackageConfig.cmake
  head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake
  head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake
  head/sysutils/condor/files/patch-src_condor__power_power__state.cpp
  head/sysutils/condor/files/patch-src_condor__sysapi_idle__time.cpp
  head/sysutils/condor/files/patch-src_condor__utils_condor__config.cpp
  head/sysutils/condor/files/patch-src_python-bindings_dc__tool.cpp
  head/sysutils/condor/files/patch-src_python-bindings_secman.cpp
  head/sysutils/condor/pkg-plist
Comment 7 Joseph Mingrone freebsd_committer freebsd_triage 2016-10-21 20:24:45 UTC
Committed (with minor changes).  Thanks!

P.S., I manually put DEFAULT_VERSIONS+= ssl=libressl in make.conf to test.