commit zisofs-tools for openSUSE:Factory

Hello community, here is the log from the commit of package zisofs-tools for openSUSE:Factory checked in at Wed Feb 24 02:35:50 CET 2010. -------- --- zisofs-tools/zisofs-tools.changes 2007-03-29 15:44:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/zisofs-tools/zisofs-tools.changes 2010-02-15 16:17:02.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 15 15:54:10 CET 2010 - dimstar@opensuse.org + +- Update to version 1.0.8: + + This release fixes the --sloppy option, which was documented + but did not work. +- Spec cleanup. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zisofs-tools-1.0.6.tar.bz2 New: ---- zisofs-tools-1.0.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zisofs-tools.spec ++++++ --- /var/tmp/diff_new_pack.iy5Mad/_old 2010-02-24 02:35:41.000000000 +0100 +++ /var/tmp/diff_new_pack.iy5Mad/_new 2010-02-24 02:35:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package zisofs-tools (Version 1.0.6) +# spec file for package zisofs-tools (Version 1.0.8) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,12 @@ Name: zisofs-tools BuildRequires: zlib-devel Url: ftp://ftp.kernel.org/pub/linux/utils/fs/zisofs/ -License: GPL v2 or later +License: GPLv2+ Group: System/Filesystems Requires: mkisofs AutoReqProv: on -Version: 1.0.6 -Release: 138 +Version: 1.0.8 +Release: 1 Summary: User tools for zisofs Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,30 +39,23 @@ such a filesystem and read compressed files on a system without zisofs support. - - -Authors: --------- - H. Peter Anvin <hpa@zytor.com> - %prep %setup -#%patch %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --mandir=%{_mandir} -make +make %{?jobs:-j%jobs} %install make INSTALLROOT=$RPM_BUILD_ROOT install %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf %{buildroot} %files %defattr(-,root,root) %doc CHANGES COPYING INSTALL README -/usr/bin/mkzftree +%{_bindir}/mkzftree %doc %{_mandir}/man1/mkzftree.1* %changelog ++++++ zisofs-tools-1.0.6.tar.bz2 -> zisofs-tools-1.0.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/compress.c new/zisofs-tools-1.0.8/compress.c --- old/zisofs-tools-1.0.6/compress.c 2001-07-31 05:20:52.000000000 +0200 +++ new/zisofs-tools-1.0.8/compress.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,7 +1,7 @@ -/* $Id: compress.c,v 1.3 2001/07/31 03:20:52 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * 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 @@ -11,19 +11,21 @@ * * ----------------------------------------------------------------------- */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdlib.h> #include <stdio.h> #include <utime.h> #include <unistd.h> #include <zlib.h> -#include "mkzftree.h" + #include "iso9660.h" int block_compress_file(FILE *input, FILE *output, off_t size) { struct compressed_file_header hdr; - char inbuf[CBLOCK_SIZE], outbuf[2*CBLOCK_SIZE]; + Bytef inbuf[CBLOCK_SIZE], outbuf[2*CBLOCK_SIZE]; size_t bytes, pointer_bytes, nblocks, block; uLong cbytes; /* uLong is a zlib datatype */ char *pointer_block, *curptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/configure new/zisofs-tools-1.0.8/configure --- old/zisofs-tools-1.0.6/configure 2004-07-20 06:24:29.000000000 +0200 +++ new/zisofs-tools-1.0.8/configure 2007-05-17 07:49:53.000000000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.7 2004/07/20 04:04:22 hpa Exp . +# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/configure.in new/zisofs-tools-1.0.8/configure.in --- old/zisofs-tools-1.0.6/configure.in 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/configure.in 2007-05-17 07:49:47.000000000 +0200 @@ -3,7 +3,7 @@ dnl AC_PREREQ(2.57) -AC_REVISION([$Id: configure.in,v 1.7 2004/07/20 04:04:22 hpa Exp $]) +AC_REVISION([$Id$]) AC_INIT(MCONFIG.in) AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/copytime.c new/zisofs-tools-1.0.8/copytime.c --- old/zisofs-tools-1.0.6/copytime.c 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/copytime.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: copytime.c,v 1.1 2004/07/20 04:04:22 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * * Copyright 2004 H. Peter Anvin - All Rights Reserved @@ -12,12 +12,12 @@ * ----------------------------------------------------------------------- */ /* - * copytime.h + * copytime.c * * Copy time(s) from a struct stat */ -#include "mkzftree.h" +#include "mkzftree.h" /* Must be included first! */ #include <utime.h> #include <sys/time.h> @@ -52,4 +52,3 @@ #endif } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/hash.c new/zisofs-tools-1.0.8/hash.c --- old/zisofs-tools-1.0.6/hash.c 2003-07-11 05:24:01.000000000 +0200 +++ new/zisofs-tools-1.0.8/hash.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -#ident "$Id: hash.c,v 1.2 2003/07/11 03:24:01 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved @@ -17,7 +17,7 @@ * Hash table used to find hard-linked files */ -#include "mkzftree.h" +#include "mkzftree.h" /* Must be included first! */ #define HASH_BUCKETS 2683 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/iso9660.c new/zisofs-tools-1.0.8/iso9660.c --- old/zisofs-tools-1.0.6/iso9660.c 2001-07-27 16:37:08.000000000 +0200 +++ new/zisofs-tools-1.0.8/iso9660.c 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: iso9660.c,v 1.1 2001/07/27 14:37:08 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/iso9660.h new/zisofs-tools-1.0.8/iso9660.h --- old/zisofs-tools-1.0.6/iso9660.h 2001-07-27 21:49:08.000000000 +0200 +++ new/zisofs-tools-1.0.8/iso9660.h 2007-05-17 07:49:47.000000000 +0200 @@ -1,4 +1,4 @@ -#ident "$Id: iso9660.h,v 1.3 2001/07/27 19:49:08 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved @@ -13,6 +13,9 @@ /* zisofs definitions */ +#ifndef ISO9660_H +#define ISO9660_H + #ifndef CBLOCK_SIZE_LG2 #define CBLOCK_SIZE_LG2 15 /* Compressed block size */ #endif @@ -43,3 +46,5 @@ void set_733(void *, unsigned int); #define get_723(x) get_721(x) #define get_733(x) get_731(x) + +#endif /* ISO9660_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/mkzftree.1 new/zisofs-tools-1.0.8/mkzftree.1 --- old/zisofs-tools-1.0.6/mkzftree.1 2004-07-20 06:03:53.000000000 +0200 +++ new/zisofs-tools-1.0.8/mkzftree.1 2007-05-17 07:49:48.000000000 +0200 @@ -1,4 +1,4 @@ -.\" $Id: mkzftree.1,v 1.13 2004/07/20 04:03:53 hpa Exp $ +.\" $Id$ .\" ----------------------------------------------------------------------- .\" .\" Copyright 2001 H. Peter Anvin - All Rights Reserved diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/mkzftree.c new/zisofs-tools-1.0.8/mkzftree.c --- old/zisofs-tools-1.0.6/mkzftree.c 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/mkzftree.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: mkzftree.c,v 1.17 2004/07/20 04:04:22 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * * Copyright 2001 H. Peter Anvin - All Rights Reserved @@ -59,6 +59,8 @@ * The block data is compressed according to "zlib". */ +#include "mkzftree.h" /* Must be included first! */ + #include <errno.h> #include <stdlib.h> #include <string.h> @@ -69,13 +71,12 @@ #include <sys/types.h> #include <sys/time.h> -#include "mkzftree.h" -#include "version.h" - #ifdef HAVE_GETOPT_H #include <getopt.h> #endif +#include "version.h" + /* Command line options */ struct cmdline_options opt = { 0, /* Force compression */ @@ -94,7 +95,7 @@ const char *program; /* Long options */ -#define OPTSTRING "fz:up:xXC:lLFvqV:hw" +#define OPTSTRING "fz:up:xXC:lLFvqV:hws" #ifdef HAVE_GETOPT_LONG const struct option long_options[] = { { "force", 0, 0, 'f' }, @@ -112,6 +113,7 @@ { "verbosity", 1, 0, 'V' }, { "help", 0, 0, 'h' }, { "version", 0, 0, 'w' }, + { "sloppy", 0, 0, 's' }, { 0, 0, 0, 0 } }; #define LO(X) X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/mkzftree.h new/zisofs-tools-1.0.8/mkzftree.h --- old/zisofs-tools-1.0.6/mkzftree.h 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/mkzftree.h 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -#ident "$Id: mkzftree.h,v 1.6 2004/07/20 04:04:22 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * 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 @@ -11,7 +11,12 @@ * * ----------------------------------------------------------------------- */ +#ifndef MKZFTREE_H +#define MKZFTREE_H + +/* config.h should be included before any system headers!!!! */ #include "config.h" + #include <stddef.h> #include <stdlib.h> #include <string.h> @@ -95,3 +100,4 @@ /* copytime.h */ int copytime(const char *, const struct stat *); +#endif /* MKZFTREE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/uncompress.c new/zisofs-tools-1.0.8/uncompress.c --- old/zisofs-tools-1.0.6/uncompress.c 2001-07-27 21:49:08.000000000 +0200 +++ new/zisofs-tools-1.0.8/uncompress.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -/* $Id: uncompress.c,v 1.2 2001/07/27 19:49:08 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * 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 @@ -11,16 +11,18 @@ * * ----------------------------------------------------------------------- */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdio.h> #include <stdlib.h> #include <zlib.h> -#include "mkzftree.h" + #include "iso9660.h" int block_uncompress_file(FILE *input, FILE *output, off_t size) { struct compressed_file_header hdr; - char *inbuf, *outbuf; + Bytef *inbuf, *outbuf; int block_shift; char *pointer_block, *pptr; unsigned long nblocks; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/util.c new/zisofs-tools-1.0.8/util.c --- old/zisofs-tools-1.0.6/util.c 2001-07-31 05:20:52.000000000 +0200 +++ new/zisofs-tools-1.0.8/util.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -/* $Id: util.c,v 1.2 2001/07/31 03:20:52 hpa Exp $ */ +/* $Id$ */ /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * 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 @@ -11,12 +11,13 @@ * * ----------------------------------------------------------------------- */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdio.h> #include <errno.h> #include <stdlib.h> #include <stdarg.h> #include <string.h> -#include "mkzftree.h" /* Convenience functions */ void *xmalloc(size_t size) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/version new/zisofs-tools-1.0.8/version --- old/zisofs-tools-1.0.6/version 2004-07-20 06:07:19.000000000 +0200 +++ new/zisofs-tools-1.0.8/version 2007-05-17 07:49:48.000000000 +0200 @@ -1 +1 @@ -1.0.6 +1.0.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/walk.c new/zisofs-tools-1.0.8/walk.c --- old/zisofs-tools-1.0.6/walk.c 2004-07-20 06:04:22.000000000 +0200 +++ new/zisofs-tools-1.0.8/walk.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -#ident "$Id: walk.c,v 1.6 2004/07/20 04:04:22 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * - * Copyright 2001-2002 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * 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 @@ -17,6 +17,8 @@ * Functions to walk the file tree */ +#include "mkzftree.h" /* Must be included first! */ + #include <stdlib.h> #include <stdio.h> #include <limits.h> @@ -26,7 +28,7 @@ #include <unistd.h> #include <sys/stat.h> #include <sys/types.h> -#include "mkzftree.h" + #include "iso9660.h" static int munge_file(const char *inpath, const char *outpath, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/workers.c new/zisofs-tools-1.0.8/workers.c --- old/zisofs-tools-1.0.6/workers.c 2001-07-31 05:20:52.000000000 +0200 +++ new/zisofs-tools-1.0.8/workers.c 2007-05-17 07:49:48.000000000 +0200 @@ -1,7 +1,7 @@ -#ident "$Id: workers.c,v 1.2 2001/07/31 03:20:52 hpa Exp $" +#ident "$Id$" /* ----------------------------------------------------------------------- * * - * Copyright 2001 H. Peter Anvin - All Rights Reserved + * Copyright 2001-2006 H. Peter Anvin - All Rights Reserved * * 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 @@ -17,13 +17,14 @@ * Parallel job maintenance */ +#include "mkzftree.h" /* Must be included first! */ + #include <stddef.h> #include <stdlib.h> #include <unistd.h> #include <signal.h> #include <stdio.h> #include <sys/wait.h> -#include "mkzftree.h" /* Global option */ extern int parallel; /* Number of parallel jobs */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zisofs-tools-1.0.6/zisofs-tools.spec new/zisofs-tools-1.0.8/zisofs-tools.spec --- old/zisofs-tools-1.0.6/zisofs-tools.spec 2004-07-20 06:25:03.000000000 +0200 +++ new/zisofs-tools-1.0.8/zisofs-tools.spec 2007-05-17 07:50:08.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Utilities to create compressed CD-ROM filesystems. Name: zisofs-tools -Version: 1.0.6 +Version: 1.0.8 Release: 1 License: GPL Group: Applications/System ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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