From 410940cb25a90920fffd02a096f658bae49c3e16 Mon Sep 17 00:00:00 2001 From: Atsushi Konno Date: Mon, 4 Jul 2011 20:47:47 +0900 Subject: [PATCH] * version up - 0.14.0 -> 0.14.1 * Fixed Bug. - It is not possible to compile with RHEL/CentOS4. (Thanx Mr.ooi and Mr.osanai) --- ChangeLog | 12 ++++++++++++ configure | 20 ++++++++++---------- configure.ac | 2 +- debian/changelog | 12 ++++++++++++ include/config.h | 6 +++--- include/mod_chxj.h | 19 +++++++++++++++++++ support/centos/mod-chxj.spec | 2 +- support/freebsd/Makefile | 4 ++-- 8 files changed, 60 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21e6161a..ab986af4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +libapache2-mod-chxj (0.14.1-1) unstable; urgency=high + + * Fixed Bug + - If the value attribute is empty, the value attribute is not + output. + - No adding cookie parameter if flagment only. + - SEGV occurs in ImageMagick when mmap is used. + * Added Features + - for KANTAN LOGIN with Cookie + + -- Atsush Konno Mon, 04 Jul 2011 20:38:40 +0900 + libapache2-mod-chxj (0.14.0-1) unstable; urgency=low * Added New Feature. diff --git a/configure b/configure index 0126d225..d5b7c936 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for mod_chxj 0.14.0. +# Generated by GNU Autoconf 2.67 for mod_chxj 0.14.1. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mod_chxj' PACKAGE_TARNAME='mod_chxj' -PACKAGE_VERSION='0.14.0' -PACKAGE_STRING='mod_chxj 0.14.0' +PACKAGE_VERSION='0.14.1' +PACKAGE_STRING='mod_chxj 0.14.1' PACKAGE_BUGREPORT='konn@users.sourceforge.jp' PACKAGE_URL='' @@ -1447,7 +1447,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mod_chxj 0.14.0 to adapt to many kinds of systems. +\`configure' configures mod_chxj 0.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1518,7 +1518,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mod_chxj 0.14.0:";; + short | recursive ) echo "Configuration of mod_chxj 0.14.1:";; esac cat <<\_ACEOF @@ -1633,7 +1633,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mod_chxj configure 0.14.0 +mod_chxj configure 0.14.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2002,7 +2002,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mod_chxj $as_me 0.14.0, which was +It was created by mod_chxj $as_me 0.14.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2929,7 +2929,7 @@ fi # Define the identity of the package. PACKAGE=mod_chxj - VERSION=0.14.0 + VERSION=0.14.1 cat >>confdefs.h <<_ACEOF @@ -12175,7 +12175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mod_chxj $as_me 0.14.0, which was +This file was extended by mod_chxj $as_me 0.14.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12241,7 +12241,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mod_chxj config.status 0.14.0 +mod_chxj config.status 0.14.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4c7068d9..2def742a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([mod_chxj],[0.14.0],[konn@users.sourceforge.jp]) +AC_INIT([mod_chxj],[0.14.1],[konn@users.sourceforge.jp]) AC_PREREQ(2.59) AC_CONFIG_SRCDIR([src/mod_chxj.c]) AC_CANONICAL_TARGET diff --git a/debian/changelog b/debian/changelog index 1fc00258..fc5988f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libapache2-mod-chxj (0.14.1) unstable; urgency=high + + * Fixed Bug + - If the value attribute is empty, the value attribute is not + output. + - No adding cookie parameter if flagment only. + - SEGV occurs in ImageMagick when mmap is used. + * Added Features + - for KANTAN LOGIN with Cookie + + -- Atsush Konno Mon, 04 Jul 2011 20:38:40 +0900 + libapache2-mod-chxj (0.14.0-1) unstable; urgency=low * Added New Feature. diff --git a/include/config.h b/include/config.h index 8bbb56eb..2207f8b3 100644 --- a/include/config.h +++ b/include/config.h @@ -100,7 +100,7 @@ #define PACKAGE_NAME "mod_chxj" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mod_chxj 0.14.0" +#define PACKAGE_STRING "mod_chxj 0.14.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mod_chxj" @@ -109,13 +109,13 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.14.0" +#define PACKAGE_VERSION "0.14.1" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.14.0" +#define VERSION "0.14.1" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/include/mod_chxj.h b/include/mod_chxj.h index c9cc0d6c..f25d49ce 100755 --- a/include/mod_chxj.h +++ b/include/mod_chxj.h @@ -576,6 +576,25 @@ extern void *rpl_malloc(size_t n); #define TO_ADDR(X) ((unsigned int)(apr_size_t)(X)) #define ADJUST_WIDTH_FOR_ANDROID (40) + +#if APR_MAJOR_VERSION < 1 + #ifndef APR_FOPEN_READ + #define APR_FOPEN_READ APR_READ + #endif + #ifndef APR_FOPEN_BUFFERED + #define APR_FOPEN_BUFFERED APR_BUFFERED + #endif + #ifndef APR_FOPEN_BINARY + #define APR_FOPEN_BINARY APR_BINARY + #endif + #ifndef APR_FOPEN_CREATE + #define APR_FOPEN_CREATE APR_CREATE + #endif + #ifndef APR_FOPEN_WRITE + #define APR_FOPEN_WRITE APR_WRITE + #endif +#endif + #endif /* * vim:ts=2 et diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec index 11252cb2..a341e78a 100644 --- a/support/centos/mod-chxj.spec +++ b/support/centos/mod-chxj.spec @@ -1,4 +1,4 @@ -%define version 0.14.0 +%define version 0.14.1 Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD. Name: mod_chxj diff --git a/support/freebsd/Makefile b/support/freebsd/Makefile index d1fd5fe2..2d2f0619 100644 --- a/support/freebsd/Makefile +++ b/support/freebsd/Makefile @@ -6,13 +6,13 @@ # PORTNAME= mod_chxj -PORTVERSION= 0.14.0 +PORTVERSION= 0.14.1 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=modchxj/51793/} PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -DISTNAME= mod-chxj_0.14.0 +DISTNAME= mod-chxj_0.14.1 EXTRACT_SUFX= .src.tar.gz MAINTAINER= konno@qsdn.co.jp -- 2.11.0