@@ -1,3 +1,12 @@

+Thu Mar  8 20:34:36 EET 2007 (edwin)

+---------------------------------

+  * contrib/entitynorm/: fix entity list generator to support more entities,

+  including & (bb #391)

+  * libclamav/entitylist.h: new entitylist generated using

+  contrib/entitynorm/generate_entitylist (bb #391)

+  * libclamav/hashtab.c: fix bug in growing hash tables (must use hash on new

+  table) 

+

 Thu Mar  8 12:22:36 CET 2007 (tk)

 ---------------------------------

   * libclamav/readdb.c: call cli_dconf_print() from cl_build()

@@ -45,7 +54,7 @@ Mon Mar  5 19:10:11 CET 2007 (tk)

 ---------------------------------

   * configure: add GNU/Hurd support (bb#363)

-Fri Mar  2 19:36:00 CEST 2007 (edwin)

+Fri Mar  2 19:36:00 EET 2007 (edwin)

 -------------------------------------

    * libclamav/htmlnorm.c: ampersands were missed in URLs. (bb #377)

@@ -33,7 +33,8 @@ POST_UNINSTALL = :

 build_triplet = x86_64-unknown-linux-gnu

 host_triplet = x86_64-unknown-linux-gnu

 noinst_PROGRAMS = fixdb$(EXEEXT) postprocessdb$(EXEEXT) \

-	generate_entitylist$(EXEEXT)

+	generate_entitylist$(EXEEXT) \

+	generate_encoding_aliases$(EXEEXT)

 subdir = .

 DIST_COMMON = README $(am__configure_deps) \

 	$(srcdir)/../../config.guess $(srcdir)/../../config.sub \

@@ -55,6 +56,12 @@ PROGRAMS = $(noinst_PROGRAMS)

 am_fixdb_OBJECTS = fixdb.$(OBJEXT)

 fixdb_OBJECTS = $(am_fixdb_OBJECTS)

 fixdb_DEPENDENCIES = $(clam_builddir)/libclamav/libclamav.la

+am_generate_encoding_aliases_OBJECTS =  \

+	generate_encoding_aliases.$(OBJEXT)

+generate_encoding_aliases_OBJECTS =  \

+	$(am_generate_encoding_aliases_OBJECTS)

+generate_encoding_aliases_DEPENDENCIES =  \

+	$(clam_builddir)/libclamav/libclamav.la

 am_generate_entitylist_OBJECTS = generate_entitylist.$(OBJEXT)

 generate_entitylist_OBJECTS = $(am_generate_entitylist_OBJECTS)

 generate_entitylist_DEPENDENCIES =  \

@@ -74,10 +81,10 @@ CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

 	$(LDFLAGS) -o $@

-SOURCES = $(fixdb_SOURCES) $(generate_entitylist_SOURCES) \

-	$(postprocessdb_SOURCES)

-DIST_SOURCES = $(fixdb_SOURCES) $(generate_entitylist_SOURCES) \

-	$(postprocessdb_SOURCES)

+SOURCES = $(fixdb_SOURCES) $(generate_encoding_aliases_SOURCES) \

+	$(generate_entitylist_SOURCES) $(postprocessdb_SOURCES)

+DIST_SOURCES = $(fixdb_SOURCES) $(generate_encoding_aliases_SOURCES) \

+	$(generate_entitylist_SOURCES) $(postprocessdb_SOURCES)

 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

 	html-recursive info-recursive install-data-recursive \

 	install-dvi-recursive install-exec-recursive \

@@ -101,16 +108,16 @@ DIST_ARCHIVES = $(distdir).tar.gz

 GZIP_ENV = --best

 distuninstallcheck_listfiles = find . -type f -print

 distcleancheck_listfiles = find . -type f -print

-ACLOCAL = ${SHELL} /home/edwin/clam/clamav-devel/missing --run aclocal-1.10

-AMTAR = ${SHELL} /home/edwin/clam/clamav-devel/missing --run tar

+ACLOCAL = ${SHELL} /home/edwin/clam/svn2/trunk/missing --run aclocal-1.10

+AMTAR = ${SHELL} /home/edwin/clam/svn2/trunk/missing --run tar

 AR = ar

-AUTOCONF = ${SHELL} /home/edwin/clam/clamav-devel/missing --run autoconf

-AUTOHEADER = ${SHELL} /home/edwin/clam/clamav-devel/missing --run autoheader

-AUTOMAKE = ${SHELL} /home/edwin/clam/clamav-devel/missing --run automake-1.10

+AUTOCONF = ${SHELL} /home/edwin/clam/svn2/trunk/missing --run autoconf

+AUTOHEADER = ${SHELL} /home/edwin/clam/svn2/trunk/missing --run autoheader

+AUTOMAKE = ${SHELL} /home/edwin/clam/svn2/trunk/missing --run automake-1.10

 AWK = gawk

 CC = gcc

 CCDEPMODE = depmode=gcc3

-CFLAGS = -D_FORTIFY_SOURCE=2 -fstack-protector -g3 -march=k8 -pedantic -W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wdisabled-optimization -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-unused-parameter -Wpointer-arith -Wshadow -Wstack-protector -Wstrict-prototypes -Wswitch -Wundef -Wwrite-strings 

+CFLAGS = -mfpmath=sse -msse -msse2 -m3dnow -mmmx -D_FORTIFY_SOURCE=2 -fstack-protector -march=k8 -pedantic -g3 -Wextra -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wdisabled-optimization -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-unused-parameter -Wpointer-arith -Wshadow -Wstack-protector -Wstrict-prototypes -Wswitch -Wundef -Wwrite-strings

 CPP = gcc -E

 CPPFLAGS = 

 CXX = g++

@@ -140,7 +147,7 @@ LIBS =

 LIBTOOL = $(SHELL) $(top_builddir)/libtool

 LN_S = ln -s

 LTLIBOBJS = 

-MAKEINFO = ${SHELL} /home/edwin/clam/clamav-devel/missing --run makeinfo

+MAKEINFO = ${SHELL} /home/edwin/clam/svn2/trunk/missing --run makeinfo

 MKDIR_P = /bin/mkdir -p

 OBJEXT = o

 PACKAGE = fixdb

@@ -154,11 +161,11 @@ RANLIB = ranlib

 SET_MAKE = 

 SHELL = /bin/sh

 STRIP = strip

-VERSION = 20061119

-abs_builddir = /home/edwin/clam/clamav-devel/contrib/entitynorm

-abs_srcdir = /home/edwin/clam/clamav-devel/contrib/entitynorm

-abs_top_builddir = /home/edwin/clam/clamav-devel/contrib/entitynorm

-abs_top_srcdir = /home/edwin/clam/clamav-devel/contrib/entitynorm

+VERSION = 20070308

+abs_builddir = /home/edwin/clam/svn2/trunk/contrib/entitynorm

+abs_srcdir = /home/edwin/clam/svn2/trunk/contrib/entitynorm

+abs_top_builddir = /home/edwin/clam/svn2/trunk/contrib/entitynorm

+abs_top_srcdir = /home/edwin/clam/svn2/trunk/contrib/entitynorm

 ac_ct_CC = gcc

 ac_ct_CXX = g++

 ac_ct_F77 = 

@@ -187,7 +194,7 @@ host_vendor = unknown

 htmldir = ${docdir}

 includedir = ${prefix}/include

 infodir = ${datarootdir}/info

-install_sh = $(SHELL) /home/edwin/clam/clamav-devel/install-sh

+install_sh = $(SHELL) /home/edwin/clam/svn2/trunk/install-sh

 libdir = ${exec_prefix}/lib

 libexecdir = ${exec_prefix}/libexec

 localedir = ${datarootdir}/locale

@@ -218,6 +225,9 @@ postprocessdb_LDADD = $(clam_builddir)/libclamav/libclamav.la

 generate_entitylist_SOURCES = generate_entitylist.c

 generate_entitylist_INCLUDES = 

 generate_entitylist_LDADD = $(clam_builddir)/libclamav/libclamav.la

+generate_encoding_aliases_SOURCES = generate_encoding_aliases.c

+generate_encoding_aliases_INCLUDES = 

+generate_encoding_aliases_LDADD = $(clam_builddir)/libclamav/libclamav.la

 INCLUDES = -I$(top_srcdir) -I$(clam_builddir) -I$(clam_builddir)/shared -I$(clam_builddir)/libclamav

 all: test-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -284,6 +294,9 @@ clean-noinstPROGRAMS:

 fixdb$(EXEEXT): $(fixdb_OBJECTS) $(fixdb_DEPENDENCIES) 

 	@rm -f fixdb$(EXEEXT)

 	$(LINK) $(fixdb_OBJECTS) $(fixdb_LDADD) $(LIBS)

+generate_encoding_aliases$(EXEEXT): $(generate_encoding_aliases_OBJECTS) $(generate_encoding_aliases_DEPENDENCIES) 

+	@rm -f generate_encoding_aliases$(EXEEXT)

+	$(LINK) $(generate_encoding_aliases_OBJECTS) $(generate_encoding_aliases_LDADD) $(LIBS)

 generate_entitylist$(EXEEXT): $(generate_entitylist_OBJECTS) $(generate_entitylist_DEPENDENCIES) 

 	@rm -f generate_entitylist$(EXEEXT)

 	$(LINK) $(generate_entitylist_OBJECTS) $(generate_entitylist_LDADD) $(LIBS)

@@ -298,6 +311,7 @@ distclean-compile:

 	-rm -f *.tab.c

 include ./$(DEPDIR)/fixdb.Po

+include ./$(DEPDIR)/generate_encoding_aliases.Po

 include ./$(DEPDIR)/generate_entitylist.Po

 include ./$(DEPDIR)/postprocess.Po

deleted file mode 100644

@@ -1,122 +0,0 @@

-

-<!--

-     File isopub.ent produced by the XSL script entities.xsl

-     from input data in unicode.xml.

-

-     Please report any errors to David Carlisle

-     via the public W3C list www-math@w3.org.

-

-     The numeric character values assigned to each entity

-     (should) match the Unicode assignments in Unicode 4.0.

-

-     (C) International Organization for Standardization 2003

-     Permission to copy in any form is granted for use with

-     conforming SGML systems and applications as defined in

-     ISO 8879, provided this notice is included in all copies.

-

-

-

-<!-- 

-     Version: $Id: isopub(2).ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $

-

-       Public identifier: ISO 9573-13:2003//ENTITIES Publishing//EN//XML

-       System identifier: http://www.w3.org/2003/entities/iso9573-2003/isopub.ent

-

-     The public identifier should always be used verbatim.

-     The system identifier may be changed to suit local requirements.

-

-     Typical invocation:

-

-       <!ENTITY % isopub PUBLIC

-         "ISO 9573-13:2003//ENTITIES Publishing//EN//XML"

-         "http://www.w3.org/2003/entities/iso9573-2003/isopub.ent"

-       >

-       %isopub;

-

-

-<!ENTITY blank            "&#x02423;" ><!--OPEN BOX -->

-<!ENTITY blk12            "&#x02592;" ><!--MEDIUM SHADE -->

-<!ENTITY blk14            "&#x02591;" ><!--LIGHT SHADE -->

-<!ENTITY blk34            "&#x02593;" ><!--DARK SHADE -->

-<!ENTITY block            "&#x02588;" ><!--FULL BLOCK -->

-<!ENTITY bull             "&#x02022;" ><!--BULLET -->

-<!ENTITY caret            "&#x02041;" ><!--CARET INSERTION POINT -->

-<!ENTITY check            "&#x02713;" ><!--CHECK MARK -->

-<!ENTITY cir              "&#x025CB;" ><!--WHITE CIRCLE -->

-<!ENTITY clubs            "&#x02663;" ><!--BLACK CLUB SUIT -->

-<!ENTITY copysr           "&#x02117;" ><!--SOUND RECORDING COPYRIGHT -->

-<!ENTITY cross            "&#x02717;" ><!--BALLOT X -->

-<!ENTITY Dagger           "&#x02021;" ><!--DOUBLE DAGGER -->

-<!ENTITY dagger           "&#x02020;" ><!--DAGGER -->

-<!ENTITY dash             "&#x02010;" ><!--HYPHEN -->

-<!ENTITY diams            "&#x02666;" ><!--BLACK DIAMOND SUIT -->

-<!ENTITY dlcrop           "&#x0230D;" ><!--BOTTOM LEFT CROP -->

-<!ENTITY drcrop           "&#x0230C;" ><!--BOTTOM RIGHT CROP -->

-<!ENTITY dtri             "&#x025BF;" ><!--WHITE DOWN-POINTING SMALL TRIANGLE -->

-<!ENTITY dtrif            "&#x025BE;" ><!--BLACK DOWN-POINTING SMALL TRIANGLE -->

-<!ENTITY emsp             "&#x02003;" ><!--EM SPACE -->

-<!ENTITY emsp13           "&#x02004;" ><!--THREE-PER-EM SPACE -->

-<!ENTITY emsp14           "&#x02005;" ><!--FOUR-PER-EM SPACE -->

-<!ENTITY ensp             "&#x02002;" ><!--EN SPACE -->

-<!ENTITY female           "&#x02640;" ><!--FEMALE SIGN -->

-<!ENTITY ffilig           "&#x0FB03;" ><!--LATIN SMALL LIGATURE FFI -->

-<!ENTITY fflig            "&#x0FB00;" ><!--LATIN SMALL LIGATURE FF -->

-<!ENTITY ffllig           "&#x0FB04;" ><!--LATIN SMALL LIGATURE FFL -->

-<!ENTITY filig            "&#x0FB01;" ><!--LATIN SMALL LIGATURE FI -->

-<!ENTITY flat             "&#x0266D;" ><!--MUSIC FLAT SIGN -->

-<!ENTITY fllig            "&#x0FB02;" ><!--LATIN SMALL LIGATURE FL -->

-<!ENTITY frac13           "&#x02153;" ><!--VULGAR FRACTION ONE THIRD -->

-<!ENTITY frac15           "&#x02155;" ><!--VULGAR FRACTION ONE FIFTH -->

-<!ENTITY frac16           "&#x02159;" ><!--VULGAR FRACTION ONE SIXTH -->

-<!ENTITY frac23           "&#x02154;" ><!--VULGAR FRACTION TWO THIRDS -->

-<!ENTITY frac25           "&#x02156;" ><!--VULGAR FRACTION TWO FIFTHS -->

-<!ENTITY frac35           "&#x02157;" ><!--VULGAR FRACTION THREE FIFTHS -->

-<!ENTITY frac45           "&#x02158;" ><!--VULGAR FRACTION FOUR FIFTHS -->

-<!ENTITY frac56           "&#x0215A;" ><!--VULGAR FRACTION FIVE SIXTHS -->

-<!ENTITY hairsp           "&#x0200A;" ><!--HAIR SPACE -->

-<!ENTITY hearts           "&#x02665;" ><!--BLACK HEART SUIT -->

-<!ENTITY hellip           "&#x02026;" ><!--HORIZONTAL ELLIPSIS -->

-<!ENTITY hybull           "&#x02043;" ><!--HYPHEN BULLET -->

-<!ENTITY incare           "&#x02105;" ><!--CARE OF -->

-<!ENTITY ldquor           "&#x0201E;" ><!--DOUBLE LOW-9 QUOTATION MARK -->

-<!ENTITY lhblk            "&#x02584;" ><!--LOWER HALF BLOCK -->

-<!ENTITY loz              "&#x025CA;" ><!--LOZENGE -->

-<!ENTITY lozf             "&#x029EB;" ><!--BLACK LOZENGE -->

-<!ENTITY lsquor           "&#x0201A;" ><!--SINGLE LOW-9 QUOTATION MARK -->

-<!ENTITY ltri             "&#x025C3;" ><!--WHITE LEFT-POINTING SMALL TRIANGLE -->

-<!ENTITY ltrif            "&#x025C2;" ><!--BLACK LEFT-POINTING SMALL TRIANGLE -->

-<!ENTITY male             "&#x02642;" ><!--MALE SIGN -->

-<!ENTITY malt             "&#x02720;" ><!--MALTESE CROSS -->

-<!ENTITY marker           "&#x025AE;" ><!--BLACK VERTICAL RECTANGLE -->

-<!ENTITY mdash            "&#x02014;" ><!--EM DASH -->

-<!ENTITY mldr             "&#x02026;" ><!--HORIZONTAL ELLIPSIS -->

-<!ENTITY natur            "&#x0266E;" ><!--MUSIC NATURAL SIGN -->

-<!ENTITY ndash            "&#x02013;" ><!--EN DASH -->

-<!ENTITY nldr             "&#x02025;" ><!--TWO DOT LEADER -->

-<!ENTITY numsp            "&#x02007;" ><!--FIGURE SPACE -->

-<!ENTITY phone            "&#x0260E;" ><!--BLACK TELEPHONE -->

-<!ENTITY puncsp           "&#x02008;" ><!--PUNCTUATION SPACE -->

-<!ENTITY rdquor           "&#x0201D;" ><!--RIGHT DOUBLE QUOTATION MARK -->

-<!ENTITY rect             "&#x025AD;" ><!--WHITE RECTANGLE -->

-<!ENTITY rsquor           "&#x02019;" ><!--RIGHT SINGLE QUOTATION MARK -->

-<!ENTITY rtri             "&#x025B9;" ><!--WHITE RIGHT-POINTING SMALL TRIANGLE -->

-<!ENTITY rtrif            "&#x025B8;" ><!--BLACK RIGHT-POINTING SMALL TRIANGLE -->

-<!ENTITY rx               "&#x0211E;" ><!--PRESCRIPTION TAKE -->

-<!ENTITY sext             "&#x02736;" ><!--SIX POINTED BLACK STAR -->

-<!ENTITY sharp            "&#x0266F;" ><!--MUSIC SHARP SIGN -->

-<!ENTITY spades           "&#x02660;" ><!--BLACK SPADE SUIT -->

-<!ENTITY squ              "&#x025A1;" ><!--WHITE SQUARE -->

-<!ENTITY squf             "&#x025AA;" ><!--BLACK SMALL SQUARE -->

-<!ENTITY star             "&#x02606;" ><!--WHITE STAR -->

-<!ENTITY starf            "&#x02605;" ><!--BLACK STAR -->

-<!ENTITY target           "&#x02316;" ><!--POSITION INDICATOR -->

-<!ENTITY telrec           "&#x02315;" ><!--TELEPHONE RECORDER -->

-<!ENTITY thinsp           "&#x02009;" ><!--THIN SPACE -->

-<!ENTITY uhblk            "&#x02580;" ><!--UPPER HALF BLOCK -->

-<!ENTITY ulcrop           "&#x0230F;" ><!--TOP LEFT CROP -->

-<!ENTITY urcrop           "&#x0230E;" ><!--TOP RIGHT CROP -->

-<!ENTITY utri             "&#x025B5;" ><!--WHITE UP-POINTING SMALL TRIANGLE -->

-<!ENTITY utrif            "&#x025B4;" ><!--BLACK UP-POINTING SMALL TRIANGLE -->

-<!ENTITY vellip           "&#x022EE;" ><!--VERTICAL ELLIPSIS -->

@@ -22,7 +22,7 @@

 #include <others.h>

 #include <htmlnorm.h>

 #include <hashtab.h>

-#include <entitiesConverter.h>

+#include <entconv.h>

 #include <string.h>

 static const struct {

@@ -23,7 +23,7 @@

 #include <others.h>

 #include <htmlnorm.h>

 #include <hashtab.h>

-#include <entitiesConverter.h>

+#include <entconv.h>

 #include <regex.h>

 #include <sys/types.h>

 #include <dirent.h>

@@ -46,19 +46,36 @@ static char* extract_str(const char* l,const regmatch_t* pmatch)

 }

 static regex_t entity_regex;

+static const char ent_head[]="<!ENTITY";

+static const size_t ent_head_size = sizeof(ent_head);

 static int entity_extract(const char* line,char* entity_name,int* entity_value)

 {

-	regmatch_t pmatch[3];

+	regmatch_t pmatch[5];

-	if(regexec(&entity_regex,line,3,pmatch,0)==0) {

+	if(regexec(&entity_regex,line,5,pmatch,0)==0) {

 		const char* entity_val;

-		strncpy(entity_name,extract_str(line,&pmatch[1]),MAX_LINE); 

-		entity_val  = extract_str(line,&pmatch[2]);

-		if(sscanf( entity_val,"%d",entity_value)!=1)

-			return -2;

+		strncpy(entity_name,extract_str(line,&pmatch[1]),MAX_LINE);

+		entity_val  = extract_str(line,&pmatch[3]);

+		if(entity_val[0] == 'x') {

+			if(sscanf(entity_val+1,"%x",entity_value)!=1)

+				return -2;

+		}

+		else {

+			if(sscanf( entity_val,"%d",entity_value)!=1)

+				return -2;

+		}

+		if(*entity_value > 65535) {

+			fprintf(stderr,"Entity value outside of utf-16 range:%u; %s\n",*entity_value,line);

+			return 0;

+		}

 		return 1;

 	}

-	else return 0;	

+	else {

+		if(strncmp(line,ent_head,ent_head_size-1)==0) {

+			fprintf(stderr,"Unable to interpret entity decl:%s\n",line);

+		}

+		return 0;	

+	}

 }

 static void loadEntitiesFromFile(const char* file,struct hashtable* s,char* xt[])

 {

@@ -89,8 +106,10 @@ static void loadEntitiesFromFile(const char* file,struct hashtable* s,char* xt[]

 			}

 			if(xt[val] && strcmp(xt[val],name))

 				cli_dbgmsg("Duplicate entity reference to same code:%s->%d<-%s\n",name,val,xt[val]);

-			else if(xt[val])

-				printf("%s:%d\n",xt[val],val);

+			else if(xt[val]) {

+				fprintf(stderr,"Impossible: element not found in hashtable, but we did add it!! %s:%d:%s:%p\n",xt[val],val,name,elem);

+				abort();

+			}

 			xt[val] = strdup(name);

 			hashtab_insert(s,name,strlen(name),val);

 		}

@@ -103,7 +122,7 @@ static void init_entity_parser(void)

 {

 	int rc;

 	char errbuff[MAX_LINE];

-	if(( rc = regcomp(&entity_regex,".*<!ENTITY +([^ ]+) +\"&#([0-9]+);\">.*",REG_EXTENDED) )) {

+	if(( rc = regcomp(&entity_regex,".*<!ENTITY +([^ \t]+) +\" *&(#38;)?#(([0-9]+)|x([0-9a-fA-F])+); *\" *>.*",REG_EXTENDED) )) {

 		regerror(rc,&entity_regex,errbuff,MAX_LINE);

 		fprintf(stderr,"Error compiling regex:%s\n",errbuff);

 		exit(1);

@@ -1,7 +1,7 @@

 #! /bin/sh

 # libtoolT - Provide generalized library-building support services.

-# Generated automatically by  (GNU fixdb 20061119)

+# Generated automatically by  (GNU fixdb 20070308)

 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

 #

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001

@@ -85,7 +85,7 @@ AR_FLAGS="cru"

 LTCC="gcc"

 # LTCC compiler flags.

-LTCFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector -g3 -march=k8 -pedantic -W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wdisabled-optimization -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-unused-parameter -Wpointer-arith -Wshadow -Wstack-protector -Wstrict-prototypes -Wswitch -Wundef -Wwrite-strings "

+LTCFLAGS="-mfpmath=sse -msse -msse2 -m3dnow -mmmx -D_FORTIFY_SOURCE=2 -fstack-protector -march=k8 -pedantic -g3 -Wextra -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wdisabled-optimization -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-unused-parameter -Wpointer-arith -Wshadow -Wstack-protector -Wstrict-prototypes -Wswitch -Wundef -Wwrite-strings"

 # A language-specific compiler.

 CC="gcc"

@@ -328,7 +328,7 @@ link_all_deplibs=no

 sys_lib_search_path_spec=" /usr/lib/gcc/x86_64-linux-gnu/4.1.2/ /usr/lib/gcc/x86_64-linux-gnu/4.1.2/ /usr/lib/gcc/x86_64-linux-gnu/4.1.2/../../../../x86_64-linux-gnu/lib/x86_64-linux-gnu/4.1.2/ /usr/lib/gcc/x86_64-linux-gnu/4.1.2/../../../../x86_64-linux-gnu/lib/ /usr/lib/gcc/x86_64-linux-gnu/4.1.2/../../../x86_64-linux-gnu/4.1.2/ /usr/lib/gcc/x86_64-linux-gnu/4.1.2/../../../ /lib/x86_64-linux-gnu/4.1.2/ /lib/ /usr/lib/x86_64-linux-gnu/4.1.2/ /usr/lib/"

 # Run-time system search path for libraries

-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib "

+sys_lib_dlsearch_path_spec="/lib /usr/lib "

 # Fix the shell variable $srcfile for the compiler.

 fix_srcfile_path=""

@@ -353,7 +353,7 @@ include_expsyms=""

 # ltmain.sh - Provide generalized library-building support services.

 # NOTE: Changing this file will not affect anything until you rerun configure.

 #

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001

+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005

 # Free Software Foundation, Inc.

 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

 #

@@ -369,13 +369,41 @@ include_expsyms=""

 #

 # You should have received a copy of the GNU General Public License

 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 #

 # As a special exception to the GNU General Public License, if you

 # distribute this file as part of a program that contains a

 # configuration script generated by Autoconf, you may include it under

 # the same distribution terms that you use for the rest of that program.

+basename="s,^.*/,,g"

+

+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh

+# is ksh but when the shell is invoked as "sh" and the current value of

+# the _XPG environment variable is not equal to 1 (one), the special

+# positional parameter $0, within a function call, is the name of the

+# function.

+progpath="$0"

+

+# The name of this program:

+progname=`echo "$progpath" | $SED $basename`

+modename="$progname"

+

+# Global variables:

+EXIT_SUCCESS=0

+EXIT_FAILURE=1

+

+PROGRAM=ltmain.sh

+PACKAGE=libtool

+VERSION="1.5.22 Debian 1.5.22-4"

+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"

+

+# See if we are running on zsh, and set the options which allow our

+# commands through without removal of \ escapes.

+if test -n "${ZSH_VERSION+set}" ; then

+  setopt NO_GLOB_SUBST

+fi

+

 # Check that we have a working $echo.

 if test "X$1" = X--no-reexec; then

   # Discard the --no-reexec flag, and continue.

@@ -388,7 +416,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then

   :

 else

   # Restart under the correct shell, and then maybe $echo will work.

-  exec $SHELL "$0" --no-reexec ${1+"$@"}

+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}

 fi

 if test "X$1" = X--fallback-echo; then

@@ -397,19 +425,9 @@ if test "X$1" = X--fallback-echo; then

   cat <<EOF

 $*

 EOF

-  exit 0

+  exit $EXIT_SUCCESS

 fi

-# The name of this program.

-progname=`$echo "$0" | sed 's%^.*/%%'`

-modename="$progname"

-

-# Constants.

-PROGRAM=ltmain.sh

-PACKAGE=libtool

-VERSION=1.4.2a

-TIMESTAMP=" (1.922.2.79 2001/11/28 21:50:31)"

-

 default_mode=

 help="Try \`$progname --help' for more information."

 magic="%%%MAGIC variable%%%"

@@ -419,10 +437,20 @@ rm="rm -f"

 # Sed substitution that helps us do robust quoting.  It backslashifies

 # metacharacters that are still active within double-quoted strings.

-Xsed='sed -e 1s/^X//'

+Xsed="${SED}"' -e 1s/^X//'

 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'

-SP2NL='tr \040 \012'

-NL2SP='tr \015\012 \040\040'

+# test EBCDIC or ASCII

+case `echo X|tr X '\101'` in

+ A) # ASCII based system

+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr

+  SP2NL='tr \040 \012'

+  NL2SP='tr \015\012 \040\040'

+  ;;

+ *) # EBCDIC based system

+  SP2NL='tr \100 \n'

+  NL2SP='tr \r\n \100\100'

+  ;;

+esac

 # NLS nuisances.

 # Only set LANG and LC_ALL to C if already set.

@@ -437,12 +465,14 @@ if test "${LANG+set}" = set; then

 fi

 # Make sure IFS has a sensible default

-: ${IFS=" 	"}

+lt_nl='

+'

+IFS=" 	$lt_nl"

 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then

-  echo "$modename: not configured to build any kind of library" 1>&2

-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2

-  exit 1

+  $echo "$modename: not configured to build any kind of library" 1>&2

+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2

+  exit $EXIT_FAILURE

 fi

 # Global variables.

@@ -454,11 +484,268 @@ run=

 show="$echo"

 show_help=

 execute_dlfiles=

+duplicate_deps=no

+preserve_args=

 lo2o="s/\\.lo\$/.${objext}/"

 o2lo="s/\\.${objext}\$/.lo/"

+#####################################

+# Shell function definitions:

+# This seems to be the best place for them

+

+# func_mktempdir [string]

+# Make a temporary directory that won't clash with other running

+# libtool processes, and avoids race conditions if possible.  If

+# given, STRING is the basename for that directory.

+func_mktempdir ()

+{

+    my_template="${TMPDIR-/tmp}/${1-$progname}"

+

+    if test "$run" = ":"; then

+      # Return a directory name, but don't create it in dry-run mode

+      my_tmpdir="${my_template}-$$"

+    else

+

+      # If mktemp works, use that first and foremost

+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`

+

+      if test ! -d "$my_tmpdir"; then

+	# Failing that, at least try and use $RANDOM to avoid a race

+	my_tmpdir="${my_template}-${RANDOM-0}$$"

+

+	save_mktempdir_umask=`umask`

+	umask 0077

+	$mkdir "$my_tmpdir"

+	umask $save_mktempdir_umask

+      fi

+

+      # If we're not in dry-run mode, bomb out on failure

+      test -d "$my_tmpdir" || {

+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2

+	exit $EXIT_FAILURE

+      }

+    fi

+

+    $echo "X$my_tmpdir" | $Xsed

+}

+

+

+# func_win32_libid arg

+# return the library type of file 'arg'

+#

+# Need a lot of goo to handle *both* DLLs and import libs

+# Has to be a shell function in order to 'eat' the argument

+# that is supplied when $file_magic_command is called.

+func_win32_libid ()

+{

+  win32_libid_type="unknown"

+  win32_fileres=`file -L $1 2>/dev/null`

+  case $win32_fileres in

+  *ar\ archive\ import\ library*) # definitely import

+    win32_libid_type="x86 archive import"

+    ;;

+  *ar\ archive*) # could be an import, or static

+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \

+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then

+      win32_nmres=`eval $NM -f posix -A $1 | \

+	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`

+      case $win32_nmres in

+      import*)  win32_libid_type="x86 archive import";;

+      *)        win32_libid_type="x86 archive static";;

+      esac

+    fi

+    ;;

+  *DLL*)

+    win32_libid_type="x86 DLL"

+    ;;

+  *executable*) # but shell scripts are "executable" too...

+    case $win32_fileres in

+    *MS\ Windows\ PE\ Intel*)

+      win32_libid_type="x86 DLL"

+      ;;

+    esac

+    ;;

+  esac

+  $echo $win32_libid_type

+}

+

+

+# func_infer_tag arg

+# Infer tagged configuration to use if any are available and

+# if one wasn't chosen via the "--tag" command line option.

+# Only attempt this if the compiler in the base compile

+# command doesn't match the default compiler.

+# arg is usually of the form 'gcc ...'

+func_infer_tag ()

+{

+    if test -n "$available_tags" && test -z "$tagname"; then

+      CC_quoted=

+      for arg in $CC; do

+	case $arg in

+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")

+	  arg="\"$arg\""

+	  ;;

+	esac

+	CC_quoted="$CC_quoted $arg"

+      done

+      case $@ in

+      # Blanks in the command may have been stripped by the calling shell,

+      # but not from the CC environment variable when configure was run.

+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;

+      # Blanks at the start of $base_compile will cause this to fail

+      # if we don't check for them as well.

+      *)

+	for z in $available_tags; do

+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then

+	    # Evaluate the configuration.

+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"

+	    CC_quoted=

+	    for arg in $CC; do

+	    # Double-quote args containing other shell metacharacters.

+	    case $arg in

+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")

+	      arg="\"$arg\""

+	      ;;

+	    esac

+	    CC_quoted="$CC_quoted $arg"

+	  done

+	    case "$@ " in

+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)

+	      # The compiler in the base compile command matches

+	      # the one in the tagged configuration.

+	      # Assume this is the tagged configuration we want.

+	      tagname=$z

+	      break

+	      ;;

+	    esac

+	  fi

+	done

+	# If $tagname still isn't set, then no tagged configuration

+	# was found and let the user know that the "--tag" command

+	# line option must be used.

+	if test -z "$tagname"; then

+	  $echo "$modename: unable to infer tagged configuration"

+	  $echo "$modename: specify a tag with \`--tag'" 1>&2

+	  exit $EXIT_FAILURE

+#        else

+#          $echo "$modename: using $tagname tagged configuration"

+	fi

+	;;

+      esac

+    fi

+}

+

+

+# func_extract_an_archive dir oldlib

+func_extract_an_archive ()

+{

+    f_ex_an_ar_dir="$1"; shift

+    f_ex_an_ar_oldlib="$1"

+

+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"

+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?

+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then

+     :

+    else

+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2

+      exit $EXIT_FAILURE

+    fi

+}

+

+# func_extract_archives gentop oldlib ...

+func_extract_archives ()

+{

+    my_gentop="$1"; shift

+    my_oldlibs=${1+"$@"}

+    my_oldobjs=""

+    my_xlib=""

+    my_xabs=""

+    my_xdir=""

+    my_status=""

+

+    $show "${rm}r $my_gentop"

+    $run ${rm}r "$my_gentop"

+    $show "$mkdir $my_gentop"

+    $run $mkdir "$my_gentop"

+    my_status=$?

+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then

+      exit $my_status

+    fi

+

+    for my_xlib in $my_oldlibs; do

+      # Extract the objects.

+      case $my_xlib in

+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;

+	*) my_xabs=`pwd`"/$my_xlib" ;;

+      esac

+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`

+      my_xdir="$my_gentop/$my_xlib"

+

+      $show "${rm}r $my_xdir"

+      $run ${rm}r "$my_xdir"

+      $show "$mkdir $my_xdir"

+      $run $mkdir "$my_xdir"

+      exit_status=$?

+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then

+	exit $exit_status

+      fi

+      case $host in

+      *-darwin*)

+	$show "Extracting $my_xabs"

+	# Do not bother doing anything if just a dry run

+	if test -z "$run"; then

+	  darwin_orig_dir=`pwd`

+	  cd $my_xdir || exit $?

+	  darwin_archive=$my_xabs

+	  darwin_curdir=`pwd`

+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`

+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`

+	  if test -n "$darwin_arches"; then 

+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`

+	    darwin_arch=

+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"

+	    for darwin_arch in  $darwin_arches ; do

+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"

+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"

+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"

+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"

+	      cd "$darwin_curdir"

+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"

+	    done # $darwin_arches

+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)

+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`

+	    darwin_file=

+	    darwin_files=

+	    for darwin_file in $darwin_filelist; do

+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`

+	      lipo -create -output "$darwin_file" $darwin_files

+	    done # $darwin_filelist

+	    ${rm}r unfat-$$

+	    cd "$darwin_orig_dir"

+	  else

+	    cd "$darwin_orig_dir"

+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"

+	  fi # $darwin_arches

+	fi # $run

+	;;

+      *)

+        func_extract_an_archive "$my_xdir" "$my_xabs"

+        ;;

+      esac

+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`

+    done

+    func_extract_archives_result="$my_oldobjs"

+}

+# End of Shell function definitions

+#####################################

+

+# Darwin sucks

+eval std_shrext=\"$shrext_cmds\"

+

+disable_libs=no

+

 # Parse our command line options once, thoroughly.

-while test $# -gt 0

+while test "$#" -gt 0

 do

   arg="$1"

   shift

@@ -474,6 +761,34 @@ do

     execute_dlfiles)

       execute_dlfiles="$execute_dlfiles $arg"

       ;;

+    tag)

+      tagname="$arg"

+      preserve_args="${preserve_args}=$arg"

+

+      # Check whether tagname contains only valid characters

+      case $tagname in

+      *[!-_A-Za-z0-9,/]*)

+	$echo "$progname: invalid tag name: $tagname" 1>&2

+	exit $EXIT_FAILURE

+	;;

+      esac

+

+      case $tagname in

+      CC)

