@@ -1,3 +1,8 @@

+Sat Feb 24 02:32:57 CET 2007 (tk)

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

+  * configure, libclamav: add support for HP-UX 11.11 with native

+			  compiler (bb#180), thanks to Edwin

+

 Fri Feb 23 21:42:08 CET 2007 (tk)

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

   * configure: use -pthread also for FreeBSD 6.x

@@ -189,6 +189,9 @@

 /* "pragma pack" */

 #undef HAVE_PRAGMA_PACK

+/* "pragma pack hppa/hp-ux style" */

+#undef HAVE_PRAGMA_PACK_HPPA

+

 /* readdir_r takes 2 arguments */

 #undef HAVE_READDIR_R_2

@@ -21479,6 +21479,8 @@ echo "$as_me: WARNING: ****** stability problems to the ClamAV developers!" >&2;

     if test "$ZLIB_HOME" != "/usr"; then

 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"

+	save_LDFLAGS="$LDFLAGS"

+	LDFLAGS="$LIBS -L$ZLIB_HOME/lib"

 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5

 echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6; }

 if test "${ac_cv_lib_z_inflateEnd+set}" = set; then

@@ -21552,6 +21554,7 @@ echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

    { (exit 1); exit 1; }; }

 fi

+	LDFLAGS="$save_LDFLAGS"

     else

 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5

 echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6; }

@@ -23293,6 +23296,7 @@ cat >>confdefs.h <<\_ACEOF

 #define C_HPUX 1

 _ACEOF

+    use_gethostbyname_r="no"

     ;;

 aix*)

     if test "$have_pthreads" = "yes"; then

@@ -25550,11 +25554,83 @@ fi

 	{ echo "$as_me:$LINENO: result: $have_pragma_pack" >&5

 echo "${ECHO_T}$have_pragma_pack" >&6; }

+	if test "$have_pragma_pack" = yes; then

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_PRAGMA_PACK 1

 _ACEOF

+	else

+		{ echo "$as_me:$LINENO: checking for structure packing via hppa/hp-ux pragma" >&5

+echo $ECHO_N "checking for structure packing via hppa/hp-ux pragma... $ECHO_C" >&6; }

+		if test "${have_pragma_pack_hpux+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+

+			if test "$cross_compiling" = yes; then

+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling

