View | Details | Raw Unified | Return to bug 232379 | Differences between
and this patch

Collapse All | Expand All

(-)py-matrix-synapse/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1538476562
1
TIMESTAMP = 1542851909
2
SHA256 (matrix-org-synapse-v0.33.5.1_GH0.tar.gz) = 2828f271c3bd1f38d7e55746b4a41c44e60b440e35aa466e1710386a4035deab
2
SHA256 (matrix-org-synapse-v0.33.9_GH0.tar.gz) = a0870c157598a494774fd9b6faf7041f9c3d62ec10d88986232c5d404de93aa4
3
SIZE (matrix-org-synapse-v0.33.5.1_GH0.tar.gz) = 1035101
3
SIZE (matrix-org-synapse-v0.33.9_GH0.tar.gz) = 1087324
(-)py-matrix-synapse/files/homeserver.yaml.in (-22 / +305 lines)
Lines 20-27 Link Here
20
# make HTTPS requests to this server will check that the TLS
20
# make HTTPS requests to this server will check that the TLS
21
# certificates returned by this server match one of the fingerprints.
21
# certificates returned by this server match one of the fingerprints.
22
#
22
#
23
# Synapse automatically adds its the fingerprint of its own certificate
23
# Synapse automatically adds the fingerprint of its own certificate
24
# to the list. So if federation traffic is handle directly by synapse
24
# to the list. So if federation traffic is handled directly by synapse
25
# then no modification to the list is required.
25
# then no modification to the list is required.
26
#
26
#
27
# If synapse is run behind a load balancer that handles the TLS then it
27
# If synapse is run behind a load balancer that handles the TLS then it
Lines 34-39 Link Here
34
# key. It may be necessary to publish the fingerprints of a new
34
# key. It may be necessary to publish the fingerprints of a new
35
# certificate and wait until the "valid_until_ts" of the previous key
35
# certificate and wait until the "valid_until_ts" of the previous key
36
# responses have passed before deploying it.
36
# responses have passed before deploying it.
37
#
38
# You can calculate a fingerprint from a given TLS listener via:
39
# openssl s_client -connect $host:$port < /dev/null 2> /dev/null |
40
#   openssl x509 -outform DER | openssl sha256 -binary | base64 | tr -d '='
41
# or by checking matrix.org/federationtester/api/report?server_name=$host
42
#
37
tls_fingerprints: []
43
tls_fingerprints: []
38
# tls_fingerprints: [{"sha256": "<base64_encoded_sha256_fingerprint>"}]
44
# tls_fingerprints: [{"sha256": "<base64_encoded_sha256_fingerprint>"}]
39
45
Lines 49-57 Link Here
49
# When running as a daemon, the file to store the pid in
55
# When running as a daemon, the file to store the pid in
50
pid_file: %%PIDDIR%%/homeserver.pid
56
pid_file: %%PIDDIR%%/homeserver.pid
51
57
58
# CPU affinity mask. Setting this restricts the CPUs on which the
59
# process will be scheduled. It is represented as a bitmask, with the
60
# lowest order bit corresponding to the first logical CPU and the
61
# highest order bit corresponding to the last logical CPU. Not all CPUs
62
# may exist on a given system but a mask may specify more CPUs than are
63
# present.
64
#
65
# For example:
66
#    0x00000001  is processor #0,
67
#    0x00000003  is processors #0 and #1,
68
#    0xFFFFFFFF  is all processors (#0 through #31).
69
#
70
# Pinning a Python process to a single CPU is desirable, because Python
71
# is inherently single-threaded due to the GIL, and can suffer a
72
# 30-40% slowdown due to cache blow-out and thread context switching
73
# if the scheduler happens to schedule the underlying threads across
74
# different cores. See
75
# https://www.mirantis.com/blog/improve-performance-python-programs-restricting-single-cpu/.
76
#
77
# This setting requires the affinity package to be installed!
78
#
79
# cpu_affinity: 0xFFFFFFFF
80
52
# Whether to serve a web client from the HTTP/HTTPS root resource.
81
# Whether to serve a web client from the HTTP/HTTPS root resource.
53
web_client: True
82
web_client: True
54
83
84
# The root directory to server for the above web client.
85
# If left undefined, synapse will serve the matrix-angular-sdk web client.
86
# Make sure matrix-angular-sdk is installed with pip if web_client is True
87
# and web_client_location is undefined
88
# web_client_location: "/path/to/web/root"
89
55
# The public-facing base URL for the client API (not including _matrix/...)
90
# The public-facing base URL for the client API (not including _matrix/...)
56
# public_baseurl: https://example.com:8448/
91
# public_baseurl: https://example.com:8448/
57
92
Lines 60-68 Link Here
60
# hard limit.
95
# hard limit.
61
soft_file_limit: 0
96
soft_file_limit: 0
62
97
98
# Set to false to disable presence tracking on this homeserver.
99
use_presence: true
100
63
# The GC threshold parameters to pass to `gc.set_threshold`, if defined
101
# The GC threshold parameters to pass to `gc.set_threshold`, if defined
64
# gc_thresholds: [700, 10, 10]
102
# gc_thresholds: [700, 10, 10]
65
103
104
# Set the limit on the returned events in the timeline in the get
105
# and sync operations. The default value is -1, means no upper limit.
106
# filter_timeline_limit: 5000
107
108
# Whether room invites to users on this server should be blocked
109
# (except those sent by local server admins). The default is False.
110
# block_non_admin_invites: True
111
112
# Restrict federation to the following whitelist of domains.
113
# N.B. we recommend also firewalling your federation listener to limit
114
# inbound federation traffic as early as possible, rather than relying
115
# purely on this application-layer restriction.  If not specified, the
116
# default is to whitelist everything.
117
#
118
# federation_domain_whitelist:
119
#  - lon.example.com
120
#  - nyc.example.com
121
#  - syd.example.com
122
66
# List of ports that Synapse should listen on, their purpose and their
123
# List of ports that Synapse should listen on, their purpose and their
67
# configuration.
124
# configuration.
68
listeners:
125
listeners:
Lines 72-80 Link Here
72
    # The port to listen for HTTPS requests on.
