svn commit: r523238 - head/security/cyrus-sasl2/files

Hajimu UMEMOTO ume at FreeBSD.org
Thu Jan 16 15:08:10 UTC 2020


Author: ume
Date: Thu Jan 16 15:08:09 2020
New Revision: 523238
URL: https://svnweb.freebsd.org/changeset/ports/523238

Log:
  check exit status of sasldblistusers2 when deinstalling
  cyrus-sasl2 package.
  
  PR:		243363
  Reported by:	hsakamt__at__tsnr.com

Modified:
  head/security/cyrus-sasl2/files/pkg-deinstall.in

Modified: head/security/cyrus-sasl2/files/pkg-deinstall.in
==============================================================================
--- head/security/cyrus-sasl2/files/pkg-deinstall.in	Thu Jan 16 14:55:00 2020	(r523237)
+++ head/security/cyrus-sasl2/files/pkg-deinstall.in	Thu Jan 16 15:08:09 2020	(r523238)
@@ -16,7 +16,8 @@ CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
 # delete sasldb database
 delete_sasldb() {
 	if [ -f ${SASLDB_NAME} ] ; then
-		if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ]; then
+		result=$(${PKG_PREFIX}/sbin/sasldblistusers2)
+		if [ $? -eq 0 -a -z "${result}" ]; then
 			rm ${SASLDB_NAME}
 			if [ -f ${SASLDB_NAME}-lock ] ; then
 				rm ${SASLDB_NAME}-lock


More information about the svn-ports-all mailing list