On Tue, Feb 24, 2015 at 2:20 PM, Darren Tucker <dtucker at zip.com.au> wrote:> On Wed, Feb 25, 2015 at 09:13:22AM +1100, Darren Tucker wrote: > > On Wed, Feb 25, 2015 at 09:04:57AM +1100, Darren Tucker wrote: > > > On Tue, Feb 24, 2015 at 12:11:16PM -0800, Kevin Brott wrote: > > > > ld: Unsatisfied symbol "xstrdup" in file > > > > openbsd-compat//libopenbsd-compat.a[bsd-misc.o] > > > > > > How about removing the dependency on xmalloc? eg (untested): > > > > Shoulda tested it. Now one that will compile: > > Sigh. And now the right patch from the tree that compiled. > (djm: I get the idea :-) > > diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c > index 65e8003..f7be415 100644 > >Applying this patch against the git clone from this morning, the patched openssh-SNAP-20150225.tar.gz that worked finally for AIX and the git clone I just pulled gives me: patching file openbsd-compat/bsd-misc.c Hunk #2 FAILED at 41. Hunk #3 FAILED at 54. 2 out of 3 hunks FAILED -- saving rejects to file openbsd-compat/bsd-misc.c.rej Suggestions?
On Tue, Feb 24, 2015 at 5:33 PM, Kevin Brott <kevin.brott at gmail.com> wrote:> > patching file openbsd-compat/bsd-misc.c > Hunk #2 FAILED at 41. > Hunk #3 FAILED at 54. > 2 out of 3 hunks FAILED -- saving rejects to file > openbsd-compat/bsd-misc.c.rej > > Suggestions? >Whitespace mangled in the mail? I put up a copy here: http://www.dtucker.net/~dtucker/tmp/openssh-progname.patch failing that, try patch -l ? -- Darren Tucker (dtucker at zip.com.au) GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4 37C9 C982 80C7 8FF4 FA69 Good judgement comes with experience. Unfortunately, the experience usually comes from bad judgement.
On Tue, Feb 24, 2015 at 4:16 PM, Darren Tucker <dtucker at zip.com.au> wrote:> > Whitespace mangled in the mail? > > I put up a copy here: > http://www.dtucker.net/~dtucker/tmp/openssh-progname.patch > > failing that, try patch -l ? >That patch applies to the git clone I just pulled - so - guessing some ramdom whitespace, although I usually have no trouble grabbing patches from the raw email. I'll push it over and run the compile later, as I'm taking the wife to the Alton B rown show in just a bit. -- # include <stddisclaimer.h> /* Kevin Brott <Kevin.Brott at gmail.com> */