From 0a2868a5b8c3bc67dd22d5b536aeb1440d07b367 Mon Sep 17 00:00:00 2001 From: Danilo Chang Date: Wed, 11 Jul 2018 08:17:30 +0800 Subject: [PATCH] Bump to version 0.6 --- CHANGES.txt | 8 +++++++- Makefile | 10 +++++----- config.status | 14 +++++++------- configure | 18 +++++++++--------- configure.ac | 2 +- generic/tgdbm.c | 2 +- pkgIndex.tcl | 6 +++--- qgdbm.tcl | 4 ++-- tests/artest.gdbm | Bin 16384 -> 16384 bytes tests/qgdbm.test | 2 +- tests/strange.gdbm | Bin 16384 -> 16384 bytes tests/test.gdbm | Bin 16384 -> 16384 bytes tests/test1.gdbm | Bin 3072 -> 3072 bytes tests/tgdbm.test | 2 +- tgdbm.spec | 4 ++-- 15 files changed, 39 insertions(+), 33 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9c31174..95288fe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,9 @@ +CHANGES for 0.6 2018/07/11 ------------------------------------------------- + +* Fix GDBM_UNKNOWN_ERROR error +* Try to fix build failed in Ubuntu 14.04 +* Remove _ANSI_ARGS_ + CHANGES for 0.5 again 2005/04/14 ------------------------------------------- * added some changes from Thomas Maeder @@ -38,4 +44,4 @@ CHANGES for 0.4 ------------------------------------------------------------ package require gdbm you should change this to - package require tgdbm \ No newline at end of file + package require tgdbm diff --git a/Makefile b/Makefile index c4e389e..e21b65a 100644 --- a/Makefile +++ b/Makefile @@ -57,8 +57,8 @@ PKG_HEADERS = # configuration options) composed of the named objects. #======================================================================== -PKG_LIB_FILE = libtgdbm0.5.so -PKG_STUB_LIB_FILE = libtgdbmstub0.5.a +PKG_LIB_FILE = libtgdbm0.6.so +PKG_STUB_LIB_FILE = libtgdbmstub0.6.a lib_BINARIES = $(PKG_LIB_FILE) BINARIES = $(lib_BINARIES) @@ -94,7 +94,7 @@ INSTALL_SCRIPT = ${INSTALL} -m 755 INSTALL_LIBRARY = ${INSTALL} -m 644 PACKAGE_NAME = tgdbm -PACKAGE_VERSION = 0.5 +PACKAGE_VERSION = 0.6 CC = gcc CFLAGS_DEFAULT = -O2 -fomit-frame-pointer -DNDEBUG CFLAGS_WARNING = -Wall @@ -154,8 +154,8 @@ PKG_CFLAGS = # that your library may use. TCL_DEFS can actually be a problem if # you do not compile with a similar machine setup as the Tcl core was # compiled with. -#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"tgdbm\" -DPACKAGE_TARNAME=\"tgdbm\" -DPACKAGE_VERSION=\"0.5\" -DPACKAGE_STRING=\"tgdbm\ 0.5\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tgdbm=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS) -DEFS = -DPACKAGE_NAME=\"tgdbm\" -DPACKAGE_TARNAME=\"tgdbm\" -DPACKAGE_VERSION=\"0.5\" -DPACKAGE_STRING=\"tgdbm\ 0.5\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tgdbm=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS) +#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"tgdbm\" -DPACKAGE_TARNAME=\"tgdbm\" -DPACKAGE_VERSION=\"0.6\" -DPACKAGE_STRING=\"tgdbm\ 0.6\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tgdbm=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS) +DEFS = -DPACKAGE_NAME=\"tgdbm\" -DPACKAGE_TARNAME=\"tgdbm\" -DPACKAGE_VERSION=\"0.6\" -DPACKAGE_STRING=\"tgdbm\ 0.6\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DBUILD_tgdbm=/\*\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_HIDDEN=1 -DHAVE_CAST_TO_UNION=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 $(PKG_CFLAGS) # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl diff --git a/config.status b/config.status index 8551be4..8ea8ffd 100755 --- a/config.status +++ b/config.status @@ -380,7 +380,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 tgdbm $as_me 0.5, which was +This file was extended by tgdbm $as_me 0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -419,7 +419,7 @@ Report bugs to the package provider." ac_cs_config="" ac_cs_version="\ -tgdbm config.status 0.5 +tgdbm config.status 0.6 configured by ./configure, generated by GNU Autoconf 2.69, with options \"$ac_cs_config\" @@ -665,8 +665,8 @@ S["PKG_HEADERS"]="" S["PKG_TCL_SOURCES"]=" qgdbm.tcl" S["PKG_STUB_OBJECTS"]="" S["PKG_STUB_SOURCES"]="" -S["PKG_STUB_LIB_FILE"]="libtgdbmstub0.5.a" -S["PKG_LIB_FILE"]="libtgdbm0.5.so" +S["PKG_STUB_LIB_FILE"]="libtgdbmstub0.6.a" +S["PKG_LIB_FILE"]="libtgdbm0.6.so" S["EXEEXT"]="" S["CYGPATH"]="echo" S["target_alias"]="" @@ -676,7 +676,7 @@ S["LIBS"]="" S["ECHO_T"]="" S["ECHO_N"]="-n" S["ECHO_C"]="" -S["DEFS"]="-DPACKAGE_NAME=\\\"tgdbm\\\" -DPACKAGE_TARNAME=\\\"tgdbm\\\" -DPACKAGE_VERSION=\\\"0.5\\\" -DPACKAGE_STRING=\\\"tgdbm\\ 0.5\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_UR"\ +S["DEFS"]="-DPACKAGE_NAME=\\\"tgdbm\\\" -DPACKAGE_TARNAME=\\\"tgdbm\\\" -DPACKAGE_VERSION=\\\"0.6\\\" -DPACKAGE_STRING=\\\"tgdbm\\ 0.6\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_UR"\ "L=\\\"\\\" -DBUILD_tgdbm=/\\*\\*/ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_S"\ "TRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THR"\ "EAD_SAFE=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DUSE_TCLOO_STUBS=1 -DMODULE_SCOPE=extern\\ __attribute__\\(\\(__visibility__\\(\\\"hidden\\\"\\)\\)\\) -DHAVE_HID"\ @@ -705,8 +705,8 @@ S["prefix"]="/usr" S["exec_prefix"]="/usr" S["PACKAGE_URL"]="" S["PACKAGE_BUGREPORT"]="" -S["PACKAGE_STRING"]="tgdbm 0.5" -S["PACKAGE_VERSION"]="0.5" +S["PACKAGE_STRING"]="tgdbm 0.6" +S["PACKAGE_VERSION"]="0.6" S["PACKAGE_TARNAME"]="tgdbm" S["PACKAGE_NAME"]="tgdbm" S["PATH_SEPARATOR"]=":" diff --git a/configure b/configure index 1e4bfb5..76db357 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.69 for tgdbm 0.5. +# Generated by GNU Autoconf 2.69 for tgdbm 0.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tgdbm' PACKAGE_TARNAME='tgdbm' -PACKAGE_VERSION='0.5' -PACKAGE_STRING='tgdbm 0.5' +PACKAGE_VERSION='0.6' +PACKAGE_STRING='tgdbm 0.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1295,7 +1295,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 tgdbm 0.5 to adapt to many kinds of systems. +\`configure' configures tgdbm 0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1356,7 +1356,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tgdbm 0.5:";; + short | recursive ) echo "Configuration of tgdbm 0.6:";; esac cat <<\_ACEOF @@ -1458,7 +1458,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tgdbm configure 0.5 +tgdbm configure 0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1823,7 +1823,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 tgdbm $as_me 0.5, which was +It was created by tgdbm $as_me 0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9240,7 +9240,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 tgdbm $as_me 0.5, which was +This file was extended by tgdbm $as_me 0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9293,7 +9293,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="\\ -tgdbm config.status 0.5 +tgdbm config.status 0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b27652f..e81f8ca 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([tgdbm], [0.5]) +AC_INIT([tgdbm], [0.6]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/generic/tgdbm.c b/generic/tgdbm.c index 29f2aec..d4ba824 100644 --- a/generic/tgdbm.c +++ b/generic/tgdbm.c @@ -101,7 +101,7 @@ extern "C" { //extern const char* gdbm_version; //extern gdbm_error gdbm_errno; -#define TGDBM_VERSION "0.5" +#define TGDBM_VERSION "0.6" /* 0x10 */ #define GDBM_SETVAR TCL_TRACE_READS diff --git a/pkgIndex.tcl b/pkgIndex.tcl index 3afedc7..e6404b1 100644 --- a/pkgIndex.tcl +++ b/pkgIndex.tcl @@ -1,7 +1,7 @@ # # Tcl package index file # -package ifneeded tgdbm 0.5 \ - [list load [file join $dir libtgdbm0.5.so] tgdbm] -package ifneeded qgdbm 0.5 \ +package ifneeded tgdbm 0.6 \ + [list load [file join $dir libtgdbm0.6.so] tgdbm] +package ifneeded qgdbm 0.6 \ [list source [file join $dir qgdbm.tcl]] diff --git a/qgdbm.tcl b/qgdbm.tcl index 2efc3dd..6b3ca14 100644 --- a/qgdbm.tcl +++ b/qgdbm.tcl @@ -6,9 +6,9 @@ # 20.02.2000: 0.3 initial official version # 09.07.2000: fixed renaming of gdbm to tgdbm -package require -exact tgdbm 0.5 +package require -exact tgdbm 0.6 -set qgdbm_version 0.5 +set qgdbm_version 0.6 package provide qgdbm $qgdbm_version diff --git a/tests/artest.gdbm b/tests/artest.gdbm index 068631cdabc7ee61dca0d6498d0128ce31e883dc..dc86310850854b22770db2b1e7bb64f90ee6b13a 100644 GIT binary patch delta 41 pcmZo@U~Fh$+`ytBRZ!2saFd?_4Ac!Ebi&EUZC64!%PBmP2LR8t3d{fi delta 41 pcmZo@U~Fh$+`ytBwXU9l;U+%=7^oXS=!BiW{^*2lmQ#2n4*=GL3g7?$ diff --git a/tests/qgdbm.test b/tests/qgdbm.test index f0616d6..df17222 100644 --- a/tests/qgdbm.test +++ b/tests/qgdbm.test @@ -8,7 +8,7 @@ # extend auto-loader-path, to avoid interference by installed versions set auto_path [concat .. $auto_path] -package require -exact qgdbm 0.5 +package require -exact qgdbm 0.6 # standard insert-data set stdInsert [list "anna schatzi [clock scan 09/09/1972] 1.80 62" \ diff --git a/tests/strange.gdbm b/tests/strange.gdbm index 0adfb804bd86c62ba0dca7ff4636d62b5abd9b88..755665568de1e5e5fa0ea4fac672a492512b223e 100644 GIT binary patch delta 16 XcmZo@U~Fh$+`yv1Sg@H@;kP^hEZhY; delta 16 XcmZo@U~Fh$+`yv1xNbA6!f$y1E>Hz{ diff --git a/tests/test.gdbm b/tests/test.gdbm index 5e183e99cd4bb9525a043de6a0fbe59051f78cdb..156cac4d7a7a59a512720af685a2482c026bc1e4 100644 GIT binary patch literal 16384 zcmeH~J!}&}5QRs?BmseNVnK(r1@tCC&{`m9Xj~+sj2&WrltX7hh)IPTQo8^ls9Z#$ zO#>xz0iuj0B4{HaXlPtu0w@yfdUlf2g=+@10`yK=&&}S=?&o(ibN2d^%LU344Td$& z9`JV6*^>Jp+Gc}KC;$bZ02F`%Pyh-*0Vn_kpa2wr0#M*zRKR#>SQY|0KnJG)@&I{& zJU|_w51A2R=7Zqo_z;Uv_tS`RU^nPw$!`YeCadyv#<~V&y}7WQ`TKi0or1!X)fdgfu$-l5I?nQ|u$=V|I?iT)m-BXfvv$bm$*6r6ZtOe{ z_i*eXzO$P5QTymu)q8X8B*)4AS^2?~yPRYFyW`iQc=oveUM}|!C%%WQlaA|N&~a`~ z>o~P~(xQ$tzZ{mcxT@nUJrB!Sd8^~Bf8@9uk4Fm=HkqW3_Sy4XGT(fnNgivTdu#Zc zs*c*nI8OGL{1;!W$NcSj@0`(bb}xqI>|NDyQX?#4F0@4emIelRmiIijRl z!}fr;>uihsL-f@d{6YaJ00p1`6o3Ly017|>C;$bZ02F`%|DpoML&G{DpaXPZ1rP^_ z1H=LH0CfO$0CfO$0CfO$0CfO$;6JMaJvOEv-6A^ZvYSQ8+E>xykpgyrm<*KyK(SWdI5 z<1E|_%UOD?<19Z5%UOS;<7|8k%eis*kg6`Vj=6D?SARO+cc%7oUa783kgw-`Hr@Bz zCOl$07s7Jp7WZ;;B@&))I+@#HIg1Z%5y>>F0)(Z&%sPS)=hAC7XDGym!4$U+p)jrr%|*dIzghs={5*FLS|+&Qb` z)apqWb)31Su$+Z89cOVpENA(-jyc$J%{weAaO` z`*UHxKaach{A2%8KN6pDSJHa0r#%^#voo#Zq=m4Y=8lfDa4#%pX;a5pei4?l{!Yi) z_!5RQet)j_QZo&R2Dfa!$a^g7Z=J{|`Ob61v>acH=4qU6EXTA$b5X_EM#L}3 wO61M#QYBif+MAr$b!WMz;eY~A017|>C;$bZ02F`%Pyh-*0Vn_k{%!?+01(0PQ~&?~ diff --git a/tests/test1.gdbm b/tests/test1.gdbm index 6829a6bf3f1ca81cc4f725606a8b3c70642724b6..b279b7df249fe14788c95b46c6c9795d7f1f08ce 100644 GIT binary patch delta 15 WcmZpWXpq>z!ohSUbTb>rFJ=HG{{+?m delta 15 WcmZpWXpq>z!oj2ywwaCN7c&4MZ3Hg> diff --git a/tests/tgdbm.test b/tests/tgdbm.test index 51ccb32..0d16e84 100644 --- a/tests/tgdbm.test +++ b/tests/tgdbm.test @@ -18,7 +18,7 @@ verbose error # extend auto-loader-path, to avoid interference by installed versions set auto_path [concat .. $auto_path] -package require -exact tgdbm 0.5 +package require -exact tgdbm 0.6 # just to be sure delete the created test-files catch {file delete -force test.gdbm test1.gdbm strange.gdbm junk_n_copy.gdbm artest.gdbm} diff --git a/tgdbm.spec b/tgdbm.spec index be61f70..80d8b0d 100644 --- a/tgdbm.spec +++ b/tgdbm.spec @@ -5,7 +5,7 @@ Name: tcl-tgdbm Summary: Tcl interface to the Gdbm -Version: 0.5 +Version: 0.6 Release: 0 License: GPL Group: Development/Libraries/Tcl @@ -23,7 +23,7 @@ This is a Tcl-Wrapper for the famous gdbm (the GNU-Version of dbm) and a small database-utility "Qgdbm". %prep -%setup -q -n %{packagename} +%setup -q -n %{packagename}-%{version} %build ./configure \