diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-07-15 17:41:00 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-07-15 17:41:00 +0000 |
| commit | a1400796a38c8b460e554ccebc4877faa9fd2248 (patch) | |
| tree | c9af98a11a638f5514f96814190ff3b84803b120 | |
| parent | Merge branch 'cyberboxster-master-patch-30594' into 'master' (diff) | |
| parent | Bring in unreleased changes from 2020 (diff) | |
| download | laps-master.tar.gz laps-master.tar.bz2 laps-master.zip | |
version bump and rename .cron file
Closes #12, #11, and #10
See merge request bgstack15/laps!8
| -rw-r--r-- | laps.spec | 10 | ||||
| -rw-r--r-- | src/etc/cron.d/70_laps_cron (renamed from src/etc/cron.d/70_laps.cron) | 0 | ||||
| -rw-r--r-- | src/usr/share/doc/laps/changes | 10 | ||||
| -rwxr-xr-x | src/usr/share/laps/laps.sh | 6 |
4 files changed, 20 insertions, 6 deletions
@@ -11,7 +11,8 @@ Source0: laps-%{version}.tgz BuildArch: noarch BuildRequires: coreutils -Requires: bgscripts-core >= 1.4.4 +# 1.5.3 fixes #10 (bgscripts#41) +Requires: bgscripts-core >= 1.5.3 Requires: krb5-workstation Requires: openldap-clients Requires: passwd @@ -40,9 +41,12 @@ cp -pr %{name}*/src/* "%{buildroot}" %files %doc %{_docdir}/%{name}/* %config %attr(644, -, -) %{_sysconfdir}/%{name}/* -%config %attr(600, -, -) %{_sysconfdir}/cron.d/*.cron +%config %attr(600, -, -) %{_sysconfdir}/cron.d/* %{_datadir}/%{name} %changelog -* Thu Jul 18 2019 B Stack <bgstack15@gmail.com> 0.0.5-1 +* Mon Mar 22 2021 B. Stack <bgstack15@gmail.com> - 0.0.5-1 +- Version bump + +* Thu Jul 18 2019 B Stack <bgstack15@gmail.com> 0.0.4-2 - rpm built diff --git a/src/etc/cron.d/70_laps.cron b/src/etc/cron.d/70_laps_cron index 6be219b..6be219b 100644 --- a/src/etc/cron.d/70_laps.cron +++ b/src/etc/cron.d/70_laps_cron diff --git a/src/usr/share/doc/laps/changes b/src/usr/share/doc/laps/changes index c7067e3..484ad4c 100644 --- a/src/usr/share/doc/laps/changes +++ b/src/usr/share/doc/laps/changes @@ -11,5 +11,13 @@ - fix #6 document the -i interactive flag - fix #7 add LAPS_KINIT_HOST_SCRIPT_OPTS -* Thu Jul 18 2019 B Stack <bgstack15@gmail.com> - 0.0.5-1 +* Thu Jul 18 2019 B Stack <bgstack15@gmail.com> - 0.0.4-2 - move library functions out of laps + +* Fri Apr 17 2020 Ben Stack <bgstack15@gmail.com> - unreleased +- add support for libexec/ path + +* Mon Mar 22 2021 B. Stack <bgstack15@gmail.com> - 0.0.5-1 +- Fix #10: Depend on bgscripts version that fixes shldap lib +- Fix #11: laps 0.0.5 rpm +- Fix #12: 70_laps.cron name is invalid on Debian-based distros diff --git a/src/usr/share/laps/laps.sh b/src/usr/share/laps/laps.sh index 1023dc4..d561c55 100755 --- a/src/usr/share/laps/laps.sh +++ b/src/usr/share/laps/laps.sh @@ -341,6 +341,7 @@ while read flocation ; do if test -e ${flocation} ; then __thisfver="$( sh ${flo /usr/share/bgscripts/framework.sh /usr/share/laps/dependencies/framework.sh /usr/share/laps/framework.sh +/usr/libexec/bgscripts/framework.sh EOFLOCATIONS test -z "${frameworkscript}" && echo "$0: framework not found. Aborted." 1>&2 && exit 4 @@ -384,6 +385,7 @@ ${LAPS_SHLDAP} ${SHLDAP} /usr/share/bgscripts/shldap.sh /usr/lib/bgscripts/shldap.sh +/usr/libexec/bgscripts/shldap.sh EOFSENDSH test "${setvalout}" = "critical-fail" && ferror "${scriptfile}: 4. LAPS_SHLDAP not found. Aborted." && exit 4 LAPS_SHLDAP_MINIMUM=20190717 @@ -442,9 +444,9 @@ test -z "${LAPS_LDAPMODIFY_STATUS_TMPFILE}" && LAPS_LDAPMODIFY_STATUS_TMPFILE="$ test -z "${LAPS_LDAPSEARCH_STATUS_TMPFILE}" && LAPS_LDAPSEARCH_STATUS_TMPFILE="$( TMPDIR="${LAPS_TMPDIR}" mktemp )" test -z "${LAPS_PASSWORD_STATUS_TMPFILE}" && LAPS_PASSWORD_STATUS_TMPFILE="$( TMPDIR="${LAPS_TMPDIR}" mktemp )" #test -z "${LAPS_TMPFILE1}" && LAPS_TMPFILE1="$( TMPDIR="${LAPS_TMPDIR}" mktemp )" -define_if_new LAPS_KINIT_HOST_SCRIPT "/usr/share/bgscripts/work/kinit-host.sh" +define_if_new LAPS_KINIT_HOST_SCRIPT "/usr/bin/kinit-host" define_if_new LAPS_KINIT_HOST_SCRIPT_OPTS "" -define_if_new LAPS_KINIT_HOST_SCRIPT_DEFAULT "/usr/share/bgscripts/work/kinit-host.sh" +define_if_new LAPS_KINIT_HOST_SCRIPT_DEFAULT "/usr/bin/kinit-host" define_if_new LAPS_KLIST_BIN "/usr/bin/klist" define_if_new LAPS_KINIT_BIN "/usr/bin/kinit" define_if_new LAPS_LDAPSEARCH_BIN "/usr/bin/ldapsearch" |