From 9365b84003ff0fca7911b5815490956d4910e2a5 Mon Sep 17 00:00:00 2001 From: brad Date: Sat, 4 Sep 1999 22:28:41 +0000 Subject: [PATCH] upgrade to lha 1.14f --- archivers/lha/Makefile | 10 ++-- archivers/lha/files/md5 | 6 +-- archivers/lha/patches/patch-aa | 99 +++++++++++++++------------------- archivers/lha/patches/patch-ab | 67 +++++++---------------- archivers/lha/patches/patch-ac | 93 ++++++++++++++------------------ archivers/lha/pkg/DESCR | 5 +- 6 files changed, 111 insertions(+), 169 deletions(-) diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile index eec2837c341..839205c86f2 100644 --- a/archivers/lha/Makefile +++ b/archivers/lha/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 1999/08/18 01:49:18 angelos Exp $ +# $OpenBSD: Makefile,v 1.6 1999/09/04 22:28:41 brad Exp $ -DISTNAME= lha-114c -PKGNAME= lha-1.14c +DISTNAME= lha-114f +PKGNAME= lha-1.14f CATEGORIES= archivers -MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/ -EXTRACT_SUFX= .tgz +MASTER_SITES= http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \ + ftp://ftp.win.ne.jp/pub/misc/ MAINTAINER= angelos@openbsd.org diff --git a/archivers/lha/files/md5 b/archivers/lha/files/md5 index 741d30deed6..cd670e9c699 100644 --- a/archivers/lha/files/md5 +++ b/archivers/lha/files/md5 @@ -1,3 +1,3 @@ -MD5 (lha-114c.tgz) = b626a5af259773dfb2b12c3876bdfd46 -RMD160 (lha-114c.tgz) = aa0d3e319dad35c2557d216a679fe37b1f49c6a5 -SHA1 (lha-114c.tgz) = 669ee346726d23e89fd01773ffbd1d519668830b +MD5 (lha-114f.tar.gz) = db86f414e08c39e190763f8b0c190ff6 +RMD160 (lha-114f.tar.gz) = f544e8674914d7995d779fac25143b3531602e31 +SHA1 (lha-114f.tar.gz) = 379168bc8c96b3a8b9401426e5360aa8978ba9fc diff --git a/archivers/lha/patches/patch-aa b/archivers/lha/patches/patch-aa index 6c00357c611..6a9f0f6e7b4 100644 --- a/archivers/lha/patches/patch-aa +++ b/archivers/lha/patches/patch-aa @@ -1,57 +1,42 @@ -*** Makefile.orig Fri Mar 1 17:59:19 1996 ---- Makefile Sun Dec 15 11:00:17 1996 -*************** -*** 11,35 **** - #----------------------------------------------------------------------- - - SHELL=/bin/sh -! MAKE = make - - #CC = cc -! CC = gcc -! SWITCHES = -DNEED_INCREMENTAL_INDICATOR \ -! -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\"" - #MACHINE = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC -! MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DFTIME - #OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer -mv8 - #OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer -! OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer - -! BINDIR = /usr/local/bin -! MANDIR = /usr/local/man -! MANSECT = n - -! INSTALL = install -! INSTALLBIN = -s -m 755 -! INSTALLMAN = -m 644 - - SUBDIRS = src man - ---- 11,37 ---- - #----------------------------------------------------------------------- - - SHELL=/bin/sh -! #MAKE = make - - #CC = cc -! #CC = gcc -! SWITCHES = -DNEED_INCREMENTAL_INDICATOR - #MACHINE = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC -! MACHINE = -DSYSTIME_HAS_NO_TM -DTIMELOCAL -DUSESTRCASECMP \ -! -DSYSV_SYSTEM_DIR - #OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer -mv8 - #OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer -! #OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer -! OPTIMIZE = ${CFLAGS} - -! PREFIX ?= /usr/local -! BINDIR = ${PREFIX}/bin -! MANDIR = ${PREFIX}/man/ja_JP.EUC -! MANSECT = 1 - -! #INSTALL = install -! INSTALLBIN = -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -! INSTALLMAN = -m 444 -o bin -g bin -c - - SUBDIRS = src man - +--- Makefile.orig Sun Aug 29 01:36:34 1999 ++++ Makefile Thu Sep 2 03:33:33 1999 +@@ -11,27 +11,26 @@ + #----------------------------------------------------------------------- + + SHELL=/bin/sh +-MAKE = make ++#MAKE = make + + #CC = cc +-CC = gcc +-SWITCHES = -DNEED_INCREMENTAL_INDICATOR \ +- -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\"" ++#CC = gcc ++SWITCHES = -DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH6 + + #MACHINE = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC + #MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE -DSYSV_SYSTEM_DIR +-MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME ++MACHINE = -DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME -DUSESTRCASECMP + +-#OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer +-OPTIMIZE = -O2 -DSUPPORT_LH6 ++OPTIMIZE = ${CFLAGS} + +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man +-MANSECT = n ++PREFIX ?= /usr/local ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/ja_JP.EUC ++MANSECT = 1 + +-INSTALL = install +-INSTALLBIN = -s -m 755 +-INSTALLMAN = -m 644 ++#INSTALL = install ++INSTALLBIN = -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ++INSTALLMAN = -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} + + SUBDIRS = src man + diff --git a/archivers/lha/patches/patch-ab b/archivers/lha/patches/patch-ab index 3699215d833..f79413c163a 100644 --- a/archivers/lha/patches/patch-ab +++ b/archivers/lha/patches/patch-ab @@ -1,48 +1,19 @@ -*** src/lharc.c.orig Fri Mar 8 01:09:06 1996 ---- src/lharc.c Tue Nov 25 15:37:05 1997 -*************** -*** 318,324 **** - cmd_filec = 0; - if ((xfilev = (char **) malloc(sizeof(char *) * xfilec)) == NULL) - fatal_error("Virtual memory exhausted\n"); -! while (gets(inpbuf)) { - if (cmd_filec >= xfilec) { - xfilec += 256; - cmd_filev = (char **) realloc(xfilev, ---- 318,326 ---- - cmd_filec = 0; - if ((xfilev = (char **) malloc(sizeof(char *) * xfilec)) == NULL) - fatal_error("Virtual memory exhausted\n"); -! while (fgets(inpbuf, sizeof(inpbuf), stdin)) { -! if ((p = strchr(inpbuf, '\n'))) -! *p = '\0'; - if (cmd_filec >= xfilec) { - xfilec += 256; - cmd_filev = (char **) realloc(xfilev, -*************** -*** 798,803 **** ---- 800,806 ---- - /* */ - /* ------------------------------------------------------------------------ */ - /* Build temporary file name and store to TEMPORARY_NAME */ -+ #if !defined(__OpenBSD__) - void - build_temporary_name() - { -*************** -*** 821,827 **** - mktemp(temporary_name); - #endif - } -! - /* ------------------------------------------------------------------------ */ - static void - modify_filename_extention(buffer, ext) ---- 824,830 ---- - mktemp(temporary_name); - #endif - } -! #endif - /* ------------------------------------------------------------------------ */ - static void - modify_filename_extention(buffer, ext) +--- src/lharc.c.orig Sat Sep 4 18:08:21 1999 ++++ src/lharc.c Sat Sep 4 18:09:48 1999 +@@ -865,6 +865,7 @@ + /* */ + /* ------------------------------------------------------------------------ */ + /* Build temporary file name and store to TEMPORARY_NAME */ ++#if !defined(__OpenBSD__) + void + build_temporary_name() + { +@@ -888,7 +889,7 @@ + mktemp(temporary_name); + #endif + } +- ++#endif + /* ------------------------------------------------------------------------ */ + static void + modify_filename_extention(buffer, ext) diff --git a/archivers/lha/patches/patch-ac b/archivers/lha/patches/patch-ac index 6bc25603c48..d8f389e9a71 100644 --- a/archivers/lha/patches/patch-ac +++ b/archivers/lha/patches/patch-ac @@ -1,53 +1,40 @@ -*** src/lhadd.c.orig Tue Nov 25 15:33:47 1997 ---- src/lhadd.c Tue Nov 25 15:29:32 1997 -*************** -*** 275,287 **** - { - int old_umask; - FILE *afp; - -! build_temporary_name(); - signal(SIGINT, interrupt); - signal(SIGHUP, interrupt); - - old_umask = umask(077); -! afp = xfopen(temporary_name, WRITE_BINARY); - remove_temporary_at_error = TRUE; - temporary_fp = afp; - umask(old_umask); ---- 275,309 ---- - { - int old_umask; - FILE *afp; -+ int tempfd; - -! #ifdef TMP_FILENAME_TEMPLATE -! if (extract_directory == NULL) { -! strcpy(temporary_name, TMP_FILENAME_TEMPLATE); -! } -! else { -! sprintf(temporary_name, "%s/lhXXXXXX", extract_directory); -! } -! tempfd = mkstemp(temporary_name); -! #else -! char *p, *s; -! -! strcpy(temporary_name, archive_name); -! for (p = temporary_name, s = (char *) 0; *p; p++) -! if (*p == '/') -! s = p; -! strcpy((s ? s + 1 : temporary_name), "lhXXXXXX"); -! tempfd = mkstemp(temporary_name); -! #endif -! if (tempfd == -1) -! return NULL; -! - signal(SIGINT, interrupt); - signal(SIGHUP, interrupt); - - old_umask = umask(077); -! /*afp = xfopen(temporary_name, WRITE_BINARY);*/ -! afp = fdopen(tempfd, "w+"); - remove_temporary_at_error = TRUE; - temporary_fp = afp; - umask(old_umask); +--- src/lhadd.c.orig Sat Sep 4 18:10:14 1999 ++++ src/lhadd.c Sat Sep 4 18:14:30 1999 +@@ -270,13 +270,35 @@ + { + int old_umask; + FILE *afp; ++ int tempfd; ++ ++ #ifdef TMP_FILENAME_TEMPLATE ++ if (extract_directory == NULL) { ++ strcpy(temporary_name, TMP_FILENAME_TEMPLATE); ++ } ++ else { ++ sprintf(temporary_name, "%s/lhXXXXXX", extract_directory); ++ } ++ tempfd = mkstemp(temporary_name); ++ #else ++ char *p, *s; ++ ++ strcpy(temporary_name, archive_name); ++ for (p = temporary_name, s = (char *) 0; *p; p++) ++ if (*p == '/') ++ s = p; ++ strcpy((s ? s + 1 : temporary_name), "lhXXXXXX"); ++ tempfd = mkstemp(temporary_name); ++ #endif ++ if (tempfd == -1) ++ return NULL; + +- build_temporary_name(); + signal(SIGINT, interrupt); + signal(SIGHUP, interrupt); + + old_umask = umask(077); +- afp = xfopen(temporary_name, WRITE_BINARY); ++ /*afp = xfopen(temporary_name, WRITE_BINARY);*/ ++ afp = fdopen(tempfd, "w+"); + remove_temporary_at_error = TRUE; + temporary_fp = afp; + umask(old_umask); diff --git a/archivers/lha/pkg/DESCR b/archivers/lha/pkg/DESCR index 0a2bfc77c40..13d8e21663f 100644 --- a/archivers/lha/pkg/DESCR +++ b/archivers/lha/pkg/DESCR @@ -1,12 +1,11 @@ - LHa for UNIX version 1.14c Mar. 7 1996 by Tsugio Okamoto + LHa for UNIX This unofficial version of lha is based on Version 1.00. This version supports extraction & archiving using -lh5- as well as extraction using -lh6- algorithm. All the bug reports on this version should be directed to Tsuguo -Okamoto . - +Okamoto . If this software is included in medium that may be obtained by users without network connectivity, please notify Tsuguo Okamoto in