commit libHX10

Hello community, here is the log from the commit of package libHX10 checked in at Wed Apr 2 21:49:18 CEST 2008. -------- --- libHX10/libHX10.changes 2007-10-08 15:18:27.000000000 +0200 +++ libHX10/libHX10.changes 2008-04-02 18:17:49.833240000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 2 18:06:43 CEST 2008 - mc@suse.de + +- version 1.10.2 + * bugfixes + +------------------------------------------------------------------- Old: ---- libHX-1.10.1.tar.bz2 New: ---- libHX-1.10.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libHX10.spec ++++++ --- /var/tmp/diff_new_pack.iG1229/_old 2008-04-02 21:34:46.000000000 +0200 +++ /var/tmp/diff_new_pack.iG1229/_new 2008-04-02 21:34:46.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libHX10 (Version 1.10.1) +# spec file for package libHX10 (Version 1.10.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,13 +10,14 @@ # norootforbuild + Name: libHX10 %define REALNAME libHX BuildRequires: libxml2-devel Summary: General-purpose Library -Version: 1.10.1 +Version: 1.10.2 Release: 1 -License: LGPL v2 or later; LGPL v3 or later +License: LGPL v2.1 or later; LGPL v3 or later Prefix: /usr Group: System/Libraries Source: libHX-%{version}.tar.bz2 @@ -51,6 +52,7 @@ Jan Engelhardt %package devel +License: LGPL v2.1 or later Summary: General-purpose library Group: System/Libraries Requires: libHX10 = %{version} @@ -118,11 +120,15 @@ %_includedir/%{REALNAME}* %_libdir/%{REALNAME}*.so %_libdir/pkgconfig/*.pc + %changelog -* Mon Oct 08 2007 - mc@suse.de +* Wed Apr 02 2008 mc@suse.de +- version 1.10.2 + * bugfixes +* Mon Oct 08 2007 mc@suse.de - version 1.10.1 * Fix output of line-wrapped help text * fix tarball - package pkgconfig file -* Thu Jul 12 2007 - mc@suse.de +* Thu Jul 12 2007 mc@suse.de - initial release 1.10.0 ++++++ libHX-1.10.1.tar.bz2 -> libHX-1.10.2.tar.bz2 ++++++ ++++ 9382 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/compile new/libHX-1.10.2/compile --- old/libHX-1.10.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/libHX-1.10.2/compile 2007-12-06 22:09:17.000000000 +0100 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/configure.ac new/libHX-1.10.2/configure.ac --- old/libHX-1.10.1/configure.ac 2007-09-17 13:37:09.000000000 +0200 +++ new/libHX-1.10.2/configure.ac 2007-12-06 22:07:28.000000000 +0100 @@ -1,5 +1,5 @@ -AC_INIT(libHX, 1.10.1) +AC_INIT(libHX, 1.10.2) AC_CONFIG_HEADERS(config.h) AC_PROG_INSTALL AM_INIT_AUTOMAKE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/doc/changelog.txt new/libHX-1.10.2/doc/changelog.txt --- old/libHX-1.10.1/doc/changelog.txt 2007-09-17 13:37:09.000000000 +0200 +++ new/libHX-1.10.2/doc/changelog.txt 2007-12-06 22:07:28.000000000 +0100 @@ -3,6 +3,13 @@ ========== +libHX 1.10.2 (December 06 2007) +=============================== +- [r105]: pass up NULL from memory allocation error +- [r108]: only return success on EEXIST when HXF_KEEP was given +- [r112]: HX_dirname() incorrectly computed the path + + libHX 1.10.1 (September 17 2007) ================================ - [r96]: Fix output of line-wrapped help text diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/libHX.spec new/libHX-1.10.2/libHX.spec --- old/libHX-1.10.1/libHX.spec 2007-09-17 13:56:43.000000000 +0200 +++ new/libHX-1.10.2/libHX.spec 2007-12-06 22:07:28.000000000 +0100 @@ -1,6 +1,6 @@ Name: libHX -Version: 1.10.1 +Version: 1.10.2 Release: jen0 Group: System/Libraries URL: http://jengelh.hopto.org/p/%name/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/missing new/libHX-1.10.2/missing --- old/libHX-1.10.1/missing 2007-09-17 13:56:56.000000000 +0200 +++ new/libHX-1.10.2/missing 2007-12-06 22:09:17.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/src/dir.c new/libHX-1.10.2/src/dir.c --- old/libHX-1.10.1/src/dir.c 2007-08-18 11:06:58.000000000 +0200 +++ new/libHX-1.10.2/src/dir.c 2007-09-30 17:14:41.000000000 +0200 @@ -22,6 +22,12 @@ # include #endif #include "libHX.h" +#ifndef S_IRUGO +# define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) +#endif +#ifndef S_IWUGO +# define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) +#endif struct HXdir { #if defined _WIN32 @@ -113,16 +119,21 @@ unsigned int opts, ...) { char buf[MAXLNLEN]; + unsigned int extra_flags = 0; int dd, eax = 0, sd, l; + int throw_away; - if ((sd = open(src, O_RDONLY | O_BINARY, 0400)) < 0) + if ((sd = open(src, O_RDONLY | O_BINARY)) < 0) return -errno; - if ((dd = open(dest, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC | - (!!(opts & HXF_KEEP) * O_EXCL), 0666)) < 0) { + if (opts & HXF_KEEP) + extra_flags = O_EXCL; + dd = open(dest, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC | + extra_flags, S_IRUGO | S_IWUGO); + if (dd < 0) { eax = errno; close(sd); errno = eax; - if (eax == EEXIST) + if (extra_flags != 0 && eax == EEXIST) return 1; return -errno; } @@ -143,7 +154,7 @@ if (opts & HXF_UID) uid = va_arg(argp, long); if (opts & HXF_GID) gid = va_arg(argp, long); - fchown(dd, uid, gid); + throw_away = fchown(dd, uid, gid); va_end(argp); } close(dd); @@ -156,6 +167,7 @@ void *dt = HXdir_open(src); long uid = -1, gid = -1; const char *fn; + int throw_away; if (dt == NULL) return 0; @@ -181,22 +193,22 @@ sb.st_mode &= 0777; /* clear SUID/GUID/Sticky bits */ if (S_ISREG(sb.st_mode)) { - HX_copy_file(fsrc, fdest, opts & ~(HXF_UID | HXF_GID)); + HX_copy_file(fsrc, fdest, opts, uid, gid); } else if (S_ISDIR(sb.st_mode)) { HX_mkdir(fdest); - HX_copy_dir(fsrc, fdest, opts | HXF_UID | HXF_GID, uid, gid); + HX_copy_dir(fsrc, fdest, opts, uid, gid); } else if (S_ISLNK(sb.st_mode)) { char pt[MAXFNLEN]; memset(pt, '\0', MAXFNLEN); if (readlink(fsrc, pt, MAXFNLEN - 1) < MAXFNLEN - 1) - symlink(pt, fdest); + throw_away = symlink(pt, fdest); } else if (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode)) { mknod(fdest, sb.st_mode, sb.st_dev); } else if (S_ISFIFO(sb.st_mode)) { mkfifo(fdest, sb.st_mode); } - lchown(fdest, uid, gid); + throw_away = lchown(fdest, uid, gid); if (!S_ISLNK(sb.st_mode)) chmod(fdest, sb.st_mode); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/src/string.c new/libHX-1.10.2/src/string.c --- old/libHX-1.10.1/src/string.c 2007-07-01 15:39:50.000000000 +0200 +++ new/libHX-1.10.2/src/string.c 2007-12-06 21:57:44.000000000 +0100 @@ -41,13 +41,24 @@ EXPORT_SYMBOL char *HX_dirname(const char *s) { - char *dir; - if (strrchr(s, '/') == NULL) + const char *last, *stop; + char *p; + + if (*s == '\0') + return HX_strdup("."); + + for (last = s + strlen(s) - 1; last > s && *last == '/'; --last) + ; + + if ((stop = HX_strbchr(s, last, '/')) == NULL) return HX_strdup("."); - dir = HX_strdup(s); - *strrchr(dir, '/') = '\0'; - return dir; + for (; stop > s && *stop == '/'; --stop) + ; + + p = HX_memdup(s, stop - s + 2); + p[stop-s+1] = '\0'; + return p; } EXPORT_SYMBOL hmc_t *HX_getl(hmc_t **ptr, FILE *fp) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/t/Makefile.am new/libHX-1.10.2/t/Makefile.am --- old/libHX-1.10.1/t/Makefile.am 2007-08-30 13:21:16.000000000 +0200 +++ new/libHX-1.10.2/t/Makefile.am 2007-12-06 19:28:49.000000000 +0100 @@ -1,9 +1,10 @@ # -*- Makefile -*- -EXTRA_PROGRAMS = test_btree test_dir test_format test_hpp test_multiline \ +noinst_PROGRAMS = test_btree test_dir test_format test_hpp test_multiline \ test_opt test_str test_strncat test_strsep AM_CFLAGS = $(regular_CFLAGS) -I$(top_srcdir)/src AM_CXXFLAGS = -Wall -pipe -I$(top_srcdir)/src LDADD = ../src/libHX.la test_btree_LDADD = ../src/libHX.la -lm +test_hpp_SOURCES = test_hpp.cpp test_hpp_LDADD = ../src/libHX.la -ldl diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.10.1/t/test_str.c new/libHX-1.10.2/t/test_str.c --- old/libHX-1.10.1/t/test_str.c 2007-07-01 15:39:50.000000000 +0200 +++ new/libHX-1.10.2/t/test_str.c 2007-12-06 21:57:44.000000000 +0100 @@ -20,6 +20,11 @@ printf("%s", tx); fclose(fp); + + printf("%s\n", HX_dirname("/")); + printf("%s\n", HX_dirname("//")); + printf("%s\n", HX_dirname("etc//foo/")); + printf("%s\n", HX_dirname("//etc//foo//")); return 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org