From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 09 16:31:27 2020 Received: (at submit) by debbugs.gnu.org; 9 Feb 2020 21:31:27 +0000 Received: from localhost ([127.0.0.1]:53323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j0uAo-0007w9-Pp for submit@debbugs.gnu.org; Sun, 09 Feb 2020 16:31:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:53185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j0uAn-0007w2-KO for submit@debbugs.gnu.org; Sun, 09 Feb 2020 16:31:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44410) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0uAm-0005d1-1D for guix-patches@gnu.org; Sun, 09 Feb 2020 16:31:25 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: **** X-Spam-Status: No, score=4.1 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HK_RANDOM_ENVFROM,HK_RANDOM_FROM,HK_RANDOM_REPLYTO,RCVD_IN_DNSWL_LOW, SPOOFED_FREEMAIL,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0uAk-0007WR-CC for guix-patches@gnu.org; Sun, 09 Feb 2020 16:31:23 -0500 Received: from mail4.protonmail.ch ([185.70.40.27]:50648) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j0uAj-0007Uu-Rm for guix-patches@gnu.org; Sun, 09 Feb 2020 16:31:22 -0500 Date: Sun, 09 Feb 2020 21:31:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=default; t=1581283878; bh=sDxWTA1D+MO8abxwjy6DW9WdCeWavqobhGoakMNzyg0=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=nxh+fmSjImpe/gmmyKmJbBpOWL4LjHMhK7605j8hkXbKGa7Kk8A+CHaXQe/ctKAnI l39/FddXzjiD0zNhmNHQx2xElN9/MCNjKQ4WJV2b7C9426cYD7glXwvWyDpPvAwQUu uVHKWtshhffAjEr5hYjP42G/Tm0YD8qHv6dsL22Y= To: guix-patches@gnu.org From: shtwzrd Subject: [PATCH] services: xorg: Filter modules based on system Message-ID: Feedback-ID: zWLOmdNK465NSc9NhqEt4ZM6-V4iXach0rvA_JGRX4PV2HBydhahPKFng7EKRbGuoUf2smBaJzvGb4W4uiVQsg==:Ext:ProtonMail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.70.40.27 X-Spam-Score: 4.9 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Fixes . Reported by shtwzrd . * gnu/services/xorg.scm (xorg-configuration): Apply a filter over %default-xorg-modules packages, excluding those for which the %current-system is not among the package's supported-systems. Content analysis details: (4.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: protonmail.com] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [209.51.188.17 listed in list.dnswl.org] 1.0 HK_RANDOM_FROM From username looks random 0.6 HK_RANDOM_ENVFROM Envelope sender username looks random 1.0 HK_RANDOM_REPLYTO Reply-To username looks random 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (shtwzrd[at]protonmail.com) 2.0 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit Cc: shtwzrd X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: shtwzrd Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Fixes . Reported by shtwzrd . * gnu/services/xorg.scm (xorg-configuration): Apply a filter over %default-xorg-modules packages, excluding those for which the %current-system is not among the package's supported-systems. Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: protonmail.com] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [209.51.188.17 listed in list.dnswl.org] 1.0 HK_RANDOM_FROM From username looks random 0.6 HK_RANDOM_ENVFROM Envelope sender username looks random 1.0 HK_RANDOM_REPLYTO Reply-To username looks random 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (shtwzrd[at]protonmail.com) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Fixes . Reported by shtwzrd . * gnu/services/xorg.scm (xorg-configuration): Apply a filter over %default-xorg-modules packages, excluding those for which the %current-system is not among the package's supported-systems. This patch makes it possible to use xorg-configuration on systems other than x86_64 and i686, as without it, xf86-video-intel would be pulled in on the unsupported architecture and fail. --- gnu/services/xorg.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 9c84f7413f..edb421ada6 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -152,7 +152,12 @@ xorg-configuration make-xorg-configuration xorg-configuration? (modules xorg-configuration-modules ;list of packages - (default %default-xorg-modules)) + ; filter out modules not supported on current system + (default (filter + (lambda (p) + (member (%current-system) + (package-supported-systems p))) + %default-xorg-modules))) (fonts xorg-configuration-fonts ;list of packges (default %default-xorg-fonts)) (drivers xorg-configuration-drivers ;list of strings @@ -356,7 +361,7 @@ in @var{config}, are available. The result should be u= sed in place of #~(apply execl #$X #$X ;; Second #$X is for argv[0]. "-logverbose" "-verbose" "-terminate" #$@(xorg-configuration-server-arguments config) - (cdr (command-line)))) + (cdr (command-line)))) =20 (program-file "startx" exp)) =20 @@ -477,7 +482,7 @@ desktop session from the system or user profile will be= used." (auto-login? slim-configuration-auto-login? (default #f)) (default-user slim-configuration-default-user - (default "")) + (default "")) (theme slim-configuration-theme (default %default-slim-theme)) (theme-name slim-configuration-theme-name @@ -870,10 +875,10 @@ the GNOME desktop environment.") "Enable=3D" (if (gdm-configuration-debug? config) "true" "false") "\n" - "\n" - "[security]\n" - "#DisallowTCP=3Dtrue\n" - "#AllowRemoteAutoLogin=3Dfalse\n")) + "\n" + "[security]\n" + "#DisallowTCP=3Dtrue\n" + "#AllowRemoteAutoLogin=3Dfalse\n")) =20 (define (gdm-pam-service config) "Return a PAM service for @command{gdm}." --=20 2.11.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 15 18:04:13 2020 Received: (at 39535-done) by debbugs.gnu.org; 15 Feb 2020 23:04:13 +0000 Received: from localhost ([127.0.0.1]:36559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j36Tt-0003TT-7I for submit@debbugs.gnu.org; Sat, 15 Feb 2020 18:04:13 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:51468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j36To-0003T4-Vx for 39535-done@debbugs.gnu.org; Sat, 15 Feb 2020 18:04:10 -0500 Received: (qmail 20754 invoked by uid 1009); 16 Feb 2020 00:04:07 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25723. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.026404 secs); 15 Feb 2020 23:04:07 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 16 Feb 2020 00:04:06 +0100 Date: Sun, 16 Feb 2020 00:04:42 +0100 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: shtwzrd Subject: Re: [PATCH] services: xorg: Filter modules based on system Message-ID: <20200215230442.wdvepfnc5yd3zpvd@gravity> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="sjrdcudju7772we2" Content-Disposition: inline In-Reply-To: X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39535-done Cc: 39402-done@debbugs.gnu.org, 39535-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --sjrdcudju7772we2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 09, 2020 at 09:31:09PM +0000, shtwzrd wrote: > @@ -356,7 +361,7 @@ in @var{config}, are available. The result should be= used in place of > #~(apply execl #$X #$X ;; Second #$X is for argv[0]. > "-logverbose" "-verbose" "-terminate" > #$@(xorg-configuration-server-arguments config) > - (cdr (command-line)))) > + (cdr (command-line)))) > =20 > (program-file "startx" exp)) > =20 > @@ -477,7 +482,7 @@ desktop session from the system or user profile will = be used." > (auto-login? slim-configuration-auto-login? > (default #f)) > (default-user slim-configuration-default-user > - (default "")) > + (default "")) > (theme slim-configuration-theme > (default %default-slim-theme)) > (theme-name slim-configuration-theme-name > @@ -870,10 +875,10 @@ the GNOME desktop environment.") > "Enable=3D" (if (gdm-configuration-debug? config) > "true" > "false") "\n" > - "\n" > - "[security]\n" > - "#DisallowTCP=3Dtrue\n" > - "#AllowRemoteAutoLogin=3Dfalse\n")) > + "\n" > + "[security]\n" > + "#DisallowTCP=3Dtrue\n" > + "#AllowRemoteAutoLogin=3Dfalse\n")) > =20 > (define (gdm-pam-service config) > "Return a PAM service for @command{gdm}." Looks like you reformatted the file by accident. Apart from that, LGTM, so pushed as 779d96c9b0ee38cbaca9f8577e6cc7f907fb29cb after removing the formatting mishap. Thanks for the patch! --sjrdcudju7772we2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl5IeQoACgkQ4xWnWEYT FWSNhxAAoVNtMbLah3OPTnB2HY3q8KgOwN2BjgE8vDa8LYKaKQP4hvWyEVRc+S8f HEs7w5bIcn+qJUaq5XGAUAW0eGg48PF6wZtHvmGRED3RokWivh0KYRI/C0Rq+fCK bCeIC2JnyhuyQOQElHFFqb4IBlcPonSLHtnfidpQOnnOv2ndzqX0lQ6r7HjvgiJI fkedYBJul8A2fUX4BV5S5hl7eRsV+KajPU+nmM9woqxSv0Uyux7QY5v42VLiuL5P IBHE4H872GkyER1LjzG+pNal4e7zJcdzbTukq0xbaAuKsRDjc7nDDJHKVDdJfHNI WBuP8xROI3taO+60CzF9iL0lf2/VjbopcXlOmMt74zxMD/8ZAnpj7WcSMLh6zRZx Ee87rnsDCZwryx65pnz9++jxvfhZzzc7wIKqFchEsBGE7U9y1amUYkCX6DkW+pvC 0lAAaMS51Fpn1MdfNWTqrSA45He7oZMyM8wotVl0EQuaK2MxGebZ+ag4FzEuRrT1 7yyV1B47vvCAbTBdz7ptjtmRawZDuHKrq8eIWBoesKLBniqbcTwb7cD/lAQjwHSG jZpiEQlVdu7l7hCnNdujT+GvxZoE9Ea3HERZASj+TkNk2SN1sGPH5gzSU4IVxk1u TGsze4jHoeADkGjF49WdCQsmSskkvchOUli1LVc05pW3ivCfg6o= =Lt+c -----END PGP SIGNATURE----- --sjrdcudju7772we2-- From unknown Sat Sep 20 13:35:45 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 15 Mar 2020 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator