Browse Source

Remove support for pkg.conf in light of the consolidation towards

a single configuration file for the OpenBSD repository location.
The pkg_* tools now use installurl(5) to find the package repository.
NOTE:
/etc/installurl only contains a single URL pointing to a mirror.
Use the PKG_PATH environment variable to specify more than one
package repository.
prodded by and OK deraadt@ aja@
OPENBSD_6_1
rpe 7 years ago
parent
commit
f930dc7a4d
3 changed files with 3 additions and 150 deletions
  1. +2
    -2
      src/etc/Makefile
  2. +1
    -2
      src/etc/changelist
  3. +0
    -146
      src/etc/examples/pkg.conf

+ 2
- 2
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.451 2017/02/26 16:51:18 matthieu Exp $
# $OpenBSD: Makefile,v 1.452 2017/02/27 21:53:11 rpe Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -40,7 +40,7 @@ MUTABLE=acme-client.conf changelist daily etc.${MACHINE}/disktab \
# -rw-r--r-- # -rw-r--r--
EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \ EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \
httpd.conf ifstated.conf inetd.conf man.conf mixerctl.conf \ httpd.conf ifstated.conf inetd.conf man.conf mixerctl.conf \
mrouted.conf ntpd.conf pkg.conf printcap rbootd.conf \
mrouted.conf ntpd.conf printcap rbootd.conf \
remote sensorsd.conf wsconsctl.conf remote sensorsd.conf wsconsctl.conf
# -rw------- # -rw-------


+ 1
- 2
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.115 2017/01/24 03:13:13 ajacoutot Exp $
# $OpenBSD: changelist,v 1.116 2017/02/27 21:53:11 rpe Exp $
# #
# List of files which the security script backs up and checks # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -90,7 +90,6 @@
/etc/passwd /etc/passwd
/etc/pf.conf /etc/pf.conf
/etc/pf.os /etc/pf.os
/etc/pkg.conf
/etc/printcap /etc/printcap
/etc/profile /etc/profile
/etc/protocols /etc/protocols


+ 0
- 146
src/etc/examples/pkg.conf View File

@ -1,146 +0,0 @@
# $OpenBSD: pkg.conf,v 1.25 2017/02/23 12:48:08 sthen Exp $
#
# Mirrors update at differing schedules. If using snapshots, sticking
# with one host will reduce risk of fetching out-of-sync packages.
# Anycast CDN
#installpath = mirrors.evowise.com
# Australia
#installpath = mirror.internode.on.net
#installpath = mirror.aarnet.edu.au
# Austria
#installpath = http://ftp5.eu.openbsd.org/ftp/pub/OpenBSD/%c/packages/%a/
#installpath = ftp2.eu.openbsd.org
# Brazil
#installpath = openbsd.c3sl.ufpr.br
#installpath = mirrors.unb.br
# Bulgaria
#installpath = openbsd.ipacct.com
# Canada
#installpath = ftp.OpenBSD.org
#installpath = openbsd.cs.toronto.edu
#installpath = openbsd.delfic.org
#installpath = openbsd.mirror.netelligent.ca
# Costa Rica
#installpath = http://mirrors.ucr.ac.cr/OpenBSD/%c/packages/%a/
# Denmark
#installpath = mirrors.dotsrc.org
#installpath = mirror.one.com
# Estonia
#installpath = ftp.aso.ee
# France
#installpath = ftp.fr.openbsd.org
#installpath = ftp2.fr.openbsd.org
#installpath = mirrors.ircam.fr
# Germany
#installpath = ftp.spline.de
#installpath = mirror.hs-esslingen.de
#installpath = ftp.bytemine.net
#installpath = http://ftp.halifax.rwth-aachen.de/openbsd/%c/packages/%a/
#installpath = http://artfiles.org/openbsd/%c/packages/%a/
#installpath = ftp.hostserver.de
# Greece
#installpath = ftp.cc.uoc.gr
# Hong Kong
#installpath = openbsd.hk
# Hungary
#installpath = ftp.fsn.hu
# Indonesia
#installpath = kartolo.sby.datautama.net.id
# Ireland
#installpath = ftp.heanet.ie
# Italy
#installpath = openbsd.mirror.garr.it
# Japan
#installpath = ftp.jaist.ac.jp
#installpath = www.ftp.ne.jp
# Lithuania
#installpath = mirror.litnet.lt
# The Netherlands
#installpath = mirror.meerval.net
#installpath = ftp.nluug.nl
#installpath = ftp.bit.nl
#installpath = mirrors.dalenys.com
# Phillipines
#installpath = mirror.rise.ph
# Poland
#installpath = piotrkosoft.net
#installpath = ftp.icm.edu.pl
# Romania
#installpath = mirrors.pidginhost.com
# Russia
#installpath = mirror.yandex.ru
# Slovenia
#installpath = www.obsd.si
# Sweden
#installpath = ftp.eu.openbsd.org
# Switzerland
#installpath = http://mirror.switch.ch/ftp/pub/OpenBSD/%c/packages/%a/
# Taiwan
#installpath = ftp.yzu.edu.tw
# Ukraine
#installpath = mirror.eject.name
# United Kingdom
#installpath = www.mirrorservice.org
#installpath = anorien.csc.warwick.ac.uk
#installpath = mirror.bytemark.co.uk
#installpath = mirror.ox.ac.uk
#installpath = mirror.exonetric.net
# CA, USA
#installpath = mirrors.sonic.net
# CO, USA
#installpath = ftp3.usa.openbsd.org
# ID, USA
#installpath = mirrors.syringanetworks.net
# IL, USA
#installpath = mirrors.gigenet.com
# MA, USA
#installpath = mirrors.mit.edu
# NY, USA
#installpath = ftp4.usa.openbsd.org
#installpath = ftp5.usa.openbsd.org
# PA, USA
#installpath = http://openbsd.mirrors.hoobly.com/%c/packages/%a/
#installpath = http://openbsd.mirrors.pair.com/%c/packages/%a/
# TX, USA
#installpath = mirror.esc7.net
# VA, USA
#installpath = mirror.jmu.edu

Loading…
Cancel
Save