Skip to content
Browse files

Backport to 9.2 the fixes for pkg+http:// in pkg.conf

  • Loading branch information...
1 parent cfad5bc commit 9b2e2e69aed37360418f36c9b3d0e68a1d2abdb1 @kmoore134 kmoore134 committed
View
2 src-sh/libsh/functions.sh
@@ -48,7 +48,7 @@ download_cache_packages()
if [ $? -ne 0 ] ; then
exit_err "Failed getting packagesite:"
fi
- pkgUrl="`grep '^packagesite:' /usr/local/etc/pkg.conf | awk '{print $2}'`"
+ pkgUrl="`grep '^packagesite:' /usr/local/etc/pkg.conf | awk '{print $2}' | sed 's|pkg+||g'`"
if [ ! -d "$PKG_CACHEDIR/All" ] ; then
mkdir -p ${PKG_CACHEDIR}/All
View
2 src-sh/pbi-manager10/pbi-manager
@@ -1788,7 +1788,7 @@ set_make_options() {
if [ "$PBI_PKGNGBUILD" ] ; then
echo "Installing pkgng..."
- pkgFetchURL=`grep "^packagesite:" /usr/local/etc/pkg.conf | awk '{print $2}'`
+ pkgFetchURL=`grep "^packagesite:" /usr/local/etc/pkg.conf | awk '{print $2}' | sed 's|pkg+||g'`
cd /tmp
fetch -o pkg.txz ${pkgFetchURL}/Latest/pkg.txz
if [ $? -ne 0 ] ; then exit_err "Failed fetching pkgng..."; fi
View
2 src-sh/pc-updatemanager/pc-updatemanager
@@ -422,7 +422,7 @@ start_major_fbsd_update() {
# Set the new pkg.conf file to the new repo
local arch=`uname -m`
- echo "packagesite: http://pkg.cdn.pcbsd.org/$rel/$arch" >/usr/local/etc/pkg.conf
+ echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/$rel/$arch" >/usr/local/etc/pkg.conf
echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf
echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf
View
4 src-sh/warden/scripts/backend/functions.sh
@@ -799,7 +799,7 @@ tar xvf pkg.txz --exclude +MANIFEST --exclude +MTREE_DIRS 2>/dev/null
pkg add pkg.txz
rm pkg.txz
-echo "packagesite: http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf
+echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf
echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf
echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf
@@ -832,7 +832,7 @@ rm pkg.txz
mount -t devfs devfs /dev
-echo "packagesite: http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf
+echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf
echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf
echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf
pkg install -y pcbsd-utils

0 comments on commit 9b2e2e6

Please sign in to comment.
Something went wrong with that request. Please try again.