cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix...

Browse Source
This commit is contained in:
form 1998-06-22 10:15:31 +00:00
parent 82660bbe85
commit eaea23ec16
7 changed files with 0 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
archivers/unzip/patches/patch-aa
View File

@ -1,34 +0,0 @@
*** unix/Makefile.orig Mon Nov 24 14:30:41 1997
--- unix/Makefile Mon Nov 24 14:37:38 1997
***************
*** 123,129 ****
SYSTEMS6 = next next10 next2x next3x nextfat osf1 pixel ptx pyramid realix
SYSTEMS7 = regulus rs6000 sco sco_dos sco_sl sco_x286 sequent sgi solaris
SYSTEMS8 = solaris_pkg stardent stellar sunos3 sunos4 sysv sysv_gcc sysv6300
! SYSTEMS9 = tahoe ti_sysv ultrix vax v7 wombat xenix xos
####################
--- 123,129 ----
SYSTEMS6 = next next10 next2x next3x nextfat osf1 pixel ptx pyramid realix
SYSTEMS7 = regulus rs6000 sco sco_dos sco_sl sco_x286 sequent sgi solaris
SYSTEMS8 = solaris_pkg stardent stellar sunos3 sunos4 sysv sysv_gcc sysv6300
! SYSTEMS9 = tahoe ti_sysv ultrix vax v7 wombat xenix xos openbsd
####################
***************
*** 661,666 ****
--- 661,672 ----
# FreeBSD on Intel:
freebsd: unix_make
@echo 'NOTE: use bsd target for non-Intel FreeBSD compiles (if any).'
+ $(MAKE) unzips CC=gcc LD=gcc AS=gcc\
+ CF="-O3 -Wall -I. -DASM_CRC -DBSD $(LOC)"\
+ AF="-Di386 $(AF)" CRC32=crc_gcc
+
+ # OpenBSD
+ openbsd: unix_make
$(MAKE) unzips CC=gcc LD=gcc AS=gcc\
CF="-O3 -Wall -I. -DASM_CRC -DBSD $(LOC)"\
AF="-Di386 $(AF)" CRC32=crc_gcc

104
archivers/zip/patches/patch-aa
View File

@ -1,104 +0,0 @@
*** zipnote.c.orig Mon Apr 1 12:10:51 1996
--- zipnote.c Tue Nov 25 17:19:01 1997
***************
*** 403,409 ****
/* Process stdin, replacing comments */
z = zfiles;
! while (gets(a) != NULL && (a[0] != MARK || strcmp(a + 1, MARKZ)))
{ /* while input and not file comment */
if (a[0] != MARK || a[1] != ' ') /* better be "@ name" */
ziperr(ZE_NOTE, "unexpected input");
--- 403,409 ----
/* Process stdin, replacing comments */
z = zfiles;
! while (fgets(a, FNMAX, stdin) != NULL && (a[0] != MARK || strcmp(a + 1, MARKZ)))
{ /* while input and not file comment */
if (a[0] != MARK || a[1] != ' ') /* better be "@ name" */
ziperr(ZE_NOTE, "unexpected input");
***************
*** 411,417 ****
z = z->nxt; /* allow missing entries in order */
if (z == NULL)
ziperr(ZE_NOTE, "unknown entry name");
! if (gets(a) != NULL && a[0] == MARK && a[1] == '=')
{
if (z->name != z->zname)
free((zvoid *)z->zname);
--- 411,417 ----
z = z->nxt; /* allow missing entries in order */
if (z == NULL)
ziperr(ZE_NOTE, "unknown entry name");
! if (fgets(a, FNMAX, stdin) != NULL && a[0] == MARK && a[1] == '=')
{
if (z->name != z->zname)
free((zvoid *)z->zname);
***************
*** 422,428 ****
* Don't update z->nam here, we need the old value a little later.....
* The update is handled in zipcopy().
*/
! gets(a);
}
if (z->com) /* change zip entry comment */
free((zvoid *)z->comment);
--- 422,428 ----
* Don't update z->nam here, we need the old value a little later.....
* The update is handled in zipcopy().
*/
! fgets(a, FNMAX, stdin);
}
if (z->com) /* change zip entry comment */
free((zvoid *)z->comment);
***************
*** 431,437 ****
{
if ((r = catalloc(&(z->comment), a)) != ZE_OK)
ziperr(r, "was building new comments");
! gets(a);
}
z->com = strlen(z->comment);
z = z->nxt; /* point to next entry */
--- 431,437 ----
{
if ((r = catalloc(&(z->comment), a)) != ZE_OK)
ziperr(r, "was building new comments");
! fgets(a, FNMAX, stdin);
}
z->com = strlen(z->comment);
z = z->nxt; /* point to next entry */
***************
*** 439,452 ****
if (a != NULL) /* change zip file comment */
{
zcomment = malloc(1); *zcomment = 0;
! while (gets(a) != NULL)
if ((r = catalloc(&zcomment, a)) != ZE_OK)
ziperr(r, "was building new comments");
zcomlen = strlen(zcomment);
}
/* Open output zip file for writing */
! if ((tempzf = y = fopen(tempzip = tempname(zipfile), FOPW)) == NULL)
ziperr(ZE_TEMP, tempzip);
/* Open input zip file again, copy preamble if any */
--- 439,455 ----
if (a != NULL) /* change zip file comment */
{
zcomment = malloc(1); *zcomment = 0;
! while (fgets(a, FNMAX, stdin) != NULL)
if ((r = catalloc(&zcomment, a)) != ZE_OK)
ziperr(r, "was building new comments");
zcomlen = strlen(zcomment);
}
/* Open output zip file for writing */
! tempzip = tempname(zipfile, &y);
! tempzf = y;
!
! if ((tempzf == NULL) || (tempzip == NULL))
ziperr(ZE_TEMP, tempzip);
/* Open input zip file again, copy preamble if any */

81
archivers/zip/patches/patch-ab
View File

@ -1,81 +0,0 @@
*** fileio.c.orig Mon Apr 15 17:28:31 1996
--- fileio.c Tue Nov 25 17:18:22 1997
***************
*** 596,606 ****
}
! char *tempname(zip)
char *zip; /* path name of zip file to generate temp name for */
/* Return a temporary file name in its own malloc'ed space, using tempath. */
{
#ifdef CMS_MVS
return tmpnam(NULL);
#else /* !CMS_MVS */
--- 596,609 ----
}
! char *tempname(zip, fpfp)
char *zip; /* path name of zip file to generate temp name for */
+ FILE **fpfp;
/* Return a temporary file name in its own malloc'ed space, using tempath. */
{
+ int fdfd;
+
#ifdef CMS_MVS
return tmpnam(NULL);
#else /* !CMS_MVS */
***************
*** 634,640 ****
}
else
{
! if ((t = malloc(12)) == NULL)
return NULL;
*t = 0;
}
--- 637,643 ----
}
else
{
! if ((t = malloc(17)) == NULL)
return NULL;
*t = 0;
}
***************
*** 645,652 ****
return t;
}
#else
! strcat(t, "ziXXXXXX"); /* must use lowercase for Linux dos file system */
! return mktemp(t);
#endif
#endif /* ?CMS_MVS */
}
--- 648,670 ----
return t;
}
#else
! strcat(t, "/tmp/ziXXXXXX"); /* must use lowercase for Linux dos file system */
! fdfd = mkstemp(t);
! if (fdfd == -1)
! {
! free(t);
! return NULL;
! }
!
! *fpfp = fdopen(fdfd, "w+");
! if (*fpfp == NULL)
! {
! free(t);
! close(fdfd);
! return NULL;
! }
!
! return t;
#endif
#endif /* ?CMS_MVS */
}

