From edcd7af0f48af18379e5df2b30b29b4475eea58e Mon Sep 17 00:00:00 2001
From: Tim Theisen <ttheisen@fedoraproject.org>
Date: Jul 31 2019 12:53:22 +0000
Subject: Merge branch 'f29' into f30


---

diff --git a/.gitignore b/.gitignore
index af81ecd..e58c627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ _build
 /htcondor-8.6.10.tar.gz
 /htcondor-8.6.11.tar.gz
 /htcondor-8.6.13.tar.gz
+/htcondor-8.8.4.tar.gz
diff --git a/Werror_replace.patch b/Werror_replace.patch
index 73f7902..4c6f6a3 100644
--- a/Werror_replace.patch
+++ b/Werror_replace.patch
@@ -1,5 +1,5 @@
 diff --git a/src/condor_contrib/CMakeLists.txt b/src/condor_contrib/CMakeLists.txt
-index 31aa3d6..dd67685 100644
+index 627334660f..5f02bcc581 100644
 --- a/src/condor_contrib/CMakeLists.txt
 +++ b/src/condor_contrib/CMakeLists.txt
 @@ -21,7 +21,7 @@
@@ -10,4 +10,4 @@ index 31aa3d6..dd67685 100644
 +  #string(REGEX REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
    #dprint( "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
  
-   if (HAVE_EXT_POSTGRESQL AND WANT_FULL_DEPLOYMENT)
+   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/utils")
diff --git a/condor-gahp.patch b/condor-gahp.patch
index 27a811b..4d45bf2 100644
--- a/condor-gahp.patch
+++ b/condor-gahp.patch
@@ -1,8 +1,8 @@
 diff --git a/src/condor_gridmanager/gahp-client.cpp b/src/condor_gridmanager/gahp-client.cpp
-index 48c6b15..b0a44d8 100644
+index d2c66ce629..a2a694a6b9 100644
 --- a/src/condor_gridmanager/gahp-client.cpp
 +++ b/src/condor_gridmanager/gahp-client.cpp
-@@ -703,6 +703,16 @@ GahpServer::Startup()
+@@ -820,6 +820,16 @@ GahpServer::Startup()
  		free( tmp_char );
  	}
  
@@ -17,5 +17,5 @@ index 48c6b15..b0a44d8 100644
 +	}
 +
  	// For amazon ec2 ca authentication
