diff options
Diffstat (limited to 'net/netatalk/patches/patch-ae')
| -rw-r--r-- | net/netatalk/patches/patch-ae | 102 |
1 files changed, 27 insertions, 75 deletions
diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae index a2207bc4014..a824bf23677 100644 --- a/net/netatalk/patches/patch-ae +++ b/net/netatalk/patches/patch-ae @@ -1,79 +1,31 @@ -$NetBSD: patch-ae,v 1.1.1.1 1998/12/26 22:09:27 agc Exp $ +$NetBSD: patch-ae,v 1.2 1999/08/31 22:09:42 wrstuden Exp $ ---- libatalk/Makefile 1998/10/26 13:10:36 1.1 -+++ libatalk/Makefile 1998/10/26 13:14:24 -@@ -1,63 +1,15 @@ --ALL= asp atp nbp adouble util compat --LIBS= asp/asplib atp/atplib nbp/nbplib adouble/adoublelib \ -- util/utillib compat/compatlib --PLIBS= asp/asplib_p atp/atplib_p nbp/nbplib_p adouble/adoublelib_p \ -- util/utillib_p compat/compatlib_p --TAGSFILE=tags --CC=cc --INSTALL=install -+LIB= atalk +--- etc/atalkd/nbp.c Mon Oct 27 14:28:43 1997 ++++ etc/atalkd/nbp.c Mon Aug 30 06:52:31 1999 +@@ -86,7 +86,7 @@ + nn.nn_sat.sat_port = nt.nt_port; --all: libatalk.a -+.include "${.CURDIR}/asp/Makefile.inc" -+.include "${.CURDIR}/atp/Makefile.inc" -+.include "${.CURDIR}/nbp/Makefile.inc" -+.include "${.CURDIR}/adouble/Makefile.inc" -+.include "${.CURDIR}/util/Makefile.inc" -+.include "${.CURDIR}/compat/Makefile.inc" + /* object */ +- if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) { ++ if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) { + syslog( LOG_INFO, "nbp_packet: malformed packet" ); + return; + } +@@ -95,7 +95,7 @@ + data += nn.nn_objlen; --libatalk.a: ${LIBS} -- rm -rf tmp -- -mkdir tmp -- for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done -- (cd tmp; ar cr libatalk.a *.o; ranlib libatalk.a) -- mv tmp/libatalk.a libatalk.a -- ranlib libatalk.a -- rm -rf tmp tmp_p -- -mkdir tmp_p -- for i in ${ALL}; do (cd tmp_p; ar x ../$$i/$${i}lib_p); done -- (cd tmp_p; ar cr libatalk_p.a *.o; ranlib libatalk_p.a) -- mv tmp_p/libatalk_p.a libatalk_p.a -- ranlib libatalk_p.a -- rm -rf tmp_p -+CPPFLAGS= ${DEFS} ${OPTOPTS} -I${.CURDIR}/../include + /* type */ +- if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) { ++ if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) { + syslog( LOG_INFO, "nbp_packet: malformed packet" ); + return; + } +@@ -104,7 +104,7 @@ + data += nn.nn_typelen; --${ALL}: FRC -- cd $@; ${MAKE} ${MFLAGS} CC="${CC}" DEFS="${DEFS}" \ -- OPTOPTS="${OPTOPTS}" -+SHLIB_MAJOR= 1 -+SHLIB_MINOR= 0 - --asp/asplib: asp --atp/atplib: atp --nbp/nbplib: nbp --adouble/adoublelib: adouble --util/utillib: util --compat/compatlib: compat -- --FRC: -- --tags: -- for i in ${ALL}; do \ -- (cd $$i; ${MAKE} ${MFLAGS} DEFS="${DEFS}" \ -- TAGSFILE=../${TAGSFILE} tags); \ -- done -- --install: all -- -mkdir ${LIBDIR} -- ${INSTALL} -c libatalk.a ${LIBDIR}/libatalk.a -- (cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk.a) -- ${INSTALL} -c libatalk_p.a ${LIBDIR}/libatalk_p.a -- (cd ${LIBDIR}; ranlib ${LIBDIR}/libatalk_p.a) -- --clean: -- for i in ${ALL}; \ -- do (cd $$i; ${MAKE} ${MFLAGS} clean); \ -- done -- rm -f *[Ee]rrs libatalk.a libatalk_p.a -- rm -rf tmp tmp_p -- --depend: -- for i in ${ALL}; \ -- do (cd $$i; ${MAKE} ${MFLAGS} DEFS=${DEFS} depend); \ -- done -+.include <bsd.lib.mk> + /* zone */ +- if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) { ++ if ( data >= end || (*(unsigned char *)data > 32 ) || data + *data > end ) { + syslog( LOG_INFO, "nbp_packet: malformed packet" ); + return; + } |