Hello community, here is the log from the commit of package libburnia for openSUSE:Factory checked in at 2013-08-10 11:57:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libburnia (Old) and /work/SRC/openSUSE:Factory/.libburnia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libburnia" Changes: -------- --- /work/SRC/openSUSE:Factory/libburnia/libburnia.changes 2013-06-19 14:46:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libburnia.new/libburnia.changes 2013-08-10 11:57:56.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Aug 8 13:24:26 UTC 2013 - pascal.bleser@opensuse.org + +- update to 1.3.2: + * cdrskin has acquired the ability to copy audio tracks to .wav files + * cdrskin can extract CD-TEXT in a form which is readable for humans and for + cdrskin itself + +------------------------------------------------------------------- Old: ---- libburn-1.3.0.tar.gz libisoburn-1.3.0.tar.gz libisofs-1.3.0.tar.gz New: ---- libburn-1.3.2.tar.gz libisoburn-1.3.2.tar.gz libisofs-1.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libburnia.spec ++++++ --- /var/tmp/diff_new_pack.XQmBKX/_old 2013-08-10 11:57:58.000000000 +0200 +++ /var/tmp/diff_new_pack.XQmBKX/_new 2013-08-10 11:57:58.000000000 +0200 @@ -16,9 +16,9 @@ # -%define libburn_ver 1.3.0 -%define libisoburn_ver 1.3.0 -%define libisofs_ver 1.3.0 +%define libburn_ver 1.3.2 +%define libisoburn_ver 1.3.2 +%define libisofs_ver 1.3.2 %define libburn_so 4 %define libisoburn_so 1 ++++++ libburn-1.3.0.tar.gz -> libburn-1.3.2.tar.gz ++++++ ++++ 6863 lines of diff (skipped) ++++++ libisoburn-1.3.0.tar.gz -> libisoburn-1.3.2.tar.gz ++++++ ++++ 4778 lines of diff (skipped) ++++++ libisofs-1.3.0.tar.gz -> libisofs-1.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/ChangeLog new/libisofs-1.3.2/ChangeLog --- old/libisofs-1.3.0/ChangeLog 2013-05-17 09:51:39.000000000 +0200 +++ new/libisofs-1.3.2/ChangeLog 2013-08-07 10:56:13.000000000 +0200 @@ -1,3 +1,10 @@ +libisofs-1.3.2.tar.gz Wed Aug 07 2013 +=============================================================================== +* Bug fix: iso_finish() left an invalid global pointer, which a subsequent + call of iso_init() would try to dereference. +* The sort weight of data files loaded from ISO image is now 2 exp 28 to 1 + rather than 2 exp 31 - 1 to - 2 exp 31 + libisofs-1.3.0.tar.gz Fri May 17 2013 =============================================================================== * Bug fix: GPT header CRC was computed from all 512 bytes rather than from 92. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/configure new/libisofs-1.3.2/configure --- old/libisofs-1.3.0/configure 2013-05-17 09:55:21.000000000 +0200 +++ new/libisofs-1.3.2/configure 2013-08-07 11:01:25.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for libisofs 1.3.0. +# Generated by GNU Autoconf 2.60 for libisofs 1.3.2. # # Report bugs to http://libburnia-project.org. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='libisofs' PACKAGE_TARNAME='libisofs' -PACKAGE_VERSION='1.3.0' -PACKAGE_STRING='libisofs 1.3.0' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='libisofs 1.3.2' PACKAGE_BUGREPORT='http://libburnia-project.org' ac_default_prefix=/usr/local @@ -1399,7 +1399,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 libisofs 1.3.0 to adapt to many kinds of systems. +\`configure' configures libisofs 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1470,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libisofs 1.3.0:";; + short | recursive ) echo "Configuration of libisofs 1.3.2:";; esac cat <<\_ACEOF @@ -1584,7 +1584,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libisofs configure 1.3.0 +libisofs configure 1.3.2 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1598,7 +1598,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libisofs $as_me 1.3.0, which was +It was created by libisofs $as_me 1.3.2, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2406,7 +2406,7 @@ # Define the identity of the package. PACKAGE='libisofs' - VERSION='1.3.0' + VERSION='1.3.2' cat >>confdefs.h <<_ACEOF @@ -2564,7 +2564,7 @@ LIBISOFS_MAJOR_VERSION=1 LIBISOFS_MINOR_VERSION=3 -LIBISOFS_MICRO_VERSION=0 +LIBISOFS_MICRO_VERSION=2 LIBISOFS_VERSION=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION.$LIBISOFS_MICRO_VERSION @@ -2573,10 +2573,10 @@ LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION -# 2013.05.17 development jump has not yet happened -# SONAME = 72 - 66 = 6 . Library name = libisofs.6.66.0 -LT_CURRENT=72 -LT_AGE=66 +# 2013.08.07 development jump has not yet happened +# SONAME = 74 - 68 = 6 . Library name = libisofs.6.68.0 +LT_CURRENT=74 +LT_AGE=68 LT_REVISION=0 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` @@ -24171,7 +24171,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libisofs $as_me 1.3.0, which was +This file was extended by libisofs $as_me 1.3.2, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24218,7 +24218,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libisofs config.status 1.3.0 +libisofs config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/configure.ac new/libisofs-1.3.2/configure.ac --- old/libisofs-1.3.0/configure.ac 2013-05-17 09:54:44.000000000 +0200 +++ new/libisofs-1.3.2/configure.ac 2013-08-07 11:01:15.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([libisofs], [1.3.0], [http://libburnia-project.org]) +AC_INIT([libisofs], [1.3.2], [http://libburnia-project.org]) AC_PREREQ([2.50]) dnl AC_CONFIG_HEADER([config.h]) @@ -41,7 +41,7 @@ dnl LIBISOFS_MAJOR_VERSION=1 LIBISOFS_MINOR_VERSION=3 -LIBISOFS_MICRO_VERSION=0 +LIBISOFS_MICRO_VERSION=2 LIBISOFS_VERSION=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION.$LIBISOFS_MICRO_VERSION AC_SUBST(LIBISOFS_MAJOR_VERSION) @@ -51,10 +51,10 @@ dnl Libtool versioning LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION -# 2013.05.17 development jump has not yet happened -# SONAME = 72 - 66 = 6 . Library name = libisofs.6.66.0 -LT_CURRENT=72 -LT_AGE=66 +# 2013.08.07 development jump has not yet happened +# SONAME = 74 - 68 = 6 . Library name = libisofs.6.68.0 +LT_CURRENT=74 +LT_AGE=68 LT_REVISION=0 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/ecma119.c new/libisofs-1.3.2/libisofs/ecma119.c --- old/libisofs-1.3.0/libisofs/ecma119.c 2013-04-13 19:08:47.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/ecma119.c 2013-08-03 15:48:15.000000000 +0200 @@ -597,6 +597,8 @@ ecma119_set_voldescr_times(writer, &vol); vol.file_structure_version[0] = 1; + memcpy(vol.app_use, image->application_use, 512); + free(vol_id); free(volset_id); free(pub_id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/fs_image.c new/libisofs-1.3.2/libisofs/fs_image.c --- old/libisofs-1.3.0/libisofs/fs_image.c 2013-04-25 17:54:49.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/fs_image.c 2013-05-24 12:35:23.000000000 +0200 @@ -3104,8 +3104,19 @@ /* * and we set the sort weight based on the block on image, to * improve performance on image modifying. + * + * This was too obtrusive because it occupied the highest + * possible weight ranks: + * file->sort_weight = INT_MAX - data->sections[0].block; + * + * So a try to be more nice and rely on caching with tiles + * of at least 16 blocks. This occupies a range within + * the interval of 1 to 2 exp 28 = 268,435,456. + * (Dividing each number separately saves from integer + * rollover problems.) */ - file->sort_weight = INT_MAX - data->sections[0].block; + file->sort_weight = + fsdata->nblocks / 16 - data->sections[0].block / 16 + 1; file->stream = stream; file->node.type = LIBISO_FILE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/image.c new/libisofs-1.3.2/libisofs/image.c --- old/libisofs-1.3.0/libisofs/image.c 2013-04-13 22:06:29.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/image.c 2013-08-03 15:53:29.000000000 +0200 @@ -78,6 +78,7 @@ img->volset_id = strdup(name); img->volume_id = strdup(name); } + memset(img->application_use, 0, 512); img->system_area_data = NULL; img->system_area_options = 0; img->num_mips_boot_files = 0; @@ -373,6 +374,19 @@ return ISO_SUCCESS; } +void iso_image_set_app_use(IsoImage *image, const char *app_use_data, + int count) +{ + if (count < 0) + count= 0; + else if(count > 512) + count= 512; + if (count > 0) + memcpy(image->application_use, app_use_data, count); + if (count < 512) + memset(image->application_use + count, 0, 512 - count); +} + int iso_image_get_msg_id(IsoImage *image) { return image->id; @@ -392,6 +406,14 @@ int dir_update_size(IsoImage *image, IsoDir *dir) { IsoNode *pos; + +#ifdef Libisofs_update_sizes_abortablE + char *path= NULL; + IsoStream *base_stream; + int cancel_ret, ret; + uint32_t lba; +#endif + pos = dir->children; while (pos) { int ret = 1; @@ -400,13 +422,51 @@ } else if (pos->type == LIBISO_DIR) { /* recurse */ ret = dir_update_size(image, ISO_DIR(pos)); + +#ifdef Libisofs_update_sizes_abortablE + if (ret == ISO_CANCELED) + return ret; /* Message already issued by dir_update_size */ +#endif + } + +#ifdef Libisofs_update_sizes_abortablE + + /* This would report error and abort according to severity threshold. + But it is desirable to let the update_size crawler continue + its work after e.g. a file has vanished from hard disk. + So normally this macro case should be disabled. + */ + if (ret < 0) { - ret = iso_msg_submit(image->id, ret, 0, NULL); - if (ret < 0) { - return ret; /* cancel due error threshold */ + cancel_ret = iso_msg_submit(image->id, ret, 0, NULL); + path = iso_tree_get_node_path(pos); + if (path != NULL) { + iso_msg_submit(image->id, ret, 0, + "ISO path : %s", path); + free(path); } + /* Report source path with streams which do not come from + the loaded ISO filesystem */ + if (pos->type == LIBISO_FILE && + iso_node_get_old_image_lba(pos, &lba, 0) == 0) { + base_stream = iso_stream_get_input_stream( + ISO_FILE(pos)->stream, 1); + if (base_stream == NULL) + base_stream = ISO_FILE(pos)->stream; + path = iso_stream_get_source_path(base_stream, 0); + if (path != NULL) { + iso_msg_submit(image->id, ret, 0, + "Local path: %s", path); + free(path); + } + } + if (cancel_ret < 0) + return cancel_ret; /* cancel due error threshold */ } + +#endif /* Libisofs_update_sizes_abortablE */ + pos = pos->next; } return ISO_SUCCESS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/image.h new/libisofs-1.3.2/libisofs/image.h --- old/libisofs-1.3.0/libisofs/image.h 2013-04-13 19:04:37.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/image.h 2013-08-03 15:39:20.000000000 +0200 @@ -53,6 +53,7 @@ char *modification_time; char *expiration_time; char *effective_time; + char application_use[512]; /* el-torito boot catalog */ struct el_torito_boot_catalog *bootcat; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/libisofs.h new/libisofs-1.3.2/libisofs/libisofs.h --- old/libisofs-1.3.0/libisofs/libisofs.h 2013-05-17 09:55:06.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/libisofs.h 2013-08-07 10:59:51.000000000 +0200 @@ -84,7 +84,7 @@ */ #define iso_lib_header_version_major 1 #define iso_lib_header_version_minor 3 -#define iso_lib_header_version_micro 0 +#define iso_lib_header_version_micro 2 /** * Get version of the libisofs library at runtime. @@ -2895,7 +2895,7 @@ /** * Get the volset identifier. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -2911,7 +2911,7 @@ /** * Get the volume identifier. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -2927,7 +2927,7 @@ /** * Get the publisher of a image. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -2944,7 +2944,7 @@ /** * Get the data preparer of a image. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -2960,7 +2960,7 @@ /** * Get the system id of a image. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -2976,7 +2976,7 @@ /** * Get the application id of a image. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -2994,7 +2994,7 @@ /** * Get the copyright information of a image. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -3012,7 +3012,7 @@ /** * Get the abstract information of a image. - * The returned string is owned by the image and should not be freed nor + * The returned string is owned by the image and must not be freed nor * changed. * * @since 0.6.2 @@ -3029,14 +3029,43 @@ /** * Get the biblio information of a image. - * The returned string is owned by the image and should not be freed nor - * changed. + * The returned string is owned by the image and must not be freed or changed. * * @since 0.6.2 */ const char *iso_image_get_biblio_file_id(const IsoImage *image); /** + * Fill Application Use field of the Primary Volume Descriptor. + * ECMA-119 8.4.32 Application Use (BP 884 to 1395) + * "This field shall be reserved for application use. Its content + * is not specified by this Standard." + * + * @param image + * The image to manipulate. + * @param app_use_data + * Up to 512 bytes of data. + * @param count + * The number of bytes in app_use_data. If the number is smaller than 512, + * then the remaining bytes will be set to 0. + * @since 1.3.2 + */ +void iso_image_set_app_use(IsoImage *image, const char *app_use_data, + int count); + +/** + * Get the current setting for the Application Use field of the Primary Volume + * Descriptor. + * The returned char array of 512 bytes is owned by the image and must not + * be freed or changed. + * + * @param image + * The image to inquire + * @since 1.3.2 + */ +const char *iso_image_get_app_use(IsoImage *image); + +/** * Get the four timestamps from the Primary Volume Descriptor of the imported * ISO image. The timestamps are strings which are either empty or consist * of 17 digits of the form YYYYMMDDhhmmsscc. @@ -3094,7 +3123,7 @@ * creation time. * @param boot * Location where a pointer to the added boot image will be stored. That - * object is owned by the IsoImage and should not be freed by the user, + * object is owned by the IsoImage and must not be freed by the user, * nor dereferenced once the last reference to the IsoImage was disposed * via iso_image_unref(). A NULL value is allowed if you don't need a * reference to the boot image. @@ -3144,7 +3173,7 @@ * the image and catalog tree nodes. An application would want those, for * example, to prevent the user removing it. * - * Both nodes are owned by libisofs and should not be freed. You can get your + * Both nodes are owned by libisofs and must not be freed. You can get your * own ref with iso_node_ref(). You can also check if the node is already * on the tree by getting its parent (note that when reading El-Torito info * from a previous image, the nodes might not be on the tree even if you haven't @@ -3156,7 +3185,7 @@ * The image from which to get the boot image. * @param boot * If not NULL, it will be filled with a pointer to the boot image, if - * any. That object is owned by the IsoImage and should not be freed by + * any. That object is owned by the IsoImage and must not be freed by * the user, nor dereferenced once the last reference to the IsoImage was * disposed via iso_image_unref(). * @param imgnode @@ -3924,7 +3953,7 @@ /** * Get the name of a node. - * The returned string belongs to the node and should not be modified nor + * The returned string belongs to the node and must not be modified nor * freed. Use strdup if you really need your own copy. * * @since 0.6.2 @@ -4503,7 +4532,7 @@ /** * Get the destination of a node. - * The returned string belongs to the node and should not be modified nor + * The returned string belongs to the node and must not be modified nor * freed. Use strdup if you really need your own copy. * * @since 0.6.2 @@ -6421,7 +6450,10 @@ * @param stream * The eventual filter stream to be inquired. * @param flag - * Bitfield for control purposes. Submit 0 for now. + * Bitfield for control purposes. + * bit0= Follow the chain of input streams and return the one at the + * end of the chain. + * @since 1.3.2 * @return * The input stream, if one exists. Elsewise NULL. * No extra reference to the stream is taken by this call. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/libisofs.ver new/libisofs-1.3.2/libisofs/libisofs.ver --- old/libisofs-1.3.0/libisofs/libisofs.ver 2013-04-13 19:24:48.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/libisofs.ver 2013-08-03 16:12:11.000000000 +0200 @@ -88,6 +88,7 @@ iso_image_generator_is_running; iso_image_get_abstract_file_id; iso_image_get_all_boot_imgs; +iso_image_get_app_use; iso_image_get_application_id; iso_image_get_attached_data; iso_image_get_biblio_file_id; @@ -114,6 +115,7 @@ iso_image_ref; iso_image_remove_boot_image; iso_image_set_abstract_file_id; +iso_image_set_app_use; iso_image_set_application_id; iso_image_set_biblio_file_id; iso_image_set_boot_catalog_hidden; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/messages.c new/libisofs-1.3.2/libisofs/messages.c --- old/libisofs-1.3.0/libisofs/messages.c 2013-04-10 13:13:29.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/messages.c 2013-07-31 09:30:00.000000000 +0200 @@ -139,6 +139,7 @@ next = assoc->next; free((char *) assoc); } + iso_xinfo_cloner_list= NULL; return(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/stream.c new/libisofs-1.3.2/libisofs/stream.c --- old/libisofs-1.3.0/libisofs/stream.c 2011-08-09 11:00:53.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/stream.c 2013-06-25 11:15:25.000000000 +0200 @@ -890,17 +890,27 @@ } } +/* @param flag bit0= Obtain most fundamental stream */ IsoStream *iso_stream_get_input_stream(IsoStream *stream, int flag) { IsoStreamIface* class; + IsoStream *result = NULL, *next; if (stream == NULL) { return NULL; } - class = stream->class; - if (class->version < 2) - return NULL; - return class->get_input_stream(stream, 0); + while (1) { + class = stream->class; + if (class->version < 2) + return result; + next = class->get_input_stream(stream, 0); + if (next == NULL) + return result; + result = next; + if (!(flag & 1)) + return result; + stream = result; + } } char *iso_stream_get_source_path(IsoStream *stream, int flag) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libisofs-1.3.0/libisofs/tree.c new/libisofs-1.3.2/libisofs/tree.c --- old/libisofs-1.3.0/libisofs/tree.c 2012-07-20 12:14:21.000000000 +0200 +++ new/libisofs-1.3.2/libisofs/tree.c 2013-06-24 20:10:47.000000000 +0200 @@ -803,6 +803,8 @@ ret = iso_file_source_lstat(file, &info); } if (ret < 0) { + ret = iso_msg_submit(image->id, ISO_FILE_CANT_ADD, ret, + "Error when adding file %s", path); goto dir_rec_continue; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org