- 	tmp_char = param("SOAP_SSL_CA_FILE");
+ 	tmp_char = param("GAHP_SSL_CAFILE");
  	if( tmp_char ) {
diff --git a/condor-shared-port.patch b/condor-shared-port.patch
deleted file mode 100644
index 3027869..0000000
--- a/condor-shared-port.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/condor_io/shared_port_client.cpp b/src/condor_io/shared_port_client.cpp
-index 70eff3547299ca6527fce38fe78bdc37f2c750d8..25ca3597adf82848e34e11752bfcd30345fe3064 100644
---- a/src/condor_io/shared_port_client.cpp
-+++ b/src/condor_io/shared_port_client.cpp
-@@ -651,10 +651,10 @@ SharedPortState::HandleFD(Stream *&s)
- 		// cmsghdr(s) to set it to the sum of CMSG_LEN() across all cmsghdrs.
- 
- 	struct msghdr msg;
--	std::vector<char> buf; buf.reserve(CMSG_SPACE(sizeof(int)));
-+	char buf[CMSG_SPACE(sizeof(int))];
- 	msg.msg_name = NULL;
- 	msg.msg_namelen = 0;
--	msg.msg_control = &buf[0];
-+	msg.msg_control = buf;
- 	msg.msg_controllen = CMSG_SPACE(sizeof(int));
- 	msg.msg_flags = 0;
- 
diff --git a/condor.spec b/condor.spec
index 28e4c78..a205298 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,5 +1,5 @@
 %global newname         htcondor
-%global srcver          8_6_13
+%global srcver          8_8_4
 
 %ifarch %{arm} %{ix86} x86_64
 %global with_mongodb    1
@@ -19,7 +19,7 @@
 
 #######################
 Name:           condor
-Version:        8.6.13
+Version:        8.8.4
 Release:        1%{?dist}
 Summary:        HTCondor: High Throughput Computing
 License:        ASL 2.0
@@ -37,11 +37,8 @@ Patch1:         condor-gahp.patch
 # turn off the cmake regex-replace hack that removes "-Werror", as it 
 # breaks the new cflag "-Werror=format-security" passed in from build system:
 Patch2:         Werror_replace.patch
-Patch3:         condor_aviary_schedulerobject.patch
-Patch4:         condor_aviary_sock_assign.patch
-#Patch5:         condor-shared-port.patch
-Patch6:		libdl.patch
-Patch7:		specify_python2.patch
+Patch3:         libdl.patch
+Patch4:         python-boost.patch
 
 #######################
 BuildRequires: gcc gcc-c++
@@ -62,7 +59,10 @@ BuildRequires: latex2html
 BuildRequires: boost-devel
 BuildRequires: boost-python2
 BuildRequires: boost-python2-devel
+BuildRequires: boost-python3
+BuildRequires: boost-python3-devel
 BuildRequires: libuuid-devel
+BuildRequires: sqlite-devel
 # needed for param table generator
 BuildRequires: perl-generators
 BuildRequires: perl(Data::Dumper)
@@ -91,6 +91,7 @@ BuildRequires: globus-common-devel
 BuildRequires: globus-ftp-client-devel
 BuildRequires: globus-ftp-control-devel
 BuildRequires: libtool-ltdl-devel
+BuildRequires: munge-devel
 BuildRequires: voms-devel
 # support for aviary
 %if 0%{?with_aviary}
@@ -111,6 +112,8 @@ BuildRequires: mongodb-devel
 # we now need to request the python libs and includes explicitly:
 BuildRequires: python2-devel
 BuildRequires: python2-libs
+BuildRequires: python3-devel
+BuildRequires: python3-libs
 
 #######################
 # Installation requirements.
@@ -289,6 +292,30 @@ Obsoletes: %{name}-python < %{version}-%{release}
 The python bindings allow one to directly invoke the C++ implementations of
 the ClassAd library and HTCondor from python
 
+#######################
+%package -n python3-condor
+Summary: Python bindings for Condor.
+Group: Applications/System
+Requires: %name = %version-%release
+%{?python_provide:%python_provide python3-condor}
+
+%description -n python3-condor
+The python bindings allow one to directly invoke the C++ implementations of
+the ClassAd library and HTCondor from python
+
+#######################
+%package -n minicondor
+Summary: Configuration for a single-node HTCondor
+Group: Applications/System
+Requires: %name = %version-%release
+Requires: python2-condor = %version-%release
+
+%description -n minicondor
+This example configuration is good for trying out HTCondor for the first time.
+It only configures the IPv4 loopback address, turns on basic security, and
+shortens many timers to be more responsive.
+
+#######################
 # The bosco subpkg is currently dropping file that breaks the out-of-box condor
 # configuration (60-campus_factory.config).  The file looks somewhat site-
 # specific.  I'm going to disable bosco until it can be made more generic for
@@ -310,6 +337,32 @@ cluster.  This allows the user to run their workflows using Condor tools across
 multiple clusters.
 %endif
 
+#######################
+%package annex-ec2
+Summary: Configuration and scripts to make an EC2 image annex-compatible.
+Group: Applications/System
+Requires: %name = %version-%release
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+
+%description annex-ec2
+Configures HTCondor to make an EC2 image annex-compatible.  Do NOT install
+on a non-EC2 image.
+
+%files annex-ec2
+%_libexecdir/condor/condor-annex-ec2
+%{_unitdir}/condor-annex-ec2.service
+%config(noreplace) %_sysconfdir/condor/config.d/50ec2.config
+%config(noreplace) %_sysconfdir/condor/master_shutdown_script.sh
+
+%post annex-ec2
+/bin/systemctl enable condor-annex-ec2
+
+%preun annex-ec2
+if [ $1 == 0 ]; then
+    /bin/systemctl disable condor-annex-ec2
+fi
+
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || \
@@ -323,9 +376,6 @@ exit 0
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 cp %{SOURCE1} %{name}-tmpfiles.conf
 cp %{SOURCE2} %{name}.service
 cp %{SOURCE3} .
@@ -394,9 +444,20 @@ populate %{_datadir}/condor %{buildroot}/%{_usr}/lib/*
 # Except for the shared libs
 populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libclassad.s*
 populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libcondor_utils*.so
-#populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpyclassad2.7_%{srcver}.so
+populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpyclassad2.7_%{srcver}.so
+populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpy3classad3.7_%{srcver}.so
+# and python site-packages
+if [ -d %{buildroot}/%{_datadir}/condor/python2.? ]; then
+    mv %{buildroot}/%{_datadir}/condor/python2.? %{buildroot}/%{_libdir}/
+fi
+if [ -d %{buildroot}/%{_datadir}/condor/python3.? ]; then
+    mv %{buildroot}/%{_datadir}/condor/python3.? %{buildroot}/%{_libdir}/
+fi
 rm -f %{buildroot}/%{_datadir}/condor/libclassad.a
 
+# Remove the small shadow if built
+rm -f %{buildroot}/%{_sbindir}/condor_shadow_s
+
 # It is proper to put HTCondor specific libexec binaries under libexec/condor/
 populate %_libexecdir/condor %{buildroot}/usr/libexec/*
 
@@ -421,9 +482,12 @@ sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \
 
 # Install the basic configuration, a Personal HTCondor config. Allows for
 # yum install condor + service condor start and go.
-mkdir -m0755 %{buildroot}/%{_sysconfdir}/condor/config.d
+#mkdir -m0755 %{buildroot}/%{_sysconfdir}/condor/config.d
 cp 00personal_condor.config %{buildroot}/%{_sysconfdir}/condor/config.d/00personal_condor.config
 
+populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/00-minicondor
+populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/50ec2.config
+
 %if 0%{?with_aviary}
 populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/61aviary.config
 populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/63aviary-hadoop.config
@@ -452,12 +516,16 @@ mkdir -p -m1777 %{buildroot}/%{_var}/lock/condor/local
 mkdir -p -m0755 %{buildroot}/%{_var}/lib/condor/spool
 mkdir -p -m1777 %{buildroot}/%{_var}/lib/condor/execute
 
+# no master shutdown program for now
+rm %{buildroot}/%{_sbindir}/condor_set_shutdown
+rm %{buildroot}/%{_mandir}/man1/condor_set_shutdown.1
+
 # not packaging standard universe
-rm %{buildroot}/%{_mandir}/man1/condor_compile.1*
-rm %{buildroot}/%{_mandir}/man1/condor_checkpoint.1*
+rm %{buildroot}/%{_mandir}/man1/condor_compile.1
+rm %{buildroot}/%{_mandir}/man1/condor_checkpoint.1
 
 # not packaging configure/install scripts
-rm %{buildroot}/%{_mandir}/man1/condor_configure.1*
+rm %{buildroot}/%{_mandir}/man1/condor_configure.1
 
 # Remove junk
 rm -r %{buildroot}/%{_sysconfdir}/sysconfig
@@ -467,13 +535,19 @@ rm -r %{buildroot}/%{_sysconfdir}/init.d
 mkdir -p %{buildroot}%{_tmpfilesdir}/tmpfiles.d
 install -m 0644 %{name}-tmpfiles.conf %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
+install -Dp -m0755 %{buildroot}/etc/examples/condor-annex-ec2 %{buildroot}%{_libexecdir}/condor/condor-annex-ec2
+
+mkdir -p %{buildroot}%{_unitdir}
+install -m 0644 %{buildroot}/etc/examples/condor-annex-ec2.service %{buildroot}%{_unitdir}/condor-annex-ec2.service
+
 mkdir -p %{buildroot}%{_localstatedir}/run/
 install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
 
 mkdir -p %{buildroot}%{_unitdir}
 cp %{name}.service %{buildroot}%{_unitdir}/condor.service
 
-populate %{python2_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so
+mv %{buildroot}%{python3_sitearch}/py3htcondor.so %{buildroot}%{python3_sitearch}/htcondor.so
+mv %{buildroot}%{python3_sitearch}/py3classad.so %{buildroot}%{python3_sitearch}/classad.so
 
 # Remove stuff that comes from the full-deploy
 rm -rf %{buildroot}%{_sbindir}/cleanup_release
@@ -503,6 +577,7 @@ rm -rf %{buildroot}%{_usrsrc}/startd_factory
 rm -rf %{buildroot}/usr/DOC
 rm -rf %{buildroot}/usr/INSTALL
 rm -rf %{buildroot}/usr/LICENSE-2.0.txt
+rm -rf %{buildroot}/usr/NOTICE.txt
 rm -rf %{buildroot}/usr/README
 rm -rf %{buildroot}/usr/examples/
 rm -rf %{buildroot}%{_includedir}/MyString.h
@@ -524,10 +599,10 @@ rm -rf %{buildroot}%{_libexecdir}/condor/bgp_*
 rm -rf %{buildroot}%{_datadir}/condor/libchirp_client.*
 rm -rf %{buildroot}%{_datadir}/condor/libcondorapi.a
 rm -rf %{buildroot}%{_datadir}/condor/python/{htcondor,classad}.so
-rm -rf %{buildroot}%{_datadir}/condor/{libpyclassad_*,htcondor,classad}.so
+rm -rf %{buildroot}%{_datadir}/condor/{libpy*classad_*,htcondor,classad}.so
 rm %{buildroot}%{_libexecdir}/condor/condor_schedd.init
 rm -rf %{buildroot}%{_libexecdir}/condor/pandad
-rm -rf %{buildroot}%{_libexecdir}/condor/libclassad_python_user.so
+rm -rf %{buildroot}%{_libexecdir}/condor/libclassad_python*_user.so
 
 # Install BOSCO
 %if 0%{?with_bosco}
@@ -570,6 +645,8 @@ rm -rf %{buildroot}/etc/examples
 %_libexecdir/condor/condor_chirp
 %_libexecdir/condor/condor_ssh
 %_libexecdir/condor/sshd.sh
+%_libexecdir/condor/get_orted_cmd.sh
+%_libexecdir/condor/orted_launcher.sh
 %_libexecdir/condor/condor_job_router
 %_libexecdir/condor/condor_gangliad
 %_libexecdir/condor/condor_glexec_setup
@@ -588,20 +665,22 @@ rm -rf %{buildroot}/etc/examples
 %_libexecdir/condor/condor_mips
 %_libexecdir/condor/data_plugin
 %_libexecdir/condor/curl_plugin
+%_libexecdir/condor/multifile_curl_plugin
 %_libexecdir/condor/condor_shared_port
 %_libexecdir/condor/condor_sinful
 %_libexecdir/condor/condor_testingd
+%_libexecdir/condor/test_user_mapping
 %_libexecdir/condor/condor_glexec_wrapper
 %_libexecdir/condor/glexec_starter_setup.sh
 %_libexecdir/condor/condor_defrag
 %_libexecdir/condor/interactive.sub
 %_libexecdir/condor/linux_kernel_tuning
 %_libexecdir/condor/condor_dagman_metrics_reporter
-%_libexecdir/condor/condor_history_helper
 %_libexecdir/condor/condor_pid_ns_init
 %_libexecdir/condor/condor_urlfetch
 %_libexecdir/condor/test_user_mapping
 %_mandir/man1/condor_advertise.1.gz
+%_mandir/man1/condor_annex.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
 %_mandir/man1/condor_convert_history.1*
@@ -631,6 +710,7 @@ rm -rf %{buildroot}/etc/examples
 %_mandir/man1/condor_store_cred.1.gz
 %_mandir/man1/condor_submit.1.gz
 %_mandir/man1/condor_submit_dag.1.gz
+%_mandir/man1/condor_top.1.gz
 %_mandir/man1/condor_transfer_data.1.gz
 %_mandir/man1/condor_updates_stats.1.gz
 %_mandir/man1/condor_userlog.1.gz
@@ -654,6 +734,7 @@ rm -rf %{buildroot}/etc/examples
 %_mandir/man1/condor_rmdir.1.gz
 %_mandir/man1/condor_tail.1.gz
 %_mandir/man1/condor_who.1.gz
+%_mandir/man1/condor_now.1.gz
 %_mandir/man1/condor_dagman_metrics_reporter.1.gz
 %_mandir/man1/condor_gpu_discovery.1.gz
 %_mandir/man1/condor_pool_job_report.1.gz
@@ -666,14 +747,17 @@ rm -rf %{buildroot}/etc/examples
 %_libdir/libcondor_utils*.so
 %_libexecdir/condor/panda-plugin.so
 %_libexecdir/condor/libcollector_python_plugin.so
+%_libexecdir/condor/libcollector_python3_plugin.so
 %_bindir/condor_submit_dag
 %_bindir/condor_who
+%_bindir/condor_now
 %_bindir/condor_prio
 %_bindir/condor_transfer_data
 %_bindir/condor_check_userlogs
 %_bindir/condor_q
 %_libexecdir/condor/condor_transferer
 %_bindir/condor_cod
+%_bindir/condor_docker_enter
 %_bindir/condor_qedit
 %_bindir/condor_userlog
 %_bindir/condor_release
@@ -691,7 +775,6 @@ rm -rf %{buildroot}/etc/examples
 %_bindir/condor_vacate_job
 %_bindir/condor_findhost
 %_bindir/condor_stats
-%_bindir/condor_top.pl
 %_bindir/condor_transform_ads
 %_bindir/condor_version
 %_bindir/condor_history
@@ -712,6 +795,7 @@ rm -rf %{buildroot}/etc/examples
 %_bindir/condor_pool_job_report
 %_bindir/condor_job_router_info
 %_bindir/condor_update_machine_ad
+%_bindir/condor_annex
 %_sbindir/condor_advertise
 %_sbindir/condor_aklog
 %_sbindir/condor_c-gahp
@@ -720,7 +804,6 @@ rm -rf %{buildroot}/etc/examples
 %_sbindir/condor_convert_history
 %_sbindir/condor_fetchlog
 %_sbindir/condor_had
-%_sbindir/condor_init
 %_sbindir/condor_master
 %_sbindir/condor_negotiator
 %_sbindir/condor_off
@@ -729,7 +812,6 @@ rm -rf %{buildroot}/etc/examples
 %_sbindir/condor_reconfig
 %_sbindir/condor_replication
 %_sbindir/condor_restart
-%attr(6755, root, root) %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
 %_sbindir/condor_set_shutdown
 %_sbindir/condor_shadow
@@ -746,11 +828,13 @@ rm -rf %{buildroot}/etc/examples
 %_sbindir/grid_monitor.sh
 %_sbindir/remote_gahp
 %_sbindir/nordugrid_gahp
+%_sbindir/AzureGAHPServer
 %_sbindir/condor_sos
 %_sbindir/condor_testwritelog
 %_sbindir/gce_gahp
 #%%_bindir/condor_ping
 %_libexecdir/condor/condor_gpu_discovery
+%_libexecdir/condor/condor_gpu_utilization
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
 %dir %_var/lib/condor/execute/
@@ -946,11 +1030,23 @@ rm -rf %{buildroot}/etc/examples
 
 #################
 %files -n python2-condor
+%_bindir/condor_top
 %{python2_sitearch}/classad.so
 %{python2_sitearch}/htcondor.so
 %{_libdir}/libpyclassad2.7_%{srcver}.so
 
 #################
+%files -n python3-condor
+%_bindir/condor_top
+%{python3_sitearch}/classad.so
+%{python3_sitearch}/htcondor.so
+%{_libdir}/libpy3classad3.7_%{srcver}.so
+
+#################
+%files -n minicondor
+%config(noreplace) %_sysconfdir/condor/config.d/00-minicondor
+
+#################
 %if 0%{?with_bosco}
 %files bosco
 %config(noreplace) %_sysconfdir/condor/campus_factory.conf
@@ -994,6 +1090,9 @@ rm -rf %{buildroot}/etc/examples
 /sbin/ldconfig
 
 %changelog
+* Tue Jul 30 2019 Tim Theisen <ttheisen@fedoraproject.org> - 8.8.4-1
+- Update to latest upstream 8.8.4
+
 * Tue Jun 18 2019 Ben Cotton <bcotton@fedoraproject.org> 8.6.13-1
 - Update to latest upstream 8.6.13
 
diff --git a/condor_aviary_schedulerobject.patch b/condor_aviary_schedulerobject.patch
deleted file mode 100644
index 072bd55..0000000
--- a/condor_aviary_schedulerobject.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/condor_contrib/aviary/src/job/SchedulerObject.cpp b/src/condor_contrib/aviary/src/job/SchedulerObject.cpp
-index 34e217a..1010ddd 100644
---- a/src/condor_contrib/aviary/src/job/SchedulerObject.cpp
-+++ b/src/condor_contrib/aviary/src/job/SchedulerObject.cpp
-@@ -380,7 +380,7 @@ SchedulerObject::suspend(std::string key, std::string &/*reason*/, std::string &
- 		return false;
- 	}
- 
--	scheduler.enqueueActOnJobMyself(id,JA_SUSPEND_JOBS,true,true);
-+	scheduler.enqueueActOnJobMyself(id,JA_SUSPEND_JOBS,true);
- 
- 	return true;
- }
-@@ -395,7 +395,7 @@ SchedulerObject::_continue(std::string key, std::string &/*reason*/, std::string
- 		return false;
- 	}
- 
--	scheduler.enqueueActOnJobMyself(id,JA_CONTINUE_JOBS,true,true);
-+	scheduler.enqueueActOnJobMyself(id,JA_CONTINUE_JOBS,true);
- 
- 	return true;
- }
--- 
-2.3.5
diff --git a/condor_aviary_sock_assign.patch b/condor_aviary_sock_assign.patch
deleted file mode 100644
index 0620d74..0000000
--- a/condor_aviary_sock_assign.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From d31a125e408996da726f06632260ae06949ac056 Mon Sep 17 00:00:00 2001
-From: Ben Cotton <ben.cotton@cyclecomputing.com>
-Date: Wed, 24 Jun 2015 16:39:41 -0400
-Subject: [PATCH 2/2] Change ReliSock::assign to ReliSock::assignSocket (see
- tickets #4713, #4288)
-
-
-diff --git a/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp b/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp
-index 7cdfc3b..48268e3 100644
---- a/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp
-+++ b/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp
-@@ -68,7 +68,7 @@ struct AviaryCollectorPlugin : public Service, CollectorPlugin
-             EXCEPT("Failed to allocate transport socket");
-         }
-         
--        if (!sock->assign(provider->getListenerSocket())) {
-+        if (!sock->assignSocket(provider->getListenerSocket())) {
-             EXCEPT("Failed to bind transport socket");
-         }
-         int index;
-diff --git a/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp b/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp
-index 13c7207..f3891e5 100644
---- a/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp
-+++ b/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp
-@@ -75,7 +75,7 @@ AviaryHadoopPlugin::earlyInitialize()
-     if (!sock) {
-         EXCEPT("Failed to allocate transport socket");
-     }
--    if (!sock->assign(provider->getListenerSocket())) {
-+    if (!sock->assignSocket(provider->getListenerSocket())) {
-         EXCEPT("Failed to bind transport socket");
-     }
-     int index;
-diff --git a/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp b/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp
-index 644cf71..65d151b 100644
---- a/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp
-+++ b/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp
-@@ -71,7 +71,7 @@ AviaryScheddPlugin::earlyInitialize()
- 	if (!sock) {
- 		EXCEPT("Failed to allocate transport socket");
- 	}
--	if (!sock->assign(provider->getListenerSocket())) {
-+	if (!sock->assignSocket(provider->getListenerSocket())) {
- 		EXCEPT("Failed to bind transport socket");
- 	}
- 	int index;
-diff --git a/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp b/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp
-index bcb7902..7472a76 100644
---- a/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp
-+++ b/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp
-@@ -66,7 +66,7 @@ struct AviaryLocatorPlugin : public Service, CollectorPlugin
- 			EXCEPT("Failed to allocate transport socket");
- 		}
- 
--		if (!sock->assign(provider->getListenerSocket())) {
-+		if (!sock->assignSocket(provider->getListenerSocket())) {
- 			EXCEPT("Failed to bind transport socket");
- 		}
- 		int index;
-diff --git a/src/condor_contrib/aviary/src/query/aviary_query_server.cpp b/src/condor_contrib/aviary/src/query/aviary_query_server.cpp
-index d026d1d..e211d5f 100644
---- a/src/condor_contrib/aviary/src/query/aviary_query_server.cpp
-+++ b/src/condor_contrib/aviary/src/query/aviary_query_server.cpp
-@@ -84,7 +84,7 @@ void main_init(int /* argc */, char * /* argv */ [])
- 		EXCEPT("Failed to allocate transport socket");
- 	}
- 
--	if (!sock->assign(provider->getListenerSocket())) {
-+	if (!sock->assignSocket(provider->getListenerSocket())) {
- 		EXCEPT("Failed to bind transport socket");
- 	}
- 	int index;
--- 
-2.3.5
diff --git a/condor_aviary_sock_bind.patch b/condor_aviary_sock_bind.patch
deleted file mode 100644
index ac22743..0000000
--- a/condor_aviary_sock_bind.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/condor_contrib/aviary/src/common/EndpointPublisher.cpp b/src/condor_contrib/aviary/src/common/EndpointPublisher.cpp
-index c96b539..4aef808 100644
---- a/src/condor_contrib/aviary/src/common/EndpointPublisher.cpp
-+++ b/src/condor_contrib/aviary/src/common/EndpointPublisher.cpp
-@@ -63,7 +63,7 @@ EndpointPublisher::init(const std::string& uri_suffix, bool for_ssl)
- 
- 	// grab an ephemeral port
- 	ReliSock probe_sock;
--	if (-1 == probe_sock.bind(true,0)) {
-+	if (-1 == probe_sock.bind(CP_IPV4, true, 0, false)) {
- 		dprintf(D_ALWAYS,"EndpointPublisher is unable to obtain ANY ephemeral port from configured range! " \
- 			"Check configured values of LOWPORT,HIGHPORT.\n");
- 		return false;
--- 
-2.3.5
-
diff --git a/python-boost.patch b/python-boost.patch
new file mode 100644
index 0000000..0d37b5b
--- /dev/null
+++ b/python-boost.patch
@@ -0,0 +1,23 @@
+diff --git a/src/python-bindings/CMakeLists.txt b/src/python-bindings/CMakeLists.txt
+index 5c2b104363..e2d16a7a69 100644
+--- a/src/python-bindings/CMakeLists.txt
++++ b/src/python-bindings/CMakeLists.txt
+@@ -220,7 +220,7 @@ else()
+     if (DEFINED PYTHON_VERSION_STRING AND PYTHONLIBS_FOUND)
+       set ( PYTHON_BOOST_LIB boost_python )
+       if (DEFINED SYSTEM_NAME)
+-        if (${SYSTEM_NAME} MATCHES "rhel7" OR ${SYSTEM_NAME} MATCHES "centos7" OR ${SYSTEM_NAME} MATCHES "sl7")
++        if (${SYSTEM_NAME} MATCHES "rhel7" OR ${SYSTEM_NAME} MATCHES "centos7" OR ${SYSTEM_NAME} MATCHES "sl7" OR ${SYSTEM_NAME} MATCHES "fc3.")
+             set ( PYTHON_BOOST_LIB "boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}" )
+         endif()
+         if (${SYSTEM_NAME} MATCHES "Debian" OR ${SYSTEM_NAME} MATCHES "Ubuntu")
+@@ -300,7 +300,8 @@ else()
+     endif()
+ 
+     if (DEFINED PYTHON3_VERSION_STRING AND PYTHON3LIBS_FOUND AND NOT ${SYSTEM_NAME} MATCHES "fc27")
+-      if (${SYSTEM_NAME} MATCHES "rhel7" OR ${SYSTEM_NAME} MATCHES "centos7" OR ${SYSTEM_NAME} MATCHES "sl7")
++      set ( PYTHON3_BOOST_LIB boost_python3 )
++      if (${SYSTEM_NAME} MATCHES "rhel7" OR ${SYSTEM_NAME} MATCHES "centos7" OR ${SYSTEM_NAME} MATCHES "sl7" OR ${SYSTEM_NAME} MATCHES "fc3.")
+         set ( PYTHON3_BOOST_LIB "boost_python${PYTHON3_VERSION_MAJOR}${PYTHON3_VERSION_MINOR}" )
+       endif()
+       if (${SYSTEM_NAME} MATCHES "Debian" OR ${SYSTEM_NAME} MATCHES "Ubuntu")
diff --git a/sources b/sources
index 5d99d71..a320592 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (htcondor-8.6.13.tar.gz) = 833313eb7c3cf4ce4850519d82a1324a7b7de558d7a6a0728359347cf97e916c5337ad9d9fb846c781a15f58f1a418cb5c0b74ae6ff731823d52d9816f8c5746
+SHA512 (htcondor-8.8.4.tar.gz) = 639bf9294425e18a7dd18be942251c99c341f6b0753824b3faa21f75fd2d91ef6c5610c7a6c7259a048fae895a08ba04c115c294503c976a96128acc9e40dc67