commit libHX for openSUSE:Factory

30 Aug 2014

Hello community,

here is the log from the commit of package libHX for openSUSE:Factory checked in at 2014-08-30 16:03:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libHX (Old)
 and      /work/SRC/openSUSE:Factory/.libHX.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libHX"

Changes:
--------

--- /work/SRC/openSUSE:Factory/libHX/libHX.changes	2014-06-30 21:50:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libHX.new/libHX.changes	2014-08-30 16:04:03.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 25 15:20:02 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 3.22
+* HX_strquote() now supports the HXQUOTE_SQLBQUOTE mechanism
+
+-------------------------------------------------------------------

Old:
----
  libHX-3.21.tar.asc
  libHX-3.21.tar.xz

New:
----
  libHX-3.22.tar.asc
  libHX-3.22.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libHX.spec ++++++
--- /var/tmp/diff_new_pack.93C7rQ/_old	2014-08-30 16:04:05.000000000 +0200
+++ /var/tmp/diff_new_pack.93C7rQ/_new	2014-08-30 16:04:05.000000000 +0200
@@ -21,7 +21,7 @@
 Summary:        Useful collection of routines for C and C++ programming
 License:        LGPL-2.1 or LGPL-3.0
 Group:          Development/Libraries/C and C++
-Version:        3.21
+Version:        3.22
 Release:        0
 Url:            http://libhx.sf.net/
 

++++++ libHX-3.21.tar.xz -> libHX-3.22.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/configure new/libHX-3.22/configure
--- old/libHX-3.21/configure	2014-06-02 03:18:09.000000000 +0200
+++ new/libHX-3.22/configure	2014-08-25 17:18:49.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libHX 3.21.
+# Generated by GNU Autoconf 2.69 for libHX 3.22.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='libHX'
 PACKAGE_TARNAME='libhx'
-PACKAGE_VERSION='3.21'
-PACKAGE_STRING='libHX 3.21'
+PACKAGE_VERSION='3.22'
+PACKAGE_STRING='libHX 3.22'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1339,7 +1339,7 @@
   # 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 libHX 3.21 to adapt to many kinds of systems.
