Index: head/ports-mgmt/poudriere/files/patch-mkdir-vp =================================================================== --- head/ports-mgmt/poudriere/files/patch-mkdir-vp (revision 436106) +++ head/ports-mgmt/poudriere/files/patch-mkdir-vp (nonexistent) @@ -1,19 +0,0 @@ -commit e7a21685d30fc183b46cd7c5e0f134ce3a6126fc -Author: Bryan Drewery -Date: Fri Jun 24 08:52:08 2016 -0700 - - Don't use -v for mkdir - -diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh -index 00eecca..75c02b7 100755 ---- src/share/poudriere/common.sh -+++ src/share/poudriere/common.sh -@@ -1179,7 +1179,7 @@ do_jail_mounts() { - - fi - echo ${nullpaths} | tr ' ' '\n' | sed -e "s,^/,${mnt}/," | \ -- xargs mkdir -vp -+ xargs mkdir -p - for nullpath in ${nullpaths}; do - [ -d "${from}${nullpath}" -a "${from}" != "${mnt}" ] && \ - ${NULLMOUNT} -o ro "${from}${nullpath}" "${mnt}${nullpath}" Property changes on: head/ports-mgmt/poudriere/files/patch-mkdir-vp ___________________________________________________________________ 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/files/patch-src_share_poudriere_common.sh =================================================================== --- head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh (revision 436106) +++ head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh (nonexistent) @@ -1,11 +0,0 @@ ---- src/share/poudriere/common.sh.orig 2015-11-30 17:25:11 UTC -+++ src/share/poudriere/common.sh -@@ -1847,7 +1847,7 @@ jail_stop() { - fi - msg "Umounting file systems" - destroyfs ${MASTERMNT} jail || : -- rm -rfx ${MASTERMNT}/../ -+ rm -rf ${MASTERMNT}/../ - export STATUS=0 - - # Don't override if there is a failure to grab the last status. Property changes on: head/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.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/files/patch-arm64-binutils =================================================================== --- head/ports-mgmt/poudriere/files/patch-arm64-binutils (revision 436106) +++ head/ports-mgmt/poudriere/files/patch-arm64-binutils (nonexistent) @@ -1,29 +0,0 @@ -commit f61894880dc863258d8ef76fb1bde993b6b9ca08 -Author: Bryan Drewery -Date: Fri Aug 26 14:23:39 2016 -0700 - - For arm64 copy the latest aarch64-binutils ld into the jail at startup. - - This will work like the qemu installation done at startup, and not require - messing with the jail creation/update or snapshots. - -diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh -index 7c1a4d7..4244b0f 100755 ---- src/share/poudriere/common.sh -+++ src/share/poudriere/common.sh -@@ -1777,6 +1777,15 @@ jail_start() { - mkdir -p "${tomnt}${EMULATOR%/*}" - cp -f "${EMULATOR}" "${tomnt}${EMULATOR}" - fi -+ # Handle special ARM64 needs -+ if [ "${arch#*.}" = "aarch64" ] && ! [ -f "${tomnt}/usr/bin/ld" ]; then -+ if [ -f /usr/local/aarch64-freebsd/bin/ld ]; then -+ cp -f /usr/local/aarch64-freebsd/bin/ld \ -+ "${tomnt}/usr/bin/ld" -+ else -+ err 1 "Arm64 requires aarch64-binutils to be installed." -+ fi -+ fi - - if [ -d "${CCACHE_DIR:-/nonexistent}" ]; then - cat >> "${tomnt}/etc/make.conf" <<-EOF Property changes on: head/ports-mgmt/poudriere/files/patch-arm64-binutils ___________________________________________________________________ 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/files/patch-src_share_poudriere_include_fs.sh =================================================================== --- head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh (revision 436106) +++ head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh (nonexistent) @@ -1,15 +0,0 @@ ---- src/share/poudriere/include/fs.sh.orig 2016-05-18 22:58:28 UTC -+++ src/share/poudriere/include/fs.sh -@@ -191,10 +191,10 @@ destroyfs() { - zfs destroy -rf ${fs} - rmdir ${mnt} - else -- rm -rfx ${mnt} 2>/dev/null || : -+ rm -rf ${mnt} 2>/dev/null || : - if [ -d "${mnt}" ]; then - chflags -R 0 ${mnt} -- rm -rfx ${mnt} -+ rm -rf ${mnt} - fi - fi - } Property changes on: head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.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/Makefile =================================================================== --- head/ports-mgmt/poudriere/Makefile (revision 436106) +++ head/ports-mgmt/poudriere/Makefile (revision 436107) @@ -1,40 +1,58 @@ # $FreeBSD$ PORTNAME= poudriere -DISTVERSION= 3.1.14 -PORTREVISION= 3 +DISTVERSION= 3.1.15 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH + MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system LICENSE= BSD2CLAUSE CONFLICTS_INSTALL= poudriere-devel-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= ZSH QEMU EXAMPLES OPTIONS_DEFAULT=ZSH OPTIONS_SUB= yes RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests QEMU_DESC= Add qemu-user-static to compile ports 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 + +pre-install: + ${REINPLACE_CMD} \ + -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ + ${WRKSRC}/src/bin/poudriere 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/distinfo =================================================================== --- head/ports-mgmt/poudriere/distinfo (revision 436106) +++ head/ports-mgmt/poudriere/distinfo (revision 436107) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466783271 -SHA256 (freebsd-poudriere-3.1.14_GH0.tar.gz) = 2442511b1898f514bd22087bf05e9693fa78c2c1e9f214581da8ab6d437882e9 -SIZE (freebsd-poudriere-3.1.14_GH0.tar.gz) = 2834745 +TIMESTAMP = 1489432342 +SHA256 (freebsd-poudriere-3.1.15_GH0.tar.gz) = 4cdd11324418a51c8c55604590f12c8772eb575b0ccd41d90ccdd2fa7e3172ad +SIZE (freebsd-poudriere-3.1.15_GH0.tar.gz) = 2858968 Index: head/ports-mgmt/poudriere/pkg-plist =================================================================== --- head/ports-mgmt/poudriere/pkg-plist (revision 436106) +++ head/ports-mgmt/poudriere/pkg-plist (revision 436107) @@ -1,88 +1,90 @@ 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/clock_monotonic +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/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%%/api.sh %%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/processonelog2.awk %%DATADIR%%/awk/siginfo_buildtime.awk %%DATADIR%%/bulk.sh %%DATADIR%%/clean.sh %%DATADIR%%/common.sh %%DATADIR%%/daemon.sh %%DATADIR%%/distclean.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%%/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%%/jail.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