From owner-svn-ports-all@freebsd.org Thu Jan 14 14:37:58 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D20204E4760; Thu, 14 Jan 2021 14:37:58 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGn3V1NfFz4Rpg; Thu, 14 Jan 2021 14:37:58 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13F813925; Thu, 14 Jan 2021 14:37:58 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10EEbvlQ041135; Thu, 14 Jan 2021 14:37:57 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10EEbvli041132; Thu, 14 Jan 2021 14:37:57 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202101141437.10EEbvli041132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 14 Jan 2021 14:37:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561563 - in head/sysutils/debootstrap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head/sysutils/debootstrap: . files X-SVN-Commit-Revision: 561563 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2021 14:37:58 -0000 Author: trasz Date: Thu Jan 14 14:37:57 2021 New Revision: 561563 URL: https://svnweb.freebsd.org/changeset/ports/561563 Log: sysutils/debootstrap: install mremap(2) apt(8) workaround Sponsored by: The FreeBSD Foundation Modified: head/sysutils/debootstrap/Makefile head/sysutils/debootstrap/files/patch-scripts-gutsy head/sysutils/debootstrap/files/patch-scripts_debian-common Modified: head/sysutils/debootstrap/Makefile ============================================================================== --- head/sysutils/debootstrap/Makefile Thu Jan 14 14:34:38 2021 (r561562) +++ head/sysutils/debootstrap/Makefile Thu Jan 14 14:37:57 2021 (r561563) @@ -3,7 +3,7 @@ PORTNAME= debootstrap PORTVERSION= 1.0.123 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: head/sysutils/debootstrap/files/patch-scripts-gutsy ============================================================================== --- head/sysutils/debootstrap/files/patch-scripts-gutsy Thu Jan 14 14:34:38 2021 (r561562) +++ head/sysutils/debootstrap/files/patch-scripts-gutsy Thu Jan 14 14:37:57 2021 (r561563) @@ -36,3 +36,16 @@ fi if [ -x "$TARGET/sbin/initctl.REAL" ]; then +@@ -267,6 +281,12 @@ echo \"Warning: Fake initctl called, doing nothing\"" + fi + mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" + rm -f "$TARGET/usr/sbin/policy-rc.d" ++ ++ echo \ ++"# Workaround for Linuxulator missing mremap(2) support; without it, ++# apt(8) fails like this: ++# E: Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. ++APT::Cache-Start 251658240;" >> "$TARGET/etc/apt/apt.conf.d/00freebsd" + + progress $bases $bases CONFBASE "Configuring base system" + info BASESUCCESS "Base system installed successfully." Modified: head/sysutils/debootstrap/files/patch-scripts_debian-common ============================================================================== --- head/sysutils/debootstrap/files/patch-scripts_debian-common Thu Jan 14 14:34:38 2021 (r561562) +++ head/sysutils/debootstrap/files/patch-scripts_debian-common Thu Jan 14 14:37:57 2021 (r561563) @@ -1,4 +1,4 @@ ---- scripts/debian-common.orig 2021-01-12 21:19:09 UTC +--- scripts/debian-common.orig 2020-03-13 02:04:21 UTC +++ scripts/debian-common @@ -200,10 +200,21 @@ echo \"Warning: Fake start-stop-daemon called, doing n predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps") @@ -22,3 +22,16 @@ done if [ -n "$base" ]; then +@@ -222,6 +233,12 @@ echo \"Warning: Fake start-stop-daemon called, doing n + + mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" + rm -f "$TARGET/usr/sbin/policy-rc.d" ++ ++ echo \ ++"# Workaround for Linuxulator missing mremap(2) support; without it, ++# apt(8) fails like this: ++# E: Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. ++APT::Cache-Start 251658240;" >> "$TARGET/etc/apt/apt.conf.d/00freebsd" + + progress $bases $bases CONFBASE "Configuring base system" + info BASESUCCESS "Base system installed successfully."