diff --git a/crypto/certbot/Makefile b/crypto/certbot/Makefile index 74a12cd7..495b8afc 100644 --- a/crypto/certbot/Makefile +++ b/crypto/certbot/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= CHEESESHOP MAINTAINER= python@FreeBSD.org COMMENT= Let's Encrypt client #' -ACME_VERSION= 0.26.1 - +ACME_VERSION= 1.0.0 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION}:python/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:python/py-configargparse@${PY_FLAVOR} \ @@ -39,9 +38,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes post-patch: - ${REINPLACE_CMD} \ - -e 's|/etc/|${LOCALBASE}/etc/|' \ - -e 's|/var/lib|/var/db|' \ - ${WRKSRC}/${PORTNAME}/constants.py + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot/compat/misc.py + .include diff --git a/crypto/certbot/distinfo b/crypto/certbot/distinfo index 34cc4972..1dff8d16 100644 --- a/crypto/certbot/distinfo +++ b/crypto/certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532431460 -SHA256 (certbot-0.26.1.tar.gz) = 4983513d63f7f36e24a07873ca2d6ea1c0101aa6cb1cd825cda02ed520f6ca66 -SIZE (certbot-0.26.1.tar.gz) = 311419 +TIMESTAMP = 1578553469 +SHA256 (certbot-1.0.0.tar.gz) = 86b82d31db19fffffb0d6b218951e2121ef514e3ff659aa042deaf92a33e302a +SIZE (certbot-1.0.0.tar.gz) = 357926 diff --git a/crypto/certbot/files/patch-certbot-compat-misc.py b/crypto/certbot/files/patch-certbot-compat-misc.py new file mode 100644 index 00000000..a90c6866 --- /dev/null +++ b/crypto/certbot/files/patch-certbot-compat-misc.py @@ -0,0 +1,34 @@ +# Incorrect config file path since update to 0.29.1 +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233909 +# TODO: Upstream + +--- certbot/compat/misc.py.orig 2019-04-04 22:02:08 UTC ++++ certbot/compat/misc.py +@@ -129,6 +129,11 @@ LINUX_DEFAULT_FOLDERS = { + 'work': '/var/lib/letsencrypt', + 'logs': '/var/log/letsencrypt', + } ++FREEBSD_DEFAULT_FOLDERS = { ++ 'config': '/usr/local/etc/letsencrypt', ++ 'work': '/var/db/letsencrypt', ++ 'logs': '/var/log/letsencrypt', ++} + + + def get_default_folder(folder_type): +@@ -142,8 +147,13 @@ def get_default_folder(folder_type): + + """ + if os.name != 'nt': +- # Linux specific +- return LINUX_DEFAULT_FOLDERS[folder_type] ++ # Unix-like ++ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): ++ # FreeBSD specific ++ return FREEBSD_DEFAULT_FOLDERS[folder_type] ++ else: ++ # Linux specific ++ return LINUX_DEFAULT_FOLDERS[folder_type] + # Windows specific + return WINDOWS_DEFAULT_FOLDERS[folder_type] + diff --git a/crypto/certbot/files/patch-setup.py b/crypto/certbot/files/patch-setup.py index c5f3c750..331c314b 100644 --- a/crypto/certbot/files/patch-setup.py +++ b/crypto/certbot/files/patch-setup.py @@ -1,15 +1,15 @@ ---- setup.py.orig 2018-03-08 22:20:34 UTC +--- setup.py.orig 2019-05-07 19:17:33 UTC +++ setup.py -@@ -44,7 +44,6 @@ install_requires = [ - 'configobj', - 'cryptography>=1.2', # load_pem_x509_certificate - 'josepy', +@@ -43,7 +43,6 @@ install_requires = [ + # 1.1.0+ is required to avoid the warnings described at + # https://github.com/certbot/josepy/issues/13. + 'josepy>=1.1.0', - 'mock', 'parsedatetime>=1.3', # Calendar.parseDT 'pyrfc3339', 'pytz', -@@ -58,6 +57,7 @@ dev_extras = [ - 'astroid==1.3.5', +@@ -56,6 +55,7 @@ dev_extras = [ + 'astroid==1.6.5', 'coverage', 'ipdb', + 'mock', diff --git a/python/py-acme/Makefile b/python/py-acme/Makefile index 7dda0535..7650a08b 100644 --- a/python/py-acme/Makefile +++ b/python/py-acme/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org COMMENT= ACME protocol implementation in Python -ACME_VERSION= 0.26.1 +ACME_VERSION= 1.0.0 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:python/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}josepy>=1.0.0:python/py-josepy@${PY_FLAVOR} \ @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:python/py-cryptography@${P ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:python/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:python/py-six@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/python/py-acme/distinfo b/python/py-acme/distinfo index d9e9097c..cbb34296 100644 --- a/python/py-acme/distinfo +++ b/python/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532431452 -SHA256 (acme-0.26.1.tar.gz) = 86e7b5f4654cb19215f16c0e6225750db7421f68ef6a0a040a61796f24e690be -SIZE (acme-0.26.1.tar.gz) = 80741 +TIMESTAMP = 1578553689 +SHA256 (acme-1.0.0.tar.gz) = 6a08f12f848ce563b50bca421ba9db653df9f82cfefeaf8aba517f046d1386c2 +SIZE (acme-1.0.0.tar.gz) = 78635 diff --git a/python/py-acme/files/patch-setup.py b/python/py-acme/files/patch-setup.py index 3106a617..63d27374 100644 --- a/python/py-acme/files/patch-setup.py +++ b/python/py-acme/files/patch-setup.py @@ -1,14 +1,14 @@ ---- setup.py.orig 2018-03-20 00:33:22 UTC +--- setup.py.orig 2019-12-05 17:30:21 UTC +++ setup.py @@ -14,7 +14,6 @@ install_requires = [ - # formerly known as acme.jose: - 'josepy>=1.0.0', - # Connection.set_tlsext_host_name (>=0.13) + # 1.1.0+ is required to avoid the warnings described at + # https://github.com/certbot/josepy/issues/13. + 'josepy>=1.1.0', - 'mock', - 'PyOpenSSL>=0.13', + # Connection.set_tlsext_host_name (>=0.13) + 'PyOpenSSL>=0.13.1', 'pyrfc3339', - 'pytz', -@@ -24,6 +23,7 @@ install_requires = [ +@@ -26,6 +25,7 @@ install_requires = [ ] dev_extras = [ diff --git a/xapp/geany/files/patch-x-data-Makefile.in b/xapp/geany/files/patch-x-data-Makefile.in index 1f1b03af..f1ba5b02 100644 --- a/xapp/geany/files/patch-x-data-Makefile.in +++ b/xapp/geany/files/patch-x-data-Makefile.in @@ -1,9 +1,11 @@ --- ./data/Makefile.in.orig 2019-09-28 14:38:52.000000000 +0200 -+++ ./data/Makefile.in 2019-11-26 10:16:22.755796000 +0200 -@@ -492,13 +492,14 @@ ++++ ./data/Makefile.in 2019-12-30 08:50:31.788564000 +0200 +@@ -492,13 +492,16 @@ tags/entities.html.tags template_files = \ ++ templates/files/file.js \ ++ templates/files/file.jsx \ + templates/files/file.go \ templates/files/file.html \ templates/files/file_html5.html \ diff --git a/xapp/geany/files/patch-x-data-filetype_extensions.conf b/xapp/geany/files/patch-x-data-filetype_extensions.conf new file mode 100644 index 00000000..9c0b532e --- /dev/null +++ b/xapp/geany/files/patch-x-data-filetype_extensions.conf @@ -0,0 +1,20 @@ +--- ./data/filetype_extensions.conf.orig 2019-09-28 14:38:17.000000000 +0200 ++++ ./data/filetype_extensions.conf 2019-12-30 08:56:49.024001000 +0200 +@@ -40,7 +40,7 @@ + Haxe=*.hx; + HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; + Java=*.java;*.jsp; +-Javascript=*.js; ++Javascript=*.js;*.jsx; + JSON=*.json; + Kotlin=*.kt;*.kts; + LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex;*.aux;*.bib; +@@ -68,7 +68,7 @@ + Swift=*.swift; + Tcl=*.tcl;*.tk;*.wish;*.exp; + Txt2tags=*.t2t; +-TypeScript=*.ts; ++TypeScript=*.ts;*.tsx; + Vala=*.vala;*.vapi; + Verilog=*.v; + VHDL=*.vhd;*.vhdl; diff --git a/xapp/geany/files/patch-x-data-templates-files-file.go b/xapp/geany/files/patch-x-data-templates-files-file.go index d3b1c460..f008e847 100644 --- a/xapp/geany/files/patch-x-data-templates-files-file.go +++ b/xapp/geany/files/patch-x-data-templates-files-file.go @@ -1,5 +1,5 @@ ---- ./data/templates/files/file.go.orig 2019-11-26 10:15:27.435188000 +0200 -+++ ./data/templates/files/file.go 2019-11-26 10:15:20.825042000 +0200 +--- ./data/templates/files/file.go.orig 2019-12-30 08:34:58.340214000 +0200 ++++ ./data/templates/files/file.go 2019-12-30 08:34:58.340297000 +0200 @@ -0,0 +1,11 @@ +{fileheader} + diff --git a/xapp/geany/files/patch-x-data-templates-files-file.js b/xapp/geany/files/patch-x-data-templates-files-file.js new file mode 100644 index 00000000..8c1a2c0a --- /dev/null +++ b/xapp/geany/files/patch-x-data-templates-files-file.js @@ -0,0 +1,11 @@ +--- ./data/templates/files/file.js.orig 2019-12-30 08:35:31.447418000 +0200 ++++ ./data/templates/files/file.js 2019-12-30 08:49:39.349962000 +0200 +@@ -0,0 +1,8 @@ ++{fileheader} ++ ++class Some { ++ constructor() { ++ } ++}; ++ ++var some = new Some; diff --git a/xapp/geany/files/patch-x-data-templates-files-file.jsx b/xapp/geany/files/patch-x-data-templates-files-file.jsx new file mode 100644 index 00000000..d4d20070 --- /dev/null +++ b/xapp/geany/files/patch-x-data-templates-files-file.jsx @@ -0,0 +1,33 @@ +--- ./data/templates/files/file.jsx.orig 2019-12-30 08:39:44.312180000 +0200 ++++ ./data/templates/files/file.jsx 2019-12-30 08:46:20.622156000 +0200 +@@ -0,0 +1,30 @@ ++{fileheader} ++ ++import React from 'react' ++ ++export class Hello extends React.Component { ++ ++ static defaultProps = { ++ some: "bare", ++ } ++ ++ constructor(props){ ++ super(props) ++ this.state = { ++ key: value ++ } ++ } ++ ++ render() { ++ return( ++
++ {this.props.some} ++ ++ { this.props.children } ++
++ ) ++ } ++} ++ ++export default Hello; ++ diff --git a/xapp/geany/pkg-plist b/xapp/geany/pkg-plist index 8170c528..9ebe74ec 100644 --- a/xapp/geany/pkg-plist +++ b/xapp/geany/pkg-plist @@ -19,8 +19,8 @@ include/geany/plugindata.h include/geany/pluginutils.h include/geany/prefs.h include/geany/project.h -include/geany/scintilla/SciLexer.h include/geany/scintilla/Sci_Position.h +include/geany/scintilla/SciLexer.h include/geany/scintilla/Scintilla.h include/geany/scintilla/Scintilla.iface include/geany/scintilla/ScintillaWidget.h @@ -55,30 +55,18 @@ lib/libgeany.so lib/libgeany.so.0 lib/pkgconfig/geany.pc share/applications/geany.desktop -share/geany/GPL-2 share/geany/colorschemes/alt.conf -share/geany/filedefs/filetypes.Arduino.conf -share/geany/filedefs/filetypes.CUDA.conf -share/geany/filedefs/filetypes.Clojure.conf -share/geany/filedefs/filetypes.Cython.conf -share/geany/filedefs/filetypes.Genie.conf -share/geany/filedefs/filetypes.Graphviz.conf -share/geany/filedefs/filetypes.Groovy.conf -share/geany/filedefs/filetypes.JSON.conf -share/geany/filedefs/filetypes.Kotlin.conf -share/geany/filedefs/filetypes.Nim.conf -share/geany/filedefs/filetypes.Scala.conf -share/geany/filedefs/filetypes.Swift.conf -share/geany/filedefs/filetypes.TypeScript.conf share/geany/filedefs/filetypes.abaqus share/geany/filedefs/filetypes.abc share/geany/filedefs/filetypes.actionscript share/geany/filedefs/filetypes.ada +share/geany/filedefs/filetypes.Arduino.conf share/geany/filedefs/filetypes.asciidoc share/geany/filedefs/filetypes.asm share/geany/filedefs/filetypes.batch share/geany/filedefs/filetypes.c share/geany/filedefs/filetypes.caml +share/geany/filedefs/filetypes.Clojure.conf share/geany/filedefs/filetypes.cmake share/geany/filedefs/filetypes.cobol share/geany/filedefs/filetypes.coffeescript @@ -87,6 +75,8 @@ share/geany/filedefs/filetypes.conf share/geany/filedefs/filetypes.cpp share/geany/filedefs/filetypes.cs share/geany/filedefs/filetypes.css +share/geany/filedefs/filetypes.CUDA.conf +share/geany/filedefs/filetypes.Cython.conf share/geany/filedefs/filetypes.d share/geany/filedefs/filetypes.diff share/geany/filedefs/filetypes.docbook @@ -96,19 +86,25 @@ share/geany/filedefs/filetypes.ferite share/geany/filedefs/filetypes.forth share/geany/filedefs/filetypes.fortran share/geany/filedefs/filetypes.freebasic +share/geany/filedefs/filetypes.Genie.conf share/geany/filedefs/filetypes.glsl share/geany/filedefs/filetypes.go +share/geany/filedefs/filetypes.Graphviz.conf +share/geany/filedefs/filetypes.Groovy.conf share/geany/filedefs/filetypes.haskell share/geany/filedefs/filetypes.haxe share/geany/filedefs/filetypes.html share/geany/filedefs/filetypes.java share/geany/filedefs/filetypes.javascript +share/geany/filedefs/filetypes.JSON.conf +share/geany/filedefs/filetypes.Kotlin.conf share/geany/filedefs/filetypes.latex share/geany/filedefs/filetypes.lisp share/geany/filedefs/filetypes.lua share/geany/filedefs/filetypes.makefile share/geany/filedefs/filetypes.markdown share/geany/filedefs/filetypes.matlab +share/geany/filedefs/filetypes.Nim.conf share/geany/filedefs/filetypes.nsis share/geany/filedefs/filetypes.objectivec share/geany/filedefs/filetypes.pascal @@ -121,10 +117,13 @@ share/geany/filedefs/filetypes.r share/geany/filedefs/filetypes.restructuredtext share/geany/filedefs/filetypes.ruby share/geany/filedefs/filetypes.rust +share/geany/filedefs/filetypes.Scala.conf share/geany/filedefs/filetypes.sh share/geany/filedefs/filetypes.sql +share/geany/filedefs/filetypes.Swift.conf share/geany/filedefs/filetypes.tcl share/geany/filedefs/filetypes.txt2tags +share/geany/filedefs/filetypes.TypeScript.conf share/geany/filedefs/filetypes.vala share/geany/filedefs/filetypes.verilog share/geany/filedefs/filetypes.vhdl @@ -134,6 +133,7 @@ share/geany/filedefs/filetypes.zephir share/geany/filetype_extensions.conf share/geany/geany.glade share/geany/geany.gtkrc +share/geany/GPL-2 share/geany/snippets.conf share/geany/tags/entities.html.tags share/geany/tags/std.pas.tags @@ -143,11 +143,14 @@ share/geany/tags/std99.c.tags share/geany/templates/bsd share/geany/templates/changelog share/geany/templates/fileheader +share/geany/templates/files/file_html5.html +share/geany/templates/files/file.go share/geany/templates/files/file.html +share/geany/templates/files/file.js +share/geany/templates/files/file.jsx share/geany/templates/files/file.php share/geany/templates/files/file.rb share/geany/templates/files/file.tex -share/geany/templates/files/file_html5.html share/geany/templates/files/main.c share/geany/templates/files/main.cpp share/geany/templates/files/main.d @@ -159,11 +162,6 @@ share/geany/templates/files/program.pas share/geany/templates/function share/geany/templates/gpl share/geany/ui_toolbar.xml -share/icons/Tango/16x16/actions/geany-save-all.png -share/icons/Tango/24x24/actions/geany-save-all.png -share/icons/Tango/32x32/actions/geany-save-all.png -share/icons/Tango/48x48/actions/geany-save-all.png -share/icons/Tango/scalable/actions/geany-save-all.svg share/icons/hicolor/16x16/actions/geany-build.png share/icons/hicolor/16x16/actions/geany-close-all.png share/icons/hicolor/16x16/actions/geany-save-all.png @@ -191,6 +189,11 @@ share/icons/hicolor/scalable/actions/geany-build.svg share/icons/hicolor/scalable/actions/geany-close-all.svg share/icons/hicolor/scalable/actions/geany-save-all.svg share/icons/hicolor/scalable/apps/geany.svg +share/icons/Tango/16x16/actions/geany-save-all.png +share/icons/Tango/24x24/actions/geany-save-all.png +share/icons/Tango/32x32/actions/geany-save-all.png +share/icons/Tango/48x48/actions/geany-save-all.png +share/icons/Tango/scalable/actions/geany-save-all.svg share/locale/ar/LC_MESSAGES/geany.mo share/locale/ast/LC_MESSAGES/geany.mo share/locale/be/LC_MESSAGES/geany.mo @@ -224,8 +227,8 @@ share/locale/mn/LC_MESSAGES/geany.mo share/locale/nl/LC_MESSAGES/geany.mo share/locale/nn/LC_MESSAGES/geany.mo share/locale/pl/LC_MESSAGES/geany.mo -share/locale/pt/LC_MESSAGES/geany.mo share/locale/pt_BR/LC_MESSAGES/geany.mo +share/locale/pt/LC_MESSAGES/geany.mo share/locale/ro/LC_MESSAGES/geany.mo share/locale/ru/LC_MESSAGES/geany.mo share/locale/sk/LC_MESSAGES/geany.mo diff --git a/xfce/xfce4-notes-plugin/files/patch-x-lib-application.c b/xfce/xfce4-notes-plugin/files/patch-x-lib-application.c new file mode 100644 index 00000000..206b8869 --- /dev/null +++ b/xfce/xfce4-notes-plugin/files/patch-x-lib-application.c @@ -0,0 +1,11 @@ +--- ./lib/application.c~ 2010-11-07 13:28:32.000000000 +0200 ++++ ./lib/application.c 2020-01-05 10:58:18.530159000 +0200 +@@ -579,7 +579,7 @@ + } + if (id > 1) { + char* _tmp2_; +- window_name = (_tmp2_ = g_strdup_printf (_ ("Notes %d"), id), _g_free0 (window_name), _tmp2_); ++ window_name = (_tmp2_ = g_strdup_printf (_ ("notes-%03d"), id), _g_free0 (window_name), _tmp2_); + } + if (!xnp_application_window_name_exists (self, window_name)) { + break; diff --git a/xfce/xfce4-notes-plugin/files/patch-x-lib-window.c b/xfce/xfce4-notes-plugin/files/patch-x-lib-window.c new file mode 100644 index 00000000..3c574db1 --- /dev/null +++ b/xfce/xfce4-notes-plugin/files/patch-x-lib-window.c @@ -0,0 +1,11 @@ +--- ./lib/window.c~ 2010-11-07 13:28:32.000000000 +0200 ++++ ./lib/window.c 2020-01-05 10:58:37.962948000 +0200 +@@ -1780,7 +1780,7 @@ + } + if (id > 1) { + char* _tmp1_; +- name = (_tmp1_ = g_strdup_printf (_ ("Notes %d"), id), _g_free0 (name), _tmp1_); ++ name = (_tmp1_ = g_strdup_printf (_ ("notes-%03d"), id), _g_free0 (name), _tmp1_); + } + if (!xnp_window_note_name_exists (self, name)) { + break;