Hello community, here is the log from the commit of package ncompress for openSUSE:Factory checked in at 2020-05-16 22:23:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncompress (Old) and /work/SRC/openSUSE:Factory/.ncompress.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncompress" Sat May 16 22:23:10 2020 rev:7 rq:805468 version:4.2.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ncompress/ncompress.changes 2019-12-11 12:03:07.704790748 +0100 +++ /work/SRC/openSUSE:Factory/.ncompress.new.2738/ncompress.changes 2020-05-16 22:23:13.228889689 +0200 @@ -1,0 +2,24 @@ +Thu May 14 07:15:00 UTC 2020 - Martin Pluskal <mplus...@suse.com> + +- Update to version 4.2.4.6: + * Fix tests under macOS + * Drop support for NOFUNCDEF + * Drop old unused MARK & SIZE_INNER_LOOP defines + * Add chmod/chown stubs for AMIGA/DOS + * Add a WINDOWS define for disabling chmod/chown + * Simplify LSTAT checking + * Disable utime usage on AMIGA/DOS/WINDOWS + * Add a fallback for access() for DOS & WINDOWS + * Disable unistd.h include on DOS & WINDOWS + * Disable chmod/chown/utime for mingw builds + * Add xxx->_xxx redirects on WINDOWS for filesystem funcs + * Add support for Windows in Travis + * Add PREFIX conformance, add option to only install main program by Eli Schwartz + * Don't strip binaries by default by Eli Schwartz + * Set the mandir to use $(PREFIX)/share/man by default by Eli Schwartz + * Do not set exit_code when an error is ignored by Petr Kubat + * Use default CFLAGS when using GNU make + * Fix typos in Makefile.def + * Tweak Changes style for better markdown integration + +------------------------------------------------------------------- Old: ---- ncompress-4.2.4.5.tar.gz New: ---- ncompress-4.2.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncompress.spec ++++++ --- /var/tmp/diff_new_pack.25Xfk0/_old 2020-05-16 22:23:15.136893605 +0200 +++ /var/tmp/diff_new_pack.25Xfk0/_new 2020-05-16 22:23:15.140893613 +0200 @@ -1,7 +1,7 @@ # # spec file for package ncompress # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ncompress -Version: 4.2.4.5 +Version: 4.2.4.6 Release: 0 Summary: LZW compression and decompression utilities License: SUSE-Public-Domain ++++++ ncompress-4.2.4.5.tar.gz -> ncompress-4.2.4.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/.travis.yml new/ncompress-4.2.4.6/.travis.yml --- old/ncompress-4.2.4.5/.travis.yml 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/.travis.yml 2019-12-30 12:06:56.000000000 +0100 @@ -11,5 +11,6 @@ os: - linux - osx + - windows script: ./travis/main.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/Changes new/ncompress-4.2.4.6/Changes --- old/ncompress-4.2.4.5/Changes 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/Changes 2019-12-30 12:06:56.000000000 +0100 @@ -1,114 +1,135 @@ +(N)compress version 4.2.4.6 + * Fix tests under macOS + * Drop support for NOFUNCDEF + * Drop old unused MARK & SIZE_INNER_LOOP defines + * Add chmod/chown stubs for AMIGA/DOS + * Add a WINDOWS define for disabling chmod/chown + * Simplify LSTAT checking + * Disable utime usage on AMIGA/DOS/WINDOWS + * Add a fallback for access() for DOS & WINDOWS + * Disable unistd.h include on DOS & WINDOWS + * Disable chmod/chown/utime for mingw builds + * Add xxx->_xxx redirects on WINDOWS for filesystem funcs + * Add support for Windows in Travis + * Add PREFIX conformance, add option to only install main program by Eli Schwartz + * Don't strip binaries by default by Eli Schwartz + * Set the mandir to use $(PREFIX)/share/man by default by Eli Schwartz + * Do not set exit_code when an error is ignored by Petr Kubat + * Use default CFLAGS when using GNU make + * Fix typos in Makefile.def + * Tweak Changes style for better markdown integration + (N)compress version 4.2.4.5 - o New homepage https://github.com/vapier/ncompress - o Switch to intmax_t for nlink_t fields when printing - o Make builds more reproducible by dropping datestamps - o Fix integer overflow in maxmaxcode computation by Jakub Wilk - o Don't leak file descriptor in error cases by Pavel Raiskup - o Drop 8.3 filename checks for old DOS/Windows - o Change signal ifdef logic to the signal names - o Fix -Werror=parentheses errors with newer compilers - o Define LSTAT=1 in modern builds by default - o Change pathnames to be dynamic to avoid hardcoded 1k limit - o Add a standard -h (help) option - o Change version output to go to stdout - o Start a testsuite! - o Add support for -- to halt option parsing - o Add a uncompress(1) link to compress(1) + * New homepage https://github.com/vapier/ncompress + * Switch to intmax_t for nlink_t fields when printing + * Make builds more reproducible by dropping datestamps + * Fix integer overflow in maxmaxcode computation by Jakub Wilk + * Don't leak file descriptor in error cases by Pavel Raiskup + * Drop 8.3 filename checks for old DOS/Windows + * Change signal ifdef logic to the signal names + * Fix -Werror=parentheses errors with newer compilers + * Define LSTAT=1 in modern builds by default + * Change pathnames to be dynamic to avoid hardcoded 1k limit + * Add a standard -h (help) option + * Change version output to go to stdout + * Start a testsuite! + * Add support for -- to halt option parsing + * Add a uncompress(1) link to compress(1) (N)compress version 4.2.4.4 - o Add some spelling fixes from Kenneth J. Pronovici - o Tweak makefile syntax for make 3.82 - o Tweak by Kenneth J. Pronovici to escape hyphens in man pages for groff + * Add some spelling fixes from Kenneth J. Pronovici + * Tweak makefile syntax for make 3.82 + * Tweak by Kenneth J. Pronovici to escape hyphens in man pages for groff (N)compress version 4.2.4.3 - o Check return value of chown(). - o Fix from Fedora for checking malloc() return. - o Fix from Fedora/gzip to avoid integer overflow for CVE-2010-0001. + * Check return value of chown(). + * Fix from Fedora for checking malloc() return. + * Fix from Fedora/gzip to avoid integer overflow for CVE-2010-0001. (N)compress version 4.2.4.2 - o Integrate build/man touchups from Debian. - o Add fix from Fedora for handling of 0 byte files. - o Pull in POSIX standard headers for prototypes (stdlib,string,unistd). - o Replace rindex() with strrchr(). - o Don't set CC by default in Makefile.def and add CFLAGS/CPPFLAGS/LDFLAGS + * Integrate build/man touchups from Debian. + * Add fix from Fedora for handling of 0 byte files. + * Pull in POSIX standard headers for prototypes (stdlib,string,unistd). + * Replace rindex() with strrchr(). + * Don't set CC by default in Makefile.def and add CFLAGS/CPPFLAGS/LDFLAGS where appropriate by default. - o Add support for DESTDIR to the install target. + * Add support for DESTDIR to the install target. (N)compress version 4.2.4.1 - o Fix possible bss buffer underflow CVE-2006-1168 - o New homepage http://ncompress.sourceforge.net/ + * Fix possible bss buffer underflow CVE-2006-1168 + * New homepage http://ncompress.sourceforge.net/ (N)compress version 4.2.4 - o Fix '-c' flag. - o Fix utime error. - o Added AMIGA support (Sascha Wildner). - o Div. remarks added. + * Fix '-c' flag. + * Fix utime error. + * Added AMIGA support (Sascha Wildner). + * Div. remarks added. (N)compress version 4.2.3 - o Comp.source.reveiwed release. + * Comp.source.reveiwed release. (N)compress version 4.2.2 Minor changes after the reviewes from comp.sources.reviewed - o Change the name to ncompress because of version problems. - o Start all scripts with ':' - o Added libary options to buidl script. - o Install zmore zcmp zdiff and manuals. - o Added patchlevel.h - o Updated README file. Created LZW.INFO - o a complete grammatical go-round - o Use utime.h if availble - o Change de default input/output buffer size to BUFSIZ. Because + * Change the name to ncompress because of version problems. + * Start all scripts with ':' + * Added libary options to buidl script. + * Install zmore zcmp zdiff and manuals. + * Added patchlevel.h + * Updated README file. Created LZW.INFO + * a complete grammatical go-round + * Use utime.h if availble + * Change de default input/output buffer size to BUFSIZ. Because of performance problems with read a head on systems. - o Build generates a makefile. + * Build generates a makefile. compress version 4.2.1 improvements - o Change the name to ncompress because of version problems. - o Completly rewrite of the compress and decompress functions. + * Change the name to ncompress because of version problems. + * Completly rewrite of the compress and decompress functions. compress speedup 25-50% (user cpu time). decompress speedup 20-30% (user cpu time). o Add special fast compress hash algorithm. - o Fix some minor things. - o use #include <utime.h> if availble. - o Cleanup the source code (I think so). - o Test if filename is not to long. This is done on runtime no fix length + * Fix some minor things. + * use #include <utime.h> if availble. + * Cleanup the source code (I think so). + * Test if filename is not to long. This is done on runtime no fix length size any more. - o Powerfull build script (test almost every thing). + * Powerfull build script (test almost every thing). Modifications for version 4.1: - o Added -r command line flag to allow recursive compression/ + * Added -r command line flag to allow recursive compression/ decompression of directory trees. As a side-effect, compress no longer tries to compress/decompress anything that isn't a regular file. In particular, it ignores symbolic links. - o zcat no longer cares whether a filename ends in .Z or + * zcat no longer cares whether a filename ends in .Z or not - it relies on the magic number in the file. If zcat is given a filename that doesn't end with .Z and the file referenced doesn't exist, zcat will append a .Z and try to open that instead. - o compress -f will now compress multiply hardlinked files. + * compress -f will now compress multiply hardlinked files. Uncompress does not recreate the hard link, it creates a new file. - o Removed compressdir/uncompressdir - no longer needed. - o Removed atob/btoa/tarmail/untarmail - my versions are + * Removed compressdir/uncompressdir - no longer needed. + * Removed atob/btoa/tarmail/untarmail - my versions are based on btoa 5.2 which is not compatible with the atob included with compress4.0. Compress version 4.0 improvements: - o compress() speedup (10-50%) by changing division hash to xor - o decompress() speedup (5-10%) - o Memory requirements reduced (3-30%) - o Stack requirements reduced to less than 4kb - o Removed 'Big+Fast' compress code (FBITS) because of compress speedup - o Portability mods for Z8000 and PC/XT (but not zeus 3.2) - o Default to 'quiet' mode - o Unification of 'force' flags - o Manual page overhaul - o Portability enhancement for M_XENIX - o Removed text on #else and #endif - o Added "-V" switch to print version and options - o Added #defines for SIGNED_COMPARE_SLOW - o Added Makefile and "usermem" program - o Removed all floating point computations - o New programs: + * compress() speedup (10-50%) by changing division hash to xor + * decompress() speedup (5-10%) + * Memory requirements reduced (3-30%) + * Stack requirements reduced to less than 4kb + * Removed 'Big+Fast' compress code (FBITS) because of compress speedup + * Portability mods for Z8000 and PC/XT (but not zeus 3.2) + * Default to 'quiet' mode + * Unification of 'force' flags + * Manual page overhaul + * Portability enhancement for M_XENIX + * Removed text on #else and #endif + * Added "-V" switch to print version and options + * Added #defines for SIGNED_COMPARE_SLOW + * Added Makefile and "usermem" program + * Removed all floating point computations + * New programs: compressdir - compress all files on a directory uncompressdir - uncompress all files on a directory zcmp - cmp compressed files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/GNUmakefile new/ncompress-4.2.4.6/GNUmakefile --- old/ncompress-4.2.4.5/GNUmakefile 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/GNUmakefile 2019-12-30 12:06:56.000000000 +0100 @@ -1,6 +1,11 @@ # this assumes a recent system -- you're using GNU make right ? -compress cleanup install: Makefile +# POSIX make doesn't support default values, so we export from here. +CFLAGS ?= -O2 -g +CFLAGS += -Wall +export CFLAGS + +compress cleanup install install_core install_extra: Makefile $(MAKE) -f Makefile $@ clean: cleanup @@ -9,7 +14,7 @@ Makefile: Makefile.def GNUmakefile sed \ - -e 's:options= :options= $$(CFLAGS) -DNOFUNCDEF -DUTIME_H -DLSTAT $$(LDFLAGS) :' \ + -e 's:options= :options= -DUTIME_H -DLSTAT :' \ Makefile.def > Makefile check: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/Makefile.def new/ncompress-4.2.4.6/Makefile.def --- old/ncompress-4.2.4.5/Makefile.def 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/Makefile.def 2019-12-30 12:06:56.000000000 +0100 @@ -1,61 +1,68 @@ # Makefile generated by build. -# C complier +# C compiler #CC=cc # Install prefix DESTDIR= -# Install directory for binarys -BINDIR=/usr/local/bin +# Base install directory +PREFIX=/usr/local + +# Install directory for binaries +BINDIR=$(PREFIX)/bin # Install directory for manual -MANDIR=/usr/local/man/man1 +MANDIR=$(PREFIX)/share/man/man1 # compiler options: # options is a collection of: # # -DAMIGA=1 Amiga support. -# -DNOFUNCDEF=1 Disable libary function definitions in -# compress42.c # -DDIRENT=1 Use dirent.h # -DSYSDIR=1 Use sys/dir.h # -DLSTAT=1 Use lstat for finding symlinks. # -DUTIME_H=1 Use utime.h -# -DUSERMEM=<size> Availble memory for compress (default 800k). +# -DUSERMEM=<size> Available memory for compress (default 800k). # -DREGISTERS=<nbr> Number of registers (default 2). # -DIBUFSIZ=<size> Input buffer size (default BUFSIZ). # -DOBUFSIZ=<size> Output buffer size (default BUFSIZ) # -DBYTEORDER=<order> Byte order (default: unknown). -# -DNOALLIGN=1 Data word allignment (default: yes). -# -DDEF_ERRNO=1 Define error (not defined in errno.h). -# -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. +# -DNOALLIGN=1 Data word alignment (default: yes). +# -DDEF_ERRNO=1 Define errno (not defined in errno.h). +# -DMAXSEG_64K=1 -BITS=16 Support segment processor like 80286. # options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -# libary options +# library options LBOPT= $(LDFLAGS) compress: Makefile compress42.c patchlevel.h $(CC) -o compress $(options) compress42.c $(LBOPT) -install: compress +install_core: compress [ -f $(DESTDIR)$(BINDIR)/compress ] && \ { rm -f $(DESTDIR)$(BINDIR)/compress.old ; \ mv $(DESTDIR)$(BINDIR)/compress $(DESTDIR)$(BINDIR)/compress.old ; } || : rm -f $(DESTDIR)$(BINDIR)/uncompress $(DESTDIR)$(BINDIR)/zcat mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) cp compress $(DESTDIR)$(BINDIR)/compress - strip $(DESTDIR)$(BINDIR)/compress rm -f $(DESTDIR)$(BINDIR)/uncompress ln $(DESTDIR)$(BINDIR)/compress $(DESTDIR)$(BINDIR)/uncompress + cp compress.1 uncompress.1 $(DESTDIR)$(MANDIR)/. + chmod 0644 $(DESTDIR)$(MANDIR)/compress.1 $(DESTDIR)$(MANDIR)/uncompress.1 + +install_extra: install_core + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) rm -f $(DESTDIR)$(BINDIR)/zcat ln -f $(DESTDIR)$(BINDIR)/compress $(DESTDIR)$(BINDIR)/zcat cp zcmp zdiff zmore $(DESTDIR)$(BINDIR)/. chmod 0755 $(DESTDIR)$(BINDIR)/compress $(DESTDIR)$(BINDIR)/zcmp $(DESTDIR)$(BINDIR)/zdiff $(DESTDIR)$(BINDIR)/zmore - cp compress.1 uncompress.1 zcmp.1 zmore.1 $(DESTDIR)$(MANDIR)/. - chmod 0644 $(DESTDIR)$(MANDIR)/compress.1 $(DESTDIR)$(MANDIR)/uncompress.1 $(DESTDIR)$(MANDIR)/zcmp.1 $(DESTDIR)$(MANDIR)/zmore.1 + cp zcmp.1 zmore.1 $(DESTDIR)$(MANDIR)/. + chmod 0644 $(DESTDIR)$(MANDIR)/zcmp.1 $(DESTDIR)$(MANDIR)/zmore.1 + +install: install_extra cleanup: rm -f compress compress.def comp.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/README.md new/ncompress-4.2.4.6/README.md --- old/ncompress-4.2.4.5/README.md 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/README.md 2019-12-30 12:06:56.000000000 +0100 @@ -71,11 +71,6 @@ - The /bin/sh under Ultrix can't handle ${var:-str} so use ksh for the build script. -- If there are any problems with the library function definitions in - compress42.c define NOFUNCDEF (-DNOFUNCDEF=1) to disable the definitions. - IBM AIX (RS/6000) uses a different definitions of open(), define -D_IBMRT=1 - to disable the open() definition. - - The output if (N)compress 4.2 is not exactly the same as compress 4.0 because of different table reset point. The output of (N)compress 4.2 is 100% compatible with compress 4.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/build new/ncompress-4.2.4.6/build --- old/ncompress-4.2.4.5/build 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/build 2019-12-30 12:06:56.000000000 +0100 @@ -768,8 +768,6 @@ # options is a collection of: # # -DAMIGA=1 Amiga support. -# -DNOFUNCDEF=1 Disable libary function definitions in -# compress42.c # -DDIRENT=1 Use dirent.h # -DSYSDIR=1 Use sys/dir.h # -DLSTAT=1 Use lstat for finding symlinks. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/compress42.c new/ncompress-4.2.4.6/compress42.c --- old/ncompress-4.2.4.5/compress42.c 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/compress42.c 2019-12-30 12:06:56.000000000 +0100 @@ -130,11 +130,20 @@ * Add variable bit length output. * */ + +#ifdef _MSC_VER +# define WINDOWS +#endif + +#ifdef __MINGW32__ +# define DIRENT +# define MINGW +#endif + #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <fcntl.h> #include <ctype.h> #include <signal.h> @@ -142,6 +151,10 @@ #include <sys/stat.h> #include <errno.h> +#if !defined(DOS) && !defined(WINDOWS) +# include <unistd.h> +#endif + #ifdef DIRENT # include <dirent.h> # define RECURSIVE 1 @@ -166,37 +179,38 @@ # define ARGS(a) () #endif -#define LARGS(a) () /* Relay on include files for libary func defs. */ - #ifndef SIG_TYPE # define SIG_TYPE void (*)() #endif -#ifndef NOFUNCDEF - extern void *malloc LARGS((int)); - extern void free LARGS((void *)); -#ifndef _IBMR2 - extern int open LARGS((char const *,int,...)); -#endif - extern int close LARGS((int)); - extern int read LARGS((int,void *,int)); - extern int write LARGS((int,void const *,int)); - extern int chmod LARGS((char const *,int)); - extern int unlink LARGS((char const *)); - extern int chown LARGS((char const *,int,int)); - extern int utime LARGS((char const *,struct utimbuf const *)); - extern char *strcpy LARGS((char *,char const *)); - extern char *strcat LARGS((char *,char const *)); - extern int strcmp LARGS((char const *,char const *)); - extern unsigned strlen LARGS((char const *)); - extern void *memset LARGS((void *,char,unsigned int)); - extern void *memcpy LARGS((void *,void const *,unsigned int)); - extern int atoi LARGS((char const *)); - extern void exit LARGS((int)); - extern int isatty LARGS((int)); +#if defined(AMIGA) || defined(DOS) || defined(MINGW) || defined(WINDOWS) +# define chmod(pathname, mode) 0 +# define chown(pathname, owner, group) 0 +# define utime(pathname, times) 0 +#endif + +#if defined(WINDOWS) +# define isatty(fd) 0 +# define open _open +# define close _close +# define read _read +# define strdup _strdup +# define unlink _unlink +# define write _write +#endif + +#ifndef LSTAT +# define lstat stat +#endif + +#if defined(DOS) || defined(WINDOWS) +# define F_OK 0 +static inline access(const char *pathname, int mode) +{ + struct stat st; + return lstat(pathname, &st) == 0; +} #endif - -#define MARK(a) { asm(" .globl M.a"); asm("M.a:"); } #ifdef DEF_ERRNO extern int errno; @@ -214,8 +228,6 @@ # define OBUFSIZ BUFSIZ /* Default output buffer size */ #endif -#define SIZE_INNER_LOOP 256 /* Size of the inter (fast) compress loop */ - /* Defines for third byte of header */ #define MAGIC_1 (char_type)'\037'/* First byte of compressed file */ #define MAGIC_2 (char_type)'\235'/* Second byte of compressed file */ @@ -920,11 +932,7 @@ has_z_suffix = (namesize >= 2 && strcmp(&tempname[namesize - 2], ".Z") == 0); errno = 0; -#ifdef LSTAT if (lstat(tempname,&infstat) == -1) -#else - if (stat(tempname,&infstat) == -1) -#endif { if (do_decomp) { @@ -942,11 +950,7 @@ namesize += 2; has_z_suffix = 1; errno = 0; -#ifdef LSTAT if (lstat(tempname,&infstat) == -1) -#else - if (stat(tempname,&infstat) == -1) -#endif { perror(tempname); goto error; @@ -1137,7 +1141,6 @@ { fprintf(stderr, "\nunlink error (ignored) "); perror(ofname); - exit_code = 1; } remove_ofname = 0; @@ -1185,32 +1188,26 @@ { fprintf(stderr, "\nutime error (ignored) "); perror(ofname); - exit_code = 1; } -#ifndef AMIGA if (chmod(ofname, infstat.st_mode & 07777)) /* Copy modes */ { fprintf(stderr, "\nchmod error (ignored) "); perror(ofname); - exit_code = 1; } -#ifndef DOS + if (chown(ofname, infstat.st_uid, infstat.st_gid)) /* Copy ownership */ { fprintf(stderr, "\nchown error (ignored) "); perror(ofname); - exit_code = 1; } -#endif -#endif + remove_ofname = 0; if (unlink(ifname)) /* Remove input file */ { fprintf(stderr, "\nunlink error (ignored) "); perror(ifname); - exit_code = 1; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/patchlevel.h new/ncompress-4.2.4.6/patchlevel.h --- old/ncompress-4.2.4.5/patchlevel.h 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/patchlevel.h 2019-12-30 12:06:56.000000000 +0100 @@ -1,2 +1,2 @@ -static char ident[] = "@(#)(N)compress 4.2.4.5"; +static char ident[] = "@(#)(N)compress 4.2.4.6"; #define version_id (ident+4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/tests/runtests.sh new/ncompress-4.2.4.6/tests/runtests.sh --- old/ncompress-4.2.4.5/tests/runtests.sh 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/tests/runtests.sh 2019-12-30 12:06:56.000000000 +0100 @@ -3,7 +3,15 @@ set -e -TESTDIR="$(dirname "$(realpath "$0" 2>/dev/null || readlink -f "$0")")" +fullpath() { + # Because portability is a pita. + realpath "$0" 2>/dev/null && return 0 + readlink -f "$0" 2>/dev/null && return 0 + python -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "$0" +} + +SCRIPT="$(fullpath "$@")" +TESTDIR="$(dirname "${SCRIPT}")" TOP_SRCDIR="$(dirname "${TESTDIR}")" if [ -z "${COMPRESS}" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncompress-4.2.4.5/travis/main.sh new/ncompress-4.2.4.6/travis/main.sh --- old/ncompress-4.2.4.5/travis/main.sh 2019-01-04 11:42:45.000000000 +0100 +++ new/ncompress-4.2.4.6/travis/main.sh 2019-12-30 12:06:56.000000000 +0100 @@ -2,9 +2,26 @@ . "${0%/*}"/lib.sh -main() { +build_make() { m m check m install DESTDIR="${PWD}/root" } + +build_linux() { build_make; } + +build_osx() { build_make; } + +build_windows() { + v ${CC} -o compress \ + -Wall \ + -DNOFUNCDEF -DUSERMEM=800000 -DREGISTERS=3 \ + compress42.c + # The tests currently fail on Windows. No idea why. + ./tests/runtests.sh || : +} + +main() { + "build_${TRAVIS_OS_NAME}" +} main "$@"
