Hello community, here is the log from the commit of package ebiso for openSUSE:Factory checked in at 2016-04-11 09:14:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ebiso (Old) and /work/SRC/openSUSE:Factory/.ebiso.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ebiso" Changes: -------- --- /work/SRC/openSUSE:Factory/ebiso/ebiso.changes 2016-04-07 13:32:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ebiso.new/ebiso.changes 2016-04-11 10:26:29.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Apr 8 11:03:44 CEST 2016 - [email protected] + +- Bugfix update to version 0.2.3.1 see upstream issue + https://github.com/gozora/ebiso/issues/7 + Now upstream Makefile accepts CFLAGS from environment + so that setting our preferred flags for the compiler + and linker via + export CFLAGS="$RPM_OPT_FLAGS" + does now work. + +------------------------------------------------------------------- +Thu Apr 7 15:17:08 CEST 2016 - [email protected] + +- Bugfix update to version 0.2.3 see upstream issue + https://github.com/gozora/ebiso/issues/6 and + https://github.com/gozora/ebiso/releases/tag/v0.2.3 + (boo#974360). +- Setting our preferred flags for the compiler and linker via + export CFLAGS="$RPM_OPT_FLAGS" + does not work because upstream Makefile uses FLAGS instead + of CFLAGS so that the upstream FLAGS are overridden with + our preferred flags added to the upstream FLAGS (boo#974360). + +------------------------------------------------------------------- Old: ---- ebiso-0.2.2.tar.gz New: ---- ebiso-0.2.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ebiso.spec ++++++ --- /var/tmp/diff_new_pack.tKE4Mz/_old 2016-04-11 10:26:30.000000000 +0200 +++ /var/tmp/diff_new_pack.tKE4Mz/_new 2016-04-11 10:26:30.000000000 +0200 @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ebiso -Version: 0.2.2 +Version: 0.2.3.1 Release: 0 Summary: UEFI bootable ISO image creator for Relax-and-Recover +License: GPL-2.0+ +Group: Productivity/Archiving/Backup # Refer to http://license.opensuse.org/ # for the list of known licences and their exact spelling: -License: GPL-2.0+ # ebiso is only used by rear to make UEFI bootable ISO images # accordingly ebiso is in the same RPM group as rear: -Group: Productivity/Archiving/Backup -URL: https://github.com/gozora/ebiso +Url: https://github.com/gozora/ebiso # How to make Source0: -# wget --no-check-certificate https://github.com/gozora/ebiso/archive/v0.2.2.tar.gz -# mv v0.2.2 ebiso-0.2.2.tar.gz +# wget --no-check-certificate https://github.com/gozora/ebiso/archive/v0.2.3.tar.gz +# mv v0.2.3 ebiso-0.2.3.tar.gz Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build # ebiso is only used by rear to make UEFI bootable ISO images @@ -61,6 +62,8 @@ %setup -q %build +# Setting our preferred architecture-specific flags for the compiler and linker: +export CFLAGS="$RPM_OPT_FLAGS" make %install ++++++ ebiso-0.2.2.tar.gz -> ebiso-0.2.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebiso-0.2.2/.gitignore new/ebiso-0.2.3.1/.gitignore --- old/ebiso-0.2.2/.gitignore 2016-04-02 23:52:26.000000000 +0200 +++ new/ebiso-0.2.3.1/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -ebiso -*.o -*.a -.d/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebiso-0.2.2/Makefile new/ebiso-0.2.3.1/Makefile --- old/ebiso-0.2.2/Makefile 2016-04-02 23:52:26.000000000 +0200 +++ new/ebiso-0.2.3.1/Makefile 2016-04-07 15:46:17.000000000 +0200 @@ -2,7 +2,7 @@ # FLAGS=-g3 -O3 -m64 -std=gnu9x -Wall -Wshadow -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes # $(info $$OBJ is [${OBJ}]) -CC=gcc +CC ?= gcc LIBDIR=lib INCLUDEDIR=./include DESTDIR= @@ -19,7 +19,8 @@ MAIN_LIB=${LIBDIR}/libmain.a MANDIR=/usr/share/man -FLAGS=-g3 -m64 -std=gnu9x -Wall -Wshadow -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -I${INCLUDEDIR} +#FLAGS=-fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I${INCLUDEDIR} +FLAGS=$(CFLAGS) -g3 -std=gnu9x -Wall -Wshadow -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -I${INCLUDEDIR} VERSION=$(shell grep "\#define EBISO_VERSION" ${INCLUDEDIR}/${PROGNAME}.h | awk '{ print $$NF }' | sed s/\"//g) SRC=$(wildcard ${LIBDIR}/*.c) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebiso-0.2.2/include/ebiso.h new/ebiso-0.2.3.1/include/ebiso.h --- old/ebiso-0.2.2/include/ebiso.h 2016-04-02 23:52:26.000000000 +0200 +++ new/ebiso-0.2.3.1/include/ebiso.h 2016-04-07 15:46:17.000000000 +0200 @@ -1,7 +1,7 @@ /* * ebiso.h * - * Version: 0.2.2 + * Version: 0.2.3 * * Release date: 2.4.2015 * @@ -33,7 +33,7 @@ #include <getopt.h> #define PROGNAME "ebiso" -#define EBISO_VERSION "0.2.2" +#define EBISO_VERSION "0.2.3" #if (DEBUG == 1) static void disp_level(struct file_list_t *list_to_display, int level); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebiso-0.2.2/lib/filename.c new/ebiso-0.2.3.1/lib/filename.c --- old/ebiso-0.2.2/lib/filename.c 2016-04-02 23:52:26.000000000 +0200 +++ new/ebiso-0.2.3.1/lib/filename.c 2016-04-07 15:46:17.000000000 +0200 @@ -1,9 +1,9 @@ /* * filename.c * - * Version: 0.1.1 + * Version: 0.1.2 * - * Release date: 20.09.2015 + * Release date: 07.04.2016 * * Copyright 2015 Vladimir (sodoma) Gozora <[email protected]> * @@ -70,7 +70,7 @@ memset(save_ext, 0, sizeof(save_ext)); /* Can't be done with memset. Valgrind doesn't like it */ - strncpy(prepad_nulls, "000", 4); + strncpy(prepad_nulls, "000", 3); /* Get pointers to name and extension */ filename_explode(input, &name, &ext, CONV_ISO9660); @@ -88,8 +88,13 @@ if (counter > 999) printf("Warning: Duplicity counter too large, file might be unreadable on target ISO\n"); - /* For padding purposes, how many '0' chars should be prepadded */ - counter_digits = log10(counter) + 1; + /* log(0) is undefined */ + if (counter == 0) + counter_digits = 1; + else { + /* For padding purposes, how many '0' chars should be prepadded */ + counter_digits = log10(counter) + 1; + } /* Create counter string (e.g. 001, 066, 123 ...)*/ snprintf(str_counter, sizeof(str_counter), "%.*s%d", (int) (sizeof(prepad_nulls) - counter_digits), prepad_nulls, counter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebiso-0.2.2/lib/iso9660.c new/ebiso-0.2.3.1/lib/iso9660.c --- old/ebiso-0.2.2/lib/iso9660.c 2016-04-02 23:52:26.000000000 +0200 +++ new/ebiso-0.2.3.1/lib/iso9660.c 2016-04-07 15:46:17.000000000 +0200 @@ -1,9 +1,9 @@ /* * iso9660.c * - * Version: 0.4.0 + * Version: 0.4.1 * - * Release date: 13.12.2015 + * Release date: 07.04.2016 * * Copyright 2015 Vladimir (sodoma) Gozora <[email protected]> * @@ -29,7 +29,7 @@ /* Rockridge */ unsigned char CE[28]; -unsigned char ER[237]; +unsigned char ER[238]; unsigned char SP[7]; unsigned char RR[5]; unsigned char PX[44]; // 1<<0 @@ -543,7 +543,6 @@ */ tmp_file_list = file_list; int CE_offset = 0; - //uint32_t CE_save_LBA = 0; while(tmp_file_list->next != NULL) { /* @@ -573,12 +572,6 @@ uint8_t pad_len = 0; uint8_t terminator_len = 0; - //if (CE_save_LBA == 0) - //CE_save_LBA = tmp_file_list->CE_LBA; - - //if (CE_save_LBA != tmp_file_list->CE_LBA) - //CE_offset = 0; - CE_offset = tmp_file_list->CE_offset; terminator_len = set_terminator_len(tmp_file_list->st_mode); @@ -591,7 +584,7 @@ fseek(dest, (tmp_file_list->CE_LBA * BLOCK_SIZE) + CE_offset, SEEK_SET); fwrite(rr_save_ptr + basic_iso9660_len, 1, entry_len - basic_iso9660_len, dest); // Write everything after standard dir record - memset(rr_CE, 0, BLOCK_SIZE - 4); + memset(rr_CE, 0, sizeof(CE) - 4); iso9660_cp2heap(&rr_CE, &CE_LBA, sizeof(CE_LBA), &rr_write); // rr_write is here only to ensure move of pointer iso9660_cp2heap(&rr_CE, &CE_offset_LSB_MSB, sizeof(CE_offset_LSB_MSB), &rr_write); iso9660_cp2heap(&rr_CE, &CE_len, sizeof(CE_len), &rr_write); @@ -608,11 +601,6 @@ directory_table += tmp_file_list->ISO9660_len; bytes_written += tmp_file_list->ISO9660_len; entry_len = tmp_file_list->ISO9660_len; - - //tmp_file_list->CE_offset = CE_offset; - //CE_offset += (tmp_file_list->full_len - tmp_file_list->ISO9660_len); - - //CE_save_LBA = tmp_file_list->CE_LBA; } /* Allign directory entry to BLOCK_SIZE */
