Bug#772176: unblock: condor/8.2.3~dfsg.1-5

Hi Adam,

thanks for taking processing my request:

On Fri, Dec 5, 2014 at 10:42 PM, Adam D. Barratt <adam@adam-barratt.org.uk> wrote:

Control: tags -1 + moreinfo

On Fri, 2014-12-05 at 21:57 +0100, Michael Hanke wrote:
> The previously unblocked (#771419) version 8.2.3~dfsg.1-4 that was
> intended to fix #769100 inadvertently introduced another (grave) bug
> in the default configuration (#772170).
[...]
> Except for the changelog and the reported patch the debdiff is identical
> to the one reported in (#771419).

That doesn't appear to be the case:

diff -Nru condor-8.2.3~dfsg.1/debian/rules condor-8.2.3~dfsg.1/debian/rules
--- condor-8.2.3~dfsg.1/debian/rules 2014-11-29 08:52:02.000000000 +0000
+++ condor-8.2.3~dfsg.1/debian/rules 2014-12-05 19:23:32.000000000 +0000
@@ -106,13 +106,6 @@
chrpath -d debian/libclassad*/usr/lib/libclassad.so.*.*
# kill the default local config -- debconf will handle that
rm debian/htcondor/etc/condor/condor_config.local
- # modify condor config file with default Debian config
- # no default chatter to upstream
- echo "CONDOR_DEVELOPERS = NONE" >> debian/htcondor/etc/condor/condor_config
- echo "CONDOR_DEVELOPERS_COLLECTOR = NONE" >> debian/htcondor/etc/condor/condor_config
- # SSH template is a config file
- echo "SSH_TO_JOB_SSHD_CONFIG_TEMPLATE = /etc/condor/condor_ssh_to_job_sshd_config_template" \
- >> debian/htcondor/etc/condor/condor_config

I am not sure I understand. I think this change is accounted for in

https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=spool_fix.patch;att=1;bug=772170

Functionally equivalent lines are now included in a patch for

src/condor_examples/condor_config.generic.debian.patch

The mixture of in-place modification at runtime and patches has proven to be unreliable. Hence to move towards putting as much

as possible into patches.

I am missing something?

Thanks,

Michael