[bug#30734] [PATCH core-updates 0/3] nologin and ifconfig profile conflicts

[bug#30734] [PATCH core-updates 0/3] nologin and ifconfig profile conflicts

[Marius Bakke]

These patches aim to fix conflicts in the default profile.  The second
patch is unrelated and not necessarily even accurate.

Feedback wanted!

Marius Bakke (3):
  gnu: util-linux: Don't build 'nologin'.
  gnu: util-linux: Move '.la' files to static output.
  gnu: net-tools: Don't install 'ifconfig'.

 gnu/packages/linux.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

-- 
2.16.2

[bug#30734] [PATCH core-updates 1/3] gnu: util-linux: Don't build 'nologin'.

[Marius Bakke]

* gnu/packages/linux.scm (util-linux)[source](snippet): Add substitution.
---
 gnu/packages/linux.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c33b473ca..e63abcea4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -559,12 +559,13 @@ providing the system administrator with some help in common tasks.")
               (patches (search-patches "util-linux-tests.patch"))
               (modules '((guix build utils)))
               (snippet
-               ;; We take the 'logger' program from GNU Inetutils and 'kill'
-               ;; from GNU Coreutils.
+               ;; We take 'nologin' from Shadow, the 'logger' program from
+               ;; GNU Inetutils and 'kill' from GNU Coreutils.
                '(begin
                   (substitute* "configure"
                     (("build_logger=yes") "build_logger=no")
-                    (("build_kill=yes") "build_kill=no"))
+                    (("build_kill=yes") "build_kill=no")
+                    (("build_nologin=yes") "build_nologin=no"))
                   #t))))
     (build-system gnu-build-system)
     (outputs '("out"
-- 
2.16.2

[bug#30734] [PATCH core-updates 2/3] gnu: util-linux: Move '.la' files to static output.

[Marius Bakke]

* gnu/packages/linux.scm (util-linux)[arguments]: Update 'move-static-libs'
phase to include .la files.  Substitute the output.
---
 gnu/packages/linux.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e63abcea4..dffe2c49c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -608,10 +608,16 @@ providing the system administrator with some help in common tasks.")
                        (mkdir-p (string-append static "/lib"))
                        (with-directory-excursion out
                          (for-each (lambda (file)
+                                     ;; The dynamic linker does not need the '.la'
+                                     ;; files, but libtool might.  Make sure they
+                                     ;; refer to the right output.
+                                     (when (string= ".la" (string-take-right file 3))
+                                       (substitute* file
+                                         ((out) static)))
                                      (rename-file file
                                                   (string-append static "/"
                                                                  file)))
-                                   (find-files "lib" "\\.a$")))
+                                   (find-files "lib" "\\.l?a$")))
                        #t))))))
     (inputs `(("zlib" ,zlib)
               ("ncurses" ,ncurses)
-- 
2.16.2

[bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'.

[Marius Bakke]

* gnu/packages/linux.scm (net-tools)[arguments]: In
REMOVE-REDUNDANT-COMMANDS-PHASE, add regexp for ifconfig.
---
 gnu/packages/linux.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index dffe2c49c..8c07d1fdd 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1290,7 +1290,7 @@ inadequately in modern network environments, and both should be deprecated.")
                ;; Remove commands and man pages redundant with Inetutils.
                (let* ((out (assoc-ref outputs "out"))
                       (dup (append-map (cut find-files out <>)
-                                       '("^hostname"
+                                       '("^hostname" "^ifconfig"
                                          "^(yp|nis|dns)?domainname"))))
                  (for-each delete-file dup)
                  #t))))
-- 
2.16.2

[bug#30734] [PATCH core-updates 2/3] gnu: util-linux: Move '.la' files to static output.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 954 bytes --]

Hi Marius,

On Tue,  6 Mar 2018 17:56:41 +0100
Marius Bakke <mbakke@fastmail.com> wrote:

> index e63abcea4..dffe2c49c 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -608,10 +608,16 @@ providing the system administrator with some help in common tasks.")
>                         (mkdir-p (string-append static "/lib"))
>                         (with-directory-excursion out
>                           (for-each (lambda (file)
> +                                     ;; The dynamic linker does not need the '.la'
> +                                     ;; files, but libtool might.  Make sure they
> +                                     ;; refer to the right output.
> +                                     (when (string= ".la" (string-take-right file 3))

string-take-right errors out when given an argument which is longer than the length of FILE.

I suggest using (string-suffix? ".la" file) instead.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]

Hi Marius,

On Tue,  6 Mar 2018 17:56:42 +0100
Marius Bakke <mbakke@fastmail.com> wrote:

> * gnu/packages/linux.scm (net-tools)[arguments]: In
> REMOVE-REDUNDANT-COMMANDS-PHASE, add regexp for ifconfig.
> ---
>  gnu/packages/linux.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index dffe2c49c..8c07d1fdd 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -1290,7 +1290,7 @@ inadequately in modern network environments, and both should be deprecated.")
>                 ;; Remove commands and man pages redundant with Inetutils.
>                 (let* ((out (assoc-ref outputs "out"))
>                        (dup (append-map (cut find-files out <>)
> -                                       '("^hostname"
> +                                       '("^hostname" "^ifconfig"
>                                           "^(yp|nis|dns)?domainname"))))
>                   (for-each delete-file dup)

Is there a reason why those regular expressions don't end in "$" (meaning "at the end")?

Otherwise LGTM!

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#30734] [PATCH core-updates 1/3] gnu: util-linux: Don't build 'nologin'.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 7 bytes --]

LGTM!

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> * gnu/packages/linux.scm (net-tools)[arguments]: In
> REMOVE-REDUNDANT-COMMANDS-PHASE, add regexp for ifconfig.
> ---
>  gnu/packages/linux.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index dffe2c49c..8c07d1fdd 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -1290,7 +1290,7 @@ inadequately in modern network environments, and both should be deprecated.")
>                 ;; Remove commands and man pages redundant with Inetutils.
>                 (let* ((out (assoc-ref outputs "out"))
>                        (dup (append-map (cut find-files out <>)
> -                                       '("^hostname"
> +                                       '("^hostname" "^ifconfig"

GNU ifconfig is somewhat incompatible and may have a different feature
set compared to the one of net-tools, so I’d be in favor of keeping it.

WDYT?

Thanks,
Ludo’.

[bug#30734] [PATCH core-updates 1/3] gnu: util-linux: Don't build 'nologin'.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> * gnu/packages/linux.scm (util-linux)[source](snippet): Add substitution.

LGTM!

Ludo'.

[bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'.

[Marius Bakke]

[-- Attachment #1.1: Type: text/plain, Size: 1360 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> Marius Bakke <mbakke@fastmail.com> skribis:
>
>> * gnu/packages/linux.scm (net-tools)[arguments]: In
>> REMOVE-REDUNDANT-COMMANDS-PHASE, add regexp for ifconfig.
>> ---
>>  gnu/packages/linux.scm | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
>> index dffe2c49c..8c07d1fdd 100644
>> --- a/gnu/packages/linux.scm
>> +++ b/gnu/packages/linux.scm
>> @@ -1290,7 +1290,7 @@ inadequately in modern network environments, and both should be deprecated.")
>>                 ;; Remove commands and man pages redundant with Inetutils.
>>                 (let* ((out (assoc-ref outputs "out"))
>>                        (dup (append-map (cut find-files out <>)
>> -                                       '("^hostname"
>> +                                       '("^hostname" "^ifconfig"
>
> GNU ifconfig is somewhat incompatible and may have a different feature
> set compared to the one of net-tools, so I’d be in favor of keeping it.
>
> WDYT?

The motivation for this commit was to remove a conflict in
%base-packages.  Currently it's entirely random which ifconfig ends up
in the system profile, which is not great.

What about the below hack?  Alternatively, it could be moved to a
separate output.  Thoughts?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-net-tools-Move-ifconfig-to-sbin.patch --]
[-- Type: text/x-patch, Size: 1361 bytes --]

From 0887b6af81781ae74f0a34c59f32ed098fa199dc Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 8 Mar 2018 21:41:13 +0100
Subject: [PATCH] gnu: net-tools: Move 'ifconfig' to "/sbin".

* gnu/packages/linux.scm (net-tools)[arguments]: In
REMOVE-REDUNDANT-COMMANDS-PHASE, use rename-file on ifconfig.
---
 gnu/packages/linux.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 875f11062..916309b79 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1286,6 +1286,11 @@ inadequately in modern network environments, and both should be deprecated.")
                                        '("^hostname"
                                          "^(yp|nis|dns)?domainname"))))
                  (for-each delete-file dup)
+                 ;; ifconfig from net-tools is somewhat incompatible with
+                 ;; GNU ifconfig, so we keep it around.  Move it to "/sbin"
+                 ;; to prevent conflict in %base-packages.
+                 (rename-file (string-append out "/bin/ifconfig")
+                              (string-append out "/sbin/ifconfig"))
                  #t))))
          ;; Binaries that depend on libnet-tools.a don't declare that
          ;; dependency, making it parallel-unsafe.
-- 
2.16.2


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Marius Bakke <mbakke@fastmail.com> skribis:
>>
>>> * gnu/packages/linux.scm (net-tools)[arguments]: In
>>> REMOVE-REDUNDANT-COMMANDS-PHASE, add regexp for ifconfig.
>>> ---
>>>  gnu/packages/linux.scm | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
>>> index dffe2c49c..8c07d1fdd 100644
>>> --- a/gnu/packages/linux.scm
>>> +++ b/gnu/packages/linux.scm
>>> @@ -1290,7 +1290,7 @@ inadequately in modern network environments, and both should be deprecated.")
>>>                 ;; Remove commands and man pages redundant with Inetutils.
>>>                 (let* ((out (assoc-ref outputs "out"))
>>>                        (dup (append-map (cut find-files out <>)
>>> -                                       '("^hostname"
>>> +                                       '("^hostname" "^ifconfig"
>>
>> GNU ifconfig is somewhat incompatible and may have a different feature
>> set compared to the one of net-tools, so I’d be in favor of keeping it.
>>
>> WDYT?
>
> The motivation for this commit was to remove a conflict in
> %base-packages.  Currently it's entirely random which ifconfig ends up
> in the system profile, which is not great.

I think it’s not _entirely_ random, but I agree it’s not great.  ;-)

> What about the below hack?  Alternatively, it could be moved to a
> separate output.  Thoughts?
>
> From 0887b6af81781ae74f0a34c59f32ed098fa199dc Mon Sep 17 00:00:00 2001
> From: Marius Bakke <mbakke@fastmail.com>
> Date: Thu, 8 Mar 2018 21:41:13 +0100
> Subject: [PATCH] gnu: net-tools: Move 'ifconfig' to "/sbin".
>
> * gnu/packages/linux.scm (net-tools)[arguments]: In
> REMOVE-REDUNDANT-COMMANDS-PHASE, use rename-file on ifconfig.
> ---
>  gnu/packages/linux.scm | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 875f11062..916309b79 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -1286,6 +1286,11 @@ inadequately in modern network environments, and both should be deprecated.")
>                                         '("^hostname"
>                                           "^(yp|nis|dns)?domainname"))))
>                   (for-each delete-file dup)
> +                 ;; ifconfig from net-tools is somewhat incompatible with
> +                 ;; GNU ifconfig, so we keep it around.  Move it to "/sbin"
> +                 ;; to prevent conflict in %base-packages.
> +                 (rename-file (string-append out "/bin/ifconfig")
> +                              (string-append out "/sbin/ifconfig"))
>                   #t))))

Sure, either that or rename it to “ifconfig.net-tools” (I think Debian
sometimes does things like this.)

But, isc-dhcp depends on net-tools, and it might have scripts that
depend on its ifconfig, for instance.  Same for virtuoso-ose, isc-bind,
iodine, and more.

So all in all, your suggestion may be safer, though we should check
whether these things break.

Thank you,
Ludo’.

[bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2095 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> Marius Bakke <mbakke@fastmail.com> skribis:
>
>> What about the below hack?  Alternatively, it could be moved to a
>> separate output.  Thoughts?
>>
>> From 0887b6af81781ae74f0a34c59f32ed098fa199dc Mon Sep 17 00:00:00 2001
>> From: Marius Bakke <mbakke@fastmail.com>
>> Date: Thu, 8 Mar 2018 21:41:13 +0100
>> Subject: [PATCH] gnu: net-tools: Move 'ifconfig' to "/sbin".
>>
>> * gnu/packages/linux.scm (net-tools)[arguments]: In
>> REMOVE-REDUNDANT-COMMANDS-PHASE, use rename-file on ifconfig.
>> ---
>>  gnu/packages/linux.scm | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
>> index 875f11062..916309b79 100644
>> --- a/gnu/packages/linux.scm
>> +++ b/gnu/packages/linux.scm
>> @@ -1286,6 +1286,11 @@ inadequately in modern network environments, and both should be deprecated.")
>>                                         '("^hostname"
>>                                           "^(yp|nis|dns)?domainname"))))
>>                   (for-each delete-file dup)
>> +                 ;; ifconfig from net-tools is somewhat incompatible with
>> +                 ;; GNU ifconfig, so we keep it around.  Move it to "/sbin"
>> +                 ;; to prevent conflict in %base-packages.
>> +                 (rename-file (string-append out "/bin/ifconfig")
>> +                              (string-append out "/sbin/ifconfig"))
>>                   #t))))
>
> Sure, either that or rename it to “ifconfig.net-tools” (I think Debian
> sometimes does things like this.)
>
> But, isc-dhcp depends on net-tools, and it might have scripts that
> depend on its ifconfig, for instance.  Same for virtuoso-ose, isc-bind,
> iodine, and more.
>
> So all in all, your suggestion may be safer, though we should check
> whether these things break.

I like renaming it better than moving to 'sbin'.  I'll try out some of
the dependent packages and see what needs to be done.  Would it be okay
to switch to GNU Inetutils for those that require 'ifconfig'?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'.

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:

[...]

>> Sure, either that or rename it to “ifconfig.net-tools” (I think Debian
>> sometimes does things like this.)
>>
>> But, isc-dhcp depends on net-tools, and it might have scripts that
>> depend on its ifconfig, for instance.  Same for virtuoso-ose, isc-bind,
>> iodine, and more.
>>
>> So all in all, your suggestion may be safer, though we should check
>> whether these things break.
>
> I like renaming it better than moving to 'sbin'.  I'll try out some of
> the dependent packages and see what needs to be done.  Would it be okay
> to switch to GNU Inetutils for those that require 'ifconfig'?

Sure.  I think we’ll have to actually run the those tools (isc-dhcp,
etc.) to check whether their scripts work well with GNU ifconfig, though.

Ludo’.

[bug#30734] [PATCH core-updates 0/3] nologin and ifconfig profile conflicts

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

On Tue, Mar 06, 2018 at 05:54:38PM +0100, Marius Bakke wrote:
> These patches aim to fix conflicts in the default profile.  The second
> patch is unrelated and not necessarily even accurate.
> 
> Feedback wanted!
> 
> Marius Bakke (3):
>   gnu: util-linux: Don't build 'nologin'.
>   gnu: util-linux: Move '.la' files to static output.
>   gnu: net-tools: Don't install 'ifconfig'.

What's the status of this third patch? Should we apply it to
core-updates (or core-updates-next)?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30734] [PATCH core-updates 0/3] nologin and ifconfig profile conflicts

[zimoun]

Hi,

An old patch [1] which probably fell through the cracks.

1: <http://issues.guix.gnu.org/issue/30464>


On Tue, 06 Mar 2018 at 17:54, Marius Bakke <mbakke@fastmail.com> wrote:

> These patches aim to fix conflicts in the default profile.  The second
> patch is unrelated and not necessarily even accurate.
>
> Feedback wanted!
>
> Marius Bakke (3):
>   gnu: util-linux: Don't build 'nologin'.

The first patch got 2 LGTM at the time, so it can be applied, IMHO.
Since the last discussion of the two others is from 4 years ago, I
assume it is not a big deal and could be close as wontfix.  WDYT?


Cheers,
simon

[bug#30734] [PATCH core-updates 0/3] nologin and ifconfig profile conflicts

[zimoun]

Hi,

On Wed, 23 Mar 2022 at 16:24, zimoun <zimon.toutoune@gmail.com> wrote:

> The first patch got 2 LGTM at the time, so it can be applied, IMHO.

It is already applied by 0223db58ef36dbc552f91e12d2bb6e444bcfd7f6.


> Since the last discussion of the two others is from 4 years ago, I
> assume it is not a big deal and could be close as wontfix.  WDYT?

Closing the 2 others?  Or what is the next action?


Cheers,
simon

bug#30734: [PATCH core-updates 0/3] nologin and ifconfig profile conflicts

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

zimoun <zimon.toutoune@gmail.com> skriver:

>> Since the last discussion of the two others is from 4 years ago, I
>> assume it is not a big deal and could be close as wontfix.  WDYT?
>
> Closing the 2 others?  Or what is the next action?

The ifconfig patch is obsolete since 58236d301 (system: Drop net-tools
from %BASE-PACKAGES (replaced by iproute2).).

Closing, thanks for the reminder.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]