[03:54] <TheLordOfTime> i have a general question, if only half of a patch applies, what should one do?
[03:54] <TheLordOfTime> (if i'm patching for, say, an SRU or a security update debdiff)
[03:55] <Noskcaj10> As in half is fixed already, or the patch needs work
[03:55] <TheLordOfTime> Noskcaj10: as in, the patch from upstream (Debian in this case) only half works
[03:55] <TheLordOfTime> lemme grab the diff i'm looking at and explain what i mean
[03:56] <TheLordOfTime> http://anonscm.debian.org/gitweb/?p=collab-maint/nginx.git;a=commitdiff_plain;h=3a4f08671c87b7fc89e077542edfd6eb651f1803 is the debian commit for this...
[03:56] <Noskcaj10> I'm guessing you do whatever is needed to the patch for the expected results to work
[03:56] <TheLordOfTime> ignoring the news file, the nginx-common.postinst changes apply
[03:56] <TheLordOfTime> but the preinst ones don't (nonexistent code, so the patch is trying to remove something that doesn't exist)
[03:56] <TheLordOfTime> kinda uncertain how to proceed there
[03:56] <TheLordOfTime> Noskcaj10: ehh, that's what i was hoping *not* to have to hear...
[03:57] <TheLordOfTime> because I don't know how to "fix" the patch to apply it, the expected result is to remove code from the preinst... but the preinst doesn't have that code it's trying to remove (in Precise)
[03:57] <TheLordOfTime> so `patch` says "It looks like this is already applied..."
[04:00] <Noskcaj10> Does the current debian preinst match the one you're trying to patch? If so, you're all good. If not, further investigation needed
[04:00] <TheLordOfTime> Noskcaj10: i could always skip working on Precise, and work from Saucy backwards until i run into this problem again, then ask the sec team for guidance
[04:00] <Noskcaj10> if you want
[04:00] <TheLordOfTime> Noskcaj10: no, it doesn't match, but there's substantial delta between 1.1.19 (Ubuntu Precise) and 1.4.4 (in Debian)
[04:01] <TheLordOfTime> (I'm ignoring Trusty because i already requested a merge of 1.4.4-2 from Debian to Trusty)
[04:01] <TheLordOfTime> meh, either way, probably shouldn't be coding at 11 PM,  since i'm kinda tired >.>
[04:01] <TheLordOfTime> maybe I'm missing something somewhere...
[04:03] <Noskcaj10> have a look again tomorrow. And i think you need to SRU to saucy before precise
[04:08] <TheLordOfTime> Noskcaj10: considering this is a security fix, the debdiffs for all releases get attached to the bug at the same time
[04:08] <TheLordOfTime> (so the sec team can review them all at once)
[04:08] <TheLordOfTime> except Trusty, because merging
[04:08] <TheLordOfTime> (which cjwatson is going to handle)
[04:08] <TheLordOfTime> (sorry for the ping)
=== jalcine is now known as jacky
[10:31] <cjwatson> TheLordOfTime: uploaded
=== paddy_ is now known as paddy
[17:06] <kalon33> hello everybody, somebody else experiencing 404 errors when refreshing updates list?
[17:06] <kalon33> using archive.ubuntu.com
=== yofel_ is now known as yofel