+\`configure' configures libHX 3.22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1409,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libHX 3.21:";;
+     short | recursive ) echo "Configuration of libHX 3.22:";;
    esac
   cat <<\_ACEOF
 
@@ -1519,7 +1519,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libHX configure 3.21
+libHX configure 3.22
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2245,7 +2245,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libHX $as_me 3.21, which was
+It was created by libHX $as_me 3.22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3111,7 +3111,7 @@
 
 # Define the identity of the package.
  PACKAGE='libhx'
- VERSION='3.21'
+ VERSION='3.22'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17121,7 +17121,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libHX $as_me 3.21, which was
+This file was extended by libHX $as_me 3.22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17187,7 +17187,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libHX config.status 3.21
+libHX config.status 3.22
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/configure.ac new/libHX-3.22/configure.ac
--- old/libHX-3.21/configure.ac	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/configure.ac	2014-08-25 17:16:37.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([libHX], [3.21])
+AC_INIT([libHX], [3.22])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/doc/api.txt new/libHX-3.22/doc/api.txt
--- old/libHX-3.21/doc/api.txt	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/doc/api.txt	2014-08-25 17:16:37.000000000 +0200
@@ -15,6 +15,7 @@
 
 RMV	MinVer	FirstA	Name
 ----------------------------------------------------------------------
+3.22	3.22	3.22	HXQUOTE_SQLBQUOTE
 3.21	3.21	3.21	xml_getnsprop
 3.19	3.19	3.19	HXQUOTE_SQLSQUOTE
 3.18	3.18	3.18	HX_stpltrim
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/doc/changelog.txt new/libHX-3.22/doc/changelog.txt
--- old/libHX-3.21/doc/changelog.txt	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/doc/changelog.txt	2014-08-25 17:16:37.000000000 +0200
@@ -4,8 +4,15 @@
 ====
 
 
+v3.22 (2014-08-25)
+==================
+Enhancements:
+- string: add the HXQUOTE_SQLBQUOTE quoting variant
+
+
 v3.21 (2014-06-02)
 ==================
+Enhancements:
 - HXformat_add() now supports HXTYPE_MCSTR objects (with and without
   HXTYPE_IMMED)
 - libxml_helper: New xml_getnsprop() function that gets the value of a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/doc/generator.cpp new/libHX-3.22/doc/generator.cpp
--- old/libHX-3.21/doc/generator.cpp	1970-01-01 01:00:00.000000000 +0100
+++ new/libHX-3.22/doc/generator.cpp	2014-08-25 17:16:37.000000000 +0200
@@ -0,0 +1,43 @@
+/*
+ * sample.
+ *
+ * Something more or less like Python generators.
+ */
+#include <cstdlib>
+#include <cstdio>
+template<class base> class fi /* filler_iterator */ {
+        private:
+        base &parent;
+        public:
+        fi(base &p) : parent(p) {};
+        bool operator!=(const fi &) { return parent.has_more(); };
+        const fi &operator++(void) { return *this; };
+        int operator*(void) { return parent.yield(); };
+};
+
+class rdgen {
+        private:
+        unsigned int remaining;
+
+        public:
+        rdgen(unsigned int x) {
+                remaining = x;
+        };
+        bool has_more(void) {
+                return remaining > 0;
+        };
+        int yield(void) {
+                --remaining;
+                return rand();
+        };
+
+        fi<rdgen> begin(void) { return fi<rdgen>(*this); };
+        fi<rdgen> end(void) { return fi<rdgen>(*this); };
+};
+
+int main(int argc, const char **argv)
+{
+        for (auto x : rdgen(argc))
+                printf("%d\n", x);
+        return 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/doc/libHX_Documentation.lyx new/libHX-3.22/doc/libHX_Documentation.lyx
--- old/libHX-3.21/doc/libHX_Documentation.lyx	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/doc/libHX_Documentation.lyx	2014-08-25 17:16:37.000000000 +0200
@@ -74,7 +74,7 @@
 \begin_body
 
 \begin_layout Title
-libHX 3.21
+libHX 3.22
 \begin_inset Newline newline
 \end_inset
 
@@ -11970,7 +11970,33 @@
  Escape all single quotes in the string by double single-quotes, as required
  for using it in a single-quoted SQL string.
  No surrounding quotes will be generated to facilitate concatenating of
- HX_strquote results.
+ 
+\family typewriter
+HX_strquote
+\family default
+ results.
+\end_layout
+
+\begin_layout Description
+
+\family typewriter
+HXQUOTE_SQLBQUOTE
+\family default
+
+\begin_inset Index idx
+status open
+
+\begin_layout Plain Layout
+
+\family typewriter
+HXQUOTE_SQLBQUOTE
+\end_layout
+
+\end_inset
+
+ Escape all backticks in the string by double backticks, as required for
+ using it in a backtick-quoted SQL string (used for table names and columns).
+ No surrounding ticks will be generated to facilitate concatenation.
 \end_layout
 
 \begin_layout Standard
@@ -12395,6 +12421,11 @@
 HX_zvecfree
 \family default
  or equivalent.
+ An empty string (zero-length string) for 
+\family typewriter
+s
+\family default
+ yields a single field.
 \end_layout
 
 \begin_layout Description
Files old/libHX-3.21/doc/libHX_Documentation.pdf and new/libHX-3.22/doc/libHX_Documentation.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/include/libHX/string.h new/libHX-3.22/include/libHX/string.h
--- old/libHX-3.21/include/libHX/string.h	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/include/libHX/string.h	2014-08-25 17:16:37.000000000 +0200
@@ -27,6 +27,7 @@
 	HXQUOTE_BASE64,
 	HXQUOTE_URIENC,
 	HXQUOTE_SQLSQUOTE,
+	HXQUOTE_SQLBQUOTE,
 	_HXQUOTE_MAX,
 };
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/src/map.c new/libHX-3.22/src/map.c
--- old/libHX-3.21/src/map.c	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/src/map.c	2014-08-25 17:16:37.000000000 +0200
@@ -408,6 +408,12 @@
     unsigned int flags, const struct HXmap_ops *ops, size_t key_size,
     size_t data_size)
 {
+	if ((flags & HXMAP_SINGULAR) &&
+	    (flags & (HXMAP_CDATA | HXMAP_SDATA) || data_size != 0))
+		fprintf(stderr, "WARNING: libHX-map: When HXMAP_SINGULAR is "
+		        "set, HXMAP_CDATA, HXMAP_SDATA and/or data_size != 0 "
+		        "has no effect.\n");
+
 	switch (type) {
 	case HXMAPT_HASH:
 		return HXhashmap_init4(flags, ops, key_size, data_size);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/src/string.c new/libHX-3.22/src/string.c
--- old/libHX-3.21/src/string.c	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/src/string.c	2014-08-25 17:16:37.000000000 +0200
@@ -505,6 +505,7 @@
 	[HXQUOTE_LDAPRDN] = {HXQUOTE_REJECT, "\n \"#+,;<=>\\"},
 	[HXQUOTE_URIENC]  = {HXQUOTE_ACCEPT, "-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"},
 	[HXQUOTE_SQLSQUOTE] = {HXQUOTE_REJECT, "'"},
+	[HXQUOTE_SQLBQUOTE] = {HXQUOTE_REJECT, "`"},
 };
 
 /**
@@ -750,6 +751,7 @@
 	case HXQUOTE_SQUOTE:
 	case HXQUOTE_DQUOTE:
 	case HXQUOTE_SQLSQUOTE:
+	case HXQUOTE_SQLBQUOTE:
 		return HX_qsize_bsr(s, HX_quote_rules[type].chars, 1);
 	case HXQUOTE_HTML:
 		return HX_qsize_html(s);
@@ -819,6 +821,7 @@
 	case HXQUOTE_URIENC:
 		return HX_quote_urlenc(*free_me, src);
 	case HXQUOTE_SQLSQUOTE:
+	case HXQUOTE_SQLBQUOTE:
 		return HX_quote_sqlbackslash(*free_me, src, rule->chars);
 	}
 	return NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.21/src/tc-strquote.c new/libHX-3.22/src/tc-strquote.c
--- old/libHX-3.21/src/tc-strquote.c	2014-06-02 03:17:37.000000000 +0200
+++ new/libHX-3.22/src/tc-strquote.c	2014-08-25 17:16:37.000000000 +0200
@@ -24,6 +24,8 @@
 static const char output3c[] = "ICNvPWZvbygqKSxiYVxyIA==";
 static const char input4[]   = "http://user:pass@host.de/~path/file(msvc);stuff.php?query[phpindex]=value&another=one;stuff";
 static const char output4[]  = "http%3A%2F%2Fuser%3Apass%40host.de%2F~path%2Ffile%28msvc%29%3Bstuff.php%3Fquery%5Bphpindex%5D%3Dvalue%26another%3Done%3Bstuff";
+static const char input5[]   = "echo hello `echo world`";
+static const char output5[]  = "echo hello ``echo world``";
 
 static int test(const char *input, unsigned int mode, const char *expect)
 {
@@ -62,6 +64,7 @@
 	tst(input3, HXQUOTE_LDAPRDN, output3b);
 	tst(input3, HXQUOTE_BASE64, output3c);
 	tst(input4, HXQUOTE_URIENC, output4);
+	tst(input5, HXQUOTE_SQLBQUOTE, output5);
 	return 0;
 #undef tst
 }

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)