From c4f197e01bce6c7e900467353a94d1bc95edbf3b Mon Sep 17 00:00:00 2001 From: asau Date: Wed, 18 Sep 2013 20:58:35 +0000 Subject: Fix segmentation fault due to time_t being longer than long. While here, allow building it with standard make. --- archivers/ha/Makefile | 5 ++--- archivers/ha/distinfo | 9 ++++++--- archivers/ha/patches/patch-ab | 14 ++++++++++++-- archivers/ha/patches/patch-ac | 18 +++++++++++++++--- archivers/ha/patches/patch-c_makefile | 15 +++++++++++++++ archivers/ha/patches/patch-nix_machine.h | 12 ++++++++++++ archivers/ha/patches/patch-nix_makefile | 15 +++++++++++++++ 7 files changed, 77 insertions(+), 11 deletions(-) create mode 100644 archivers/ha/patches/patch-c_makefile create mode 100644 archivers/ha/patches/patch-nix_machine.h create mode 100644 archivers/ha/patches/patch-nix_makefile (limited to 'archivers') diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile index b356ed0e59e..1370da25f6f 100644 --- a/archivers/ha/Makefile +++ b/archivers/ha/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2012/09/11 19:46:55 asau Exp $ +# $NetBSD: Makefile,v 1.31 2013/09/18 20:58:35 asau Exp $ DISTNAME= ha0999 PKGNAME= ha-0.999b -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= archivers MASTER_SITES= # ftp://ftp.kiarchive.ru/pub/unix/arcers/ EXTRACT_SUFX= .tgz @@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR} MAKE_FILE= makefile.nix BUILD_TARGET= ha -USE_TOOLS+= gmake INSTALLATION_DIRS= bin diff --git a/archivers/ha/distinfo b/archivers/ha/distinfo index d86e68ad67f..703a96ce00b 100644 --- a/archivers/ha/distinfo +++ b/archivers/ha/distinfo @@ -1,9 +1,12 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 14:45:23 agc Exp $ +$NetBSD: distinfo,v 1.7 2013/09/18 20:58:35 asau Exp $ SHA1 (ha0999.tgz) = 8dd106748619772f988ee0bce59937a4de1677ed RMD160 (ha0999.tgz) = 41b52392267551f834b58e0a4b69b89e813c8bd6 Size (ha0999.tgz) = 44271 bytes SHA1 (patch-aa) = 3cb453dd45de59331542a83328759d00b156a933 -SHA1 (patch-ab) = 4dcf130fa23beab775fc4b11883d4a820f223016 -SHA1 (patch-ac) = 5504ba8f6070cd6ed984a4ad870ebc9eb58353c4 +SHA1 (patch-ab) = 671ad83192103551401a2aebadf3900c9669c2d8 +SHA1 (patch-ac) = b5c7c2e8d1d9190b619918cee02725c7db4c4de3 SHA1 (patch-ad) = a50bd6e5ce904c204cd8e453538efb538dd03002 +SHA1 (patch-c_makefile) = 3909cb7726c1dc5a487f5b2a164ad3c0502d717c +SHA1 (patch-nix_machine.h) = 7ea8c6ffea40aaebb6b69ffc0c1db54f1873f639 +SHA1 (patch-nix_makefile) = 82a35bb0848de3806aad9c62df9b49340211e76f diff --git a/archivers/ha/patches/patch-ab b/archivers/ha/patches/patch-ab index 6fde962e31f..f20444e1619 100644 --- a/archivers/ha/patches/patch-ab +++ b/archivers/ha/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2004/01/29 12:55:36 grant Exp $ +$NetBSD: patch-ab,v 1.3 2013/09/18 20:58:36 asau Exp $ ---- makefile.nix.orig 1995-01-12 18:26:26.000000000 +1100 +--- makefile.nix.orig 1995-01-12 07:26:26.000000000 +0000 +++ makefile.nix @@ -21,10 +21,9 @@ @@ -16,3 +16,13 @@ $NetBSD: patch-ab,v 1.2 2004/01/29 12:55:36 grant Exp $ MDEFINES = "CC=$(CC)" "CPP=$(CPP)" "CFLAGS=$(CFLAGS)" "DEFS=$(DEFS)" SUBDIRS = c $(MCH) include +@@ -46,6 +45,6 @@ clean: + # + # include a dependency file if one exists + # +-ifeq (.depend,$(wildcard .depend)) +-include .depend +-endif ++#ifeq (.depend,$(wildcard .depend)) ++#include .depend ++#endif diff --git a/archivers/ha/patches/patch-ac b/archivers/ha/patches/patch-ac index 882c1d0fff2..b43a5c9da95 100644 --- a/archivers/ha/patches/patch-ac +++ b/archivers/ha/patches/patch-ac @@ -1,8 +1,20 @@ -$NetBSD: patch-ac,v 1.1 2001/07/15 11:49:42 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2013/09/18 20:58:36 asau Exp $ ---- nix/machine.c.orig Thu Jan 12 01:53:00 1995 +--- nix/machine.c.orig 1995-01-12 06:53:00.000000000 +0000 +++ nix/machine.c -@@ -417,7 +417,7 @@ +@@ -335,8 +335,10 @@ char *md_timestring(unsigned long t) { + + static char ts[22]; + struct tm *tim; ++ time_t t_; + +- tim=localtime((long *)&t); ++ t_ = t; ++ tim=localtime(&t_); + sprintf(ts,"%04d-%02d-%02d %02d:%02d",tim->tm_year+1900,tim->tm_mon+1, + tim->tm_mday,tim->tm_hour,tim->tm_min); + return ts; +@@ -417,7 +419,7 @@ char *md_stripname(char *mdfullpath) { if (plainname!=NULL) free(plainname),plainname=NULL; if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) error(1,ERR_MEM,"md_stripname()"); diff --git a/archivers/ha/patches/patch-c_makefile b/archivers/ha/patches/patch-c_makefile new file mode 100644 index 00000000000..e8653a84ce9 --- /dev/null +++ b/archivers/ha/patches/patch-c_makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-c_makefile,v 1.1 2013/09/18 20:58:36 asau Exp $ + +--- c/makefile.orig 1995-01-12 06:43:42.000000000 +0000 ++++ c/makefile +@@ -35,7 +35,7 @@ clean: + # + # include a dependency file if one exists + # +-ifeq (.depend,$(wildcard .depend)) +-include .depend +-endif ++#ifeq (.depend,$(wildcard .depend)) ++#include .depend ++#endif + diff --git a/archivers/ha/patches/patch-nix_machine.h b/archivers/ha/patches/patch-nix_machine.h new file mode 100644 index 00000000000..3ad4e1da26a --- /dev/null +++ b/archivers/ha/patches/patch-nix_machine.h @@ -0,0 +1,12 @@ +$NetBSD: patch-nix_machine.h,v 1.1 2013/09/18 20:58:36 asau Exp $ + +--- nix/machine.h.orig 1995-01-12 07:45:22.000000000 +0000 ++++ nix/machine.h +@@ -19,6 +19,7 @@ + HA *nix specific include file + ***********************************************************************/ + ++#include + #include + #include + #include diff --git a/archivers/ha/patches/patch-nix_makefile b/archivers/ha/patches/patch-nix_makefile new file mode 100644 index 00000000000..63bcd133876 --- /dev/null +++ b/archivers/ha/patches/patch-nix_makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-nix_makefile,v 1.1 2013/09/18 20:58:36 asau Exp $ + +--- nix/makefile.orig 1995-01-12 06:43:24.000000000 +0000 ++++ nix/makefile +@@ -38,7 +38,7 @@ clean: + # + # include a dependency file if one exists + # +-ifeq (.depend,$(wildcard .depend)) +-include .depend +-endif ++#ifeq (.depend,$(wildcard .depend)) ++#include .depend ++#endif + -- cgit v1.2.3