webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2020-12-02 23:43:15 +01:00
parent a11783096e 77b7668c9e
commit b689391f27
14 changed files with 3490 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/cfgroot/location-functions.pl
View File

@@ -163,9 +163,6 @@ sub get_full_country_name($) {
# Grab location name from hash.
$name = $not_iso_3166_location{$code};
} else {
# Init libloc database connection.
my $db_handle = &init();
# Get the country name by using the location module.
$name = &Location::get_country_name($db_handle, $code);
}

1
config/rootfiles/core/153/filelists/ddns Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ddns

3097
config/rootfiles/packages/aws-cli
View File

File diff suppressed because it is too large Load Diff

123
config/rootfiles/packages/python3-botocore
View File

@@ -1,10 +1,10 @@
#usr/lib/python3.8/site-packages/botocore
#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info
#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/PKG-INFO
#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/SOURCES.txt
#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/dependency_links.txt
#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/requires.txt
#usr/lib/python3.8/site-packages/botocore-1.16.1-py3.8.egg-info/top_level.txt
#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info
#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/PKG-INFO
#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/SOURCES.txt
#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/dependency_links.txt
#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/requires.txt
#usr/lib/python3.8/site-packages/botocore-1.19.28-py3.8.egg-info/top_level.txt
usr/lib/python3.8/site-packages/botocore/__init__.py
usr/lib/python3.8/site-packages/botocore/args.py
usr/lib/python3.8/site-packages/botocore/auth.py
@@ -43,6 +43,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25
#usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/amplify/2017-07-25/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/amplifybackend
#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11
#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/amplifybackend/2020-08-11/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/apigateway
#usr/lib/python3.8/site-packages/botocore/data/apigateway/2015-07-09
#usr/lib/python3.8/site-packages/botocore/data/apigateway/2015-07-09/examples-1.json
@@ -60,6 +64,14 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09
#usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/appconfig/2019-10-09/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/appflow
#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23
#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/appflow/2020-08-23/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/appintegrations
#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29
#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/appintegrations/2020-07-29/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/application-autoscaling
#usr/lib/python3.8/site-packages/botocore/data/application-autoscaling/2016-02-06
#usr/lib/python3.8/site-packages/botocore/data/application-autoscaling/2016-02-06/examples-1.json
@@ -111,6 +123,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/batch/2016-08-10/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/braket
#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01
#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/braket/2019-09-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/budgets
#usr/lib/python3.8/site-packages/botocore/data/budgets/2016-10-20
#usr/lib/python3.8/site-packages/botocore/data/budgets/2016-10-20/examples-1.json
@@ -223,6 +239,11 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2019-03-26/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/cloudfront/2020-05-31/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/cloudhsm
#usr/lib/python3.8/site-packages/botocore/data/cloudhsm/2014-05-30
#usr/lib/python3.8/site-packages/botocore/data/cloudhsm/2014-05-30/examples-1.json
@@ -254,6 +275,11 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/cloudwatch/2010-08-01/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/codeartifact
#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22
#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/paginators-1.sdk-extras.json
#usr/lib/python3.8/site-packages/botocore/data/codeartifact/2018-09-22/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/codebuild
#usr/lib/python3.8/site-packages/botocore/data/codebuild/2016-10-06
#usr/lib/python3.8/site-packages/botocore/data/codebuild/2016-10-06/examples-1.json
@@ -328,6 +354,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/config/2014-11-12/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/config/2014-11-12/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/connect
#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens
#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21
#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/connect-contact-lens/2020-08-21/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08
#usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/connect/2017-08-08/paginators-1.json
@@ -341,6 +371,14 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/cur/2017-01-06/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/customer-profiles
#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15
#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/customer-profiles/2020-08-15/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/databrew
#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25
#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/databrew/2017-07-25/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/dataexchange
#usr/lib/python3.8/site-packages/botocore/data/dataexchange/2017-07-25
#usr/lib/python3.8/site-packages/botocore/data/dataexchange/2017-07-25/paginators-1.json
@@ -367,6 +405,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/devicefarm/2015-06-23/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/devops-guru
#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01
#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/devops-guru/2020-12-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/directconnect
#usr/lib/python3.8/site-packages/botocore/data/directconnect/2012-10-25
#usr/lib/python3.8/site-packages/botocore/data/directconnect/2012-10-25/examples-1.json
@@ -392,6 +434,7 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31
#usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/service-2.sdk-extras.json
#usr/lib/python3.8/site-packages/botocore/data/docdb/2014-10-31/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/ds
#usr/lib/python3.8/site-packages/botocore/data/ds/2015-04-16
@@ -453,6 +496,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/ec2/2016-11-15/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/ec2/2016-11-15/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/ecr
#usr/lib/python3.8/site-packages/botocore/data/ecr-public
#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30
#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/ecr-public/2020-10-30/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21
#usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/ecr/2015-09-21/paginators-1.json
@@ -495,6 +542,7 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/elasticbeanstalk/2010-12-01/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/elastictranscoder
#usr/lib/python3.8/site-packages/botocore/data/elastictranscoder/2012-09-25
#usr/lib/python3.8/site-packages/botocore/data/elastictranscoder/2012-09-25/examples-1.json
@@ -595,12 +643,21 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/health/2016-08-04/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/honeycode
#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01
#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
#usr/lib/python3.8/site-packages/botocore/data/honeycode/2020-03-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/iam
#usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08
#usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/iam/2010-05-08/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/identitystore
#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15
#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/identitystore/2020-06-15/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/imagebuilder
#usr/lib/python3.8/site-packages/botocore/data/imagebuilder/2019-12-02
#usr/lib/python3.8/site-packages/botocore/data/imagebuilder/2019-12-02/paginators-1.json
@@ -619,6 +676,7 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/iot
#usr/lib/python3.8/site-packages/botocore/data/iot-data
#usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28
#usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/iot-data/2015-05-28/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/iot-jobs-data
#usr/lib/python3.8/site-packages/botocore/data/iot-jobs-data/2017-09-29
@@ -664,6 +722,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06
#usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/iotthingsgraph/2018-09-06/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/ivs
#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14
#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/ivs/2020-07-14/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/kafka
#usr/lib/python3.8/site-packages/botocore/data/kafka/2018-11-14
#usr/lib/python3.8/site-packages/botocore/data/kafka/2018-11-14/paginators-1.json
@@ -747,6 +809,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/logs/2014-03-28/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/lookoutvision
#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20
#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/lookoutvision/2020-11-20/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/machinelearning
#usr/lib/python3.8/site-packages/botocore/data/machinelearning/2014-12-12
#usr/lib/python3.8/site-packages/botocore/data/machinelearning/2014-12-12/examples-1.json
@@ -758,6 +824,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/macie/2017-12-19/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/macie2
#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01
#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/macie2/2020-01-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/managedblockchain
#usr/lib/python3.8/site-packages/botocore/data/managedblockchain/2018-09-24
#usr/lib/python3.8/site-packages/botocore/data/managedblockchain/2018-09-24/paginators-1.json
@@ -839,6 +909,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/mturk/2017-01-17/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/mwaa
#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01
#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/mwaa/2020-07-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/neptune
#usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31
#usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/examples-1.json
@@ -846,6 +920,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/service-2.sdk-extras.json
#usr/lib/python3.8/site-packages/botocore/data/neptune/2014-10-31/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/network-firewall
#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12
#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/network-firewall/2020-11-12/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/networkmanager
#usr/lib/python3.8/site-packages/botocore/data/networkmanager/2019-07-05
#usr/lib/python3.8/site-packages/botocore/data/networkmanager/2019-07-05/paginators-1.json
@@ -941,6 +1019,11 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/rds/2014-10-31/service-2.sdk-extras.json
#usr/lib/python3.8/site-packages/botocore/data/rds/2014-10-31/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/redshift
#usr/lib/python3.8/site-packages/botocore/data/redshift-data
#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20
#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/paginators-1.sdk-extras.json
#usr/lib/python3.8/site-packages/botocore/data/redshift-data/2019-12-20/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01
#usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/redshift/2012-12-01/paginators-1.json
@@ -980,6 +1063,7 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/route53resolver
#usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01
#usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/paginators-1.sdk-extras.json
#usr/lib/python3.8/site-packages/botocore/data/route53resolver/2018-04-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/s3
#usr/lib/python3.8/site-packages/botocore/data/s3/2006-03-01
@@ -991,11 +1075,19 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20
#usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/s3control/2018-08-20/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/s3outposts
#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25
#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/s3outposts/2017-07-25/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/sagemaker
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-a2i-runtime/2019-11-07/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-featurestore-runtime/2020-07-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime/2017-05-13
#usr/lib/python3.8/site-packages/botocore/data/sagemaker-runtime/2017-05-13/examples-1.json
@@ -1038,6 +1130,10 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/service-quotas/2019-06-24/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/service-quotas/2019-06-24/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog-appregistry/2020-06-24/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/servicecatalog/2015-12-10/paginators-1.json
@@ -1096,7 +1192,12 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/examples-1.json
#usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/ssm/2014-11-06/waiters-2.json
#usr/lib/python3.8/site-packages/botocore/data/sso
#usr/lib/python3.8/site-packages/botocore/data/sso-admin
#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20
#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/sso-admin/2020-07-20/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/sso-oidc
#usr/lib/python3.8/site-packages/botocore/data/sso-oidc/2019-06-10
#usr/lib/python3.8/site-packages/botocore/data/sso-oidc/2019-06-10/paginators-1.json
@@ -1137,6 +1238,14 @@ usr/lib/python3.8/site-packages/botocore/data
#usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27
#usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/textract/2018-06-27/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/timestream-query
#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01
#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/timestream-query/2018-11-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/timestream-write
#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01
#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01/paginators-1.json
#usr/lib/python3.8/site-packages/botocore/data/timestream-write/2018-11-01/service-2.json
#usr/lib/python3.8/site-packages/botocore/data/transcribe
#usr/lib/python3.8/site-packages/botocore/data/transcribe/2017-10-26
#usr/lib/python3.8/site-packages/botocore/data/transcribe/2017-10-26/examples-1.json
@@ -1198,11 +1307,9 @@ usr/lib/python3.8/site-packages/botocore/discovery.py
usr/lib/python3.8/site-packages/botocore/docs/__init__.py
#usr/lib/python3.8/site-packages/botocore/docs/bcdoc
usr/lib/python3.8/site-packages/botocore/docs/bcdoc/__init__.py
usr/lib/python3.8/site-packages/botocore/docs/bcdoc/docevents.py
usr/lib/python3.8/site-packages/botocore/docs/bcdoc/docstringparser.py
usr/lib/python3.8/site-packages/botocore/docs/bcdoc/restdoc.py
usr/lib/python3.8/site-packages/botocore/docs/bcdoc/style.py
usr/lib/python3.8/site-packages/botocore/docs/bcdoc/textwriter.py
usr/lib/python3.8/site-packages/botocore/docs/client.py
usr/lib/python3.8/site-packages/botocore/docs/docstring.py
usr/lib/python3.8/site-packages/botocore/docs/example.py

