From owner-svn-src-all@FreeBSD.ORG Tue May 13 23:24:21 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 981B0871; Tue, 13 May 2014 23:24:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7907729E6; Tue, 13 May 2014 23:24:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DNOLkb058800; Tue, 13 May 2014 23:24:21 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DNOE0m058757; Tue, 13 May 2014 23:24:14 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201405132324.s4DNOE0m058757@svn.freebsd.org> From: Xin LI Date: Tue, 13 May 2014 23:24:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r265988 - in releng: 9.1 9.1/etc 9.1/etc/mtree 9.1/etc/pkg 9.1/share 9.1/share/keys 9.1/share/keys/pkg 9.1/share/keys/pkg/trusted 9.1/share/man/man7 9.1/sys/conf 9.1/sys/dev/ciss 9.1/us... X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 23:24:21 -0000 Author: delphij Date: Tue May 13 23:24:14 2014 New Revision: 265988 URL: http://svnweb.freebsd.org/changeset/base/265988 Log: Add pkg bootstrapping, configuration and public keys. [EN-14:03] Improve build repeatability for kldxref(8). [EN-14:04] Fix data corruption with ciss(4). [EN-14:05] Approved by: so Added: releng/9.1/etc/pkg/ releng/9.1/etc/pkg/FreeBSD.conf (contents, props changed) releng/9.1/etc/pkg/Makefile (contents, props changed) releng/9.1/share/keys/ releng/9.1/share/keys/Makefile (contents, props changed) releng/9.1/share/keys/pkg/ releng/9.1/share/keys/pkg/Makefile (contents, props changed) releng/9.1/share/keys/pkg/trusted/ releng/9.1/share/keys/pkg/trusted/Makefile (contents, props changed) releng/9.1/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 (contents, props changed) releng/9.2/etc/pkg/ releng/9.2/etc/pkg/FreeBSD.conf (contents, props changed) releng/9.2/etc/pkg/Makefile (contents, props changed) releng/9.2/share/keys/ releng/9.2/share/keys/Makefile (contents, props changed) releng/9.2/share/keys/pkg/ releng/9.2/share/keys/pkg/Makefile (contents, props changed) releng/9.2/share/keys/pkg/trusted/ releng/9.2/share/keys/pkg/trusted/Makefile (contents, props changed) releng/9.2/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 (contents, props changed) Modified: releng/9.1/UPDATING releng/9.1/etc/Makefile releng/9.1/etc/mtree/BSD.root.dist releng/9.1/etc/mtree/BSD.usr.dist releng/9.1/share/Makefile releng/9.1/share/man/man7/hier.7 releng/9.1/sys/conf/newvers.sh releng/9.1/sys/dev/ciss/ciss.c releng/9.1/usr.sbin/kldxref/kldxref.c releng/9.1/usr.sbin/pkg/pkg.c releng/9.2/UPDATING releng/9.2/etc/Makefile releng/9.2/etc/mtree/BSD.root.dist releng/9.2/etc/mtree/BSD.usr.dist releng/9.2/share/Makefile releng/9.2/share/man/man7/hier.7 releng/9.2/sys/conf/newvers.sh releng/9.2/sys/dev/ciss/ciss.c releng/9.2/usr.sbin/kldxref/kldxref.c releng/9.2/usr.sbin/pkg/pkg.c Modified: releng/9.1/UPDATING ============================================================================== --- releng/9.1/UPDATING Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/UPDATING Tue May 13 23:24:14 2014 (r265988) @@ -9,6 +9,16 @@ handbook. Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20140513: p13 FreeBSD-EN-14:03.pkg + FreeBSD-EN-14:04.kldxref + FreeBSD-EN-14:05.ciss + + Add pkg bootstrapping, configuration and public keys. [EN-14:03] + + Improve build repeatability for kldxref(8). [EN-14:04] + + Fix data corruption with ciss(4). [EN-14:05] + 20140430: p12 FreeBSD-SA-14:08.tcp Fix TCP reassembly vulnerability. [SA-14:08] Modified: releng/9.1/etc/Makefile ============================================================================== --- releng/9.1/etc/Makefile Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/etc/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -205,6 +205,7 @@ distribution: ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install + ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap Modified: releng/9.1/etc/mtree/BSD.root.dist ============================================================================== --- releng/9.1/etc/mtree/BSD.root.dist Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/etc/mtree/BSD.root.dist Tue May 13 23:24:14 2014 (r265988) @@ -52,6 +52,8 @@ weekly .. .. + pkg + .. ppp .. rc.d Modified: releng/9.1/etc/mtree/BSD.usr.dist ============================================================================== --- releng/9.1/etc/mtree/BSD.usr.dist Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/etc/mtree/BSD.usr.dist Tue May 13 23:24:14 2014 (r265988) @@ -398,6 +398,14 @@ .. .. .. + keys + pkg + revoked + .. + trusted + .. + .. + .. locale UTF-8 .. Added: releng/9.1/etc/pkg/FreeBSD.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.1/etc/pkg/FreeBSD.conf Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,16 @@ +# $FreeBSD$ +# +# To disable this repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# +# mkdir -p /usr/local/etc/pkg/repos +# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# + +FreeBSD: { + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} Added: releng/9.1/etc/pkg/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.1/etc/pkg/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +NO_OBJ= + +FILES= FreeBSD.conf + +FILESDIR= /etc/pkg +FILESMODE= 644 + +.include Modified: releng/9.1/share/Makefile ============================================================================== --- releng/9.1/share/Makefile Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/share/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -10,6 +10,7 @@ SUBDIR= ${_colldef} \ ${_doc} \ ${_examples} \ ${_i18n} \ + keys \ ${_man} \ ${_me} \ misc \ Added: releng/9.1/share/keys/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.1/share/keys/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= pkg + +.include Added: releng/9.1/share/keys/pkg/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.1/share/keys/pkg/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= trusted + +.include Added: releng/9.1/share/keys/pkg/trusted/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.1/share/keys/pkg/trusted/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +NO_OBJ= + +FILES= pkg.freebsd.org.2013102301 + +FILESDIR= /usr/share/keys/pkg/trusted +FILESMODE= 644 + +.include Added: releng/9.1/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.1/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +function: "sha256" +fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438" Modified: releng/9.1/share/man/man7/hier.7 ============================================================================== --- releng/9.1/share/man/man7/hier.7 Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/share/man/man7/hier.7 Tue May 13 23:24:14 2014 (r265988) @@ -32,7 +32,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd May 25, 2008 +.Dd October 29, 2013 .Dt HIER 7 .Os .Sh NAME @@ -546,6 +546,16 @@ ASCII text files used by various games device description file for device name .It Pa info/ GNU Info hypertext system +.It Pa keys/ +known trusted and revoked keys. +.Bl -tag -width ".Pa keys/pkg/" -compact +.It Pa keys/pkg/ +fingerprints for +.Xr pkg 7 +and +.Xr pkg 8 +.El +.Pp .It Pa locale/ localization files; see Modified: releng/9.1/sys/conf/newvers.sh ============================================================================== --- releng/9.1/sys/conf/newvers.sh Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/sys/conf/newvers.sh Tue May 13 23:24:14 2014 (r265988) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.1" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.1/sys/dev/ciss/ciss.c ============================================================================== --- releng/9.1/sys/dev/ciss/ciss.c Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/sys/dev/ciss/ciss.c Tue May 13 23:24:14 2014 (r265988) @@ -179,8 +179,6 @@ static int ciss_cam_emulate(struct ciss_ static void ciss_cam_poll(struct cam_sim *sim); static void ciss_cam_complete(struct ciss_request *cr); static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio); -static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, - int bus, int target); static int ciss_name_device(struct ciss_softc *sc, int bus, int target); /* periodic status monitoring */ @@ -3338,27 +3336,6 @@ ciss_cam_complete_fixup(struct ciss_soft /******************************************************************************** - * Find a peripheral attached at (target) - */ -static struct cam_periph * -ciss_find_periph(struct ciss_softc *sc, int bus, int target) -{ - struct cam_periph *periph; - struct cam_path *path; - int status; - - status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), - target, 0); - if (status == CAM_REQ_CMP) { - periph = cam_periph_find(path, NULL); - xpt_free_path(path); - } else { - periph = NULL; - } - return(periph); -} - -/******************************************************************************** * Name the device at (target) * * XXX is this strictly correct? @@ -3367,12 +3344,22 @@ static int ciss_name_device(struct ciss_softc *sc, int bus, int target) { struct cam_periph *periph; + struct cam_path *path; + int status; if (CISS_IS_PHYSICAL(bus)) return (0); - if ((periph = ciss_find_periph(sc, bus, target)) != NULL) { + + status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), + target, 0); + + if (status == CAM_REQ_CMP) { + mtx_lock(&sc->ciss_mtx); + periph = cam_periph_find(path, NULL); sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d", periph->periph_name, periph->unit_number); + mtx_unlock(&sc->ciss_mtx); + xpt_free_path(path); return(0); } sc->ciss_logical[bus][target].cl_name[0] = 0; Modified: releng/9.1/usr.sbin/kldxref/kldxref.c ============================================================================== --- releng/9.1/usr.sbin/kldxref/kldxref.c Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/usr.sbin/kldxref/kldxref.c Tue May 13 23:24:14 2014 (r265988) @@ -275,6 +275,16 @@ usage(void) exit(1); } +static int +compare(const FTSENT *const *a, const FTSENT *const *b) +{ + if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D) + return 1; + if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D) + return -1; + return strcmp((*a)->fts_name, (*b)->fts_name); +} + int main(int argc, char *argv[]) { @@ -316,7 +326,7 @@ main(int argc, char *argv[]) err(1, "%s", argv[0]); } - ftsp = fts_open(argv, fts_options, 0); + ftsp = fts_open(argv, fts_options, compare); if (ftsp == NULL) exit(1); Modified: releng/9.1/usr.sbin/pkg/pkg.c ============================================================================== --- releng/9.1/usr.sbin/pkg/pkg.c Tue May 13 23:22:28 2014 (r265987) +++ releng/9.1/usr.sbin/pkg/pkg.c Tue May 13 23:24:14 2014 (r265988) @@ -282,10 +282,7 @@ static int bootstrap_pkg(void) { FILE *remote; - FILE *config; - char *site; char url[MAXPATHLEN]; - char conf[MAXPATHLEN]; char abi[BUFSIZ]; char tmppkg[MAXPATHLEN]; char buf[10240]; @@ -300,7 +297,6 @@ bootstrap_pkg(void) last = 0; ret = -1; remote = NULL; - config = NULL; printf("Bootstrapping pkg please wait\n"); @@ -355,26 +351,6 @@ bootstrap_pkg(void) if ((ret = extract_pkg_static(fd, pkgstatic, MAXPATHLEN)) == 0) ret = install_pkg_static(pkgstatic, tmppkg); - snprintf(conf, MAXPATHLEN, "%s/etc/pkg.conf", - getenv("LOCALBASE") ? getenv("LOCALBASE") : _LOCALBASE); - - if (access(conf, R_OK) == -1) { - site = strrchr(url, '/'); - if (site == NULL) - goto cleanup; - site[0] = '\0'; - site = strrchr(url, '/'); - if (site == NULL) - goto cleanup; - site[0] = '\0'; - - config = fopen(conf, "w+"); - if (config == NULL) - goto cleanup; - fprintf(config, "packagesite: %s\n", url); - fclose(config); - } - goto cleanup; fetchfail: @@ -391,7 +367,11 @@ cleanup: static const char confirmation_message[] = "The package management tool is not yet installed on your system.\n" -"Do you want to fetch and install it now? [y/N]: "; +"The mechanism for doing this is not secure on FreeBSD 9.1. To securely install\n" +"pkg(8), use ports from a portsnap checkout:\n" +" # portsnap fetch extract\n" +" # make -C /usr/ports/ports-mgmt/pkg install clean\n" +"Do you still want to fetch and install it now? [y/N]: "; static int pkg_query_yes_no(void) Modified: releng/9.2/UPDATING ============================================================================== --- releng/9.2/UPDATING Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/UPDATING Tue May 13 23:24:14 2014 (r265988) @@ -11,6 +11,16 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20140513: p6 FreeBSD-EN-14:03.pkg + FreeBSD-EN-14:04.kldxref + FreeBSD-EN-14:05.ciss + + Add pkg bootstrapping, configuration and public keys. [EN-14:03] + + Improve build repeatability for kldxref(8). [EN-14:04] + + Fix data corruption with ciss(4). [EN-14:05] + 20140430: p5 FreeBSD-SA-14:08.tcp Fix TCP reassembly vulnerability. [SA-14:08] Modified: releng/9.2/etc/Makefile ============================================================================== --- releng/9.2/etc/Makefile Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/etc/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -224,6 +224,7 @@ distribution: ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install + ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap Modified: releng/9.2/etc/mtree/BSD.root.dist ============================================================================== --- releng/9.2/etc/mtree/BSD.root.dist Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/etc/mtree/BSD.root.dist Tue May 13 23:24:14 2014 (r265988) @@ -52,6 +52,8 @@ weekly .. .. + pkg + .. ppp .. rc.d Modified: releng/9.2/etc/mtree/BSD.usr.dist ============================================================================== --- releng/9.2/etc/mtree/BSD.usr.dist Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/etc/mtree/BSD.usr.dist Tue May 13 23:24:14 2014 (r265988) @@ -402,6 +402,14 @@ .. .. .. + keys + pkg + revoked + .. + trusted + .. + .. + .. locale UTF-8 .. Added: releng/9.2/etc/pkg/FreeBSD.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.2/etc/pkg/FreeBSD.conf Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,16 @@ +# $FreeBSD$ +# +# To disable this repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# +# mkdir -p /usr/local/etc/pkg/repos +# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# + +FreeBSD: { + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} Added: releng/9.2/etc/pkg/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.2/etc/pkg/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +NO_OBJ= + +FILES= FreeBSD.conf + +FILESDIR= /etc/pkg +FILESMODE= 644 + +.include Modified: releng/9.2/share/Makefile ============================================================================== --- releng/9.2/share/Makefile Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/share/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -11,6 +11,7 @@ SUBDIR= ${_colldef} \ dtrace \ ${_examples} \ ${_i18n} \ + keys \ ${_man} \ ${_me} \ misc \ Added: releng/9.2/share/keys/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.2/share/keys/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= pkg + +.include Added: releng/9.2/share/keys/pkg/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.2/share/keys/pkg/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= trusted + +.include Added: releng/9.2/share/keys/pkg/trusted/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.2/share/keys/pkg/trusted/Makefile Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +NO_OBJ= + +FILES= pkg.freebsd.org.2013102301 + +FILESDIR= /usr/share/keys/pkg/trusted +FILESMODE= 644 + +.include Added: releng/9.2/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/9.2/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 Tue May 13 23:24:14 2014 (r265988) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +function: "sha256" +fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438" Modified: releng/9.2/share/man/man7/hier.7 ============================================================================== --- releng/9.2/share/man/man7/hier.7 Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/share/man/man7/hier.7 Tue May 13 23:24:14 2014 (r265988) @@ -32,7 +32,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd January 21, 2010 +.Dd October 29, 2013 .Dt HIER 7 .Os .Sh NAME @@ -546,6 +546,16 @@ ASCII text files used by various games device description file for device name .It Pa info/ GNU Info hypertext system +.It Pa keys/ +known trusted and revoked keys. +.Bl -tag -width ".Pa keys/pkg/" -compact +.It Pa keys/pkg/ +fingerprints for +.Xr pkg 7 +and +.Xr pkg 8 +.El +.Pp .It Pa locale/ localization files; see Modified: releng/9.2/sys/conf/newvers.sh ============================================================================== --- releng/9.2/sys/conf/newvers.sh Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/sys/conf/newvers.sh Tue May 13 23:24:14 2014 (r265988) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.2" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.2/sys/dev/ciss/ciss.c ============================================================================== --- releng/9.2/sys/dev/ciss/ciss.c Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/sys/dev/ciss/ciss.c Tue May 13 23:24:14 2014 (r265988) @@ -180,8 +180,6 @@ static int ciss_cam_emulate(struct ciss_ static void ciss_cam_poll(struct cam_sim *sim); static void ciss_cam_complete(struct ciss_request *cr); static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio); -static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, - int bus, int target); static int ciss_name_device(struct ciss_softc *sc, int bus, int target); /* periodic status monitoring */ @@ -3389,27 +3387,6 @@ ciss_cam_complete_fixup(struct ciss_soft /******************************************************************************** - * Find a peripheral attached at (target) - */ -static struct cam_periph * -ciss_find_periph(struct ciss_softc *sc, int bus, int target) -{ - struct cam_periph *periph; - struct cam_path *path; - int status; - - status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), - target, 0); - if (status == CAM_REQ_CMP) { - periph = cam_periph_find(path, NULL); - xpt_free_path(path); - } else { - periph = NULL; - } - return(periph); -} - -/******************************************************************************** * Name the device at (target) * * XXX is this strictly correct? @@ -3418,12 +3395,22 @@ static int ciss_name_device(struct ciss_softc *sc, int bus, int target) { struct cam_periph *periph; + struct cam_path *path; + int status; if (CISS_IS_PHYSICAL(bus)) return (0); - if ((periph = ciss_find_periph(sc, bus, target)) != NULL) { + + status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), + target, 0); + + if (status == CAM_REQ_CMP) { + mtx_lock(&sc->ciss_mtx); + periph = cam_periph_find(path, NULL); sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d", periph->periph_name, periph->unit_number); + mtx_unlock(&sc->ciss_mtx); + xpt_free_path(path); return(0); } sc->ciss_logical[bus][target].cl_name[0] = 0; Modified: releng/9.2/usr.sbin/kldxref/kldxref.c ============================================================================== --- releng/9.2/usr.sbin/kldxref/kldxref.c Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/usr.sbin/kldxref/kldxref.c Tue May 13 23:24:14 2014 (r265988) @@ -274,6 +274,16 @@ usage(void) exit(1); } +static int +compare(const FTSENT *const *a, const FTSENT *const *b) +{ + if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D) + return 1; + if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D) + return -1; + return strcmp((*a)->fts_name, (*b)->fts_name); +} + int main(int argc, char *argv[]) { @@ -315,7 +325,7 @@ main(int argc, char *argv[]) err(1, "%s", argv[0]); } - ftsp = fts_open(argv, fts_options, 0); + ftsp = fts_open(argv, fts_options, compare); if (ftsp == NULL) exit(1); Modified: releng/9.2/usr.sbin/pkg/pkg.c ============================================================================== --- releng/9.2/usr.sbin/pkg/pkg.c Tue May 13 23:22:28 2014 (r265987) +++ releng/9.2/usr.sbin/pkg/pkg.c Tue May 13 23:24:14 2014 (r265988) @@ -284,13 +284,10 @@ bootstrap_pkg(void) { struct url *u; FILE *remote; - FILE *config; - char *site; struct dns_srvinfo *mirrors, *current; /* To store _https._tcp. + hostname + \0 */ char zone[MAXHOSTNAMELEN + 13]; char url[MAXPATHLEN]; - char conf[MAXPATHLEN]; char abi[BUFSIZ]; char tmppkg[MAXPATHLEN]; char buf[10240]; @@ -306,7 +303,6 @@ bootstrap_pkg(void) max_retry = 3; ret = -1; remote = NULL; - config = NULL; current = mirrors = NULL; printf("Bootstrapping pkg please wait\n"); @@ -387,26 +383,6 @@ bootstrap_pkg(void) if ((ret = extract_pkg_static(fd, pkgstatic, MAXPATHLEN)) == 0) ret = install_pkg_static(pkgstatic, tmppkg); - snprintf(conf, MAXPATHLEN, "%s/etc/pkg.conf", - getenv("LOCALBASE") ? getenv("LOCALBASE") : _LOCALBASE); - - if (access(conf, R_OK) == -1) { - site = strrchr(url, '/'); - if (site == NULL) - goto cleanup; - site[0] = '\0'; - site = strrchr(url, '/'); - if (site == NULL) - goto cleanup; - site[0] = '\0'; - - config = fopen(conf, "w+"); - if (config == NULL) - goto cleanup; - fprintf(config, "packagesite: %s\n", url); - fclose(config); - } - goto cleanup; fetchfail: @@ -423,7 +399,11 @@ cleanup: static const char confirmation_message[] = "The package management tool is not yet installed on your system.\n" -"Do you want to fetch and install it now? [y/N]: "; +"The mechanism for doing this is not secure on FreeBSD 9.2. To securely install\n" +"pkg(8), use ports from a portsnap checkout:\n" +" # portsnap fetch extract\n" +" # make -C /usr/ports/ports-mgmt/pkg install clean\n" +"Do you still want to fetch and install it now? [y/N]: "; static int pkg_query_yes_no(void)