From: Alexander Dahl <post@lespocky.de>
Date: Wed, 5 Sep 2012 11:08:14 +0200
Subject: [PATCH] apply patches from ptxdist (9 patches in 1 commit)

---
 Makefile.in  |   64 ++++++++++++++++++++++++++++++++--------------------------
 src/cgi.c    |    2 +-
 src/string.c |    2 +-
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6056c0c..21e4ce9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,26 +1,32 @@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL = @INSTALL@ -D
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -D
+INSTALL_DATA = @INSTALL_DATA@ -D
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-SHAREDOPT = -shared
-LIBDIR = $(prefix)/lib
-INCDIR = $(prefix)/include
-MANDIR	= $(prefix)/man/man3
+SHAREDOPT = -shared -shared -fPIC,-Wl,-soname,libcgi.so.0
+libdir = $(prefix)/lib
+incdir = $(prefix)/include/libcgi
+mandir	= $(prefix)/man/man3
 SHELL = /bin/sh
 EXTRA_LIBS = 
 
 INCS =  -Isrc
-FLAGS = -Wall -fpic
+FLAGS = -Wall -D_REENTRANT
 
 OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \
 	src/string.o src/general.o src/list.o src/cookie.o
 
-.c.o: $(CC) $(FLAGS) -c $<
+SHOBJS = $(OBJS:.o=.sh.o)
 
-all: $(OBJS) src/libcgi.so
+%.o: %.c
+	$(CC) $(FLAGS) -c $*.c -o $@
+
+%.sh.o: %.c
+	$(CC) $(FLAGS) -fPIC -c $*.c -o $@
+
+all: src/libcgi.so src/libcgi.a
 
 	@echo ""
 	@echo ""
@@ -43,20 +49,19 @@ all: $(OBJS) src/libcgi.so
 
 
 shared: src/libcgi.so
-	cp src/libcgi.so $(LIBDIR)
+	$(INSTALL) -m 0644 src/libcgi.so $(DESTDIR)$(libdir)
 
 src/libcgi.a: $(OBJS)
 	$(AR) rc src/libcgi.a $(OBJS)
 
-src/libcgi.so: src/libcgi.a
-	$(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS)
+src/libcgi.so: $(SHOBJS)
+	$(CC) $(SHAREDOPT) -o src/libcgi.so $(SHOBJS) $(EXTRA_LIBS)
 
 install:
-	cp src/libcgi.a $(LIBDIR)
-	cp src/libcgi.so $(LIBDIR)
-	cp src/cgi.h $(INCDIR)
-	cp src/session.h $(INCDIR)
-
+	$(INSTALL) -m 0644 src/libcgi.a $(DESTDIR)/$(libdir)/libcgi.a
+	$(INSTALL) -m 0644 src/libcgi.so $(DESTDIR)/$(libdir)/libcgi.so
+	$(INSTALL) -m 0644 src/cgi.h $(DESTDIR)/$(incdir)/cgi.h
+	$(INSTALL) -m 0644 src/session.h $(DESTDIR)/$(incdir)/session.h
 
 src/error.o: src/error.c src/error.h
 src/cgi.o: src/cgi.c src/cgi.h
@@ -69,20 +74,21 @@ src/general.o: src/general.c
 src/list.o: src/list.c
 
 clean:
-	find src/ -name *.*o -exec rm -f {} \;
+	find src/ -name *.o -exec rm -f {} \;
 	find src/ -name *.a -exec rm -f {} \;
+	find src/ -name *.so -exec rm -f {} \;
 
 uninstall: clean
-	rm -f $(LIBDIR)/libcgi.*
-	rm -f $(INCDIR)/cgi.h
-	rm -f $(INCDIR)/session.h
-	rm -f $(MANDIR)/libcgi*
+	rm -f $(libdir)/libcgi.*
+	rm -f $(incdir)/cgi.h
+	rm -f $(incdir)/session.h
+	rm -f $(mandir)/libcgi*
 
 install_man:
-	cp doc/man/man3/libcgi_base64.3 $(MANDIR)
-	cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
-	cp doc/man/man3/libcgi_general.3 $(MANDIR)
-	cp doc/man/man3/libcgi_string.3 $(MANDIR)
-	cp doc/man/man3/libcgi_session.3 $(MANDIR)
-	cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
+	cp doc/man/man3/libcgi_base64.3 $(DESTDIR)$(mandir)
+	cp doc/man/man3/libcgi_cgi.3 $(DESTDIR)$(mandir)
+	cp doc/man/man3/libcgi_general.3 $(DESTDIR)$(mandir)
+	cp doc/man/man3/libcgi_string.3 $(DESTDIR)$(mandir)
+	cp doc/man/man3/libcgi_session.3 $(DESTDIR)$(mandir)
+	cp doc/man/man3/libcgi_cookie.3 $(DESTDIR)$(mandir)
 
diff --git a/src/cgi.c b/src/cgi.c
index fb37445..eca9ac2 100644
--- a/src/cgi.c
+++ b/src/cgi.c
@@ -336,7 +336,7 @@ void init_hex_table()
 	hextable['b'] = 11;
 	hextable['c'] = 12;
 	hextable['d'] = 13;
-	hextable['e'] = 13;
+	hextable['e'] = 14;
 	hextable['f'] = 15;
 	hextable['A'] = 10;
 	hextable['B'] = 11;
diff --git a/src/string.c b/src/string.c
index 2cfcbe2..3dc437f 100644
--- a/src/string.c
+++ b/src/string.c
@@ -584,7 +584,7 @@ char *make_string(char *s, ...)
 
 	va_start(ptr, s);
 
-	va_copy(bkp, str);
+	va_copy(bkp, ptr);
 	len = strlen(s);
 
 	while (*str) {