52
config/rootfiles/packages/python3-urllib3 Normal file
View File

@@ -0,0 +1,52 @@
usr/lib/python3.8/site-packages/urllib3
#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info
#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/PKG-INFO
#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/SOURCES.txt
#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/dependency_links.txt
#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/requires.txt
#usr/lib/python3.8/site-packages/urllib3-1.26.2-py3.8.egg-info/top_level.txt
#usr/lib/python3.8/site-packages/urllib3/__init__.py
#usr/lib/python3.8/site-packages/urllib3/_collections.py
#usr/lib/python3.8/site-packages/urllib3/_version.py
#usr/lib/python3.8/site-packages/urllib3/connection.py
#usr/lib/python3.8/site-packages/urllib3/connectionpool.py
#usr/lib/python3.8/site-packages/urllib3/contrib
#usr/lib/python3.8/site-packages/urllib3/contrib/__init__.py
#usr/lib/python3.8/site-packages/urllib3/contrib/_appengine_environ.py
#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport
#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/__init__.py
#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/bindings.py
#usr/lib/python3.8/site-packages/urllib3/contrib/_securetransport/low_level.py
#usr/lib/python3.8/site-packages/urllib3/contrib/appengine.py
#usr/lib/python3.8/site-packages/urllib3/contrib/ntlmpool.py
#usr/lib/python3.8/site-packages/urllib3/contrib/pyopenssl.py
#usr/lib/python3.8/site-packages/urllib3/contrib/securetransport.py
#usr/lib/python3.8/site-packages/urllib3/contrib/socks.py
#usr/lib/python3.8/site-packages/urllib3/exceptions.py
#usr/lib/python3.8/site-packages/urllib3/fields.py
#usr/lib/python3.8/site-packages/urllib3/filepost.py
#usr/lib/python3.8/site-packages/urllib3/packages
#usr/lib/python3.8/site-packages/urllib3/packages/__init__.py
#usr/lib/python3.8/site-packages/urllib3/packages/backports
#usr/lib/python3.8/site-packages/urllib3/packages/backports/__init__.py
#usr/lib/python3.8/site-packages/urllib3/packages/backports/makefile.py
#usr/lib/python3.8/site-packages/urllib3/packages/six.py
#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname
#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname/__init__.py
#usr/lib/python3.8/site-packages/urllib3/packages/ssl_match_hostname/_implementation.py
#usr/lib/python3.8/site-packages/urllib3/poolmanager.py
#usr/lib/python3.8/site-packages/urllib3/request.py
#usr/lib/python3.8/site-packages/urllib3/response.py
#usr/lib/python3.8/site-packages/urllib3/util
#usr/lib/python3.8/site-packages/urllib3/util/__init__.py
#usr/lib/python3.8/site-packages/urllib3/util/connection.py
#usr/lib/python3.8/site-packages/urllib3/util/proxy.py
#usr/lib/python3.8/site-packages/urllib3/util/queue.py
#usr/lib/python3.8/site-packages/urllib3/util/request.py
#usr/lib/python3.8/site-packages/urllib3/util/response.py
#usr/lib/python3.8/site-packages/urllib3/util/retry.py
#usr/lib/python3.8/site-packages/urllib3/util/ssl_.py
#usr/lib/python3.8/site-packages/urllib3/util/ssltransport.py
#usr/lib/python3.8/site-packages/urllib3/util/timeout.py
#usr/lib/python3.8/site-packages/urllib3/util/url.py
#usr/lib/python3.8/site-packages/urllib3/util/wait.py

