package/libcgi/libcgi.patch

   1 --- libcgi-1.0.orig/src/cgi.c
   2 +++ libcgi-1.0/src/cgi.c
   3 @@ -336,7 +336,7 @@
   4         hextable['b'] = 11;
   5         hextable['c'] = 12;
   6         hextable['d'] = 13;
   7 -       hextable['e'] = 13;
   8 +       hextable['e'] = 14;
   9         hextable['f'] = 15;
  10         hextable['A'] = 10;
  11         hextable['B'] = 11;
  12 --- libcgi-1.0.orig/src/string.c
  13 +++ libcgi-1.0/src/string.c
  14 @@ -584,7 +584,7 @@
  15
  16         va_start(ptr, s);
  17
  18 -       va_copy(bkp, str);
  19 +       va_copy(bkp, ptr);
  20         len = strlen(s);
  21
  22         while (*str) {
  23 --- libcgi-1.0.orig/Makefile.in
  24 +++ libcgi-1.0/Makefile.in
  25 @@ -5,22 +5,27 @@
  26  prefix = @prefix@
  27  exec_prefix = @exec_prefix@
  28
  29 -SHAREDOPT = -shared
  30 +SHAREDOPT = -shared -fPIC,-Wl,-soname,libcgi.so.0
  31  LIBDIR = $(prefix)/lib
  32 -INCDIR = $(prefix)/include
  33 +INCDIR = $(prefix)/include/libcgi/
  34  MANDIR = $(prefix)/man/man3
  35  SHELL = /bin/sh
  36  EXTRA_LIBS =
  37
  38  INCS =  -Isrc
  39 -FLAGS = -Wall -fpic
  40 +FLAGS = -Wall -D_REENTRANT
  41
  42  OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \
  43         src/string.o src/general.o src/list.o src/cookie.o
  44 +SHOBJS=$(OBJS:.o=.sh.o)
  45
  46 -.c.o: $(CC) $(FLAGS) -c $<
  47 +%.o: %.c
  48 +       $(CC) $(FLAGS) -c $*.c -o $@
  49
  50 -all: $(OBJS) src/libcgi.so
  51 +%.sh.o: %.c
  52 +       $(CC) $(FLAGS) -fPIC -c $*.c -o $@
  53 +
  54 +all: src/libcgi.so src/libcgi.a
  55
  56         @echo ""
  57         @echo ""
  58 @@ -48,14 +53,15 @@
  59  src/libcgi.a: $(OBJS)
  60         $(AR) rc src/libcgi.a $(OBJS)
  61
  62 -src/libcgi.so: src/libcgi.a
  63 -       $(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS)
  64 +src/libcgi.so: $(SHOBJS)
  65 +       $(CC) $(SHAREDOPT) -o src/libcgi.so $(SHOBJS) $(EXTRA_LIBS)
  66
  67  install:
  68 -       cp src/libcgi.a $(LIBDIR)
  69 -       cp src/libcgi.so $(LIBDIR)
  70 -       cp src/cgi.h $(INCDIR)
  71 -       cp src/session.h $(INCDIR)
  72 +       cp src/libcgi.a $(DESTDIR)/$(LIBDIR)
  73 +       cp src/libcgi.so $(DESTDIR)/$(LIBDIR)
  74 +       [ -d $(DESTDIR)/$(INCDIR) ] || mkdir $(DESTDIR)/$(INCDIR)
  75 +       cp src/cgi.h $(DESTDIR)/$(INCDIR)
  76 +       cp src/session.h $(DESTDIR)/$(INCDIR)
  77
  78
  79  src/error.o: src/error.c src/error.h
  80 @@ -69,8 +75,9 @@
  81  src/list.o: src/list.c
  82
  83  clean:
  84 -       find src/ -name *.*o -exec rm -f {} \;
  85 +       find src/ -name *.o -exec rm -f {} \;
  86         find src/ -name *.a -exec rm -f {} \;
  87 +       find src/ -name *.so -exec rm -f {} \;
  88
  89  uninstall: clean
  90         rm -f $(LIBDIR)/libcgi.*
  91 @@ -78,11 +85,11 @@
  92         rm -f $(INCDIR)/session.h
  93         rm -f $(MANDIR)/libcgi*
  94
  95 -install_man:
  96 -       cp doc/man/man3/libcgi_base64.3 $(MANDIR)
  97 -       cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
  98 -       cp doc/man/man3/libcgi_general.3 $(MANDIR)
  99 -       cp doc/man/man3/libcgi_string.3 $(MANDIR)
 100 -       cp doc/man/man3/libcgi_session.3 $(MANDIR)
 101 -       cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
 102 +#install_man:
 103 +#      cp doc/man/man3/libcgi_base64.3 $(MANDIR)
 104 +#      cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
 105 +#      cp doc/man/man3/libcgi_general.3 $(MANDIR)
 106 +#      cp doc/man/man3/libcgi_string.3 $(MANDIR)
 107 +#      cp doc/man/man3/libcgi_session.3 $(MANDIR)
 108 +#      cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
 109