129
    # The port to listen for HTTPS requests on.
73
    port: 8448
130
    port: 8448
74
131
75
    # Local interface to listen on.
132
    # Local addresses to listen on.
76
    # The empty string will cause synapse to listen on all interfaces.
133
    # On Linux and Mac OS, `::` will listen on all IPv4 and IPv6
77
    bind_address: ''
134
    # addresses by default. For most other OSes, this will only listen
135
    # on IPv6.
136
    bind_addresses:
137
      - '::'
138
      - '0.0.0.0'
78
139
79
    # This is a 'http' listener, allows us to specify 'resources'.
140
    # This is a 'http' listener, allows us to specify 'resources'.
80
    type: http
141
    type: http
Lines 101-111 Link Here
101
      - names: [federation]  # Federation APIs
162
      - names: [federation]  # Federation APIs
102
        compress: false
163
        compress: false
103
164
165
    # optional list of additional endpoints which can be loaded via
166
    # dynamic modules
167
    # additional_resources:
168
    #   "/_matrix/my/custom/endpoint":
169
    #     module: my_module.CustomRequestHandler
170
    #     config: {}
171
104
  # Unsecure HTTP listener,
172
  # Unsecure HTTP listener,
105
  # For when matrix traffic passes through loadbalancer that unwraps TLS.
173
  # For when matrix traffic passes through loadbalancer that unwraps TLS.
106
  - port: 8008
174
  - port: 8008
107
    tls: false
175
    tls: false
108
    bind_address: ''
176
    bind_addresses: ['::', '0.0.0.0']
109
    type: http
177
    type: http
110
178
111
    x_forwarded: false
179
    x_forwarded: false
Lines 119-128 Link Here
119
  # Turn on the twisted ssh manhole service on localhost on the given
187
  # Turn on the twisted ssh manhole service on localhost on the given
120
  # port.
188
  # port.
121
  # - port: 9000
189
  # - port: 9000
122
  #   bind_address: 127.0.0.1
190
  #   bind_addresses: ['::1', '127.0.0.1']
123
  #   type: manhole
191
  #   type: manhole
124
192
125
193
194
  # Homeserver blocking
195
  #
196
  # How to reach the server admin, used in ResourceLimitError
197
  # admin_contact: 'mailto:admin@server.com'
198
  #
199
  # Global block config
200
  #
201
  # hs_disabled: False
