afio: update 2.5.1 -> 2.5.2

+48 -51
+45
pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch
··· 1 + From 428c6e0eb604b63a67fda6af445c10c8ae3c1826 Mon Sep 17 00:00:00 2001 2 + From: Philipp Gesang <phg@phi-gamma.net> 3 + Date: Sun, 27 Jan 2019 21:37:13 +0100 4 + Subject: [PATCH] makefile: fix installation 5 + 6 + - comment hard-coded $(CC) 7 + - avoid full paths during install 8 + - set proper permissions 9 + --- 10 + Makefile | 11 ++++++++--- 11 + 1 file changed, 8 insertions(+), 3 deletions(-) 12 + 13 + diff --git a/Makefile b/Makefile 14 + index 9268c6f..0797579 100644 15 + --- a/Makefile 16 + +++ b/Makefile 17 + @@ -76,7 +76,7 @@ MW=-Wformat -Werror=format-security -Wall 18 + 19 + CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) 20 + 21 + -CC=gcc 22 + +#CC=gcc 23 + 24 + # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment 25 + # variables, if they exist 26 + @@ -94,9 +94,14 @@ clean: 27 + rm -f regtest/statsize regtest/statsize64 28 + cd regtest; /bin/sh regtest.clean 29 + 30 + +ifndef DESTDIR 31 + +install: 32 + + $(error Please specify install prefix as $$DESTDIR) 33 + +else 34 + install: afio 35 + - cp afio /usr/local/bin 36 + - cp afio.1 /usr/share/man/man1 37 + + install -Dm755 afio $(DESTDIR)/bin/afio 38 + + install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 39 + +endif 40 + 41 + # generate default list of -E extensions from manpage 42 + # note: on sun, I had to change awk command below to nawk or gawk 43 + -- 44 + 2.18.1 45 +
-48
pkgs/tools/archivers/afio/afio-2.5.1-install.patch
··· 1 - --- p1/Makefile.orig 2017-02-14 21:40:20.404249126 +0100 2 - +++ p1/Makefile 2017-02-19 23:38:43.880414077 +0100 3 - @@ -66,37 +66,42 @@ 4 - # systems the large file compile environment itself might be buggy or beta. 5 - #LARGEFILEFLAGS= 6 - LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 7 - 8 - # even more warnings flags.. 9 - MW= 10 - #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations 11 - 12 - CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} 13 - 14 - -CC=gcc 15 - +#CC=gcc 16 - 17 - CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I 18 - LDFLAGS = 19 - 20 - afio : afio.o compfile.o exten.o match.o $M 21 - ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio 22 - 23 - clean: 24 - rm -f *.o afio 25 - rm -f regtest/cmpstat regtest/makesparse 26 - rm -f regtest/statsize regtest/statsize64 27 - cd regtest; /bin/sh regtest.clean 28 - 29 - +ifndef DESTDIR 30 - +install: 31 - + $(error Please specify install prefix as $$DESTDIR) 32 - +else 33 - install: afio 34 - - cp afio /usr/local/bin 35 - - cp afio.1 /usr/share/man/man1 36 - + install -Dm755 afio $(DESTDIR)/bin/afio 37 - + install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 38 - +endif 39 - 40 - # generate default list of -E extensions from manpage 41 - # note: on sun, I had to change awk command below to nawk or gawk 42 - # to get it to work. 43 - exten_default.h : afio.1 44 - awk -f exten_make.awk afio.1 >exten_default.h 45 - 46 - 47 - afio.o : afio.h patchlevel.h 48 - compfile.o : afio.h
+3 -3
pkgs/tools/archivers/afio/default.nix
··· 1 1 { stdenv, fetchurl } : 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "2.5.1"; 4 + version = "2.5.2"; 5 5 name = "afio-${version}"; 6 6 7 7 src = fetchurl { 8 8 url = "http://members.chello.nl/~k.holtman/${name}.tgz"; 9 - sha256 = "363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a"; 9 + sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; 10 10 }; 11 11 12 12 /* 13 13 * A patch to simplify the installation and for removing the 14 14 * hard coded dependency on GCC. 15 15 */ 16 - patches = [ ./afio-2.5.1-install.patch ]; 16 + patches = [ ./0001-makefile-fix-installation.patch ]; 17 17 18 18 installFlags = "DESTDIR=$(out)"; 19 19