2
html/cgi-bin/tor.cgi
View File

@@ -340,7 +340,7 @@ END
@guard_countries = split(/\|/, $settings{'TOR_GUARD_COUNTRY'});
}
my @country_codes = &Location::database_countries($db_handle);
my @country_codes = &Location::Functions::get_locations("no_special_locations");
foreach my $country_code (@country_codes) {
# Convert country code into upper case format.
$country_code = uc($country_code);

8
lfs/aws-cli
View File

@@ -24,15 +24,15 @@
include Config
VER = 1.15.77
VER = 1.18.188
THISAPP = aws-cli-$(VER)
THISAPP = awscli-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = aws-cli
PAK_VER = 2
PAK_VER = 3
DEPS = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-yaml
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b4404ee6ff3c1dad1aa1174d063beb71
$(DL_FILE)_MD5 = d0e6edde94f5bd17bf6024fd6534dc61
install : $(TARGET)

2
lfs/ddns
View File

@@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Apply upstream patches.
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-duckdns-new-api.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure \

6
lfs/python3-botocore
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.16.1
VER = 1.19.28
THISAPP = botocore-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-botocore
PAK_VER = 3
DEPS = python3-dateutil python3-jmespath
DEPS = python3-dateutil python3-jmespath python3-urllib3
###############################################################################
# Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 12a0d999c364985f1e21a36286c4ab57
$(DL_FILE)_MD5 = 9cb390d4c293528db8ca014647bbe03b
install : $(TARGET)

81
lfs/python3-urllib3 Normal file
View File

@@ -0,0 +1,81 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 1.26.2
THISAPP = urllib3-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-urllib3
PAK_VER = 1
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2233256ccfe140a915f68703f8c2cc1f
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && python3 setup.py build
cd $(DIR_APP) && python3 setup.py install --root=/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

1
make.sh
View File

@@ -1561,6 +1561,7 @@ buildipfire() {
lfsmake2 python3-s3transfer
lfsmake2 python3-rsa
lfsmake2 python3-pyasn1
lfsmake2 python3-urllib3
lfsmake2 python3-botocore
lfsmake2 python3-llfuse
lfsmake2 python3-msgpack

30
src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch Normal file
View File

@@ -0,0 +1,30 @@
commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon May 25 18:00:51 2020 +0200
ProviderDDNSS: Fix unhandled exception on update
In python > 3.3 the getheader() attribute is not longer part of the
urllib.response response.info() object. It is part of response object
and so directly can be accessed.
Fixes #12328
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index f1fed22..46d8a67 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
response = self.send_request(self.url, data=data)
# This provider sends the response code as part of the header.
- header = response.info()
-
# Get status information from the header.
- output = header.getheader('ddnss-response')
+ output = response.getheader('ddnss-response')
# Handle success messages.
if output == "good" or output == "nochg":

30
src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch Normal file
View File

@@ -0,0 +1,30 @@
commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon May 25 18:00:51 2020 +0200
ProviderDDNSS: Fix unhandled exception on update
In python > 3.3 the getheader() attribute is not longer part of the
urllib.response response.info() object. It is part of response object
and so directly can be accessed.
Fixes #12328
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index f1fed22..46d8a67 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
response = self.send_request(self.url, data=data)
# This provider sends the response code as part of the header.
- header = response.info()
-
# Get status information from the header.
- output = header.getheader('ddnss-response')
+ output = response.getheader('ddnss-response')
# Handle success messages.
if output == "good" or output == "nochg":

83
src/patches/ddns-013-duckdns-new-api.patch Normal file
View File

@@ -0,0 +1,83 @@
commit ebdb37245e2033b065cce5a19597be4ef1c8875c
Author: Carl Mascott <cmascott@yahoo.com>
Date: Wed Dec 2 11:39:20 2020 +0100
DuckDNS: Update to use new API.
The new API supports IPv6 and a token based auth.
Reference #12415.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 46d8a67..a1ca3f3 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -802,16 +802,62 @@ class DDNSProviderDtDNS(DDNSProvider):
raise DDNSUpdateError
-class DDNSProviderDuckDNS(DDNSProtocolDynDNS2, DDNSProvider):
+class DDNSProviderDuckDNS(DDNSProvider):
handle = "duckdns.org"
name = "Duck DNS"
website = "http://www.duckdns.org/"
- protocols = ("ipv4",)
+ protocols = ("ipv6", "ipv4",)
# Information about the format of the request is to be found
- # https://www.duckdns.org/install.jsp
+ # https://www.duckdns.org/spec.jsp
+
+ url = "https://www.duckdns.org/update"
+ can_remove_records = False
+
+ def update(self):
+ # Raise an error if no auth details are given.
+ if not self.token:
+ raise DDNSConfigurationError
+
+ data = {
+ "domains" : self.hostname,
+ "token" : self.token,
+ }
+
+ # Check if we update an IPv4 address.
+ address4 = self.get_address("ipv4")
+ if address4:
+ data["ip"] = address4
- url = "https://www.duckdns.org/nic/update"
+ # Check if we update an IPv6 address.
+ address6 = self.get_address("ipv6")
+ if address6:
+ data["ipv6"] = address6
+
+ # Raise an error if no address is given.
+ if "ip" not in data and "ipv6" not in data:
+ raise DDNSConfigurationError
+
+ # Send update to the server.
+ response = self.send_request(self.url, data=data)
+
+ # Get the full response message.
+ output = response.read().decode()
+
+ # Remove all leading and trailing whitespace.
+ output = output.strip()
+
+ # Handle success messages.
+ if output == "OK":
+ return
+
+ # The provider does not give detailed information
+ # if the update fails. Only a "KO" will be sent back.
+ if output == "KO":
+ raise DDNSUpdateError
+
+ # If we got here, some other update error happened.
+ raise DDNSUpdateError
class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider):