Index: head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--image.sh =================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--image.sh (revision 463609) +++ head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--image.sh (nonexistent) @@ -1,11 +0,0 @@ ---- src/share/poudriere/image.sh.orig 2018-02-06 16:22:49.894625000 +0000 -+++ src/share/poudriere/image.sh 2018-02-06 16:25:14.320814000 +0000 -@@ -314,7 +314,7 @@ - if [ -n "${HOSTNAME}" ]; then - mkdir -p ${WRKDIR}/world/etc/rc.conf.d - echo "hostname=${HOSTNAME}" > ${WRKDIR}/world/etc/rc.conf.d/hostname --else -+fi - - [ ! -d "${EXTRADIR}" ] || cp -fRLp ${EXTRADIR}/ ${WRKDIR}/world/ - mv ${WRKDIR}/world/etc/login.conf.orig ${WRKDIR}/world/etc/login.conf Property changes on: head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--image.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh =================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh (revision 463609) +++ head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh (nonexistent) @@ -1,37 +0,0 @@ -commit 8f9fdcc9691dcb6ab3619bbced22beb108bfcbb1 -Author: Bryan Drewery -Date: Sat Feb 3 16:39:51 2018 -0800 - - HTML: Hide harmless shared lock failures - -commit 129a3b0bfde6bf77982ebece039aaa745ead8b2a -Author: Bryan Drewery -Date: Sat Feb 3 17:58:53 2018 -0800 - - HTML: Only wait for shared locks for 2 seconds each - ---- src/share/poudriere/include/html.sh.orig 2018-02-22 05:50:35 UTC -+++ src/share/poudriere/include/html.sh -@@ -78,11 +78,11 @@ html_json_main() { - build_all_json() { - critical_start - build_json -- if slock_acquire "json_jail_${MASTERNAME}"; then -+ if slock_acquire "json_jail_${MASTERNAME}" 2 2>/dev/null; then - build_jail_json - slock_release "json_jail_${MASTERNAME}" - fi -- if slock_acquire "json_top"; then -+ if slock_acquire "json_top" 2 2>/dev/null; then - build_top_json - slock_release "json_top" - fi -@@ -173,7 +173,7 @@ install_html_files() { - local base="$2" - local dest="$3" - -- slock_acquire html_base || return 0 -+ slock_acquire html_base 2>/dev/null 2 || return 0 - - # Update the base copy - mkdir -p "${base}" Property changes on: head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/poudriere-devel/Makefile =================================================================== --- head/ports-mgmt/poudriere-devel/Makefile (revision 463609) +++ head/ports-mgmt/poudriere-devel/Makefile (revision 463610) @@ -1,68 +1,68 @@ # $FreeBSD$ PORTNAME= poudriere -DISTVERSION= 3.2.99.20180202 -PORTREVISION= 4 +DISTVERSION= 3.2.99.20180304 +PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH PKGNAMESUFFIX= -devel MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system LICENSE= BSD2CLAUSE CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.2.4-149-g9c388299 +GH_TAGNAME= 3.2.4-282-g49422b58a #DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME} GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= CERTS DIALOG4PORTS EXAMPLES QEMU ZSH OPTIONS_DEFAULT=CERTS DIALOG4PORTS ZSH OPTIONS_SUB= yes CERTS_DESC= Install checksum and SSL certificates for jail creation CERTS_RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss CERTS_RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests DIALOG4PORTS_DESC= Install dialog4ports for options command DIALOG4PORTS_RUN_DEPENDS= dialog4ports>0:ports-mgmt/dialog4ports QEMU_DESC= Add qemu-user-static for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static .include # rm -x support came in 10.0. A bundled rm is used if not supported in base. # While <10 is technically not supported in the Ports Tree, Poudriere # detects this and it being a package build tool it should still be # supported as a user may be installing this to build packages for upgrading # their system to a supported release. .if ${OSVERSION} < 1000000 PLIST_SUB+= RM="" .else PLIST_SUB+= RM="@comment " .endif post-patch: ${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere ${REINPLACE_CMD} \ -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ ${WRKSRC}/poudriere ${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.* post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ ${STAGEDIR}${DATADIR}/MANIFESTS .include Index: head/ports-mgmt/poudriere-devel/distinfo =================================================================== --- head/ports-mgmt/poudriere-devel/distinfo (revision 463609) +++ head/ports-mgmt/poudriere-devel/distinfo (revision 463610) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517595754 -SHA256 (freebsd-poudriere-3.2.99.20180202-3.2.4-149-g9c388299_GH0.tar.gz) = 1b3d4ece2b5b9cb7422c0dfeb685c907fcb7e3288e7e703d29d552f06fa31767 -SIZE (freebsd-poudriere-3.2.99.20180202-3.2.4-149-g9c388299_GH0.tar.gz) = 4356256 +TIMESTAMP = 1520198602 +SHA256 (freebsd-poudriere-3.2.99.20180304-3.2.4-282-g49422b58a_GH0.tar.gz) = 2f1c2f0e1c79b61a1d3d77a2b62e41efadae009f76dd4e8a71868a4171753aa1 +SIZE (freebsd-poudriere-3.2.99.20180304-3.2.4-282-g49422b58a_GH0.tar.gz) = 4370398 Index: head/ports-mgmt/poudriere-devel/pkg-plist =================================================================== --- head/ports-mgmt/poudriere-devel/pkg-plist (revision 463609) +++ head/ports-mgmt/poudriere-devel/pkg-plist (revision 463610) @@ -1,98 +1,99 @@ bin/poudriere @sample etc/poudriere.conf.sample %%ETCDIR%%/hooks/bulk.sh.sample %%ETCDIR%%/hooks/pkgbuild.sh.sample @sample etc/poudriered.conf.sample etc/rc.d/poudriered libexec/poudriere/cachec libexec/poudriere/cached libexec/poudriere/clock libexec/poudriere/cpdup libexec/poudriere/dirempty libexec/poudriere/dirwatch libexec/poudriere/jexecd libexec/poudriere/locked_mkdir libexec/poudriere/nc libexec/poudriere/poudriered libexec/poudriere/ptsort libexec/poudriere/pwait libexec/poudriere/rename libexec/poudriere/rexec %%RM%%libexec/poudriere/rm libexec/poudriere/sh libexec/poudriere/timeout libexec/poudriere/timestamp libexec/poudriere/tsort man/man8/poudriere.8.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample %%DATADIR%%/MANIFESTS %%DATADIR%%/awk/dependency_loop.awk %%DATADIR%%/awk/humanize.awk %%DATADIR%%/awk/json.awk %%DATADIR%%/awk/json_jail.awk %%DATADIR%%/awk/json_top.awk %%DATADIR%%/awk/parse_MOVED.awk %%DATADIR%%/awk/processonelog2.awk %%DATADIR%%/awk/siginfo_buildtime.awk %%DATADIR%%/api.sh %%DATADIR%%/bulk.sh %%DATADIR%%/common.sh %%DATADIR%%/daemon.sh %%DATADIR%%/distclean.sh +%%DATADIR%%/foreachport.sh %%DATADIR%%/html/assets/DataTables-1.10.0/css/jquery.dataTables.min.css %%DATADIR%%/html/assets/DataTables-1.10.0/css/jquery.dataTables_themeroller.min.css %%DATADIR%%/html/assets/DataTables-1.10.0/images/back_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/back_enabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/back_enabled_hover.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_enabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_enabled_hover.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_asc.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_asc_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_both.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_desc.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_desc_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/js/jquery.dataTables.min.js %%DATADIR%%/html/assets/bootstrap-3.1.1/css/bootstrap-theme.min.css %%DATADIR%%/html/assets/bootstrap-3.1.1/css/bootstrap.min.css %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.eot %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.svg %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.ttf %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.woff %%DATADIR%%/html/assets/bootstrap-3.1.1/js/bootstrap.min.js %%DATADIR%%/html/assets/favicon.ico %%DATADIR%%/html/assets/jquery-1.11.1.js %%DATADIR%%/html/assets/jquery-1.11.1.min.js %%DATADIR%%/html/assets/jquery-1.11.1.min.map %%DATADIR%%/html/assets/jquery.dataTables.rowGrouping-1.2.9.js %%DATADIR%%/html/assets/logo.svg %%DATADIR%%/html/assets/poudriere.css %%DATADIR%%/html/assets/poudriere.js %%DATADIR%%/html/build.html %%DATADIR%%/html/index.html %%DATADIR%%/html/jail.html %%DATADIR%%/html/robots.txt %%DATADIR%%/image.sh %%DATADIR%%/include/cache.sh %%DATADIR%%/include/colors.pre.sh %%DATADIR%%/include/colors.sh %%DATADIR%%/include/common.sh.dragonfly %%DATADIR%%/include/common.sh.freebsd %%DATADIR%%/include/display.sh %%DATADIR%%/include/fs.sh %%DATADIR%%/include/hash.sh %%DATADIR%%/include/html.sh %%DATADIR%%/include/parallel.sh %%DATADIR%%/include/shared_hash.sh %%DATADIR%%/include/util.sh %%DATADIR%%/jail.sh %%DATADIR%%/logclean.sh %%DATADIR%%/options.sh %%DATADIR%%/pkgclean.sh %%DATADIR%%/ports.sh %%DATADIR%%/processonelog.sh %%DATADIR%%/queue.sh %%DATADIR%%/status.sh %%DATADIR%%/testport.sh %%ZSH%%share/zsh/site-functions/_poudriere