Hello community, here is the log from the commit of package archivemount for openSUSE:Factory checked in at 2018-02-06 16:47:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/archivemount (Old) and /work/SRC/openSUSE:Factory/.archivemount.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "archivemount" Tue Feb 6 16:47:48 2018 rev:8 rq:572524 version:0.8.7 Changes: -------- --- /work/SRC/openSUSE:Factory/archivemount/archivemount.changes 2015-11-12 19:41:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.archivemount.new/archivemount.changes 2018-02-06 16:47:51.867689207 +0100 @@ -1,0 +2,13 @@ +Sat Feb 3 16:30:37 UTC 2018 - [email protected] + +- Update to version 0.8.7 + * corrected an ifdef +- includes 0.8.6 + * adaptions for CentOS, RHEL and Scientific Linux +- cleanup with spec-cleaner +- rebase archivemount.dif + * dropped fchdir fix, merged upstream in + 6839a38b570794d890ae1f0d94b41a2f0b7d23d2 +- simplify CFLAGS handling + +------------------------------------------------------------------- Old: ---- archivemount-0.8.5.tar.gz New: ---- archivemount-0.8.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ archivemount.spec ++++++ --- /var/tmp/diff_new_pack.D4sBbz/_old 2018-02-06 16:47:52.755647658 +0100 +++ /var/tmp/diff_new_pack.D4sBbz/_new 2018-02-06 16:47:52.755647658 +0100 @@ -1,7 +1,7 @@ # # spec file for package archivemount # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ Name: archivemount -Version: 0.8.5 +Version: 0.8.7 Release: 0 Summary: Mounts an archive for access as a file system -License: LGPL-2.1+ and BSD-2-Clause +License: LGPL-2.1+ AND BSD-2-Clause Group: Productivity/Archiving/Compression Url: http://www.cybernoia.de/software/archivemount/ Source: http://www.cybernoia.de/software/archivemount/%{name}-%{version}.tar.gz @@ -29,8 +29,7 @@ BuildRequires: automake BuildRequires: fuse-devel BuildRequires: libarchive-devel -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig %description Archivemount is a piece of glue code between libarchive (http://code.google.com/p/libarchive/) and FUSE @@ -42,67 +41,17 @@ %patch0 %build - cflags () - { - local flag=$1; shift - local var=$1; shift - test -n "${flag}" -a -n "${var}" || return - case "${!var}" in - *${flag}*) return - esac - set -o noclobber - case "$flag" in - -Wl,*) - if echo 'int main () { return 0; }' | \ - ${CC:-gcc} -Werror $flag -o /dev/null -xc - > /dev/null 2>&1 ; then - eval $var=\${$var:+\$$var\ }$flag - fi - ;; - *) - if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then - eval $var=\${$var:+\$$var\ }$flag - fi - if ${CXX:-g++} -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then - eval $var=\${$var:+\$$var\ }$flag - fi - esac - set +o noclobber - } -LDFLAGS= -cflags -Wl,-O2 LDFLAGS -cflags -Wl,--as-needed LDFLAGS -cflags -Wl,--hash-size=8599 LDFLAGS - -CFLAGS= -cflags -Wall CFLAGS -cflags -Wextra CFLAGS -cflags -pipe CFLAGS -cflags -pthread CFLAGS -cflags -pthreads CFLAGS -cflags -mthread CFLAGS -cflags -mthreads CFLAGS -cflags -g2 CFLAGS -cflags -ggdb CFLAGS -cflags -ftree-loop-im CFLAGS -cflags -funswitch-loops CFLAGS -cflags -fprefetch-loop-arrays CFLAGS -cflags -fgraphite-identity CFLAGS -cflags -ftree-loop-linear CFLAGS -cflags -floop-flatten CFLAGS -cflags -floop-parallelize-all CFLAGS - autoreconf --force --install -%global optflags %{optflags} -D_REENTRANT $LDFLAGS $CFLAGS +export CFLAGS="%{optflags}" %configure make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install %files -%defattr(-,root,root,0755) %doc CHANGELOG README COPYING -%{_bindir}/archivemount -%{_mandir}/man1/archivemount.1.gz +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1%{ext_man} %changelog ++++++ archivemount-0.8.5.tar.gz -> archivemount-0.8.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/archivemount-0.8.5/CHANGELOG new/archivemount-0.8.7/CHANGELOG --- old/archivemount-0.8.5/CHANGELOG 2015-06-28 18:04:43.000000000 +0200 +++ new/archivemount-0.8.7/CHANGELOG 2015-11-23 19:19:02.000000000 +0100 @@ -1,3 +1,7 @@ +* 0.8.7 - contribution by KAICHO: + * fixup to 0.8.6: corrected an ifdef +* 0.8.6 - contribution by KAICHO: + * adaptions for CentOS, RHEL and Scientific Linux * 0.8.5 - fixed stat'ing of hardlinks in ar_readdir - contributions by Alain Parmentier: * FormatRaw optimization diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/archivemount-0.8.5/Makefile.am new/archivemount-0.8.7/Makefile.am --- old/archivemount-0.8.5/Makefile.am 2015-06-27 18:47:35.000000000 +0200 +++ new/archivemount-0.8.7/Makefile.am 2015-11-22 16:15:18.000000000 +0100 @@ -1,5 +1,5 @@ bin_PROGRAMS = archivemount -archivemount_SOURCES = archivemount.c uthash.h +archivemount_SOURCES = archivemount.c uthash.h archivecomp.h archivemount_LDADD = $(ARCHIVE_LIBS) $(FUSE_LIBS) archivemount_CFLAGS = $(FUSE_CFLAGS) -D_FILE_OFFSET_BITS=64 if DEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/archivemount-0.8.5/Makefile.in new/archivemount-0.8.7/Makefile.in --- old/archivemount-0.8.5/Makefile.in 2015-06-27 18:48:09.000000000 +0200 +++ new/archivemount-0.8.7/Makefile.in 2015-11-23 19:19:25.000000000 +0100 @@ -305,7 +305,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -archivemount_SOURCES = archivemount.c uthash.h +archivemount_SOURCES = archivemount.c uthash.h archivecomp.h archivemount_LDADD = $(ARCHIVE_LIBS) $(FUSE_LIBS) archivemount_CFLAGS = $(FUSE_CFLAGS) -D_FILE_OFFSET_BITS=64 \ $(am__append_1) $(am__append_2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/archivemount-0.8.5/archivecomp.h new/archivemount-0.8.7/archivecomp.h --- old/archivemount-0.8.5/archivecomp.h 1970-01-01 01:00:00.000000000 +0100 +++ new/archivemount-0.8.7/archivecomp.h 2015-11-22 15:55:33.000000000 +0100 @@ -0,0 +1,13 @@ +#if ARCHIVE_VERSION_NUMBER < 3000000 + +#define archive_read_support_filter_all archive_read_support_compression_all +#define archive_write_add_filter_gzip archive_write_set_compression_gzip +#define archive_write_add_filter_bzip2 archive_write_set_compression_bzip2 +#define archive_write_add_filter_none archive_write_set_compression_none + +#define archive_read_free archive_read_finish +#define archive_write_free archive_write_finish + +#define archive_filter_code(arc, num) archive_compression(arc) + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/archivemount-0.8.5/archivemount.1 new/archivemount-0.8.7/archivemount.1 --- old/archivemount-0.8.5/archivemount.1 2015-06-28 18:06:51.000000000 +0200 +++ new/archivemount-0.8.7/archivemount.1 2015-11-23 19:21:53.000000000 +0100 @@ -1,7 +1,7 @@ \" Process this file with .\" groff -man -Tascii archivemount.1 .\" -.TH ARCHIVEMOUNT "1" "15 August 2013" "ARCHIVEMOUNT version 0.8.5" "User Commands" +.TH ARCHIVEMOUNT "1" "15 August 2013" "ARCHIVEMOUNT version 0.8.7" "User Commands" .SH NAME archivemount \- mounts an archive for access as a file system .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/archivemount-0.8.5/archivemount.c new/archivemount-0.8.7/archivemount.c --- old/archivemount-0.8.5/archivemount.c 2015-06-28 18:03:24.000000000 +0200 +++ new/archivemount-0.8.7/archivemount.c 2015-11-23 19:21:30.000000000 +0100 @@ -27,6 +27,7 @@ #include "config.h" #include <fuse.h> +#include <fuse/fuse_lowlevel.h> #include <fuse_opt.h> #include <stdio.h> #include <stdlib.h> @@ -50,6 +51,8 @@ #include <pthread.h> #include <regex.h> +#include "archivecomp.h" + #include "uthash.h" /**********/ @@ -283,11 +286,13 @@ free(node); } -static void +/* not used now +#static void free_rawcache(FORMATRAW_CACHE *rawcache) { free(rawcache); } +*/ static void @@ -400,7 +405,7 @@ int format; int compression; NODE *cur; - char *subtree_filter; + char *subtree_filter = NULL; regex_t subtree; int regex_error; regmatch_t regmatch; @@ -488,7 +493,6 @@ /* read all entries in archive, create node for each */ while( archive_read_next_header2( archive, cur->entry ) == ARCHIVE_OK ) { const char *name; - const char *new_name; /* find name of node */ name = archive_entry_pathname( cur->entry ); if( memcmp( name, "./\0", 3 ) == 0 ) { @@ -790,7 +794,7 @@ int fh = 0; off_t offset = 0; void *buf; - ssize_t len; + ssize_t len = 0; /* copy stat info */ if( lstat( node->location, &st ) != 0 ) { log( "Could not lstat temporary file %s: %s", @@ -1162,7 +1166,6 @@ struct fuse_file_info *fi ) { int ret = -1; - const char *realpath; NODE *node; ( void )fi; @@ -1391,8 +1394,6 @@ static off_t _ar_getsizeraw(const char *path) { - size_t bufsize = 1024 * 1024; - char *buf = malloc(bufsize+1); off_t offset = 0, ret; NODE *node; const char *realpath; @@ -2693,7 +2694,6 @@ int main( int argc, char **argv ) { - int fuse_ret; struct stat st; int oldpwd; struct fuse_args args = FUSE_ARGS_INIT(argc, argv); @@ -2773,11 +2773,17 @@ char *mountpoint; int multithreaded; int foreground; - struct stat st; +#ifdef FUSE_NUMA + int numa; +#endif int res; res = fuse_parse_cmdline(&args, &mountpoint, &multithreaded, +#ifdef FUSE_NUMA + &foreground, &numa); +#else &foreground); +#endif if (res == -1) exit(1); @@ -2823,12 +2829,21 @@ free(mountpoint); } #else - /* now do the real mount */ - fuse_ret = fuse_main( args.argc, args.argv, &ar_oper, NULL ); + { + /* now do the real mount */ + int fuse_ret; + fuse_ret = fuse_main( args.argc, args.argv, &ar_oper, NULL ); + } #endif /* go back to saved dir */ - fchdir( oldpwd ); + { + int fchdir_ret; + fchdir_ret = fchdir( oldpwd ); + if (fchdir_ret != 0) { + log( "fchdir() to old path failed\n" ); + } + } /* save changes if modified */ if( archiveWriteable && !options.readonly && archiveModified && !options.nosave ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/archivemount-0.8.5/configure new/archivemount-0.8.7/configure --- old/archivemount-0.8.5/configure 2015-06-27 18:48:08.000000000 +0200 +++ new/archivemount-0.8.7/configure 2015-11-23 19:19:24.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for archivemount 0.8.5. +# Generated by GNU Autoconf 2.69 for archivemount 0.8.7. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='archivemount' PACKAGE_TARNAME='archivemount' -PACKAGE_VERSION='0.8.5' -PACKAGE_STRING='archivemount 0.8.5' +PACKAGE_VERSION='0.8.7' +PACKAGE_STRING='archivemount 0.8.7' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1280,7 +1280,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 archivemount 0.8.5 to adapt to many kinds of systems. +\`configure' configures archivemount 0.8.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of archivemount 0.8.5:";; + short | recursive ) echo "Configuration of archivemount 0.8.7:";; esac cat <<\_ACEOF @@ -1445,7 +1445,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -archivemount configure 0.8.5 +archivemount configure 0.8.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1747,7 +1747,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by archivemount $as_me 0.8.5, which was +It was created by archivemount $as_me 0.8.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2610,7 +2610,7 @@ # Define the identity of the package. PACKAGE='archivemount' - VERSION='0.8.5' + VERSION='0.8.7' cat >>confdefs.h <<_ACEOF @@ -5008,7 +5008,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by archivemount $as_me 0.8.5, which was +This file was extended by archivemount $as_me 0.8.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5074,7 +5074,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -archivemount config.status 0.8.5 +archivemount config.status 0.8.7 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/archivemount-0.8.5/configure.ac new/archivemount-0.8.7/configure.ac --- old/archivemount-0.8.5/configure.ac 2015-06-27 18:48:02.000000000 +0200 +++ new/archivemount-0.8.7/configure.ac 2015-11-23 19:19:13.000000000 +0100 @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script -AC_INIT([archivemount],[0.8.5], [[email protected]]) +AC_INIT([archivemount],[0.8.7], [[email protected]]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_PROG_CC ++++++ archivemount.dif ++++++ --- /var/tmp/diff_new_pack.D4sBbz/_old 2018-02-06 16:47:52.835643915 +0100 +++ /var/tmp/diff_new_pack.D4sBbz/_new 2018-02-06 16:47:52.839643727 +0100 @@ -1,30 +1,14 @@ -Index: archivemount.c -=================================================================== ---- archivemount.c.orig -+++ archivemount.c -@@ -2539,7 +2539,8 @@ main( int argc, char **argv ) - #endif - - /* go back to saved dir */ -- fchdir( oldpwd ); -+ if (fchdir( oldpwd ) < 0) -+ perror( "can not go back to old pwd" ); - - /* save changes if modified */ - if( archiveWriteable && !options.readonly && archiveModified && !options.nosave ) { -Index: configure.ac -=================================================================== --- configure.ac.orig +++ configure.ac @@ -3,6 +3,7 @@ - AC_INIT([archivemount],[0.8.5], [[email protected]]) + AC_INIT([archivemount],[0.8.7], [[email protected]]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_PROG_CC +AM_PROG_CC_C_O AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile archivemount.1]) -@@ -11,8 +12,6 @@ AC_CONFIG_FILES([Makefile archivemount.1 +@@ -11,8 +12,6 @@ RELEASE_DATE="15 August 2013" AC_SUBST(RELEASE_DATE)
