66: update to 0.6.1.2.
This commit is contained in:
parent
55272b0245
commit
c715de3d1c
3 changed files with 5 additions and 91 deletions
|
@ -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)
|
|
@ -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
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue