* version up.

    - 0.12.17 -> 0.12.18

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@3616 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/ChangeLog b/ChangeLog
index a84b38b..9a68f9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+libapache2-mod-chxj (0.12.18-1) unstable; urgency=low
+
+  * Fixed Bug.
+    - When the POST data of 64 bytes or less is sent, it is Segv.
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Fri,  7 Nov 2008 10:05:30 +0900
+
 libapache2-mod-chxj (0.12.17-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/Makefile.in b/Makefile.in
index a18fc68..c5d4cd3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,9 +35,10 @@ target_triplet = @target@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/configure \
-       $(top_srcdir)/include/config.h.in AUTHORS COPYING ChangeLog \
-       INSTALL NEWS TODO compile config.guess config.sub depcomp \
-       install-sh ltmain.sh missing ylwrap
+       $(top_srcdir)/include/config.h.in \
+       $(top_srcdir)/support/centos/mod-chxj.spec.in AUTHORS COPYING \
+       ChangeLog INSTALL NEWS TODO compile config.guess config.sub \
+       depcomp install-sh ltmain.sh missing ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -46,7 +47,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = support/centos/mod-chxj.spec
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -248,6 +249,8 @@ $(top_srcdir)/include/config.h.in:  $(am__configure_deps)
 
 distclean-hdr:
        -rm -f include/config.h include/stamp-h1
+support/centos/mod-chxj.spec: $(top_builddir)/config.status $(top_srcdir)/support/centos/mod-chxj.spec.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
        -rm -f *.lo

diff --git a/configure b/configure
index 5adbb4a..2d841e3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.17.
+# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.18.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mod_chxj'
 PACKAGE_TARNAME='mod_chxj'
-PACKAGE_VERSION='0.12.17'
-PACKAGE_STRING='mod_chxj 0.12.17'
+PACKAGE_VERSION='0.12.18'
+PACKAGE_STRING='mod_chxj 0.12.18'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/mod_chxj.c"
@@ -1405,7 +1405,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.12.17 to adapt to many kinds of systems.
+\`configure' configures mod_chxj 0.12.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_chxj 0.12.17:";;
+     short | recursive ) echo "Configuration of mod_chxj 0.12.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1592,7 +1592,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_chxj configure 0.12.17
+mod_chxj configure 0.12.18
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1606,7 +1606,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.12.17, which was
+It was created by mod_chxj $as_me 0.12.18, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2424,7 +2424,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=mod_chxj
- VERSION=0.12.17
+ VERSION=0.12.18
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21416,7 +21416,7 @@ done
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile support/centos/mod-chxj.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -21835,7 +21835,7 @@ exec 6>&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.12.17, which was
+This file was extended by mod_chxj $as_me 0.12.18, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21888,7 +21888,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_chxj config.status 0.12.17
+mod_chxj config.status 0.12.18
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -22006,6 +22006,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "support/centos/mod-chxj.spec") CONFIG_FILES="$CONFIG_FILES support/centos/mod-chxj.spec" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

diff --git a/configure.ac b/configure.ac
index ddc3e46..6e20f8e 100644 (file)
--- 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.12.17])
+AC_INIT([mod_chxj],[0.12.18],[konn@users.sourceforge.jp])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET
@@ -309,5 +309,5 @@ AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
 
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile support/centos/mod-chxj.spec])
 AC_OUTPUT

diff --git a/debian-sarge/changelog b/debian-sarge/changelog
index 336f9e2..9627dff 100644 (file)
--- a/debian-sarge/changelog
+++ b/debian-sarge/changelog
@@ -1,3 +1,10 @@
+libapache2-mod-chxj (0.12.18-1) unstable; urgency=low
+
+  * Fixed Bug.
+    - When the POST data of 64 bytes or less is sent, it is Segv.
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Fri,  7 Nov 2008 10:05:30 +0900
+
 libapache2-mod-chxj (0.12.17-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/debian/changelog b/debian/changelog
index e9e218c..cfdd0cf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libapache2-mod-chxj (0.12.18-1) unstable; urgency=low
+
+  * Fixed Bug.
+    - When the POST data of 64 bytes or less is sent, it is Segv.
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Fri,  7 Nov 2008 10:05:30 +0900
+
 libapache2-mod-chxj (0.12.17-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/include/config.h b/include/config.h
index b2cd5f2..275a2cd 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -96,19 +96,19 @@
 #define PACKAGE_NAME "mod_chxj"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_chxj 0.12.17"
+#define PACKAGE_STRING "mod_chxj 0.12.18"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "mod_chxj"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.12.17"
+#define PACKAGE_VERSION "0.12.18"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.12.17"
+#define VERSION "0.12.18"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec
index b108926..88a37d1 100644 (file)
--- a/support/centos/mod-chxj.spec
+++ b/support/centos/mod-chxj.spec
@@ -1,4 +1,4 @@
-%define version 0.12.17
+%define version 0.12.18
 
 Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD.
 Name:  mod_chxj

diff --git a/support/centos/mod-chxj.spec.in b/support/centos/mod-chxj.spec.in
new file mode 100644 (file)
index 0000000..90cd240
--- /dev/null
+++ b/support/centos/mod-chxj.spec.in
@@ -0,0 +1,68 @@
+%define version @PACKAGE_VERSION@
+
+Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD.
+Name:  mod_chxj
+Version:  %{version}
+Release:  1
+License:  Apache License Version 2.0
+Group: System Environment/Daemons
+Vendor: Atsushi Konno
+URL: http://sourceforge.jp/projects/modchxj/
+Source:  http://sourceforge.jp/projects/modchxj/downloads/33637/mod-chxj_%{version}.src.tar.gz
+Source1: http://download.tangent.org/libmemcached-0.23.tar.gz
+Packager:  Atsushi Konno <konn@sourceforge.jp>
+Requires: ImageMagick >= 6.2.8.0, httpd >= 2.2.3, apr >= 1.2.7, apr-util >= 1.2.7, mysql >= 5.0.45
+BuildPreReq: mysql-devel httpd-devel ImageMagick-devel gcc-c++ libtool
+
+%description
+The contents conversion middleware for domestic main carrying (three careers)
+is made as a module for Apache2.0. UserAgent is seen when contents made with
+CHTML are output and it converts it into HDML, XHTML, and JHTML (The image :
+to JPG, GIF, JPG, GIF from PNG, and PNG and BMP). With QR code generation
+function.
+
+%prep
+cd $RPM_BUILD_DIR
+rm -rf libmemcached-0.23
+/bin/gzip -dc $RPM_SOURCE_DIR/libmemcached-0.23.tar.gz | tar -xf -
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+cd libmemcached-0.23
+./configure --with-pic
+make
+%setup -q -n mod-chxj_%{version}
+
+%build
+./configure --enable-mysql-cookie \
+            --with-mysql-header=/usr/include/mysql  \
+            --with-mysql-lib-dir=/usr/lib/mysql \
+            --enable-memcache-cookie \
+            --with-memcached-header=../libmemcached-0.23 \
+            --with-memcached-lib-dir=../../libmemcached-0.23/libmemcached/.libs \
+            --enable-memcached-static
+%{__make}
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/chxj
+%{__mkdir} -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
+%{__install} -m0644 support/centos/chxj.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/chxj.conf
+%{__install} -m0644 etc/emoji.xml $RPM_BUILD_ROOT%{_sysconfdir}/httpd/chxj/emoji.xml
+%{__install} -m0644 etc/device_data.xml $RPM_BUILD_ROOT%{_sysconfdir}/httpd/chxj/device_data.xml
+%{__make} -C src make_so
+%{__install} -m0755 src/mod_chxj.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/mod_chxj.so
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/chxj.conf
+%config(noreplace) %{_sysconfdir}/httpd/chxj/emoji.xml
+%config(noreplace) %{_sysconfdir}/httpd/chxj/device_data.xml
+%{_libdir}/httpd/modules/mod_chxj.so
+
+%changelog
+* Fri Nov  7 2008 Atsushi Konno <konn@users.sourceforge.jp> 0.12.17-1
+- Added initial package for CentOS5.1.