202
  # hs_disabled_message: 'Human readable reason for why the HS is blocked'
203
  # hs_disabled_limit_type: 'error code(str), to help clients decode reason'
204
  #
205
  # Monthly Active User Blocking
206
  #
207
  # Enables monthly active user checking
208
  # limit_usage_by_mau: False
209
  # max_mau_value: 50
210
  # mau_trial_days: 2
211
  #
212
  # Sometimes the server admin will want to ensure certain accounts are
213
  # never blocked by mau checking. These accounts are specified here.
214
  #
215
  # mau_limit_reserved_threepids:
216
  # - medium: 'email'
217
  #   address: 'reserved_user@example.com'
218
219
220
126
# Database configuration
221
# Database configuration
127
database:
222
database:
128
  # The database engine name
223
  # The database engine name
Lines 137-156 Link Here
137
232
138
233
139
234
140
# Logging verbosity level.
141
verbose: 0
142
143
# File to write logging to
144
log_file: "%%LOGDIR%%/homeserver.log"
145
146
# A yaml python logging config file
235
# A yaml python logging config file
147
log_config: "%%ETCDIR%%/log.config"
236
log_config: "%%ETCDIR%%/log.config"
148
237
149
# Stop twisted from discarding the stack traces of exceptions in
150
# deferreds by waiting a reactor tick before running a deferred's
151
# callbacks.
152
# full_twisted_stacktraces: true
153
154
238
155
## Ratelimiting ##
239
## Ratelimiting ##
156
240
Lines 184-189 Link Here
184
# Directory where uploaded images and attachments are stored.
268
# Directory where uploaded images and attachments are stored.
185
media_store_path: "%%DBDIR%%/media_store"
269
media_store_path: "%%DBDIR%%/media_store"
186
270
271
# Media storage providers allow media to be stored in different
272
# locations.
273
# media_storage_providers:
274
# - module: file_system
275
#   # Whether to write new local files.
276
#   store_local: false
277
#   # Whether to write new remote media
278
#   store_remote: false
279
#   # Whether to block upload requests waiting for write to this
280
#   # provider to complete
281
#   store_synchronous: false
282
#   config:
283
#     directory: /mnt/some/other/directory
284
187
# Directory where in-progress uploads are stored.
285
# Directory where in-progress uploads are stored.
188
uploads_path: "%%DBDIR%%/uploads"
286
uploads_path: "%%DBDIR%%/uploads"
189
287
Lines 238-243 Link Here
238
# - '192.168.0.0/16'
336
# - '192.168.0.0/16'
239
# - '100.64.0.0/10'
337
# - '100.64.0.0/10'
240
# - '169.254.0.0/16'
338
# - '169.254.0.0/16'
339
# - '::1/128'
340
# - 'fe80::/64'
341
# - 'fc00::/7'
241
#
342
#
242
# List of IP address CIDR ranges that the URL preview spider is allowed
343
# List of IP address CIDR ranges that the URL preview spider is allowed
243
# to access even if they are specified in url_preview_ip_range_blacklist.
344
# to access even if they are specified in url_preview_ip_range_blacklist.
Lines 312-338 Link Here
312
## Turn ##
413
## Turn ##
313
414
314
# The public URIs of the TURN server to give to clients
415
# The public URIs of the TURN server to give to clients
315
turn_uris: []
416
#turn_uris: []
316
417
317
# The shared secret used to compute passwords for the TURN server
418
# The shared secret used to compute passwords for the TURN server
318
turn_shared_secret: "YOUR_SHARED_SECRET"
419
#turn_shared_secret: "YOUR_SHARED_SECRET"
420
421
# The Username and password if the TURN server needs them and
422
# does not use a token
423
#turn_username: "TURNSERVER_USERNAME"
424
#turn_password: "TURNSERVER_PASSWORD"
319
425
320
# How long generated TURN credentials last
426
# How long generated TURN credentials last
321
turn_user_lifetime: "1h"
427
turn_user_lifetime: "1h"
322
428
429
# Whether guests should be allowed to use the TURN server.
430
# This defaults to True, otherwise VoIP will be unreliable for guests.
431
# However, it does introduce a slight security risk as it allows users to
432
# connect to arbitrary endpoints without having first signed up for a
433
# valid account (e.g. by passing a CAPTCHA).
434
turn_allow_guests: True
435
323
436
324
## Registration ##
437
## Registration ##
325
438
326
# Enable registration for new users.
439
# Enable registration for new users.
327
enable_registration: False
440
enable_registration: False
328
441
442
# The user must provide all of the below types of 3PID when registering.
443
#
444
# registrations_require_3pid:
445
#     - email
446
#     - msisdn
447
448
# Mandate that users are only allowed to associate certain formats of
449
# 3PIDs with accounts on this server.
450
#
451
# allowed_local_3pids:
452
#     - medium: email
453
#       pattern: ".*@matrix\.org"
454
#     - medium: email
455
#       pattern: ".*@vector\.im"
456
#     - medium: msisdn
457
#       pattern: "\+44"
458
329
# If set, allows registration by anyone who also has the shared
459
# If set, allows registration by anyone who also has the shared
330
# secret, even if registration is otherwise disabled.
460
# secret, even if registration is otherwise disabled.
331
registration_shared_secret: "CHANGEME_50CHAR_RANDOM"
461
registration_shared_secret: "CHANGEME_50CHAR_RANDOM"
332
462
333
# Set the number of bcrypt rounds used to generate password hash.
463
# Set the number of bcrypt rounds used to generate password hash.
334
# Larger numbers increase the work factor needed to generate the hash.
464
# Larger numbers increase the work factor needed to generate the hash.
335
# The default number of rounds is 12.
465
# The default number is 12 (which equates to 2^12 rounds).
466
# N.B. that increasing this will exponentially increase the time required
467
# to register or login - e.g. 24 => 2^24 rounds which will take >20 mins.
336
bcrypt_rounds: 12
468
bcrypt_rounds: 12
337
469
338
# Allows users to register as guests without a password/email/etc, and
470
# Allows users to register as guests without a password/email/etc, and
Lines 345-350 Link Here
345
trusted_third_party_id_servers:
477
trusted_third_party_id_servers:
346
    - matrix.org
