CVS commit: pkgsrc/archivers/zip

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug  5 09:23:37 UTC 2024

Modified Files:
        pkgsrc/archivers/zip: distinfo
        pkgsrc/archivers/zip/patches: patch-ab
Added Files:
        pkgsrc/archivers/zip/patches: patch-timezone.c

Log Message:
zip: remove broken configure tests

We don't need to test for existence of memset(3) et al in 2024.
(If you want to test for it, at least include the correct headers!)


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/archivers/zip/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/zip/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/zip/patches/patch-timezone.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/zip/distinfo
diff -u pkgsrc/archivers/zip/distinfo:1.18 pkgsrc/archivers/zip/distinfo:1.19
--- pkgsrc/archivers/zip/distinfo:1.18  Tue Oct 26 09:57:20 2021
+++ pkgsrc/archivers/zip/distinfo       Mon Aug  5 09:23:36 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 09:57:20 nia Exp $
+$NetBSD: distinfo,v 1.19 2024/08/05 09:23:36 tnn Exp $
 
 BLAKE2s (zip30.tgz) = c742fa4863485c84d4577e4f7b3853909f93d160e71e9428135911c98e834897
 SHA512 (zip30.tgz) = c1c3d62bf1426476c0f9919b568013d6d7b03514912035f09ee283226d94c978791ad2af5310021e96c4c2bf320bfc9d0b8f4045c48e4667e034d98197e1a9b3
 Size (zip30.tgz) = 1118845 bytes
 SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3
-SHA1 (patch-ab) = 9b5e62be5f7e6d2e4640ade5bf8c469681e6246f
+SHA1 (patch-ab) = 7353cafb6b1b7e3d8a2fd184ff0b81c0d60e506b
+SHA1 (patch-timezone.c) = 7814de0a9d1471b02235e1fbee29b8dbfeb83c93

Index: pkgsrc/archivers/zip/patches/patch-ab
diff -u pkgsrc/archivers/zip/patches/patch-ab:1.7 pkgsrc/archivers/zip/patches/patch-ab:1.8
--- pkgsrc/archivers/zip/patches/patch-ab:1.7   Fri Aug 28 08:17:38 2015
+++ pkgsrc/archivers/zip/patches/patch-ab       Mon Aug  5 09:23:37 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2015/08/28 08:17:38 richard Exp $
+$NetBSD: patch-ab,v 1.8 2024/08/05 09:23:37 tnn Exp $
 
 Use CPPFLAGS during configuration.
 Don't force compiler optimization flags.
 Introduce DISABLE_ASM
+Remove broken configure tests. Assume we have
+standard libc functions such as memset(3).
 
 --- unix/configure.orig        2008-06-20 03:32:20.000000000 +0000
 +++ unix/configure
@@ -61,3 +63,91 @@ Introduce DISABLE_ASM
  
  
  # ANSI options for compilers that don't have __STDC__ defined by default
+@@ -505,87 +503,6 @@ _EOF_
+ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && BFLAG="-fno-builtin"
+ 
+-
+-# Check for missing functions
+-# add NO_'function_name' to flags if missing
+-
+-for func in rmdir strchr strrchr rename mktemp mktime mkstemp
+-do
+-  echo Check for $func
+-  echo "int main(){ $func(); return 0; }" > conftest.c
+-  $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
+-  [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
+-done
+-
+-
+-echo Check for memset
+-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
+-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
+-
+-
+-echo Check for memmove
+-cat > conftest.c << _EOF_
+-#include <string.h>
+-int main() { int a; int b = 0; memmove( &a, &b, sizeof( a)); return a; }
+-_EOF_
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
+-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_MEMMOVE"
+-
+-
+-echo Check for strerror
+-cat > conftest.c << _EOF_
+-#include <string.h>
+-int main() { strerror( 0); return 0; }
+-_EOF_
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
+-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_STRERROR"
+-
+-echo Check for errno declaration
+-cat > conftest.c << _EOF_
+-#include <errno.h>
+-main()
+-{
+-  errno = 0;
+-  return 0;
+-}
+-_EOF_
+-$CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
+-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_ERRNO"
+-
+-
+-echo Check for directory libraries
+-cat > conftest.c << _EOF_
+-int main() { return closedir(opendir(".")); }
+-_EOF_
+-
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
+-if [ $? -ne 0 ]; then
+-  OPT=""
+-  for lib in ndir dir ucb bsd BSD PW x dirent
+-  do
+-    $CC -o conftest conftest.c -l$lib >/dev/null 2>/dev/null
+-    [ $? -eq 0 ] && OPT=-l$lib && break
+-  done
+-  if [ ${OPT} ]; then
+-    LFLAGS2="${LFLAGS2} ${OPT}"
+-  else
+-    CFLAGS="${CFLAGS} -DNO_DIR"
+-  fi
+-fi
+-
+-
+-# Dynix/ptx 1.3 needed this
+-
+-echo Check for readlink
+-echo "int main(){ return readlink(); }" > conftest.c
+-$CC -o conftest conftest.c >/dev/null 2>/dev/null
+-if [ $? -ne 0 ]; then
+-  $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
+-  [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq"
+-fi
+-
+-
+ echo Check for directory include file
+ OPT=""
+ for inc in dirent.h sys/ndir.h ndir.h sys/dir.h

Added files:

Index: pkgsrc/archivers/zip/patches/patch-timezone.c
diff -u /dev/null pkgsrc/archivers/zip/patches/patch-timezone.c:1.1
--- /dev/null   Mon Aug  5 09:23:37 2024
+++ pkgsrc/archivers/zip/patches/patch-timezone.c       Mon Aug  5 09:23:37 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-timezone.c,v 1.1 2024/08/05 09:23:37 tnn Exp $
+
+Needs <time.h> for struct tm.
+
+--- timezone.c.orig    2024-08-05 10:58:20.252837901 +0000
++++ timezone.c
+@@ -41,6 +41,7 @@
+ #include "timezone.h"
+ #include <ctype.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #ifdef IZTZ_DEFINESTDGLOBALS
+ long timezone = 0;