[PC-BSD Commits] r8002 - in pcbsd/current/src-sh/pbi-manager: . etc keys

[svn at pcbsd.org]

Author: kris
Date: 2010-11-07 13:37:53 -0800 (Sun, 07 Nov 2010)
New Revision: 8002

Added:
   pcbsd/current/src-sh/pbi-manager/keys/pcbsd.ssl
Removed:
   pcbsd/current/src-sh/pbi-manager/keys/pubkey.ssl
Modified:
   pcbsd/current/src-sh/pbi-manager/etc/pbi.conf
   pcbsd/current/src-sh/pbi-manager/install.sh
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Updated pbi-manager, now load pub ssl keys from /var/db/pbi-keys directly, don't need
an entry in pbi.conf



Modified: pcbsd/current/src-sh/pbi-manager/etc/pbi.conf
===================================================================
--- pcbsd/current/src-sh/pbi-manager/etc/pbi.conf	2010-11-07 21:27:15 UTC (rev 8001)
+++ pcbsd/current/src-sh/pbi-manager/etc/pbi.conf	2010-11-07 21:37:53 UTC (rev 8002)
@@ -3,8 +3,5 @@
 # Default PBI Update Server
 PBI_UPDATEURL: https://update.pbidir.com/
 
-# Public openssl keys 
-PBI_PUBKEYS: /var/db/pbi-keys/pcbsd.ssl
-
 # Default PC-BSD Mirror for PBI / System Updates / Meta-Pkgs
 PBI_MIRROR: ftp://ftp.pcbsd.org/pub/snapshots

Modified: pcbsd/current/src-sh/pbi-manager/install.sh
===================================================================
--- pcbsd/current/src-sh/pbi-manager/install.sh	2010-11-07 21:27:15 UTC (rev 8001)
+++ pcbsd/current/src-sh/pbi-manager/install.sh	2010-11-07 21:37:53 UTC (rev 8002)
@@ -46,7 +46,8 @@
 cp ${DIR}/icons/patch.png ${LB}/share/pbi-manager/icons
 
 mkdir -p /var/db/pbi-keys >/dev/null 2>/dev/null
-cp ${DIR}/keys/pubkey.ssl /var/db/pbi-keys/pcbsd.ssl
+chmod 644 /var/db/pbi-keys
+cp ${DIR}/keys/*.ssl /var/db/pbi-keys/
 
 # Copy the ldconfig script / pbi.conf
 #mkdir -p ${LB}/etc/rc.d >/dev/null 2>/dev/null

Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-07 21:27:15 UTC (rev 8001)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-07 21:37:53 UTC (rev 8002)
@@ -4111,7 +4111,7 @@
 load_pbi_etcconf() {
 	if [ ! -e "${PBI_ETCCONF}" ] ; then return 0 ; fi
 	PBI_UPDATEURL="`cat ${PBI_ETCCONF} | grep 'PBI_UPDATEURL: ' | sed 's|PBI_UPDATEURL: ||g'`"
-	PBI_PUBKEYS="`cat ${PBI_ETCCONF} | grep 'PBI_PUBKEYS: ' | sed 's|PBI_PUBKEYS: ||g'`"
+	PBI_PUBKEYS="`ls /var/db/pbi-keys/*.ssl 2>/dev/null`"
 
         # Set the default remote mirror we are using
 	PBI_MIRROR="`cat ${PBI_ETCCONF} | grep 'PBI_MIRROR: ' | sed 's|PBI_MIRROR: ||g'`"