478
    - matrix.org
347
    - vector.im
479
    - vector.im
480
    - riot.im
481
482
# Users who register on this homeserver will automatically be joined
483
# to these rooms
484
#auto_join_rooms:
485
#    - "#example:example.com"
486
487
# Where auto_join_rooms are specified, setting this flag ensures that the
488
# the rooms exist by creating them when the first user on the
489
# homeserver registers.
490
# Setting to false means that if the rooms are not manually created,
491
# users cannot be auto-joined since they do not exist.
492
autocreate_auto_join_rooms: true
348
493
349
494
350
## Metrics ###
495
## Metrics ###
Lines 373-378 Link Here
373
# Used to enable access token expiration.
518
# Used to enable access token expiration.
374
expire_access_token: False
519
expire_access_token: False
375
520
521
# a secret which is used to calculate HMACs for form values, to stop
522
# falsification of values
523
form_secret: "CHANGEME_50CHAR_RANDOM"
524
376
## Signing Keys ##
525
## Signing Keys ##
377
526
378
# Path to the signing key to sign messages with
527
# Path to the signing key to sign messages with
Lines 443-458 Link Here
443
592
444
593
445
# Enable sending emails for notification events
594
# Enable sending emails for notification events
595
# Defining a custom URL for Riot is only needed if email notifications
596
# should contain links to a self-hosted installation of Riot; when set
597
# the "app_name" setting is ignored.
598
#
599
# If your SMTP server requires authentication, the optional smtp_user &
600
# smtp_pass variables should be used
601
#
446
#email:
602
#email:
447
#   enable_notifs: false
603
#   enable_notifs: false
448
#   smtp_host: "localhost"
604
#   smtp_host: "localhost"
449
#   smtp_port: 25
605
#   smtp_port: 25
606
#   smtp_user: "exampleusername"
607
#   smtp_pass: "examplepassword"
608
#   require_transport_security: False
450
#   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
609
#   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
451
#   app_name: Matrix
610
#   app_name: Matrix
452
#   template_dir: res/templates
611
#   # if template_dir is unset, uses the example templates that are part of
612
#   # the Synapse distribution.
613
#   #template_dir: res/templates
453
#   notif_template_html: notif_mail.html
614
#   notif_template_html: notif_mail.html
454
#   notif_template_text: notif_mail.txt
615
#   notif_template_text: notif_mail.txt
455
#   notif_for_new_users: True
616
#   notif_for_new_users: True
617
#   riot_base_url: "http://localhost/riot"
456
618
457
619
458
# password_providers:
620
# password_providers:
Lines 469-471 Link Here
469
#         #bind_dn:
631
#         #bind_dn:
470
#         #bind_password:
632
#         #bind_password:
471
#         #filter: "(objectClass=posixAccount)"
633
#         #filter: "(objectClass=posixAccount)"
634
635
636
637
# Clients requesting push notifications can either have the body of
638
# the message sent in the notification poke along with other details
639
# like the sender, or just the event ID and room ID (`event_id_only`).
640
# If clients choose the former, this option controls whether the
641
# notification request includes the content of the event (other details
642
# like the sender are still included). For `event_id_only` push, it
643
# has no effect.
644
645
# For modern android devices the notification content will still appear
646
# because it is loaded by the app. iPhone, however will send a
647
# notification saying only that a message arrived and who it came from.
648
#
649
#push:
650
#   include_content: true
651
652
653
# spam_checker:
654
#     module: "my_custom_project.SuperSpamChecker"
655
#     config:
656
#         example_option: 'things'
657
658
659
# Whether to allow non server admins to create groups on this server
660
enable_group_creation: false
661
662
# If enabled, non server admins can only create groups with local parts
663
# starting with this prefix
664
# group_creation_prefix: "unofficial/"
665
666
667
668
# User Directory configuration
669
#
670
# 'search_all_users' defines whether to search all users visible to your HS
671
# when searching the user directory, rather than limiting to users visible
672
# in public rooms.  Defaults to false.  If you set it True, you'll have to run
673
# UPDATE user_directory_stream_pos SET stream_id = NULL;
674
# on your database to tell it to rebuild the user_directory search indexes.
675
#
676
#user_directory:
677
#   search_all_users: false
678
679
680
# User Consent configuration
681
#
682
# for detailed instructions, see
683
# https://github.com/matrix-org/synapse/blob/master/docs/consent_tracking.md
684
#
685
# Parts of this section are required if enabling the 'consent' resource under
686
# 'listeners', in particular 'template_dir' and 'version'.
687
#
688
# 'template_dir' gives the location of the templates for the HTML forms.
689
# This directory should contain one subdirectory per language (eg, 'en', 'fr'),
690
# and each language directory should contain the policy document (named as
691
# '<version>.html') and a success page (success.html).
692
#
693
# 'version' specifies the 'current' version of the policy document. It defines
694
# the version to be served by the consent resource if there is no 'v'
695
# parameter.
696
#
697
# 'server_notice_content', if enabled, will send a user a "Server Notice"
698
# asking them to consent to the privacy policy. The 'server_notices' section
699
# must also be configured for this to work. Notices will *not* be sent to
700
# guest users unless 'send_server_notice_to_guests' is set to true.
701
#
702
# 'block_events_error', if set, will block any attempts to send events
703
# until the user consents to the privacy policy. The value of the setting is
704
# used as the text of the error.
705
#
706
# user_consent:
707
#   template_dir: res/templates/privacy
708
#   version: 1.0
709
#   server_notice_content:
710
#     msgtype: m.text
711
#     body: >-
712
#       To continue using this homeserver you must review and agree to the
713
#       terms and conditions at %(consent_uri)s
714
#   send_server_notice_to_guests: True
715
#   block_events_error: >-
716
#     To continue using this homeserver you must review and agree to the
717
#     terms and conditions at %(consent_uri)s
718
#
719
720
721
# Server Notices room configuration
722
#
723
# Uncomment this section to enable a room which can be used to send notices
724
# from the server to users. It is a special room which cannot be left; notices
725
# come from a special "notices" user id.
726
#
727
# If you uncomment this section, you *must* define the system_mxid_localpart
728
# setting, which defines the id of the user which will be used to send the
729
# notices.
730
#
731
# It's also possible to override the room name, the display name of the
732
# "notices" user, and the avatar for the user.
733
#
734
# server_notices:
735
#   system_mxid_localpart: notices
736
#   system_mxid_display_name: "Server Notices"
737
#   system_mxid_avatar_url: "mxc://server.com/oumMVlgDnLYFaPVkExemNVVZ"
738
#   room_name: "Server Notices"
739
740
741
742
# The `alias_creation` option controls who's allowed to create aliases
743
# on this server.
744
#
745
# The format of this option is a list of rules that contain globs that
746
# match against user_id and the new alias (fully qualified with server
747
# name). The action in the first rule that matches is taken, which can
748
# currently either be "allow" or "deny".
749
#
750
# If no rules match the request is denied.
751
alias_creation_rules:
752
    - user_id: "*"
