[PR PATCH] 66: update to 0.6.1.2.

[PR PATCH] 66: update to 0.6.1.2.

[mobinmob]

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

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

https://github.com/mobinmob/void-packages 66
https://github.com/void-linux/void-packages/pull/29328

66: update to 0.6.1.2.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (x64_64-glibc)
- [X] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [X] aarch64-musl
  - [X] armv7l-musl
  - [X] i686



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

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

From 1147131a9006d14ec2a5b3ea665918d7d1548251 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Mar 2021 18:26:04 +0200
Subject: [PATCH] 66: update to 0.6.1.2.

---
 ...021570c3037d716a1cb5d95eb06727d1745a5.diff | 47 -------------------
 srcpkgs/66/patches/man_page_fix.diff          | 40 ----------------
 srcpkgs/66/template                           |  9 ++--
 3 files changed, 5 insertions(+), 91 deletions(-)
 delete mode 100644 srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
 delete mode 100644 srcpkgs/66/patches/man_page_fix.diff

diff --git a/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff b/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
deleted file mode 100644
index 001ee8097c2..00000000000
--- a/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/66/66-inservice.c b/src/66/66-inservice.c
-index cfe5995e4fb861b749edca9a324f0207f26facc7..03fda5587df20e796300333c2db9d4847b1aa5b9 100644
---- a/src/66/66-inservice.c
-+++ b/src/66/66-inservice.c
-@@ -621,6 +621,7 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
- 
-         FOREACH_SASTR(&list,pos) {
- 
-+            ssize_t upstream = 0 ;
-             sa.len = 0 ;
-             salink.len = newlen ;
-             if (!stralloc_cats(&salink,"/") ||
-@@ -630,8 +631,25 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
-             if (!file_readputsa_g(&sa,salink.s))
-                 log_dieusys(LOG_EXIT_SYS,"read environment file") ;
- 
--            if (NOFIELD) {
-+            /** Remove warning message */
-+            if (list.s[pos] == '.') {
-+
-+                char t[sa.len + 1] ;
-+
-+                upstream = str_contain(sa.s,"[ENDWARN]") ;
- 
-+                if (upstream == -1)
-+                    log_die(LOG_EXIT_SYS,"invalid upstream configuration file! Do you have modified it? Tries to enable the service again.") ;
-+
-+                auto_strings(t,sa.s + upstream) ;
-+
-+                sa.len = 0 ;
-+
-+                if (!auto_stra(&sa,t))
-+                    log_die_nomem("stralloc") ;
-+            }
-+
-+            if (NOFIELD) {
- 
-                 char *m = "environment variables from: " ;
-                 size_t mlen = strlen(m) ;
-@@ -640,6 +658,7 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
-                 if (!stralloc_inserts(&sa,0,msg) ||
-                 !stralloc_0(&sa))
-                     log_die_nomem("stralloc") ;
-+
-             }
- 
-             if (pos)
diff --git a/srcpkgs/66/patches/man_page_fix.diff b/srcpkgs/66/patches/man_page_fix.diff
deleted file mode 100644
index 2d25a6ccf4a..00000000000
--- a/srcpkgs/66/patches/man_page_fix.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/doc/make-man.sh b/doc/make-man.sh
-index fd5d9cd..0c3fee6 100755
---- a/doc/make-man.sh
-+++ b/doc/make-man.sh
-@@ -14,29 +14,26 @@ done
- 
- for i in ${man1}; do
-     lowdown -s -Tman doc/"${i}".md -o doc/man/man1/"${i}".1 || exit 1
--    var=$(head -n1 < doc/man/man1/"${i}".1)
-+    var=$( sed -n -e '/^.TH/p' < doc/man/man1/"${i}".1)
-     var=$(printf '%s' "$var" | tr '7' '1')
--    var="${var} \"\" \"General Commands Manual\""
-     sed -i "s!^.TH.*!${var}!" doc/man/man1/"${i}".1 || exit 1
--    sed -i '2,5d' doc/man/man1/"${i}".1 || exit 1
-+    sed -i '4,8d' doc/man/man1/"${i}".1 || exit 1
- done
- 
- for i in ${man5}; do
-     lowdown -s -Tman doc/"${i}".md -o doc/man/man5/"${i}".5 || exit 1
--    var=$(head -n1 < doc/man/man5/"${i}".5)
-+    var=$( sed -n -e '/^.TH/p' < doc/man/man5/"${i}".5)
-     var=$(printf '%s' "$var" | tr '7' '5')
--    var="${var} \"\" \"File Formats Manual\""
-     sed -i "s!^.TH.*!${var}!" doc/man/man5/"${i}".5 || exit 1
--    sed -i '2,5d' doc/man/man5/"${i}".5 || exit 1
-+    sed -i '4,8d' doc/man/man5/"${i}".5 || exit 1
- done
- 
- for i in ${man8}; do
-     lowdown -s -Tman doc/"${i}".md -o doc/man/man8/"${i}".8 || exit 1
--    var=$(head -n1 < doc/man/man8/"${i}".8)
-+    var=$( sed -n -e '/^.TH/p' < doc/man/man8/"${i}".8)
-     var=$(printf '%s' "$var" | tr '7' '8')
--    var="${var} \"\" \"System Administration\""
-     sed -i "s!^.TH.*!${var}!" doc/man/man8/"${i}".8 || exit 1
--    sed -i '2,5d' doc/man/man8/"${i}".8 || exit 1
-+    sed -i '4,8d' doc/man/man8/"${i}".8 || exit 1
- done
- 
- exit 0
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 849e5c42c37..46e5770b2ad 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
 # Template file for '66'
 pkgname=66
-version=0.6.1.1
-revision=3
+version=0.6.1.2
+revision=1
 wrksrc="66-v${version}"
 build_style=configure
 configure_args="--prefix=/usr
@@ -18,13 +18,14 @@ license="ISC"
 homepage="http://web.obarun.org/software/"
 changelog="https://framagit.org/Obarun/66/raw/master/NEWS.md"
 distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=4f80d94851a8c26e9666ea0f274890fc3abb6185ca1fe9fd8e2ad71e27a2ade9
-patch_args=" -Np1"
+checksum=99de5ede29670ffb55808dc0c3f28a49bf005d594ba3016b13271d4de025f589
 
 conf_files="/etc/66/init.conf"
 
 system_accounts="_s6log"
 
+make_dirs="/var/log/66 0750 _s6log _s6log"
+
 pre_configure() {
 
 	# Clean the default $PATH for service scripts

Re: [PR PATCH] [Merged]: 66: update to 0.6.1.2.

[the-maldridge]

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

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

66: update to 0.6.1.2.
https://github.com/void-linux/void-packages/pull/29328

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (x64_64-glibc)
- [X] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [X] aarch64-musl
  - [X] armv7l-musl
  - [X] i686