aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports-mgmt/poudriere-devel/Makefile6
-rw-r--r--ports-mgmt/poudriere-devel/distinfo6
-rw-r--r--ports-mgmt/poudriere-devel/files/patch-arm64-binutils29
-rw-r--r--ports-mgmt/poudriere-devel/files/patch-mkdir-vp19
-rw-r--r--ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c12
-rw-r--r--ports-mgmt/poudriere-devel/pkg-plist4
6 files changed, 21 insertions, 55 deletions
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index 0c2031ebe274..f19f2ba1b417 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= poudriere
-DISTVERSION= 3.1.99.20160624
-PORTREVISION= 3
+DISTVERSION= 3.1.99.20170221
+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.0-1677-g146fc3f
+GH_TAGNAME= 3.0-1822-ge8f0d3e
#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 35c457ed57d4..00ae0073366a 100644
--- a/ports-mgmt/poudriere-devel/distinfo
+++ b/ports-mgmt/poudriere-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466783382
-SHA256 (freebsd-poudriere-3.1.99.20160624-3.0-1677-g146fc3f_GH0.tar.gz) = 7f8071d836dd8770d098514059604eca898d06ce99f71bff082d168aa6fa6906
-SIZE (freebsd-poudriere-3.1.99.20160624-3.0-1677-g146fc3f_GH0.tar.gz) = 2939889
+TIMESTAMP = 1487697127
+SHA256 (freebsd-poudriere-3.1.99.20170221-3.0-1822-ge8f0d3e_GH0.tar.gz) = 6f2702bd7f4f753c40a43df6599a46657766d39deda83a2e2df746d1525fb68a
+SIZE (freebsd-poudriere-3.1.99.20170221-3.0-1822-ge8f0d3e_GH0.tar.gz) = 2952866
diff --git a/ports-mgmt/poudriere-devel/files/patch-arm64-binutils b/ports-mgmt/poudriere-devel/files/patch-arm64-binutils
deleted file mode 100644
index c6aefa27c523..000000000000
--- a/ports-mgmt/poudriere-devel/files/patch-arm64-binutils
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 58b0c214d76525e53745133cd3de56eda5379934
-Author: Bryan Drewery <bryan@shatow.net>
-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 4261243..8e0c8cf 100755
---- src/share/poudriere/common.sh
-+++ src/share/poudriere/common.sh
-@@ -1795,6 +1795,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
diff --git a/ports-mgmt/poudriere-devel/files/patch-mkdir-vp b/ports-mgmt/poudriere-devel/files/patch-mkdir-vp
deleted file mode 100644
index 986595e127fa..000000000000
--- a/ports-mgmt/poudriere-devel/files/patch-mkdir-vp
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e7a21685d30fc183b46cd7c5e0f134ce3a6126fc
-Author: Bryan Drewery <bryan@shatow.net>
-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}"
diff --git a/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c b/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c
new file mode 100644
index 000000000000..ab14e5f02c78
--- /dev/null
+++ b/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c
@@ -0,0 +1,12 @@
+diff --git src/libexec/poudriere/cached/cached.c src/libexec/poudriere/cached/cached.c
+index 68ba6e6..ce266cd 100644
+--- src/libexec/poudriere/cached/cached.c
++++ src/libexec/poudriere/cached/cached.c
+@@ -26,6 +26,7 @@
+
+ #include <sys/types.h>
+
++#include <inttypes.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/ports-mgmt/poudriere-devel/pkg-plist b/ports-mgmt/poudriere-devel/pkg-plist
index 16b9356375e5..b88fcc6ddab7 100644
--- a/ports-mgmt/poudriere-devel/pkg-plist
+++ b/ports-mgmt/poudriere-devel/pkg-plist
@@ -4,8 +4,9 @@ bin/poudriere
%%ETCDIR%%/hooks/pkgbuild.sh.sample
@sample etc/poudriered.conf.sample
etc/rc.d/poudriered
+libexec/poudriere/cachec
libexec/poudriere/cached
-libexec/poudriere/clock_monotonic
+libexec/poudriere/clock
libexec/poudriere/cpdup
libexec/poudriere/dirempty
libexec/poudriere/dirwatch
@@ -13,6 +14,7 @@ libexec/poudriere/jexecd
libexec/poudriere/locked_mkdir
libexec/poudriere/nc
libexec/poudriere/poudriered
+libexec/poudriere/ptsort
libexec/poudriere/rename
libexec/poudriere/rexec
libexec/poudriere/sh