[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files - pull in the changes from ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files - pull in the changes from ...
From: dmcmahill <dmcmahill%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:52:11 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e3cee5be6af
branches:  trunk
changeset: 494687:1e3cee5be6af
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Sat May 28 02:50:45 2005 +0000

description:
- pull in the changes from usr.sbin which prevent an over flow
  of a 32 bit signed number when pkg_add-ing a binary package
  file larger than 512 Mb.

- Bump PKGTOOLS_VERSION (NOT!!! PKGTOOLS_REQD) to 20050527

diffstat:

 pkgtools/pkg_install/files/add/perform.c |  15 ++++++++++-----
 pkgtools/pkg_install/files/configure     |  21 +++++++++++----------
 pkgtools/pkg_install/files/configure.ac  |   4 ++--
 pkgtools/pkg_install/files/lib/version.h |   4 ++--
 4 files changed, 25 insertions(+), 19 deletions(-)

diffs (176 lines):

diff -r e7ccb4e97cbe -r 1e3cee5be6af pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Sat May 28 00:42:31 2005 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Sat May 28 02:50:45 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.29 2005/03/07 08:41:58 agc Exp $ */
+/*     $NetBSD: perform.c,v 1.30 2005/05/28 02:50:46 dmcmahill Exp $   */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.29 2005/03/07 08:41:58 agc Exp $");
+__RCSID("$NetBSD: perform.c,v 1.30 2005/05/28 02:50:46 dmcmahill Exp $");
 #endif
 #endif
 
@@ -45,6 +45,9 @@
 #include "add.h"
 #include "verify.h"
 
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #if HAVE_SIGNAL_H
 #include <signal.h>
 #endif
@@ -200,6 +203,7 @@
        struct utsname host_uname;
        int     inPlace;
        int     rc;
+       uint64_t needed;
        Boolean is_depoted_pkg = FALSE;
 
        errc = 0;
@@ -320,11 +324,12 @@
                         * compress an average of 75%, so multiply by 4 for good measure.
                         */
 
-                       if (!inPlace && min_free(playpen) < sb.st_size * 4) {
-                               warnx("projected size of %ld bytes exceeds available free space\n"
+                       needed = 4 * (uint64_t) sb.st_size;
+                       if (!inPlace && min_free(playpen) < needed) {
+                               warnx("projected size of %" PRIu64 " bytes exceeds available free space\n"
                                    "in %s. Please set your PKG_TMPDIR variable to point\n"
                                    "to a location with more free space and try again.",
-                                       (long) (sb.st_size * 4), playpen);
+                                       needed, playpen);
                                goto bomb;
                        }
 
diff -r e7ccb4e97cbe -r 1e3cee5be6af pkgtools/pkg_install/files/configure
--- a/pkgtools/pkg_install/files/configure      Sat May 28 00:42:31 2005 +0000
+++ b/pkgtools/pkg_install/files/configure      Sat May 28 02:50:45 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for pkg_install 20040813.
+# Generated by GNU Autoconf 2.59 for pkg_install 20050527.
 #
 # Report bugs to <grant%NetBSD.org@localhost>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='pkg_install'
 PACKAGE_TARNAME='pkg_install'
-PACKAGE_VERSION='20040813'
-PACKAGE_STRING='pkg_install 20040813'
+PACKAGE_VERSION='20050527'
+PACKAGE_STRING='pkg_install 20050527'
 PACKAGE_BUGREPORT='grant%NetBSD.org@localhost'
 
 ac_unique_file="lib/plist.c"
@@ -780,7 +780,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pkg_install 20040813 to adapt to many kinds of systems.
+\`configure' configures pkg_install 20050527 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -841,7 +841,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pkg_install 20040813:";;
+     short | recursive ) echo "Configuration of pkg_install 20050527:";;
    esac
   cat <<\_ACEOF
 
@@ -962,7 +962,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-pkg_install configure 20040813
+pkg_install configure 20050527
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -976,7 +976,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pkg_install $as_me 20040813, which was
+It was created by pkg_install $as_me 20050527, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -3841,8 +3841,9 @@
 
 
 
+
 for ac_header in assert.h ctype.h dirent.h err.h errno.h fnctl.h fnmatch.h \
-       glob.h limits.h md5.h netdb.h pwd.h regex.h signal.h stdarg.h \
+       glob.h inttypes.h limits.h md5.h netdb.h pwd.h regex.h signal.h stdarg.h \
        stdio.h stdlib.h string.h termcap.h termios.h time.h unistd.h vis.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4889,7 +4890,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by pkg_install $as_me 20040813, which was
+This file was extended by pkg_install $as_me 20050527, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4949,7 +4950,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pkg_install config.status 20040813
+pkg_install config.status 20050527
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r e7ccb4e97cbe -r 1e3cee5be6af pkgtools/pkg_install/files/configure.ac
--- a/pkgtools/pkg_install/files/configure.ac   Sat May 28 00:42:31 2005 +0000
+++ b/pkgtools/pkg_install/files/configure.ac   Sat May 28 02:50:45 2005 +0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([pkg_install], [20040813], [grant%NetBSD.org@localhost])
+AC_INIT([pkg_install], [20050527], [grant%NetBSD.org@localhost])
 AC_CONFIG_SRCDIR([lib/plist.c])
 AC_CONFIG_HEADER(lib/config.h)
 
@@ -74,7 +74,7 @@
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([assert.h ctype.h dirent.h err.h errno.h fnctl.h fnmatch.h \
-       glob.h limits.h md5.h netdb.h pwd.h regex.h signal.h stdarg.h \
+       glob.h inttypes.h limits.h md5.h netdb.h pwd.h regex.h signal.h stdarg.h \
        stdio.h stdlib.h string.h termcap.h termios.h time.h unistd.h vis.h])
 AC_CHECK_HEADERS([db1/db.h db.h])
 AC_CHECK_HEADERS([sys/cdefs.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h \
diff -r e7ccb4e97cbe -r 1e3cee5be6af pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sat May 28 00:42:31 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sat May 28 02:50:45 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.42 2005/03/20 15:55:54 hubertf Exp $     */
+/*     $NetBSD: version.h,v 1.43 2005/05/28 02:50:46 dmcmahill Exp $   */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20050318"
+#define PKGTOOLS_VERSION "20050527"
 
 #endif /* _INST_LIB_VERSION_H_ */
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc Remove namazu1.
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/qpopper - Update HOMEPAGE.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc Remove namazu1.
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/qpopper - Update HOMEPAGE.
Indexes:
Home | Main Index | Thread Index | Old Index