Index: head/net-im/gajim/Makefile =================================================================== --- head/net-im/gajim/Makefile (revision 460419) +++ head/net-im/gajim/Makefile (revision 460420) @@ -1,58 +1,57 @@ # Created by: Vsevolod Stakhov # $FreeBSD$ PORTNAME= gajim -PORTVERSION= 0.16.8 -PORTREVISION= 1 +PORTVERSION= 0.16.9 CATEGORIES= net-im MASTER_SITES= http://gajim.org/downloads/0.16/ MAINTAINER= rm@FreeBSD.org COMMENT= Jabber client based on a plugin system LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} NO_ARCH= yes USES= cpe dos2unix gmake localbase pathfix python:2.7 tar:bzip2 USE_GNOME= intltool pygtk2 USE_XORG= x11 xext xscrnsaver DOS2UNIX_FILES= src/plugins/plugins_i18n.py GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} INSTALLS_ICONS= yes OPTIONS_DEFINE= AVAHI CRYPTO DBUS DOCS GUPNP NLS SPELL OPTIONS_DEFAULT=DBUS SPELL OPTIONS_SUB= yes CRYPTO_DESC= End to end encryption support GUPNP_DESC= UPnP IGD protocol support SPELL_DESC= Spell checking support AVAHI_RUN_DEPENDS= avahi-discover:net/py-avahi@${PY_FLAVOR} CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus@${PY_FLAVOR} GUPNP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gupnp/__init__.py:net/gupnp-igd NLS_USES= gettext SPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell PORTDOCS= AUTHORS ChangeLog README SUB_FILES= pkg-message post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} pre-build: ${PYTHON_CMD} -m compileall ${WRKSRC}/src ${PYTHON_CMD} -O -m compileall ${WRKSRC}/src .include Index: head/net-im/gajim/distinfo =================================================================== --- head/net-im/gajim/distinfo (revision 460419) +++ head/net-im/gajim/distinfo (revision 460420) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496754428 -SHA256 (gajim-0.16.8.tar.bz2) = 46d4887857455b6e104d0478735edb51569bfa384578ffb4f4da81f1649b6a32 -SIZE (gajim-0.16.8.tar.bz2) = 4465521 +TIMESTAMP = 1517301219 +SHA256 (gajim-0.16.9.tar.bz2) = 21b3973676fb04c8b665c83e65377623f321754634d87e3b072f2a7c77fb086c +SIZE (gajim-0.16.9.tar.bz2) = 4469275 Index: head/net-im/gajim/files/patch-3dd35f5e762dcef2cf05e325705d0e7a2db21917 =================================================================== --- head/net-im/gajim/files/patch-3dd35f5e762dcef2cf05e325705d0e7a2db21917 (revision 460419) +++ head/net-im/gajim/files/patch-3dd35f5e762dcef2cf05e325705d0e7a2db21917 (nonexistent) @@ -1,87 +0,0 @@ ---- src/common/crypto.py.orig -+++ src/common/crypto.py -@@ -76,50 +76,8 @@ - else: - return base28_chr[n] - --def add_entropy_sources_OpenSSL(): -- # Other possibly variable data. This are very low quality sources of -- # entropy, but some of them are installation dependent and can be hard -- # to guess for the attacker. -- # Data available on all platforms Unix, Windows -- sources = [sys.argv, sys.builtin_module_names, -- sys.copyright, sys.getfilesystemencoding(), sys.hexversion, -- sys.modules, sys.path, sys.version, sys.api_version, -- os.environ, os.getcwd(), os.getpid()] -- -- for s in sources: -- OpenSSL.rand.add(str(s), 1) -- -- # The /proc filesystem on POSIX systems contains many random variables: -- # memory statistics, interrupt counts, network packet counts -- if os.name == 'posix': -- dirs = ['/proc', '/proc/net', '/proc/self'] -- for d in dirs: -- if os.access(d, os.R_OK): -- for filename in os.listdir(d): -- OpenSSL.rand.add(filename, 0) -- try: -- with open(d + os.sep + filename, "r") as fp: -- # Limit the ammount of read bytes, in case a memory -- # file was opened -- OpenSSL.rand.add(str(fp.read(5000)), 1) -- except IOError: -- # Ignore all read and access errors -- pass -- --PYOPENSSL_PRNG_PRESENT = False --try: -- import OpenSSL.rand -- PYOPENSSL_PRNG_PRESENT = True --except ImportError: -- # PyOpenSSL PRNG not available -- pass -- - def random_bytes(bytes_): -- if PYOPENSSL_PRNG_PRESENT: -- OpenSSL.rand.add(os.urandom(bytes_), bytes_) -- return OpenSSL.rand.bytes(bytes_) -- else: -- return os.urandom(bytes_) -+ return os.urandom(bytes_) - - def generate_nonce(): - return random_bytes(8) ---- src/gajim.py.orig -+++ src/gajim.py -@@ -296,20 +296,6 @@ - pid_filename = gajimpaths['PID_FILE'] - config_filename = gajimpaths['CONFIG_FILE'] - --# Seed the OpenSSL pseudo random number generator from file and initialize --RNG_SEED = gajimpaths['RNG_SEED'] --PYOPENSSL_PRNG_PRESENT = False --try: -- import OpenSSL.rand -- from common import crypto -- PYOPENSSL_PRNG_PRESENT = True -- # Seed from file -- OpenSSL.rand.load_file(str(RNG_SEED)) -- crypto.add_entropy_sources_OpenSSL() -- OpenSSL.rand.write_file(str(RNG_SEED)) --except ImportError: -- log.info("PyOpenSSL PRNG not available") -- - import traceback - import errno - import dialogs -@@ -456,9 +442,6 @@ - del pid_dir - - def on_exit(): -- # Save the entropy from OpenSSL PRNG -- if PYOPENSSL_PRNG_PRESENT: -- OpenSSL.rand.write_file(str(RNG_SEED)) - # delete pid file on normal exit - if os.path.exists(pid_filename): - os.remove(pid_filename) Property changes on: head/net-im/gajim/files/patch-3dd35f5e762dcef2cf05e325705d0e7a2db21917 ___________________________________________________________________ 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