Attachment 10022 Details for Bug 20262 – file.diff

[patch] file.diff

file.diff (text/plain), 4.61 KB, created by tkato on 2000-07-28 20:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-07-28 20:00:01 UTC

Size: 4.61 KB

patch

obsolete

>diff -urN /usr/ports/archivers/lha/Makefile archivers/lha/Makefile
>--- /usr/ports/archivers/lha/Makefile	Sun Apr  9 15:41:16 2000
>+++ archivers/lha/Makefile	Fri Jul 28 19:13:48 2000
>@@ -6,11 +6,11 @@
> #
> 
> PORTNAME=	lha
>-PORTVERSION=	1.14f
>+PORTVERSION=	1.14g
> CATEGORIES=	archivers
> MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
> 		ftp://ftp.win.ne.jp/pub/misc/
>-DISTNAME=	lha-114f
>+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}
> 
> MAINTAINER=	ache@FreeBSD.org
> 
>diff -urN /usr/ports/archivers/lha/files/md5 archivers/lha/files/md5
>--- /usr/ports/archivers/lha/files/md5	Thu Sep  2 03:41:20 1999
>+++ archivers/lha/files/md5	Fri Jul 28 19:15:18 2000
>@@ -1 +1 @@
>-MD5 (lha-114f.tar.gz) = db86f414e08c39e190763f8b0c190ff6
>+MD5 (lha-114g.tar.gz) = 6e99dd9be599e60decebea97f62a0448
>diff -urN /usr/ports/archivers/lha/patches/patch-aa archivers/lha/patches/patch-aa
>--- /usr/ports/archivers/lha/patches/patch-aa	Thu Sep  2 03:41:21 1999
>+++ archivers/lha/patches/patch-aa	Fri Jul 28 19:28:24 2000
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Sun Aug 29 01:36:34 1999
>-+++ Makefile	Thu Sep  2 03:33:33 1999
>+--- Makefile.orig	Sat May  6 23:55:15 2000
>++++ Makefile	Fri Jul 28 19:28:13 2000
> @@ -11,27 +11,26 @@
>  #-----------------------------------------------------------------------
>  
>@@ -12,7 +12,7 @@
> -SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
> - -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
> +#CC			= gcc
>-+SWITCHES	= -DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH6
>++SWITCHES	= -DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH7
>  
>  #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
>  #MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE -DSYSV_SYSTEM_DIR
>@@ -20,7 +20,7 @@
> +MACHINE	= -DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME -DUSESTRCASECMP
>  
> -#OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
>--OPTIMIZE	= -O2 -DSUPPORT_LH6
>+-OPTIMIZE	= -O2 -DSUPPORT_LH7
> +OPTIMIZE	= ${CFLAGS}
>  
> -BINDIR = /usr/local/bin
>diff -urN /usr/ports/archivers/lha/patches/patch-ac archivers/lha/patches/patch-ac
>--- /usr/ports/archivers/lha/patches/patch-ac	Thu Sep  2 03:41:22 1999
>+++ archivers/lha/patches/patch-ac	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/lhext.c.orig	Sun Aug 29 01:36:16 1999
>-+++ src/lhext.c	Wed Sep  1 17:23:43 1999
>-@@ -162,7 +162,7 @@
>- #endif
>- 		if (!getuid()) {
>- #ifndef HAVE_NO_LCHOWN
>--            if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) != UNIX_FILE_SYMLINK)
>-+            if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK)
>- 			    lchown(name, hdr->unix_uid, hdr->unix_gid);
>- 			else
>- #endif /* HAVE_NO_LCHWON */
>diff -urN /usr/ports/archivers/lha/patches/patch-ad archivers/lha/patches/patch-ad
>--- /usr/ports/archivers/lha/patches/patch-ad	Thu Jan  1 09:00:00 1970
>+++ archivers/lha/patches/patch-ad	Fri Jul 28 19:53:12 2000
>@@ -0,0 +1,19 @@
>+--- src/lharc.c.orig	Sun May  7 00:05:29 2000
>++++ src/lharc.c	Fri Jul 28 19:35:31 2000
>+@@ -889,6 +889,7 @@
>+ /*																			*/
>+ /* ------------------------------------------------------------------------ */
>+ /* Build temporary file name and store to TEMPORARY_NAME */
>++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
>+ void
>+ build_temporary_name()
>+ {
>+@@ -912,7 +913,7 @@
>+ 	mktemp(temporary_name);
>+ #endif
>+ }
>+-
>++#endif
>+ /* ------------------------------------------------------------------------ */
>+ static void
>+ modify_filename_extention(buffer, ext)
>diff -urN /usr/ports/archivers/lha/patches/patch-ae archivers/lha/patches/patch-ae
>--- /usr/ports/archivers/lha/patches/patch-ae	Thu Jan  1 09:00:00 1970
>+++ archivers/lha/patches/patch-ae	Fri Jul 28 19:36:11 2000
>@@ -0,0 +1,40 @@
>+--- src/lhadd.c.orig	Sun May  7 00:05:29 2000
>++++ src/lhadd.c	Fri Jul 28 19:35:55 2000
>+@@ -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);

Actions: View | Diff

Attachments on bug 20262: 10022