Index: head/net-im/py-matrix-synapse/Makefile =================================================================== --- head/net-im/py-matrix-synapse/Makefile (revision 452706) +++ head/net-im/py-matrix-synapse/Makefile (revision 452707) @@ -1,97 +1,97 @@ # Created by: Brendan Molloy # $FreeBSD$ PORTNAME= matrix-synapse DISTVERSIONPREFIX= v -DISTVERSION= 0.23.0 +DISTVERSION= 0.24.0 PORTREVISION= 0 CATEGORIES= net-im python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= feld@FreeBSD.org COMMENT= Matrix protocol reference homeserver LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE # Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema \ ${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict \ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64 \ ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson \ ${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson \ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity \ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \ ${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt \ ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon \ ${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson \ ${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist \ ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2 \ ${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl \ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3.0:devel/py-msgpack-python \ ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers # Conditional requirements that aren't so conditional RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk \ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml # Dependencies that aren't declared in python_dependencies.py which I have discovered RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv \ ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils GH_ACCOUNT= matrix-org GH_PROJECT= synapse USE_RC_SUBR= synapse USERS= synapse GROUPS= synapse DBDIR?= /var/db/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} PIDDIR?= /var/run/${PORTNAME} SUB_FILES= pkg-message homeserver.yaml log.config SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS} PLIST_FILES+= "@sample %%ETCDIR%%/homeserver.yaml.sample" PLIST_FILES+= "@sample %%ETCDIR%%/log.config.sample" NO_ARCH= yes OPTIONS_DEFINE= EMAIL LDAP PGSQL SQLITE OPTIONS_DEFAULT= SQLITE EMAIL_DESC= Email notifications for missed messages EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach LDAP_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3 PGSQL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 SQLITE_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 .include do-test: # -epy27 added to skip running python packaging and other dist tests @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${TEST_TARGET} \ -a "-epy27") post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/homeserver.yaml ${STAGEDIR}${ETCDIR}/homeserver.yaml.sample ${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample .include Index: head/net-im/py-matrix-synapse/distinfo =================================================================== --- head/net-im/py-matrix-synapse/distinfo (revision 452706) +++ head/net-im/py-matrix-synapse/distinfo (revision 452707) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506956682 -SHA256 (matrix-org-synapse-v0.23.0_GH0.tar.gz) = 26a4bae1097d097452d53a89bcb72b61eafc006d50f030b84eba8e39d9454a2e -SIZE (matrix-org-synapse-v0.23.0_GH0.tar.gz) = 846883 +TIMESTAMP = 1508763796 +SHA256 (matrix-org-synapse-v0.24.0_GH0.tar.gz) = c8153a383348760d060b21d8f643c440677bff80df5ddffaafdf2e0e8d4cd4e3 +SIZE (matrix-org-synapse-v0.24.0_GH0.tar.gz) = 877263 Index: head/net-im/py-matrix-synapse/files/patch-disable-affinity =================================================================== --- head/net-im/py-matrix-synapse/files/patch-disable-affinity (revision 452706) +++ head/net-im/py-matrix-synapse/files/patch-disable-affinity (nonexistent) @@ -1,114 +0,0 @@ ---- synapse/app/_base.py.orig 2017-10-02 12:52:03 UTC -+++ synapse/app/_base.py -@@ -15,7 +15,6 @@ - import gc - import logging - --import affinity - from daemonize import Daemonize - from synapse.util import PreserveLoggingContext - from synapse.util.rlimit import change_resource_limit -@@ -41,8 +40,7 @@ def start_worker_reactor(appname, config - config.gc_thresholds, - config.worker_pid_file, - config.worker_daemonize, -- config.worker_cpu_affinity, -- logger, -+ logger - ) - - -@@ -52,7 +50,6 @@ def start_reactor( - gc_thresholds, - pid_file, - daemonize, -- cpu_affinity, - logger, - ): - """ Run the reactor in the main process -@@ -66,7 +63,6 @@ def start_reactor( - gc_thresholds: - pid_file (str): name of pid file to write to if daemonize is True - daemonize (bool): true to run the reactor in a background process -- cpu_affinity (int|None): cpu affinity mask - logger (logging.Logger): logger instance to pass to Daemonize - """ - -@@ -77,9 +73,6 @@ def start_reactor( - # between the sentinel and `run` logcontexts. - with PreserveLoggingContext(): - logger.info("Running") -- if cpu_affinity is not None: -- logger.info("Setting CPU affinity to %s" % cpu_affinity) -- affinity.set_process_affinity_mask(0, cpu_affinity) - change_resource_limit(soft_file_limit) - if gc_thresholds: - gc.set_threshold(*gc_thresholds) ---- synapse/app/homeserver.py.orig 2017-10-02 12:52:03 UTC -+++ synapse/app/homeserver.py -@@ -442,7 +442,6 @@ def run(hs): - hs.config.gc_thresholds, - hs.config.pid_file, - hs.config.daemonize, -- hs.config.cpu_affinity, - logger, - ) - ---- synapse/config/server.py.orig 2017-10-02 12:52:03 UTC -+++ synapse/config/server.py -@@ -30,7 +30,6 @@ class ServerConfig(Config): - self.user_agent_suffix = config.get("user_agent_suffix") - self.use_frozen_dicts = config.get("use_frozen_dicts", False) - self.public_baseurl = config.get("public_baseurl") -- self.cpu_affinity = config.get("cpu_affinity") - - # Whether to send federation traffic out in this process. This only - # applies to some federation traffic, and so shouldn't be used to -@@ -155,27 +154,6 @@ class ServerConfig(Config): - # When running as a daemon, the file to store the pid in - pid_file: %(pid_file)s - -- # CPU affinity mask. Setting this restricts the CPUs on which the -- # process will be scheduled. It is represented as a bitmask, with the -- # lowest order bit corresponding to the first logical CPU and the -- # highest order bit corresponding to the last logical CPU. Not all CPUs -- # may exist on a given system but a mask may specify more CPUs than are -- # present. -- # -- # For example: -- # 0x00000001 is processor #0, -- # 0x00000003 is processors #0 and #1, -- # 0xFFFFFFFF is all processors (#0 through #31). -- # -- # Pinning a Python process to a single CPU is desirable, because Python -- # is inherently single-threaded due to the GIL, and can suffer a -- # 30-40%% slowdown due to cache blow-out and thread context switching -- # if the scheduler happens to schedule the underlying threads across -- # different cores. See -- # https://www.mirantis.com/blog/improve-performance-python-programs-restricting-single-cpu/. -- # -- # cpu_affinity: 0xFFFFFFFF -- - # Whether to serve a web client from the HTTP/HTTPS root resource. - web_client: True - ---- synapse/config/workers.py.orig 2017-10-02 12:52:03 UTC -+++ synapse/config/workers.py -@@ -33,7 +33,6 @@ class WorkerConfig(Config): - self.worker_name = config.get("worker_name", self.worker_app) - - self.worker_main_http_uri = config.get("worker_main_http_uri", None) -- self.worker_cpu_affinity = config.get("worker_cpu_affinity") - - if self.worker_listeners: - for listener in self.worker_listeners: ---- synapse/python_dependencies.py.orig 2017-10-02 12:52:03 UTC -+++ synapse/python_dependencies.py -@@ -40,7 +40,6 @@ REQUIREMENTS = { - "pymacaroons-pynacl": ["pymacaroons"], - "msgpack-python>=0.3.0": ["msgpack"], - "phonenumbers>=8.2.0": ["phonenumbers"], -- "affinity": ["affinity"], - } - CONDITIONAL_REQUIREMENTS = { - "web_client": { Property changes on: head/net-im/py-matrix-synapse/files/patch-disable-affinity ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property