+See \`config.log' for more details." >&5

+echo "$as_me: error: cannot run test program while cross compiling

+See \`config.log' for more details." >&2;}

+   { (exit 1); exit 1; }; }

+else

+  cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+			/* hppa/hp-ux wants pragma outside of function */

+#pragma pack 1 /* has to be in column 1 ! */

+			struct { char c; long l; } s;

+			    int main(int argc, char **argv) {

+			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; }

+_ACEOF

+rm -f conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

+  { (case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_try") 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  have_pragma_pack_hpux=yes

+else

+  echo "$as_me: program exited with status $ac_status" >&5

+echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+( exit $ac_status )

+have_pragma_pack_hpux=no

+fi

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

+fi

+

+

+

+fi

+

+		{ echo "$as_me:$LINENO: result: $have_pragma_pack_hpux" >&5

+echo "${ECHO_T}$have_pragma_pack_hpux" >&6; }

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_PRAGMA_PACK_HPPA 1

+_ACEOF

+

+	fi

 fi

 { echo "$as_me:$LINENO: checking for type aligning via __attribute__((aligned))" >&5

@@ -25610,7 +25686,7 @@ fi

 { echo "$as_me:$LINENO: result: $have_attrib_aligned" >&5

 echo "${ECHO_T}$have_attrib_aligned" >&6; }

-if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no ; then

+if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no -a "$have_pragma_pack_hpux" = no; then

 	{ { echo "$as_me:$LINENO: error: Need to know how to pack structures with this compiler" >&5

 echo "$as_me: error: Need to know how to pack structures with this compiler" >&2;}

    { (exit 1); exit 1; }; }

@@ -124,7 +124,10 @@ else

     if test "$ZLIB_HOME" != "/usr"; then

 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"

+	save_LDFLAGS="$LDFLAGS"

+	LDFLAGS="$LIBS -L$ZLIB_HOME/lib"

 	AC_CHECK_LIB(z, inflateEnd, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)], AC_MSG_ERROR(Please install zlib and zlib-devel packages))

+	LDFLAGS="$save_LDFLAGS"

     else

 	AC_CHECK_LIB(z, inflateEnd, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)], AC_MSG_ERROR(Please install zlib and zlib-devel packages))

     fi

@@ -540,6 +543,7 @@ hpux*)

 	AC_DEFINE(_REENTRANT,1,[thread safe])

     fi

     AC_DEFINE(C_HPUX,1,[os is hpux])

+    use_gethostbyname_r="no"

     ;;

 aix*)

     if test "$have_pthreads" = "yes"; then

@@ -997,7 +1001,23 @@ if test "$have_attrib_packed" = no; then

 			[have_pragma_pack=no])

 		])

 	AC_MSG_RESULT($have_pragma_pack)

-	AC_DEFINE(HAVE_PRAGMA_PACK, 1, "pragma pack")

+	if test "$have_pragma_pack" = yes; then

+		AC_DEFINE(HAVE_PRAGMA_PACK, 1, "pragma pack")

+	else

+		AC_MSG_CHECKING(for structure packing via hppa/hp-ux pragma)

+		AC_CACHE_VAL(have_pragma_pack_hpux,[

+			AC_TRY_RUN([

+			/* hppa/hp-ux wants pragma outside of function */

+#pragma pack 1 /* has to be in column 1 ! */

+			struct { char c; long l; } s;

+			    int main(int argc, char **argv) {

+			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],

+			[have_pragma_pack_hpux=yes],

+			[have_pragma_pack_hpux=no])

+		])

+		AC_MSG_RESULT($have_pragma_pack_hpux)

+		AC_DEFINE(HAVE_PRAGMA_PACK_HPPA, 1, "pragma pack hppa/hp-ux style")

+	fi

 fi

 dnl check for __attribute__((aligned))

@@ -1010,7 +1030,7 @@ AC_CACHE_VAL(have_attrib_aligned,[

 	])

 AC_MSG_RESULT($have_attrib_aligned)

-if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no ; then

+if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no -a "$have_pragma_pack_hpux" = no; then

 	AC_MSG_ERROR(Need to know how to pack structures with this compiler)

 fi

@@ -32,7 +32,7 @@

 #endif

 #include <string.h>

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 #if HAVE_MMAP

 #if HAVE_SYS_MMAN_H

 #include <sys/mman.h>

@@ -57,6 +57,10 @@

 #pragma pack(1)

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack 1

+#endif

+

 #ifndef	O_BINARY

 #define	O_BINARY	0

 #endif

@@ -151,6 +155,10 @@ typedef struct lzx_content_tag {

 #pragma pack()

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack

+#endif

+

 #define chm_endian_convert_16(x) le16_to_host(x) 

 #define chm_endian_convert_32(x) le32_to_host(x) 

 #define chm_endian_convert_64(x) le64_to_host(x)

@@ -237,7 +245,7 @@ static void itsf_print_header(itsf_header_t *itsf_hdr)

 static int itsf_read_header(int fd, itsf_header_t *itsf_hdr, unsigned char *m_area, off_t m_length)

 {

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 	if (!chm_read_data(fd, (unsigned char *) itsf_hdr, 0, CHM_ITSF_MIN_LEN,

 				m_area,	m_length)) {

 		return FALSE;

@@ -326,7 +334,7 @@ static void itsp_print_header(itsp_header_t *itsp_hdr)

 static int itsp_read_header(int fd, itsp_header_t *itsp_hdr, off_t offset,

 				unsigned char *m_area, off_t m_length)

 {

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 	if (!chm_read_data(fd, (unsigned char *) itsp_hdr, offset, CHM_ITSP_LEN,

 				m_area,	m_length)) {

 		return FALSE;

@@ -529,7 +537,7 @@ static int read_chunk(int fd, off_t offset, uint32_t chunk_len,

 		return FALSE;

 	}

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 	/* 8 bytes reads the signature and the free_space */

 	if (!chm_read_data(fd, chunk_hdr->signature, offset, 8,

 				m_area,	m_length)) {

@@ -559,7 +567,7 @@ static int read_chunk(int fd, off_t offset, uint32_t chunk_len,

 	chunk_hdr->free_space = chm_endian_convert_32(chunk_hdr->free_space);

 	if (memcmp(chunk_hdr->signature, "PMGL", 4) == 0) {

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 		if (!chm_read_data(fd, (unsigned char *) &chunk_hdr->unknown, offset+8, 12,

 					m_area,	m_length)) {

 			goto abort;

@@ -628,7 +636,7 @@ static lzx_control_t *read_sys_control(int fd, itsf_header_t *itsf_hdr, file_lis

 	if (!lzx_control) {

 		return NULL;

 	}

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 	if (!chm_read_data(fd, (unsigned char *) lzx_control, offset, CHM_CONTROL_LEN,

 				m_area,	m_length)) {

 		goto abort;

@@ -750,7 +758,7 @@ static lzx_reset_table_t *read_sys_reset_table(int fd, itsf_header_t *itsf_hdr,

 	/* Save the entry offset for later use */

 	lzx_reset_table->rt_offset = offset-4;

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 	if (!chm_read_data(fd, (unsigned char *) lzx_reset_table, offset, CHM_RESET_TABLE_LEN,

 				m_area,	m_length)) {

 		goto abort;

@@ -60,6 +60,10 @@

 #pragma pack(1)

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack 1

+#endif

+

 #ifndef	O_BINARY

 #define	O_BINARY	0

 #endif

@@ -123,6 +127,10 @@ typedef struct property_tag

 #pragma pack()

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack

+#endif

+

 static unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1};

 static char *get_property_name(char *name, int size)

@@ -670,7 +678,7 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 	return TRUE;

 }

-#if !defined(HAVE_ATTRIB_PACKED) && !defined(HAVE_PRAGMA_PACK)

+#if !defined(HAVE_ATTRIB_PACKED) && !defined(HAVE_PRAGMA_PACK) && !defined(HAVE_PRAGMA_PACK_HPPA)

 static int ole2_read_header(int fd, ole2_header_t *hdr)

 {

 	int i;

@@ -764,7 +772,7 @@ int cli_ole2_extract(int fd, const char *dirname, const struct cl_limits *limits

 #endif

 	if (hdr.m_area == NULL) {

-#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

+#if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK) || defined(HAVE_PRAGMA_PACK_HPPA)

 		if (cli_readn(fd, &hdr, hdr_size) != hdr_size) {

 			return 0;

 		}

@@ -118,6 +118,10 @@ typedef struct mark_header_tag

 #pragma pack(1)

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack 1

+#endif

+

 typedef struct main_header_tag

 {

 	uint16_t head_crc __attribute__ ((packed));

@@ -346,4 +350,8 @@ int decode_number(unpack_data_t *unpack_data, struct Decode *decode);

 #pragma pack()

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack

+#endif

+

 #endif

@@ -982,8 +982,8 @@ int ppm_decode_char(ppm_data_t *ppm_data, int fd, unpack_data_t *unpack_data)

 		return -1;

 	}

 	if (ppm_data->min_context->num_stats != 1) {

-		if (ppm_data->min_context->con_ut.u.stats <= ppm_data->sub_alloc.ptext ||

-			ppm_data->min_context->con_ut.u.stats > ppm_data->sub_alloc.heap_end) {

+		if ((uint8_t *) ppm_data->min_context->con_ut.u.stats <= ppm_data->sub_alloc.ptext ||

+			(uint8_t *) ppm_data->min_context->con_ut.u.stats > ppm_data->sub_alloc.heap_end) {

 			return -1;

 		}

 		if (!ppm_decode_symbol1(ppm_data, ppm_data->min_context)) {

@@ -42,6 +42,10 @@

 #pragma pack(1)

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack 1

+#endif

+

 /******** Zip format structures *********/

 /* Local file header */

@@ -211,4 +215,8 @@ int zip_dir_close(zip_dir *dir);

 #pragma pack()

 #endif

+#ifdef HAVE_PRAGMA_PACK_HPPA

+#pragma pack

+#endif

+

 #endif /* __UNZIP_H */