org.handhelds.familiar/packages/libedit/files/20031222-debian-to-gentoo.patch

   1 diff -ur netbsd-cvs/Makefile libedit-20031222/Makefile
   2 --- netbsd-cvs/Makefile 2003-12-22 13:44:24.798012752 -0500
   3 +++ libedit-20031222/Makefile   2003-12-22 14:55:15.133863488 -0500
   4 @@ -5,6 +5,7 @@
   5
   6  WARNS= 3
   7  LIB=   edit
   8 +LIBS=-lncurses
   9
  10  OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
  11         parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
  12 @@ -22,9 +23,10 @@
  13         editline.3 tok_line.3 editline.3 tok_str.3
  14
  15  # For speed and debugging
  16 -#SRCS=   ${OSRCS} tokenizer.c history.c readline.c
  17 +SRCS=   ${OSRCS} tokenizer.c history.c readline.c vis.c unvis.c fgetln.c strlcat.c strlcpy.c
  18  # For protection
  19 -SRCS=  editline.c tokenizer.c history.c readline.c
  20 +#SRCS= editline.c tokenizer.c history.c readline.c
  21 +OOBJS= $(patsubst %.c,%.o,$(SRCS))
  22
  23  LIBEDITDIR?=${.CURDIR}
  24
  25 @@ -38,6 +40,7 @@
  26  CPPFLAGS+=-I. -I${.CURDIR}
  27  CPPFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
  28  CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT
  29 +CFLAGS+=-I. -include ../glibc-bsd-glue/bsdcompat.h -I../glibc-compat -I../glibc-bsd-glue
  30
  31  AHDR=vi.h emacs.h common.h
  32  ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
  33 @@ -46,46 +49,56 @@
  34  CLEANFILES+=   ${AHDR} fcns.h help.h fcns.c help.c
  35
  36  SUBDIR=        readline
  37 +HOST_SH=sh
  38 +LIBEDITDIR=.
  39 +all: .depend libedit.a libedit.so
  40
  41  vi.h: vi.c makelist
  42         ${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/vi.c \
  43 -           > ${.TARGET}.tmp && \
  44 -           mv ${.TARGET}.tmp ${.TARGET}
  45 +           > $@.tmp && \
  46 +           mv $@.tmp $@
  47
  48  emacs.h: emacs.c makelist
  49         ${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/emacs.c \
  50 -           > ${.TARGET}.tmp && \
  51 -           mv ${.TARGET}.tmp ${.TARGET}
  52 +           > $@.tmp && \
  53 +           mv $@.tmp $@
  54
  55  common.h: common.c makelist
  56         ${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/common.c \
  57 -           > ${.TARGET}.tmp && \
  58 -           mv ${.TARGET}.tmp ${.TARGET}
  59 +           > $@.tmp && \
  60 +           mv $@.tmp $@
  61
  62  fcns.h: ${AHDR} makelist
  63 -       ${HOST_SH} ${LIBEDITDIR}/makelist -fh ${AHDR} > ${.TARGET}.tmp && \
  64 -           mv ${.TARGET}.tmp ${.TARGET}
  65 +       ${HOST_SH} ${LIBEDITDIR}/makelist -fh ${AHDR} > $@.tmp && \
  66 +           mv $@.tmp $@
  67
  68  fcns.c: ${AHDR} fcns.h help.h makelist
  69 -       ${HOST_SH} ${LIBEDITDIR}/makelist -fc ${AHDR} > ${.TARGET}.tmp && \
  70 -           mv ${.TARGET}.tmp ${.TARGET}
  71 +       ${HOST_SH} ${LIBEDITDIR}/makelist -fc ${AHDR} > $@.tmp && \
  72 +           mv $@.tmp $@
  73
  74  help.c: ${ASRC} makelist
  75 -       ${HOST_SH} ${LIBEDITDIR}/makelist -bc ${ASRC} > ${.TARGET}.tmp && \
  76 -           mv ${.TARGET}.tmp ${.TARGET}
  77 +       ${HOST_SH} ${LIBEDITDIR}/makelist -bc ${ASRC} > $@.tmp && \
  78 +           mv $@.tmp $@
  79
  80  help.h: ${ASRC} makelist
  81 -       ${HOST_SH} ${LIBEDITDIR}/makelist -bh ${ASRC} > ${.TARGET}.tmp && \
  82 -           mv ${.TARGET}.tmp ${.TARGET}
  83 +       ${HOST_SH} ${LIBEDITDIR}/makelist -bh ${ASRC} > $@.tmp && \
  84 +           mv $@.tmp $@
  85
  86  editline.c: ${OSRCS}
  87 -       ${HOST_SH} ${LIBEDITDIR}/makelist -e ${.ALLSRC:T} > ${.TARGET}.tmp && \
  88 -           mv ${.TARGET}.tmp ${.TARGET}
  89 +       ${HOST_SH} ${LIBEDITDIR}/makelist -e ${.ALLSRC:T} > $@.tmp && \
  90 +           mv $@.tmp $@
  91
  92  test.o:        ${LIBEDITDIR}/TEST/test.c
  93
  94  test:  libedit.a test.o
  95 -       ${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermcap
  96 +       ${CC} ${LDFLAGS} ${.ALLSRC} -o $@ libedit.a ${LDADD} -ltermcap
  97
  98 -.include <bsd.lib.mk>
  99 -.include <bsd.subdir.mk>
 100 +.depend: vi.h emacs.h common.h fcns.h help.h help.c
 101 +       -mkdir .a .so
 102 +.c.o:
 103 +       ${CC} ${CFLAGS} -c $< -o .a/$*
 104 +       ${CC} ${CFLAGS} -fPIC -c $< -o .so/$*
 105 +libedit.a: ${OOBJS}
 106 +       ar -r $@ .a/*
 107 +libedit.so: ${OOBJS}
 108 +       ${CC} --shared -o $@ .so/* ${LIBS}
 109 diff -ur netbsd-cvs/el.c libedit-20031222/el.c
 110 --- netbsd-cvs/el.c     2003-12-22 13:44:25.474909848 -0500
 111 +++ libedit-20031222/el.c       2003-12-22 15:00:15.545194024 -0500
 112 @@ -439,8 +439,10 @@
 113                 static const char elpath[] = "/.editrc";
 114                 char path[MAXPATHLEN];
 115
 116 +#if 0
 117                 if (issetugid())
 118                         return (-1);
 119 +#endif
 120                 if ((ptr = getenv("HOME")) == NULL)
 121                         return (-1);
 122                 if (strlcpy(path, ptr, sizeof(path)) >= sizeof(path))