31
archivers/zip/patches/patch-ac
View File

@ -1,31 +0,0 @@
*** zip.c.orig Sat Apr 27 08:32:56 1996
--- zip.c Tue Nov 25 17:17:26 1997
***************
*** 1519,1531 ****
return 0;
#endif
}
! if ((tempzip = tempname(zipfile)) == NULL) {
ziperr(ZE_MEM, "allocating temp filename");
#ifdef WIZZIPDLL
return 0;
#endif
}
! if ((tempzf = y = fopen(tempzip, FOPW)) == NULL) {
ziperr(ZE_TEMP, tempzip);
#ifdef WIZZIPDLL
return 0;
--- 1519,1531 ----
return 0;
#endif
}
! if ((tempzip = tempname(zipfile, &y)) == NULL) {
ziperr(ZE_MEM, "allocating temp filename");
#ifdef WIZZIPDLL
return 0;
#endif
}
! if ((tempzf = y) == NULL) {
ziperr(ZE_TEMP, tempzip);
#ifdef WIZZIPDLL
return 0;

25
archivers/zip/patches/patch-ad
View File

@ -1,25 +0,0 @@
*** zipcloak.c.orig Mon Apr 1 12:10:50 1996
--- zipcloak.c Tue Nov 25 17:20:11 1997
***************
*** 342,350 ****
attr = getfileattr(zipfile);
/* Open output zip file for writing */
! if ((tempzf = outzip = fopen(tempzip = tempname(zipfile), FOPW)) == NULL) {
ziperr(ZE_TEMP, tempzip);
- }
/* Get password */
if (getp("Enter password: ", passwd, PWLEN+1) == NULL)
--- 342,352 ----
attr = getfileattr(zipfile);
/* Open output zip file for writing */
! tempzip = tempname(zipfile, &outzip);
! tempzf = outzip;
!
! if ((tempzip == NULL) || (outzip == NULL))
ziperr(ZE_TEMP, tempzip);
/* Get password */
if (getp("Enter password: ", passwd, PWLEN+1) == NULL)

19
archivers/zip/patches/patch-ae
View File

@ -1,19 +0,0 @@
*** zip.h.orig Wed Apr 3 16:13:10 1996
--- zip.h Tue Nov 25 17:16:46 1997
***************
*** 275,281 ****
int replace OF((char *, char *));
int getfileattr OF((char *));
int setfileattr OF((char *, int));
! char *tempname OF((char *));
int fcopy OF((FILE *, FILE *, ulg));
#ifdef ZMEM
--- 275,281 ----
int replace OF((char *, char *));
int getfileattr OF((char *));
int setfileattr OF((char *, int));
! char *tempname OF((char *, FILE **));
int fcopy OF((FILE *, FILE *, ulg));
#ifdef ZMEM

11
archivers/zip/patches/patch-af
View File

@ -1,11 +0,0 @@
--- unix/configure.~1~ Wed Apr 24 11:13:49 1996
+++ unix/configure Tue Apr 7 21:35:01 1998
@@ -126,7 +126,7 @@
done
echo Check for memset
-echo "int main(){ memset(); return 0; }" > conftest.c
+echo "int main(){ char buf[ 2 ]; memset(buf, 0, 2); return 0; }" > conftest.c
$CC conftest.c >/dev/null 2>/dev/null
[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"