[PR PATCH] autofs: add log service, fix patch args

[PR PATCH] autofs: add log service, fix patch args

[classabbyamp]

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

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages autofs-log
https://github.com/void-linux/void-packages/pull/36029

autofs: add log service, fix patch args
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

the log service was essential for  successfully debugging my autofs setup

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36029.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-autofs-log-36029.patch --]
[-- Type: text/x-diff, Size: 1721 bytes --]

From 638d28b2486fbbf878a8bcda3824b2a5a1aa9a6e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 02:57:59 -0500
Subject: [PATCH] autofs: add log service, fix patch args

---
 srcpkgs/autofs/files/autofs/log/run | 2 ++
 srcpkgs/autofs/files/autofs/run     | 1 +
 srcpkgs/autofs/template             | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/autofs/files/autofs/log/run

diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run
new file mode 100644
index 000000000000..a2abfe61e846
--- /dev/null
+++ b/srcpkgs/autofs/files/autofs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -p daemon.info -t autofs
diff --git a/srcpkgs/autofs/files/autofs/run b/srcpkgs/autofs/files/autofs/run
index 14ee8daad0c8..6da6f9c3d404 100644
--- a/srcpkgs/autofs/files/autofs/run
+++ b/srcpkgs/autofs/files/autofs/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec automount -f
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 6ec782cccbb9..5fd9b08aac7b 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
 version=5.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/daemons/autofs"
 distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
 checksum=b33d1059855664b20eeda26f3e28ff518fb0c3d58f565570af2ae569dc73c0fd
+patch_args="-Nlp1"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"
 

Re: [PR REVIEW] autofs: add log service, fix patch args

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36029#discussion_r830679810

Comment:
Could we instead fix whitespace in the patch?

Re: [PR PATCH] [Updated] autofs: add log service, fix patch args

[classabbyamp]

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

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages autofs-log
https://github.com/void-linux/void-packages/pull/36029

autofs: add log service, fix patch args
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

the log service was essential for  successfully debugging my autofs setup

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36029.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-autofs-log-36029.patch --]
[-- Type: text/x-diff, Size: 2715 bytes --]

From 371e36aa6da5c54c051b516a19df2918093148bc Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 02:57:59 -0500
Subject: [PATCH] autofs: add log service, fix patch

---
 srcpkgs/autofs/files/autofs/log/run |  2 ++
 srcpkgs/autofs/files/autofs/run     |  1 +
 srcpkgs/autofs/patches/musl.patch   | 22 +++++++++++-----------
 srcpkgs/autofs/template             |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/autofs/files/autofs/log/run

diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run
new file mode 100644
index 000000000000..a2abfe61e846
--- /dev/null
+++ b/srcpkgs/autofs/files/autofs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -p daemon.info -t autofs
diff --git a/srcpkgs/autofs/files/autofs/run b/srcpkgs/autofs/files/autofs/run
index 14ee8daad0c8..6da6f9c3d404 100644
--- a/srcpkgs/autofs/files/autofs/run
+++ b/srcpkgs/autofs/files/autofs/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec automount -f
diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch
index 5cd45dd184ab..f81228ad740a 100644
--- a/srcpkgs/autofs/patches/musl.patch
+++ b/srcpkgs/autofs/patches/musl.patch
@@ -30,18 +30,18 @@
  #include <dlfcn.h>
 --- a/lib/log.c.orig     2019-03-30 10:49:52.965336128 +0100
 +++ b/lib/log.c  2019-03-30 10:50:43.232710045 +0100
-@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons
-       char buffer[ATTEMPT_ID_SIZE + 1];
-       char *prefixed_msg = NULL;
+@@ -38,7 +38,11 @@
+ 	char buffer[ATTEMPT_ID_SIZE + 1];
+ 	char *prefixed_msg = NULL;
  
--      attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      if (key_thread_attempt_id) {
-+              attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      } else {
-+              attempt_id = 0;
-+      }
-       if (attempt_id) {
-               int len = sizeof(buffer) + 1 + strlen(msg) + 1;
+-	attempt_id = pthread_getspecific(key_thread_attempt_id);
++	if (key_thread_attempt_id) {
++		attempt_id = pthread_getspecific(key_thread_attempt_id);
++	} else {
++		attempt_id = 0;
++	}
+ 	if (attempt_id) {
+ 		int len = sizeof(buffer) + 1 + strlen(msg) + 1;
  
 --- a/include/hash.h	2021-01-31 09:22:19.668222263 +0100
 +++ b/include/hash.h	2021-01-31 09:22:41.390327622 +0100
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 6ec782cccbb9..a9abc60e64e8 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
 version=5.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"

Re: [PR REVIEW] autofs: add log service, fix patch args

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36029#discussion_r830682375

Comment:
done

Re: [PR PATCH] [Merged]: autofs: add log service, fix patch args

[paper42]

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

There's a merged pull request on the void-packages repository

autofs: add log service, fix patch args
https://github.com/void-linux/void-packages/pull/36029

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

the log service was essential for  successfully debugging my autofs setup

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->