diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-07-24 16:21:37 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-07-24 16:21:37 +0000 |
| commit | 30dafc462599d1ff98edfcb64f6d6038ac23ad12 (patch) | |
| tree | 6ecfee26226032eb1c38504f625dd6b412113629 /ports-mgmt | |
| parent | 58f0dbcf1d3e0c9658c067390b323f836b345e44 (diff) | |
| download | ports-30dafc462599d1ff98edfcb64f6d6038ac23ad12.tar.gz ports-30dafc462599d1ff98edfcb64f6d6038ac23ad12.zip | |
- Update to 3.3.0-90-gd6f021339
- Add DISALLOW_NETWORKING, fixes #689
- qemu: Add /usr/bin/wc and /usr/bin/head to HLINK_FILES.
- image: Add zsnapshot imagetype.
- Fix pkg 1.11 issue with devfs mount.
- bulk -a: Don't print ports in summary unless -v is used.
- Show FLAVOR in more places.
- ports -l: Fix error when no ports trees exist yet.
- testport -c: Fix make.conf not being respected for `make config`.
- image: Add sleep, ls, and ping to miniroot.
Notes
Notes:
svn path=/head/; revision=507274
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/poudriere-devel/Makefile | 6 | ||||
| -rw-r--r-- | ports-mgmt/poudriere-devel/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 | 17 | ||||
| -rw-r--r-- | ports-mgmt/poudriere-devel/pkg-plist | 4 |
4 files changed, 8 insertions, 25 deletions
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 0082fc35efd5..e4db45750808 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= poudriere -DISTVERSION= 3.3.99.20190311 -PORTREVISION= 1 +DISTVERSION= 3.3.99.20190724 +PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -18,7 +18,7 @@ CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-62-g5abf90c67 +GH_TAGNAME= 3.3.0-90-gd6f021339 #DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME} GNU_CONFIGURE= yes diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index fdb4c0425dcc..793848e2f9fd 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552335136 -SHA256 (freebsd-poudriere-3.3.99.20190311-3.3.0-62-g5abf90c67_GH0.tar.gz) = c1b9f97bbaf6cf1f90510bc1d7fe91721ba7b929fae88c1b006cd20ea1fd1e97 -SIZE (freebsd-poudriere-3.3.99.20190311-3.3.0-62-g5abf90c67_GH0.tar.gz) = 4381180 +TIMESTAMP = 1563985147 +SHA256 (freebsd-poudriere-3.3.99.20190724-3.3.0-90-gd6f021339_GH0.tar.gz) = e6fc0c303e7020bba732c6ea16bd098ba2b9f92f5d49a82e6bc3c8556f24fa60 +SIZE (freebsd-poudriere-3.3.99.20190724-3.3.0-90-gd6f021339_GH0.tar.gz) = 4397614 diff --git a/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 b/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 deleted file mode 100644 index d9f06f13d0f6..000000000000 --- a/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 +++ /dev/null @@ -1,17 +0,0 @@ -diff --git src/share/poudriere/image.sh src/share/poudriere/image.sh -index 5a0f2e2b..e34dc063 100644 ---- src/share/poudriere/image.sh -+++ src/share/poudriere/image.sh -@@ -411,10 +411,12 @@ if [ -n "${PACKAGELIST}" ]; then - FreeBSD: { enabled: false } - local: { url: file:///tmp/packages } - EOF -+ mount -t devfs devfs ${WRKDIR}/world/dev - convert_package_list "${PACKAGELIST}" | \ - xargs chroot "${WRKDIR}/world" env \ - REPOS_DIR=/tmp ASSUME_ALWAYS_YES=yes \ - pkg install -+ umount ${WRKDIR}/world/dev - else - cat > "${WRKDIR}/world/tmp/repo.conf" <<-EOF - FreeBSD: { enabled: false } diff --git a/ports-mgmt/poudriere-devel/pkg-plist b/ports-mgmt/poudriere-devel/pkg-plist index 1a724e592533..62c9e7f43694 100644 --- a/ports-mgmt/poudriere-devel/pkg-plist +++ b/ports-mgmt/poudriere-devel/pkg-plist @@ -2,9 +2,9 @@ bin/poudriere @sample etc/poudriere.conf.sample %%ETCDIR%%/hooks/bulk.sh.sample %%ETCDIR%%/hooks/pkgbuild.sh.sample -@sample etc/poudriered.conf.sample +@sample(0,0,0) etc/poudriered.conf.sample etc/rc.d/poudriered -libexec/poudriere/cachec +@comment libexec/poudriere/cachec libexec/poudriere/cached libexec/poudriere/clock libexec/poudriere/cpdup |