From nobody Thu Apr 13 08:16:31 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxsqM6lXcz44VPv; Thu, 13 Apr 2023 08:16:31 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxsqM1w7Dz4Jkp; Thu, 13 Apr 2023 08:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681373791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZKEgocy7VIuFMf69K2vDtUatImRQtUQdJUDVAjilCMA=; b=ebpDmlM17K5+yJOARVD8silSvSUfq2KR6CweykQs0HnM4ieSYjwGiZJkQ+46PGW+JpxR3y /zr990HOrKPl10GNd275oa8c+e7IygCTXBPxs+tM2eWnC0ZT2ZhIzjkcZQP+qk7p9T5PsU B4eKX9xpMwEp8vABQVyIn5n6lxByeLVTsois/NYkxirbO9qYmH8jixrXVnBhvar6Z28V2S KgPOo1qY5V8xQr5/uJFRzzVZXDJtFFYnTiRunYGcT2W+2MxaxNBjk+c2Uc6X4a5k54zRTv xw4i613kYnQwUCL8iO9JlVfG0bNGLsb7C68u46OPsfTjxOtpiUz3YB/NgNk+Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681373791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZKEgocy7VIuFMf69K2vDtUatImRQtUQdJUDVAjilCMA=; b=iRkZ6IkAlvyvgHfdzp9BQePNlEqSr88AczzQvrJ3VFmiBk+osyM2OmExmdAmG2200WbqwE xUo5FNzS06tFEaDM7OWQSdkSz8SG0N+EQw/oP3xEbQsxO0rgzAeQ9SNEkcUuXtPHuFy26g g+TPuoYTKp619YnQh1D1/ccXTkRYAXvq2ZhFrbRIdRe1LgRvCcjpRzL2f5eevMOJAkq4uU gc/YGdgxaaL0lOL/8wVM8kdmSNUfz6Tl2NSUR2BvhOmGB3yflGFMn0BrTCS7K8YwT2rH5U D6EQuQP9l3+ZB7inJOJyb1Ub0QrcIy3aLufOOJn1oOJWIPdFXtAx08AIAryhPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681373791; a=rsa-sha256; cv=none; b=KDBcV+lFb2ozYERQy0pG/OuG32NTIjkEaQLmXHMtatyB5IhDeNkpPsjVhzU8vk0bTMYyfA 1HJBpI2DCujulP6vyJb72TPeFwrLiT3W1navwwUGNl4JszNBugxJ1L8Tf9ojAYF+1xkGLN btrRakxA7jyjUi6H/SpjJwER0g+mqqd5pwLKgSmJePYUaApf8s8nMOHbDrfZxov3LucGTQ qC4aDRb6EQf6nBbxdrXuv/F/d2E5linFlGKl0qmNwnSdUoOxW8I1N/n2ZmRoRGKNXRBtRf 5kzypKUzdrRKdALn/nIu0DiVIajpUKSwVmbXvVANoK0Y8VQA78AuFBU7kgJX+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxsqM0j3wzZfg; Thu, 13 Apr 2023 08:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33D8GVTK047888; Thu, 13 Apr 2023 08:16:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33D8GVEr047887; Thu, 13 Apr 2023 08:16:31 GMT (envelope-from git) Date: Thu, 13 Apr 2023 08:16:31 GMT Message-Id: <202304130816.33D8GVEr047887@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Chris Rees Subject: git: 4353081bac0c - main - audio/oss: Save mixer before unloading module List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: crees X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4353081bac0cb82f0590bf81800ac507f0cb75dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=4353081bac0cb82f0590bf81800ac507f0cb75dd commit 4353081bac0cb82f0590bf81800ac507f0cb75dd Author: Marten AuthorDate: 2023-04-13 08:10:55 +0000 Commit: Chris Rees CommitDate: 2023-04-13 08:16:00 +0000 audio/oss: Save mixer before unloading module After installing the oss package, a kernel panic occurs every time the computer is shut down. This is because the mixer RC script tries to save the mixer values after the OSS module is unloaded. We can avoid this by making OSS unload after this is done. [crees] While here, pet rclint. PR: ports/270709 --- audio/oss/Makefile | 2 +- audio/oss/files/oss.in | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/audio/oss/Makefile b/audio/oss/Makefile index da65d3e6b7da..5491461da85f 100644 --- a/audio/oss/Makefile +++ b/audio/oss/Makefile @@ -1,6 +1,6 @@ PORTNAME= oss DISTVERSION= 4.2-build2019 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/ DISTNAME= ${PORTNAME}-v${DISTVERSION}-src-bsd diff --git a/audio/oss/files/oss.in b/audio/oss/files/oss.in index 1ed49145aba2..413121acee0f 100644 --- a/audio/oss/files/oss.in +++ b/audio/oss/files/oss.in @@ -2,19 +2,21 @@ # PROVIDE: oss # REQUIRE: DAEMON +# BEFORE: mixer # KEYWORD: nojail shutdown . /etc/rc.subr -name="oss" +name=oss rcvar=oss_enable - -stop_cmd="oss_stop" -start_cmd="oss_start" +desc="Load Open Sound System kernel modules" load_rc_config $name -: ${oss_enable=NO} +: ${oss_enable:=NO} + +stop_cmd=oss_stop +start_cmd=oss_start oss_start() {