shib.conf conflict (and other Lenny fixes)

[Ferenc Wagner]

Ferenc Wagner <wferi at niif.hu> writes:

> Russ Allbery <rra at debian.org> writes:
>
>> We should get this fix into lenny, which will mean making a lenny branch
>> off of the old master before we merged in Shibboleth 2.1.  I can take a
>> look at doing that.
>
> I gave it a try.  Please review, possibly botched it...

I actually did, but tried to fix now.  Also included the missing
/var/log/shibboleth, as that sure should make it into Lenny.  There
are at least two more fixes which we could incorporate: a322a546 and
42e487ed.  What do you think?

> Apart from that, should we also take care of the 2.0.dfsg1-3 ->
> 2.0.dfsg1-4 upgrade?  I don't know much about the possible conffile
> migration issues, but surely they are numerous.

Any comments on this?
-- 
Cheers,
Feri.