Date: Wed, 28 Jul 1999 16:31:53 +0200 (CEST) From: Andrej Brodnik (Andy) <brodnik@IBC.IskraSistemi.Si> To: brian@FreeBSD.org.uk (Brian Somers) Cc: rich@ruh-bath.swest.nhs.uk, freebsd-isdn@FreeBSD.ORG Subject: Re: sPPP, RAS, MD5, CHAP, ISDN, FreeBSD and WinNT Message-ID: <199907281431.QAA15353@Dolinca.IBC.IskraSistemi.Si> In-Reply-To: <199907281407.PAA02961@keep.lan.Awfulhak.org> from Brian Somers at "Jul 28, 1999 3: 7:58 pm"
next in thread | previous in thread | raw e-mail | index | archive | help
> Subject: Re: sPPP, RAS, MD5, CHAP, ISDN, FreeBSD and WinNT > Date: Wed, 28 Jul 1999 15:07:58 +0100 > From: Brian Somers <brian@FreeBSD.org.uk> > > > > -----Original Message----- > > > From: Andrej Brodnik [mailto:brodnik@IBC.IskraSistemi.Si] > > > Sent: 28 July 1999 14:14 > > > > > Hm, excuse me, where is the root directory of the ppp sources in my > > > ``/usr/src'' tree?-/ Brian, did you do it? > > > > Get the current PPP sources from http://www.freebsd.org/~brian/ and extract > > them to /usr/src/ppp or similar, then apply the patch from within this > > directory. > > If you unpack into /usr/src/ppp, you must go into > /usr/src/ppp/ppp-990728/ppp to apply the patches (otherwise > you end up with i4b.[ch] in the wrong directory). Yep, I was in the wrong directory -- one level too high.-) > You may have to hand-patch the Makefile (If a Makefile.rej is > produced). > From: "Wood, Richard" <rich@ruh-bath.swest.nhs.uk> > Subject: RE: sPPP, RAS, MD5, CHAP, ISDN, FreeBSD and WinNT > Date: Wed, 28 Jul 1999 15:14:18 +0100 > > You will need to patch it by hand. IIRC it is due to the line numbers being > a bit out, it's quite easy to see what needs to be modified and make the > appropriate changes. I see. Now I got only one patching failure: ==================================================================== Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r -N -u --exclude=CVS --exclude=*.o --exclude=*.gz --exclude=*.orig --exc lude=*.cat* --exclude=ppp --exclude=*.cat* --exclude=.??* ppp/Makefile 1/Makefil e |--- ppp/Makefile Sun May 16 13:26:41 1999 |+++ 1/Makefile Tue Jul 6 23:30:46 1999 -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 40. Hunk #2 succeeded at 76 (offset 9 lines). 1 out of 2 hunks failed--saving rejects to Makefile.rej ==================================================================== Hm, the "Makefile.rej" contains: ==================================================================== *************** *** 40,45 **** .endif .endif .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(RELEASE_CRUNCH) DISTRIBUTION=des CFLAGS+=-DHAVE_DES --- 40,51 ---- .endif .endif + .if defined(NOI4B) + CFLAGS+=-DNOI4B + .else + SRCS+= i4b.c + .endif + .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(RELEASE_CRUNCH) DISTRIBUTION=des CFLAGS+=-DHAVE_DES ==================================================================== I think I need to patch in the Makefile: ==================================================================== .if defined(NOALIAS) CFLAGS+=-DNOALIAS .else .if !defined(RELEASE_CRUNCH) SRCS+= alias_cmd.c LDADD+= -L../libhack -lalias DPADD+= ${LIBALIAS} .endif .endif .if exists(/usr/src/secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(RELEASE_CRUNCH) DISTRIBUTION=des CFLAGS+=-DHAVE_DES SRCS+= chap_ms.c LDADD+= -ldes DPADD+= ${LIBDES} .endif ==================================================================== into: ==================================================================== .if defined(NOALIAS) CFLAGS+=-DNOALIAS .else .if !defined(RELEASE_CRUNCH) SRCS+= alias_cmd.c LDADD+= -L../libhack -lalias DPADD+= ${LIBALIAS} .endif .endif .if defined(NOI4B) CFLAGS+=-DNOI4B .else SRCS+= i4b.c .endif .if exists(/usr/src/secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(RELEASE_CRUNCH) DISTRIBUTION=des CFLAGS+=-DHAVE_DES SRCS+= chap_ms.c LDADD+= -ldes DPADD+= ${LIBDES} .endif ==================================================================== Right? LPA To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199907281431.QAA15353>