753
      alias: "*"
754
      action: allow
(-)py-matrix-synapse/files/pkg-message.in (-1 / +1 lines)
Lines 12-18 Link Here
12
self-signed TLS certificates and dhparams you can use the following
12
self-signed TLS certificates and dhparams you can use the following
13
command:
13
command:
14
14
15
%%PYTHON_CMD%% -B -m synapse.app.homeserver -c %%ETCDIR%%/homeserver.yaml --generate-config --server-name=example.com --report-stats=false
15
%%PYTHON_CMD%% -B -m synapse.app.homeserver -c %%ETCDIR%%/homeserver.yaml --generate-config -H <SERVER_NAME> --report-stats no
16
16
17
Please note that you will still need to manually configure paths to log
17
Please note that you will still need to manually configure paths to log
18
directory, database, and media storage with this method.
18
directory, database, and media storage with this method.
(-)py-matrix-synapse/Makefile (-10 / +10 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	matrix-synapse
4
PORTNAME=	matrix-synapse
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	0.33.5.1
6
DISTVERSION=	0.33.9
7
CATEGORIES=	net-im python
7
CATEGORIES=	net-im python
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
9
Lines 15-45 Link Here
15
15
16
# Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file
16
# Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file
17
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \
17
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}frozendict>=1:devel/py-frozendict@${PY_FLAVOR} \
19
		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \
