Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 166a612
Fix a behaviour change with the update of autosetup
Baptiste Daroussin committed 6 years ago
commit 166a612b767b4bc0fd0bdc9abefcecd4b18e7ab6
parent a103e0e
8 files changed +10 -11
modified scripts/Makefile.autosetup
@@ -3,8 +3,7 @@ include @builddir@/mk/defs.mk
.SUFFIXES: .in



.in:
- 
	sed -e 's|@prefix@|$(PREFIX)|g; s|@abs_top_srcdir@|$(top_srcdir)|g' \
- 
		-e 's|@VERSION@|$(version)|g' $< > $@
+ 
	sed -e 's|%prefix%|$(PREFIX)|g' $< > $@



pdailydir=		$(sysconfdir)/periodic/daily

psecuritydir=		$(sysconfdir)/periodic/security
modified scripts/completion/_pkg.bash.in
@@ -46,15 +46,15 @@
######################################################################



_pkg_installed () {
- 
    @prefix@/sbin/pkg query "%n-%v"
+ 
    %prefix%/sbin/pkg query "%n-%v"

}



_pkg_available_name () {
- 
    @prefix@/sbin/pkg rquery "%n"
+ 
    %prefix%/sbin/pkg rquery "%n"

}



_pkg_available () {
- 
    @prefix@/sbin/pkg rquery "%n-%v"
+ 
    %prefix%/sbin/pkg rquery "%n-%v"

}



######################################################################
modified scripts/completion/_pkg.in
@@ -1,7 +1,7 @@
#compdef pkg pkg-static



_pkg_cmd() {
- 
	@prefix@/sbin/pkg "${pkg_config[@]}" "$@"
+ 
	%prefix%/sbin/pkg "${pkg_config[@]}" "$@"

}



_pkg_installed() {
modified scripts/periodic/400.status-pkg.in
@@ -7,7 +7,7 @@ if [ -r /etc/defaults/periodic.conf ]; then
    . /etc/defaults/periodic.conf

    source_periodic_confs

fi
- 
pkgcmd=@prefix@/sbin/pkg
+ 
pkgcmd=%prefix%/sbin/pkg



status_pkg() {

    local pkgargs
modified scripts/periodic/410.pkg-audit.in
@@ -51,7 +51,7 @@ security_daily_compat_var security_status_pkgaudit_jails
security_daily_compat_var security_status_pkgaudit_expiry



# Compute PKG_DBDIR from the config file.
- 
pkgcmd=@prefix@/sbin/pkg
+ 
pkgcmd=%prefix%/sbin/pkg

PKG_DBDIR=`${pkgcmd} config PKG_DBDIR`

auditfile="${PKG_DBDIR}/vuln.xml"
modified scripts/periodic/411.pkg-backup.in
@@ -117,7 +117,7 @@ case "${daily_backup_pkg_enable:-YES}" in
*)

	bak="${daily_backup_pkg_dir:-/var/backups}"

	bak_file="${bak}/pkg.sql.xz"
- 
	pkgcmd=@prefix@/sbin/pkg
+ 
	pkgcmd=%prefix%/sbin/pkg



	if ! ${pkgcmd} -N >/dev/null 2>&1 ; then

		echo 'pkg-backup is enabled but pkg is not used'
modified scripts/periodic/460.pkg-checksum.in
@@ -80,7 +80,7 @@ rc=0


if check_yesno_period security_status_pkg_checksum_enable

then
- 
	pkgcmd=@prefix@/sbin/pkg
+ 
	pkgcmd=%prefix%/sbin/pkg



	echo

	echo 'Checking for packages with mismatched checksums:'
modified scripts/periodic/490.status-pkg-changes.in
@@ -85,7 +85,7 @@ list_pkgs_all() {


case "$daily_status_pkg_changes_enable" in

	[Yy][Ee][Ss])
- 
	pkgcmd=@prefix@/sbin/pkg
+ 
	pkgcmd=%prefix%/sbin/pkg



	echo

	echo 'Changes in installed packages:'