[PATCH 0/3] Update lua and nmap.

[PATCH 0/3] Update lua and nmap.

[Marius Bakke]

Recent nmap requires lua-5.3. I've built the dependents and only
wireshark required 5.2 (which did not trigger rebuild).

[PATCH 1/3] gnu: lua: Update to 5.3.3.

[Marius Bakke]

* gnu/packages/lua.scm (lua): Update to 5.3.3.
[source]: Use https URL.
[home-page]: Use https URL.
(lua-5.2): New variable.
(lua-5.1)[source]: Use https URL.
---
 gnu/packages/lua.scm | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 8fdba61..55e529e 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -40,13 +40,13 @@
 (define-public lua
   (package
     (name "lua")
-    (version "5.2.4")
+    (version "5.3.3")
     (source (origin
              (method url-fetch)
-             (uri (string-append "http://www.lua.org/ftp/lua-"
+             (uri (string-append "https://www.lua.org/ftp/lua-"
                                  version ".tar.gz"))
              (sha256
-              (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
+              (base32 "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"))
              (patches (search-patches "lua-pkgconfig.patch"
                                       "lua52-liblua-so.patch"))))
     (build-system gnu-build-system)
@@ -69,7 +69,7 @@
                                (string-append "INSTALL_TOP=" out)
                                (string-append "INSTALL_MAN=" out
                                               "/share/man/man1")))))))))
-    (home-page "http://www.lua.org/")
+    (home-page "https://www.lua.org/")
     (synopsis "Embeddable scripting language")
     (description
      "Lua is a powerful, fast, lightweight, embeddable scripting language.  Lua
@@ -80,12 +80,25 @@ automatic memory management with incremental garbage collection, making it ideal
 for configuration, scripting, and rapid prototyping.")
     (license license:x11)))
 
