Hello community, here is the log from the commit of package ntfs-3g checked in at Thu Feb 28 20:38:56 CET 2008. -------- --- ntfs-3g/ntfs-3g.changes 2008-02-18 20:49:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/ntfs-3g/ntfs-3g.changes 2008-02-28 16:19:46.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 28 16:05:43 CET 2008 - bk@suse.de + +- Workaround for build issue with gcc-4.3 (bnc#354113) is obsolete +- Improve treatment of warnings and integrate -Wformat-security + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntfs-3g.spec ++++++ --- /var/tmp/diff_new_pack.HP5002/_old 2008-02-28 20:38:52.000000000 +0100 +++ /var/tmp/diff_new_pack.HP5002/_new 2008-02-28 20:38:52.000000000 +0100 @@ -13,7 +13,7 @@ Name: ntfs-3g Summary: Linux NTFS-3G userspace filesystem with full write support Version: 1.2216 -Release: 1 +Release: 4 License: GPL v2 or later Group: System/Base Source0: %{name}-%{version}.tar.bz2 @@ -69,14 +69,14 @@ %patch %build -CFLAGS="$RPM_OPT_FLAGS -W -Werror" \ +# +# regarding -Wno-sign-compare - checked with the Szaka: There is one variable +# which is signed and would possibly ok to be unsigned. Any solution to this +# needs to be carefully reviewed and tested, so we do not change the code now: +# +CFLAGS="$RPM_OPT_FLAGS -Wformat-security -W -Wno-sign-compare -Werror" \ %configure --disable-static --disable-ldconfig -make -# Workaround for bnc#354113: -%ifarch %{ix86} -touch libntfs-3g/attrib.c -make CFLAGS="$CFLAGS -O0" -%endif +make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -92,7 +92,7 @@ %check echo >test.fs -/sbin/mkfs.ntfs -q -F test.fs 3000 +/usr/sbin/mkntfs -q -F test.fs 3000 src/ntfs-3g.probe --readonly test.fs src/ntfs-3g.probe --readwrite test.fs rm test.fs @@ -111,6 +111,9 @@ %exclude /usr/share/doc/ntfs-3g/README %changelog +* Thu Feb 28 2008 bk@suse.de +- Workaround for build issue with gcc-4.3 (bnc#354113) is obsolete +- Improve treatment of warnings and integrate -Wformat-security * Mon Feb 18 2008 bk@suse.de - Update to 1.2216: - adds ntfs3-g.probe to check if filesystem is in mountable state ++++++ ntfs-3g-warnings.patch ++++++ --- /var/tmp/diff_new_pack.HP5002/_old 2008-02-28 20:38:52.000000000 +0100 +++ /var/tmp/diff_new_pack.HP5002/_new 2008-02-28 20:38:52.000000000 +0100 @@ -1,20 +1,16 @@ fusermount.c: In function 'mount_fuse': fusermount.c:657: warning: ignoring return value of 'fchdir', declared with attribute warn_unused_result +# Checked with author of ntfs-3g: Currently it's best to ignore the return value (for now, not critical) --- libfuse-lite/fusermount.c 2008/02/18 15:49:32 1.1 +++ libfuse-lite/fusermount.c 2008/02/18 16:34:13 -@@ -654,7 +654,11 @@ +@@ -654,6 +654,7 @@ &source, &mnt_opts); if (currdir_fd != -1) { -- fchdir(currdir_fd); -+ if (fchdir(currdir_fd)) { -+ fprintf(stderr, "%s: chdir to current directory failed!\n", -+ progname); -+ goto err; -+ } ++ __attribute__((unused))int ignored_fchdir_status = + fchdir(currdir_fd); close(currdir_fd); } - if (mountpoint_fd != -1) # Unused: --- libfuse-lite/fuse_lowlevel.c 2008/02/18 15:57:00 1.1 +++ libfuse-lite/fuse_lowlevel.c 2008/02/18 15:58:54 @@ -92,58 +88,56 @@ #ifdef __CYGWIN32__ if (!ins_len && *ins) { /* Older Cygwin had broken mbsrtowcs() implementation. */ -# ntfs-3g.c: In function ‘ntfs_fuse_getattr’: -# ntfs-3g.c:408: error: comparison between signed and unsigned -# ntfs-3g.c:409: error: comparison between signed and unsigned -# ntfs-3g.c: In function ‘ntfs_fuse_readlink’: -# ntfs-3g.c:499: error: comparison between signed and unsigned -# ntfs-3g.c:504: error: comparison between signed and unsigned -# ntfs-3g.c: In function ‘ntfs_fuse_read’: -# ntfs-3g.c:669: error: comparison between signed and unsigned -# ntfs-3g.c: In function ‘ntfs_fuse_getxattr’: -# ntfs-3g.c:1470: error: comparison between signed and unsigned +# Fix -Wformat-security: +utils.c:135: error: format not a string literal and no format arguments +--- libntfs-3g/logging.c ++++ libntfs-3g/logging.c +@@ -451,7 +451,7 @@ int ntfs_log_handler_fprintf(const char + } + + if (col_prefix) +- ret += fprintf(stream, col_prefix); ++ ret += fprintf(stream, "%s", col_prefix); + + if ((ntfs_log.flags & NTFS_LOG_FLAG_ONLYNAME) && + (strchr(file, PATH_SEP))) /* Abbreviate the filename */ +@@ -476,7 +476,7 @@ int ntfs_log_handler_fprintf(const char + ret += fprintf(stream, ": %s\n", strerror(olderr)); + + if (col_suffix) +- ret += fprintf(stream, col_suffix); ++ ret += fprintf(stream, "%s", col_suffix); + + + fflush(stream); --- src/ntfs-3g.c +++ src/ntfs-3g.c -@@ -404,8 +404,8 @@ - * Check whether it's Interix symbolic link, block or - * character device. - */ -- if (na->data_size <= sizeof(INTX_FILE_TYPES) + sizeof( -- ntfschar) * MAX_PATH && na->data_size > -+ if ((u64)na->data_size <= sizeof(INTX_FILE_TYPES) + sizeof( -+ ntfschar) * MAX_PATH && (u64)na->data_size > - sizeof(INTX_FILE_TYPES) && - !stream_name_len) { - INTX_FILE *intx_file; -@@ -496,11 +496,11 @@ - res = -errno; - goto exit; - } -- if (na->data_size <= sizeof(INTX_FILE_TYPES)) { -+ if ((u64)na->data_size <= sizeof(INTX_FILE_TYPES)) { - res = -EINVAL; - goto exit; - } -- if (na->data_size > sizeof(INTX_FILE_TYPES) + -+ if ((u64)na->data_size > sizeof(INTX_FILE_TYPES) + - sizeof(ntfschar) * MAX_PATH) { - res = -ENAMETOOLONG; - goto exit; -@@ -666,7 +666,7 @@ - res = -errno; - goto exit; +@@ -2045,7 +2045,7 @@ static void mknod_dev_fuse(const char *d + if (mknod(dev, S_IFCHR | 0666, makedev(10, 229))) { + ntfs_log_perror("Failed to create '%s'", dev); + if (errno == EPERM) +- ntfs_log_error(dev_fuse_msg); ++ ntfs_log_error("%s", dev_fuse_msg); + } + umask(mask); } -- if (offset + size > na->data_size) { -+ if ((s64)(offset + size) > na->data_size) { - if (na->data_size < offset) - goto ok; - size = na->data_size - offset; -@@ -1467,7 +1467,7 @@ - goto exit; - } - if (size) { -- if (size >= na->data_size) { -+ if (size >= (u64)na->data_size) { - res = ntfs_attr_pread(na, 0, na->data_size, value); - if (res != na->data_size) - res = -errno; +@@ -2314,7 +2314,7 @@ int main(int argc, char *argv[]) + + #if defined(linux) || defined(__uClinux__) + if (S_ISBLK(sbuf.st_mode) && (fstype == FSTYPE_FUSE)) +- ntfs_log_info(fuse26_kmod_msg); ++ ntfs_log_info("%s", fuse26_kmod_msg); + #endif + setup_logging(parsed_options); + +--- src/utils.c ++++ src/utils.c +@@ -132,7 +132,7 @@ void utils_mount_error(const char *volum + ntfs_log_error(hibernated_volume_msg, volume, mntpoint); + break; + case NTFS_VOLUME_UNCLEAN_UNMOUNT: +- ntfs_log_error(unclean_journal_msg); ++ ntfs_log_error("%s", unclean_journal_msg); + ntfs_log_error(forced_mount_msg, volume, mntpoint, + volume, mntpoint); + break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de