Merge branch 'stable/15.7' of github.com:opnsense/core into stable/15.7

Makefile

@@ -14,22 +14,27 @@ umount: force
 	/sbin/umount -f "<above>:${.CURDIR}/src"
 
 install: force
-	# move all sources to their destination
-	@mkdir -p ${DESTDIR}/usr/local
-	@cp -r ${.CURDIR}/src/* ${DESTDIR}/usr/local
-	# invoke pkg(8) bootstraping
 	@make -C ${.CURDIR}/pkg install
-	# invoke translation glue
 	@make -C ${.CURDIR}/lang install
-	# invoke third-party tools
 	@make -C ${.CURDIR}/contrib install
-	# finally pretty-print a list of files present
-	@(cd ${.CURDIR}/src; find * -type f) | \
-	    xargs -n1 printf "/usr/local/%s\n"
+	@mkdir -p ${DESTDIR}/usr/local
+	@cp -vr ${.CURDIR}/src/* ${DESTDIR}/usr/local
+
+plist: force
+	@make -C ${.CURDIR}/pkg plist
+	@make -C ${.CURDIR}/lang plist
+	@make -C ${.CURDIR}/contrib plist
+	@(cd ${.CURDIR}/src; find * -type f) | while read FILE; do \
+		if [ $${FILE%%.sample} != $${FILE} ]; then \
+			echo "@sample /usr/local/$${FILE}"; \
+		else \
+			echo "/usr/local/$${FILE}"; \
+		fi; \
+	done
 
 lint: force
 	find ${.CURDIR}/src ${.CURDIR}/lang/dynamic/helpers \
-	    ! -name "*.xml" ! -name "*.eot" \
+	    ! -name "*.xml" ! -name "*.xml.sample" ! -name "*.eot" \
 	    ! -name "*.svg" ! -name "*.woff" ! -name "*.woff2" \
 	    ! -name "*.otf" ! -name "*.png" ! -name "*.js" \
 	    ! -name "*.scss" ! -name "*.py" ! -name "*.ttf" \

contrib/Makefile

 all:
 
 install:
-	# bootstrap needed root directories
 	@mkdir -p ${DESTDIR}/usr/local/share
-	# openvpn client exporter files
-	@cp -r ${.CURDIR}/openvpn ${DESTDIR}/usr/local/share/
+	@cp -vr ${.CURDIR}/openvpn ${DESTDIR}/usr/local/share/
+	@cp -vr ${.CURDIR}/mobile-broadband-provider-info \
+	    ${DESTDIR}/usr/local/share/
+
+plist:
 	@(cd ${.CURDIR}/openvpn; find * -type f) | \
 	    xargs -n1 printf "/usr/local/share/openvpn/%s\n"
-	# mobile broadband provider database
-	@cp -r ${.CURDIR}/mobile-broadband-provider-info \
-	    ${DESTDIR}/usr/local/share/
 	@(cd ${.CURDIR}/mobile-broadband-provider-info; find * -type f) | \
 	    xargs -n1 printf \
 	    "/usr/local/share/mobile-broadband-provider-info/%s\n"
 
-.PHONY: install
+.PHONY: install plist

lang/Makefile

@@ -7,13 +7,20 @@ LOCALEDIR=	/usr/local/share/locale/%%LANG%%/LC_MESSAGES
 
 LANGUAGES=	de_DE es_CO ja_JP zh_CN
 TEMPLATE=	en_US
+INSTALL=
+PLIST=
 
 .for LANG in ${LANGUAGES}
 ${LANG}DIR=	${LOCALEDIR:S/%%LANG%%/${LANG}/g}
-${LANG}:
+install-${LANG}:
 	@mkdir -p ${DESTDIR}${${LANG}DIR}
-	@${MSGFMT} -o ${DESTDIR}${${LANG}DIR}/OPNsense.mo ${LANG}.po
+	${MSGFMT} -o ${DESTDIR}${${LANG}DIR}/OPNsense.mo ${LANG}.po
+
+plist-${LANG}:
 	@echo ${${LANG}DIR}/OPNsense.mo
+
+INSTALL+=	install-${LANG}
+PLIST+=		plist-${LANG}
 .endfor
 
 ${TEMPLATE}:
@@ -21,10 +28,11 @@ ${TEMPLATE}:
 	cd ${.CURDIR}/.. && find src lang/dynamic/helpers | \
 	    xargs ${XGETTEXT} -j -o ${.CURDIR}/${TEMPLATE}.pot
 
-install: ${LANGUAGES}
 template: ${TEMPLATE}
+install: ${INSTALL}
+plist: ${PLIST}
 
 dynamic:
 	@${.CURDIR}/dynamic/collect.py ${.CURDIR}/..
 
-.PHONY: ${LANGUAGES} ${TEMPLATE} dynamic
+.PHONY: ${INSTALL} ${PLIST} ${TEMPLATE} dynamic

pkg/Makefile

 all:
 
 install:
-	# main pkg(8) glue
-	@cp ${.CURDIR}/+PRE_DEINSTALL ${DESTDIR}
-	@cp ${.CURDIR}/+POST_INSTALL ${DESTDIR}
-	@cp ${.CURDIR}/+MANIFEST ${DESTDIR}
-	# config.xml factory reset file
-	@cp ${.CURDIR}/config.xml.sample ${DESTDIR}/usr/local/etc
-	@echo "@sample /usr/local/etc/config.xml.sample"
-	# create needed root direction
+	@mkdir -p ${DESTDIR}
+	@cp -v ${.CURDIR}/+PRE_DEINSTALL ${DESTDIR}
+	@cp -v ${.CURDIR}/+POST_INSTALL ${DESTDIR}
+	@cp -v ${.CURDIR}/+MANIFEST ${DESTDIR}
 	@mkdir -p ${DESTDIR}/usr/local/etc/pkg
-	# available repository configurations
-	@cp -r ${.CURDIR}/repos ${DESTDIR}/usr/local/etc/pkg/
+	@cp -vr ${.CURDIR}/repos ${DESTDIR}/usr/local/etc/pkg/
+	@cp -vr ${.CURDIR}/fingerprints ${DESTDIR}/usr/local/etc/pkg/
+
+plist:
 	@(cd ${.CURDIR}/repos; find * -type f) | \
 	    xargs -n1 printf "/usr/local/etc/pkg/repos/%s\n"
-	# available fingerprints
-	@cp -r ${.CURDIR}/fingerprints ${DESTDIR}/usr/local/etc/pkg/
 	@(cd ${.CURDIR}/fingerprints; find * -type f) | \
 	    xargs -n1 printf "/usr/local/etc/pkg/fingerprints/%s\n"
-	# XXX CONSERVATIVE_UPGRADE is not very helpful
-	@cp ${.CURDIR}/pkg.conf ${DESTDIR}/usr/local/etc
-	@echo /usr/local/etc/pkg.conf
 
-.PHONY: install
+.PHONY: install plist

pkg/pkg.conf

-conservative_upgrade: yes

src/etc/ca_countries

-AX Aland Islands
-AD Andorra
-AE United Arab Emirates
-AF Afghanistan
-AG Antigua and Barbuda
-AI Anguilla
-AL Albania
-AM Armenia
-AN Netherlands Antilles
-AO Angola
-AQ Antarctica
-AR Argentina
-AS American Samoa
-AT Austria
-AU Australia
-AW Aruba
-AZ Azerbaijan
-BA Bosnia and Herzegovina
-BB Barbados
-BD Bangladesh
-BE Belgium
-BF Burkina Faso
-BG Bulgaria
-BH Bahrain
-BI Burundi
-BJ Benin
-BM Bermuda
-BN Brunei Darussalam
-BO Bolivia
-BR Brazil
-BS Bahamas
-BT Bhutan
-BV Bouvet Island
-BW Botswana
-BZ Belize
-CA Canada
-CC Cocos (Keeling) Islands
-CF Central African Republic
-CH Switzerland
-CI Cote D'Ivoire (Ivory Coast)
-CK Cook Islands
-CL Chile
-CM Cameroon
-CN China
-CO Colombia
-CR Costa Rica
-CS Czechoslovakia (former)
-CV Cape Verde
-CX Christmas Island
-CY Cyprus
-CZ Czech Republic
-DE Germany
-DJ Djibouti
-DK Denmark
-DM Dominica
-DO Dominican Republic
-DZ Algeria
-EC Ecuador
-EE Estonia
-EG Egypt
-EH Western Sahara
-ER Eritrea
-ES Spain
-ET Ethiopia
-FI Finland
-FJ Fiji
-FK Falkland Islands (Malvinas)
-FM Micronesia
-FO Faroe Islands
-FR France
-FX France, Metropolitan
-GA Gabon
-GB Great Britain (UK)
-GD Grenada
-GE Georgia
-GF French Guiana
-GG Guernsey
-GH Ghana
-GI Gibraltar
-GL Greenland
-GM Gambia
-GN Guinea
-GP Guadeloupe
-GQ Equatorial Guinea
-GR Greece
-GS S. Georgia and S. Sandwich Isls.
-GT Guatemala
-GU Guam
-GW Guinea-Bissau
-GY Guyana
-HK Hong Kong
-HM Heard and McDonald Islands
-HN Honduras
-HR Croatia (Hrvatska)
-HT Haiti
-HU Hungary
-ID Indonesia
-IE Ireland
-IL Israel
-IM Isle of Man
-IN India
-IO British Indian Ocean Territory
-IS Iceland
-IT Italy
-JE Jersey
-JM Jamaica
-JO Jordan
-JP Japan
-KE Kenya
-KG Kyrgyzstan
-KH Cambodia
-KI Kiribati
-KM Comoros
-KN Saint Kitts and Nevis
-KR Korea (South)
-KW Kuwait
-KY Cayman Islands
-KZ Kazakhstan
-LA Laos
-LC Saint Lucia
-LI Liechtenstein
-LK Sri Lanka
-LS Lesotho
-LT Lithuania
-LU Luxembourg
-LV Latvia
-LY Libya
-MA Morocco
-MC Monaco
-MD Moldova
-ME Montenegro
-MG Madagascar
-MH Marshall Islands
-MK Macedonia
-ML Mali
-MM Myanmar
-MN Mongolia
-MO Macau
-MP Northern Mariana Islands
-MQ Martinique
-MR Mauritania
-MS Montserrat
-MT Malta
-MU Mauritius
-MV Maldives
-MW Malawi
-MX Mexico
-MY Malaysia
-MZ Mozambique
-NA Namibia
-NC New Caledonia
-NE Niger
-NF Norfolk Island
-NG Nigeria
-NI Nicaragua
-NL Netherlands
-NO Norway
-NP Nepal
-NR Nauru
-NT Neutral Zone
-NU Niue
-NZ New Zealand (Aotearoa)
-OM Oman
-PA Panama
-PE Peru
-PF French Polynesia
-PG Papua New Guinea
-PH Philippines
-PK Pakistan
-PL Poland
-PM St. Pierre and Miquelon
-PN Pitcairn
-PR Puerto Rico
-PS Palestinian Territory
-PT Portugal
-PW Palau
-PY Paraguay
-QA Qatar
-RE Reunion
-RO Romania
-RS Serbia
-RU Russian Federation
-RW Rwanda
-SA Saudi Arabia
-SB Solomon Islands
-SC Seychelles
-SE Sweden
-SG Singapore
-SH St. Helena
-SI Slovenia
-SJ Svalbard and Jan Mayen Islands
-SK Slovak Republic
-SL Sierra Leone
-SM San Marino
-SN Senegal
-SR Suriname
-ST Sao Tome and Principe
-SU USSR (former)
-SV El Salvador
-SZ Swaziland
-TC Turks and Caicos Islands
-TD Chad
-TF French Southern Territories
-TG Togo
-TH Thailand
-TJ Tajikistan
-TK Tokelau
-TM Turkmenistan
-TN Tunisia
-TO Tonga
-TP East Timor
-TR Turkey
-TT Trinidad and Tobago
-TV Tuvalu
-TW Taiwan
-TZ Tanzania
-UA Ukraine
-UG Uganda
-UM US Minor Outlying Islands
-US United States
-UY Uruguay
-UZ Uzbekistan
-VA Vatican City State (Holy See)
-VC Saint Vincent and the Grenadines
-VE Venezuela
-VG Virgin Islands (British)
-VI Virgin Islands (U.S.)
-VN Viet Nam
-VU Vanuatu
-WF Wallis and Futuna Islands
-WS Samoa
-YE Yemen
-YT Mayotte
-ZA South Africa
-ZM Zambia