+	# Don't test for the "default" C tag, as we know, it's there, but

+	# not specially marked.

+	;;

+      *)

+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then

+	  taglist="$taglist $tagname"

+	  # Evaluate the configuration.

+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"

+	else

+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2

+	fi

+	;;

+      esac

+      ;;

     *)

       eval "$prev=\$arg"

       ;;

@@ -491,18 +806,27 @@ do

     ;;

   --version)

-    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"

-    exit 0

+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"

+    $echo

+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."

+    $echo "This is free software; see the source for copying conditions.  There is NO"

+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

+    exit $?

     ;;

   --config)

-    sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0

-    exit 0

+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath

+    # Now print the configurations for the tags.

+    for tagname in $taglist; do

+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"

+    done

+    exit $?

     ;;

   --debug)

-    echo "$progname: enabling shell trace mode"

+    $echo "$progname: enabling shell trace mode"

     set -x

+    preserve_args="$preserve_args $arg"

     ;;

   --dry-run | -n)

@@ -510,18 +834,18 @@ do

     ;;

   --features)

-    echo "host: $host"

+    $echo "host: $host"

     if test "$build_libtool_libs" = yes; then

-      echo "enable shared libraries"

+      $echo "enable shared libraries"

     else

-      echo "disable shared libraries"

+      $echo "disable shared libraries"

     fi

     if test "$build_old_libs" = yes; then

-      echo "enable static libraries"

+      $echo "enable static libraries"

     else

-      echo "disable static libraries"

+      $echo "disable static libraries"

     fi

-    exit 0

+    exit $?

     ;;

   --finish) mode="finish" ;;

@@ -533,6 +857,19 @@ do

   --quiet | --silent)

     show=:

+    preserve_args="$preserve_args $arg"

+    ;;

+

+  --tag)

+    prevopt="--tag"

+    prev=tag

+    preserve_args="$preserve_args --tag"

+    ;;

+  --tag=*)

+    set tag "$optarg" ${1+"$@"}

+    shift

+    prev=tag

+    preserve_args="$preserve_args --tag"

     ;;