From 03e5bfadfb223d37a532f79522b8433709d93efd Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 19 Dec 2020 14:03:20 +0200 Subject: [PATCH] 66: update to 0.5.1.1. --- ...38d6cbdc78e3b8ce869949b601505caa4b6cb.diff | 26 ------------------- srcpkgs/66/template | 7 +++-- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/66/patches/ed738d6cbdc78e3b8ce869949b601505caa4b6cb.diff diff --git a/srcpkgs/66/patches/ed738d6cbdc78e3b8ce869949b601505caa4b6cb.diff b/srcpkgs/66/patches/ed738d6cbdc78e3b8ce869949b601505caa4b6cb.diff deleted file mode 100644 index 3ba2c9a5fd3..00000000000 --- a/srcpkgs/66/patches/ed738d6cbdc78e3b8ce869949b601505caa4b6cb.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/lib66/ss_environ.c b/src/lib66/ss_environ.c -index 05f2697c45d3958147d9243c24a5389897c2bd41..12c2b8fcbc99fcb83adf576c1541984a4b23e8e5 100644 ---- a/src/lib66/ss_environ.c -+++ b/src/lib66/ss_environ.c -@@ -185,7 +185,7 @@ int env_make_symlink(stralloc *dst,stralloc *old_dst,sv_alltype *sv,uint8_t conf - * a directory. File means old format, in this case we enforce to pass - * to the new one. */ - r = lstat(sym_version,&st) ; -- if (S_ISLNK(st.st_mode)) -+ if (S_ISLNK(st.st_mode) && !r) - { - if (sarealpath(&saversion,sym_version) == -1) - log_warn_return(LOG_EXIT_ZERO,"sarealpath of: ",sym_version) ; -diff --git a/src/lib66/ssexec_disable.c b/src/lib66/ssexec_disable.c -index ed884021cea729be8d22af9323fa5ec67c7a7b56..5e056509171fcaaa48ae52ea2390400edc1a3312 100644 ---- a/src/lib66/ssexec_disable.c -+++ b/src/lib66/ssexec_disable.c -@@ -213,7 +213,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse - - /** The force options can be only used if the service is not marked initialized. - * This option should only be used when we have a inconsistent state between -- * the /var/lib/66/system//servicedirs/* and /var/lib/66/system//.resolve -+ * the /var/lib/66/system//servicedirs/ and /var/lib/66/system//.resolve - * directory meaning a service which is not present in the compiled db but its resolve file - * exist.*/ - if (FORCE && ss_state_check(state,name)) diff --git a/srcpkgs/66/template b/srcpkgs/66/template index 5766b141932..c6ace3e6a34 100644 --- a/srcpkgs/66/template +++ b/srcpkgs/66/template @@ -1,7 +1,7 @@ # Template file for '66' pkgname=66 -version=0.5.1.0 -revision=2 +version=0.5.1.1 +revision=1 wrksrc="66-v${version}" build_style=configure configure_args="--prefix=/usr @@ -17,8 +17,7 @@ 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=16a720f493d40a6d43e78b66ddd218335926ed988b7ea2aed82d17c6f7b5a8a6 -patch_args="-Np1" +checksum=7a0db00186f1c2111d07cbcc082f769c806820607d7ba5f49e505abf06687e0c conf_files="/etc/66/init /etc/66/init.conf"