19
		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.1.3:devel/py-canonicaljson@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.1.3:devel/py-canonicaljson@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}service_identity>=1.0.0:security/py-service_identity@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${PY_FLAVOR} \
24
		${PYTHON_PKGNAMEPREFIX}twisted>=17.1.0:devel/py-twisted@${PY_FLAVOR} \
24
		${PYTHON_PKGNAMEPREFIX}twisted>=17.1.0:devel/py-twisted@${PY_FLAVOR} \
25
		${PYTHON_PKGNAMEPREFIX}treq>=15.1:www/py-treq@${PY_FLAVOR} \
25
		${PYTHON_PKGNAMEPREFIX}treq>=15.1:www/py-treq@${PY_FLAVOR} \
26
		${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
26
		${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
27
		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
27
		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
28
		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \
28
		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \
29
		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \
29
		${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${PY_FLAVOR} \
30
		${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${PY_FLAVOR} \
30
		${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt@${PY_FLAVOR} \
31
		${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \
31
		${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow@${PY_FLAVOR} \
32
		${PYTHON_PKGNAMEPREFIX}pillow>=3.1.2:graphics/py-pillow@${PY_FLAVOR} \
32
		${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon@${PY_FLAVOR} \
33
		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \
33
		${PYTHON_PKGNAMEPREFIX}sortedcontainers>0:devel/py-sortedcontainers@${PY_FLAVOR} \
34
		${PYTHON_PKGNAMEPREFIX}psutil>=2.0.0:sysutils/py-psutil@${PY_FLAVOR} \
34
		${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${PY_FLAVOR} \
35
		${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${PY_FLAVOR} \
35
		${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl@${PY_FLAVOR} \
36
		${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl@${PY_FLAVOR} \
36
		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3.0:devel/py-msgpack@${PY_FLAVOR} \
37
		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3.0:devel/py-msgpack@${PY_FLAVOR} \
37
		${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \
38
		${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \
38
		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
39
		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
39
		${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.2.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \
40
		${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.2.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \
40
		${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \
41
		${PYTHON_PKGNAMEPREFIX}attrs>16.0.0:devel/py-attrs@${PY_FLAVOR} \
41
		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
42
		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR}
42
		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
43
43
44
# Conditional requirements that aren't so conditional
44
# Conditional requirements that aren't so conditional
45
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.8:devel/py-matrix-angular-sdk@${PY_FLAVOR}
45
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.8:devel/py-matrix-angular-sdk@${PY_FLAVOR}

Return to bug 232379