CVS commit: src/share/installboot/evbarm
Module Name:src Committed By: gutteridge Date: Wed Jun 12 02:31:48 UTC 2024 Modified Files: src/share/installboot/evbarm: boards.plist Log Message: evbarm/boards.plist: add three more boards FriendlyElec NanoPi R2S PineCube IP Camera TI AM335x BeagleBone Green To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/installboot/evbarm/boards.plist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/installboot/evbarm/boards.plist diff -u src/share/installboot/evbarm/boards.plist:1.10 src/share/installboot/evbarm/boards.plist:1.11 --- src/share/installboot/evbarm/boards.plist:1.10 Wed Jun 12 02:27:41 2024 +++ src/share/installboot/evbarm/boards.plist Wed Jun 12 02:31:48 2024 @@ -1,4 +1,4 @@ - + + friendlyarm,nanopi-r2s + + description + FriendlyElec NanoPi R2S + u-boot-pkg + nanopi-r2s + pine64,rock64 description @@ -93,6 +100,13 @@ u-boot-pkg pinebook-pro + pine64,pinecube + + description + PineCube IP Camera + u-boot-pkg + pinecube + asus,rk3288-tinker description @@ -168,6 +182,13 @@ u-boot-pkg beagleboneblack + ti,am335x-bone-green + + description + TI AM335x BeagleBone Green + u-boot-pkg + beaglebonegreen + ti,omap4-panda description
CVS commit: src/share/installboot/evbarm
Module Name:src Committed By: gutteridge Date: Wed Jun 12 02:31:48 UTC 2024 Modified Files: src/share/installboot/evbarm: boards.plist Log Message: evbarm/boards.plist: add three more boards FriendlyElec NanoPi R2S PineCube IP Camera TI AM335x BeagleBone Green To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/installboot/evbarm/boards.plist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/installboot
Module Name:src Committed By: gutteridge Date: Wed Jun 12 02:27:42 UTC 2024 Modified Files: src/share/installboot/evbarm: boards.plist src/share/installboot/evbmips: boards.plist Log Message: (evbarm|evbmips)/boards.plist: make these plists valid XML XML does not permit double hyphens inside comments. Adjust so these files can be checked by an XML parser to confirm they're well-formed after editing. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/installboot/evbarm/boards.plist cvs rdiff -u -r1.1 -r1.2 src/share/installboot/evbmips/boards.plist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/installboot
Module Name:src Committed By: gutteridge Date: Wed Jun 12 02:27:42 UTC 2024 Modified Files: src/share/installboot/evbarm: boards.plist src/share/installboot/evbmips: boards.plist Log Message: (evbarm|evbmips)/boards.plist: make these plists valid XML XML does not permit double hyphens inside comments. Adjust so these files can be checked by an XML parser to confirm they're well-formed after editing. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/installboot/evbarm/boards.plist cvs rdiff -u -r1.1 -r1.2 src/share/installboot/evbmips/boards.plist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/installboot/evbarm/boards.plist diff -u src/share/installboot/evbarm/boards.plist:1.9 src/share/installboot/evbarm/boards.plist:1.10 --- src/share/installboot/evbarm/boards.plist:1.9 Sun Jun 21 19:39:11 2020 +++ src/share/installboot/evbarm/boards.plist Wed Jun 12 02:27:41 2024 @@ -1,4 +1,4 @@ - + terasic,de0-atlas @@ -41,7 +41,7 @@ hardkernel,odroid-c2 @@ -59,7 +59,7 @@ hardkernel,odroid-xu3 @@ -70,7 +70,7 @@ pine64,rock64 @@ -102,7 +102,7 @@ bananapi,bpi-r2 @@ -113,7 +113,7 @@ nvidia,jetson-tk1 @@ -145,7 +145,7 @@ ti,omap3-beagle @@ -184,7 +184,7 @@ @@ -487,7 +487,7 @@ digilent,zynq-zybo Index: src/share/installboot/evbmips/boards.plist diff -u src/share/installboot/evbmips/boards.plist:1.1 src/share/installboot/evbmips/boards.plist:1.2 --- src/share/installboot/evbmips/boards.plist:1.1 Sun Jun 21 17:15:51 2020 +++ src/share/installboot/evbmips/boards.plist Wed Jun 12 02:27:42 2024 @@ -1,4 +1,4 @@ - + img,ci20
CVS commit: src/doc
Module Name:src Committed By: gutteridge Date: Wed Jun 12 02:26:13 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: 3RDPARTY: add a note about DTS To generate a diff of this commit: cvs rdiff -u -r1.2011 -r1.2012 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: gutteridge Date: Wed Jun 12 02:26:13 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: 3RDPARTY: add a note about DTS To generate a diff of this commit: cvs rdiff -u -r1.2011 -r1.2012 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2011 src/doc/3RDPARTY:1.2012 --- src/doc/3RDPARTY:1.2011 Tue Jun 11 17:21:58 2024 +++ src/doc/3RDPARTY Wed Jun 12 02:26:13 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2011 2024/06/11 17:21:58 riastradh Exp $ +# $NetBSD: 3RDPARTY,v 1.2012 2024/06/12 02:26:13 gutteridge Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1749,6 +1749,9 @@ Mailing List: mailto:devicet...@vger.ker Responsible: jmcneill License: GPLv2 and dual GPLv2/X11 license Location: sys/external/gpl2/dts +Notes: +sys/external/gpl2/dts/dts2netbsd should be used to create directories to import +Not all DTS files are presently sourced from kernel.org. Package: iscsi Version: 4.12.4
CVS commit: src/doc
Module Name:src Committed By: riastradh Date: Tue Jun 11 17:21:58 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: doc/3RDPARTY: Fix licence and remind path change in OpenSSL entry. To generate a diff of this commit: cvs rdiff -u -r1.2010 -r1.2011 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2010 src/doc/3RDPARTY:1.2011 --- src/doc/3RDPARTY:1.2010 Tue Jun 11 15:14:00 2024 +++ src/doc/3RDPARTY Tue Jun 11 17:21:58 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2010 2024/06/11 15:14:00 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.2011 2024/06/11 17:21:58 riastradh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1130,12 +1130,14 @@ Home Page: http://www.openssl.org/ Date: 2024-06-11 Mailing List: openssl-annou...@openssl.org Responsible: christos, mjf, tls, riastradh, spz -License: OpenSSL and SSLeay license (both BSD-like) +License: Apache2 Location: crypto/external/bsd/openssl/dist Vendor tag: OPENSSL Release tag: openssl-x-y-z (openssl-x-y-zw in past with lettered releases) Current tag: openssl-3-0-14 Notes: +- Next update to be in crypto/openssl/apache2/openssl/dist, since + OpenSSL 3.0 was relicensed as Apache2 - Run openssl2netbsd to get rid of the RCSID identifiers - run make in /usr/src/crypto/external/bsd/openssl/lib/libcrypto/man to regen man pages.
CVS commit: src/doc
Module Name:src Committed By: riastradh Date: Tue Jun 11 17:21:58 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: doc/3RDPARTY: Fix licence and remind path change in OpenSSL entry. To generate a diff of this commit: cvs rdiff -u -r1.2010 -r1.2011 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/cd9660
Module Name:src
Committed By: rillig
Date: Tue Jun 11 17:12:36 UTC 2024
Modified Files:
src/tests/fs/cd9660: t_high_ino_big_file.sh
Log Message:
tests/cd9660: use absolute path for mounting filesystem
On amd64-compat32, the test failed with:
> rump_cd9660: "./pr_48787.image" is a relative path.
> rump_cd9660: using "/tmp/atf-run.dfxJMh/pr_48787.image" instead.
> assertion "PU_GETSFLAG(pu, PU_PUFFSDAEMON)" failed:
> file "/work/src/lib/libpuffs/puffs.c", line 718, function "puffs_cancel"
> rump_cd9660: puffs_daemon: Invalid argument
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/cd9660/t_high_ino_big_file.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/cd9660/t_high_ino_big_file.sh
diff -u src/tests/fs/cd9660/t_high_ino_big_file.sh:1.6 src/tests/fs/cd9660/t_high_ino_big_file.sh:1.7
--- src/tests/fs/cd9660/t_high_ino_big_file.sh:1.6 Sun Apr 28 14:39:22 2024
+++ src/tests/fs/cd9660/t_high_ino_big_file.sh Tue Jun 11 17:12:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_high_ino_big_file.sh,v 1.6 2024/04/28 14:39:22 rillig Exp $
+# $NetBSD: t_high_ino_big_file.sh,v 1.7 2024/06/11 17:12:36 rillig Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -71,7 +71,7 @@ atf_test_case pr_kern_48787 cleanup
pr_kern_48787_head() {
atf_set "descr" "Verifies 32bit overflow issues from PR kern/48787 are fixed"
atf_set "require.user" "root"
- atf_set "require.progs" "rump_cd9660 bunzip2 stat"
+ atf_set "require.progs" "rump_cd9660 stat"
atf_set "timeout" 6000
}
@@ -81,10 +81,10 @@ pr_kern_48787_body() {
atf_skip "not enough free disk space, have ${avail} Kbytes, need ~ 450 Kbytes"
fi
$(atf_get_srcdir)/h_hexdump_r < $(atf_get_srcdir)/pr_48787.image.hex > pr_48787.image || atf_fail "h_hexdump_r failed"
- mntpnt=$(pwd)/mnt
+ mntpnt=$PWD/mnt
mkdir ${mntpnt}
- rump_cd9660 -o norrip ./pr_48787.image ${mntpnt}
+ rump_cd9660 -o norrip "$PWD"/pr_48787.image ${mntpnt}
if [ ! -r ${mntpnt}/small_file ]; then
atf_fail "${mntpnt}/small_file does not exist"
fi
@@ -93,7 +93,7 @@ pr_kern_48787_body() {
fi
umount ${mntpnt}
- rump_cd9660 ./pr_48787.image ${mntpnt}
+ rump_cd9660 "$PWD/pr_48787.image" ${mntpnt}
if [ ! -r ${mntpnt}/small_file ]; then
atf_fail "${mntpnt}/small_file does not exist"
fi
CVS commit: src/tests/fs/cd9660
Module Name:src Committed By: rillig Date: Tue Jun 11 17:12:36 UTC 2024 Modified Files: src/tests/fs/cd9660: t_high_ino_big_file.sh Log Message: tests/cd9660: use absolute path for mounting filesystem On amd64-compat32, the test failed with: > rump_cd9660: "./pr_48787.image" is a relative path. > rump_cd9660: using "/tmp/atf-run.dfxJMh/pr_48787.image" instead. > assertion "PU_GETSFLAG(pu, PU_PUFFSDAEMON)" failed: > file "/work/src/lib/libpuffs/puffs.c", line 718, function "puffs_cancel" > rump_cd9660: puffs_daemon: Invalid argument To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/fs/cd9660/t_high_ino_big_file.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Jun 11 15:14:00 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: update for OpenSSL (also remove mention of upstreaming of bug for libarchive) To generate a diff of this commit: cvs rdiff -u -r1.2009 -r1.2010 src/doc/3RDPARTY cvs rdiff -u -r1.3064 -r1.3065 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2009 src/doc/3RDPARTY:1.2010 --- src/doc/3RDPARTY:1.2009 Tue Jun 11 06:47:11 2024 +++ src/doc/3RDPARTY Tue Jun 11 11:14:00 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2009 2024/06/11 10:47:11 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.2010 2024/06/11 15:14:00 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -728,7 +728,6 @@ License: BSD (2-clause) Location: external/bsd/libarchive/dist Notes: Distribution is stripped down to the relevant part. -Local fix for PR bin/56080 sent back to upstream. Package: libdevmapper Version: 1.02.40 @@ -1123,19 +1122,19 @@ markus is very cooperative about it): - blocklistd additions Package: OpenSSL -Version: 1.0.2o/1.1.1t/3.0.12 -Current Vers: 1.0.2zd/1.1.1u/3.0.12/3.3.0 +Version: 1.0.2o/1.1.1t/3.0.14 +Current Vers: 1.0.2zd/1.1.1u/3.0.14/3.3.1 Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ -Date: 2023-10-24 +Date: 2024-06-11 Mailing List: openssl-annou...@openssl.org Responsible: christos, mjf, tls, riastradh, spz License: OpenSSL and SSLeay license (both BSD-like) Location: crypto/external/bsd/openssl/dist Vendor tag: OPENSSL Release tag: openssl-x-y-z (openssl-x-y-zw in past with lettered releases) -Current tag: openssl-3-0-12 +Current tag: openssl-3-0-14 Notes: - Run openssl2netbsd to get rid of the RCSID identifiers - run make in /usr/src/crypto/external/bsd/openssl/lib/libcrypto/man Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3064 src/doc/CHANGES:1.3065 --- src/doc/CHANGES:1.3064 Tue Jun 11 06:47:11 2024 +++ src/doc/CHANGES Tue Jun 11 11:14:00 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3064 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3065 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -418,3 +418,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: pthread(3): Fix memory leak in pthread_create(). [hannken 20240608] libarchive: Import libarchive-3.7.4. [christos 20240609] pkg_install: Import pkg_install-20240307. [wiz 20240611] + OpenSSL: Imported 3.0.14. [christos 2020611]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Jun 11 15:14:00 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: update for OpenSSL (also remove mention of upstreaming of bug for libarchive) To generate a diff of this commit: cvs rdiff -u -r1.2009 -r1.2010 src/doc/3RDPARTY cvs rdiff -u -r1.3064 -r1.3065 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src
Committed By: christos
Date: Tue Jun 11 14:47:52 UTC 2024
Modified Files:
src/crypto/external/bsd/openssl/dist: Configure e_os.h
src/crypto/external/bsd/openssl/dist/apps: ocsp.c req.c s_server.c
speed.c
src/crypto/external/bsd/openssl/dist/apps/lib: opt.c
src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lib.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c
bn_nist.c bn_rand.c
src/crypto/external/bsd/openssl/dist/crypto/err: openssl.ec
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_lib.c
src/crypto/external/bsd/openssl/dist/include/internal: refcount.h
src/crypto/external/bsd/openssl/dist/include/openssl: bio.h.in
src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c s3_enc.c s3_lib.c
ssl_ciph.c ssl_err.c ssl_lib.c ssl_sess.c t1_enc.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: bntest.c dsatest.c
ecdsatest.c evp_extra_test.c evp_test.c
Removed Files:
src/crypto/external/bsd/openssl/dist: FAQ.md
Log Message:
Merge conflicts between 3.0.12 and 3.0.14
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/bsd/openssl/dist/FAQ.md
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/e_os.h
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssl/dist/apps/ocsp.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/apps/req.c
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/lib/opt.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_rand.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/err/openssl.ec
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/include/internal/refcount.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/include/openssl/bio.h.in
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/ssl/d1_lib.c \
src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c \
src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/dist/test/bntest.c \
src/crypto/external/bsd/openssl/dist/test/evp_test.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/test/dsatest.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/test/ecdsatest.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/Configure
diff -u src/crypto/external/bsd/openssl/dist/Configure:1.34 src/crypto/external/bsd/openssl/dist/Configure:1.35
--- src/crypto/external/bsd/openssl/dist/Configure:1.34 Wed Oct 25 13:17:49 2023
+++ src/crypto/external/bsd/openssl/dist/Configure Tue Jun 11 10:47:51 2024
@@ -1,6 +1,6 @@
#! /usr/bin/env perl
# -*- mode: perl; -*-
-# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@ -405,6 +405,7 @@ my @disablables = (
"asan",
"asm",
"async",
+"atexit",
"autoalginit",
"autoerrinit",
"autoload-config",
@@ -933,8 +934,6 @@ while (@argvcopy)
if (/^--prefix=(.*)$/)
{
$config{prefix}=$1;
-die "Directory
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Tue Jun 11 14:47:52 UTC 2024 Modified Files: src/crypto/external/bsd/openssl/dist: Configure e_os.h src/crypto/external/bsd/openssl/dist/apps: ocsp.c req.c s_server.c speed.c src/crypto/external/bsd/openssl/dist/apps/lib: opt.c src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lib.c src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c bn_nist.c bn_rand.c src/crypto/external/bsd/openssl/dist/crypto/err: openssl.ec src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_lib.c src/crypto/external/bsd/openssl/dist/include/internal: refcount.h src/crypto/external/bsd/openssl/dist/include/openssl: bio.h.in src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c s3_enc.c s3_lib.c ssl_ciph.c ssl_err.c ssl_lib.c ssl_sess.c t1_enc.c t1_lib.c src/crypto/external/bsd/openssl/dist/test: bntest.c dsatest.c ecdsatest.c evp_extra_test.c evp_test.c Removed Files: src/crypto/external/bsd/openssl/dist: FAQ.md Log Message: Merge conflicts between 3.0.12 and 3.0.14 To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/bsd/openssl/dist/FAQ.md cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/e_os.h cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssl/dist/apps/ocsp.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/apps/req.c cvs rdiff -u -r1.29 -r1.30 \ src/crypto/external/bsd/openssl/dist/apps/s_server.c cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/apps/speed.c cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/lib/opt.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c cvs rdiff -u -r1.22 -r1.23 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_rand.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/err/openssl.ec cvs rdiff -u -r1.26 -r1.27 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/include/internal/refcount.h cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/include/openssl/bio.h.in cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/ssl/d1_lib.c \ src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c cvs rdiff -u -r1.24 -r1.25 \ src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c \ src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/dist/test/bntest.c \ src/crypto/external/bsd/openssl/dist/test/evp_test.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/test/dsatest.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/test/ecdsatest.c cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Jun 11 10:47:11 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: doc: Mention pkg_install update. To generate a diff of this commit: cvs rdiff -u -r1.2008 -r1.2009 src/doc/3RDPARTY cvs rdiff -u -r1.3063 -r1.3064 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2008 src/doc/3RDPARTY:1.2009 --- src/doc/3RDPARTY:1.2008 Sun Jun 9 20:47:55 2024 +++ src/doc/3RDPARTY Tue Jun 11 10:47:11 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2008 2024/06/09 20:47:55 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.2009 2024/06/11 10:47:11 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1205,11 +1205,11 @@ definition (files.pf). userland code is reachover Makefiles are in src/usr.sbin/pf. Package: pkg_install -Version: 20210410 -Current Vers: 2025 +Version: 20240307 +Current Vers: 20240307 Maintainer: The pkgsrc developers Home Page: http://www.pkgsrc.org/ -Date: 2022-05-10 +Date: 2024-06-11 Mailing List: tech-...@netbsd.org Responsible: joerg License: BSD Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3063 src/doc/CHANGES:1.3064 --- src/doc/CHANGES:1.3063 Sun Jun 9 19:59:36 2024 +++ src/doc/CHANGES Tue Jun 11 10:47:11 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3063 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3064 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -417,3 +417,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: [tsutsui 20240531] pthread(3): Fix memory leak in pthread_create(). [hannken 20240608] libarchive: Import libarchive-3.7.4. [christos 20240609] + pkg_install: Import pkg_install-20240307. [wiz 20240611]
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Jun 11 10:47:11 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: doc: Mention pkg_install update. To generate a diff of this commit: cvs rdiff -u -r1.2008 -r1.2009 src/doc/3RDPARTY cvs rdiff -u -r1.3063 -r1.3064 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install
Module Name:src Committed By: wiz Date: Tue Jun 11 10:18:11 UTC 2024 Modified Files: src/external/bsd/pkg_install: prepare-import.sh src/external/bsd/pkg_install/sbin/pkg_add: Makefile Log Message: Add new file for pkg_install-20240307, add import instructions. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/prepare-import.sh cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/sbin/pkg_add/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install
Module Name:src Committed By: wiz Date: Tue Jun 11 10:18:11 UTC 2024 Modified Files: src/external/bsd/pkg_install: prepare-import.sh src/external/bsd/pkg_install/sbin/pkg_add: Makefile Log Message: Add new file for pkg_install-20240307, add import instructions. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/prepare-import.sh cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/sbin/pkg_add/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/pkg_install/prepare-import.sh diff -u src/external/bsd/pkg_install/prepare-import.sh:1.4 src/external/bsd/pkg_install/prepare-import.sh:1.5 --- src/external/bsd/pkg_install/prepare-import.sh:1.4 Sat Apr 20 15:30:34 2013 +++ src/external/bsd/pkg_install/prepare-import.sh Tue Jun 11 10:18:11 2024 @@ -1,9 +1,14 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.4 2013/04/20 15:30:34 wiz Exp $ +# $NetBSD: prepare-import.sh,v 1.5 2024/06/11 10:18:11 wiz Exp $ # # Copy new pkgsrc/pkgtools/pkg_install/files to dist. # Run this script and check for additional files and # directories to prune, only relevant content is included. +# +# Import with: +# +# cd dist +# cvs -d cvs.netbsd.org:/cvsroot import -m "Import pkg_install 20xx from pkgsrc" src/external/bsd/pkg_install/dist PKGSRC pkg_install-20xx set -e Index: src/external/bsd/pkg_install/sbin/pkg_add/Makefile diff -u src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.3 src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.4 --- src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.3 Thu Apr 20 13:18:47 2017 +++ src/external/bsd/pkg_install/sbin/pkg_add/Makefile Tue Jun 11 10:18:11 2024 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2017/04/20 13:18:47 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2024/06/11 10:18:11 wiz Exp $ # Original from FreeBSD, no rcs id. PROG= pkg_add -SRCS= main.c perform.c +SRCS= main.c parse_cross.c perform.c .include
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src
Committed By: wiz
Date: Tue Jun 11 09:26:58 UTC 2024
Modified Files:
src/external/bsd/pkg_install/dist/add: add.h main.c perform.c
src/external/bsd/pkg_install/dist/admin: main.c
src/external/bsd/pkg_install/dist/create: util.c
src/external/bsd/pkg_install/dist/lib: dewey.c fexec.c license.c
pkg_install.conf.5.in pkg_io.c version.h
src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf
Log Message:
Merge pkg_install-20240307
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/add.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/main.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/util.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/dewey.c \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/fexec.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/pkg_io.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pkg_install/dist/add/add.h
diff -u src/external/bsd/pkg_install/dist/add/add.h:1.3 src/external/bsd/pkg_install/dist/add/add.h:1.4
--- src/external/bsd/pkg_install/dist/add/add.h:1.3 Sat Apr 10 19:49:59 2021
+++ src/external/bsd/pkg_install/dist/add/add.h Tue Jun 11 09:26:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: add.h,v 1.3 2021/04/10 19:49:59 nia Exp $ */
+/* $NetBSD: add.h,v 1.4 2024/06/11 09:26:57 wiz Exp $ */
/* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp */
@@ -27,6 +27,8 @@
extern char *Destdir;
extern char *OverrideMachine;
+extern char *OverrideOpsys;
+extern char *OverrideOSVersion;
extern char *Prefix;
extern char *View;
extern char *Viewbase;
@@ -42,6 +44,8 @@ extern int ReplaceSame;
extern Boolean ForceDepends;
extern Boolean ForceDepending;
+void parse_cross(const char *, char **, char **, char **);
+
int make_hierarchy(char *);
voidapply_perms(char *, char **, int);
Index: src/external/bsd/pkg_install/dist/add/main.c
diff -u src/external/bsd/pkg_install/dist/add/main.c:1.4 src/external/bsd/pkg_install/dist/add/main.c:1.5
--- src/external/bsd/pkg_install/dist/add/main.c:1.4 Sat Apr 10 22:59:46 2021
+++ src/external/bsd/pkg_install/dist/add/main.c Tue Jun 11 09:26:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $ */
+/* $NetBSD: main.c,v 1.5 2024/06/11 09:26:57 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.5 2024/06/11 09:26:57 wiz Exp $");
/*
*
@@ -40,6 +40,8 @@ static char Options[] = "AC:DIK:P:RVfhm:
char *Destdir = NULL;
char *OverrideMachine = NULL;
+char *OverrideOpsys = NULL;
+char *OverrideOSVersion = NULL;
char *Prefix = NULL;
Boolean NoInstall = FALSE;
Boolean NoRecord = FALSE;
@@ -110,7 +112,8 @@ main(int argc, char **argv)
break;
case 'm':
- OverrideMachine = optarg;
+ parse_cross(optarg, , ,
+ );
break;
case 'n':
Index: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.10 src/external/bsd/pkg_install/dist/add/perform.c:1.11
--- src/external/bsd/pkg_install/dist/add/perform.c:1.10 Sat Apr 10 20:07:57 2021
+++ src/external/bsd/pkg_install/dist/add/perform.c Tue Jun 11 09:26:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $ */
+/* $NetBSD: perform.c,v 1.11 2024/06/11 09:26:57 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $");
+__RCSID("$NetBSD: perform.c,v 1.11 2024/06/11 09:26:57 wiz Exp $");
/*-
* Copyright (c) 2003 Grant Beattie
@@ -893,19 +893,28 @@ check_platform(struct pkg_task *pkg)
{
struct utsname host_uname;
const char *effective_arch;
+ const char *effective_opsys;
+ const char *effective_os_version;
int fatal;
- if (uname(_uname) < 0) {
- if (Force) {
- warnx("uname() failed, continuing.");
- return 0;
- } else {
- warnx("uname() failed, aborting.");
- return -1;
+if (OverrideOpsys != NULL && OverrideOSVersion != NULL) {
+ effective_opsys = OverrideOpsys;
+ effective_os_version = OverrideOSVersion;
+ } else {
+ if (uname(_uname) < 0) {
+ if (Force) {
+warnx("uname() failed, continuing.");
+
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Jun 11 09:26:58 UTC 2024 Modified Files: src/external/bsd/pkg_install/dist/add: add.h main.c perform.c src/external/bsd/pkg_install/dist/admin: main.c src/external/bsd/pkg_install/dist/create: util.c src/external/bsd/pkg_install/dist/lib: dewey.c fexec.c license.c pkg_install.conf.5.in pkg_io.c version.h src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf Log Message: Merge pkg_install-20240307 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/add.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/main.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/admin/main.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/util.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/dewey.c \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/fexec.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/pkg_io.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/pkg_install/dist/lib/version.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Jun 11 09:15:43 UTC 2024 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16001 Log Message: Import pkg_install 20240307 from pkgsrc Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20240307 C src/external/bsd/pkg_install/dist/add/add.h C src/external/bsd/pkg_install/dist/add/main.c C src/external/bsd/pkg_install/dist/add/perform.c C src/external/bsd/pkg_install/dist/add/pkg_add.1 N src/external/bsd/pkg_install/dist/add/parse_cross.c U src/external/bsd/pkg_install/dist/admin/admin.h C src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in C src/external/bsd/pkg_install/dist/admin/audit.c C src/external/bsd/pkg_install/dist/admin/check.c C src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in C src/external/bsd/pkg_install/dist/admin/main.c C src/external/bsd/pkg_install/dist/admin/pkg_admin.1 C src/external/bsd/pkg_install/dist/create/build.c C src/external/bsd/pkg_install/dist/create/create.h C src/external/bsd/pkg_install/dist/create/main.c C src/external/bsd/pkg_install/dist/create/perform.c C src/external/bsd/pkg_install/dist/create/pkg_create.1 C src/external/bsd/pkg_install/dist/create/pl.c C src/external/bsd/pkg_install/dist/create/util.c C src/external/bsd/pkg_install/dist/delete/pkg_delete.1 C src/external/bsd/pkg_install/dist/delete/pkg_delete.c C src/external/bsd/pkg_install/dist/info/info.h C src/external/bsd/pkg_install/dist/info/main.c C src/external/bsd/pkg_install/dist/info/perform.c C src/external/bsd/pkg_install/dist/info/pkg_info.1 C src/external/bsd/pkg_install/dist/info/show.c C src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in C src/external/bsd/pkg_install/dist/lib/conflicts.c C src/external/bsd/pkg_install/dist/lib/defs.h C src/external/bsd/pkg_install/dist/lib/dewey.c C src/external/bsd/pkg_install/dist/lib/dewey.h C src/external/bsd/pkg_install/dist/lib/fexec.c C src/external/bsd/pkg_install/dist/lib/file.c C src/external/bsd/pkg_install/dist/lib/global.c C src/external/bsd/pkg_install/dist/lib/gpgsig.c C src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h C src/external/bsd/pkg_install/dist/lib/license.c C src/external/bsd/pkg_install/dist/lib/lpkg.c C src/external/bsd/pkg_install/dist/lib/opattern.c C src/external/bsd/pkg_install/dist/lib/parse-config.c C src/external/bsd/pkg_install/dist/lib/pkcs7.c C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in C src/external/bsd/pkg_install/dist/lib/pkg_io.c C src/external/bsd/pkg_install/dist/lib/pkg_signature.c C src/external/bsd/pkg_install/dist/lib/pkg_summary.5 C src/external/bsd/pkg_install/dist/lib/pkgdb.c C src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/plist.c C src/external/bsd/pkg_install/dist/lib/remove.c C src/external/bsd/pkg_install/dist/lib/str.c C src/external/bsd/pkg_install/dist/lib/var.c C src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h C src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c C src/external/bsd/pkg_install/dist/lib/xwrapper.c C src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf C src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 56 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Jun 11 09:15:43 UTC 2024 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16001 Log Message: Import pkg_install 20240307 from pkgsrc Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20240307 C src/external/bsd/pkg_install/dist/add/add.h C src/external/bsd/pkg_install/dist/add/main.c C src/external/bsd/pkg_install/dist/add/perform.c C src/external/bsd/pkg_install/dist/add/pkg_add.1 N src/external/bsd/pkg_install/dist/add/parse_cross.c U src/external/bsd/pkg_install/dist/admin/admin.h C src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in C src/external/bsd/pkg_install/dist/admin/audit.c C src/external/bsd/pkg_install/dist/admin/check.c C src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in C src/external/bsd/pkg_install/dist/admin/main.c C src/external/bsd/pkg_install/dist/admin/pkg_admin.1 C src/external/bsd/pkg_install/dist/create/build.c C src/external/bsd/pkg_install/dist/create/create.h C src/external/bsd/pkg_install/dist/create/main.c C src/external/bsd/pkg_install/dist/create/perform.c C src/external/bsd/pkg_install/dist/create/pkg_create.1 C src/external/bsd/pkg_install/dist/create/pl.c C src/external/bsd/pkg_install/dist/create/util.c C src/external/bsd/pkg_install/dist/delete/pkg_delete.1 C src/external/bsd/pkg_install/dist/delete/pkg_delete.c C src/external/bsd/pkg_install/dist/info/info.h C src/external/bsd/pkg_install/dist/info/main.c C src/external/bsd/pkg_install/dist/info/perform.c C src/external/bsd/pkg_install/dist/info/pkg_info.1 C src/external/bsd/pkg_install/dist/info/show.c C src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in C src/external/bsd/pkg_install/dist/lib/conflicts.c C src/external/bsd/pkg_install/dist/lib/defs.h C src/external/bsd/pkg_install/dist/lib/dewey.c C src/external/bsd/pkg_install/dist/lib/dewey.h C src/external/bsd/pkg_install/dist/lib/fexec.c C src/external/bsd/pkg_install/dist/lib/file.c C src/external/bsd/pkg_install/dist/lib/global.c C src/external/bsd/pkg_install/dist/lib/gpgsig.c C src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h C src/external/bsd/pkg_install/dist/lib/license.c C src/external/bsd/pkg_install/dist/lib/lpkg.c C src/external/bsd/pkg_install/dist/lib/opattern.c C src/external/bsd/pkg_install/dist/lib/parse-config.c C src/external/bsd/pkg_install/dist/lib/pkcs7.c C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in C src/external/bsd/pkg_install/dist/lib/pkg_io.c C src/external/bsd/pkg_install/dist/lib/pkg_signature.c C src/external/bsd/pkg_install/dist/lib/pkg_summary.5 C src/external/bsd/pkg_install/dist/lib/pkgdb.c C src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/plist.c C src/external/bsd/pkg_install/dist/lib/remove.c C src/external/bsd/pkg_install/dist/lib/str.c C src/external/bsd/pkg_install/dist/lib/var.c C src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h C src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c C src/external/bsd/pkg_install/dist/lib/xwrapper.c C src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf C src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 56 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
