diff options
| author |   tb <tb@openbsd.org> | 2016-11-20 11:00:19 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2016-11-20 11:00:19 +0000 |
| commit | 0a2f831749ff58a9e02788273196a9417c14b666 (patch) | |
| tree | 5c41704dbba50ec0cc18e1bc17a7e3657dd29331 | |
| parent | add dedicated functions to set fd and callback on a struct io. (diff) | |
| download | wireguard-openbsd-0a2f831749ff58a9e02788273196a9417c14b666.tar.xz wireguard-openbsd-0a2f831749ff58a9e02788273196a9417c14b666.zip | |
Fix up some permissions in RELEASEDIR and /var/sysmerge.
help, testing & ok rpe
| -rw-r--r-- | distrib/sets/makeetcset | 3 | ||||
| -rw-r--r-- | distrib/sets/maketars | 4 | ||||
| -rw-r--r-- | etc/Makefile | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/distrib/sets/makeetcset b/distrib/sets/makeetcset index 76de05a82da..5be05352bf1 100644 --- a/distrib/sets/makeetcset +++ b/distrib/sets/makeetcset @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: makeetcset,v 1.3 2016/11/06 12:16:14 tb Exp $ +# $OpenBSD: makeetcset,v 1.4 2016/11/20 11:00:19 tb Exp $ # # Copyright (c) 2014 Robert Peichaer <rpe@openbsd.org> # @@ -16,6 +16,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. set -e +umask 022 CURDIR=$1 MAKE=$2 diff --git a/distrib/sets/maketars b/distrib/sets/maketars index b8ff0e1f92b..f35955cb02a 100644 --- a/distrib/sets/maketars +++ b/distrib/sets/maketars @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: maketars,v 1.24 2014/08/26 20:19:26 rpe Exp $ +# $OpenBSD: maketars,v 1.25 2016/11/20 11:00:19 tb Exp $ # # Copyright (c) 2001 Theo de Raadt # All rights reserved. @@ -24,7 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +umask 022 RELEASE=$1 if [ "X${RELEASE}" = "X" ]; then diff --git a/etc/Makefile b/etc/Makefile index 155e4ae2c58..63d4cfe9e04 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.445 2016/11/19 14:20:58 tb Exp $ +# $OpenBSD: Makefile,v 1.446 2016/11/20 11:00:19 tb Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -211,6 +211,7 @@ distribution-etc-root-var: distrib-dirs chown -h root:wheel ${DESTDIR}/var/tmp touch ${DESTDIR}/var/sysmerge/etcsum chown root:wheel ${DESTDIR}/var/sysmerge/etcsum + chmod 644 ${DESTDIR}/var/sysmerge/etcsum cd ${DESTDIR}/ && \ sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true @@ -218,6 +219,7 @@ distribution-etc-root-var: distrib-dirs sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz chown root:wheel ${DESTDIR}/var/sysmerge/etc.tgz + chmod 644 ${DESTDIR}/var/sysmerge/etc.tgz distribution: exec ${MAKE} distribution-etc-root-var @@ -257,6 +259,7 @@ do-release: ${MAKE} release-sets ${MAKE} distrib su ${BUILDUSER} -c 'exec ${MAKE} sha' + -cd ${RELEASEDIR} && chmod g-w,a+rX * release-sets: su ${BUILDUSER} -c 'exec ${MAKE} distribution' |