+(define-public lua-5.2
+  (package (inherit lua)
+           (version "5.2.4")
+           (source
+            (origin
+              (method url-fetch)
+              (uri (string-append "https://www.lua.org/ftp/lua-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
+              (patches (search-patches "lua-pkgconfig.patch"
+                                       "lua52-liblua-so.patch"))))))
+
 (define-public lua-5.1
   (package (inherit lua)
     (version "5.1.5")
     (source (origin
              (method url-fetch)
-             (uri (string-append "http://www.lua.org/ftp/lua-"
+             (uri (string-append "https://www.lua.org/ftp/lua-"
                                  version ".tar.gz"))
              (sha256
               (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16"))
-- 
2.10.1

Re: [PATCH 1/3] gnu: lua: Update to 5.3.3.

[Leo Famulari]

On Mon, Oct 31, 2016 at 01:29:42PM +0000, Marius Bakke wrote:
> * gnu/packages/lua.scm (lua): Update to 5.3.3.
> [source]: Use https URL.
> [home-page]: Use https URL.
> (lua-5.2): New variable.
> (lua-5.1)[source]: Use https URL.
> ---
>  gnu/packages/lua.scm | 23 ++++++++++++++++++-----
>  1 file changed, 18 insertions(+), 5 deletions(-)
> 
> diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
> index 8fdba61..55e529e 100644
> --- a/gnu/packages/lua.scm
> +++ b/gnu/packages/lua.scm
> @@ -40,13 +40,13 @@
>  (define-public lua
>    (package
>      (name "lua")
> -    (version "5.2.4")
> +    (version "5.3.3")
>      (source (origin
>               (method url-fetch)
> -             (uri (string-append "http://www.lua.org/ftp/lua-"
> +             (uri (string-append "https://www.lua.org/ftp/lua-"
>                                   version ".tar.gz"))
>               (sha256
> -              (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
> +              (base32 "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"))
>               (patches (search-patches "lua-pkgconfig.patch"
>                                        "lua52-liblua-so.patch"))))

Does this lua52-liblua-so.patch still apply / is it still needed for Lua
5.3? I remember that there were significant differences between how Lua
5.1 and 5.2 in terms of building a dynamic Lua library.

If so, I guess we should rename it.

>      (build-system gnu-build-system)
> @@ -69,7 +69,7 @@
>                                 (string-append "INSTALL_TOP=" out)
>                                 (string-append "INSTALL_MAN=" out
>                                                "/share/man/man1")))))))))
> -    (home-page "http://www.lua.org/")
> +    (home-page "https://www.lua.org/")
>      (synopsis "Embeddable scripting language")
>      (description
>       "Lua is a powerful, fast, lightweight, embeddable scripting language.  Lua
> @@ -80,12 +80,25 @@ automatic memory management with incremental garbage collection, making it ideal
>  for configuration, scripting, and rapid prototyping.")
>      (license license:x11)))
>  
> +(define-public lua-5.2
> +  (package (inherit lua)
> +           (version "5.2.4")
> +           (source
> +            (origin
> +              (method url-fetch)
> +              (uri (string-append "https://www.lua.org/ftp/lua-"
> +                                  version ".tar.gz"))
> +              (sha256
> +               (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
> +              (patches (search-patches "lua-pkgconfig.patch"
> +                                       "lua52-liblua-so.patch"))))))
> +
>  (define-public lua-5.1
>    (package (inherit lua)
>      (version "5.1.5")
>      (source (origin
>               (method url-fetch)
> -             (uri (string-append "http://www.lua.org/ftp/lua-"
> +             (uri (string-append "https://www.lua.org/ftp/lua-"
>                                   version ".tar.gz"))
>               (sha256
>                (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16"))
> -- 
> 2.10.1
> 
> 

Re: [PATCH 1/3] gnu: lua: Update to 5.3.3.

[Marius Bakke]

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

Leo Famulari <leo@famulari.name> writes:

> On Mon, Oct 31, 2016 at 01:29:42PM +0000, Marius Bakke wrote:
>> * gnu/packages/lua.scm (lua): Update to 5.3.3.
>> [source]: Use https URL.
>> [home-page]: Use https URL.
>> (lua-5.2): New variable.
>> (lua-5.1)[source]: Use https URL.
>> ---
>>  gnu/packages/lua.scm | 23 ++++++++++++++++++-----
>>  1 file changed, 18 insertions(+), 5 deletions(-)
>> 
>> diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
>> index 8fdba61..55e529e 100644
>> --- a/gnu/packages/lua.scm
>> +++ b/gnu/packages/lua.scm
>> @@ -40,13 +40,13 @@
>>  (define-public lua
>>    (package
>>      (name "lua")
>> -    (version "5.2.4")
>> +    (version "5.3.3")
>>      (source (origin
>>               (method url-fetch)
>> -             (uri (string-append "http://www.lua.org/ftp/lua-"
>> +             (uri (string-append "https://www.lua.org/ftp/lua-"
>>                                   version ".tar.gz"))
>>               (sha256
>> -              (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
>> +              (base32 "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"))
>>               (patches (search-patches "lua-pkgconfig.patch"
>>                                        "lua52-liblua-so.patch"))))
>
> Does this lua52-liblua-so.patch still apply / is it still needed for Lua
> 5.3? I remember that there were significant differences between how Lua
> 5.1 and 5.2 in terms of building a dynamic Lua library.
>
> If so, I guess we should rename it.

I tried building 5.3 initially without patches and noticed the shared
library was not created. It applies cleanly and works as advertised.

Should I rename it to just lua-liblua-so.patch? IMO the version number
is useful information, even if it applies for a later minor release. I'm
in favor of keeping it, and create the lua54 equivalent if/when needed.

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

Re: [PATCH 1/3] gnu: lua: Update to 5.3.3.

[Marius Bakke]

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

Marius Bakke <mbakke@fastmail.com> writes:

> Leo Famulari <leo@famulari.name> writes:
>
>> On Mon, Oct 31, 2016 at 01:29:42PM +0000, Marius Bakke wrote:
>>> * gnu/packages/lua.scm (lua): Update to 5.3.3.
>>> [source]: Use https URL.
>>> [home-page]: Use https URL.
>>> (lua-5.2): New variable.
>>> (lua-5.1)[source]: Use https URL.
>>> ---
>>>  gnu/packages/lua.scm | 23 ++++++++++++++++++-----
>>>  1 file changed, 18 insertions(+), 5 deletions(-)
>>> 
>>> diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
>>> index 8fdba61..55e529e 100644
>>> --- a/gnu/packages/lua.scm
>>> +++ b/gnu/packages/lua.scm
>>> @@ -40,13 +40,13 @@
>>>  (define-public lua
>>>    (package
>>>      (name "lua")
>>> -    (version "5.2.4")
>>> +    (version "5.3.3")
>>>      (source (origin
>>>               (method url-fetch)
>>> -             (uri (string-append "http://www.lua.org/ftp/lua-"
>>> +             (uri (string-append "https://www.lua.org/ftp/lua-"
>>>                                   version ".tar.gz"))
>>>               (sha256
>>> -              (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
>>> +              (base32 "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"))
>>>               (patches (search-patches "lua-pkgconfig.patch"
>>>                                        "lua52-liblua-so.patch"))))
>>
>> Does this lua52-liblua-so.patch still apply / is it still needed for Lua
>> 5.3? I remember that there were significant differences between how Lua
>> 5.1 and 5.2 in terms of building a dynamic Lua library.
>>
>> If so, I guess we should rename it.
>
> I tried building 5.3 initially without patches and noticed the shared
> library was not created. It applies cleanly and works as advertised.
>
> Should I rename it to just lua-liblua-so.patch? IMO the version number
> is useful information, even if it applies for a later minor release. I'm
> in favor of keeping it, and create the lua54 equivalent if/when needed.

How should we proceed with this? I think renaming it to
"lua-liblua-so.patch" is fine, since it applies to the current release.

Another option is "lua52-lua53-liblua-so.patch", although we will have
to keep renaming it for all future versions it applies to in that case,
which seems like unnecessary noise.

The third option is of course keeping the lua52 name, but I see how that
can be confusing for the next code spelunker.

I don't have a strong opinion either way, but will go ahead with the
first option unless there are any objections.

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

Re: [PATCH 1/3] gnu: lua: Update to 5.3.3.

[Leo Famulari]

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

On Sat, Nov 05, 2016 at 06:43:39PM +0000, Marius Bakke wrote:
> Marius Bakke <mbakke@fastmail.com> writes:
> > Leo Famulari <leo@famulari.name> writes:
> >> Does this lua52-liblua-so.patch still apply / is it still needed for Lua
> >> 5.3? I remember that there were significant differences between how Lua
> >> 5.1 and 5.2 in terms of building a dynamic Lua library.
> >>
> >> If so, I guess we should rename it.
> >
> > I tried building 5.3 initially without patches and noticed the shared
> > library was not created. It applies cleanly and works as advertised.
> >
> > Should I rename it to just lua-liblua-so.patch? IMO the version number
> > is useful information, even if it applies for a later minor release. I'm
> > in favor of keeping it, and create the lua54 equivalent if/when needed.
> 
> How should we proceed with this? I think renaming it to
> "lua-liblua-so.patch" is fine, since it applies to the current release.
> 
> Another option is "lua52-lua53-liblua-so.patch", although we will have
> to keep renaming it for all future versions it applies to in that case,
> which seems like unnecessary noise.
> 
> The third option is of course keeping the lua52 name, but I see how that
> can be confusing for the next code spelunker.
> 
> I don't have a strong opinion either way, but will go ahead with the
> first option unless there are any objections.

The first option sounds good. Please add a comment to the patch
mentioning which Lua versions it should be used for.

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

Re: [PATCH 1/3] gnu: lua: Update to 5.3.3.

[Marius Bakke]

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

Leo Famulari <leo@famulari.name> writes:

> On Sat, Nov 05, 2016 at 06:43:39PM +0000, Marius Bakke wrote:
>> Marius Bakke <mbakke@fastmail.com> writes:
>> > Leo Famulari <leo@famulari.name> writes:
>> >> Does this lua52-liblua-so.patch still apply / is it still needed for Lua
>> >> 5.3? I remember that there were significant differences between how Lua
>> >> 5.1 and 5.2 in terms of building a dynamic Lua library.
>> >>
>> >> If so, I guess we should rename it.
>> >
>> > I tried building 5.3 initially without patches and noticed the shared
>> > library was not created. It applies cleanly and works as advertised.
>> >
>> > Should I rename it to just lua-liblua-so.patch? IMO the version number
>> > is useful information, even if it applies for a later minor release. I'm
>> > in favor of keeping it, and create the lua54 equivalent if/when needed.
>> 
>> How should we proceed with this? I think renaming it to
>> "lua-liblua-so.patch" is fine, since it applies to the current release.
>> 
>> Another option is "lua52-lua53-liblua-so.patch", although we will have
>> to keep renaming it for all future versions it applies to in that case,
>> which seems like unnecessary noise.
>> 
>> The third option is of course keeping the lua52 name, but I see how that
>> can be confusing for the next code spelunker.
>> 
>> I don't have a strong opinion either way, but will go ahead with the
>> first option unless there are any objections.
>
> The first option sounds good. Please add a comment to the patch
> mentioning which Lua versions it should be used for.

Good idea. I pushed these changes in f4dc22bcd95eaebb026457c0a36396517be64130.

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

[PATCH 2/3] gnu: wireshark: Use lua-5.2.

[Marius Bakke]

* gnu/packages/networking.scm (wireshark)[inputs]: Change from 'lua' to
'lua-5.2'.
---
 gnu/packages/networking.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1f6ed77..5089d3d 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -486,7 +486,7 @@ which can be used to encrypt a password with @code{crypt(3)}.")
               ("libgcrypt" ,libgcrypt)
               ("libnl" ,libnl)
               ("libpcap" ,libpcap)
-              ("lua" ,lua)
+              ("lua" ,lua-5.2)
               ("krb5" ,mit-krb5)
               ("openssl" ,openssl)
               ("portaudio" ,portaudio)
-- 
2.10.1

Re: [PATCH 2/3] gnu: wireshark: Use lua-5.2.

[Leo Famulari]

On Mon, Oct 31, 2016 at 01:29:43PM +0000, Marius Bakke wrote:
> * gnu/packages/networking.scm (wireshark)[inputs]: Change from 'lua' to
> 'lua-5.2'.

Okay!

[PATCH 3/3] gnu: nmap: Update to 7.31.

[Marius Bakke]

* gnu/packages/admin.scm (nmap): Update to 7.31.
[arguments]: Add phase 'patch-Makefile' to prevent lua from being built.
---
 gnu/packages/admin.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d9b08ef..35156f6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1570,14 +1570,14 @@ done with the @code{auditctl} utility.")
 (define-public nmap
   (package
     (name "nmap")
-    (version "7.12")
+    (version "7.31")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://nmap.org/dist/nmap-" version
                                   ".tar.bz2"))
               (sha256
                (base32
-                "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3"))
+                "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb"))
               (modules '((guix build utils)))
               (snippet
                '(map delete-file-recursively
@@ -1603,6 +1603,12 @@ done with the @code{auditctl} utility.")
      '(#:configure-flags '("--without-zenmap")
        #:phases
        (modify-phases %standard-phases
+         (add-after 'configure 'patch-Makefile
+           (lambda _
+             (substitute* "Makefile"
+               ;; Do not attempt to build lua.
+               (("build-dnet build-lua") "build-dnet"))
+             #t))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (define (make out . args)
-- 
2.10.1

Re: [PATCH 3/3] gnu: nmap: Update to 7.31.

[Leo Famulari]

On Mon, Oct 31, 2016 at 01:29:44PM +0000, Marius Bakke wrote:
> * gnu/packages/admin.scm (nmap): Update to 7.31.
> [arguments]: Add phase 'patch-Makefile' to prevent lua from being built.
> ---
>  gnu/packages/admin.scm | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index d9b08ef..35156f6 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -1570,14 +1570,14 @@ done with the @code{auditctl} utility.")
>  (define-public nmap
>    (package
>      (name "nmap")
> -    (version "7.12")
> +    (version "7.31")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "https://nmap.org/dist/nmap-" version
>                                    ".tar.bz2"))
>                (sha256
>                 (base32
> -                "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3"))
> +                "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb"))

Okay!

>                (modules '((guix build utils)))
>                (snippet
>                 '(map delete-file-recursively
> @@ -1603,6 +1603,12 @@ done with the @code{auditctl} utility.")
>       '(#:configure-flags '("--without-zenmap")
>         #:phases
>         (modify-phases %standard-phases
> +         (add-after 'configure 'patch-Makefile
> +           (lambda _
> +             (substitute* "Makefile"
> +               ;; Do not attempt to build lua.
> +               (("build-dnet build-lua") "build-dnet"))
> +             #t))

So, in this new release it tries to build the bundled Lua and fails
because we've deleted it?

Re: [PATCH 3/3] gnu: nmap: Update to 7.31.

[Marius Bakke]

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

Leo Famulari <leo@famulari.name> writes:

> On Mon, Oct 31, 2016 at 01:29:44PM +0000, Marius Bakke wrote:
>> * gnu/packages/admin.scm (nmap): Update to 7.31.
>> [arguments]: Add phase 'patch-Makefile' to prevent lua from being built.
>> ---
>>  gnu/packages/admin.scm | 10 ++++++++--
>>  1 file changed, 8 insertions(+), 2 deletions(-)
>> 
>> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
>> index d9b08ef..35156f6 100644
>> --- a/gnu/packages/admin.scm
>> +++ b/gnu/packages/admin.scm
>> @@ -1570,14 +1570,14 @@ done with the @code{auditctl} utility.")
>>  (define-public nmap
>>    (package
>>      (name "nmap")
>> -    (version "7.12")
>> +    (version "7.31")
>>      (source (origin
>>                (method url-fetch)
>>                (uri (string-append "https://nmap.org/dist/nmap-" version
>>                                    ".tar.bz2"))
>>                (sha256
>>                 (base32
>> -                "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3"))
>> +                "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb"))
>
> Okay!
>
>>                (modules '((guix build utils)))
>>                (snippet
>>                 '(map delete-file-recursively
>> @@ -1603,6 +1603,12 @@ done with the @code{auditctl} utility.")
>>       '(#:configure-flags '("--without-zenmap")
>>         #:phases
>>         (modify-phases %standard-phases
>> +         (add-after 'configure 'patch-Makefile
>> +           (lambda _
>> +             (substitute* "Makefile"
>> +               ;; Do not attempt to build lua.
>> +               (("build-dnet build-lua") "build-dnet"))
>> +             #t))
>
> So, in this new release it tries to build the bundled Lua and fails
> because we've deleted it?

Correct, "build-lua" is now part of the default make target. Don't know
how it worked before, there have been a few changes to the Makefile:

https://github.com/nmap/nmap/commits/master/Makefile.in

Reading through the commits, I will double check that the NSE stuff
still works with our Lua ;)

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