/sysutils/p5-LJ-Cache/

hon:3.6+ PYTHON_QMAKE_OFF= DISABLE_PYTHON_PLUGIN=yes post-patch: @${FIND} ${WRKSRC} -name "*.pro" -exec ${REINPLACE_CMD} -e 's|share/man|man|' {} \; +post-patch-PYTHON-on: + @${REINPLACE_CMD} -e 's|python3|python-${PYTHON_VER}|' \ + ${WRKSRC}/src/plugins/python/find_python.pri + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS README.md NEWS.md diff --git a/graphics/tiled/distinfo b/graphics/tiled/distinfo index 98aec6370c54..7686006cfc94 100644 --- a/graphics/tiled/distinfo +++ b/graphics/tiled/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531919719 -SHA256 (bjorn-tiled-v1.1.6_GH0.tar.gz) = 01e7485a44d1a4dc485804a466c9f93de4fcd078e763d6c8670d1082aad181a8 -SIZE (bjorn-tiled-v1.1.6_GH0.tar.gz) = 16050408 +TIMESTAMP = 1537474798 +SHA256 (bjorn-tiled-v1.2.0_GH0.tar.gz) = 979ab56337ba365455d3b9cf54c957b94e15dbe82884143c9c12c2fd6771b48d +SIZE (bjorn-tiled-v1.2.0_GH0.tar.gz) = 17007687 diff --git a/graphics/tiled/pkg-plist b/graphics/tiled/pkg-plist index d62fac552a69..b0e61f29ef40 100644 --- a/graphics/tiled/pkg-plist +++ b/graphics/tiled/pkg-plist @@ -22,15 +22,15 @@ man/man1/automappingconverter.1.gz man/man1/tiled.1.gz man/man1/tmxrasterizer.1.gz man/man1/tmxviewer.1.gz -share/applications/tiled.desktop +share/applications/org.mapeditor.Tiled.desktop share/icons/hicolor/16x16/apps/tiled.png share/icons/hicolor/16x16/mimetypes/application-x-tiled.png share/icons/hicolor/32x32/apps/tiled.png share/icons/hicolor/32x32/mimetypes/application-x-tiled.png share/icons/hicolor/scalable/apps/tiled.svg share/icons/hicolor/scalable/mimetypes/application-x-tiled.svg -share/metainfo/tiled.appdata.xml -share/mime/packages/tiled.xml +share/metainfo/org.mapeditor.Tiled.appdata.xml +share/mime/packages/org.mapeditor.Tiled.xml share/thumbnailers/tiled.thumbnailer %%DATADIR%%/translations/tiled_ar_DZ.qm %%DATADIR%%/translations/tiled_bg.qm -- cgit From 598fded3adf18c5ad86f0eda1ff560c27bc14deb Mon Sep 17 00:00:00 2001 From: 0mp <0mp@FreeBSD.org> Date: Sun, 23 Sep 2018 13:25:45 +0000 Subject: www/libhubbub: Set maintainership. PR: 231602 Submitted by: Neel Chauhan Approved by: krion (mentor) Differential Revision: https://reviews.freebsd.org/D17295 --- www/libhubbub/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/libhubbub/Makefile b/www/libhubbub/Makefile index 64e9a13d222e..f8852377f930 100644 --- a/www/libhubbub/Makefile +++ b/www/libhubbub/Makefile @@ -7,7 +7,7 @@ CATEGORIES= www MASTER_SITES= http://download.netsurf-browser.org/libs/releases/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= neel@neelc.org COMMENT= HTML5 parser library LICENSE= MIT -- cgit From f3d85a2560c3ac4ede34e43f498396e4f80b2040 Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 23 Sep 2018 13:30:47 +0000 Subject: audio/shorten: move to new home Upstream maintainer already used freeshell.org hosting for mail. https://web.archive.org/web/20180903155129/http://etree.org/shnutils/shorten/ Obtained from: Gentoo Approved by: portmgr blanket --- audio/shorten/Makefile | 3 +-- audio/shorten/pkg-descr | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile index 0d504f6af202..7bb5e50d14b1 100644 --- a/audio/shorten/Makefile +++ b/audio/shorten/Makefile @@ -4,12 +4,11 @@ PORTNAME= shorten PORTVERSION= 3.6.1 CATEGORIES= audio archivers -MASTER_SITES= http://www.etree.org/shnutils/shorten/dist/src/ +MASTER_SITES= http://shnutils.freeshell.org/shorten/dist/src/ MAINTAINER= sec@42.org COMMENT= Fast and optionally lossless compression for waveform files -BROKEN= unfetchable RESTRICTED= May not be sold. May not be distributed if modified GNU_CONFIGURE= yes diff --git a/audio/shorten/pkg-descr b/audio/shorten/pkg-descr index 7b9e43398877..af70d0f64e5e 100644 --- a/audio/shorten/pkg-descr +++ b/audio/shorten/pkg-descr @@ -14,4 +14,4 @@ non-commercial encoding (e.g. private or research use). If you intend to use shorten, be sure to check the full license, which can be displayed by "shorten -l". -WWW: http://www.etree.org/shnutils/shorten/ +WWW: http://shnutils.freeshell.org/shorten/ -- cgit From 51336e673e01b83aa894d294f8535f3be3462e37 Mon Sep 17 00:00:00 2001 From: tobik Date: Sun, 23 Sep 2018 13:50:11 +0000 Subject: New port: sysutils/bfs bfs is a breadth-first version of the UNIX find(1) command. It supports almost every feature from every major find(1) implementation, so your existing command lines should work as-is. It also adds some features of its own, such as a more forgiving command line parser and some additional options. WWW: https://github.com/tavianator/bfs --- sysutils/Makefile | 1 + sysutils/bfs/Makefile | 30 ++++++++++++++++++++++++++++++ sysutils/bfs/distinfo | 3 +++ sysutils/bfs/pkg-descr | 8 ++++++++ 4 files changed, 42 insertions(+) create mode 100644 sysutils/bfs/Makefile create mode 100644 sysutils/bfs/distinfo create mode 100644 sysutils/bfs/pkg-descr diff --git a/sysutils/Makefile b/sysutils/Makefile index bcabfe4b281c..f6800b8080c9 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -106,6 +106,7 @@ SUBDIR += beadm SUBDIR += beadm-devel SUBDIR += beats + SUBDIR += bfs SUBDIR += bhyve-firmware SUBDIR += bhyve-rc SUBDIR += biosfont diff --git a/sysutils/bfs/Makefile b/sysutils/bfs/Makefile new file mode 100644 index 000000000000..6df5f3b69d41 --- /dev/null +++ b/sysutils/bfs/Makefile @@ -0,0 +1,30 @@ +# $FreeBSD$ + +PORTNAME= bfs +DISTVERSION= 1.2.3 +CATEGORIES= sysutils + +MAINTAINER= tobik@FreeBSD.org +COMMENT= Breadth-first version of the UNIX find command + +LICENSE= BSD0CLAUSE +LICENSE_NAME= BSD Zero Clause License +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +TEST_DEPENDS= bash:shells/bash + +USES= gmake shebangfix +USE_GITHUB= yes +GH_ACCOUNT= tavianator + +SHEBANG_FILES= tests.sh +PLIST_FILES= bin/bfs \ + man/man1/bfs.1.gz +TEST_TARGET= check + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/bfs ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/bfs.1 ${STAGEDIR}${MANPREFIX}/man/man1 + +.include diff --git a/sysutils/bfs/distinfo b/sysutils/bfs/distinfo new file mode 100644 index 000000000000..0a766cbd95c1 --- /dev/null +++ b/sysutils/bfs/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537658096 +SHA256 (tavianator-bfs-1.2.3_GH0.tar.gz) = 8ce9e47367db50aeb0bf3c5707080a853993ed98059d577daa45c681f07e2fcd +SIZE (tavianator-bfs-1.2.3_GH0.tar.gz) = 80044 diff --git a/sysutils/bfs/pkg-descr b/sysutils/bfs/pkg-descr new file mode 100644 index 000000000000..4895b3198a41 --- /dev/null +++ b/sysutils/bfs/pkg-descr @@ -0,0 +1,8 @@ +bfs(1) is a breadth-first version of the UNIX find(1) command. + +It supports almost every feature from every major find(1) +implementation, so your existing command lines should work as-is. +It also adds some features of its own, such as a more forgiving +command line parser and some additional options. + +WWW: https://github.com/tavianator/bfs -- cgit From cf6207d8dfeab95c345c8b3694929d84a70a3bc8 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sun, 23 Sep 2018 14:54:52 +0000 Subject: Update lang/erlang to version 19.3.6.11. --- lang/erlang/Makefile | 4 ++-- lang/erlang/distinfo | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 51db4a83e17a..d4dd69cc0cea 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.3.6.10 +PORTVERSION= 19.3.6.11 PORTEPOCH= 4 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ @@ -23,7 +23,7 @@ PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \ patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \ patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \ patch-otp-19.3.6.7 patch-otp-19.3.6.8 patch-otp-19.3.6.9 \ - patch-otp-19.3.6.10 + patch-otp-19.3.6.10 patch-otp-19.3.6.11 MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index eb377938e3a6..f20a2285a776 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1534858704 +TIMESTAMP = 1537701103 SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SIZE (erlang/otp_src_19.3.tar.gz) = 68510871 -SHA256 (erlang/preloaded-19.3.6.10.tar.gz) = 89bf5faaa166b670c56b021d3106205796cb54c7b3a9ef7b10267012ad45109f -SIZE (erlang/preloaded-19.3.6.10.tar.gz) = 330065 +SHA256 (erlang/preloaded-19.3.6.11.tar.gz) = 3dbb54f0c463ca581d55d5e34fde8ccc1c6ab400bf81e9bf8e46510ea5fd0c79 +SIZE (erlang/preloaded-19.3.6.11.tar.gz) = 330068 SHA256 (erlang/otp_doc_man_19.3.tar.gz) = f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SIZE (erlang/otp_doc_man_19.3.tar.gz) = 1410781 SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd @@ -37,3 +37,5 @@ SHA256 (erlang/patch-otp-19.3.6.9) = c0a243be5693752dc35b0fbe7622618903f130ad944 SIZE (erlang/patch-otp-19.3.6.9) = 6989 SHA256 (erlang/patch-otp-19.3.6.10) = 98968885a53ab75a6abeeba584dc26297d01234866d2797d6c16f1bdd89d72c3 SIZE (erlang/patch-otp-19.3.6.10) = 12767 +SHA256 (erlang/patch-otp-19.3.6.11) = a79f5a3fe737df191c9fa2eea3c9961b94be4d4d44620b1bed2266f1874f3669 +SIZE (erlang/patch-otp-19.3.6.11) = 4886 -- cgit From 081b0e0ad64c19d5565b35806af73d19677170d8 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sun, 23 Sep 2018 14:55:00 +0000 Subject: Update lang/erlang-java to version 19.3.6.11. --- lang/erlang-java/Makefile | 4 ++-- lang/erlang-java/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile index 041b50560a5f..87869729137d 100644 --- a/lang/erlang-java/Makefile +++ b/lang/erlang-java/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.3.6.10 +PORTVERSION= 19.3.6.11 PORTEPOCH= 1 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ @@ -20,7 +20,7 @@ PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \ patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \ patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \ patch-otp-19.3.6.7 patch-otp-19.3.6.8 patch-otp-19.3.6.9 \ - patch-otp-19.3.6.10 + patch-otp-19.3.6.10 patch-otp-19.3.6.11 MAINTAINER= erlang@FreeBSD.org COMMENT= Erlang interface for Java diff --git a/lang/erlang-java/distinfo b/lang/erlang-java/distinfo index 05f38c575bf6..b0caf31c7d3b 100644 --- a/lang/erlang-java/distinfo +++ b/lang/erlang-java/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1534858835 +TIMESTAMP = 1537701108 SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SIZE (erlang/otp_src_19.3.tar.gz) = 68510871 -SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c -SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689 SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd SIZE (erlang/patch-otp-19.3.1) = 30225 SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a @@ -35,3 +33,5 @@ SHA256 (erlang/patch-otp-19.3.6.9) = c0a243be5693752dc35b0fbe7622618903f130ad944 SIZE (erlang/patch-otp-19.3.6.9) = 6989 SHA256 (erlang/patch-otp-19.3.6.10) = 98968885a53ab75a6abeeba584dc26297d01234866d2797d6c16f1bdd89d72c3 SIZE (erlang/patch-otp-19.3.6.10) = 12767 +SHA256 (erlang/patch-otp-19.3.6.11) = a79f5a3fe737df191c9fa2eea3c9961b94be4d4d44620b1bed2266f1874f3669 +SIZE (erlang/patch-otp-19.3.6.11) = 4886 -- cgit From da390469e767ab064f5babe71e2afcfcc198eea0 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sun, 23 Sep 2018 14:55:07 +0000 Subject: Update lang/erlang-wx to version 19.3.6.11. --- lang/erlang-wx/Makefile | 4 ++-- lang/erlang-wx/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile index ecac987f754f..49b930ebaa25 100644 --- a/lang/erlang-wx/Makefile +++ b/lang/erlang-wx/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.3.6.10 +PORTVERSION= 19.3.6.11 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel @@ -21,7 +21,7 @@ PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \ patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \ patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \ patch-otp-19.3.6.7 patch-otp-19.3.6.8 patch-otp-19.3.6.9 \ - patch-otp-19.3.6.10 + patch-otp-19.3.6.10 patch-otp-19.3.6.11 MAINTAINER= erlang@FreeBSD.org COMMENT= Erlang bindings for wxWindows diff --git a/lang/erlang-wx/distinfo b/lang/erlang-wx/distinfo index 5340b31ffd8c..0396bd147da3 100644 --- a/lang/erlang-wx/distinfo +++ b/lang/erlang-wx/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1534858766 +TIMESTAMP = 1537701106 SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SIZE (erlang/otp_src_19.3.tar.gz) = 68510871 -SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c -SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689 SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd SIZE (erlang/patch-otp-19.3.1) = 30225 SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a @@ -35,3 +33,5 @@ SHA256 (erlang/patch-otp-19.3.6.9) = c0a243be5693752dc35b0fbe7622618903f130ad944 SIZE (erlang/patch-otp-19.3.6.9) = 6989 SHA256 (erlang/patch-otp-19.3.6.10) = 98968885a53ab75a6abeeba584dc26297d01234866d2797d6c16f1bdd89d72c3 SIZE (erlang/patch-otp-19.3.6.10) = 12767 +SHA256 (erlang/patch-otp-19.3.6.11) = a79f5a3fe737df191c9fa2eea3c9961b94be4d4d44620b1bed2266f1874f3669 +SIZE (erlang/patch-otp-19.3.6.11) = 4886 -- cgit From 1c1c24b3941f080401ed7713d72722e5cf093a3e Mon Sep 17 00:00:00 2001 From: olgeni Date: Sun, 23 Sep 2018 16:52:53 +0000 Subject: Update devel/rebar3 to version 3.6.2. --- devel/rebar3/Makefile | 7 ++++--- devel/rebar3/distinfo | 16 +++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile index 26d5b0a9d572..b80ee91a6411 100644 --- a/devel/rebar3/Makefile +++ b/devel/rebar3/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rebar3 -PORTVERSION= 3.6.1 +PORTVERSION= 3.6.2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES+= LOCAL/olgeni:deps \ @@ -31,15 +31,16 @@ PORTEXAMPLES= rebar.config.sample BASH_PLIST_FILES= share/bash-completion/completions/rebar3 ZSH_PLIST_FILES= share/zsh/site-functions/_rebar3 -CACHE_VERSION= 18 +CACHE_VERSION= 19 # from rebar.config REBAR_DEPS= bbmustache-1.5.0 \ - certifi-2.0.0 \ + certifi-2.3.1 \ cf-0.2.2 \ cth_readable-1.4.2 \ erlware_commons-1.2.0 \ eunit_formatters-0.5.0 \ getopt-1.0.1 \ + parse_trans-3.3.0 \ providers-1.7.0 \ relx-3.26.0 \ ssl_verify_fun-1.1.3 diff --git a/devel/rebar3/distinfo b/devel/rebar3/distinfo index bf9cf10a8781..6f60979ea3bd 100644 --- a/devel/rebar3/distinfo +++ b/devel/rebar3/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1530627730 -SHA256 (rebar3-cache-18.tar.gz) = 1befd3b5c737322a152bd7dde48240462bcdd45bc8c92c906a78f6f7dd12b7d4 -SIZE (rebar3-cache-18.tar.gz) = 3212816 +TIMESTAMP = 1537720621 +SHA256 (rebar3-cache-19.tar.gz) = 244636f0e587b466245184f418cb1a9e0325952536f7c4591bb5bba731cf6943 +SIZE (rebar3-cache-19.tar.gz) = 3474627 SHA256 (bbmustache-1.5.0.tar) = ed074fb6e94e1a6f6e098f98a403638aba593f59a5542bc6ce2e62d829c9e375 SIZE (bbmustache-1.5.0.tar) = 14848 -SHA256 (certifi-2.0.0.tar) = fdc6066ceeccb3aa14049ab6edf0b9af3b64ae1b0db2a92d5c52146f373bbb1c -SIZE (certifi-2.0.0.tar) = 174080 +SHA256 (certifi-2.3.1.tar) = e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68 +SIZE (certifi-2.3.1.tar) = 154112 SHA256 (cf-0.2.2.tar) = 48283b3019bc7fad56e7b23028a5da4d3e6cd598a553ab2a99a2153bf5f19b21 SIZE (cf-0.2.2.tar) = 10240 SHA256 (cth_readable-1.4.2.tar) = 5bcdbe544c56abd0288d2baac163c6df663d97370ae700740be85e601c6951de @@ -15,11 +15,13 @@ SHA256 (eunit_formatters-0.5.0.tar) = d6c8ba213424944e6e05bbc097c32001cdd0abe392 SIZE (eunit_formatters-0.5.0.tar) = 14848 SHA256 (getopt-1.0.1.tar) = 53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c SIZE (getopt-1.0.1.tar) = 19456 +SHA256 (parse_trans-3.3.0.tar) = 17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960 +SIZE (parse_trans-3.3.0.tar) = 35840 SHA256 (providers-1.7.0.tar) = 8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6 SIZE (providers-1.7.0.tar) = 13312 SHA256 (relx-3.26.0.tar) = 69ef393db66e8568ec3062ae7ff186c48fc77c10431794d46db1cd00560601b9 SIZE (relx-3.26.0.tar) = 84992 SHA256 (ssl_verify_fun-1.1.3.tar) = 2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe SIZE (ssl_verify_fun-1.1.3.tar) = 14848 -SHA256 (rebar-rebar3-3.6.1_GH0.tar.gz) = 40b3c85440f3235c7b149578d0211bdf57d1c66390f888bb771704f8abc71033 -SIZE (rebar-rebar3-3.6.1_GH0.tar.gz) = 289019 +SHA256 (rebar-rebar3-3.6.2_GH0.tar.gz) = 7f358170025b54301bce9a10ec7ad07d4e88a80eaa7b977b73b32b45ea0b626e +SIZE (rebar-rebar3-3.6.2_GH0.tar.gz) = 290819 -- cgit From 7c9bb6716540a122fc9fae07e3c0b7e1cf2cdca5 Mon Sep 17 00:00:00 2001 From: olgeni Date: Sun, 23 Sep 2018 16:55:02 +0000 Subject: Update devel/erlang-gpb to version 4.3.3. --- devel/erlang-gpb/Makefile | 2 +- devel/erlang-gpb/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/erlang-gpb/Makefile b/devel/erlang-gpb/Makefile index 03b43929e81a..813c7b4cc515 100644 --- a/devel/erlang-gpb/Makefile +++ b/devel/erlang-gpb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gpb -PORTVERSION= 4.3.2 +PORTVERSION= 4.3.3 CATEGORIES= devel PKGNAMEPREFIX= erlang- diff --git a/devel/erlang-gpb/distinfo b/devel/erlang-gpb/distinfo index 3f0ec4bfc3b4..8ddc4e5e9b39 100644 --- a/devel/erlang-gpb/distinfo +++ b/devel/erlang-gpb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536047050 -SHA256 (tomas-abrahamsson-gpb-4.3.2_GH0.tar.gz) = b06a147335a14999ef9e05b1dbe9efef5ae64887a0ab452a083efd4a8e9bf4c4 -SIZE (tomas-abrahamsson-gpb-4.3.2_GH0.tar.gz) = 429012 +TIMESTAMP = 1537721615 +SHA256 (tomas-abrahamsson-gpb-4.3.3_GH0.tar.gz) = 76ae1a2268ff19169222dd47b7cf8579f791fae571cb756f4279941a6f2ed057 +SIZE (tomas-abrahamsson-gpb-4.3.3_GH0.tar.gz) = 418239 -- cgit From 7e2b1560cb121c6cbbe6c9857edc509894bf1c9f Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:08:19 +0000 Subject: Added new ports required by www/gitlab-ce update to 11.3. Approved by: mentors (implizit) --- textproc/Makefile | 2 ++ textproc/rubygem-js_regex/Makefile | 21 +++++++++++++++++++++ textproc/rubygem-js_regex/distinfo | 3 +++ textproc/rubygem-js_regex/pkg-descr | 6 ++++++ textproc/rubygem-regexp_parser/Makefile | 20 ++++++++++++++++++++ textproc/rubygem-regexp_parser/distinfo | 3 +++ textproc/rubygem-regexp_parser/pkg-descr | 3 +++ 7 files changed, 58 insertions(+) create mode 100644 textproc/rubygem-js_regex/Makefile create mode 100644 textproc/rubygem-js_regex/distinfo create mode 100644 textproc/rubygem-js_regex/pkg-descr create mode 100644 textproc/rubygem-regexp_parser/Makefile create mode 100644 textproc/rubygem-regexp_parser/distinfo create mode 100644 textproc/rubygem-regexp_parser/pkg-descr diff --git a/textproc/Makefile b/textproc/Makefile index a3aa75c68a0d..fa2928abf4c9 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1573,6 +1573,7 @@ SUBDIR += rubygem-jekyll-sass-converter SUBDIR += rubygem-jekyll-sitemap SUBDIR += rubygem-jemoji + SUBDIR += rubygem-js_regex SUBDIR += rubygem-jsmin SUBDIR += rubygem-kramdown SUBDIR += rubygem-kwalify @@ -1606,6 +1607,7 @@ SUBDIR += rubygem-rdiscount SUBDIR += rubygem-rdtool SUBDIR += rubygem-redcarpet + SUBDIR += rubygem-regexp_parser SUBDIR += rubygem-representable SUBDIR += rubygem-reverse_markdown SUBDIR += rubygem-ri_cal diff --git a/textproc/rubygem-js_regex/Makefile b/textproc/rubygem-js_regex/Makefile new file mode 100644 index 000000000000..1bb13649170d --- /dev/null +++ b/textproc/rubygem-js_regex/Makefile @@ -0,0 +1,21 @@ +# Created by: Matthias Fechner +# $FreeBSD$ + +PORTNAME= js_regex +PORTVERSION= 2.2.2 +CATEGORIES= textproc rubygems +MASTER_SITES= RG + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Convert ruby native regular expressions for JavaScript + +LICENSE= MIT + +RUN_DEPENDS= rubygem-regexp_parser>=0.5.0:textproc/rubygem-regexp_parser + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/textproc/rubygem-js_regex/distinfo b/textproc/rubygem-js_regex/distinfo new file mode 100644 index 000000000000..a7404107e1f6 --- /dev/null +++ b/textproc/rubygem-js_regex/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537564866 +SHA256 (rubygem/js_regex-2.2.2.gem) = 9f702df800cd39a4078a8276216a0e0ef679f83c4947d5e141492ae8a8140819 +SIZE (rubygem/js_regex-2.2.2.gem) = 46592 diff --git a/textproc/rubygem-js_regex/pkg-descr b/textproc/rubygem-js_regex/pkg-descr new file mode 100644 index 000000000000..d0760a29d2ac --- /dev/null +++ b/textproc/rubygem-js_regex/pkg-descr @@ -0,0 +1,6 @@ +JsRegex converts Ruby's native regular expressions +for JavaScript, taking care of various +incompatibilities and returning warnings for +unsolvable differences. + +WWW: https://github.com/janosch-x/js_regex diff --git a/textproc/rubygem-regexp_parser/Makefile b/textproc/rubygem-regexp_parser/Makefile new file mode 100644 index 000000000000..ed5d0666f6ea --- /dev/null +++ b/textproc/rubygem-regexp_parser/Makefile @@ -0,0 +1,20 @@ +# Created by: Matthias Fechner +# $FreeBSD$ + +PORTNAME= regexp_parser +PORTVERSION= 0.5.0 +CATEGORIES= textproc rubygems +MASTER_SITES= RG + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Tokenizing, lexinf and parsing Ruby regular expressions + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/textproc/rubygem-regexp_parser/distinfo b/textproc/rubygem-regexp_parser/distinfo new file mode 100644 index 000000000000..d567d2cd36d5 --- /dev/null +++ b/textproc/rubygem-regexp_parser/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537565033 +SHA256 (rubygem/regexp_parser-0.5.0.gem) = eb0a270384d89888d4e11c40b351f09be5d81c123d359004948c3172b6c0e58c +SIZE (rubygem/regexp_parser-0.5.0.gem) = 100864 diff --git a/textproc/rubygem-regexp_parser/pkg-descr b/textproc/rubygem-regexp_parser/pkg-descr new file mode 100644 index 000000000000..f6c0f0c1544a --- /dev/null +++ b/textproc/rubygem-regexp_parser/pkg-descr @@ -0,0 +1,3 @@ +A library for tokenizing, lexing, and parsing Ruby regular expressions. + +WWW: https://github.com/ammar/regexp_parser -- cgit From 4613b1fd2d8c319b6cf8f127ae2a8dee9320b60b Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:13:56 +0000 Subject: Update devel/gitaly to 0.120.0 which is required for gitlab 11.3. Approved by: mentors (implicit) --- devel/gitaly/Makefile | 5 ++--- devel/gitaly/distinfo | 6 +++--- devel/gitaly/files/patch-ruby_Gemfile | 6 +++--- devel/gitaly/pkg-plist | 13 +++++-------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 8a87fd9079ad..ee8cdef86bf3 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.117.2 -PORTREVISION= 2 +DISTVERSION= 0.120.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -42,7 +41,7 @@ USE_RUBY= yes USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= 93cc4119d91af9644da2b748f2563fd67ee5b855 +GL_COMMIT= 8a8daada771e4659baeb6fc08178179ea78010a6 post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 0211182e4625..ea5f6782962f 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535130930 -SHA256 (gitlab-org-gitaly-93cc4119d91af9644da2b748f2563fd67ee5b855_GL0.tar.gz) = 6e0dda552c34dd39f352ff7e2bb65c5cb961073f41e6f49aff5a605c89c5b0d4 -SIZE (gitlab-org-gitaly-93cc4119d91af9644da2b748f2563fd67ee5b855_GL0.tar.gz) = 3601446 +TIMESTAMP = 1537566136 +SHA256 (gitlab-org-gitaly-8a8daada771e4659baeb6fc08178179ea78010a6_GL0.tar.gz) = 172816c471e65f2da09eb51066624d115c7b4db05a8983dbb4d6943ab24f197e +SIZE (gitlab-org-gitaly-8a8daada771e4659baeb6fc08178179ea78010a6_GL0.tar.gz) = 3608782 diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 088e572312b8..2fe6c3527205 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,4 +1,4 @@ ---- ruby/Gemfile.orig 2018-08-17 16:15:58 UTC +--- ruby/Gemfile.orig 2018-09-07 08:03:54 UTC +++ ruby/Gemfile @@ -1,16 +1,17 @@ source 'https://rubygems.org' @@ -7,8 +7,8 @@ -gem 'github-linguist', '~> 6.1', require: 'linguist' +gem 'github-linguist', '~> 5.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.4' --gem 'gitaly-proto', '~> 0.107.0', require: 'gitaly' -+gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly' +-gem 'gitaly-proto', '~> 0.116.0', require: 'gitaly' ++gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist index 070122294abb..7343457a8688 100644 --- a/devel/gitaly/pkg-plist +++ b/devel/gitaly/pkg-plist @@ -21,6 +21,7 @@ %%DATADIR%%/ruby/lib/gitlab/config.rb %%DATADIR%%/ruby/lib/gitlab/git.rb %%DATADIR%%/ruby/lib/gitlab/git/blob.rb +%%DATADIR%%/ruby/lib/gitlab/git/branch.rb %%DATADIR%%/ruby/lib/gitlab/git/commit.rb %%DATADIR%%/ruby/lib/gitlab/git/commit_stats.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/resolver.rb @@ -30,11 +31,13 @@ %%DATADIR%%/ruby/lib/gitlab/git/index.rb %%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb %%DATADIR%%/ruby/lib/gitlab/git/pre_receive_error.rb +%%DATADIR%%/ruby/lib/gitlab/git/raw_diff_change.rb +%%DATADIR%%/ruby/lib/gitlab/git/ref.rb %%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb %%DATADIR%%/ruby/lib/gitlab/git/repository.rb %%DATADIR%%/ruby/lib/gitlab/git/repository_mirroring.rb %%DATADIR%%/ruby/lib/gitlab/git/rev_list.rb -%%DATADIR%%/ruby/lib/gitlab/git/support/format-git-cat-file-input +%%DATADIR%%/ruby/lib/gitlab/git/tag.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_file.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_page.rb @@ -54,6 +57,7 @@ %%DATADIR%%/ruby/spec/lib/gitlab/config_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/diff_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb +%%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/wiki_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/version_info_spec.rb @@ -64,9 +68,6 @@ %%DATADIR%%/ruby/vendor/gitlab_git/REVISION %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/encoding_helper.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/attributes_at_ref_parser.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/attributes_parser.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/branch.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/committer_with_hooks.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/file.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/parser.rb @@ -78,16 +79,12 @@ %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/path_helper.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/popen.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/pre_receive_error.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/raw_diff_change.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/ref.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_mirror.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository_mirroring.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/tag.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/user.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/util.rb -%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/version.rb %%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/utils/strong_memoize.rb @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-ssh -- cgit From b4aea5ea800d1319a32ec4e9e3ab3350bc14bbfc Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:15:25 +0000 Subject: Update devel/gitlab-shell to 8.3.3 which is required for gitlab 11.3. Approved by: mentors (implicit) --- devel/gitlab-shell/Makefile | 4 ++-- devel/gitlab-shell/distinfo | 6 +++--- devel/gitlab-shell/pkg-plist | 26 ++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 56da78f93151..49b98c84d073 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 8.1.1 +PORTVERSION= 8.3.3 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -16,7 +16,7 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags -GL_COMMIT= 5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1 +GL_COMMIT= 4b19de3a1897d06c3e0d530f679c6f56e250ca41 USERS= git GROUPS= git diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 2ce65d3fa7e2..e8627c3bb690 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535126431 -SHA256 (gitlab-org-gitlab-shell-5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1_GL0.tar.gz) = 31f87dad90fa8871cf743ac1d8a322324cdc144685a83b32bca1342b003dfb60 -SIZE (gitlab-org-gitlab-shell-5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1_GL0.tar.gz) = 1560578 +TIMESTAMP = 1537567084 +SHA256 (gitlab-org-gitlab-shell-4b19de3a1897d06c3e0d530f679c6f56e250ca41_GL0.tar.gz) = c197935f0461746dc30ce3c5ad3307796e931796282dba099bb7410baf546050 +SIZE (gitlab-org-gitlab-shell-4b19de3a1897d06c3e0d530f679c6f56e250ca41_GL0.tar.gz) = 1564456 diff --git a/devel/gitlab-shell/pkg-plist b/devel/gitlab-shell/pkg-plist index 2cdfac95fdd8..225ab89f91b3 100644 --- a/devel/gitlab-shell/pkg-plist +++ b/devel/gitlab-shell/pkg-plist @@ -7,7 +7,6 @@ %%DATADIR%%/CONTRIBUTING.md %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.lock -%%DATADIR%%/Guardfile %%DATADIR%%/LICENSE %%DATADIR%%/README.md %%DATADIR%%/VERSION @@ -28,6 +27,8 @@ @(,,555) %%DATADIR%%/hooks/post-receive @(,,555) %%DATADIR%%/hooks/pre-receive @(,,555) %%DATADIR%%/hooks/update +%%DATADIR%%/lib/action.rb +%%DATADIR%%/lib/action/custom.rb %%DATADIR%%/lib/gitlab_access.rb %%DATADIR%%/lib/gitlab_access_status.rb %%DATADIR%%/lib/gitlab_config.rb @@ -41,9 +42,11 @@ %%DATADIR%%/lib/gitlab_post_receive.rb %%DATADIR%%/lib/gitlab_shell.rb %%DATADIR%%/lib/httpunix.rb +%%DATADIR%%/lib/http_codes.rb %%DATADIR%%/lib/http_helper.rb %%DATADIR%%/lib/names_helper.rb %%DATADIR%%/lib/object_dirs_helper.rb +%%DATADIR%%/spec/action/custom_spec.rb %%DATADIR%%/spec/gitlab_access_spec.rb %%DATADIR%%/spec/gitlab_config_spec.rb %%DATADIR%%/spec/gitlab_custom_hook_spec.rb @@ -61,14 +64,27 @@ %%DATADIR%%/spec/object_dirs_helper_spec.rb %%DATADIR%%/spec/spec_helper.rb %%DATADIR%%/spec/support/gl_id_test_hook +%%DATADIR%%/spec/support/http_unix_server.rb %%DATADIR%%/support/go-update-vendor %%DATADIR%%/spec/support/hook_fail %%DATADIR%%/spec/support/hook_ok +%%DATADIR%%/spec/support/vcr.rb +%%DATADIR%%/spec/support/webmock.rb %%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push.yml +%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml +%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml +%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404.yml +%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml +%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml +%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-none.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-ok.yml %%DATADIR%%/spec/vcr_cassettes/check-ok.yml +%%DATADIR%%/spec/vcr_cassettes/custom-action-not-ok-json.yml +%%DATADIR%%/spec/vcr_cassettes/custom-action-not-ok-not-json.yml +%%DATADIR%%/spec/vcr_cassettes/custom-action-ok-not-json.yml +%%DATADIR%%/spec/vcr_cassettes/custom-action-ok.yml %%DATADIR%%/spec/vcr_cassettes/discover-ok.yml %%DATADIR%%/spec/vcr_cassettes/http-pull-disabled.yml %%DATADIR%%/spec/vcr_cassettes/http-push-disabled.yml @@ -83,8 +99,14 @@ %%DATADIR%%/spec/vcr_cassettes/ssh-key-ok.yml %%DATADIR%%/spec/vcr_cassettes/ssh-pull-disabled.yml %%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-disabled.yml -%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-with-user.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401.yml %%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied.yml %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes.yml -- cgit From 2f5cb8bf13ad871c95bc7723a7695a7d5aca450e Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:19:16 +0000 Subject: Fixed dep problem. The upgrade of rubygem-google-api-client to version 0.24.0 has broken this port which blocks the update to gitlab 11.3. Approved by: mentors (implicit) --- net/rubygem-fog-google/Makefile | 6 +++-- .../files/patch-fog-google.gemspec | 29 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 net/rubygem-fog-google/files/patch-fog-google.gemspec diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile index 85e2046def89..8efea5d4471e 100644 --- a/net/rubygem-fog-google/Makefile +++ b/net/rubygem-fog-google/Makefile @@ -3,6 +3,7 @@ PORTNAME= fog-google PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG @@ -17,8 +18,9 @@ RUN_DEPENDS= rubygem-fog-core>=0:devel/rubygem-fog-core \ rubygem-fog-xml>=0:textproc/rubygem-fog-xml \ rubygem-google-api-client>=0.23.0:devel/rubygem-google-api-client -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/net/rubygem-fog-google/files/patch-fog-google.gemspec b/net/rubygem-fog-google/files/patch-fog-google.gemspec new file mode 100644 index 000000000000..6b29e723a013 --- /dev/null +++ b/net/rubygem-fog-google/files/patch-fog-google.gemspec @@ -0,0 +1,29 @@ +--- fog-google.gemspec.orig 2018-09-21 22:25:33 UTC ++++ fog-google.gemspec +@@ -26,7 +26,7 @@ Gem::Specification.new do |s| + s.add_runtime_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, [">= 0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 0.23.0"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 0.23"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + s.add_development_dependency(%q.freeze, [">= 0"]) +@@ -41,7 +41,7 @@ Gem::Specification.new do |s| + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) +- s.add_dependency(%q.freeze, ["~> 0.23.0"]) ++ s.add_dependency(%q.freeze, ["~> 0.23"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) +@@ -57,7 +57,7 @@ Gem::Specification.new do |s| + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) +- s.add_dependency(%q.freeze, ["~> 0.23.0"]) ++ s.add_dependency(%q.freeze, ["~> 0.23"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) -- cgit From de64c87b52c67c7ca35230a6075287f0456a8409 Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:20:45 +0000 Subject: Update net/rubygem-gitaly-proto to 0.117.0 which is required for gitlab 11.3. Approved by: mentors (implicit) --- net/rubygem-gitaly-proto/Makefile | 3 ++- net/rubygem-gitaly-proto/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/rubygem-gitaly-proto/Makefile b/net/rubygem-gitaly-proto/Makefile index 5faa562526b9..5c6ff3d5ad6e 100644 --- a/net/rubygem-gitaly-proto/Makefile +++ b/net/rubygem-gitaly-proto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitaly-proto -PORTVERSION= 0.113.0 +PORTVERSION= 0.117.0 CATEGORIES= net rubygems MASTER_SITES= RG @@ -16,6 +16,7 @@ RUN_DEPENDS= rubygem-google-protobuf>=3.1:devel/rubygem-google-protobuf \ USES= gem USE_RUBY= yes + NO_ARCH= yes .include diff --git a/net/rubygem-gitaly-proto/distinfo b/net/rubygem-gitaly-proto/distinfo index c4df763426f8..5187251ceca7 100644 --- a/net/rubygem-gitaly-proto/distinfo +++ b/net/rubygem-gitaly-proto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535124347 -SHA256 (rubygem/gitaly-proto-0.113.0.gem) = 01283a29ace5b6930202d2b2fc43fd1a5ef5f3a8dcc0eaa7ec3852dc7dbf0055 -SIZE (rubygem/gitaly-proto-0.113.0.gem) = 17408 +TIMESTAMP = 1537565844 +SHA256 (rubygem/gitaly-proto-0.117.0.gem) = 11906acfa59d1c537e4a6c491f93f5619ad0098e36793776851256ca08ffaf47 +SIZE (rubygem/gitaly-proto-0.117.0.gem) = 17408 -- cgit From 8923125c34a7e3da112a35a041860c3056ec9321 Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:22:16 +0000 Subject: Update www/gitlab-pages to 1.1.0 which is required for gitlab 11.3. Approved by: mentors (implicit) --- www/gitlab-pages/Makefile | 4 ++-- www/gitlab-pages/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index fd6c4fea85f4..046dda419b9b 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitlab-pages -PORTVERSION= 1.0.0 +PORTVERSION= 1.1.0 CATEGORIES= www MAINTAINER= swills@FreeBSD.org @@ -15,7 +15,7 @@ BUILD_DEPENDS= go:lang/go USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags -GL_COMMIT= 7edf64c1951e2184890403ab60c26381dd81e942 +GL_COMMIT= 5cffa83537890540d74664a43e828cd81a164980 PLIST_FILES= bin/gitlab-pages diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 92de87df9251..93225cdfe18f 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532164199 -SHA256 (gitlab-org-gitlab-pages-7edf64c1951e2184890403ab60c26381dd81e942_GL0.tar.gz) = 89be884ad5cff68dbe01faa77b2a5f0b86bc069d02ab5ee664467d85a68558de -SIZE (gitlab-org-gitlab-pages-7edf64c1951e2184890403ab60c26381dd81e942_GL0.tar.gz) = 1693802 +TIMESTAMP = 1537566899 +SHA256 (gitlab-org-gitlab-pages-5cffa83537890540d74664a43e828cd81a164980_GL0.tar.gz) = 5184776254befb9de13898c4807e5191e5dcb9a45e35d80d7eb7c4b6a160bded +SIZE (gitlab-org-gitlab-pages-5cffa83537890540d74664a43e828cd81a164980_GL0.tar.gz) = 1764221 -- cgit From 89c0c2c7cfb580520e6cf4cd2c4a6a704df9b6b0 Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:23:41 +0000 Subject: Update www/gitlab-workhorse to 6.1.0 which is required for gitlab 11.3. Approved by: mentors (implicit) --- www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index aeb427a12006..85adad6f2ba5 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-workhorse -PORTVERSION= 5.1.0 +PORTVERSION= 6.1.0 CATEGORIES= www MAINTAINER= mfechner@FreeBSD.org @@ -19,7 +19,7 @@ USES= gmake USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags -GL_COMMIT= 2fd82d0f4fcc945a11c72e08344ccb967eb0c48f +GL_COMMIT= 70ca94d07aecf2151d6b749cb049bedecc8a6a3d PLIST_FILES= bin/gitlab-workhorse \ bin/gitlab-zip-cat \ diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index dbea5a1a5f76..6707149718c6 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535125677 -SHA256 (gitlab-org-gitlab-workhorse-2fd82d0f4fcc945a11c72e08344ccb967eb0c48f_GL0.tar.gz) = 9643a01612b2eff835e43167cb612c11ecf39cc47c80175e5a6c59a03e736f35 -SIZE (gitlab-org-gitlab-workhorse-2fd82d0f4fcc945a11c72e08344ccb967eb0c48f_GL0.tar.gz) = 1838862 +TIMESTAMP = 1537567672 +SHA256 (gitlab-org-gitlab-workhorse-70ca94d07aecf2151d6b749cb049bedecc8a6a3d_GL0.tar.gz) = 3b6007300f7c6ebf276cfc3e62a362e4339f070a572b193c8c4ab1eb501de03c +SIZE (gitlab-org-gitlab-workhorse-70ca94d07aecf2151d6b749cb049bedecc8a6a3d_GL0.tar.gz) = 1846823 -- cgit From 1f39588bb428b23fc0e09fd5da7dec6ba792b947 Mon Sep 17 00:00:00 2001 From: mfechner Date: Sun, 23 Sep 2018 18:25:11 +0000 Subject: Update www/gitlab-ce to version 11.3.0. Changelog: https://about.gitlab.com/2018/09/22/gitlab-11-3-released/ Approved by: mentors (implicit) --- www/gitlab-ce/Makefile | 27 +- www/gitlab-ce/distinfo | 6 +- www/gitlab-ce/files/patch-Gemfile | 23 +- .../files/patch-config_gitlab.yml.example | 10 +- www/gitlab-ce/pkg-message | 6 +- www/gitlab-ce/pkg-plist | 518 ++++++++++++++++----- 6 files changed, 442 insertions(+), 148 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 1739e1f25890..f35bbe6bc66d 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.2.3 -PORTREVISION= 2 +PORTVERSION= 11.3.0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -17,10 +16,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # for the options MY_DEPENDS= git>=2.16.2:devel/git \ - gitlab-shell>=8.1.1:devel/gitlab-shell \ - gitlab-workhorse>=5.1.0:www/gitlab-workhorse \ - gitaly>=0.117.2:devel/gitaly \ - gitlab-pages>=1.0.0:www/gitlab-pages \ + gitlab-shell>=8.3.3:devel/gitlab-shell \ + gitlab-workhorse>=6.1.0:www/gitlab-workhorse \ + gitaly>=0.120.0:devel/gitaly \ + gitlab-pages>=1.1.0:www/gitlab-pages \ redis>=2.8.23:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ @@ -59,7 +58,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \ rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \ - rubygem-browser>=2.2:www/rubygem-browser \ + rubygem-browser>=2.5:www/rubygem-browser \ rubygem-gpgme>=2.0.13:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap20>=2.0.4:net/rubygem-gitlab_omniauth-ldap20 \ rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \ @@ -74,17 +73,17 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \ rubygem-hamlit>=2.8.8:www/rubygem-hamlit \ - rubygem-carrierwave>=1.1:www/rubygem-carrierwave \ + rubygem-carrierwave>=1.2.3:www/rubygem-carrierwave \ rubygem-mini_magick>=0:graphics/rubygem-mini_magick \ rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \ rubygem-fog-aws2>=2.0.1:net/rubygem-fog-aws2 \ rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \ - rubygem-fog-google13>=1.3.3:net/rubygem-fog-google13 \ + rubygem-fog-google>=1.7.1:net/rubygem-fog-google \ rubygem-fog-local>=0.3:net/rubygem-fog-local \ rubygem-fog-openstack02>=0.1:net/rubygem-fog-openstack02 \ rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \ rubygem-fog-aliyun02>=0.2.0:net/rubygem-fog-aliyun02 \ - rubygem-google-api-client>=0.19.8:devel/rubygem-google-api-client \ + rubygem-google-api-client>=0.23:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ @@ -115,11 +114,12 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \ rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ - rubygem-rainbow2>=2.2:devel/rubygem-rainbow2 \ + rubygem-rainbow>=3.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ rubygem-re2>=1.1.1:devel/rubygem-re2 \ rubygem-version_sorter21>=2.1.0:textproc/rubygem-version_sorter21 \ + rubygem-js_regex>=2.2.1:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \ rubygem-redis3>=3.2:databases/rubygem-redis3 \ @@ -127,7 +127,6 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-hipchat15>=1.5.0:net-im/rubygem-hipchat15 \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \ - rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ rubygem-hangouts-chat>=0.0.5:net/rubygem-hangouts-chat \ rubygem-asana>=0.6.0:www/rubygem-asana \ @@ -185,7 +184,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-sshkey>=1.9.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto>=0.113.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=0.117.0:net/rubygem-gitaly-proto \ rubygem-grpc>=1.11.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \ @@ -219,7 +218,7 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= 06cbee3bf9dd960380390c0a5df9b67a52a85ba9 +GL_COMMIT= 17bd59adecf525e5e0a42101d241d05e29228338 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 8d82d7a5b797..4b463dad293a 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535876579 -SHA256 (gitlab-org-gitlab-ce-06cbee3bf9dd960380390c0a5df9b67a52a85ba9_GL0.tar.gz) = b7735a0589b4eaba762ee28e3d6ba2a3a3f788c82de1c3dffd57a5ad2b35dda5 -SIZE (gitlab-org-gitlab-ce-06cbee3bf9dd960380390c0a5df9b67a52a85ba9_GL0.tar.gz) = 52777352 +TIMESTAMP = 1537563375 +SHA256 (gitlab-org-gitlab-ce-17bd59adecf525e5e0a42101d241d05e29228338_GL0.tar.gz) = 7a3615de5c2359f10f5f0ec606871a3034546e7f5cf41f41809665fe56a11464 +SIZE (gitlab-org-gitlab-ce-17bd59adecf525e5e0a42101d241d05e29228338_GL0.tar.gz) = 42430478 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index d9fcb6578ef3..68a6966d7e76 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-08-22 22:40:32 UTC +--- Gemfile.orig 2018-09-21 11:36:34 UTC +++ Gemfile @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', gem_versions['default_value_for'] @@ -9,16 +9,7 @@ gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.27' -@@ -123,7 +123,7 @@ gem 'fog-rackspace', '~> 0.1.1' - gem 'fog-aliyun', '~> 0.2.0' - - # for Google storage --gem 'google-api-client', '~> 0.19.8' -+gem 'google-api-client', '>= 0.19.8' - - # for aws storage - gem 'unf', '~> 0.1.4' -@@ -177,7 +177,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req +@@ -179,7 +179,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req gem 'rufus-scheduler', '~> 3.4' # HTTP requests @@ -26,8 +17,8 @@ +gem 'httparty', '>= 0.13.3' # Colored output to console - gem 'rainbow', '~> 2.2' -@@ -294,7 +294,7 @@ gem 'batch-loader', '~> 1.2.1' + gem 'rainbow', '~> 3.0' +@@ -296,7 +296,7 @@ gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' @@ -36,7 +27,7 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -@@ -302,96 +302,11 @@ gem 'peek-sidekiq', '~> 1.0.3' +@@ -304,96 +304,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do @@ -101,12 +92,11 @@ - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.26.0', require: false - gem 'simplecov', '~> 0.14.0', require: false -- gem 'flay', '~> 2.10.0', require: false - gem 'bundler-audit', '~> 0.5.0', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - -- gem 'license_finder', '~> 3.1', require: false +- gem 'license_finder', '~> 5.4', require: false - gem 'knapsack', '~> 1.16' - - gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] @@ -128,6 +118,7 @@ - gem 'sham_rack', '~> 1.3.6' - gem 'concurrent-ruby', '~> 1.0.5' - gem 'test-prof', '~> 0.2.5' +- gem 'rspec_junit_formatter' -end - gem 'octokit', '~> 4.9' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 99b75ea196d0..d4c498bbc6b8 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2018-08-22 22:40:32 UTC +--- config/gitlab.yml.example.orig 2018-09-21 11:36:34 UTC +++ config/gitlab.yml.example @@ -223,7 +223,7 @@ production: &base # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages @@ -9,7 +9,7 @@ ## Mattermost ## For enabling Add to Mattermost button -@@ -582,7 +582,7 @@ production: &base +@@ -585,7 +585,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,7 +18,7 @@ # Default Gitaly authentication token. Can be overriden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -600,8 +600,8 @@ production: &base +@@ -603,8 +603,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -29,7 +29,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -629,12 +629,12 @@ production: &base +@@ -632,12 +632,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -45,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -655,7 +655,7 @@ production: &base +@@ -658,7 +658,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index 257da06e2da7..27f575efc9d6 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -4,12 +4,12 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.2-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.3-freebsd.md If you just installed an major upgrade of GitLab, for example you -switched from 11.1.x to 11.2.x, please follow the instructions in the guide at: +switched from 11.2.x to 11.3.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.1-11.2-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.2-11.3-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist index 709fa12a031b..60aac06443a4 100644 --- a/www/gitlab-ce/pkg-plist +++ b/www/gitlab-ce/pkg-plist @@ -3,16 +3,20 @@ %%WWWDIR%%/.csscomb.json %%WWWDIR%%/.eslintignore %%WWWDIR%%/.eslintrc.yml -%%WWWDIR%%/.flayignore %%WWWDIR%%/.foreman %%WWWDIR%%/.gitattributes %%WWWDIR%%/.github/ISSUE_TEMPLATE.md %%WWWDIR%%/.github/PULL_REQUEST_TEMPLATE.md %%WWWDIR%%/.gitlab-ci.yml +%%WWWDIR%%/.gitlab/CODEOWNERS +%%WWWDIR%%/.gitlab/issue_templates/Acceptance_Testing.md %%WWWDIR%%/.gitlab/issue_templates/Bug.md +%%WWWDIR%%/.gitlab/issue_templates/Documentation.md %%WWWDIR%%/.gitlab/issue_templates/Feature proposal.md %%WWWDIR%%/.gitlab/issue_templates/Research proposal.md %%WWWDIR%%/.gitlab/issue_templates/Security developer workflow.md +%%WWWDIR%%/.gitlab/issue_templates/Test plan.md +%%WWWDIR%%/.gitlab/merge_request_templates/Change documentation location.md %%WWWDIR%%/.gitlab/merge_request_templates/Database changes.md %%WWWDIR%%/.gitlab/merge_request_templates/Documentation.md %%WWWDIR%%/.gitlab/route-map.yml @@ -44,6 +48,7 @@ %%WWWDIR%%/README.md %%WWWDIR%%/Rakefile %%WWWDIR%%/VERSION +%%WWWDIR%%/app/assets/images/auth_buttons/auth0_64.png %%WWWDIR%%/app/assets/images/auth_buttons/authentiq_64.png %%WWWDIR%%/app/assets/images/auth_buttons/azure_64.png %%WWWDIR%%/app/assets/images/auth_buttons/bitbucket_64.png @@ -51,6 +56,8 @@ %%WWWDIR%%/app/assets/images/auth_buttons/github_64.png %%WWWDIR%%/app/assets/images/auth_buttons/gitlab_64.png %%WWWDIR%%/app/assets/images/auth_buttons/google_64.png +%%WWWDIR%%/app/assets/images/auth_buttons/jwt_64.png +%%WWWDIR%%/app/assets/images/auth_buttons/shibboleth_64.png %%WWWDIR%%/app/assets/images/auth_buttons/signin_with_google.png %%WWWDIR%%/app/assets/images/auth_buttons/twitter_64.png %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_canceled.ico @@ -2001,7 +2008,6 @@ %%WWWDIR%%/app/assets/javascripts/boards/services/board_service.js %%WWWDIR%%/app/assets/javascripts/boards/stores/boards_store.js %%WWWDIR%%/app/assets/javascripts/boards/stores/modal_store.js -%%WWWDIR%%/app/assets/javascripts/boards/utils/query_data.js %%WWWDIR%%/app/assets/javascripts/branches/branches_delete_modal.js %%WWWDIR%%/app/assets/javascripts/breadcrumb.js %%WWWDIR%%/app/assets/javascripts/breakpoints.js @@ -2015,7 +2021,6 @@ %%WWWDIR%%/app/assets/javascripts/clusters/clusters_index.js %%WWWDIR%%/app/assets/javascripts/clusters/components/application_row.vue %%WWWDIR%%/app/assets/javascripts/clusters/components/applications.vue -%%WWWDIR%%/app/assets/javascripts/clusters/components/gcp_signup_offer.js %%WWWDIR%%/app/assets/javascripts/clusters/constants.js %%WWWDIR%%/app/assets/javascripts/clusters/event_hub.js %%WWWDIR%%/app/assets/javascripts/clusters/services/clusters_service.js @@ -2114,6 +2119,7 @@ %%WWWDIR%%/app/assets/javascripts/diffs/store/mutation_types.js %%WWWDIR%%/app/assets/javascripts/diffs/store/mutations.js %%WWWDIR%%/app/assets/javascripts/diffs/store/utils.js +%%WWWDIR%%/app/assets/javascripts/dismissable_callout.js %%WWWDIR%%/app/assets/javascripts/dispatcher.js %%WWWDIR%%/app/assets/javascripts/docs/docs_bundle.js %%WWWDIR%%/app/assets/javascripts/droplab/constants.js @@ -2232,6 +2238,7 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/branches/search_list.vue %%WWWDIR%%/app/assets/javascripts/ide/components/changed_file_icon.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/actions.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/empty_state.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/form.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -2247,6 +2254,8 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/external_link.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/index.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/item.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/file_templates/bar.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/file_templates/dropdown.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide_project_header.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide_review.vue @@ -2319,6 +2328,12 @@ %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/mutation_types.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/mutations.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/state.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/file_templates/actions.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/file_templates/getters.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/file_templates/index.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/file_templates/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/file_templates/mutations.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/file_templates/state.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/constants.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/index.js @@ -2386,12 +2401,28 @@ %%WWWDIR%%/app/assets/javascripts/issue_show/stores/index.js %%WWWDIR%%/app/assets/javascripts/issue_status_select.js %%WWWDIR%%/app/assets/javascripts/job.js +%%WWWDIR%%/app/assets/javascripts/jobs/components/artifacts_block.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/commit_block.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/empty_state.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/environments_block.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/erased_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/header.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/job_log.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/job_log_controllers.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/jobs_container.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/sidebar_detail_row.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/sidebar_details_block.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/stages_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/stuck_block.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/trigger_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/job_details_bundle.js %%WWWDIR%%/app/assets/javascripts/jobs/job_details_mediator.js %%WWWDIR%%/app/assets/javascripts/jobs/services/job_service.js +%%WWWDIR%%/app/assets/javascripts/jobs/store/actions.js +%%WWWDIR%%/app/assets/javascripts/jobs/store/index.js +%%WWWDIR%%/app/assets/javascripts/jobs/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/jobs/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/jobs/store/state.js %%WWWDIR%%/app/assets/javascripts/jobs/stores/job_store.js %%WWWDIR%%/app/assets/javascripts/label_manager.js %%WWWDIR%%/app/assets/javascripts/labels.js @@ -2431,6 +2462,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/url_utility.js %%WWWDIR%%/app/assets/javascripts/lib/utils/users_cache.js %%WWWDIR%%/app/assets/javascripts/line_highlighter.js +%%WWWDIR%%/app/assets/javascripts/locale/ensure_single_line.js @(git,,) %%WWWDIR%%/app/assets/javascripts/locale/index.js %%WWWDIR%%/app/assets/javascripts/locale/sprintf.js %%WWWDIR%%/app/assets/javascripts/logo.js @@ -2531,7 +2563,9 @@ %%WWWDIR%%/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js %%WWWDIR%%/app/assets/javascripts/pages/admin/abuse_reports/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/admin.js +%%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js %%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/index.js +%%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/usage_ping_payload.js %%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js %%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/groups/edit/index.js @@ -2548,6 +2582,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue %%WWWDIR%%/app/assets/javascripts/pages/admin/users/index.js +%%WWWDIR%%/app/assets/javascripts/pages/admin/users/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/constants.js %%WWWDIR%%/app/assets/javascripts/pages/dashboard/activity/index.js %%WWWDIR%%/app/assets/javascripts/pages/dashboard/groups/index/index.js @@ -2575,6 +2610,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/groups/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/settings/badges/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/show/group_tabs.js %%WWWDIR%%/app/assets/javascripts/pages/groups/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/help/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/help/show/index.js @@ -2582,8 +2618,6 @@ %%WWWDIR%%/app/assets/javascripts/pages/ide/index.js %%WWWDIR%%/app/assets/javascripts/pages/import/fogbugz/new_user_map/index.js %%WWWDIR%%/app/assets/javascripts/pages/import/gitlab_projects/new/index.js -%%WWWDIR%%/app/assets/javascripts/pages/instance_statistics/cohorts/index.js -%%WWWDIR%%/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js %%WWWDIR%%/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js %%WWWDIR%%/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js %%WWWDIR%%/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue @@ -2697,11 +2731,11 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/registry/repositories/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/releases/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/services/edit/index.js -%%WWWDIR%%/app/assets/javascripts/pages/projects/settings/badges/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/create_deploy_token/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/form.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/show/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/show/mirror_repos.js %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue @@ -2817,6 +2851,7 @@ %%WWWDIR%%/app/assets/javascripts/protected_tags/protected_tag_edit_list.js %%WWWDIR%%/app/assets/javascripts/raven/index.js %%WWWDIR%%/app/assets/javascripts/raven/raven_config.js +%%WWWDIR%%/app/assets/javascripts/read_more.js %%WWWDIR%%/app/assets/javascripts/ref_select_dropdown.js %%WWWDIR%%/app/assets/javascripts/registry/components/app.vue %%WWWDIR%%/app/assets/javascripts/registry/components/collapsible_container.vue @@ -2829,7 +2864,15 @@ %%WWWDIR%%/app/assets/javascripts/registry/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/registry/stores/mutations.js %%WWWDIR%%/app/assets/javascripts/reports/components/grouped_test_reports_app.vue +%%WWWDIR%%/app/assets/javascripts/reports/components/issue_body.js +%%WWWDIR%%/app/assets/javascripts/reports/components/issue_status_icon.vue +%%WWWDIR%%/app/assets/javascripts/reports/components/issues_list.vue %%WWWDIR%%/app/assets/javascripts/reports/components/modal.vue +%%WWWDIR%%/app/assets/javascripts/reports/components/modal_open_name.vue +%%WWWDIR%%/app/assets/javascripts/reports/components/report_issues.vue +%%WWWDIR%%/app/assets/javascripts/reports/components/report_link.vue +%%WWWDIR%%/app/assets/javascripts/reports/components/report_section.vue +%%WWWDIR%%/app/assets/javascripts/reports/components/summary_row.vue %%WWWDIR%%/app/assets/javascripts/reports/components/test_issue_body.vue %%WWWDIR%%/app/assets/javascripts/reports/constants.js %%WWWDIR%%/app/assets/javascripts/reports/store/actions.js @@ -2906,6 +2949,7 @@ %%WWWDIR%%/app/assets/javascripts/u2f/register.js %%WWWDIR%%/app/assets/javascripts/u2f/util.js %%WWWDIR%%/app/assets/javascripts/ui_development_kit.js +%%WWWDIR%%/app/assets/javascripts/usage_ping_consent.js %%WWWDIR%%/app/assets/javascripts/user_callout.js %%WWWDIR%%/app/assets/javascripts/users_select.js %%WWWDIR%%/app/assets/javascripts/version_check_image.js @@ -2999,15 +3043,6 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_avatar/default.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_avatar/image.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/recaptcha_modal.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/constants.js -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/issue_body.js -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/issue_status_icon.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/issues_list.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/modal_open_name.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/report_issues.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/report_link.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/report_section.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/reports/summary_row.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue @@ -3029,6 +3064,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/tabs/tabs.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/toggle_button.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/tooltip_on_truncate.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_svg.vue @@ -3095,6 +3131,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework/pagination.scss %%WWWDIR%%/app/assets/stylesheets/framework/panels.scss %%WWWDIR%%/app/assets/stylesheets/framework/popup.scss +%%WWWDIR%%/app/assets/stylesheets/framework/read_more.scss %%WWWDIR%%/app/assets/stylesheets/framework/responsive_tables.scss %%WWWDIR%%/app/assets/stylesheets/framework/secondary_navigation_elements.scss %%WWWDIR%%/app/assets/stylesheets/framework/selects.scss @@ -3109,6 +3146,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework/tooltips.scss %%WWWDIR%%/app/assets/stylesheets/framework/typography.scss %%WWWDIR%%/app/assets/stylesheets/framework/variables.scss +%%WWWDIR%%/app/assets/stylesheets/framework/variables_overrides.scss %%WWWDIR%%/app/assets/stylesheets/framework/vue_transitions.scss %%WWWDIR%%/app/assets/stylesheets/framework/wells.scss %%WWWDIR%%/app/assets/stylesheets/framework/zen.scss @@ -3247,6 +3285,7 @@ %%WWWDIR%%/app/controllers/concerns/requires_whitelisted_monitoring_client.rb %%WWWDIR%%/app/controllers/concerns/routable_actions.rb %%WWWDIR%%/app/controllers/concerns/send_file_upload.rb +%%WWWDIR%%/app/controllers/concerns/sends_blob.rb %%WWWDIR%%/app/controllers/concerns/service_params.rb %%WWWDIR%%/app/controllers/concerns/snippets_actions.rb %%WWWDIR%%/app/controllers/concerns/spammable_actions.rb @@ -3279,7 +3318,6 @@ %%WWWDIR%%/app/controllers/groups/labels_controller.rb %%WWWDIR%%/app/controllers/groups/milestones_controller.rb %%WWWDIR%%/app/controllers/groups/runners_controller.rb -%%WWWDIR%%/app/controllers/groups/settings/badges_controller.rb %%WWWDIR%%/app/controllers/groups/settings/ci_cd_controller.rb %%WWWDIR%%/app/controllers/groups/shared_projects_controller.rb %%WWWDIR%%/app/controllers/groups/uploads_controller.rb @@ -3397,7 +3435,6 @@ %%WWWDIR%%/app/controllers/projects/runner_projects_controller.rb %%WWWDIR%%/app/controllers/projects/runners_controller.rb %%WWWDIR%%/app/controllers/projects/services_controller.rb -%%WWWDIR%%/app/controllers/projects/settings/badges_controller.rb %%WWWDIR%%/app/controllers/projects/settings/ci_cd_controller.rb %%WWWDIR%%/app/controllers/projects/settings/integrations_controller.rb %%WWWDIR%%/app/controllers/projects/settings/repository_controller.rb @@ -3429,7 +3466,11 @@ %%WWWDIR%%/app/finders/README.md %%WWWDIR%%/app/finders/access_requests_finder.rb %%WWWDIR%%/app/finders/admin/projects_finder.rb -%%WWWDIR%%/app/finders/autocomplete_users_finder.rb +%%WWWDIR%%/app/finders/autocomplete/group_finder.rb +%%WWWDIR%%/app/finders/autocomplete/move_to_project_finder.rb +%%WWWDIR%%/app/finders/autocomplete/project_finder.rb +%%WWWDIR%%/app/finders/autocomplete/users_finder.rb +%%WWWDIR%%/app/finders/awarded_emoji_finder.rb %%WWWDIR%%/app/finders/branches_finder.rb %%WWWDIR%%/app/finders/clusters_finder.rb %%WWWDIR%%/app/finders/concerns/created_at_filter.rb @@ -3449,11 +3490,11 @@ %%WWWDIR%%/app/finders/issues_finder.rb %%WWWDIR%%/app/finders/joined_groups_finder.rb %%WWWDIR%%/app/finders/labels_finder.rb +%%WWWDIR%%/app/finders/license_template_finder.rb %%WWWDIR%%/app/finders/members_finder.rb %%WWWDIR%%/app/finders/merge_request_target_project_finder.rb %%WWWDIR%%/app/finders/merge_requests_finder.rb %%WWWDIR%%/app/finders/milestones_finder.rb -%%WWWDIR%%/app/finders/move_to_project_finder.rb %%WWWDIR%%/app/finders/notes_finder.rb %%WWWDIR%%/app/finders/personal_access_tokens_finder.rb %%WWWDIR%%/app/finders/personal_projects_finder.rb @@ -3463,8 +3504,10 @@ %%WWWDIR%%/app/finders/runner_jobs_finder.rb %%WWWDIR%%/app/finders/snippets_finder.rb %%WWWDIR%%/app/finders/tags_finder.rb +%%WWWDIR%%/app/finders/template_finder.rb %%WWWDIR%%/app/finders/todos_finder.rb %%WWWDIR%%/app/finders/union_finder.rb +%%WWWDIR%%/app/finders/user_finder.rb %%WWWDIR%%/app/finders/user_recent_events_finder.rb %%WWWDIR%%/app/finders/users_finder.rb %%WWWDIR%%/app/graphql/functions/base_function.rb @@ -3524,6 +3567,7 @@ %%WWWDIR%%/app/helpers/compare_helper.rb %%WWWDIR%%/app/helpers/components_helper.rb %%WWWDIR%%/app/helpers/conversational_development_index_helper.rb +%%WWWDIR%%/app/helpers/cookies_helper.rb %%WWWDIR%%/app/helpers/count_helper.rb %%WWWDIR%%/app/helpers/dashboard_helper.rb %%WWWDIR%%/app/helpers/defer_script_tag_helper.rb @@ -3559,6 +3603,7 @@ %%WWWDIR%%/app/helpers/merge_requests_helper.rb %%WWWDIR%%/app/helpers/milestones_helper.rb %%WWWDIR%%/app/helpers/milestones_routing_helper.rb +%%WWWDIR%%/app/helpers/mirror_helper.rb %%WWWDIR%%/app/helpers/namespaces_helper.rb %%WWWDIR%%/app/helpers/nav_helper.rb %%WWWDIR%%/app/helpers/notes_helper.rb @@ -3603,6 +3648,7 @@ %%WWWDIR%%/app/mailers/base_mailer.rb %%WWWDIR%%/app/mailers/devise_mailer.rb %%WWWDIR%%/app/mailers/email_rejection_mailer.rb +%%WWWDIR%%/app/mailers/emails/auto_devops.rb %%WWWDIR%%/app/mailers/emails/issues.rb %%WWWDIR%%/app/mailers/emails/members.rb %%WWWDIR%%/app/mailers/emails/merge_requests.rb @@ -3754,9 +3800,11 @@ %%WWWDIR%%/app/models/concerns/milestoneish.rb %%WWWDIR%%/app/models/concerns/note_on_diff.rb %%WWWDIR%%/app/models/concerns/noteable.rb +%%WWWDIR%%/app/models/concerns/optionally_search.rb %%WWWDIR%%/app/models/concerns/participable.rb %%WWWDIR%%/app/models/concerns/presentable.rb %%WWWDIR%%/app/models/concerns/project_features_compatibility.rb +%%WWWDIR%%/app/models/concerns/project_services_loggable.rb %%WWWDIR%%/app/models/concerns/prometheus_adapter.rb %%WWWDIR%%/app/models/concerns/protected_branch_access.rb %%WWWDIR%%/app/models/concerns/protected_ref.rb @@ -3838,6 +3886,7 @@ %%WWWDIR%%/app/models/group_label.rb %%WWWDIR%%/app/models/group_milestone.rb %%WWWDIR%%/app/models/guest.rb +%%WWWDIR%%/app/models/hooks/active_hook_filter.rb %%WWWDIR%%/app/models/hooks/project_hook.rb %%WWWDIR%%/app/models/hooks/service_hook.rb %%WWWDIR%%/app/models/hooks/system_hook.rb @@ -3855,12 +3904,14 @@ %%WWWDIR%%/app/models/key.rb %%WWWDIR%%/app/models/label.rb %%WWWDIR%%/app/models/label_link.rb +%%WWWDIR%%/app/models/label_note.rb %%WWWDIR%%/app/models/label_priority.rb %%WWWDIR%%/app/models/legacy_diff_discussion.rb %%WWWDIR%%/app/models/legacy_diff_note.rb %%WWWDIR%%/app/models/lfs_file_lock.rb %%WWWDIR%%/app/models/lfs_object.rb %%WWWDIR%%/app/models/lfs_objects_project.rb +%%WWWDIR%%/app/models/license_template.rb %%WWWDIR%%/app/models/list.rb %%WWWDIR%%/app/models/member.rb %%WWWDIR%%/app/models/members/group_member.rb @@ -3921,7 +3972,6 @@ %%WWWDIR%%/app/models/project_services/emails_on_push_service.rb %%WWWDIR%%/app/models/project_services/external_wiki_service.rb %%WWWDIR%%/app/models/project_services/flowdock_service.rb -%%WWWDIR%%/app/models/project_services/gemnasium_service.rb %%WWWDIR%%/app/models/project_services/gitlab_issue_tracker_service.rb %%WWWDIR%%/app/models/project_services/hangouts_chat_service.rb %%WWWDIR%%/app/models/project_services/hipchat_service.rb @@ -3950,17 +4000,18 @@ %%WWWDIR%%/app/models/project_statistics.rb %%WWWDIR%%/app/models/project_team.rb %%WWWDIR%%/app/models/project_wiki.rb +%%WWWDIR%%/app/models/prometheus_metric.rb %%WWWDIR%%/app/models/protectable_dropdown.rb %%WWWDIR%%/app/models/protected_branch.rb %%WWWDIR%%/app/models/protected_branch/merge_access_level.rb %%WWWDIR%%/app/models/protected_branch/push_access_level.rb -%%WWWDIR%%/app/models/protected_ref_matcher.rb %%WWWDIR%%/app/models/protected_tag.rb %%WWWDIR%%/app/models/protected_tag/create_access_level.rb %%WWWDIR%%/app/models/push_event.rb %%WWWDIR%%/app/models/push_event_payload.rb %%WWWDIR%%/app/models/readme_blob.rb %%WWWDIR%%/app/models/redirect_route.rb +%%WWWDIR%%/app/models/ref_matcher.rb %%WWWDIR%%/app/models/release.rb %%WWWDIR%%/app/models/remote_mirror.rb %%WWWDIR%%/app/models/repository.rb @@ -4003,6 +4054,7 @@ %%WWWDIR%%/app/policies/ci/runner_policy.rb %%WWWDIR%%/app/policies/ci/trigger_policy.rb %%WWWDIR%%/app/policies/clusters/cluster_policy.rb +%%WWWDIR%%/app/policies/commit_policy.rb %%WWWDIR%%/app/policies/commit_status_policy.rb %%WWWDIR%%/app/policies/concerns/policy_actor.rb %%WWWDIR%%/app/policies/deploy_key_policy.rb @@ -4088,6 +4140,9 @@ %%WWWDIR%%/app/serializers/deployment_entity.rb %%WWWDIR%%/app/serializers/deployment_serializer.rb %%WWWDIR%%/app/serializers/diff_file_entity.rb +%%WWWDIR%%/app/serializers/diff_line_entity.rb +%%WWWDIR%%/app/serializers/diff_line_parallel_entity.rb +%%WWWDIR%%/app/serializers/diff_line_serializer.rb %%WWWDIR%%/app/serializers/diffs_entity.rb %%WWWDIR%%/app/serializers/diffs_serializer.rb %%WWWDIR%%/app/serializers/discussion_entity.rb @@ -4122,6 +4177,8 @@ %%WWWDIR%%/app/serializers/merge_request_serializer.rb %%WWWDIR%%/app/serializers/merge_request_user_entity.rb %%WWWDIR%%/app/serializers/merge_request_widget_entity.rb +%%WWWDIR%%/app/serializers/move_to_project_entity.rb +%%WWWDIR%%/app/serializers/move_to_project_serializer.rb %%WWWDIR%%/app/serializers/note_attachment_entity.rb %%WWWDIR%%/app/serializers/note_entity.rb %%WWWDIR%%/app/serializers/note_user_entity.rb @@ -4130,6 +4187,7 @@ %%WWWDIR%%/app/serializers/pipeline_serializer.rb %%WWWDIR%%/app/serializers/project_entity.rb %%WWWDIR%%/app/serializers/project_mirror_entity.rb +%%WWWDIR%%/app/serializers/project_mirror_serializer.rb %%WWWDIR%%/app/serializers/project_note_entity.rb %%WWWDIR%%/app/serializers/project_note_serializer.rb %%WWWDIR%%/app/serializers/project_serializer.rb @@ -4182,6 +4240,7 @@ %%WWWDIR%%/app/services/ci/compare_test_reports_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_schedule_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_service.rb +%%WWWDIR%%/app/services/ci/enqueue_build_service.rb %%WWWDIR%%/app/services/ci/ensure_stage_service.rb %%WWWDIR%%/app/services/ci/extract_sections_from_build_trace_service.rb %%WWWDIR%%/app/services/ci/fetch_kubernetes_token_service.rb @@ -4210,6 +4269,7 @@ %%WWWDIR%%/app/services/commits/cherry_pick_service.rb %%WWWDIR%%/app/services/commits/create_service.rb %%WWWDIR%%/app/services/commits/revert_service.rb +%%WWWDIR%%/app/services/commits/tag_service.rb %%WWWDIR%%/app/services/compare_service.rb %%WWWDIR%%/app/services/concerns/exclusive_lease_guard.rb %%WWWDIR%%/app/services/concerns/issues/resolve_discussions.rb @@ -4260,8 +4320,8 @@ %%WWWDIR%%/app/services/issues/close_service.rb %%WWWDIR%%/app/services/issues/create_service.rb %%WWWDIR%%/app/services/issues/duplicate_service.rb -%%WWWDIR%%/app/services/issues/fetch_referenced_merge_requests_service.rb %%WWWDIR%%/app/services/issues/move_service.rb +%%WWWDIR%%/app/services/issues/referenced_merge_requests_service.rb %%WWWDIR%%/app/services/issues/reopen_service.rb %%WWWDIR%%/app/services/issues/update_service.rb %%WWWDIR%%/app/services/keys/base_service.rb @@ -4331,11 +4391,13 @@ %%WWWDIR%%/app/services/notification_service.rb %%WWWDIR%%/app/services/preview_markdown_service.rb %%WWWDIR%%/app/services/projects/after_import_service.rb +%%WWWDIR%%/app/services/projects/auto_devops/disable_service.rb %%WWWDIR%%/app/services/projects/autocomplete_service.rb %%WWWDIR%%/app/services/projects/base_move_relations_service.rb %%WWWDIR%%/app/services/projects/batch_count_service.rb %%WWWDIR%%/app/services/projects/batch_forks_count_service.rb %%WWWDIR%%/app/services/projects/batch_open_issues_count_service.rb +%%WWWDIR%%/app/services/projects/container_repository/destroy_service.rb %%WWWDIR%%/app/services/projects/count_service.rb %%WWWDIR%%/app/services/projects/create_from_template_service.rb %%WWWDIR%%/app/services/projects/create_service.rb @@ -4392,10 +4454,12 @@ %%WWWDIR%%/app/services/protected_tags/update_service.rb %%WWWDIR%%/app/services/push_event_payload_service.rb %%WWWDIR%%/app/services/quick_actions/interpret_service.rb +%%WWWDIR%%/app/services/quick_actions/target_service.rb %%WWWDIR%%/app/services/repair_ldap_blocked_user_service.rb %%WWWDIR%%/app/services/repository_archive_clean_up_service.rb %%WWWDIR%%/app/services/reset_project_cache_service.rb %%WWWDIR%%/app/services/resource_events/change_labels_service.rb +%%WWWDIR%%/app/services/resource_events/merge_into_notes_service.rb %%WWWDIR%%/app/services/search/global_service.rb %%WWWDIR%%/app/services/search/group_service.rb %%WWWDIR%%/app/services/search/project_service.rb @@ -4441,6 +4505,7 @@ %%WWWDIR%%/app/services/wiki_pages/create_service.rb %%WWWDIR%%/app/services/wiki_pages/destroy_service.rb %%WWWDIR%%/app/services/wiki_pages/update_service.rb +%%WWWDIR%%/app/services/wikis/create_attachment_service.rb %%WWWDIR%%/app/uploaders/attachment_uploader.rb %%WWWDIR%%/app/uploaders/avatar_uploader.rb %%WWWDIR%%/app/uploaders/favicon_uploader.rb @@ -4458,6 +4523,7 @@ %%WWWDIR%%/app/uploaders/uploader_helper.rb %%WWWDIR%%/app/uploaders/workhorse.rb %%WWWDIR%%/app/validators/abstract_path_validator.rb +%%WWWDIR%%/app/validators/branch_filter_validator.rb %%WWWDIR%%/app/validators/certificate_fingerprint_validator.rb %%WWWDIR%%/app/validators/certificate_key_validator.rb %%WWWDIR%%/app/validators/certificate_validator.rb @@ -4467,6 +4533,7 @@ %%WWWDIR%%/app/validators/cron_validator.rb %%WWWDIR%%/app/validators/duration_validator.rb %%WWWDIR%%/app/validators/email_validator.rb +%%WWWDIR%%/app/validators/js_regex_validator.rb %%WWWDIR%%/app/validators/key_restriction_validator.rb %%WWWDIR%%/app/validators/line_code_validator.rb %%WWWDIR%%/app/validators/namespace_name_validator.rb @@ -4694,6 +4761,7 @@ %%WWWDIR%%/app/views/events/event/_common.html.haml %%WWWDIR%%/app/views/events/event/_created_project.html.haml %%WWWDIR%%/app/views/events/event/_note.html.haml +%%WWWDIR%%/app/views/events/event/_private.html.haml %%WWWDIR%%/app/views/events/event/_push.html.haml %%WWWDIR%%/app/views/explore/_head.html.haml %%WWWDIR%%/app/views/explore/groups/_groups.html.haml @@ -4707,11 +4775,13 @@ %%WWWDIR%%/app/views/explore/projects/trending.html.haml %%WWWDIR%%/app/views/explore/snippets/index.html.haml %%WWWDIR%%/app/views/groups/_activities.html.haml -%%WWWDIR%%/app/views/groups/_children.html.haml +%%WWWDIR%%/app/views/groups/_archived_projects.html.haml %%WWWDIR%%/app/views/groups/_create_chat_team.html.haml %%WWWDIR%%/app/views/groups/_group_admin_settings.html.haml %%WWWDIR%%/app/views/groups/_home_panel.html.haml %%WWWDIR%%/app/views/groups/_projects.html.haml +%%WWWDIR%%/app/views/groups/_shared_projects.html.haml +%%WWWDIR%%/app/views/groups/_subgroups_and_projects.html.haml %%WWWDIR%%/app/views/groups/activity.html.haml %%WWWDIR%%/app/views/groups/boards/index.html.haml %%WWWDIR%%/app/views/groups/boards/show.html.haml @@ -4815,6 +4885,7 @@ %%WWWDIR%%/app/views/layouts/devise_empty.html.haml %%WWWDIR%%/app/views/layouts/errors.html.haml %%WWWDIR%%/app/views/layouts/explore.html.haml +%%WWWDIR%%/app/views/layouts/fullscreen.html.haml %%WWWDIR%%/app/views/layouts/group.html.haml %%WWWDIR%%/app/views/layouts/group_settings.html.haml %%WWWDIR%%/app/views/layouts/header/_current_user_dropdown.html.haml @@ -4839,7 +4910,6 @@ %%WWWDIR%%/app/views/layouts/nav/sidebar/_instance_statistics.html.haml %%WWWDIR%%/app/views/layouts/nav/sidebar/_profile.html.haml %%WWWDIR%%/app/views/layouts/nav/sidebar/_project.html.haml -%%WWWDIR%%/app/views/layouts/nav_only.html.haml %%WWWDIR%%/app/views/layouts/notify.html.haml %%WWWDIR%%/app/views/layouts/notify.text.erb %%WWWDIR%%/app/views/layouts/oauth_error.html.haml @@ -4850,10 +4920,13 @@ %%WWWDIR%%/app/views/layouts/snippets.html.haml %%WWWDIR%%/app/views/layouts/terms.html.haml %%WWWDIR%%/app/views/layouts/xml.atom.builder +%%WWWDIR%%/app/views/notify/_failed_builds.html.haml %%WWWDIR%%/app/views/notify/_note_email.html.haml %%WWWDIR%%/app/views/notify/_note_email.text.erb %%WWWDIR%%/app/views/notify/_relabeled_issuable_email.html.haml %%WWWDIR%%/app/views/notify/_relabeled_issuable_email.text.erb +%%WWWDIR%%/app/views/notify/autodevops_disabled_email.html.haml +%%WWWDIR%%/app/views/notify/autodevops_disabled_email.text.erb %%WWWDIR%%/app/views/notify/closed_issue_email.html.haml %%WWWDIR%%/app/views/notify/closed_issue_email.text.haml %%WWWDIR%%/app/views/notify/closed_merge_request_email.html.haml @@ -5121,6 +5194,7 @@ %%WWWDIR%%/app/views/projects/cycle_analytics/_no_access.html.haml %%WWWDIR%%/app/views/projects/cycle_analytics/_overview.html.haml %%WWWDIR%%/app/views/projects/cycle_analytics/show.html.haml +%%WWWDIR%%/app/views/projects/default_branch/_show.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/_form.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/_index.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/edit.html.haml @@ -5256,6 +5330,7 @@ %%WWWDIR%%/app/views/projects/merge_requests/show.html.haml %%WWWDIR%%/app/views/projects/merge_requests/widget/_commit_change_content.html.haml %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_error.html.haml +%%WWWDIR%%/app/views/projects/milestones/_deprecation_message.html.haml %%WWWDIR%%/app/views/projects/milestones/_form.html.haml %%WWWDIR%%/app/views/projects/milestones/_milestone.html.haml %%WWWDIR%%/app/views/projects/milestones/edit.html.haml @@ -5264,7 +5339,8 @@ %%WWWDIR%%/app/views/projects/milestones/show.html.haml %%WWWDIR%%/app/views/projects/milestones/update.js.haml %%WWWDIR%%/app/views/projects/mirrors/_instructions.html.haml -%%WWWDIR%%/app/views/projects/mirrors/_push.html.haml +%%WWWDIR%%/app/views/projects/mirrors/_mirror_repos.html.haml +%%WWWDIR%%/app/views/projects/mirrors/_mirror_repos_form.html.haml %%WWWDIR%%/app/views/projects/mirrors/_show.html.haml %%WWWDIR%%/app/views/projects/network/_head.html.haml %%WWWDIR%%/app/views/projects/network/show.html.haml @@ -5303,8 +5379,8 @@ %%WWWDIR%%/app/views/projects/pipelines/new.html.haml %%WWWDIR%%/app/views/projects/pipelines/show.html.haml %%WWWDIR%%/app/views/projects/project_members/_groups.html.haml +%%WWWDIR%%/app/views/projects/project_members/_new_project_group.html.haml %%WWWDIR%%/app/views/projects/project_members/_new_project_member.html.haml -%%WWWDIR%%/app/views/projects/project_members/_new_shared_group.html.haml %%WWWDIR%%/app/views/projects/project_members/_team.html.haml %%WWWDIR%%/app/views/projects/project_members/import.html.haml %%WWWDIR%%/app/views/projects/project_members/index.html.haml @@ -5376,8 +5452,10 @@ %%WWWDIR%%/app/views/projects/snippets/show.html.haml %%WWWDIR%%/app/views/projects/snippets/verify.html.haml %%WWWDIR%%/app/views/projects/stage/_stage.html.haml +%%WWWDIR%%/app/views/projects/tags/_tag.atom.builder %%WWWDIR%%/app/views/projects/tags/_tag.html.haml %%WWWDIR%%/app/views/projects/tags/destroy.js.haml +%%WWWDIR%%/app/views/projects/tags/index.atom.builder %%WWWDIR%%/app/views/projects/tags/index.html.haml %%WWWDIR%%/app/views/projects/tags/new.html.haml %%WWWDIR%%/app/views/projects/tags/show.html.haml @@ -5434,6 +5512,7 @@ %%WWWDIR%%/app/views/sent_notifications/unsubscribe.html.haml %%WWWDIR%%/app/views/shared/_allow_request_access.html.haml %%WWWDIR%%/app/views/shared/_auto_devops_callout.html.haml +%%WWWDIR%%/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml %%WWWDIR%%/app/views/shared/_choose_group_avatar_button.html.haml %%WWWDIR%%/app/views/shared/_clone_panel.html.haml %%WWWDIR%%/app/views/shared/_commit_message_container.html.haml @@ -5459,6 +5538,7 @@ %%WWWDIR%%/app/views/shared/_milestones_filter.html.haml %%WWWDIR%%/app/views/shared/_milestones_sort_dropdown.html.haml %%WWWDIR%%/app/views/shared/_mini_pipeline_graph.html.haml +%%WWWDIR%%/app/views/shared/_mobile_clone_panel.html.haml %%WWWDIR%%/app/views/shared/_new_commit_form.html.haml %%WWWDIR%%/app/views/shared/_new_merge_request_checkbox.html.haml %%WWWDIR%%/app/views/shared/_new_project_item_select.html.haml @@ -5467,6 +5547,7 @@ %%WWWDIR%%/app/views/shared/_outdated_browser.html.haml %%WWWDIR%%/app/views/shared/_personal_access_tokens_form.html.haml %%WWWDIR%%/app/views/shared/_personal_access_tokens_table.html.haml +%%WWWDIR%%/app/views/shared/_ping_consent.html.haml %%WWWDIR%%/app/views/shared/_project_limit.html.haml %%WWWDIR%%/app/views/shared/_promo.html.haml %%WWWDIR%%/app/views/shared/_recaptcha_form.html.haml @@ -5681,6 +5762,7 @@ %%WWWDIR%%/app/views/shared/members/_requests.html.haml %%WWWDIR%%/app/views/shared/members/_sort_dropdown.html.haml %%WWWDIR%%/app/views/shared/members/update.js.haml +%%WWWDIR%%/app/views/shared/milestones/_delete_button.html.haml %%WWWDIR%%/app/views/shared/milestones/_deprecation_message.html.haml %%WWWDIR%%/app/views/shared/milestones/_form_dates.html.haml %%WWWDIR%%/app/views/shared/milestones/_issuable.html.haml @@ -5754,6 +5836,7 @@ %%WWWDIR%%/app/workers/all_queues.yml %%WWWDIR%%/app/workers/archive_trace_worker.rb %%WWWDIR%%/app/workers/authorized_projects_worker.rb +%%WWWDIR%%/app/workers/auto_devops/disable_worker.rb %%WWWDIR%%/app/workers/background_migration_worker.rb %%WWWDIR%%/app/workers/build_coverage_worker.rb %%WWWDIR%%/app/workers/build_finished_worker.rb @@ -5768,6 +5851,7 @@ %%WWWDIR%%/app/workers/cluster_wait_for_app_installation_worker.rb %%WWWDIR%%/app/workers/cluster_wait_for_ingress_ip_address_worker.rb %%WWWDIR%%/app/workers/concerns/application_worker.rb +%%WWWDIR%%/app/workers/concerns/auto_devops_queue.rb %%WWWDIR%%/app/workers/concerns/cluster_applications.rb %%WWWDIR%%/app/workers/concerns/cluster_queue.rb %%WWWDIR%%/app/workers/concerns/cronjob_queue.rb @@ -5791,6 +5875,7 @@ %%WWWDIR%%/app/workers/create_gpg_signature_worker.rb %%WWWDIR%%/app/workers/create_note_diff_file_worker.rb %%WWWDIR%%/app/workers/create_pipeline_worker.rb +%%WWWDIR%%/app/workers/delete_container_repository_worker.rb %%WWWDIR%%/app/workers/delete_diff_files_worker.rb %%WWWDIR%%/app/workers/delete_merged_branches_worker.rb %%WWWDIR%%/app/workers/delete_user_worker.rb @@ -5956,6 +6041,7 @@ %%WWWDIR%%/config/initializers/batch_loader.rb %%WWWDIR%%/config/initializers/bootstrap_form.rb %%WWWDIR%%/config/initializers/bullet.rb +%%WWWDIR%%/config/initializers/carrierwave_patch.rb %%WWWDIR%%/config/initializers/chronic_duration.rb %%WWWDIR%%/config/initializers/connection_fix.rb %%WWWDIR%%/config/initializers/console_message.rb @@ -6031,7 +6117,7 @@ %%WWWDIR%%/config/mail_room.yml %%WWWDIR%%/config/no_todos_messages.yml %%WWWDIR%%/config/object_store_settings.rb -%%WWWDIR%%/config/prometheus/additional_metrics.yml +%%WWWDIR%%/config/prometheus/common_metrics.yml %%WWWDIR%%/config/redis.cache.yml.example %%WWWDIR%%/config/redis.queues.yml.example %%WWWDIR%%/config/redis.shared_state.yml.example @@ -6067,6 +6153,7 @@ %%WWWDIR%%/danger/changelog/Dangerfile %%WWWDIR%%/danger/changes_size/Dangerfile %%WWWDIR%%/danger/database/Dangerfile +%%WWWDIR%%/danger/documentation/Dangerfile %%WWWDIR%%/danger/frozen_string/Dangerfile %%WWWDIR%%/danger/gemfile/Dangerfile %%WWWDIR%%/danger/metadata/Dangerfile @@ -6091,8 +6178,12 @@ %%WWWDIR%%/db/fixtures/development/20_nested_groups.rb %%WWWDIR%%/db/fixtures/development/21_conversational_development_index_metrics.rb %%WWWDIR%%/db/fixtures/development/22_labeled_issues_seed.rb +%%WWWDIR%%/db/fixtures/development/23_spam_logs.rb +%%WWWDIR%%/db/fixtures/development/99_common_metrics.rb %%WWWDIR%%/db/fixtures/production/001_admin.rb %%WWWDIR%%/db/fixtures/production/010_settings.rb +%%WWWDIR%%/db/fixtures/production/999_common_metrics.rb +%%WWWDIR%%/db/importers/common_metrics_importer.rb %%WWWDIR%%/db/migrate/20140313092127_init_schema.rb %%WWWDIR%%/db/migrate/20140407135544_fix_namespaces.rb %%WWWDIR%%/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb @@ -6803,6 +6894,8 @@ %%WWWDIR%%/db/migrate/20171222183504_add_jobs_cache_index_to_project.rb %%WWWDIR%%/db/migrate/20171229225929_change_user_project_limit_not_null_and_remove_default.rb %%WWWDIR%%/db/migrate/20171230123729_add_rebase_commit_sha_to_merge_requests_ce.rb +%%WWWDIR%%/db/migrate/20180101160629_create_prometheus_metrics.rb +%%WWWDIR%%/db/migrate/20180101160630_change_project_id_for_prometheus_metrics.rb %%WWWDIR%%/db/migrate/20180102220145_add_pages_https_only_to_projects.rb %%WWWDIR%%/db/migrate/20180103123548_add_confidential_note_events_to_services.rb %%WWWDIR%%/db/migrate/20180105212544_add_commits_count_to_merge_request_diff.rb @@ -6839,12 +6932,14 @@ %%WWWDIR%%/db/migrate/20180223144945_add_allow_local_requests_from_hooks_and_services_to_application_settings.rb %%WWWDIR%%/db/migrate/20180226050030_add_checksum_to_ci_job_artifacts.rb %%WWWDIR%%/db/migrate/20180227182112_add_group_id_to_boards_ce.rb +%%WWWDIR%%/db/migrate/20180228172924_add_include_private_contributions_to_users.rb %%WWWDIR%%/db/migrate/20180301010859_create_ci_builds_metadata_table.rb %%WWWDIR%%/db/migrate/20180302152117_ensure_foreign_keys_on_clusters_applications.rb %%WWWDIR%%/db/migrate/20180305095250_create_internal_ids_table.rb %%WWWDIR%%/db/migrate/20180305144721_add_privileged_to_runner.rb %%WWWDIR%%/db/migrate/20180306134842_add_missing_indexes_acts_as_taggable_on_engine.rb %%WWWDIR%%/db/migrate/20180308052825_add_section_name_id_index_on_ci_build_trace_sections.rb +%%WWWDIR%%/db/migrate/20180308125206_add_user_internal_regex_to_application_setting.rb %%WWWDIR%%/db/migrate/20180309121820_reschedule_commits_count_for_merge_request_diff.rb %%WWWDIR%%/db/migrate/20180309160427_add_partial_indexes_on_todos.rb %%WWWDIR%%/db/migrate/20180319190020_create_deploy_tokens.rb @@ -6900,6 +6995,7 @@ %%WWWDIR%%/db/migrate/20180531185349_add_repository_languages.rb %%WWWDIR%%/db/migrate/20180531220618_change_default_value_for_dsa_key_restriction.rb %%WWWDIR%%/db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb +%%WWWDIR%%/db/migrate/20180607071808_add_push_events_branch_filter_to_web_hooks.rb %%WWWDIR%%/db/migrate/20180608091413_add_group_to_todos.rb %%WWWDIR%%/db/migrate/20180608110058_rename_merge_requests_allow_collaboration.rb %%WWWDIR%%/db/migrate/20180612103626_add_columns_for_helm_tiller_certificates.rb @@ -6913,17 +7009,38 @@ %%WWWDIR%%/db/migrate/20180704204006_add_hide_third_party_offers_to_application_settings.rb %%WWWDIR%%/db/migrate/20180705160945_add_file_format_to_ci_job_artifacts.rb %%WWWDIR%%/db/migrate/20180710162338_add_foreign_key_from_notification_settings_to_users.rb +%%WWWDIR%%/db/migrate/20180711103851_drop_duplicate_protected_tags.rb +%%WWWDIR%%/db/migrate/20180711103922_add_protected_tags_index.rb %%WWWDIR%%/db/migrate/20180713092803_create_user_statuses.rb %%WWWDIR%%/db/migrate/20180717125853_remove_restricted_todos.rb %%WWWDIR%%/db/migrate/20180718005113_add_instance_statistics_visibility_to_application_setting.rb +%%WWWDIR%%/db/migrate/20180720023512_add_receive_max_input_size_to_application_settings.rb %%WWWDIR%%/db/migrate/20180722103201_add_private_profile_to_users.rb %%WWWDIR%%/db/migrate/20180723135214_add_web_ide_client_side_preview_enabled_to_application_settings.rb %%WWWDIR%%/db/migrate/20180726172057_create_resource_label_events.rb +%%WWWDIR%%/db/migrate/20180807153545_remove_redundant_status_index_on_ci_builds.rb +%%WWWDIR%%/db/migrate/20180808162000_add_user_show_add_ssh_key_message_to_application_settings.rb +%%WWWDIR%%/db/migrate/20180813101999_change_default_of_auto_devops_instance_wide.rb +%%WWWDIR%%/db/migrate/20180813102000_enable_auto_devops_instance_wide_for_everyone.rb +%%WWWDIR%%/db/migrate/20180815040323_add_authorization_type_to_cluster_platforms_kubernetes.rb +%%WWWDIR%%/db/migrate/20180815160409_add_file_location_to_ci_job_artifacts.rb +%%WWWDIR%%/db/migrate/20180815170510_add_partial_index_to_ci_builds_artifacts_file.rb +%%WWWDIR%%/db/migrate/20180815175440_add_index_on_list_type.rb +%%WWWDIR%%/db/migrate/20180831164904_fix_prometheus_metric_query_limits.rb +%%WWWDIR%%/db/migrate/20180831164905_add_common_to_prometheus_metrics.rb +%%WWWDIR%%/db/migrate/20180831164907_add_index_on_common_for_prometheus_metrics.rb +%%WWWDIR%%/db/migrate/20180831164908_add_identifier_to_prometheus_metric.rb +%%WWWDIR%%/db/migrate/20180831164909_add_index_for_identifier_to_prometheus_metric.rb +%%WWWDIR%%/db/migrate/20180831164910_import_common_metrics.rb +%%WWWDIR%%/db/migrate/20180901171833_add_project_config_source_status_index_to_pipeline.rb +%%WWWDIR%%/db/migrate/20180901200537_add_resource_label_event_reference_fields.rb +%%WWWDIR%%/db/migrate/20180906101639_add_user_ping_consent_to_application_settings.rb %%WWWDIR%%/db/migrate/gpg_keys_limits_to_mysql.rb %%WWWDIR%%/db/migrate/limits_ci_build_trace_chunks_raw_data_for_mysql.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb %%WWWDIR%%/db/migrate/markdown_cache_limits_to_mysql.rb %%WWWDIR%%/db/migrate/merge_request_diff_file_limits_to_mysql.rb +%%WWWDIR%%/db/migrate/prometheus_metrics_limits_to_mysql.rb %%WWWDIR%%/db/optional_migrations/composite_primary_keys.rb %%WWWDIR%%/db/post_migrate/20160824121037_change_personal_access_tokens_default_back_to_empty_array.rb %%WWWDIR%%/db/post_migrate/20161011222551_remove_inactive_jira_service_properties.rb @@ -7075,6 +7192,12 @@ %%WWWDIR%%/db/post_migrate/20180702120647_enqueue_fix_cross_project_label_links.rb %%WWWDIR%%/db/post_migrate/20180704145007_update_project_indexes.rb %%WWWDIR%%/db/post_migrate/20180706223200_populate_site_statistics.rb +%%WWWDIR%%/db/post_migrate/20180723130817_delete_inconsistent_internal_id_records.rb +%%WWWDIR%%/db/post_migrate/20180809195358_migrate_null_wiki_access_levels.rb +%%WWWDIR%%/db/post_migrate/20180816161409_migrate_legacy_artifacts_to_job_artifacts.rb +%%WWWDIR%%/db/post_migrate/20180816193530_rename_login_root_namespaces.rb +%%WWWDIR%%/db/post_migrate/20180826111825_recalculate_site_statistics.rb +%%WWWDIR%%/db/post_migrate/20180906051323_remove_orphaned_label_links.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md @@ -7093,6 +7216,7 @@ %%WWWDIR%%/doc/administration/auth/ldap.md %%WWWDIR%%/doc/administration/auth/okta.md %%WWWDIR%%/doc/administration/build_artifacts.md +%%WWWDIR%%/doc/administration/compliance.md %%WWWDIR%%/doc/administration/container_registry.md %%WWWDIR%%/doc/administration/custom_hooks.md %%WWWDIR%%/doc/administration/environment_variables.md @@ -7236,9 +7360,11 @@ %%WWWDIR%%/doc/api/project_snippets.md %%WWWDIR%%/doc/api/projects.md %%WWWDIR%%/doc/api/protected_branches.md +%%WWWDIR%%/doc/api/protected_tags.md %%WWWDIR%%/doc/api/repositories.md %%WWWDIR%%/doc/api/repository_files.md %%WWWDIR%%/doc/api/repository_storage_health.md +%%WWWDIR%%/doc/api/resource_label_events.md %%WWWDIR%%/doc/api/runners.md %%WWWDIR%%/doc/api/search.md %%WWWDIR%%/doc/api/services.md @@ -7355,6 +7481,10 @@ %%WWWDIR%%/doc/ci/img/types-of-pipelines.svg %%WWWDIR%%/doc/ci/img/view_on_env_blob.png %%WWWDIR%%/doc/ci/img/view_on_env_mr.png +%%WWWDIR%%/doc/ci/interactive_web_terminal/img/finished_job_with_terminal_open.png +%%WWWDIR%%/doc/ci/interactive_web_terminal/img/interactive_web_terminal_page.png +%%WWWDIR%%/doc/ci/interactive_web_terminal/img/interactive_web_terminal_running_job.png +%%WWWDIR%%/doc/ci/interactive_web_terminal/index.md %%WWWDIR%%/doc/ci/junit_test_reports.md %%WWWDIR%%/doc/ci/permissions/README.md %%WWWDIR%%/doc/ci/pipelines.md @@ -7418,6 +7548,10 @@ %%WWWDIR%%/doc/development/build_test_package.md %%WWWDIR%%/doc/development/changelog.md %%WWWDIR%%/doc/development/code_review.md +%%WWWDIR%%/doc/development/contributing/design.md +%%WWWDIR%%/doc/development/contributing/index.md +%%WWWDIR%%/doc/development/contributing/issue_workflow.md +%%WWWDIR%%/doc/development/contributing/merge_request_workflow.md %%WWWDIR%%/doc/development/database_debugging.md %%WWWDIR%%/doc/development/database_merge_request_checklist.md %%WWWDIR%%/doc/development/db_dump.md @@ -7425,7 +7559,9 @@ %%WWWDIR%%/doc/development/doc_styleguide.md %%WWWDIR%%/doc/development/documentation/img/manual_build_docs.png %%WWWDIR%%/doc/development/documentation/index.md +%%WWWDIR%%/doc/development/documentation/structure.md %%WWWDIR%%/doc/development/documentation/styleguide.md +%%WWWDIR%%/doc/development/documentation/workflow.md %%WWWDIR%%/doc/development/ee_features.md %%WWWDIR%%/doc/development/emails.md %%WWWDIR%%/doc/development/fe_guide/accessibility.md @@ -7506,6 +7642,7 @@ %%WWWDIR%%/doc/development/polymorphic_associations.md %%WWWDIR%%/doc/development/post_deployment_migrations.md %%WWWDIR%%/doc/development/profiling.md +%%WWWDIR%%/doc/development/prometheus_metrics.md %%WWWDIR%%/doc/development/pry_debugging.md %%WWWDIR%%/doc/development/query_count_limits.md %%WWWDIR%%/doc/development/query_recorder.md @@ -7527,9 +7664,11 @@ %%WWWDIR%%/doc/development/testing_guide/frontend_testing.md %%WWWDIR%%/doc/development/testing_guide/img/testing_triangle.png %%WWWDIR%%/doc/development/testing_guide/index.md +%%WWWDIR%%/doc/development/testing_guide/smoke.md %%WWWDIR%%/doc/development/testing_guide/testing_levels.md %%WWWDIR%%/doc/development/testing_guide/testing_rake_tasks.md %%WWWDIR%%/doc/development/ui_guide.md +%%WWWDIR%%/doc/development/understanding_explain_plans.md %%WWWDIR%%/doc/development/utilities.md %%WWWDIR%%/doc/development/ux_guide/animation.md %%WWWDIR%%/doc/development/ux_guide/basics.md @@ -7888,6 +8027,7 @@ %%WWWDIR%%/doc/security/reset_root_password.md %%WWWDIR%%/doc/security/ssh_keys_restrictions.md %%WWWDIR%%/doc/security/two_factor_authentication.md +%%WWWDIR%%/doc/security/unlock_user.md %%WWWDIR%%/doc/security/user_email_confirmation.md %%WWWDIR%%/doc/security/user_file_uploads.md %%WWWDIR%%/doc/security/webhooks.md @@ -7950,7 +8090,7 @@ %%WWWDIR%%/doc/university/high-availability/aws/img/rds-sec-group.png %%WWWDIR%%/doc/university/high-availability/aws/img/redis-cluster-det.png %%WWWDIR%%/doc/university/high-availability/aws/img/redis-net.png -%%WWWDIR%%/doc/university/high-availability/aws/img/reference-arch.png +%%WWWDIR%%/doc/university/high-availability/aws/img/reference-arch2.png %%WWWDIR%%/doc/university/high-availability/aws/img/route_table.png %%WWWDIR%%/doc/university/high-availability/aws/img/subnet.png %%WWWDIR%%/doc/university/process/README.md @@ -7993,6 +8133,7 @@ %%WWWDIR%%/doc/update/10.8-to-11.0.md %%WWWDIR%%/doc/update/11.0-to-11.1.md %%WWWDIR%%/doc/update/11.1-to-11.2.md +%%WWWDIR%%/doc/update/11.2-to-11-3.md %%WWWDIR%%/doc/update/2.6-to-3.0.md %%WWWDIR%%/doc/update/2.9-to-3.0.md %%WWWDIR%%/doc/update/3.0-to-3.1.md @@ -8527,6 +8668,7 @@ %%WWWDIR%%/doc/user/project/repository/img/contributors_graph.png %%WWWDIR%%/doc/user/project/repository/img/jupyter_notebook.png %%WWWDIR%%/doc/user/project/repository/img/repo_graph.png +%%WWWDIR%%/doc/user/project/repository/img/repository_languages.png %%WWWDIR%%/doc/user/project/repository/img/web_editor_new_branch_dropdown.png %%WWWDIR%%/doc/user/project/repository/img/web_editor_new_branch_from_issue.png %%WWWDIR%%/doc/user/project/repository/img/web_editor_new_branch_page.png @@ -8759,7 +8901,9 @@ %%WWWDIR%%/lib/api/projects.rb %%WWWDIR%%/lib/api/projects_relation_builder.rb %%WWWDIR%%/lib/api/protected_branches.rb +%%WWWDIR%%/lib/api/protected_tags.rb %%WWWDIR%%/lib/api/repositories.rb +%%WWWDIR%%/lib/api/resource_label_events.rb %%WWWDIR%%/lib/api/runner.rb %%WWWDIR%%/lib/api/runners.rb %%WWWDIR%%/lib/api/scope.rb @@ -8826,12 +8970,14 @@ %%WWWDIR%%/lib/banzai/filter/mermaid_filter.rb %%WWWDIR%%/lib/banzai/filter/milestone_reference_filter.rb %%WWWDIR%%/lib/banzai/filter/plantuml_filter.rb +%%WWWDIR%%/lib/banzai/filter/project_reference_filter.rb %%WWWDIR%%/lib/banzai/filter/redactor_filter.rb %%WWWDIR%%/lib/banzai/filter/reference_filter.rb %%WWWDIR%%/lib/banzai/filter/relative_link_filter.rb %%WWWDIR%%/lib/banzai/filter/sanitization_filter.rb %%WWWDIR%%/lib/banzai/filter/set_direction_filter.rb %%WWWDIR%%/lib/banzai/filter/snippet_reference_filter.rb +%%WWWDIR%%/lib/banzai/filter/spaced_link_filter.rb %%WWWDIR%%/lib/banzai/filter/syntax_highlight_filter.rb %%WWWDIR%%/lib/banzai/filter/table_of_contents_filter.rb %%WWWDIR%%/lib/banzai/filter/task_list_filter.rb @@ -8855,6 +9001,7 @@ %%WWWDIR%%/lib/banzai/pipeline/emoji_pipeline.rb %%WWWDIR%%/lib/banzai/pipeline/full_pipeline.rb %%WWWDIR%%/lib/banzai/pipeline/gfm_pipeline.rb +%%WWWDIR%%/lib/banzai/pipeline/label_pipeline.rb %%WWWDIR%%/lib/banzai/pipeline/markup_pipeline.rb %%WWWDIR%%/lib/banzai/pipeline/note_pipeline.rb %%WWWDIR%%/lib/banzai/pipeline/plain_markdown_pipeline.rb @@ -8878,6 +9025,7 @@ %%WWWDIR%%/lib/banzai/reference_parser/label_parser.rb %%WWWDIR%%/lib/banzai/reference_parser/merge_request_parser.rb %%WWWDIR%%/lib/banzai/reference_parser/milestone_parser.rb +%%WWWDIR%%/lib/banzai/reference_parser/project_parser.rb %%WWWDIR%%/lib/banzai/reference_parser/snippet_parser.rb %%WWWDIR%%/lib/banzai/reference_parser/user_parser.rb %%WWWDIR%%/lib/banzai/render_context.rb @@ -8996,6 +9144,7 @@ %%WWWDIR%%/lib/gitlab/background_migration/migrate_build_stage.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb +%%WWWDIR%%/lib/gitlab/background_migration/migrate_legacy_artifacts.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_stage_index.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_stage_status.rb %%WWWDIR%%/lib/gitlab/background_migration/migrate_system_uploads_to_new_folder.rb @@ -9092,6 +9241,8 @@ %%WWWDIR%%/lib/gitlab/ci/config/entry/validator.rb %%WWWDIR%%/lib/gitlab/ci/config/entry/validators.rb %%WWWDIR%%/lib/gitlab/ci/config/entry/variables.rb +%%WWWDIR%%/lib/gitlab/ci/config/extendable.rb +%%WWWDIR%%/lib/gitlab/ci/config/extendable/entry.rb %%WWWDIR%%/lib/gitlab/ci/config/loader.rb %%WWWDIR%%/lib/gitlab/ci/cron_parser.rb %%WWWDIR%%/lib/gitlab/ci/mask_secret.rb @@ -9269,6 +9420,7 @@ %%WWWDIR%%/lib/gitlab/diff/formatters/image_formatter.rb %%WWWDIR%%/lib/gitlab/diff/formatters/text_formatter.rb %%WWWDIR%%/lib/gitlab/diff/highlight.rb +%%WWWDIR%%/lib/gitlab/diff/highlight_cache.rb %%WWWDIR%%/lib/gitlab/diff/image_point.rb %%WWWDIR%%/lib/gitlab/diff/inline_diff.rb %%WWWDIR%%/lib/gitlab/diff/inline_diff_markdown_marker.rb @@ -9311,6 +9463,8 @@ %%WWWDIR%%/lib/gitlab/favicon.rb %%WWWDIR%%/lib/gitlab/file_detector.rb %%WWWDIR%%/lib/gitlab/file_finder.rb +%%WWWDIR%%/lib/gitlab/file_markdown_link_builder.rb +%%WWWDIR%%/lib/gitlab/file_type_detection.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/client.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/importer.rb %%WWWDIR%%/lib/gitlab/fogbugz_import/project_creator.rb @@ -9342,6 +9496,7 @@ %%WWWDIR%%/lib/gitlab/git/index.rb %%WWWDIR%%/lib/gitlab/git/lfs_changes.rb %%WWWDIR%%/lib/gitlab/git/lfs_pointer_file.rb +%%WWWDIR%%/lib/gitlab/git/merge_base.rb %%WWWDIR%%/lib/gitlab/git/operation_service.rb %%WWWDIR%%/lib/gitlab/git/path_helper.rb %%WWWDIR%%/lib/gitlab/git/popen.rb @@ -9370,6 +9525,8 @@ %%WWWDIR%%/lib/gitlab/git/wiki_page.rb %%WWWDIR%%/lib/gitlab/git/wiki_page_version.rb %%WWWDIR%%/lib/gitlab/git_access.rb +%%WWWDIR%%/lib/gitlab/git_access_result/custom_action.rb +%%WWWDIR%%/lib/gitlab/git_access_result/success.rb %%WWWDIR%%/lib/gitlab/git_access_wiki.rb %%WWWDIR%%/lib/gitlab/git_logger.rb %%WWWDIR%%/lib/gitlab/git_post_receive.rb @@ -9451,7 +9608,9 @@ %%WWWDIR%%/lib/gitlab/gpg/commit.rb %%WWWDIR%%/lib/gitlab/gpg/invalid_gpg_signature_updater.rb %%WWWDIR%%/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb +%%WWWDIR%%/lib/gitlab/grape_logging/loggers/perf_logger.rb %%WWWDIR%%/lib/gitlab/grape_logging/loggers/queue_duration_logger.rb +%%WWWDIR%%/lib/gitlab/grape_logging/loggers/route_logger.rb %%WWWDIR%%/lib/gitlab/grape_logging/loggers/user_logger.rb %%WWWDIR%%/lib/gitlab/graphql.rb %%WWWDIR%%/lib/gitlab/graphql/authorize.rb @@ -9494,6 +9653,10 @@ %%WWWDIR%%/lib/gitlab/i18n/po_linter.rb %%WWWDIR%%/lib/gitlab/i18n/translation_entry.rb %%WWWDIR%%/lib/gitlab/identifier.rb +%%WWWDIR%%/lib/gitlab/import/database_helpers.rb +%%WWWDIR%%/lib/gitlab/import/logger.rb +%%WWWDIR%%/lib/gitlab/import/merge_request_creator.rb +%%WWWDIR%%/lib/gitlab/import/merge_request_helpers.rb %%WWWDIR%%/lib/gitlab/import_export.rb %%WWWDIR%%/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy.rb %%WWWDIR%%/lib/gitlab/import_export/after_export_strategies/download_notification_strategy.rb @@ -9542,6 +9705,7 @@ %%WWWDIR%%/lib/gitlab/job_waiter.rb %%WWWDIR%%/lib/gitlab/json_logger.rb %%WWWDIR%%/lib/gitlab/kubernetes.rb +%%WWWDIR%%/lib/gitlab/kubernetes/cluster_role_binding.rb %%WWWDIR%%/lib/gitlab/kubernetes/config_map.rb %%WWWDIR%%/lib/gitlab/kubernetes/helm.rb %%WWWDIR%%/lib/gitlab/kubernetes/helm/api.rb @@ -9550,8 +9714,10 @@ %%WWWDIR%%/lib/gitlab/kubernetes/helm/init_command.rb %%WWWDIR%%/lib/gitlab/kubernetes/helm/install_command.rb %%WWWDIR%%/lib/gitlab/kubernetes/helm/pod.rb +%%WWWDIR%%/lib/gitlab/kubernetes/kube_client.rb %%WWWDIR%%/lib/gitlab/kubernetes/namespace.rb %%WWWDIR%%/lib/gitlab/kubernetes/pod.rb +%%WWWDIR%%/lib/gitlab/kubernetes/service_account.rb %%WWWDIR%%/lib/gitlab/language_detection.rb %%WWWDIR%%/lib/gitlab/lazy.rb %%WWWDIR%%/lib/gitlab/legacy_github_import/base_formatter.rb @@ -9628,6 +9794,7 @@ %%WWWDIR%%/lib/gitlab/project_authorizations/with_nested_groups.rb %%WWWDIR%%/lib/gitlab/project_authorizations/without_nested_groups.rb %%WWWDIR%%/lib/gitlab/project_search_results.rb +%%WWWDIR%%/lib/gitlab/project_service_logger.rb %%WWWDIR%%/lib/gitlab/project_template.rb %%WWWDIR%%/lib/gitlab/project_transfer.rb %%WWWDIR%%/lib/gitlab/prometheus/additional_metrics_parser.rb @@ -9759,6 +9926,7 @@ %%WWWDIR%%/lib/gitlab/themes.rb %%WWWDIR%%/lib/gitlab/time_tracking_formatter.rb %%WWWDIR%%/lib/gitlab/timeless.rb +%%WWWDIR%%/lib/gitlab/tree_summary.rb %%WWWDIR%%/lib/gitlab/untrusted_regexp.rb %%WWWDIR%%/lib/gitlab/update_path_error.rb %%WWWDIR%%/lib/gitlab/upgrader.rb @@ -9768,6 +9936,7 @@ %%WWWDIR%%/lib/gitlab/url_sanitizer.rb %%WWWDIR%%/lib/gitlab/usage_data.rb %%WWWDIR%%/lib/gitlab/user_access.rb +%%WWWDIR%%/lib/gitlab/user_extractor.rb %%WWWDIR%%/lib/gitlab/utils.rb %%WWWDIR%%/lib/gitlab/utils/merge_hash.rb %%WWWDIR%%/lib/gitlab/utils/override.rb @@ -9861,7 +10030,6 @@ %%WWWDIR%%/lib/tasks/downtime_check.rake %%WWWDIR%%/lib/tasks/ee_compat_check.rake %%WWWDIR%%/lib/tasks/eslint.rake -%%WWWDIR%%/lib/tasks/flay.rake %%WWWDIR%%/lib/tasks/gemojione.rake %%WWWDIR%%/lib/tasks/gettext.rake %%WWWDIR%%/lib/tasks/gitlab/artifacts/check.rake @@ -9887,6 +10055,7 @@ %%WWWDIR%%/lib/tasks/gitlab/pages.rake %%WWWDIR%%/lib/tasks/gitlab/setup.rake %%WWWDIR%%/lib/tasks/gitlab/shell.rake +%%WWWDIR%%/lib/tasks/gitlab/site_statistics.rake %%WWWDIR%%/lib/tasks/gitlab/storage.rake %%WWWDIR%%/lib/tasks/gitlab/tcp_check.rake %%WWWDIR%%/lib/tasks/gitlab/test.rake @@ -9920,9 +10089,12 @@ %%WWWDIR%%/lib/unfold_form.rb %%WWWDIR%%/lib/uploaded_file.rb %%WWWDIR%%/lib/version_check.rb +@(git,,) %%WWWDIR%%/locale/ar_SA/gitlab.po @(git,,) %%WWWDIR%%/locale/bg/gitlab.po @(git,,) %%WWWDIR%%/locale/bg/gitlab.po.time_stamp +@(git,,) %%WWWDIR%%/locale/ca_ES/gitlab.po @(git,,) %%WWWDIR%%/locale/cs_CZ/gitlab.po +@(git,,) %%WWWDIR%%/locale/da_DK/gitlab.po @(git,,) %%WWWDIR%%/locale/de/gitlab.po @(git,,) %%WWWDIR%%/locale/de/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/en/gitlab.po @@ -9931,11 +10103,13 @@ @(git,,) %%WWWDIR%%/locale/eo/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/es/gitlab.po @(git,,) %%WWWDIR%%/locale/es/gitlab.po.time_stamp +@(git,,) %%WWWDIR%%/locale/et_EE/gitlab.po @(git,,) %%WWWDIR%%/locale/fil_PH/gitlab.po @(git,,) %%WWWDIR%%/locale/fr/gitlab.po @(git,,) %%WWWDIR%%/locale/fr/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/gitlab.pot @(git,,) %%WWWDIR%%/locale/gl_ES/gitlab.po +@(git,,) %%WWWDIR%%/locale/he_IL/gitlab.po @(git,,) %%WWWDIR%%/locale/id_ID/gitlab.po @(git,,) %%WWWDIR%%/locale/it/gitlab.po @(git,,) %%WWWDIR%%/locale/it/gitlab.po.time_stamp @@ -9947,11 +10121,14 @@ @(git,,) %%WWWDIR%%/locale/pl_PL/gitlab.po @(git,,) %%WWWDIR%%/locale/pt_BR/gitlab.po @(git,,) %%WWWDIR%%/locale/pt_BR/gitlab.po.time_stamp +@(git,,) %%WWWDIR%%/locale/ro_RO/gitlab.po @(git,,) %%WWWDIR%%/locale/ru/gitlab.po @(git,,) %%WWWDIR%%/locale/ru/gitlab.po.time_stamp +@(git,,) %%WWWDIR%%/locale/sq_AL/gitlab.po @(git,,) %%WWWDIR%%/locale/tr_TR/gitlab.po @(git,,) %%WWWDIR%%/locale/uk/gitlab.po @(git,,) %%WWWDIR%%/locale/uk/gitlab.po.time_stamp +%%WWWDIR%%/locale/unfound_translations.rb @(git,,) %%WWWDIR%%/locale/zh_CN/gitlab.po @(git,,) %%WWWDIR%%/locale/zh_CN/gitlab.po.time_stamp @(git,,) %%WWWDIR%%/locale/zh_HK/gitlab.po @@ -10013,7 +10190,9 @@ %%WWWDIR%%/qa/qa/page/admin/settings/main.rb %%WWWDIR%%/qa/qa/page/admin/settings/repository_storage.rb %%WWWDIR%%/qa/qa/page/base.rb +%%WWWDIR%%/qa/qa/page/component/clone_panel.rb %%WWWDIR%%/qa/qa/page/component/dropzone.rb +%%WWWDIR%%/qa/qa/page/component/groups_filter.rb %%WWWDIR%%/qa/qa/page/component/select2.rb %%WWWDIR%%/qa/qa/page/dashboard/groups.rb %%WWWDIR%%/qa/qa/page/dashboard/projects.rb @@ -10068,7 +10247,6 @@ %%WWWDIR%%/qa/qa/page/project/wiki/new.rb %%WWWDIR%%/qa/qa/page/project/wiki/show.rb %%WWWDIR%%/qa/qa/page/settings/common.rb -%%WWWDIR%%/qa/qa/page/shared/clone_panel.rb %%WWWDIR%%/qa/qa/page/validator.rb %%WWWDIR%%/qa/qa/page/view.rb %%WWWDIR%%/qa/qa/runtime/address.rb @@ -10086,41 +10264,47 @@ %%WWWDIR%%/qa/qa/runtime/user.rb %%WWWDIR%%/qa/qa/scenario/actable.rb %%WWWDIR%%/qa/qa/scenario/bootable.rb -%%WWWDIR%%/qa/qa/scenario/taggable.rb %%WWWDIR%%/qa/qa/scenario/template.rb %%WWWDIR%%/qa/qa/scenario/test/instance.rb +%%WWWDIR%%/qa/qa/scenario/test/instance/all.rb +%%WWWDIR%%/qa/qa/scenario/test/instance/smoke.rb %%WWWDIR%%/qa/qa/scenario/test/integration/github.rb %%WWWDIR%%/qa/qa/scenario/test/integration/kubernetes.rb %%WWWDIR%%/qa/qa/scenario/test/integration/ldap.rb %%WWWDIR%%/qa/qa/scenario/test/integration/mattermost.rb +%%WWWDIR%%/qa/qa/scenario/test/integration/object_storage.rb +%%WWWDIR%%/qa/qa/scenario/test/sanity/framework.rb %%WWWDIR%%/qa/qa/scenario/test/sanity/selectors.rb %%WWWDIR%%/qa/qa/service/kubernetes_cluster.rb %%WWWDIR%%/qa/qa/service/omnibus.rb %%WWWDIR%%/qa/qa/service/runner.rb %%WWWDIR%%/qa/qa/service/shellout.rb -%%WWWDIR%%/qa/qa/specs/features/api/basics_spec.rb -%%WWWDIR%%/qa/qa/specs/features/api/users_spec.rb -%%WWWDIR%%/qa/qa/specs/features/login/ldap_spec.rb -%%WWWDIR%%/qa/qa/specs/features/mattermost/group_create_spec.rb -%%WWWDIR%%/qa/qa/specs/features/mattermost/login_spec.rb -%%WWWDIR%%/qa/qa/specs/features/merge_request/create_spec.rb -%%WWWDIR%%/qa/qa/specs/features/merge_request/rebase_spec.rb -%%WWWDIR%%/qa/qa/specs/features/merge_request/squash_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/activity_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/add_deploy_key_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/add_secret_variable_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/auto_devops_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/create_issue_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/create_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/deploy_key_clone_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/file_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/fork_project_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/import_from_github_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/pipelines_spec.rb -%%WWWDIR%%/qa/qa/specs/features/project/wikis_spec.rb -%%WWWDIR%%/qa/qa/specs/features/repository/clone_spec.rb -%%WWWDIR%%/qa/qa/specs/features/repository/protected_branches_spec.rb -%%WWWDIR%%/qa/qa/specs/features/repository/push_spec.rb +%%WWWDIR%%/qa/qa/specs/features/api/1_manage/users_spec.rb +%%WWWDIR%%/qa/qa/specs/features/api/3_create/repository/files_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/4_verify/secret_variable/add_secret_variable_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb +%%WWWDIR%%/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb +%%WWWDIR%%/qa/qa/specs/features/sanity/framework_spec.rb %%WWWDIR%%/qa/qa/specs/runner.rb %%WWWDIR%%/qa/spec/factory/base_spec.rb %%WWWDIR%%/qa/spec/factory/dependency_spec.rb @@ -10143,12 +10327,22 @@ %%WWWDIR%%/qa/spec/runtime/scenario_spec.rb %%WWWDIR%%/qa/spec/scenario/actable_spec.rb %%WWWDIR%%/qa/spec/scenario/bootable_spec.rb -%%WWWDIR%%/qa/spec/scenario/test/instance_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/instance/all_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/instance/smoke_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/integration/github_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/integration/kubernetes_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/integration/ldap_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/integration/mattermost_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/integration/object_storage_spec.rb +%%WWWDIR%%/qa/spec/scenario/test/sanity/framework_spec.rb %%WWWDIR%%/qa/spec/scenario/test/sanity/selectors_spec.rb %%WWWDIR%%/qa/spec/spec_helper.rb +%%WWWDIR%%/qa/spec/specs/runner_spec.rb +%%WWWDIR%%/qa/spec/support/shared_examples/scenario_shared_examples.rb %%WWWDIR%%/qa/spec/support/stub_env.rb %%WWWDIR%%/rubocop/cop/avoid_break_from_strong_memoize.rb %%WWWDIR%%/rubocop/cop/avoid_return_from_blocks.rb +%%WWWDIR%%/rubocop/cop/destroy_all.rb %%WWWDIR%%/rubocop/cop/gitlab/finder_with_find_by.rb %%WWWDIR%%/rubocop/cop/gitlab/httparty.rb %%WWWDIR%%/rubocop/cop/gitlab/module_with_instance_variables.rb @@ -10159,6 +10353,7 @@ %%WWWDIR%%/rubocop/cop/migration/add_concurrent_foreign_key.rb %%WWWDIR%%/rubocop/cop/migration/add_concurrent_index.rb %%WWWDIR%%/rubocop/cop/migration/add_index.rb +%%WWWDIR%%/rubocop/cop/migration/add_reference.rb %%WWWDIR%%/rubocop/cop/migration/add_timestamps.rb %%WWWDIR%%/rubocop/cop/migration/datetime.rb %%WWWDIR%%/rubocop/cop/migration/hash_index.rb @@ -10170,9 +10365,11 @@ %%WWWDIR%%/rubocop/cop/migration/timestamps.rb %%WWWDIR%%/rubocop/cop/migration/update_column_in_batches.rb %%WWWDIR%%/rubocop/cop/migration/update_large_table.rb +%%WWWDIR%%/rubocop/cop/prefer_class_methods_over_module.rb %%WWWDIR%%/rubocop/cop/project_path_helper.rb %%WWWDIR%%/rubocop/cop/rspec/env_assignment.rb %%WWWDIR%%/rubocop/cop/rspec/factories_in_migration_specs.rb +%%WWWDIR%%/rubocop/cop/ruby_interpolation_in_translation.rb %%WWWDIR%%/rubocop/cop/sidekiq_options_queue.rb %%WWWDIR%%/rubocop/migration_helpers.rb %%WWWDIR%%/rubocop/rubocop.rb @@ -10180,6 +10377,7 @@ %%WWWDIR%%/scripts/create_mysql_user.sh %%WWWDIR%%/scripts/create_postgres_user.sh %%WWWDIR%%/scripts/detect-new-flaky-examples +%%WWWDIR%%/scripts/frontend/extract_gettext_all.js %%WWWDIR%%/scripts/frontend/frontend_script_utils.js %%WWWDIR%%/scripts/frontend/postinstall.js %%WWWDIR%%/scripts/frontend/prettier.js @@ -10360,6 +10558,9 @@ %%WWWDIR%%/spec/controllers/user_callouts_controller_spec.rb %%WWWDIR%%/spec/controllers/users/terms_controller_spec.rb %%WWWDIR%%/spec/controllers/users_controller_spec.rb +%%WWWDIR%%/spec/db/development/import_common_metrics_spec.rb +%%WWWDIR%%/spec/db/importers/common_metrics_importer_spec.rb +%%WWWDIR%%/spec/db/production/import_common_metrics_spec.rb %%WWWDIR%%/spec/db/production/settings_spec.rb %%WWWDIR%%/spec/dependencies/omniauth_saml_spec.rb %%WWWDIR%%/spec/factories/abuse_reports.rb @@ -10448,6 +10649,7 @@ %%WWWDIR%%/spec/factories/project_statistics.rb %%WWWDIR%%/spec/factories/project_wikis.rb %%WWWDIR%%/spec/factories/projects.rb +%%WWWDIR%%/spec/factories/prometheus_metrics.rb %%WWWDIR%%/spec/factories/protected_branches.rb %%WWWDIR%%/spec/factories/protected_tags.rb %%WWWDIR%%/spec/factories/redirect_routes.rb @@ -10522,6 +10724,7 @@ %%WWWDIR%%/spec/features/boards/sidebar_spec.rb %%WWWDIR%%/spec/features/boards/sub_group_project_spec.rb %%WWWDIR%%/spec/features/calendar_spec.rb +%%WWWDIR%%/spec/features/commits/user_uses_slash_commands_spec.rb %%WWWDIR%%/spec/features/commits_spec.rb %%WWWDIR%%/spec/features/container_registry_spec.rb %%WWWDIR%%/spec/features/cycle_analytics_spec.rb @@ -10569,6 +10772,7 @@ %%WWWDIR%%/spec/features/groups/issues_spec.rb %%WWWDIR%%/spec/features/groups/labels/edit_spec.rb %%WWWDIR%%/spec/features/groups/labels/index_spec.rb +%%WWWDIR%%/spec/features/groups/labels/search_labels_spec.rb %%WWWDIR%%/spec/features/groups/labels/subscription_spec.rb %%WWWDIR%%/spec/features/groups/labels/user_sees_links_to_issuables.rb %%WWWDIR%%/spec/features/groups/members/filter_members_spec.rb @@ -10596,6 +10800,7 @@ %%WWWDIR%%/spec/features/import/manifest_import_spec.rb %%WWWDIR%%/spec/features/instance_statistics/cohorts_spec.rb %%WWWDIR%%/spec/features/instance_statistics/conversational_development_index_spec.rb +%%WWWDIR%%/spec/features/instance_statistics/instance_statistics.rb %%WWWDIR%%/spec/features/invites_spec.rb %%WWWDIR%%/spec/features/issuables/close_reopen_report_toggle_spec.rb %%WWWDIR%%/spec/features/issuables/default_sort_order_spec.rb @@ -10605,8 +10810,6 @@ %%WWWDIR%%/spec/features/issuables/markdown_references/jira_spec.rb %%WWWDIR%%/spec/features/issuables/shortcuts_issuable_spec.rb %%WWWDIR%%/spec/features/issuables/user_sees_sidebar_spec.rb -%%WWWDIR%%/spec/features/issues/award_emoji_spec.rb -%%WWWDIR%%/spec/features/issues/award_spec.rb %%WWWDIR%%/spec/features/issues/bulk_assignment_labels_spec.rb %%WWWDIR%%/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb %%WWWDIR%%/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb @@ -10630,11 +10833,22 @@ %%WWWDIR%%/spec/features/issues/move_spec.rb %%WWWDIR%%/spec/features/issues/note_polling_spec.rb %%WWWDIR%%/spec/features/issues/notes_on_issues_spec.rb +%%WWWDIR%%/spec/features/issues/resource_label_events_spec.rb +%%WWWDIR%%/spec/features/issues/rss_spec.rb %%WWWDIR%%/spec/features/issues/spam_issues_spec.rb %%WWWDIR%%/spec/features/issues/todo_spec.rb %%WWWDIR%%/spec/features/issues/update_issues_spec.rb +%%WWWDIR%%/spec/features/issues/user_comments_on_issue_spec.rb %%WWWDIR%%/spec/features/issues/user_creates_branch_and_merge_request_spec.rb +%%WWWDIR%%/spec/features/issues/user_creates_issue_spec.rb +%%WWWDIR%%/spec/features/issues/user_edits_issue_spec.rb +%%WWWDIR%%/spec/features/issues/user_interacts_with_awards_spec.rb +%%WWWDIR%%/spec/features/issues/user_sees_breadcrumb_links_spec.rb +%%WWWDIR%%/spec/features/issues/user_sorts_issues_spec.rb +%%WWWDIR%%/spec/features/issues/user_toggles_subscription_spec.rb %%WWWDIR%%/spec/features/issues/user_uses_slash_commands_spec.rb +%%WWWDIR%%/spec/features/issues/user_views_issue_spec.rb +%%WWWDIR%%/spec/features/issues/user_views_issues_spec.rb %%WWWDIR%%/spec/features/issues_spec.rb %%WWWDIR%%/spec/features/labels_hierarchy_spec.rb %%WWWDIR%%/spec/features/markdown/copy_as_gfm_spec.rb @@ -10643,24 +10857,37 @@ %%WWWDIR%%/spec/features/markdown/math_spec.rb %%WWWDIR%%/spec/features/markdown/mermaid_spec.rb %%WWWDIR%%/spec/features/merge_request/maintainer_edits_fork_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_accepts_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb %%WWWDIR%%/spec/features/merge_request/user_assigns_themselves_spec.rb %%WWWDIR%%/spec/features/merge_request/user_awards_emoji_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_closes_merge_request_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_comments_on_commit_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_comments_on_diff_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_comments_on_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_request/user_creates_image_diff_notes_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_creates_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_request/user_creates_mr_spec.rb %%WWWDIR%%/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_edits_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_request/user_edits_mr_spec.rb %%WWWDIR%%/spec/features/merge_request/user_locks_discussion_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_manages_subscription_spec.rb %%WWWDIR%%/spec/features/merge_request/user_merges_immediately_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_merges_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb %%WWWDIR%%/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb %%WWWDIR%%/spec/features/merge_request/user_posts_diff_notes_spec.rb %%WWWDIR%%/spec/features/merge_request/user_posts_notes_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_rebases_merge_request_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_reopens_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_request/user_resolves_conflicts_spec.rb %%WWWDIR%%/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb %%WWWDIR%%/spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_reverts_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb %%WWWDIR%%/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb %%WWWDIR%%/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb %%WWWDIR%%/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb %%WWWDIR%%/spec/features/merge_request/user_sees_closing_issues_message_spec.rb @@ -10683,6 +10910,9 @@ %%WWWDIR%%/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb %%WWWDIR%%/spec/features/merge_request/user_toggles_whitespace_changes_spec.rb %%WWWDIR%%/spec/features/merge_request/user_uses_slash_commands_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_views_diffs_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_views_open_merge_request_spec.rb +%%WWWDIR%%/spec/features/merge_request/user_views_user_status_on_merge_request_spec.rb %%WWWDIR%%/spec/features/merge_requests/filters_generic_behavior_spec.rb %%WWWDIR%%/spec/features/merge_requests/user_filters_by_assignees_spec.rb %%WWWDIR%%/spec/features/merge_requests/user_filters_by_labels_spec.rb @@ -10690,7 +10920,12 @@ %%WWWDIR%%/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb %%WWWDIR%%/spec/features/merge_requests/user_lists_merge_requests_spec.rb %%WWWDIR%%/spec/features/merge_requests/user_mass_updates_spec.rb +%%WWWDIR%%/spec/features/merge_requests/user_sorts_merge_requests_spec.rb %%WWWDIR%%/spec/features/merge_requests/user_squashes_merge_request_spec.rb +%%WWWDIR%%/spec/features/merge_requests/user_views_all_merge_requests_spec.rb +%%WWWDIR%%/spec/features/merge_requests/user_views_closed_merge_requests_spec.rb +%%WWWDIR%%/spec/features/merge_requests/user_views_merged_merge_requests_spec.rb +%%WWWDIR%%/spec/features/merge_requests/user_views_open_merge_requests_spec.rb %%WWWDIR%%/spec/features/milestone_spec.rb %%WWWDIR%%/spec/features/milestones/user_creates_milestone_spec.rb %%WWWDIR%%/spec/features/milestones/user_deletes_milestone_spec.rb @@ -10723,12 +10958,12 @@ %%WWWDIR%%/spec/features/project_variables_spec.rb %%WWWDIR%%/spec/features/projects/activity/rss_spec.rb %%WWWDIR%%/spec/features/projects/activity/user_sees_activity_spec.rb +%%WWWDIR%%/spec/features/projects/activity/user_sees_private_activity_spec.rb %%WWWDIR%%/spec/features/projects/actve_tabs_spec.rb %%WWWDIR%%/spec/features/projects/artifacts/file_spec.rb %%WWWDIR%%/spec/features/projects/artifacts/raw_spec.rb %%WWWDIR%%/spec/features/projects/artifacts/user_browses_artifacts_spec.rb %%WWWDIR%%/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb -%%WWWDIR%%/spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb %%WWWDIR%%/spec/features/projects/badges/coverage_spec.rb %%WWWDIR%%/spec/features/projects/badges/list_spec.rb %%WWWDIR%%/spec/features/projects/badges/pipeline_badge_spec.rb @@ -10798,19 +11033,9 @@ %%WWWDIR%%/spec/features/projects/graph_spec.rb %%WWWDIR%%/spec/features/projects/hook_logs/user_reads_log_spec.rb %%WWWDIR%%/spec/features/projects/import_export/export_file_spec.rb -%%WWWDIR%%/spec/features/projects/import_export/import_file_object_storage_spec.rb %%WWWDIR%%/spec/features/projects/import_export/import_file_spec.rb -%%WWWDIR%%/spec/features/projects/import_export/namespace_export_file_spec.rb %%WWWDIR%%/spec/features/projects/import_export/test_project_export.tar.gz %%WWWDIR%%/spec/features/projects/issuable_templates_spec.rb -%%WWWDIR%%/spec/features/projects/issues/rss_spec.rb -%%WWWDIR%%/spec/features/projects/issues/user_comments_on_issue_spec.rb -%%WWWDIR%%/spec/features/projects/issues/user_creates_issue_spec.rb -%%WWWDIR%%/spec/features/projects/issues/user_edits_issue_spec.rb -%%WWWDIR%%/spec/features/projects/issues/user_sorts_issues_spec.rb -%%WWWDIR%%/spec/features/projects/issues/user_toggles_subscription_spec.rb -%%WWWDIR%%/spec/features/projects/issues/user_views_issue_spec.rb -%%WWWDIR%%/spec/features/projects/issues/user_views_issues_spec.rb %%WWWDIR%%/spec/features/projects/jobs/permissions_spec.rb %%WWWDIR%%/spec/features/projects/jobs/user_browses_job_spec.rb %%WWWDIR%%/spec/features/projects/jobs/user_browses_jobs_spec.rb @@ -10830,6 +11055,7 @@ %%WWWDIR%%/spec/features/projects/members/group_members_spec.rb %%WWWDIR%%/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb %%WWWDIR%%/spec/features/projects/members/groups_with_access_list_spec.rb +%%WWWDIR%%/spec/features/projects/members/invite_group_spec.rb %%WWWDIR%%/spec/features/projects/members/list_spec.rb %%WWWDIR%%/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb %%WWWDIR%%/spec/features/projects/members/master_manages_access_requests_spec.rb @@ -10837,30 +11063,9 @@ %%WWWDIR%%/spec/features/projects/members/member_leaves_project_spec.rb %%WWWDIR%%/spec/features/projects/members/owner_cannot_leave_project_spec.rb %%WWWDIR%%/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb -%%WWWDIR%%/spec/features/projects/members/share_with_group_spec.rb %%WWWDIR%%/spec/features/projects/members/sorting_spec.rb %%WWWDIR%%/spec/features/projects/members/user_requests_access_spec.rb %%WWWDIR%%/spec/features/projects/merge_request_button_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_closes_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_comments_on_commit_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_comments_on_diff_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_comments_on_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_manages_subscription_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_merges_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_rebases_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_reopens_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_views_all_merge_requests_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_views_closed_merge_requests_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_views_diffs_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_views_merged_merge_requests_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_views_open_merge_request_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_views_open_merge_requests_spec.rb -%%WWWDIR%%/spec/features/projects/merge_requests/user_views_user_status_on_merge_request_spec.rb %%WWWDIR%%/spec/features/projects/milestones/milestone_spec.rb %%WWWDIR%%/spec/features/projects/milestones/milestones_sorting_spec.rb %%WWWDIR%%/spec/features/projects/milestones/new_spec.rb @@ -10914,6 +11119,7 @@ %%WWWDIR%%/spec/features/projects/show/no_password_spec.rb %%WWWDIR%%/spec/features/projects/show/redirects_spec.rb %%WWWDIR%%/spec/features/projects/show/rss_spec.rb +%%WWWDIR%%/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb %%WWWDIR%%/spec/features/projects/show/user_interacts_with_stars_spec.rb %%WWWDIR%%/spec/features/projects/show/user_manages_notifications_spec.rb %%WWWDIR%%/spec/features/projects/show/user_sees_collaboration_links_spec.rb @@ -10930,6 +11136,7 @@ %%WWWDIR%%/spec/features/projects/snippets/user_views_snippets_spec.rb %%WWWDIR%%/spec/features/projects/sub_group_issuables_spec.rb %%WWWDIR%%/spec/features/projects/tags/download_buttons_spec.rb +%%WWWDIR%%/spec/features/projects/tags/user_views_tags_spec.rb %%WWWDIR%%/spec/features/projects/tree/create_directory_spec.rb %%WWWDIR%%/spec/features/projects/tree/create_file_spec.rb %%WWWDIR%%/spec/features/projects/tree/rss_spec.rb @@ -11005,6 +11212,7 @@ %%WWWDIR%%/spec/features/uploads/user_uploads_avatar_to_group_spec.rb %%WWWDIR%%/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb %%WWWDIR%%/spec/features/uploads/user_uploads_file_to_note_spec.rb +%%WWWDIR%%/spec/features/usage_stats_consent_spec.rb %%WWWDIR%%/spec/features/user_can_display_performance_bar_spec.rb %%WWWDIR%%/spec/features/user_sees_revert_modal_spec.rb %%WWWDIR%%/spec/features/user_sorts_things_spec.rb @@ -11020,7 +11228,11 @@ %%WWWDIR%%/spec/features/users/user_browses_projects_on_user_page_spec.rb %%WWWDIR%%/spec/finders/access_requests_finder_spec.rb %%WWWDIR%%/spec/finders/admin/projects_finder_spec.rb -%%WWWDIR%%/spec/finders/autocomplete_users_finder_spec.rb +%%WWWDIR%%/spec/finders/autocomplete/group_finder_spec.rb +%%WWWDIR%%/spec/finders/autocomplete/move_to_project_finder_spec.rb +%%WWWDIR%%/spec/finders/autocomplete/project_finder_spec.rb +%%WWWDIR%%/spec/finders/autocomplete/users_finder_spec.rb +%%WWWDIR%%/spec/finders/awarded_emoji_finder_spec.rb %%WWWDIR%%/spec/finders/branches_finder_spec.rb %%WWWDIR%%/spec/finders/clusters_finder_spec.rb %%WWWDIR%%/spec/finders/concerns/finder_methods_spec.rb @@ -11036,11 +11248,11 @@ %%WWWDIR%%/spec/finders/issues_finder_spec.rb %%WWWDIR%%/spec/finders/joined_groups_finder_spec.rb %%WWWDIR%%/spec/finders/labels_finder_spec.rb +%%WWWDIR%%/spec/finders/license_template_finder_spec.rb %%WWWDIR%%/spec/finders/members_finder_spec.rb %%WWWDIR%%/spec/finders/merge_request_target_project_finder_spec.rb %%WWWDIR%%/spec/finders/merge_requests_finder_spec.rb %%WWWDIR%%/spec/finders/milestones_finder_spec.rb -%%WWWDIR%%/spec/finders/move_to_project_finder_spec.rb %%WWWDIR%%/spec/finders/notes_finder_spec.rb %%WWWDIR%%/spec/finders/personal_access_tokens_finder_spec.rb %%WWWDIR%%/spec/finders/personal_projects_finder_spec.rb @@ -11050,7 +11262,9 @@ %%WWWDIR%%/spec/finders/runner_jobs_finder_spec.rb %%WWWDIR%%/spec/finders/snippets_finder_spec.rb %%WWWDIR%%/spec/finders/tags_finder_spec.rb +%%WWWDIR%%/spec/finders/template_finder_spec.rb %%WWWDIR%%/spec/finders/todos_finder_spec.rb +%%WWWDIR%%/spec/finders/user_finder_spec.rb %%WWWDIR%%/spec/finders/user_recent_events_finder_spec.rb %%WWWDIR%%/spec/finders/users_finder_spec.rb %%WWWDIR%%/spec/fixtures/GoogleCodeProjectHosting.json @@ -11065,6 +11279,8 @@ %%WWWDIR%%/spec/fixtures/api/schemas/contributors.json %%WWWDIR%%/spec/fixtures/api/schemas/deployment.json %%WWWDIR%%/spec/fixtures/api/schemas/deployments.json +%%WWWDIR%%/spec/fixtures/api/schemas/entities/diff_line.json +%%WWWDIR%%/spec/fixtures/api/schemas/entities/diff_line_parallel.json %%WWWDIR%%/spec/fixtures/api/schemas/entities/issue.json %%WWWDIR%%/spec/fixtures/api/schemas/entities/issue_sidebar.json %%WWWDIR%%/spec/fixtures/api/schemas/entities/label.json @@ -11075,9 +11291,12 @@ %%WWWDIR%%/spec/fixtures/api/schemas/entities/test_reports_comparer.json %%WWWDIR%%/spec/fixtures/api/schemas/entities/test_suite_comparer.json %%WWWDIR%%/spec/fixtures/api/schemas/entities/user.json +%%WWWDIR%%/spec/fixtures/api/schemas/http_method.json %%WWWDIR%%/spec/fixtures/api/schemas/issue.json %%WWWDIR%%/spec/fixtures/api/schemas/issues.json -%%WWWDIR%%/spec/fixtures/api/schemas/job.json +%%WWWDIR%%/spec/fixtures/api/schemas/job/artifact.json +%%WWWDIR%%/spec/fixtures/api/schemas/job/job.json +%%WWWDIR%%/spec/fixtures/api/schemas/job/job_details.json %%WWWDIR%%/spec/fixtures/api/schemas/list.json %%WWWDIR%%/spec/fixtures/api/schemas/lists.json %%WWWDIR%%/spec/fixtures/api/schemas/merge_request.json @@ -11372,7 +11591,6 @@ %%WWWDIR%%/spec/javascripts/boards/list_spec.js %%WWWDIR%%/spec/javascripts/boards/mock_data.js %%WWWDIR%%/spec/javascripts/boards/modal_store_spec.js -%%WWWDIR%%/spec/javascripts/boards/utils/query_data_spec.js %%WWWDIR%%/spec/javascripts/bootstrap_jquery_spec.js %%WWWDIR%%/spec/javascripts/bootstrap_linked_tabs_spec.js %%WWWDIR%%/spec/javascripts/branches/branches_delete_modal_spec.js @@ -11432,6 +11650,7 @@ %%WWWDIR%%/spec/javascripts/droplab/plugins/ajax_filter_spec.js %%WWWDIR%%/spec/javascripts/droplab/plugins/ajax_spec.js %%WWWDIR%%/spec/javascripts/droplab/plugins/input_setter_spec.js +%%WWWDIR%%/spec/javascripts/dropzone_input_spec.js %%WWWDIR%%/spec/javascripts/emoji_spec.js %%WWWDIR%%/spec/javascripts/environments/emtpy_state_spec.js %%WWWDIR%%/spec/javascripts/environments/environment_actions_spec.js @@ -11462,7 +11681,9 @@ %%WWWDIR%%/spec/javascripts/filtered_search/services/recent_searches_service_spec.js %%WWWDIR%%/spec/javascripts/filtered_search/stores/recent_searches_store_spec.js %%WWWDIR%%/spec/javascripts/fixtures/abuse_reports.rb +%%WWWDIR%%/spec/javascripts/fixtures/admin_users.rb %%WWWDIR%%/spec/javascripts/fixtures/ajax_loading_spinner.html.haml +%%WWWDIR%%/spec/javascripts/fixtures/application_settings.rb %%WWWDIR%%/spec/javascripts/fixtures/balsamiq.rb %%WWWDIR%%/spec/javascripts/fixtures/balsamiq_viewer.html.haml %%WWWDIR%%/spec/javascripts/fixtures/blob.rb @@ -11578,6 +11799,8 @@ %%WWWDIR%%/spec/javascripts/ide/components/external_link_spec.js %%WWWDIR%%/spec/javascripts/ide/components/file_finder/index_spec.js %%WWWDIR%%/spec/javascripts/ide/components/file_finder/item_spec.js +%%WWWDIR%%/spec/javascripts/ide/components/file_templates/bar_spec.js +%%WWWDIR%%/spec/javascripts/ide/components/file_templates/dropdown_spec.js %%WWWDIR%%/spec/javascripts/ide/components/ide_review_spec.js %%WWWDIR%%/spec/javascripts/ide/components/ide_side_bar_spec.js %%WWWDIR%%/spec/javascripts/ide/components/ide_spec.js @@ -11632,6 +11855,9 @@ %%WWWDIR%%/spec/javascripts/ide/stores/modules/commit/actions_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/modules/commit/getters_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/modules/commit/mutations_spec.js +%%WWWDIR%%/spec/javascripts/ide/stores/modules/file_templates/actions_spec.js +%%WWWDIR%%/spec/javascripts/ide/stores/modules/file_templates/getters_spec.js +%%WWWDIR%%/spec/javascripts/ide/stores/modules/file_templates/mutations_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/modules/merge_requests/actions_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/modules/merge_requests/mutations_spec.js %%WWWDIR%%/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js @@ -11669,12 +11895,25 @@ %%WWWDIR%%/spec/javascripts/issue_show/mock_data.js %%WWWDIR%%/spec/javascripts/issue_spec.js %%WWWDIR%%/spec/javascripts/job_spec.js -%%WWWDIR%%/spec/javascripts/jobs/header_spec.js -%%WWWDIR%%/spec/javascripts/jobs/job_details_mediator_spec.js -%%WWWDIR%%/spec/javascripts/jobs/job_store_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/artifacts_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/commit_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/empty_state_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/environments_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/erased_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/header_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/job_details_mediator_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/job_log_controllers_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/job_log_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/job_store_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/jobs_container_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/sidebar_detail_row_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/sidebar_details_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/stages_dropdown_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/stuck_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/components/trigger_value_spec.js %%WWWDIR%%/spec/javascripts/jobs/mock_data.js -%%WWWDIR%%/spec/javascripts/jobs/sidebar_detail_row_spec.js -%%WWWDIR%%/spec/javascripts/jobs/sidebar_details_block_spec.js +%%WWWDIR%%/spec/javascripts/jobs/store/actions_spec.js +%%WWWDIR%%/spec/javascripts/jobs/store/mutations_spec.js %%WWWDIR%%/spec/javascripts/labels_issue_sidebar_spec.js %%WWWDIR%%/spec/javascripts/labels_select_spec.js %%WWWDIR%%/spec/javascripts/landing_spec.js @@ -11697,6 +11936,7 @@ %%WWWDIR%%/spec/javascripts/lib/utils/url_utility_spec.js %%WWWDIR%%/spec/javascripts/lib/utils/users_cache_spec.js %%WWWDIR%%/spec/javascripts/line_highlighter_spec.js +%%WWWDIR%%/spec/javascripts/locale/ensure_single_line_spec.js %%WWWDIR%%/spec/javascripts/locale/index_spec.js %%WWWDIR%%/spec/javascripts/locale/sprintf_spec.js %%WWWDIR%%/spec/javascripts/matchers.js @@ -11750,7 +11990,9 @@ %%WWWDIR%%/spec/javascripts/oauth_remember_me_spec.js %%WWWDIR%%/spec/javascripts/pager_spec.js %%WWWDIR%%/spec/javascripts/pages/admin/abuse_reports/abuse_reports_spec.js +%%WWWDIR%%/spec/javascripts/pages/admin/application_settings/account_and_limits_spec.js %%WWWDIR%%/spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js +%%WWWDIR%%/spec/javascripts/pages/admin/users/new/index_spec.js %%WWWDIR%%/spec/javascripts/pages/labels/components/promote_label_modal_spec.js %%WWWDIR%%/spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js %%WWWDIR%%/spec/javascripts/pages/milestones/shared/components/promote_milestone_modal_spec.js @@ -11764,6 +12006,7 @@ %%WWWDIR%%/spec/javascripts/performance_bar/components/request_selector_spec.js %%WWWDIR%%/spec/javascripts/performance_bar/components/simple_metric_spec.js %%WWWDIR%%/spec/javascripts/performance_bar/index_spec.js +%%WWWDIR%%/spec/javascripts/performance_bar/services/performance_bar_service_spec.js %%WWWDIR%%/spec/javascripts/pipelines/blank_state_spec.js %%WWWDIR%%/spec/javascripts/pipelines/empty_state_spec.js %%WWWDIR%%/spec/javascripts/pipelines/graph/action_component_spec.js @@ -11808,6 +12051,7 @@ %%WWWDIR%%/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js %%WWWDIR%%/spec/javascripts/raven/index_spec.js %%WWWDIR%%/spec/javascripts/raven/raven_config_spec.js +%%WWWDIR%%/spec/javascripts/read_more_spec.js %%WWWDIR%%/spec/javascripts/registry/components/app_spec.js %%WWWDIR%%/spec/javascripts/registry/components/collapsible_container_spec.js %%WWWDIR%%/spec/javascripts/registry/components/table_registry_spec.js @@ -11816,7 +12060,11 @@ %%WWWDIR%%/spec/javascripts/registry/stores/actions_spec.js %%WWWDIR%%/spec/javascripts/registry/stores/mutations_spec.js %%WWWDIR%%/spec/javascripts/reports/components/grouped_test_reports_app_spec.js +%%WWWDIR%%/spec/javascripts/reports/components/modal_open_name_spec.js %%WWWDIR%%/spec/javascripts/reports/components/modal_spec.js +%%WWWDIR%%/spec/javascripts/reports/components/report_link_spec.js +%%WWWDIR%%/spec/javascripts/reports/components/report_section_spec.js +%%WWWDIR%%/spec/javascripts/reports/components/summary_row_spec.js %%WWWDIR%%/spec/javascripts/reports/components/test_issue_body_spec.js %%WWWDIR%%/spec/javascripts/reports/mock_data/mock_data.js %%WWWDIR%%/spec/javascripts/reports/mock_data/new_and_fixed_failures_report.json @@ -11933,10 +12181,6 @@ %%WWWDIR%%/spec/javascripts/vue_shared/components/panel_resizer_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/pikaday_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/project_avatar/default_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/reports/modal_open_name_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/reports/report_link_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/reports/report_section_spec.js -%%WWWDIR%%/spec/javascripts/vue_shared/components/reports/summary_row_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/sidebar/date_picker_spec.js @@ -11958,6 +12202,7 @@ %%WWWDIR%%/spec/javascripts/vue_shared/components/tabs/tabs_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/toggle_button_spec.js +%%WWWDIR%%/spec/javascripts/vue_shared/components/tooltip_on_truncate_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/user_avatar/user_avatar_image_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js %%WWWDIR%%/spec/javascripts/vue_shared/components/user_avatar/user_avatar_svg_spec.js @@ -12000,11 +12245,13 @@ %%WWWDIR%%/spec/lib/banzai/filter/mermaid_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/milestone_reference_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/plantuml_filter_spec.rb +%%WWWDIR%%/spec/lib/banzai/filter/project_reference_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/redactor_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/reference_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/relative_link_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/sanitization_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/snippet_reference_filter_spec.rb +%%WWWDIR%%/spec/lib/banzai/filter/spaced_link_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/table_of_contents_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/user_reference_filter_spec.rb @@ -12030,6 +12277,7 @@ %%WWWDIR%%/spec/lib/banzai/reference_parser/label_parser_spec.rb %%WWWDIR%%/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb %%WWWDIR%%/spec/lib/banzai/reference_parser/milestone_parser_spec.rb +%%WWWDIR%%/spec/lib/banzai/reference_parser/project_parser_spec.rb %%WWWDIR%%/spec/lib/banzai/reference_parser/snippet_parser_spec.rb %%WWWDIR%%/spec/lib/banzai/reference_parser/user_parser_spec.rb %%WWWDIR%%/spec/lib/banzai/render_context_spec.rb @@ -12104,6 +12352,7 @@ %%WWWDIR%%/spec/lib/gitlab/background_migration/fix_cross_project_label_links_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb +%%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_legacy_artifacts_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_stage_index_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_stage_status_spec.rb %%WWWDIR%%/spec/lib/gitlab/background_migration/migrate_system_uploads_to_new_folder_spec.rb @@ -12188,6 +12437,8 @@ %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/validatable_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/validator_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/entry/variables_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/config/extendable/entry_spec.rb +%%WWWDIR%%/spec/lib/gitlab/ci/config/extendable_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config/loader_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/config_spec.rb %%WWWDIR%%/spec/lib/gitlab/ci/cron_parser_spec.rb @@ -12333,6 +12584,7 @@ %%WWWDIR%%/spec/lib/gitlab/diff/file_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/formatters/image_formatter_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb +%%WWWDIR%%/spec/lib/gitlab/diff/highlight_cache_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/highlight_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_marker_spec.rb @@ -12366,6 +12618,8 @@ %%WWWDIR%%/spec/lib/gitlab/favicon_spec.rb %%WWWDIR%%/spec/lib/gitlab/file_detector_spec.rb %%WWWDIR%%/spec/lib/gitlab/file_finder_spec.rb +%%WWWDIR%%/spec/lib/gitlab/file_markdown_link_builder_spec.rb +%%WWWDIR%%/spec/lib/gitlab/file_type_detection_spec.rb %%WWWDIR%%/spec/lib/gitlab/fogbugz_import/client_spec.rb %%WWWDIR%%/spec/lib/gitlab/gfm/reference_rewriter_spec.rb %%WWWDIR%%/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb @@ -12390,6 +12644,7 @@ %%WWWDIR%%/spec/lib/gitlab/git/index_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/lfs_changes_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/lfs_pointer_file_spec.rb +%%WWWDIR%%/spec/lib/gitlab/git/merge_base_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/popen_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/pre_receive_error_spec.rb %%WWWDIR%%/spec/lib/gitlab/git/raw_diff_change_spec.rb @@ -12502,7 +12757,8 @@ %%WWWDIR%%/spec/lib/gitlab/i18n/translation_entry_spec.rb %%WWWDIR%%/spec/lib/gitlab/i18n_spec.rb %%WWWDIR%%/spec/lib/gitlab/identifier_spec.rb -%%WWWDIR%%/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_object_storage_spec.rb +%%WWWDIR%%/spec/lib/gitlab/import/database_helpers_spec.rb +%%WWWDIR%%/spec/lib/gitlab/import/merge_request_creator_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/after_export_strategies/web_upload_strategy_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/after_export_strategy_builder_spec.rb @@ -12511,13 +12767,11 @@ %%WWWDIR%%/spec/lib/gitlab/import_export/attribute_configuration_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/avatar_restorer_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/avatar_saver_spec.rb -%%WWWDIR%%/spec/lib/gitlab/import_export/file_importer_object_storage_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/file_importer_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/fork_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/group_project_object_builder_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/hash_util_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/import_export_spec.rb -%%WWWDIR%%/spec/lib/gitlab/import_export/importer_object_storage_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/importer_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/lfs_restorer_spec.rb %%WWWDIR%%/spec/lib/gitlab/import_export/lfs_saver_spec.rb @@ -12550,6 +12804,7 @@ %%WWWDIR%%/spec/lib/gitlab/issuables_count_for_state_spec.rb %%WWWDIR%%/spec/lib/gitlab/job_waiter_spec.rb %%WWWDIR%%/spec/lib/gitlab/json_logger_spec.rb +%%WWWDIR%%/spec/lib/gitlab/kubernetes/cluster_role_binding_spec.rb %%WWWDIR%%/spec/lib/gitlab/kubernetes/config_map_spec.rb %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/api_spec.rb %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb @@ -12557,7 +12812,9 @@ %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb %%WWWDIR%%/spec/lib/gitlab/kubernetes/helm/pod_spec.rb +%%WWWDIR%%/spec/lib/gitlab/kubernetes/kube_client_spec.rb %%WWWDIR%%/spec/lib/gitlab/kubernetes/namespace_spec.rb +%%WWWDIR%%/spec/lib/gitlab/kubernetes/service_account_spec.rb %%WWWDIR%%/spec/lib/gitlab/kubernetes_spec.rb %%WWWDIR%%/spec/lib/gitlab/language_detection_spec.rb %%WWWDIR%%/spec/lib/gitlab/lazy_spec.rb @@ -12622,6 +12879,7 @@ %%WWWDIR%%/spec/lib/gitlab/project_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/project_transfer_spec.rb %%WWWDIR%%/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb +%%WWWDIR%%/spec/lib/gitlab/prometheus/metric_group_spec.rb %%WWWDIR%%/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb %%WWWDIR%%/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb %%WWWDIR%%/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb @@ -12704,11 +12962,13 @@ %%WWWDIR%%/spec/lib/gitlab/string_range_marker_spec.rb %%WWWDIR%%/spec/lib/gitlab/string_regex_marker_spec.rb %%WWWDIR%%/spec/lib/gitlab/tcp_checker_spec.rb +%%WWWDIR%%/spec/lib/gitlab/template/finders/repo_template_finders_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/gitignore_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/issue_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/merge_request_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/themes_spec.rb +%%WWWDIR%%/spec/lib/gitlab/tree_summary_spec.rb %%WWWDIR%%/spec/lib/gitlab/untrusted_regexp_spec.rb %%WWWDIR%%/spec/lib/gitlab/upgrader_spec.rb %%WWWDIR%%/spec/lib/gitlab/uploads_transfer_spec.rb @@ -12717,6 +12977,7 @@ %%WWWDIR%%/spec/lib/gitlab/url_sanitizer_spec.rb %%WWWDIR%%/spec/lib/gitlab/usage_data_spec.rb %%WWWDIR%%/spec/lib/gitlab/user_access_spec.rb +%%WWWDIR%%/spec/lib/gitlab/user_extractor_spec.rb %%WWWDIR%%/spec/lib/gitlab/utils/merge_hash_spec.rb %%WWWDIR%%/spec/lib/gitlab/utils/override_spec.rb %%WWWDIR%%/spec/lib/gitlab/utils/strong_memoize_spec.rb @@ -12760,6 +13021,7 @@ %%WWWDIR%%/spec/lib/system_check_spec.rb %%WWWDIR%%/spec/lib/uploaded_file_spec.rb %%WWWDIR%%/spec/mailers/abuse_report_mailer_spec.rb +%%WWWDIR%%/spec/mailers/emails/auto_devops_spec.rb %%WWWDIR%%/spec/mailers/emails/merge_requests_spec.rb %%WWWDIR%%/spec/mailers/emails/pages_domains_spec.rb %%WWWDIR%%/spec/mailers/emails/profile_spec.rb @@ -12791,11 +13053,14 @@ %%WWWDIR%%/spec/migrations/convert_custom_notification_settings_to_columns_spec.rb %%WWWDIR%%/spec/migrations/create_missing_namespace_for_internal_users_spec.rb %%WWWDIR%%/spec/migrations/delete_conflicting_redirect_routes_spec.rb +%%WWWDIR%%/spec/migrations/delete_inconsistent_internal_id_records_spec.rb +%%WWWDIR%%/spec/migrations/drop_duplicate_protected_tags_spec.rb %%WWWDIR%%/spec/migrations/enqueue_delete_diff_files_workers_spec.rb %%WWWDIR%%/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb %%WWWDIR%%/spec/migrations/fill_file_store_spec.rb %%WWWDIR%%/spec/migrations/fix_wrongly_renamed_routes_spec.rb %%WWWDIR%%/spec/migrations/generate_missing_routes_spec.rb +%%WWWDIR%%/spec/migrations/import_common_metrics_spec.rb %%WWWDIR%%/spec/migrations/issues_moved_to_id_foreign_key_spec.rb %%WWWDIR%%/spec/migrations/migrate_build_stage_reference_again_spec.rb %%WWWDIR%%/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb @@ -12803,6 +13068,8 @@ %%WWWDIR%%/spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb %%WWWDIR%%/spec/migrations/migrate_issues_to_ghost_user_spec.rb %%WWWDIR%%/spec/migrations/migrate_kubernetes_service_to_new_clusters_architectures_spec.rb +%%WWWDIR%%/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb +%%WWWDIR%%/spec/migrations/migrate_null_wiki_access_levels_spec.rb %%WWWDIR%%/spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb %%WWWDIR%%/spec/migrations/migrate_old_artifacts_spec.rb %%WWWDIR%%/spec/migrations/migrate_pipeline_sidekiq_queues_spec.rb @@ -12825,6 +13092,7 @@ %%WWWDIR%%/spec/migrations/remove_duplicate_mr_events_spec.rb %%WWWDIR%%/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb %%WWWDIR%%/spec/migrations/remove_empty_fork_networks_spec.rb +%%WWWDIR%%/spec/migrations/remove_orphaned_label_links_spec.rb %%WWWDIR%%/spec/migrations/remove_project_labels_group_id_spec.rb %%WWWDIR%%/spec/migrations/remove_redundant_pipeline_stages_spec.rb %%WWWDIR%%/spec/migrations/remove_soft_removed_objects_spec.rb @@ -12938,6 +13206,7 @@ %%WWWDIR%%/spec/models/concerns/mentionable_spec.rb %%WWWDIR%%/spec/models/concerns/milestoneish_spec.rb %%WWWDIR%%/spec/models/concerns/noteable_spec.rb +%%WWWDIR%%/spec/models/concerns/optionally_search_spec.rb %%WWWDIR%%/spec/models/concerns/participable_spec.rb %%WWWDIR%%/spec/models/concerns/presentable_spec.rb %%WWWDIR%%/spec/models/concerns/project_features_compatibility_spec.rb @@ -12994,6 +13263,7 @@ %%WWWDIR%%/spec/models/group_milestone_spec.rb %%WWWDIR%%/spec/models/group_spec.rb %%WWWDIR%%/spec/models/guest_spec.rb +%%WWWDIR%%/spec/models/hooks/active_hook_filter_spec.rb %%WWWDIR%%/spec/models/hooks/project_hook_spec.rb %%WWWDIR%%/spec/models/hooks/service_hook_spec.rb %%WWWDIR%%/spec/models/hooks/system_hook_spec.rb @@ -13008,12 +13278,14 @@ %%WWWDIR%%/spec/models/issue_spec.rb %%WWWDIR%%/spec/models/key_spec.rb %%WWWDIR%%/spec/models/label_link_spec.rb +%%WWWDIR%%/spec/models/label_note_spec.rb %%WWWDIR%%/spec/models/label_priority_spec.rb %%WWWDIR%%/spec/models/label_spec.rb %%WWWDIR%%/spec/models/legacy_diff_discussion_spec.rb %%WWWDIR%%/spec/models/lfs_file_lock_spec.rb %%WWWDIR%%/spec/models/lfs_object_spec.rb %%WWWDIR%%/spec/models/lfs_objects_project_spec.rb +%%WWWDIR%%/spec/models/license_template_spec.rb %%WWWDIR%%/spec/models/list_spec.rb %%WWWDIR%%/spec/models/member_spec.rb %%WWWDIR%%/spec/models/members/group_member_spec.rb @@ -13061,7 +13333,6 @@ %%WWWDIR%%/spec/models/project_services/emails_on_push_service_spec.rb %%WWWDIR%%/spec/models/project_services/external_wiki_service_spec.rb %%WWWDIR%%/spec/models/project_services/flowdock_service_spec.rb -%%WWWDIR%%/spec/models/project_services/gemnasium_service_spec.rb %%WWWDIR%%/spec/models/project_services/gitlab_issue_tracker_service_spec.rb %%WWWDIR%%/spec/models/project_services/hangouts_chat_service_spec.rb %%WWWDIR%%/spec/models/project_services/hipchat_service_spec.rb @@ -13086,6 +13357,7 @@ %%WWWDIR%%/spec/models/project_statistics_spec.rb %%WWWDIR%%/spec/models/project_team_spec.rb %%WWWDIR%%/spec/models/project_wiki_spec.rb +%%WWWDIR%%/spec/models/prometheus_metric_spec.rb %%WWWDIR%%/spec/models/protectable_dropdown_spec.rb %%WWWDIR%%/spec/models/protected_branch/merge_access_level_spec.rb %%WWWDIR%%/spec/models/protected_branch/push_access_level_spec.rb @@ -13211,7 +13483,9 @@ %%WWWDIR%%/spec/requests/api/project_snippets_spec.rb %%WWWDIR%%/spec/requests/api/projects_spec.rb %%WWWDIR%%/spec/requests/api/protected_branches_spec.rb +%%WWWDIR%%/spec/requests/api/protected_tags_spec.rb %%WWWDIR%%/spec/requests/api/repositories_spec.rb +%%WWWDIR%%/spec/requests/api/resource_label_events_spec.rb %%WWWDIR%%/spec/requests/api/runner_spec.rb %%WWWDIR%%/spec/requests/api/runners_spec.rb %%WWWDIR%%/spec/requests/api/search_spec.rb @@ -13249,6 +13523,7 @@ %%WWWDIR%%/spec/routing/routing_spec.rb %%WWWDIR%%/spec/rubocop/cop/avoid_break_from_strong_memoize_spec.rb %%WWWDIR%%/spec/rubocop/cop/avoid_return_from_blocks_spec.rb +%%WWWDIR%%/spec/rubocop/cop/destroy_all_spec.rb %%WWWDIR%%/spec/rubocop/cop/gitlab/finder_with_find_by_spec.rb %%WWWDIR%%/spec/rubocop/cop/gitlab/httparty_spec.rb %%WWWDIR%%/spec/rubocop/cop/gitlab/module_with_instance_variables_spec.rb @@ -13257,6 +13532,7 @@ %%WWWDIR%%/spec/rubocop/cop/line_break_around_conditional_block_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/add_concurrent_foreign_key_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/add_concurrent_index_spec.rb +%%WWWDIR%%/spec/rubocop/cop/migration/add_reference_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/add_timestamps_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/datetime_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/hash_index_spec.rb @@ -13268,9 +13544,11 @@ %%WWWDIR%%/spec/rubocop/cop/migration/timestamps_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/update_column_in_batches_spec.rb %%WWWDIR%%/spec/rubocop/cop/migration/update_large_table_spec.rb +%%WWWDIR%%/spec/rubocop/cop/prefer_class_methods_over_module_spec.rb %%WWWDIR%%/spec/rubocop/cop/project_path_helper_spec.rb %%WWWDIR%%/spec/rubocop/cop/rspec/env_assignment_spec.rb %%WWWDIR%%/spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb +%%WWWDIR%%/spec/rubocop/cop/ruby_interpolation_in_translation_spec.rb %%WWWDIR%%/spec/rubocop/cop/sidekiq_options_queue_spec.rb %%WWWDIR%%/spec/serializers/analytics_build_entity_spec.rb %%WWWDIR%%/spec/serializers/analytics_build_serializer_spec.rb @@ -13293,6 +13571,7 @@ %%WWWDIR%%/spec/serializers/deploy_key_entity_spec.rb %%WWWDIR%%/spec/serializers/deployment_entity_spec.rb %%WWWDIR%%/spec/serializers/diff_file_entity_spec.rb +%%WWWDIR%%/spec/serializers/diff_line_serializer_spec.rb %%WWWDIR%%/spec/serializers/diffs_entity_spec.rb %%WWWDIR%%/spec/serializers/discussion_entity_spec.rb %%WWWDIR%%/spec/serializers/entity_date_helper_spec.rb @@ -13312,10 +13591,13 @@ %%WWWDIR%%/spec/serializers/merge_request_serializer_spec.rb %%WWWDIR%%/spec/serializers/merge_request_user_entity_spec.rb %%WWWDIR%%/spec/serializers/merge_request_widget_entity_spec.rb +%%WWWDIR%%/spec/serializers/move_to_project_entity_spec.rb +%%WWWDIR%%/spec/serializers/move_to_project_serializer_spec.rb %%WWWDIR%%/spec/serializers/note_entity_spec.rb %%WWWDIR%%/spec/serializers/pipeline_details_entity_spec.rb %%WWWDIR%%/spec/serializers/pipeline_entity_spec.rb %%WWWDIR%%/spec/serializers/pipeline_serializer_spec.rb +%%WWWDIR%%/spec/serializers/project_mirror_serializer_spec.rb %%WWWDIR%%/spec/serializers/project_note_entity_spec.rb %%WWWDIR%%/spec/serializers/request_aware_entity_spec.rb %%WWWDIR%%/spec/serializers/runner_entity_spec.rb @@ -13347,6 +13629,7 @@ %%WWWDIR%%/spec/services/chat_names/find_user_service_spec.rb %%WWWDIR%%/spec/services/ci/compare_test_reports_service_spec.rb %%WWWDIR%%/spec/services/ci/create_pipeline_service_spec.rb +%%WWWDIR%%/spec/services/ci/enqueue_build_service_spec.rb %%WWWDIR%%/spec/services/ci/ensure_stage_service_spec.rb %%WWWDIR%%/spec/services/ci/extract_sections_from_build_trace_service_spec.rb %%WWWDIR%%/spec/services/ci/fetch_kubernetes_token_service_spec.rb @@ -13370,6 +13653,7 @@ %%WWWDIR%%/spec/services/clusters/gcp/verify_provision_status_service_spec.rb %%WWWDIR%%/spec/services/clusters/update_service_spec.rb %%WWWDIR%%/spec/services/cohorts_service_spec.rb +%%WWWDIR%%/spec/services/commits/tag_service_spec.rb %%WWWDIR%%/spec/services/compare_service_spec.rb %%WWWDIR%%/spec/services/create_branch_service_spec.rb %%WWWDIR%%/spec/services/create_deployment_service_spec.rb @@ -13407,8 +13691,8 @@ %%WWWDIR%%/spec/services/issues/close_service_spec.rb %%WWWDIR%%/spec/services/issues/create_service_spec.rb %%WWWDIR%%/spec/services/issues/duplicate_service_spec.rb -%%WWWDIR%%/spec/services/issues/fetch_referenced_merge_requests_service_spec.rb %%WWWDIR%%/spec/services/issues/move_service_spec.rb +%%WWWDIR%%/spec/services/issues/referenced_merge_requests_service_spec.rb %%WWWDIR%%/spec/services/issues/reopen_service_spec.rb %%WWWDIR%%/spec/services/issues/resolve_discussions_spec.rb %%WWWDIR%%/spec/services/issues/update_service_spec.rb @@ -13454,6 +13738,7 @@ %%WWWDIR%%/spec/services/milestones/create_service_spec.rb %%WWWDIR%%/spec/services/milestones/destroy_service_spec.rb %%WWWDIR%%/spec/services/milestones/promote_service_spec.rb +%%WWWDIR%%/spec/services/milestones/update_service_spec.rb %%WWWDIR%%/spec/services/note_summary_spec.rb %%WWWDIR%%/spec/services/notes/build_service_spec.rb %%WWWDIR%%/spec/services/notes/create_service_spec.rb @@ -13467,8 +13752,10 @@ %%WWWDIR%%/spec/services/notification_service_spec.rb %%WWWDIR%%/spec/services/preview_markdown_service_spec.rb %%WWWDIR%%/spec/services/projects/after_import_service_spec.rb +%%WWWDIR%%/spec/services/projects/auto_devops/disable_service_spec.rb %%WWWDIR%%/spec/services/projects/autocomplete_service_spec.rb %%WWWDIR%%/spec/services/projects/batch_open_issues_count_service_spec.rb +%%WWWDIR%%/spec/services/projects/container_repository/destroy_service_spec.rb %%WWWDIR%%/spec/services/projects/count_service_spec.rb %%WWWDIR%%/spec/services/projects/create_from_template_service_spec.rb %%WWWDIR%%/spec/services/projects/create_service_spec.rb @@ -13520,10 +13807,12 @@ %%WWWDIR%%/spec/services/protected_tags/update_service_spec.rb %%WWWDIR%%/spec/services/push_event_payload_service_spec.rb %%WWWDIR%%/spec/services/quick_actions/interpret_service_spec.rb +%%WWWDIR%%/spec/services/quick_actions/target_service_spec.rb %%WWWDIR%%/spec/services/repair_ldap_blocked_user_service_spec.rb %%WWWDIR%%/spec/services/repository_archive_clean_up_service_spec.rb %%WWWDIR%%/spec/services/reset_project_cache_service_spec.rb %%WWWDIR%%/spec/services/resource_events/change_labels_service_spec.rb +%%WWWDIR%%/spec/services/resource_events/merge_into_notes_service_spec.rb %%WWWDIR%%/spec/services/search/global_service_spec.rb %%WWWDIR%%/spec/services/search/group_service_spec.rb %%WWWDIR%%/spec/services/search/snippet_service_spec.rb @@ -13563,6 +13852,7 @@ %%WWWDIR%%/spec/services/wiki_pages/create_service_spec.rb %%WWWDIR%%/spec/services/wiki_pages/destroy_service_spec.rb %%WWWDIR%%/spec/services/wiki_pages/update_service_spec.rb +%%WWWDIR%%/spec/services/wikis/create_attachment_service_spec.rb %%WWWDIR%%/spec/sidekiq/cron/job_gem_dependency_spec.rb %%WWWDIR%%/spec/simplecov_env.rb %%WWWDIR%%/spec/spec_helper.rb @@ -13746,6 +14036,7 @@ %%WWWDIR%%/spec/support/shared_examples/chat_slash_commands_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/ci_trace_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/common_system_notes_examples.rb +%%WWWDIR%%/spec/support/shared_examples/controllers/repository_lfs_file_load_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/todos_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/uploads_actions_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/variables_shared_examples.rb @@ -13777,6 +14068,7 @@ %%WWWDIR%%/spec/support/shared_examples/models/cluster_application_core_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/models/issuable_hook_data_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/models/label_note_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/models/members_notifications_shared_example.rb %%WWWDIR%%/spec/support/shared_examples/models/project_hook_data_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/models/with_uploads_shared_examples.rb @@ -13814,6 +14106,7 @@ %%WWWDIR%%/spec/support/shared_examples/uploaders/gitlab_uploader_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/uploaders/object_storage_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/url_validator_examples.rb +%%WWWDIR%%/spec/support/shared_examples/wiki_file_attachments_examples.rb %%WWWDIR%%/spec/support/shoulda/matchers/rails_shim.rb %%WWWDIR%%/spec/support/sidekiq.rb %%WWWDIR%%/spec/support/stored_repositories.rb @@ -13837,6 +14130,7 @@ %%WWWDIR%%/spec/tasks/gitlab/lfs/migrate_rake_spec.rb %%WWWDIR%%/spec/tasks/gitlab/mail_google_schema_whitelisting.rb %%WWWDIR%%/spec/tasks/gitlab/shell_rake_spec.rb +%%WWWDIR%%/spec/tasks/gitlab/site_statistics_rake_spec.rb %%WWWDIR%%/spec/tasks/gitlab/storage_rake_spec.rb %%WWWDIR%%/spec/tasks/gitlab/task_helpers_spec.rb %%WWWDIR%%/spec/tasks/gitlab/traces_rake_spec.rb @@ -13861,6 +14155,8 @@ %%WWWDIR%%/spec/uploaders/uploader_helper_spec.rb %%WWWDIR%%/spec/uploaders/workers/object_storage/background_move_worker_spec.rb %%WWWDIR%%/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb +%%WWWDIR%%/spec/validators/branch_filter_validator_spec.rb +%%WWWDIR%%/spec/validators/js_regex_validator_spec.rb %%WWWDIR%%/spec/validators/namespace_path_validator_spec.rb %%WWWDIR%%/spec/validators/project_path_validator_spec.rb %%WWWDIR%%/spec/validators/public_url_validator_spec.rb @@ -13919,6 +14215,7 @@ %%WWWDIR%%/spec/workers/admin_email_worker_spec.rb %%WWWDIR%%/spec/workers/archive_trace_worker_spec.rb %%WWWDIR%%/spec/workers/authorized_projects_worker_spec.rb +%%WWWDIR%%/spec/workers/auto_devops/disable_worker_spec.rb %%WWWDIR%%/spec/workers/background_migration_worker_spec.rb %%WWWDIR%%/spec/workers/build_coverage_worker_spec.rb %%WWWDIR%%/spec/workers/build_finished_worker_spec.rb @@ -13944,6 +14241,7 @@ %%WWWDIR%%/spec/workers/create_gpg_signature_worker_spec.rb %%WWWDIR%%/spec/workers/create_note_diff_file_worker_spec.rb %%WWWDIR%%/spec/workers/create_pipeline_worker_spec.rb +%%WWWDIR%%/spec/workers/delete_container_repository_worker_spec.rb %%WWWDIR%%/spec/workers/delete_diff_files_worker_spec.rb %%WWWDIR%%/spec/workers/delete_merged_branches_worker_spec.rb %%WWWDIR%%/spec/workers/delete_user_worker_spec.rb @@ -14157,6 +14455,12 @@ @dir %%WWWDIR%%/public @dir %%WWWDIR%%/public/assets @dir(,,700) %%WWWDIR%%/public/uploads +@dir %%WWWDIR%%/qa/qa/specs/features/api/2_plan +@dir %%WWWDIR%%/qa/qa/specs/features/api/4_verify +@dir %%WWWDIR%%/qa/qa/specs/features/api/5_package +@dir %%WWWDIR%%/qa/qa/specs/features/api/6_release +@dir %%WWWDIR%%/qa/qa/specs/features/api/7_configure +@dir %%WWWDIR%%/qa/qa/specs/features/browser_ui/5_package @dir %%WWWDIR%%/spec/support/gitlab-git-test.git/refs/heads @dir %%WWWDIR%%/spec/support/gitlab-git-test.git/refs/tags @dir(,,700) %%WWWDIR%%/shared -- cgit From 95f01d8859f0224855502637be5151e714e8ebae Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 23 Sep 2018 18:48:21 +0000 Subject: science/hypre: Change from net/mpich2 to net/mpich Reset maintainer on request of the mantainer (Pedro F. Giffuni). PR: 231636 Approved by: pfg (maintainer) --- science/hypre/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/science/hypre/Makefile b/science/hypre/Makefile index 27e71415cf04..e0aabcdcc419 100644 --- a/science/hypre/Makefile +++ b/science/hypre/Makefile @@ -3,11 +3,11 @@ PORTNAME= hypre DISTVERSION= 2.11.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science MASTER_SITES= https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/ -MAINTAINER= pfg@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Scalable Linear Solvers and Multigrid Methods LICENSE= LGPL21 @@ -28,12 +28,13 @@ CONFIGURE_ARGS= --with-blas --with-blas-lib=${BLASLIB} \ OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= MPI -OPTIONS_SINGLE_MPI= MPICH2 OPENMPI -OPTIONS_DEFAULT= MPICH2 +OPTIONS_SINGLE_MPI= MPICH OPENMPI +OPTIONS_DEFAULT= MPICH -MPICH2_LIB_DEPENDS= libmpich.so.8:net/mpich2 -MPICH2_CONFIGURE_ENV= CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx -MPICH2_CONFIGURE_WITH= MPI-include=${LOCALBASE}/include \ +MPICH_DESC= Parallel processing support via MPICH +MPICH_LIB_DEPENDS= libmpich.so:net/mpich +MPICH_CONFIGURE_ENV= CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx +MPICH_CONFIGURE_WITH= MPI-include=${LOCALBASE}/include \ MPI-lib-dirs=${LOCALBASE}/lib OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi OPENMPI_CONFIGURE_ENV= CC=${LOCALBASE}/mpi/openmpi/bin/mpicc \ -- cgit From 35dc001b73fc9a1f4c3dd60c535b9dde8dc56d1b Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 23 Sep 2018 18:53:49 +0000 Subject: lang/rust-nightly: no longer builds after r479877 mv: rename /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src/src/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4 to /wrkdirs/usr/ports/lang/rust-nightly/work/rustc-nightly-src/src/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4.dont-fix: No such file or directory *** Error code 1 As the port appears to be a staging ground for future updates don't deprecate yet. PR: 229826 Reported by: pkg-fallout --- lang/rust-nightly/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 89bdd6740831..86c337cdbcce 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -23,5 +23,7 @@ RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta ONLY_FOR_ARCHS= amd64 i386 +IGNORE= is older than stable version. Get nightly via rustup or \ + use lang/rust and pass RUSTC_BOOTSTRAP=1 via environ(7) .include "${MASTERDIR}/Makefile" -- cgit From f588e4bfceb046b23c4dba5316deb1713d5d8184 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 23 Sep 2018 19:16:23 +0000 Subject: math/py-cyipopt: Update 0.1.7 -> 0.1.8 Reported by: portscout --- math/py-cyipopt/Makefile | 7 ++++--- math/py-cyipopt/distinfo | 6 +++--- math/py-cyipopt/files/patch-ipopt_version.py | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 math/py-cyipopt/files/patch-ipopt_version.py diff --git a/math/py-cyipopt/Makefile b/math/py-cyipopt/Makefile index 00f512333aed..d0324e61c76b 100644 --- a/math/py-cyipopt/Makefile +++ b/math/py-cyipopt/Makefile @@ -2,8 +2,7 @@ PORTNAME= cyipopt DISTVERSIONPREFIX= v -DISTVERSION= 0.1.7 -PORTREVISION= 1 +DISTVERSION= 0.1.8 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,7 +17,9 @@ LIB_DEPENDS= libblas.so:math/blas \ libcoinmetis.so:math/ipopt \ liblapack.so:math/lapack RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USES= fortran python pkgconfig # fortran because ipopt's pkg-config returns gcc libs USE_GITHUB= yes diff --git a/math/py-cyipopt/distinfo b/math/py-cyipopt/distinfo index b844d5b50633..0015456c969c 100644 --- a/math/py-cyipopt/distinfo +++ b/math/py-cyipopt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522559375 -SHA256 (matthias-k-cyipopt-v0.1.7_GH0.tar.gz) = e62d4265743078c60f0af1426218310a9fbc1b6d0d0e60879e172d569dd3343d -SIZE (matthias-k-cyipopt-v0.1.7_GH0.tar.gz) = 40782 +TIMESTAMP = 1537725965 +SHA256 (matthias-k-cyipopt-v0.1.8_GH0.tar.gz) = 146d014b69914a63c4b5b2c220db8c132756abad45aec387a8e045d7539a0137 +SIZE (matthias-k-cyipopt-v0.1.8_GH0.tar.gz) = 45348 diff --git a/math/py-cyipopt/files/patch-ipopt_version.py b/math/py-cyipopt/files/patch-ipopt_version.py new file mode 100644 index 000000000000..b46cc10d8daa --- /dev/null +++ b/math/py-cyipopt/files/patch-ipopt_version.py @@ -0,0 +1,16 @@ +https://github.com/matthias-k/cyipopt/issues/34 + +--- ipopt/version.py.orig 2018-09-23 19:06:45 UTC ++++ ipopt/version.py +@@ -4,9 +4,9 @@ + cyipopt: Python wrapper for the Ipopt optimization package, written in Cython. + + Copyright (C) 2012-2015 Amit Aides +-Copyright (C) 2015-2018 Matthias Kümmerer ++Copyright (C) 2015-2018 Matthias Kummerer + +-Author: Matthias Kümmerer ++Author: Matthias Kummerer + (original Author: Amit Aides ) + URL: https://github.com/matthias-k/cyipopt + License: EPL 1.0 -- cgit From d6847b4fea648457afc97b3ab073e8b5be38b7ef Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 23 Sep 2018 19:20:40 +0000 Subject: Update to 1.1.1 --- textproc/py-xlsxwriter/Makefile | 2 +- textproc/py-xlsxwriter/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/py-xlsxwriter/Makefile b/textproc/py-xlsxwriter/Makefile index 88347543a782..3f45604ff9cc 100644 --- a/textproc/py-xlsxwriter/Makefile +++ b/textproc/py-xlsxwriter/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= XlsxWriter -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-xlsxwriter/distinfo b/textproc/py-xlsxwriter/distinfo index d0da09b7188f..8cbeb93dd6d2 100644 --- a/textproc/py-xlsxwriter/distinfo +++ b/textproc/py-xlsxwriter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535966253 -SHA256 (XlsxWriter-1.1.0.tar.gz) = b2c7cbe246d1e1d113b4d014a71d1d9bb258f28625512f8df290352d1685be13 -SIZE (XlsxWriter-1.1.0.tar.gz) = 247686 +TIMESTAMP = 1537730284 +SHA256 (XlsxWriter-1.1.1.tar.gz) = b9d45a55c4ca976264f592fb8ceafba52cafe4e381050ade74abf11efa92d097 +SIZE (XlsxWriter-1.1.1.tar.gz) = 248121 -- cgit From 59db81ef6caa41e05f4fe44512eb35858e4acbef Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 23 Sep 2018 19:28:32 +0000 Subject: Update to 0.46 --- devel/py-olefile/Makefile | 2 +- devel/py-olefile/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-olefile/Makefile b/devel/py-olefile/Makefile index 703232ebee05..c3697e74101a 100644 --- a/devel/py-olefile/Makefile +++ b/devel/py-olefile/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= olefile -PORTVERSION= 0.45.1 +PORTVERSION= 0.46 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-olefile/distinfo b/devel/py-olefile/distinfo index 6a1cf9d5752e..95e1990b6111 100644 --- a/devel/py-olefile/distinfo +++ b/devel/py-olefile/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516970331 -SHA256 (olefile-0.45.1.zip) = 2b6575f5290de8ab1086f8c5490591f7e0885af682c7c1793bdaf6e64078d385 -SIZE (olefile-0.45.1.zip) = 112359 +TIMESTAMP = 1537730701 +SHA256 (olefile-0.46.zip) = 133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964 +SIZE (olefile-0.46.zip) = 112226 -- cgit From 2753e7bc78e3872b7e758133073ad017905395c7 Mon Sep 17 00:00:00 2001 From: ultima Date: Sun, 23 Sep 2018 19:41:17 +0000 Subject: * Updated to 6.3.6 --- net-mgmt/seafile-server/Makefile.include | 2 +- www/py-seafdav/distinfo | 6 +- www/py-seafobj/distinfo | 6 +- www/seahub/Makefile | 1 - www/seahub/distinfo | 6 +- www/seahub/pkg-plist | 122 +++++++++++++++---------------- 6 files changed, 71 insertions(+), 72 deletions(-) diff --git a/net-mgmt/seafile-server/Makefile.include b/net-mgmt/seafile-server/Makefile.include index 407ec9644f5e..9be621ce8abc 100644 --- a/net-mgmt/seafile-server/Makefile.include +++ b/net-mgmt/seafile-server/Makefile.include @@ -1,7 +1,7 @@ # $FreeBSD$ SEAFILE_VER=6.3.4 -SEAHUB_VER=6.3.5 +SEAHUB_VER=6.3.6 # Various vars used in most/all the Makefiles diff --git a/www/py-seafdav/distinfo b/www/py-seafdav/distinfo index cf91357439f8..c9b3e5cec7ff 100644 --- a/www/py-seafdav/distinfo +++ b/www/py-seafdav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537117866 -SHA256 (haiwen-seafdav-v6.3.5-pro_GH0.tar.gz) = 87ce5725faeffab1785dd318e8cac695ab5dcc8a26c913447eaa89535a5be89a -SIZE (haiwen-seafdav-v6.3.5-pro_GH0.tar.gz) = 2554680 +TIMESTAMP = 1537588170 +SHA256 (haiwen-seafdav-v6.3.6-pro_GH0.tar.gz) = 78ad43b1511bc26774214992d8857d7f39d7cd87f981d3e359dd950630b87db0 +SIZE (haiwen-seafdav-v6.3.6-pro_GH0.tar.gz) = 2554679 diff --git a/www/py-seafobj/distinfo b/www/py-seafobj/distinfo index 87095958cc2e..1a460b38a261 100644 --- a/www/py-seafobj/distinfo +++ b/www/py-seafobj/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537117871 -SHA256 (haiwen-seafobj-v6.3.5-pro_GH0.tar.gz) = 7ab3eb3dde0382237f12131209165004c9448f5f5d46dd5d31d87bd8eaf0767a -SIZE (haiwen-seafobj-v6.3.5-pro_GH0.tar.gz) = 10057843 +TIMESTAMP = 1537588175 +SHA256 (haiwen-seafobj-v6.3.6-pro_GH0.tar.gz) = adb27d53aae6548583acb2d604b08d22284929dda080a863864285e9af6a59a3 +SIZE (haiwen-seafobj-v6.3.6-pro_GH0.tar.gz) = 10057878 diff --git a/www/seahub/Makefile b/www/seahub/Makefile index 9bafaefa573c..83b37be8c43a 100644 --- a/www/seahub/Makefile +++ b/www/seahub/Makefile @@ -4,7 +4,6 @@ PORTNAME= seahub DISTVERSIONPREFIX= v DISTVERSION= ${SEAHUB_VER} DISTVERSIONSUFFIX= -pro -PORTREVISION= 1 CATEGORIES= www MAINTAINER= ultima@FreeBSD.org diff --git a/www/seahub/distinfo b/www/seahub/distinfo index b3730307571d..e13af03396e7 100644 --- a/www/seahub/distinfo +++ b/www/seahub/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537245412 -SHA256 (haiwen-seahub-v6.3.5-pro_GH0.tar.gz) = ea2e9058716639f24db766431bd45355462a5bab00963fb5a261c3ecdd026b0e -SIZE (haiwen-seahub-v6.3.5-pro_GH0.tar.gz) = 25695335 +TIMESTAMP = 1537588183 +SHA256 (haiwen-seahub-v6.3.6-pro_GH0.tar.gz) = 6ac6d4885c81a333e5065b603d63bd5105a9196b4bec229c3f4c673a47904f5f +SIZE (haiwen-seahub-v6.3.6-pro_GH0.tar.gz) = 25669055 diff --git a/www/seahub/pkg-plist b/www/seahub/pkg-plist index 399250bf5c82..d256ca5e7ec7 100644 --- a/www/seahub/pkg-plist +++ b/www/seahub/pkg-plist @@ -319,135 +319,135 @@ %%SEAHUBDIR%%/media/assets/scripts/common.js %%SEAHUBDIR%%/media/assets/scripts/dist/build.972da1846131.txt %%SEAHUBDIR%%/media/assets/scripts/dist/build.txt -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ar/djangojs.881038f5962c.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ar/djangojs.3b3fc3145687.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ar/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ca/djangojs.fbba985df480.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ca/djangojs.1ab40b9da3ab.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ca/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/cs/djangojs.a142cbb09af5.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/cs/djangojs.2cfaea31d9e1.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/cs/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/de/djangojs.8dea61004d63.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/de/djangojs.f2097de6847c.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/de/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/el/djangojs.8d8c518595ce.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/el/djangojs.886924120585.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/el/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/en/djangojs.6f7a9eb6b6e6.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/en/djangojs.5d8987dc3e0c.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/en/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-ar/djangojs.b473ed585ab5.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-ar/djangojs.6186cd4001e9.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-ar/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-mx/djangojs.7e42ee940547.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-mx/djangojs.be169ee0c650.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-mx/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.8698774c372d.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.e50a16569c24.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.6a97d211c417.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.e20ff99407c6.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.9d6fabfc6058.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.3b4a22899b8c.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/he/djangojs.7cb2cfe1eebf.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/he/djangojs.ec223f935bd6.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/he/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/hu/djangojs.1c700444a122.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/hu/djangojs.41d8d36535a0.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/hu/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/is/djangojs.9370be2d4377.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/is/djangojs.45e0c8a007c8.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/is/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/it/djangojs.48743eed6b43.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/it/djangojs.b5190bf0eaf7.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/it/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ja/djangojs.fe5375860289.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ja/djangojs.8ca038623808.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ja/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ko/djangojs.107af3a8ba41.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ko/djangojs.56ca7c9a9b9c.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ko/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/lv/djangojs.b07b4230a101.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/lv/djangojs.3b8f66865b0e.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/lv/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/nl/djangojs.f154792d6c73.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/nl/djangojs.9c814c249c03.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/nl/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pl/djangojs.b1184417f4c4.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pl/djangojs.441472add26b.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pl/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pt-br/djangojs.c597f080c9b0.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pt-br/djangojs.fd0218037de7.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pt-br/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ru/djangojs.c7106ffd1a44.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ru/djangojs.135d7f95c203.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ru/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sk/djangojs.e06218499754.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sk/djangojs.b8059241294f.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sk/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sl/djangojs.74e46338ba98.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sl/djangojs.0a92387b3c06.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sl/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sv/djangojs.95255b34f224.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sv/djangojs.a5373cb8b8fb.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sv/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/th/djangojs.44269a57f620.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/th/djangojs.200dc57cf3e0.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/th/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/tr/djangojs.951b74134c48.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/tr/djangojs.71a95808c5ea.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/tr/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/uk/djangojs.d644a2baab10.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/uk/djangojs.5cb3b8241ecc.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/uk/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/vi/djangojs.808d9a3b2e9e.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/vi/djangojs.77c12a7f9038.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/vi/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-cn/djangojs.fe2b87a461cb.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-cn/djangojs.33a2245cbae3.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-cn/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-tw/djangojs.817b28b7ff6f.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-tw/djangojs.d48dd9f148a7.js %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-tw/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.ac5ad85d01a3.js +%%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.603390194f29.js %%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.js -%%SEAHUBDIR%%/media/assets/scripts/dist/main.bbb739a81f15.js +%%SEAHUBDIR%%/media/assets/scripts/dist/main.c92d709a5bbd.js %%SEAHUBDIR%%/media/assets/scripts/dist/main.js -%%SEAHUBDIR%%/media/assets/scripts/dist/orgadmin-main.ef59fd9b903c.js +%%SEAHUBDIR%%/media/assets/scripts/dist/orgadmin-main.4c0944598d5d.js %%SEAHUBDIR%%/media/assets/scripts/dist/orgadmin-main.js -%%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.4e7c9f18e722.js +%%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.6ad0c05ae054.js %%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.js %%SEAHUBDIR%%/media/assets/scripts/file-tree.ef19875b8f54.js %%SEAHUBDIR%%/media/assets/scripts/file-tree.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/ar/djangojs.ee80c7a24abb.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/ar/djangojs.6521f436a9ac.js %%SEAHUBDIR%%/media/assets/scripts/i18n/ar/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/ca/djangojs.2bcfbd0a8a2c.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/ca/djangojs.f9235aaec16b.js %%SEAHUBDIR%%/media/assets/scripts/i18n/ca/djangojs.js %%SEAHUBDIR%%/media/assets/scripts/i18n/cs/djangojs.0daa8aa4e580.js %%SEAHUBDIR%%/media/assets/scripts/i18n/cs/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/de/djangojs.9af12c427125.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/de/djangojs.a7e988df70a1.js %%SEAHUBDIR%%/media/assets/scripts/i18n/de/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/el/djangojs.a7a95b705545.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/el/djangojs.8e0dc35ee6a6.js %%SEAHUBDIR%%/media/assets/scripts/i18n/el/djangojs.js %%SEAHUBDIR%%/media/assets/scripts/i18n/en/djangojs.e37eef1ffc63.js %%SEAHUBDIR%%/media/assets/scripts/i18n/en/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/es-ar/djangojs.c2e306161f2c.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/es-ar/djangojs.ec6ad7f11650.js %%SEAHUBDIR%%/media/assets/scripts/i18n/es-ar/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/es-mx/djangojs.9ed4e5e3e8a5.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/es-mx/djangojs.2dbe064be698.js %%SEAHUBDIR%%/media/assets/scripts/i18n/es-mx/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/es/djangojs.6cc2216ca557.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/es/djangojs.9d77bd70d3a1.js %%SEAHUBDIR%%/media/assets/scripts/i18n/es/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.78b74a36eab6.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.f3fd860e632f.js %%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.9f0c82fce458.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.92593ab96077.js %%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/he/djangojs.e3493a3ac679.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/he/djangojs.c96b1d370c88.js %%SEAHUBDIR%%/media/assets/scripts/i18n/he/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/hu/djangojs.7e68c4e0f1dd.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/hu/djangojs.3682c47658f1.js %%SEAHUBDIR%%/media/assets/scripts/i18n/hu/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/is/djangojs.ecbacbf54b35.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/is/djangojs.46c45e4feade.js %%SEAHUBDIR%%/media/assets/scripts/i18n/is/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/it/djangojs.1fe3ee5130ed.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/it/djangojs.15b84775b016.js %%SEAHUBDIR%%/media/assets/scripts/i18n/it/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/ja/djangojs.9929c5b02e0e.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/ja/djangojs.87909b3dbeeb.js %%SEAHUBDIR%%/media/assets/scripts/i18n/ja/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/ko/djangojs.9e9461b34d61.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/ko/djangojs.15267e82259b.js %%SEAHUBDIR%%/media/assets/scripts/i18n/ko/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/lv/djangojs.57b619f6b340.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/lv/djangojs.570918a26988.js %%SEAHUBDIR%%/media/assets/scripts/i18n/lv/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/nl/djangojs.ecd0472d0c3d.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/nl/djangojs.a15808e72148.js %%SEAHUBDIR%%/media/assets/scripts/i18n/nl/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/pl/djangojs.4fffe1acab87.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/pl/djangojs.c43fcdbe1b94.js %%SEAHUBDIR%%/media/assets/scripts/i18n/pl/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/pt-br/djangojs.513042ca5741.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/pt-br/djangojs.c1bde86bbde0.js %%SEAHUBDIR%%/media/assets/scripts/i18n/pt-br/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/ru/djangojs.46770d23d07a.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/ru/djangojs.b14d709e588a.js %%SEAHUBDIR%%/media/assets/scripts/i18n/ru/djangojs.js %%SEAHUBDIR%%/media/assets/scripts/i18n/sk/djangojs.06183425c030.js %%SEAHUBDIR%%/media/assets/scripts/i18n/sk/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/sl/djangojs.31b2ea460d8c.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/sl/djangojs.e45e0d391d05.js %%SEAHUBDIR%%/media/assets/scripts/i18n/sl/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/sv/djangojs.7e15aecfc0dc.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/sv/djangojs.ba953e242979.js %%SEAHUBDIR%%/media/assets/scripts/i18n/sv/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/th/djangojs.8a5195cd02f9.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/th/djangojs.b89150a62433.js %%SEAHUBDIR%%/media/assets/scripts/i18n/th/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/tr/djangojs.5ede70a2ec30.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/tr/djangojs.a2999529b591.js %%SEAHUBDIR%%/media/assets/scripts/i18n/tr/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/uk/djangojs.e9fffc432039.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/uk/djangojs.003c5713fbcf.js %%SEAHUBDIR%%/media/assets/scripts/i18n/uk/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/vi/djangojs.2dad3c52ad89.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/vi/djangojs.30a18637d3ba.js %%SEAHUBDIR%%/media/assets/scripts/i18n/vi/djangojs.js %%SEAHUBDIR%%/media/assets/scripts/i18n/zh-cn/djangojs.febd3c6105b3.js %%SEAHUBDIR%%/media/assets/scripts/i18n/zh-cn/djangojs.js -- cgit From 39a7f323bc1f2990b0f206f16eceb9b7f37f46e6 Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 23 Sep 2018 19:44:36 +0000 Subject: Update to alpha-20180831 --- devel/libqcow/Makefile | 3 +-- devel/libqcow/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/libqcow/Makefile b/devel/libqcow/Makefile index 9a457432c6bc..8d2b3c348a0c 100644 --- a/devel/libqcow/Makefile +++ b/devel/libqcow/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libqcow -DISTVERSION= alpha-20170222 -PORTREVISION= 1 +DISTVERSION= alpha-20180831 CATEGORIES= devel MASTER_SITES= https://github.com/libyal/libqcow/releases/download/${PORTVERSION:E}/ \ LOCAL/antoine diff --git a/devel/libqcow/distinfo b/devel/libqcow/distinfo index b6bf42e77b74..9cbbb7ea9305 100644 --- a/devel/libqcow/distinfo +++ b/devel/libqcow/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487916973 -SHA256 (libqcow-alpha-20170222.tar.gz) = 8b4a3f97b3091cb8dc4990a03a1c9c42385e37d876eba6e6513b1e9104e9512d -SIZE (libqcow-alpha-20170222.tar.gz) = 1426203 +TIMESTAMP = 1535781585 +SHA256 (libqcow-alpha-20180831.tar.gz) = ead0418de0bd8cf11726c3f1cd92009469459e1a51fb550b6304b9658284ac52 +SIZE (libqcow-alpha-20180831.tar.gz) = 1436245 -- cgit From 0be7a826ea5671f317eadb774a0521d2d7d25cb4 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 23 Sep 2018 20:02:46 +0000 Subject: New port: math/py-CyLP: Python interface to CLP, CBC, and CGL to solve LPs and MIPs --- math/Makefile | 1 + math/py-CyLP/Makefile | 37 +++++++++++++++++++++++++++++++++++++ math/py-CyLP/distinfo | 3 +++ math/py-CyLP/files/patch-setup.py | 11 +++++++++++ math/py-CyLP/pkg-descr | 7 +++++++ 5 files changed, 59 insertions(+) create mode 100644 math/py-CyLP/Makefile create mode 100644 math/py-CyLP/distinfo create mode 100644 math/py-CyLP/files/patch-setup.py create mode 100644 math/py-CyLP/pkg-descr diff --git a/math/Makefile b/math/Makefile index b269b2403ea2..f3e60b9e72bd 100644 --- a/math/Makefile +++ b/math/Makefile @@ -658,6 +658,7 @@ SUBDIR += pspp SUBDIR += pure-mpfr SUBDIR += pure-rational + SUBDIR += py-CyLP SUBDIR += py-Diofant SUBDIR += py-GridDataFormats SUBDIR += py-PuLP diff --git a/math/py-CyLP/Makefile b/math/py-CyLP/Makefile new file mode 100644 index 000000000000..1a81629ad17c --- /dev/null +++ b/math/py-CyLP/Makefile @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= cylp +DISTVERSION= 0.7.2-30 +DISTVERSIONSUFFIX= -g65a985b +CATEGORIES= math python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Python interface to CLP, CBC, and CGL to solve LPs and MIPs + +LICENSE= CPL10 +LICENSE_NAME= Common Public License Version 1.0 +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell + +BUILD_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.10.0:science/py-scipy@${FLAVOR} +LIB_DEPENDS= libblas.so:math/blas \ + libCbc.so:math/cbc \ + libCgl.so:math/cgl \ + libClp.so:math/clp \ + liblapack.so:math/lapack +RUN_DEPENDS:= ${BUILD_DEPENDS} + +USES= python:2.7 # 3.X support is still in the pull request: https://github.com/coin-or/CyLP/pull/28 +USE_GITHUB= yes +GH_ACCOUNT= coin-or +GH_PROJECT= CyLP +USE_PYTHON= distutils cython autoplist + +MAKE_ENV= COIN_INSTALL_DIR=${LOCALBASE} + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cylp/cy/Cy*.so + +.include diff --git a/math/py-CyLP/distinfo b/math/py-CyLP/distinfo new file mode 100644 index 000000000000..8a17a538a021 --- /dev/null +++ b/math/py-CyLP/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537731308 +SHA256 (coin-or-CyLP-0.7.2-30-g65a985b_GH0.tar.gz) = 9a611fe5e530b61ac4d9c496d7cae88f25491bb571cb3ce3c37ebcb785ee1870 +SIZE (coin-or-CyLP-0.7.2-30-g65a985b_GH0.tar.gz) = 10514134 diff --git a/math/py-CyLP/files/patch-setup.py b/math/py-CyLP/files/patch-setup.py new file mode 100644 index 000000000000..f2607cf7e063 --- /dev/null +++ b/math/py-CyLP/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2014-02-14 17:25:06 UTC ++++ setup.py +@@ -108,7 +108,7 @@ ext_modules = [] + + if operatingSystem == 'mac': + extra_link_args = ['-Wl,-framework', '-Wl,Accelerate', '-headerpad_max_install_names'] +-elif operatingSystem == 'linux': ++elif operatingSystem == 'linux' or operatingSystem.startswith('freebsd'): + extra_link_args = ['-lrt'] + else: + # Assuming Windows diff --git a/math/py-CyLP/pkg-descr b/math/py-CyLP/pkg-descr new file mode 100644 index 000000000000..7c8a40505c64 --- /dev/null +++ b/math/py-CyLP/pkg-descr @@ -0,0 +1,7 @@ +CyLP is a Python interface to COIN-OR's Linear and mixed-integer program solvers +(CLP, CBC, and CGL). CyLP's unique feature is that you can use it to alter the +solution process of the solvers from within Python. For example, you may define +cut generators, branch-and-bound strategies, and primal/dual Simplex pivot rules +completely in Python. + +WWW: https://github.com/coin-or/CyLP -- cgit From 9b28924f33c77f7be24b59d6e1f1f27d182a9392 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 23 Sep 2018 20:09:36 +0000 Subject: math/py-CyLP: Correct PORTNAME. --- math/py-CyLP/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/math/py-CyLP/Makefile b/math/py-CyLP/Makefile index 1a81629ad17c..dfb344963ce6 100644 --- a/math/py-CyLP/Makefile +++ b/math/py-CyLP/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= cylp +PORTNAME= CyLP DISTVERSION= 0.7.2-30 DISTVERSIONSUFFIX= -g65a985b CATEGORIES= math python @@ -26,7 +26,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2.7 # 3.X support is still in the pull request: https://github.com/coin-or/CyLP/pull/28 USE_GITHUB= yes GH_ACCOUNT= coin-or -GH_PROJECT= CyLP USE_PYTHON= distutils cython autoplist MAKE_ENV= COIN_INSTALL_DIR=${LOCALBASE} -- cgit From 82e2faa1ccba8099ba7f9933bd1322c99876902f Mon Sep 17 00:00:00 2001 From: thierry Date: Sun, 23 Sep 2018 20:34:29 +0000 Subject: Upgrade to 5.0.0. Release notes at . --- cad/kicad/Makefile | 19 +- cad/kicad/distinfo | 6 +- .../files/patch-3d-viewer_3d__cache_3d__cache.cpp | 11 + cad/kicad/files/patch-CMakeModules_config.h.cmake | 4 +- .../files/patch-common_tool_tool__manager.cpp | 23 +- cad/kicad/files/patch-include_common.h | 11 - cad/kicad/files/patch-include_tool_coroutine.h | 235 -------------------- cad/kicad/files/patch-include_tool_tool__base.h | 22 -- .../files/patch-include_tool_tool__interactive.h | 14 +- cad/kicad/files/patch-include_tool_tool__manager.h | 19 -- cad/kicad/pkg-plist | 245 ++++++++++++++------- 11 files changed, 195 insertions(+), 414 deletions(-) create mode 100644 cad/kicad/files/patch-3d-viewer_3d__cache_3d__cache.cpp delete mode 100644 cad/kicad/files/patch-include_common.h delete mode 100644 cad/kicad/files/patch-include_tool_coroutine.h delete mode 100644 cad/kicad/files/patch-include_tool_tool__base.h delete mode 100644 cad/kicad/files/patch-include_tool_tool__manager.h diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 52f37d33f7d9..32eff7e540f2 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= kicad -PORTVERSION= 4.0.7 -PORTREVISION= 11 +PORTVERSION= 5.0.0 PORTEPOCH= 2 CATEGORIES= cad @@ -15,6 +14,8 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm \ swig3.0:devel/swig30 LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ + libngspice.so:cad/ngspice_rework@shlib \ + libTKernel.so:cad/opencascade \ libpixman-1.so:x11/pixman \ libpng.so:graphics/png \ libcurl.so:ftp/curl @@ -25,9 +26,9 @@ USE_GITHUB= yes GH_ACCOUNT= KiCad GH_PROJECT= kicad-source-mirror -USES= cmake:noninja compiler:c++11-lib desktop-file-utils \ +USES= cmake:noninja compiler:c++11-lib desktop-file-utils gl gnome \ pkgconfig python:2.7 shared-mime-info shebangfix ssl tar:xz -SHEBANG_FILES= pcbnew/scripting/plugins/touch_slider_wizard.py +SHEBANG_FILES= pcbnew/python/plugins/touch_slider_wizard.py USE_XORG= ice x11 xext USE_GL= gl glew glu glut @@ -36,10 +37,12 @@ WX_COMPS= python:lib wx USE_GNOME= atk cairo CXXFLAGS+= --std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \ - -DwxWidgets_USE_UNICODE=ON -DKICAD_STABLE_VERSION=ON \ + -DwxWidgets_USE_UNICODE=ON -DKICAD_SCRIPTING_WXPYTHON=ON\ -DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \ -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON \ - -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SKIP_BOOST=ON + -DKICAD_USE_OCE=OFF -DKICAD_USE_OCC=ON \ + -DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE +USE_LDCONFIG= yes INSTALLS_ICONS= yes PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} @@ -49,10 +52,6 @@ OPTIONS_SUB= yes NLS_USES= gettext -BINS= cvpcb eeschema gerbview kicad pcbnew -EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \ - contrib_makefiles.txt running_kicad_under_W98.txt - DOXYGEN_VARS= LICENSE+=GFDL LICENSE_COMB=multi DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_IMPLIES= DOCS diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo index 5f66f1ab398a..b6c9d471dcd0 100644 --- a/cad/kicad/distinfo +++ b/cad/kicad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500213571 -SHA256 (KiCad-kicad-source-mirror-4.0.7_GH0.tar.gz) = 157ccd3967d93863e4c3dd718bc96273d5e1846303f3c156df52456e92656025 -SIZE (KiCad-kicad-source-mirror-4.0.7_GH0.tar.gz) = 14420680 +TIMESTAMP = 1531847771 +SHA256 (KiCad-kicad-source-mirror-5.0.0_GH0.tar.gz) = 572cdec9eb33deeb658c8540ab696e866ab79fbad75215142692f249c46c585c +SIZE (KiCad-kicad-source-mirror-5.0.0_GH0.tar.gz) = 24098572 diff --git a/cad/kicad/files/patch-3d-viewer_3d__cache_3d__cache.cpp b/cad/kicad/files/patch-3d-viewer_3d__cache_3d__cache.cpp new file mode 100644 index 000000000000..779e8074b9e8 --- /dev/null +++ b/cad/kicad/files/patch-3d-viewer_3d__cache_3d__cache.cpp @@ -0,0 +1,11 @@ +--- 3d-viewer/3d_cache/3d_cache.cpp.orig 2018-07-13 19:53:52 UTC ++++ 3d-viewer/3d_cache/3d_cache.cpp +@@ -34,7 +34,7 @@ + #include + #include + +-#include ++#include + + #include + #include diff --git a/cad/kicad/files/patch-CMakeModules_config.h.cmake b/cad/kicad/files/patch-CMakeModules_config.h.cmake index e41e2141c8ec..b55359b610a8 100644 --- a/cad/kicad/files/patch-CMakeModules_config.h.cmake +++ b/cad/kicad/files/patch-CMakeModules_config.h.cmake @@ -1,4 +1,4 @@ ---- CMakeModules/config.h.cmake.orig 2017-07-14 19:17:29 UTC +--- CMakeModules/config.h.cmake.orig 2018-07-13 19:53:52 UTC +++ CMakeModules/config.h.cmake @@ -36,7 +36,7 @@ #cmakedefine HAVE_ISO646_H @@ -8,4 +8,4 @@ +#include #endif - #if defined( HAVE_STRCASECMP ) + #if !defined( HAVE_STRCASECMP ) diff --git a/cad/kicad/files/patch-common_tool_tool__manager.cpp b/cad/kicad/files/patch-common_tool_tool__manager.cpp index ecea6a4fe893..5488e23ac656 100644 --- a/cad/kicad/files/patch-common_tool_tool__manager.cpp +++ b/cad/kicad/files/patch-common_tool_tool__manager.cpp @@ -1,25 +1,10 @@ ---- common/tool/tool_manager.cpp.orig 2017-07-14 19:17:29 UTC +--- common/tool/tool_manager.cpp.orig 2018-07-13 19:53:52 UTC +++ common/tool/tool_manager.cpp -@@ -27,6 +27,7 @@ - #include +@@ -26,6 +26,7 @@ + #include #include #include +#include - #include - #include -@@ -542,11 +543,12 @@ void TOOL_MANAGER::dispatchInternal( con - if( st->cofunc ) - st->Push(); - -+// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad -+ st->cofunc = new COROUTINE( tr.second ); -+ - // as the state changes, the transition table has to be set up again - st->transitions.clear(); - -- st->cofunc = new COROUTINE( tr.second ); -- - // got match? Run the handler. - st->cofunc->Call( aEvent ); + #include diff --git a/cad/kicad/files/patch-include_common.h b/cad/kicad/files/patch-include_common.h deleted file mode 100644 index 5d8a0c5e309d..000000000000 --- a/cad/kicad/files/patch-include_common.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/common.h.orig 2017-07-14 19:17:29 UTC -+++ include/common.h -@@ -54,7 +54,7 @@ class REPORTER; - #define GR_KB_LEFTSHIFT 0x20000000 /* left shift key depressed - */ - #define GR_KB_CTRL 0x40000000 // CTRL depressed --#define GR_KB_ALT 0x80000000 // ALT depressed -+#define GR_KB_ALT 0x04000000 // ALT depressed - #define GR_KB_SHIFT (GR_KB_LEFTSHIFT | GR_KB_RIGHTSHIFT) - #define GR_KB_SHIFTCTRL (GR_KB_SHIFT | GR_KB_CTRL) - #define MOUSE_MIDDLE 0x08000000 /* Middle button mouse diff --git a/cad/kicad/files/patch-include_tool_coroutine.h b/cad/kicad/files/patch-include_tool_coroutine.h deleted file mode 100644 index f42f4ff2372f..000000000000 --- a/cad/kicad/files/patch-include_tool_coroutine.h +++ /dev/null @@ -1,235 +0,0 @@ ---- include/tool/coroutine.h.orig 2017-07-14 19:17:29 UTC -+++ include/tool/coroutine.h -@@ -27,10 +27,12 @@ - - #include - --#include -+// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad - #include -+#include - --#include "delegate.h" -+#include -+#include - - /** - * Class COROUNTINE. -@@ -53,13 +55,12 @@ - * See coroutine_example.cpp for sample code. - */ - --template -+template - class COROUTINE - { - public: - COROUTINE() : -- m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ), -- m_running( false ) -+ COROUTINE( nullptr ) - { - } - -@@ -69,8 +70,7 @@ public: - */ - template - COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) : -- m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ), -- m_stackSize( c_defaultStackSize ), m_running( false ) -+ COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) ) - { - } - -@@ -78,9 +78,11 @@ public: - * Constructor - * Creates a coroutine from a delegate object - */ -- COROUTINE( DELEGATE aEntry ) : -- m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ), -- m_stackSize( c_defaultStackSize ), m_running( false ) -+ COROUTINE( std::function aEntry ) : -+ m_func( std::move( aEntry ) ), -+ m_running( false ), -+ m_caller( nullptr ), -+ m_callee( nullptr ) - { - // Avoid not initialized members, and make static analysers quiet - m_args = 0; -@@ -89,18 +91,13 @@ public: - - ~COROUTINE() - { -- if( m_saved ) -- delete m_saved; -- --#if BOOST_VERSION >= 105600 -- if( m_self ) -- delete m_self; --#endif -- -- if( m_stack ) -- free( m_stack ); -+ delete m_callee; - } - -+private: -+ using context_type = boost::context::execution_context; -+ -+public: - /** - * Function Yield() - * -@@ -110,7 +107,9 @@ public: - */ - void Yield() - { -- jump( m_self, m_saved, 0 ); -+ auto result = (*m_caller)( this ); -+ *m_caller = std::move( std::get<0>( result ) ); -+ - } - - /** -@@ -122,7 +121,7 @@ public: - void Yield( ReturnType& aRetVal ) - { - m_retVal = aRetVal; -- jump( m_self, m_saved, 0 ); -+ m_caller( this ); - } - - /** -@@ -130,9 +129,9 @@ public: - * - * Defines the entry point for the coroutine, if not set in the constructor. - */ -- void SetEntry( DELEGATE aEntry ) -+ void SetEntry( std::function aEntry ) - { -- m_func = aEntry; -+ m_func = std::move( aEntry ); - } - - /* Function Call() -@@ -143,30 +142,19 @@ public: - */ - bool Call( ArgType aArgs ) - { -- // fixme: Clean up stack stuff. Add a guard -- m_stack = malloc( c_defaultStackSize ); -- -- // align to 16 bytes -- void* sp = (void*) ( ( ( (ptrdiff_t) m_stack ) + m_stackSize - 0xf ) & ( ~0x0f ) ); -- -- // correct the stack size -- m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp ); -- -- assert( m_self == NULL ); -- assert( m_saved == NULL ); -+ assert( m_callee == NULL ); -+ assert( m_caller == NULL ); - - m_args = &aArgs; --#if BOOST_VERSION >= 105600 -- m_self = new boost::context::fcontext_t(); -- *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub ); --#else -- m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub ); --#endif -- m_saved = new boost::context::fcontext_t(); -+ -+ m_callee = new context_type( std::allocator_arg_t(), -+ boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub ); - - m_running = true; -+ - // off we go! -- jump( m_saved, m_self, reinterpret_cast( this ) ); -+ auto result = (*m_callee)( this ); -+ *m_callee = std::move( std::get<0>( result ) ); - return m_running; - } - -@@ -179,7 +167,8 @@ public: - */ - bool Resume() - { -- jump( m_saved, m_self, 0 ); -+ auto result = (*m_callee)( this ); -+ *m_callee = std::move( std::get<0>( result ) ); - - return m_running; - } -@@ -208,61 +197,36 @@ private: - static const int c_defaultStackSize = 2000000; // fixme: make configurable - - /* real entry point of the coroutine */ -- static void callerStub( intptr_t aData ) -+ static context_type callerStub( context_type caller, COROUTINE* cor ) - { - // get pointer to self -- COROUTINE* cor = reinterpret_cast*>( aData ); -+ cor->m_caller = &caller; - - // call the coroutine method -- cor->m_retVal = cor->m_func( *cor->m_args ); -+ cor->m_retVal = cor->m_func( *( cor->m_args ) ); - cor->m_running = false; - - // go back to wherever we came from. -- jump( cor->m_self, cor->m_saved, 0 ); // reinterpret_cast( this )); -+ return caller; - } - - ///> Wrapper for jump_fcontext to assure compatibility between different boost versions -- static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew, -- intptr_t aP, bool aPreserveFPU = true ) -- { --#if BOOST_VERSION >= 105600 -- return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU ); --#else -- return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU ); --#endif -- } -- -- template -- struct strip_ref -- { -- typedef T result; -- }; - -- template -- struct strip_ref -- { -- typedef T result; -- }; -+ std::function m_func; - -- DELEGATE m_func; -+ bool m_running; - - ///< pointer to coroutine entry arguments. Stripped of references - ///< to avoid compiler errors. -- typename strip_ref::result* m_args; -+ typename std::remove_reference::type* m_args; -+ - ReturnType m_retVal; - - ///< saved caller context -- boost::context::fcontext_t* m_saved; -+ context_type* m_caller; - - ///< saved coroutine context -- boost::context::fcontext_t* m_self; -- -- ///< coroutine stack -- void* m_stack; -- -- size_t m_stackSize; -- -- bool m_running; -+ context_type* m_callee; - }; - - #endif diff --git a/cad/kicad/files/patch-include_tool_tool__base.h b/cad/kicad/files/patch-include_tool_tool__base.h deleted file mode 100644 index bd2aa4b91da6..000000000000 --- a/cad/kicad/files/patch-include_tool_tool__base.h +++ /dev/null @@ -1,22 +0,0 @@ ---- include/tool/tool_base.h.orig 2017-07-14 19:17:29 UTC -+++ include/tool/tool_base.h -@@ -31,7 +31,8 @@ - #include - #include - --#include -+// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad -+#include - - class EDA_ITEM; - class TOOL_MANAGER; -@@ -53,7 +54,8 @@ enum TOOL_TYPE - - /// Unique identifier for tools - typedef int TOOL_ID; --typedef DELEGATE TOOL_STATE_FUNC; -+ -+using TOOL_STATE_FUNC = std::function; - - /** - * Class TOOL_BASE diff --git a/cad/kicad/files/patch-include_tool_tool__interactive.h b/cad/kicad/files/patch-include_tool_tool__interactive.h index 06d5c7027b12..0d6221154c5b 100644 --- a/cad/kicad/files/patch-include_tool_tool__interactive.h +++ b/cad/kicad/files/patch-include_tool_tool__interactive.h @@ -1,6 +1,6 @@ ---- include/tool/tool_interactive.h.orig 2017-07-14 19:17:29 UTC +--- include/tool/tool_interactive.h.orig 2018-07-13 19:53:52 UTC +++ include/tool/tool_interactive.h -@@ -26,6 +26,7 @@ +@@ -27,6 +27,7 @@ #define __TOOL_INTERACTIVE_H #include @@ -8,13 +8,3 @@ #include #include -@@ -113,7 +114,8 @@ template - void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ), - const TOOL_EVENT_LIST& aConditions ) - { -- TOOL_STATE_FUNC sptr( static_cast( this ), aStateFunc ); -+// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad -+ TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast( this ), std::placeholders::_1 ); - - goInternal( sptr, aConditions ); - } diff --git a/cad/kicad/files/patch-include_tool_tool__manager.h b/cad/kicad/files/patch-include_tool_tool__manager.h deleted file mode 100644 index 3dda41d6acd7..000000000000 --- a/cad/kicad/files/patch-include_tool_tool__manager.h +++ /dev/null @@ -1,19 +0,0 @@ ---- include/tool/tool_manager.h.orig 2017-07-14 19:17:29 UTC -+++ include/tool/tool_manager.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include - -@@ -278,6 +279,8 @@ public: - void ScheduleNextState( TOOL_BASE* aTool, TOOL_STATE_FUNC& aHandler, - const TOOL_EVENT_LIST& aConditions ); - -+ void RunMainStack( TOOL_BASE* aTool, std::function aFunc ); -+ - /** - * Pauses execution of a given tool until one or more events matching aConditions arrives. - * The pause/resume operation is done through COROUTINE object. diff --git a/cad/kicad/pkg-plist b/cad/kicad/pkg-plist index 6a01377dcd98..4a988146927b 100644 --- a/cad/kicad/pkg-plist +++ b/cad/kicad/pkg-plist @@ -12,37 +12,25 @@ bin/idf2vrml bin/idfcyl bin/idfrect bin/kicad +bin/kicad-ogltest +bin/kicad2step bin/pcb_calculator bin/pcbnew bin/pl_editor -lib/kicad/plugins/README-bom.txt -lib/kicad/plugins/bom2csv.xsl -lib/kicad/plugins/bom2grouped_csv.xsl -lib/kicad/plugins/bom_csv_grouped_by_value.py -lib/kicad/plugins/bom_csv_grouped_by_value_with_fp.py -lib/kicad/plugins/bom_csv_sorted_by_ref.py -lib/kicad/plugins/bom_html_grouped_by_value.py -lib/kicad/plugins/bom_html_with_advanced_grouping.py -lib/kicad/plugins/bom_sorted_by_ref.py -lib/kicad/plugins/bom_with_title_block_2_csv.xsl -lib/kicad/plugins/kicad_netlist_reader.py -lib/kicad/plugins/netlist_form_OrcadPcb2.xsl -lib/kicad/plugins/netlist_form_cadstar-RINF.xsl -lib/kicad/plugins/netlist_form_cadstar.xsl -lib/kicad/plugins/netlist_form_pads-pcb.xsl +lib/kicad/plugins/3d/libs3d_plugin_idf.so +lib/kicad/plugins/3d/libs3d_plugin_oce.so +lib/kicad/plugins/3d/libs3d_plugin_vrml.so +lib/libkicad_3dsg.so +lib/libkicad_3dsg.so.2.0.0 %%PYTHON_SITELIBDIR%%/_pcbnew.so %%PYTHON_SITELIBDIR%%/pcbnew.py +share/appdata/kicad.appdata.xml %%DESKTOPDIR%%/bitmap2component.desktop -%%DESKTOPDIR%%/cvpcb.desktop %%DESKTOPDIR%%/eeschema.desktop %%DESKTOPDIR%%/gerbview.desktop %%DESKTOPDIR%%/kicad.desktop %%DESKTOPDIR%%/pcbcalculator.desktop %%DESKTOPDIR%%/pcbnew.desktop -%%PORTDOCS%%%%DOCSDIR%%/GUI_Translation_HOWTO.odt -%%PORTDOCS%%%%DOCSDIR%%/GUI_Translation_HOWTO.pdf -%%PORTDOCS%%%%DOCSDIR%%/HOW_TO_CONTRIBUTE.txt -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt %%PORTDOCS%%%%DOCSDIR%%/KIWAY_Build_Symbols_Defined.txt %%PORTDOCS%%%%DOCSDIR%%/biu-plan.txt %%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2007.txt @@ -50,84 +38,104 @@ lib/kicad/plugins/netlist_form_pads-pcb.xsl %%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2009.txt %%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2010.txt %%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2011.txt -%%PORTDOCS%%%%DOCSDIR%%/coding_style_policy.pdf +%%PORTDOCS%%%%DOCSDIR%%/changelogs/CHANGELOG-2012.txt %%PORTDOCS%%%%DOCSDIR%%/development/Doxyfile %%PORTDOCS%%%%DOCSDIR%%/development/coding-style-policy.md +%%PORTDOCS%%%%DOCSDIR%%/development/commit-message-format.md %%PORTDOCS%%%%DOCSDIR%%/development/compiling.md +%%PORTDOCS%%%%DOCSDIR%%/development/config-strings.md +%%PORTDOCS%%%%DOCSDIR%%/development/pcbnew-plugins.md +%%PORTDOCS%%%%DOCSDIR%%/development/road-map-r5.md +%%PORTDOCS%%%%DOCSDIR%%/development/road-map-r6.md %%PORTDOCS%%%%DOCSDIR%%/development/road-map.md -%%PORTDOCS%%%%DOCSDIR%%/development/stable-release-policy.md -%%PORTDOCS%%%%DOCSDIR%%/guidelines/UIpolicies.txt -%%PORTDOCS%%%%DOCSDIR%%/interactive_router/build.sh -%%PORTDOCS%%%%DOCSDIR%%/interactive_router/interactive_router.mmd -%%PORTDOCS%%%%DOCSDIR%%/interactive_router/pictures/opengl_menu.png -%%PORTDOCS%%%%DOCSDIR%%/interactive_router/pictures/route_icon.png -%%PORTDOCS%%%%DOCSDIR%%/interactive_router/pictures/router_options.png -%%PORTDOCS%%%%DOCSDIR%%/interactive_router/pictures/rules_editor.png +%%PORTDOCS%%%%DOCSDIR%%/development/stable-%%CMAKE_BUILD_TYPE%%-policy.md +%%PORTDOCS%%%%DOCSDIR%%/development/testing.md +%%PORTDOCS%%%%DOCSDIR%%/development/tool-framework.md +%%PORTDOCS%%%%DOCSDIR%%/development/ui-policy.md +%%PORTDOCS%%%%DOCSDIR%%/eagle-plugin-notes.txt +%%PORTDOCS%%%%DOCSDIR%%/kicad_doxygen_logo.png %%PORTDOCS%%%%DOCSDIR%%/notes_about_pcbnew_new_file_format.odt -%%PORTDOCS%%%%DOCSDIR%%/rules_for_capitalization_in_Kicad_UI.txt %%PORTDOCS%%%%DOCSDIR%%/s-expressions.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/kicad-install.sh +%%PORTDOCS%%%%DOCSDIR%%/scripts/ddr3_length_match.py +%%PORTDOCS%%%%DOCSDIR%%/scripts/get_libngspice_so.sh %%PORTDOCS%%%%DOCSDIR%%/scripts/lib_convert.py -%%PORTDOCS%%%%DOCSDIR%%/scripts/library-repos-install.bat %%PORTDOCS%%%%DOCSDIR%%/scripts/library-repos-install.sh -%%PORTDOCS%%%%DOCSDIR%%/scripts/osx_build_wx.sh -%%PORTDOCS%%%%DOCSDIR%%/scripts/osx_fixbundle.sh +%%PORTDOCS%%%%DOCSDIR%%/scripts/mk_macos_icons.py +%%PORTDOCS%%%%DOCSDIR%%/scripts/mk_mime_icons.py %%PORTDOCS%%%%DOCSDIR%%/scripts/test_kicad_plugin.py %%PORTDOCS%%%%DOCSDIR%%/scripts/test_plugin.py -%%PORTDOCS%%%%DOCSDIR%%/wxWidgets_patch_notes.txt -share/icons/hicolor/128x128/apps/3d.png share/icons/hicolor/128x128/apps/bitmap2component.png -share/icons/hicolor/128x128/apps/cvpcb.png share/icons/hicolor/128x128/apps/eeschema.png share/icons/hicolor/128x128/apps/gerbview.png share/icons/hicolor/128x128/apps/kicad.png share/icons/hicolor/128x128/apps/pcbcalculator.png share/icons/hicolor/128x128/apps/pcbnew.png -share/icons/hicolor/128x128/mimetypes/application-x-3d-project.png -share/icons/hicolor/128x128/mimetypes/application-x-bitmap2component-project.png -share/icons/hicolor/128x128/mimetypes/application-x-cvpcb-project.png -share/icons/hicolor/128x128/mimetypes/application-x-eeschema-project.png -share/icons/hicolor/128x128/mimetypes/application-x-gerbview-project.png +share/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png share/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png -share/icons/hicolor/128x128/mimetypes/application-x-pcbcalculator-project.png -share/icons/hicolor/128x128/mimetypes/application-x-pcbnew-project.png +share/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png +share/icons/hicolor/16x16/apps/bitmap2component.png +share/icons/hicolor/16x16/apps/eeschema.png +share/icons/hicolor/16x16/apps/gerbview.png +share/icons/hicolor/16x16/apps/kicad.png +share/icons/hicolor/16x16/apps/pcbcalculator.png +share/icons/hicolor/16x16/apps/pcbnew.png +share/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png +share/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png +share/icons/hicolor/22x22/apps/bitmap2component.png +share/icons/hicolor/22x22/apps/eeschema.png +share/icons/hicolor/22x22/apps/gerbview.png share/icons/hicolor/22x22/apps/kicad.png +share/icons/hicolor/22x22/apps/pcbcalculator.png +share/icons/hicolor/22x22/apps/pcbnew.png +share/icons/hicolor/22x22/mimetypes/application-x-kicad-pcb.png share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png +share/icons/hicolor/22x22/mimetypes/application-x-kicad-schematic.png +share/icons/hicolor/24x24/apps/bitmap2component.png +share/icons/hicolor/24x24/apps/eeschema.png +share/icons/hicolor/24x24/apps/gerbview.png share/icons/hicolor/24x24/apps/kicad.png +share/icons/hicolor/24x24/apps/pcbcalculator.png +share/icons/hicolor/24x24/apps/pcbnew.png +share/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png +share/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png +share/icons/hicolor/32x32/apps/bitmap2component.png +share/icons/hicolor/32x32/apps/eeschema.png +share/icons/hicolor/32x32/apps/gerbview.png share/icons/hicolor/32x32/apps/kicad.png +share/icons/hicolor/32x32/apps/pcbcalculator.png +share/icons/hicolor/32x32/apps/pcbnew.png +share/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png +share/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png share/icons/hicolor/48x48/apps/bitmap2component.png -share/icons/hicolor/48x48/apps/cvpcb.png share/icons/hicolor/48x48/apps/eeschema.png share/icons/hicolor/48x48/apps/gerbview.png share/icons/hicolor/48x48/apps/kicad.png share/icons/hicolor/48x48/apps/pcbcalculator.png share/icons/hicolor/48x48/apps/pcbnew.png -share/icons/hicolor/48x48/mimetypes/application-x-bitmap2component-project.png -share/icons/hicolor/48x48/mimetypes/application-x-cvpcb-project.png -share/icons/hicolor/48x48/mimetypes/application-x-eeschema-project.png -share/icons/hicolor/48x48/mimetypes/application-x-gerbview-project.png +share/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png share/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png -share/icons/hicolor/48x48/mimetypes/application-x-pcbcalculator-project.png -share/icons/hicolor/48x48/mimetypes/application-x-pcbnew-project.png -share/icons/hicolor/scalable/apps/3d.svg +share/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png +share/icons/hicolor/64x64/apps/bitmap2component.png +share/icons/hicolor/64x64/apps/eeschema.png +share/icons/hicolor/64x64/apps/gerbview.png +share/icons/hicolor/64x64/apps/kicad.png +share/icons/hicolor/64x64/apps/pcbcalculator.png +share/icons/hicolor/64x64/apps/pcbnew.png +share/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png +share/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png +share/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png share/icons/hicolor/scalable/apps/bitmap2component.svg -share/icons/hicolor/scalable/apps/cvpcb.svg share/icons/hicolor/scalable/apps/eeschema.svg share/icons/hicolor/scalable/apps/gerbview.svg share/icons/hicolor/scalable/apps/kicad.svg share/icons/hicolor/scalable/apps/pcbcalculator.svg share/icons/hicolor/scalable/apps/pcbnew.svg -share/icons/hicolor/scalable/mimetypes/application-x-3d-project.svg -share/icons/hicolor/scalable/mimetypes/application-x-bitmap2component-project.svg -share/icons/hicolor/scalable/mimetypes/application-x-cvpcb-project.svg -share/icons/hicolor/scalable/mimetypes/application-x-eeschema-project.svg -share/icons/hicolor/scalable/mimetypes/application-x-gerbview-project.svg +share/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg -share/icons/hicolor/scalable/mimetypes/application-x-pcbcalculator-project.svg -share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg +share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg %%DATADIR%%/demos/complex_hierarchy/ampli_ht.sch %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy-cache.lib %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.kicad_pcb @@ -135,6 +143,17 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.pro %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy.sch %%DATADIR%%/demos/complex_hierarchy/complex_hierarchy_schlib.lib +%%DATADIR%%/demos/complex_hierarchy/fp-lib-table +%%DATADIR%%/demos/complex_hierarchy/sym-lib-table +%%DATADIR%%/demos/custom_pads_test/custom_pads_schlib.dcm +%%DATADIR%%/demos/custom_pads_test/custom_pads_schlib.lib +%%DATADIR%%/demos/custom_pads_test/custom_pads_test-cache.lib +%%DATADIR%%/demos/custom_pads_test/custom_pads_test.kicad_pcb +%%DATADIR%%/demos/custom_pads_test/custom_pads_test.lib +%%DATADIR%%/demos/custom_pads_test/custom_pads_test.net +%%DATADIR%%/demos/custom_pads_test/custom_pads_test.pro +%%DATADIR%%/demos/custom_pads_test/custom_pads_test.sch +%%DATADIR%%/demos/custom_pads_test/sym-lib-table %%DATADIR%%/demos/ecc83/ecc83-pp-cache.lib %%DATADIR%%/demos/ecc83/ecc83-pp.kicad_pcb %%DATADIR%%/demos/ecc83/ecc83-pp.net @@ -148,9 +167,13 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg %%DATADIR%%/demos/ecc83/ecc83_schlib.dcm %%DATADIR%%/demos/ecc83/ecc83_schlib.lib %%DATADIR%%/demos/ecc83/fp-lib-table +%%DATADIR%%/demos/ecc83/sym-lib-table +%%DATADIR%%/demos/electric/elec-unifil.dcm +%%DATADIR%%/demos/electric/elec-unifil.lib %%DATADIR%%/demos/electric/electric-cache.lib %%DATADIR%%/demos/electric/electric.pro %%DATADIR%%/demos/electric/electric.sch +%%DATADIR%%/demos/electric/sym-lib-table %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy-cache.lib %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.kicad_pcb %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy.net @@ -159,34 +182,48 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg %%DATADIR%%/demos/flat_hierarchy/flat_hierarchy_schlib.lib %%DATADIR%%/demos/flat_hierarchy/pic_programmer.sch %%DATADIR%%/demos/flat_hierarchy/pic_sockets.sch -%%DATADIR%%/demos/interf_u/image.lib -%%DATADIR%%/demos/interf_u/image.mod +%%DATADIR%%/demos/flat_hierarchy/sym-lib-table +%%DATADIR%%/demos/interf_u/fp-lib-table %%DATADIR%%/demos/interf_u/interf_u-cache.lib -%%DATADIR%%/demos/interf_u/interf_u.cmp %%DATADIR%%/demos/interf_u/interf_u.kicad_pcb %%DATADIR%%/demos/interf_u/interf_u.net +%%DATADIR%%/demos/interf_u/interf_u.pretty/BUS_PC.kicad_mod +%%DATADIR%%/demos/interf_u/interf_u.pretty/PGA120.kicad_mod %%DATADIR%%/demos/interf_u/interf_u.pro %%DATADIR%%/demos/interf_u/interf_u.sch +%%DATADIR%%/demos/interf_u/interf_u_schlib.dcm %%DATADIR%%/demos/interf_u/interf_u_schlib.lib %%DATADIR%%/demos/interf_u/pagelayout_logo.kicad_wks +%%DATADIR%%/demos/interf_u/sym-lib-table %%DATADIR%%/demos/interf_u/tux.bmp +%%DATADIR%%/demos/interf_u/tux.kicad_mod +%%DATADIR%%/demos/interf_u/tux.lib +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/fp-lib-table %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.net %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.dcm %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213_schlib.lib -%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/dpack_5.wings -%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/dpack_5.wrl +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wings +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wrl +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Jack.wings +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/Jack.wrl +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/db9_female_pin90deg.wrl %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wrl +%%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/sym-lib-table %%DATADIR%%/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch %%DATADIR%%/demos/microwave/microwave.kicad_pcb %%DATADIR%%/demos/microwave/microwave.pro %%DATADIR%%/demos/microwave/shape1.txt %%DATADIR%%/demos/pic_programmer/fp-lib-table -%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/1pin-4.kicad_mod +%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/40tex-Ell600.kicad_mod +%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/RV2X4.kicad_mod +%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_fp.pretty/TO-92_BC237_307.kicad_mod +%%DATADIR%%/demos/pic_programmer/libs/pic_programmer_schlib.dcm %%DATADIR%%/demos/pic_programmer/libs/pic_programmer_schlib.lib %%DATADIR%%/demos/pic_programmer/pic_programmer-cache.lib %%DATADIR%%/demos/pic_programmer/pic_programmer.kicad_pcb @@ -194,30 +231,62 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg %%DATADIR%%/demos/pic_programmer/pic_programmer.pro %%DATADIR%%/demos/pic_programmer/pic_programmer.sch %%DATADIR%%/demos/pic_programmer/pic_sockets.sch -%%DATADIR%%/demos/pspice/pspice-cache.lib -%%DATADIR%%/demos/pspice/pspice.cir -%%DATADIR%%/demos/pspice/pspice.pro -%%DATADIR%%/demos/pspice/pspice.sch +%%DATADIR%%/demos/pic_programmer/sym-lib-table +%%DATADIR%%/demos/python_scripts_examples/action_menu_add_automatic_border.py +%%DATADIR%%/demos/python_scripts_examples/action_menu_text_by_date.py +%%DATADIR%%/demos/python_scripts_examples/action_plugin_test_undoredo.py %%DATADIR%%/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py %%DATADIR%%/demos/python_scripts_examples/plot_board.py +%%DATADIR%%/demos/simulation/laser_driver/ad8009.lib +%%DATADIR%%/demos/simulation/laser_driver/fzt1049a.lib +%%DATADIR%%/demos/simulation/laser_driver/laser.lib +%%DATADIR%%/demos/simulation/laser_driver/laser_driver-cache.lib +%%DATADIR%%/demos/simulation/laser_driver/laser_driver.pro +%%DATADIR%%/demos/simulation/laser_driver/laser_driver.sch +%%DATADIR%%/demos/simulation/laser_driver/laser_driver_schlib.lib +%%DATADIR%%/demos/simulation/laser_driver/sym-lib-table +%%DATADIR%%/demos/simulation/pspice/pspice-cache.lib +%%DATADIR%%/demos/simulation/pspice/pspice.pro +%%DATADIR%%/demos/simulation/pspice/pspice.sch +%%DATADIR%%/demos/simulation/pspice/schematic_libspice.dcm +%%DATADIR%%/demos/simulation/pspice/schematic_libspice.lib +%%DATADIR%%/demos/simulation/pspice/sym-lib-table +%%DATADIR%%/demos/simulation/rectifier/rectifier-cache.lib +%%DATADIR%%/demos/simulation/rectifier/rectifier.pro +%%DATADIR%%/demos/simulation/rectifier/rectifier.sch +%%DATADIR%%/demos/simulation/rectifier/rectifier_schlib.lib +%%DATADIR%%/demos/simulation/rectifier/sym-lib-table +%%DATADIR%%/demos/simulation/sallen_key/ad8051.lib +%%DATADIR%%/demos/simulation/sallen_key/sallen_key-cache.lib +%%DATADIR%%/demos/simulation/sallen_key/sallen_key.pro +%%DATADIR%%/demos/simulation/sallen_key/sallen_key.sch +%%DATADIR%%/demos/simulation/sallen_key/sallen_key_schlib.lib +%%DATADIR%%/demos/simulation/sallen_key/sym-lib-table +%%DATADIR%%/demos/sonde xilinx/fp-lib-table %%DATADIR%%/demos/sonde xilinx/sonde xilinx-cache.lib %%DATADIR%%/demos/sonde xilinx/sonde xilinx.kicad_pcb %%DATADIR%%/demos/sonde xilinx/sonde xilinx.net %%DATADIR%%/demos/sonde xilinx/sonde xilinx.pro %%DATADIR%%/demos/sonde xilinx/sonde xilinx.sch %%DATADIR%%/demos/sonde xilinx/sonde xilinx_schlib.lib +%%DATADIR%%/demos/sonde xilinx/sym-lib-table +%%DATADIR%%/demos/test_pads_inside_pads/sym-lib-table %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.net %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.pro %%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads.sch +%%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads_schlib.dcm +%%DATADIR%%/demos/test_pads_inside_pads/test_pads_inside_pads_schlib.lib %%DATADIR%%/demos/test_xil_95108/carte_test-cache.lib %%DATADIR%%/demos/test_xil_95108/carte_test.kicad_pcb %%DATADIR%%/demos/test_xil_95108/carte_test.net %%DATADIR%%/demos/test_xil_95108/carte_test.pro %%DATADIR%%/demos/test_xil_95108/carte_test.sch +%%DATADIR%%/demos/test_xil_95108/carte_test_schlib.dcm %%DATADIR%%/demos/test_xil_95108/carte_test_schlib.lib %%DATADIR%%/demos/test_xil_95108/fp-lib-table +%%DATADIR%%/demos/test_xil_95108/sym-lib-table %%DATADIR%%/demos/video/bus_pci.sch %%DATADIR%%/demos/video/esvideo.sch %%DATADIR%%/demos/video/fp-lib-table @@ -231,29 +300,43 @@ share/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg %%DATADIR%%/demos/video/muxdata.sch %%DATADIR%%/demos/video/pal-ntsc.sch %%DATADIR%%/demos/video/rams.sch +%%DATADIR%%/demos/video/sym-lib-table %%DATADIR%%/demos/video/video-cache.lib %%DATADIR%%/demos/video/video.kicad_pcb %%DATADIR%%/demos/video/video.net %%DATADIR%%/demos/video/video.pro %%DATADIR%%/demos/video/video.sch -%%DATADIR%%/scripting/plugins/FPC_(SMD_type)_footprintwizard.py -%%DATADIR%%/scripting/plugins/FootprintWizardDrawingAids.py -%%DATADIR%%/scripting/plugins/HelpfulFootprintWizardPlugin.py +%%DATADIR%%/plugins/README-bom.txt +%%DATADIR%%/plugins/bom2csv.xsl +%%DATADIR%%/plugins/bom2grouped_csv.xsl +%%DATADIR%%/plugins/bom_csv_grouped_by_value.py +%%DATADIR%%/plugins/bom_csv_grouped_by_value_with_fp.py +%%DATADIR%%/plugins/bom_csv_sorted_by_ref.py +%%DATADIR%%/plugins/bom_html_grouped_by_value.py +%%DATADIR%%/plugins/bom_html_with_advanced_grouping.py +%%DATADIR%%/plugins/bom_sorted_by_ref.py +%%DATADIR%%/plugins/bom_with_title_block_2_csv.xsl +%%DATADIR%%/plugins/kicad_netlist_reader.py +%%DATADIR%%/plugins/netlist_form_OrcadPcb2.xsl +%%DATADIR%%/plugins/netlist_form_cadstar-RINF.xsl +%%DATADIR%%/plugins/netlist_form_cadstar.xsl +%%DATADIR%%/plugins/netlist_form_pads-pcb.asc.xsl +%%DATADIR%%/scripting/kicad_pyshell/__init__.py +%%DATADIR%%/scripting/plugins/FPC_wizard.py +%%DATADIR%%/scripting/plugins/FootprintWizardBase.py %%DATADIR%%/scripting/plugins/PadArray.py %%DATADIR%%/scripting/plugins/__init__.py %%DATADIR%%/scripting/plugins/bga_wizard.py %%DATADIR%%/scripting/plugins/circular_pad_array_wizard.py +%%DATADIR%%/scripting/plugins/microMatch_connectors.py +%%DATADIR%%/scripting/plugins/qfn_wizard.py %%DATADIR%%/scripting/plugins/qfp_wizard.py +%%DATADIR%%/scripting/plugins/qrcode.py +%%DATADIR%%/scripting/plugins/qrcode_footprint_wizard.py %%DATADIR%%/scripting/plugins/sdip_wizard.py %%DATADIR%%/scripting/plugins/touch_slider_wizard.py %%DATADIR%%/scripting/plugins/uss39_barcode.py %%DATADIR%%/scripting/plugins/zip_wizard.py -%%DATADIR%%/template/gost_landscape.kicad_wks -%%DATADIR%%/template/gost_portrait.kicad_wks %%DATADIR%%/template/kicad.pro -%%DATADIR%%/template/pagelayout_default.kicad_wks -%%DATADIR%%/template/pagelayout_logo.kicad_wks -share/mime/packages/kicad.xml -share/mimelnk/application/x-kicad-pcb.desktop -share/mimelnk/application/x-kicad-project.desktop -share/mimelnk/application/x-kicad-schematic.desktop +share/mime/packages/kicad-gerbers.xml +share/mime/packages/kicad-kicad.xml -- cgit From 2256672f1cfbebe2ceedb099374d9bf7586f0d7a Mon Sep 17 00:00:00 2001 From: jbeich Date: Sun, 23 Sep 2018 21:15:05 +0000 Subject: print/harfbuzz: unbreak on GCC archs after r477696 /usr/local/lib/libgraphite2.so: undefined reference to `__cxa_throw_bad_array_new_length@CXXABI_1.3.8' PR: 231544 Submitted by: Piotr Kubaj --- print/harfbuzz/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile index b9ca938ad472..0098a1edc8bc 100644 --- a/print/harfbuzz/Makefile +++ b/print/harfbuzz/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 USE_LDCONFIG= yes -USES= gettext-runtime gmake gnome libtool \ +USES= compiler:c++11-lib gettext-runtime gmake gnome libtool \ pathfix pkgconfig tar:bzip2 USE_GNOME= cairo glib20 introspection:build GNU_CONFIGURE= yes @@ -31,7 +31,6 @@ CONFIGURE_ARGS+= --without-icu .else CONFIGURE_ARGS+= --with-icu \ --disable-gtk-doc-html -USES+= compiler:c++11-lib LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz \ libicudata.so:devel/icu -- cgit From d7e3cdbc4d9131455bfa25e5108be1296f82333d Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 23 Sep 2018 21:43:25 +0000 Subject: New port: misc/pyobd: OBD-II compliant car diagnostic tool --- misc/Makefile | 1 + misc/pyobd/Makefile | 45 ++++++++++++++++++++++++++++++++++ misc/pyobd/distinfo | 3 +++ misc/pyobd/files/patch-pyobd | 47 ++++++++++++++++++++++++++++++++++++ misc/pyobd/files/patch-pyobd.desktop | 16 ++++++++++++ misc/pyobd/pkg-descr | 12 +++++++++ misc/pyobd/pkg-message | 15 ++++++++++++ misc/pyobd/pkg-plist | 12 +++++++++ 8 files changed, 151 insertions(+) create mode 100644 misc/pyobd/Makefile create mode 100644 misc/pyobd/distinfo create mode 100644 misc/pyobd/files/patch-pyobd create mode 100644 misc/pyobd/files/patch-pyobd.desktop create mode 100644 misc/pyobd/pkg-descr create mode 100644 misc/pyobd/pkg-message create mode 100644 misc/pyobd/pkg-plist diff --git a/misc/Makefile b/misc/Makefile index aa4e04a6a347..9e2f9e50c864 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -445,6 +445,7 @@ SUBDIR += py-tqdm SUBDIR += py-yolk SUBDIR += pylize + SUBDIR += pyobd SUBDIR += qbrew SUBDIR += qlas SUBDIR += qmetro diff --git a/misc/pyobd/Makefile b/misc/pyobd/Makefile new file mode 100644 index 000000000000..87b2999ff326 --- /dev/null +++ b/misc/pyobd/Makefile @@ -0,0 +1,45 @@ +# $FreeBSD$ + +PORTNAME= pyobd +DISTVERSION= 0.9.3 +CATEGORIES= misc +MASTER_SITES= http://www.obdtester.com/download/ +DISTNAME= pyobd_${PORTVERSION} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= OBD-II compliant car diagnostic tool + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} + +USES= dos2unix gnome python:2.7 shebangfix +DOS2UNIX_FILES= ${PORTNAME}.desktop +SHEBANG_FILES= ${PORTNAME} +USE_WX= 3.0 +WX_COMPS= python + +INSTALLS_ICONS= yes + +NO_ARCH= yes + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +do-build: + @convert ${WRKSRC}/${PORTNAME}.gif ${WRKSRC}/${PORTNAME}.png + +do-install: + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${WRKSRC}/*.py ${WRKSRC}/*.pyc \ + ${STAGEDIR}${DATADIR} + @${CHMOD} +x ${STAGEDIR}${DATADIR}/${PORTNAME} + @${LN} -sf ../share/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +.include diff --git a/misc/pyobd/distinfo b/misc/pyobd/distinfo new file mode 100644 index 000000000000..537284ea2fd5 --- /dev/null +++ b/misc/pyobd/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1468366650 +SHA256 (pyobd_0.9.3.tar.gz) = f3004db4000e2bc166aae3b4342c98aa62f74f3372c5829472af0ee56c5e110c +SIZE (pyobd_0.9.3.tar.gz) = 768154 diff --git a/misc/pyobd/files/patch-pyobd b/misc/pyobd/files/patch-pyobd new file mode 100644 index 000000000000..a65d6c4f978c --- /dev/null +++ b/misc/pyobd/files/patch-pyobd @@ -0,0 +1,47 @@ +--- pyobd.orig 2015-04-21 10:02:41 UTC ++++ pyobd +@@ -356,7 +356,7 @@ class MyApp(wx.App): + else: + self.configfilepath=os.environ['HOME']+'/.pyobdrc' + if self.config.read(self.configfilepath)==[]: +- self.COMPORT="/dev/ttyACM0" ++ self.COMPORT="/dev/ttyU0" + self.RECONNATTEMPTS=5 + self.SERTIMEOUT=2 + else: +@@ -592,34 +592,7 @@ the Free Software Foundation, Inc., 59 T + def scanSerial(self): + """scan for available ports. return a list of serial names""" + available = [] +- for i in range(256): +- try: #scan standart ttyS* +- s = serial.Serial(i) +- available.append(s.portstr) +- s.close() # explicit close 'cause of delayed GC in java +- except serial.SerialException: +- pass +- for i in range(256): +- try: #scan USB ttyACM +- s = serial.Serial("/dev/ttyACM"+str(i)) +- available.append(s.portstr) +- s.close() # explicit close 'cause of delayed GC in java +- except serial.SerialException: +- pass +- for i in range(256): +- try: +- s = serial.Serial("/dev/ttyUSB"+str(i)) +- available.append(s.portstr) +- s.close() # explicit close 'cause of delayed GC in java +- except serial.SerialException: +- pass +- for i in range(256): +- try: +- s = serial.Serial("/dev/ttyd"+str(i)) +- available.append(s.portstr) +- s.close() # explicit close 'cause of delayed GC in java +- except serial.SerialException: +- pass ++ available.append("/dev/ttyU0") + + # ELM-USB shows up as /dev/tty.usbmodemXXXX, where XXXX is a changing hex string + # on connection; so we have to search through all 64K options diff --git a/misc/pyobd/files/patch-pyobd.desktop b/misc/pyobd/files/patch-pyobd.desktop new file mode 100644 index 000000000000..d70f1d2b4b5c --- /dev/null +++ b/misc/pyobd/files/patch-pyobd.desktop @@ -0,0 +1,16 @@ +--- pyobd.desktop.orig 2016-07-21 17:05:31 UTC ++++ pyobd.desktop +@@ -1,9 +1,10 @@ + [Desktop Entry] + Encoding=UTF8 +-Icon=/usr/share/pyobd/pyobd.gif +-Name=pyOBD: OBD2 Diagnostics ++Icon=pyOBD ++Name=pyOBD ++GenericName=OBD2 Diagnostics + Comment=Car On-Board 2 vehicle diagnostics (ELM-32x compatible interface) +-Exec=python /usr/bin/pyobd ++Exec=pyobd + Terminal=false + Type=Application + Categories=Utility; diff --git a/misc/pyobd/pkg-descr b/misc/pyobd/pkg-descr new file mode 100644 index 000000000000..938ed77d70ff --- /dev/null +++ b/misc/pyobd/pkg-descr @@ -0,0 +1,12 @@ +pyOBD (aka pyOBD-II or pyOBD2) is an OBD-II compliant car diagnostic tool. +It is designed to interface with low-cost ELM 32x OBD-II diagnostic interfaces +such as ELM-USB. It will basically allow you to talk to your car's ECU, ... +display fault codes, display measured values, read status tests, etc. All cars +made since 1996 (in the US) or 2001 (in the EU) must be OBD-II compliant, i.e. +they should work with pyOBD. + +pyOBD is written entirely in Python and was originally written by Donour +Sizemore, now maintained and improved by SECONS Ltd. and it is Free Software +and is distributed under the terms of the GPL. + +WWW: http://www.obdtester.com/pyobd diff --git a/misc/pyobd/pkg-message b/misc/pyobd/pkg-message new file mode 100644 index 000000000000..f2cd139a0f8d --- /dev/null +++ b/misc/pyobd/pkg-message @@ -0,0 +1,15 @@ +====================================================================== +You installed pyOBD: OBD-II compliant car diagnostic tool. + +pyOBD expects the device /dev/ttyU0 that should be created when you +connect the OBD-II cable. + +You need these lines in /etc/devfs.rules to make the device readable +and writable by you. If your user is in the group users: + +[localrules=5] +add path 'ttyU*' mode 0660 group users + +You also need this line in /etc/rc.conf to allow localrules to take effect: +devfs_system_ruleset="localrules" +====================================================================== diff --git a/misc/pyobd/pkg-plist b/misc/pyobd/pkg-plist new file mode 100644 index 000000000000..bdc1d1ef8586 --- /dev/null +++ b/misc/pyobd/pkg-plist @@ -0,0 +1,12 @@ +bin/pyobd +share/applications/pyobd.desktop +share/icons/hicolor/32x32/apps/pyobd.png +%%DATADIR%%/debugEvent.py +%%DATADIR%%/debugEvent.pyc +%%DATADIR%%/obd2_codes.py +%%DATADIR%%/obd2_codes.pyc +%%DATADIR%%/obd_io.py +%%DATADIR%%/obd_io.pyc +%%DATADIR%%/obd_sensors.py +%%DATADIR%%/obd_sensors.pyc +%%DATADIR%%/pyobd -- cgit From af801ca0fcf10281a88c092be01863e2556bacfa Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 23 Sep 2018 22:06:04 +0000 Subject: Do not include bsd.port.mk twice --- devel/icmake/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile index 3fb02f6a0408..928e8faa7623 100644 --- a/devel/icmake/Makefile +++ b/devel/icmake/Makefile @@ -103,4 +103,4 @@ do-build: do-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install strip all ${STAGEDIR} -.include +.include -- cgit From ef3a2ce1c605fe8018aacb0f10962db005b9e4b9 Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 23 Sep 2018 22:09:35 +0000 Subject: Remove duplicate from plist --- devel/flang-clang/pkg-plist | 1 - 1 file changed, 1 deletion(-) diff --git a/devel/flang-clang/pkg-plist b/devel/flang-clang/pkg-plist index 13f6dfdcd45d..1e81c12838cb 100644 --- a/devel/flang-clang/pkg-plist +++ b/devel/flang-clang/pkg-plist @@ -702,4 +702,3 @@ flang/share/scan-view/Reporter.py flang/share/scan-view/ScanView.py flang/share/scan-view/bugcatcher.ico flang/share/scan-view/startfile.py -libdata/ldconfig/flang-clang -- cgit From d9b7156e98828f3644ad57cd4382b41edeec29e8 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 23 Sep 2018 22:14:25 +0000 Subject: dns/amass: Update 2.6.0.11 -> 2.7.0 Reported by: portscout --- dns/amass/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dns/amass/Makefile b/dns/amass/Makefile index d9d4a0430b0b..0dbc3030d583 100644 --- a/dns/amass/Makefile +++ b/dns/amass/Makefile @@ -2,8 +2,7 @@ PORTNAME= amass DISTVERSIONPREFIX= v -DISTVERSION= 2.6.0-11 -DISTVERSIONSUFFIX= -g1ef5a43 +DISTVERSION= 2.7.0 CATEGORIES= dns MAINTAINER= yuri@FreeBSD.org -- cgit From d8533ba00c3ba5cafa9a7ef3bd9897ddf31ba2b1 Mon Sep 17 00:00:00 2001 From: antoine Date: Sun, 23 Sep 2018 22:19:32 +0000 Subject: Revert r480303, it doesn't build Reported by: pkg-fallout --- www/kurly/Makefile | 22 ++++++++++++---------- www/kurly/distinfo | 10 +++++----- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/www/kurly/Makefile b/www/kurly/Makefile index c5287be2dde4..9fccbd87c940 100644 --- a/www/kurly/Makefile +++ b/www/kurly/Makefile @@ -2,31 +2,33 @@ PORTNAME= kurly DISTVERSIONPREFIX= v -DISTVERSION= 1.2.2 +DISTVERSION= 1.2.1 CATEGORIES= www MAINTAINER= seanc@FreeBSD.org COMMENT= Alternative implementation of curl written in Golang LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC_kurly}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go:lang/go -USE_GITLAB= nodefault -GL_TUPLE= davidjpeacock:kurly:369c1998dfbfca7043f8c995c8ef8714496530ea:kurly/src/gitlab.com/davidjpeacock/kurly -USE_GITHUB= nodefault -GH_TUPLE= aki237:nscjar:e2df936:nscjar/src/github.com/aki237/nscjar \ +USE_GITHUB= yes +GH_ACCOUNT= davidjpeacock +GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} + +GH_TUPLE= davidjpeacock:kurly:${DISTVERSIONPREFIX}${DISTVERSION}:DEFAULT/src/github.com/davidjpeacock/kurly \ + aki237:nscjar:e2df936:nscjar/src/github.com/aki237/nscjar \ alsm:ioprogress:063c372:ioprogress/src/github.com/alsm/ioprogress \ - urfave:cli:8e01ec4:ucli/src/github.com/urfave/cli + davidjpeacock:cli:8ba6f23:cli/src/github.com/davidjpeacock/cli PLIST_FILES= bin/kurly do-build: - @cd ${WRKSRC_kurly} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ - @${LOCALBASE}/bin/go build -o ${PORTNAME} + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ + ${LOCALBASE}/bin/go build -o ${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC_kurly}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/www/kurly/distinfo b/www/kurly/distinfo index c2cf474353a9..ef7ba61f2a7b 100644 --- a/www/kurly/distinfo +++ b/www/kurly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1537556397 +TIMESTAMP = 1525651131 +SHA256 (davidjpeacock-kurly-v1.2.1_GH0.tar.gz) = c6e26782e06d99eb3c36f8f4461ce57cba2c451db23f408ad1745e58620a761d +SIZE (davidjpeacock-kurly-v1.2.1_GH0.tar.gz) = 20600 SHA256 (aki237-nscjar-e2df936_GH0.tar.gz) = 3933d7369d8cbaf040e4ec025295776b354821e6427c5a30b145186a72e9d929 SIZE (aki237-nscjar-e2df936_GH0.tar.gz) = 3632 SHA256 (alsm-ioprogress-063c372_GH0.tar.gz) = 6aab899894d5aa787bc5631423a1e3e3aa7de47f5968eadeaec3eb526123a340 SIZE (alsm-ioprogress-063c372_GH0.tar.gz) = 4225 -SHA256 (urfave-cli-8e01ec4_GH0.tar.gz) = d8654573173cef6b639f00884c146bdb7f9130817e0b2d3f44d86d701428a63d -SIZE (urfave-cli-8e01ec4_GH0.tar.gz) = 64657 -SHA256 (kurly-kurly-369c1998dfbfca7043f8c995c8ef8714496530ea_GL0.tar.gz) = 6c7adc297812147145a0b5da8ae790c17ed7370df7180cc795e4543f6475b696 -SIZE (kurly-kurly-369c1998dfbfca7043f8c995c8ef8714496530ea_GL0.tar.gz) = 20686 +SHA256 (davidjpeacock-cli-8ba6f23_GH0.tar.gz) = 7ce68d035a3304dcb5650b6b9566e6ba75a50e8eef2c719eb626341dba236dde +SIZE (davidjpeacock-cli-8ba6f23_GH0.tar.gz) = 56146 -- cgit From 1792270ba9fe256b0490ac7be28a3f6531449850 Mon Sep 17 00:00:00 2001 From: yuri Date: Sun, 23 Sep 2018 22:22:41 +0000 Subject: dns/amass: Correction: the revious commit didn't really update the version --- dns/amass/Makefile | 5 +++-- dns/amass/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dns/amass/Makefile b/dns/amass/Makefile index 0dbc3030d583..16f41fda2cd3 100644 --- a/dns/amass/Makefile +++ b/dns/amass/Makefile @@ -3,6 +3,7 @@ PORTNAME= amass DISTVERSIONPREFIX= v DISTVERSION= 2.7.0 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= yuri@FreeBSD.org @@ -16,7 +17,7 @@ BUILD_DEPENDS= go:lang/go USE_GITHUB= nodefault # main code is in GH_TUPLE, otherwise build fails with circular dependency errors GH_ACCOUNT= OWASP GH_PROJECT= Amass -GH_TUPLE= OWASP:Amass:2.6.0-11-g1ef5a43:main/src/github.com/OWASP/Amass \ +GH_TUPLE= OWASP:Amass:2.7.0:main/src/github.com/OWASP/Amass \ andybalholm:cascadia:v1.0.0:cascadia/src/github.com/andybalholm/cascadia \ asaskevich:EventBus:d46933a:EventBus/src/github.com/asaskevich/EventBus \ fatih:color:v1.7.0:color/src/github.com/fatih/color \ @@ -36,7 +37,7 @@ GH_TUPLE= OWASP:Amass:2.6.0-11-g1ef5a43:main/src/github.com/OWASP/Amass \ golang:text:4ae1256:text/src/golang.org/x/text \ golang:tools:18207bb:tools/src/golang.org/x/tools -PROGS= ${PORTNAME} ${PORTNAME}.db ${PORTNAME}.maltego ${PORTNAME}.netnames ${PORTNAME}.viz +PROGS= ${PORTNAME} ${PORTNAME}.db ${PORTNAME}.maltego ${PORTNAME}.netdomains ${PORTNAME}.viz PLIST_FILES= ${PROGS:C/^/bin\//} diff --git a/dns/amass/distinfo b/dns/amass/distinfo index 35f75e881bf8..afdd1b407e2c 100644 --- a/dns/amass/distinfo +++ b/dns/amass/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1536698726 -SHA256 (OWASP-Amass-2.6.0-11-g1ef5a43_GH0.tar.gz) = 95783a9c8bf5d0f1ce0faec338b3a779d09ab5adb12fa65d4ad61aa8caf35b36 -SIZE (OWASP-Amass-2.6.0-11-g1ef5a43_GH0.tar.gz) = 5166598 +TIMESTAMP = 1537740949 +SHA256 (OWASP-Amass-2.7.0_GH0.tar.gz) = 676c3d5dc643e10a341bfb25650917352ca5712250dd4c27a6d82daa6d4aeb95 +SIZE (OWASP-Amass-2.7.0_GH0.tar.gz) = 6518610 SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52 SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232 SHA256 (asaskevich-EventBus-d46933a_GH0.tar.gz) = f1c2764fb95aa403c1de1445098c1a417985866983be8066316a9ae97a5bb5b7 -- cgit From e6bad0f756d55615b4359dd132f4887231ae69fc Mon Sep 17 00:00:00 2001 From: wen Date: Mon, 24 Sep 2018 00:36:07 +0000 Subject: - Update to 0.74 Changes: https://metacpan.org/changes/release/ETHER/MooseX-Getopt-0.74 --- devel/p5-MooseX-Getopt/Makefile | 2 +- devel/p5-MooseX-Getopt/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/p5-MooseX-Getopt/Makefile b/devel/p5-MooseX-Getopt/Makefile index b14e87b0dd6e..dbd987a93b4d 100644 --- a/devel/p5-MooseX-Getopt/Makefile +++ b/devel/p5-MooseX-Getopt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Getopt -PORTVERSION= 0.73 +PORTVERSION= 0.74 CATEGORIES= devel perl5 MASTER_SITES= CPAN/MooseX CPAN MASTER_SITE_SUBDIR= CPAN:ETHER diff --git a/devel/p5-MooseX-Getopt/distinfo b/devel/p5-MooseX-Getopt/distinfo index fa2d321724ca..0089b514827e 100644 --- a/devel/p5-MooseX-Getopt/distinfo +++ b/devel/p5-MooseX-Getopt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535803670 -SHA256 (MooseX-Getopt-0.73.tar.gz) = dfbbc2b6f98fa197b784196e8b2a396b26d123f0810f8bab07178ce4f242f5a7 -SIZE (MooseX-Getopt-0.73.tar.gz) = 57821 +TIMESTAMP = 1537748707 +SHA256 (MooseX-Getopt-0.74.tar.gz) = 1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24 +SIZE (MooseX-Getopt-0.74.tar.gz) = 58129 -- cgit From 9885b492d18719e49373453dc65bc2b6f19883d6 Mon Sep 17 00:00:00 2001 From: lifanov Date: Mon, 24 Sep 2018 03:18:46 +0000 Subject: update games/wtf to 20180919 snapshot from NetBSD --- games/wtf/Makefile | 2 +- games/wtf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games/wtf/Makefile b/games/wtf/Makefile index 3f8f7e357cd7..fe721b6156e9 100644 --- a/games/wtf/Makefile +++ b/games/wtf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wtf -PORTVERSION= 20180816 +PORTVERSION= 20180919 CATEGORIES= games MASTER_SITES= SF/bsdwtf diff --git a/games/wtf/distinfo b/games/wtf/distinfo index 6ef212d350ef..ff7b0421325e 100644 --- a/games/wtf/distinfo +++ b/games/wtf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534724861 -SHA256 (wtf-20180816.tar.gz) = f3c2aa795a388aee5b9cbaa8f0c4636c1f49b29eeb463fef1de68194cea13e39 -SIZE (wtf-20180816.tar.gz) = 27024 +TIMESTAMP = 1537757833 +SHA256 (wtf-20180919.tar.gz) = e9787feaff2b31fe67370e0b42c6a36c3895eb730575f82c0f41392422edac58 +SIZE (wtf-20180919.tar.gz) = 27136 -- cgit From 89ce35219c88a4ea2e7628c4bc0cbf748e3b8383 Mon Sep 17 00:00:00 2001 From: lifanov Date: Mon, 24 Sep 2018 03:18:49 +0000 Subject: update sysutils/ansible25 to 2.5.9 Changes: https://github.com/ansible/ansible/blob/v2.5.9/changelogs/CHANGELOG-v2.5.rst --- sysutils/ansible25/Makefile | 2 +- sysutils/ansible25/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/ansible25/Makefile b/sysutils/ansible25/Makefile index 0893da4ecf73..8b8936702e24 100644 --- a/sysutils/ansible25/Makefile +++ b/sysutils/ansible25/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTVERSION= 2.5.8 +PORTVERSION= 2.5.9 PKGNAMESUFFIX= 25 CONFLICTS= ansible-* ansible1-* ansible23-* ansible24-* diff --git a/sysutils/ansible25/distinfo b/sysutils/ansible25/distinfo index b17247551c74..0bbf7f452f32 100644 --- a/sysutils/ansible25/distinfo +++ b/sysutils/ansible25/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534725418 -SHA256 (ansible-2.5.8.tar.gz) = fa82b79938d6254960d9d8bcd61755794d53f5c37804f84a98bbfea7e2c152af -SIZE (ansible-2.5.8.tar.gz) = 10169397 +TIMESTAMP = 1537757360 +SHA256 (ansible-2.5.9.tar.gz) = df986910196093fd0688815e988e205606f7cdec3d1da26d42a5caea8170f2e9 +SIZE (ansible-2.5.9.tar.gz) = 10165368 -- cgit From bbb4489b093928c236c93a073203b64c25903c4d Mon Sep 17 00:00:00 2001 From: lifanov Date: Mon, 24 Sep 2018 03:32:56 +0000 Subject: update sysutils/packer to 1.3.1 Changes: https://github.com/hashicorp/packer/blob/v1.3.1/CHANGELOG.md --- sysutils/packer/Makefile | 2 +- sysutils/packer/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile index d7ad6c35091e..06f943b77749 100644 --- a/sysutils/packer/Makefile +++ b/sysutils/packer/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= packer -PORTVERSION= 1.2.5 +PORTVERSION= 1.3.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/packer/distinfo b/sysutils/packer/distinfo index 06328a40920e..79dc4ffecb45 100644 --- a/sysutils/packer/distinfo +++ b/sysutils/packer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532896420 -SHA256 (hashicorp-packer-v1.2.5_GH0.tar.gz) = 86408d212a0e0b9c7a0dc93e4835a900569ad7e7bfc45cd633d7c6560f2f8d2b -SIZE (hashicorp-packer-v1.2.5_GH0.tar.gz) = 7896951 +TIMESTAMP = 1537757560 +SHA256 (hashicorp-packer-v1.3.1_GH0.tar.gz) = 1e577ad25c98bf1b57d738c195cd611ee98b91fd2934f8002dac43cfd26ad5fd +SIZE (hashicorp-packer-v1.3.1_GH0.tar.gz) = 8873760 -- cgit From 49037d44fcfbdecb34bf4d236829b3be03b585ad Mon Sep 17 00:00:00 2001 From: wen Date: Mon, 24 Sep 2018 04:08:06 +0000 Subject: - Update to 6.0 PR: 231644 Submitted by: sikmir@gmail.com(maintainer) --- graphics/gpxsee/Makefile | 5 +++-- graphics/gpxsee/distinfo | 6 +++--- graphics/gpxsee/pkg-plist | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/graphics/gpxsee/Makefile b/graphics/gpxsee/Makefile index b55021618ff6..56f42c48151b 100644 --- a/graphics/gpxsee/Makefile +++ b/graphics/gpxsee/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gpxsee -PORTVERSION= 5.18 +PORTVERSION= 6.0 CATEGORIES= graphics geography MAINTAINER= sikmir@gmail.com @@ -12,7 +12,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/licence.txt USES= qmake:outsource desktop-file-utils qt:5 shared-mime-info -USE_QT= buildtools_build core gui network opengl printsupport widgets +USE_QT= buildtools_build core gui network opengl printsupport \ + sql sql-sqlite3_run widgets USE_GL= gl USE_GITHUB= yes diff --git a/graphics/gpxsee/distinfo b/graphics/gpxsee/distinfo index 259adb73ba8e..02f3c48c7cd9 100644 --- a/graphics/gpxsee/distinfo +++ b/graphics/gpxsee/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537045013 -SHA256 (tumic0-GPXSee-5.18_GH0.tar.gz) = 095f48a941309f6163d032ad7ddb3b267b87732b4a33c1b368befb5881ecedd3 -SIZE (tumic0-GPXSee-5.18_GH0.tar.gz) = 3846195 +TIMESTAMP = 1537749726 +SHA256 (tumic0-GPXSee-6.0_GH0.tar.gz) = 250e316fc40e542397720990b943c43cf1725a7b2d665ccf911c9e62d4a8f249 +SIZE (tumic0-GPXSee-6.0_GH0.tar.gz) = 3857021 diff --git a/graphics/gpxsee/pkg-plist b/graphics/gpxsee/pkg-plist index a0218cdb0c2c..8b46515c0ca2 100644 --- a/graphics/gpxsee/pkg-plist +++ b/graphics/gpxsee/pkg-plist @@ -10,6 +10,7 @@ share/applications/gpxsee.desktop %%DATADIR%%/maps/USGS-topo.xml %%NLS%%%%DATADIR%%/translations/gpxsee_cs.qm %%NLS%%%%DATADIR%%/translations/gpxsee_de.qm +%%NLS%%%%DATADIR%%/translations/gpxsee_en.qm %%NLS%%%%DATADIR%%/translations/gpxsee_fi.qm %%NLS%%%%DATADIR%%/translations/gpxsee_fr.qm %%NLS%%%%DATADIR%%/translations/gpxsee_pl.qm -- cgit From a122e589be61897c7392f562fced78694ad6da48 Mon Sep 17 00:00:00 2001 From: lifanov Date: Mon, 24 Sep 2018 04:21:08 +0000 Subject: update games/stonesoup to 0.22.1 Changes: https://crawl.develz.org/wordpress/0-22-1-and-0-21-2-bug-fix-releases --- games/stonesoup/Makefile | 3 ++- games/stonesoup/distinfo | 6 +++--- games/stonesoup/files/patch-initfile.cc | 20 ++++++++++++++++++++ games/stonesoup/files/patch-wiz-you.cc | 15 --------------- 4 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 games/stonesoup/files/patch-initfile.cc delete mode 100644 games/stonesoup/files/patch-wiz-you.cc diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index f8481efbba8f..b4e10a818a74 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stonesoup -PORTVERSION= 0.22.0 +PORTVERSION= 0.22.1 CATEGORIES= games MAINTAINER= lifanov@FreeBSD.org @@ -55,6 +55,7 @@ LUA_DESC= Bindings for LUA user scripts SDL_CONFLICTS= ${PORTNAME}-[0-9]* SDL_USE= sdl=sdl2,image2,mixer2 gl=gl,glu +SDL_USES= gl SDL_USES_OFF= ncurses SDL_MAKE_ARGS= TILES=y SOUND=y SDL_BUILD_DEPENDS= \ diff --git a/games/stonesoup/distinfo b/games/stonesoup/distinfo index 98d99a53ba7d..3acda66d5f2e 100644 --- a/games/stonesoup/distinfo +++ b/games/stonesoup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534118359 -SHA256 (crawl-crawl-0.22.0_GH0.tar.gz) = cdffb393955e67f2aded9194f6dcd6875ed2e2dce2a5cac1ad950d699456f242 -SIZE (crawl-crawl-0.22.0_GH0.tar.gz) = 12337662 +TIMESTAMP = 1537762805 +SHA256 (crawl-crawl-0.22.1_GH0.tar.gz) = 15217cd5cb0ae4c8fbae7343712c17d57cc770bde21fd6daa0e968780e477bab +SIZE (crawl-crawl-0.22.1_GH0.tar.gz) = 12355516 diff --git a/games/stonesoup/files/patch-initfile.cc b/games/stonesoup/files/patch-initfile.cc new file mode 100644 index 000000000000..66f12961e168 --- /dev/null +++ b/games/stonesoup/files/patch-initfile.cc @@ -0,0 +1,20 @@ +--- initfile.cc.orig 2018-09-24 03:59:12 UTC ++++ initfile.cc +@@ -4225,7 +4225,7 @@ static void _bones_rewrite(const string + if (dups) + cout << ", " << dups << " duplicates removed"; + cout << "\n"; +- unlink(filename.c_str()); ++ unlink_u(filename.c_str()); + _write_bones(filename, out); + } + else +@@ -4241,7 +4241,7 @@ static void _bones_merge(const vector Date: Mon, 24 Sep 2018 06:28:21 +0000 Subject: archivers/R-cran-zip: Cross-Platform 'zip' Compression Generated by: portcran (0.1.8) --- archivers/Makefile | 1 + archivers/R-cran-zip/Makefile | 17 +++++++++++++++++ archivers/R-cran-zip/distinfo | 3 +++ archivers/R-cran-zip/pkg-descr | 4 ++++ 4 files changed, 25 insertions(+) create mode 100644 archivers/R-cran-zip/Makefile create mode 100644 archivers/R-cran-zip/distinfo create mode 100644 archivers/R-cran-zip/pkg-descr diff --git a/archivers/Makefile b/archivers/Makefile index 249508184876..01ad9cf13c7f 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -4,6 +4,7 @@ COMMENT = Archivers SUBDIR += 9e + SUBDIR += R-cran-zip SUBDIR += advancecomp SUBDIR += amigadepacker SUBDIR += arc diff --git a/archivers/R-cran-zip/Makefile b/archivers/R-cran-zip/Makefile new file mode 100644 index 000000000000..6e5b95569a49 --- /dev/null +++ b/archivers/R-cran-zip/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= zip +DISTVERSION= 1.0.0 +CATEGORIES= archivers +DISTNAME= ${PORTNAME}_${DISTVERSION} + +MAINTAINER= dbn@FreeBSD.org +COMMENT= Cross-Platform 'zip' Compression + +LICENSE= CC0-1.0 + +TEST_DEPENDS= R-cran-withr>0:devel/R-cran-withr + +USES= cran:auto-plist,compiles + +.include diff --git a/archivers/R-cran-zip/distinfo b/archivers/R-cran-zip/distinfo new file mode 100644 index 000000000000..613a31e99759 --- /dev/null +++ b/archivers/R-cran-zip/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537727310 +SHA256 (zip_1.0.0.tar.gz) = 6fa9ec7b093b8c717c50f205d4335c31c43c2ecb51c0242c9a0337d8d84df965 +SIZE (zip_1.0.0.tar.gz) = 60823 diff --git a/archivers/R-cran-zip/pkg-descr b/archivers/R-cran-zip/pkg-descr new file mode 100644 index 000000000000..5c78a1c12102 --- /dev/null +++ b/archivers/R-cran-zip/pkg-descr @@ -0,0 +1,4 @@ +Cross-Platform 'zip' Compression Library. A replacement for the 'zip' function, +that does not require any additional external tools on any platform. + +WWW: https://github.com/gaborcsardi/zip -- cgit From 2ec30cfec33f4cf34d09da7371aa4f34edb36a5f Mon Sep 17 00:00:00 2001 From: dbn Date: Mon, 24 Sep 2018 06:59:56 +0000 Subject: textproc/R-cran-openxlsx: Read, Write and Edit XLSX Files Generated by: portcran (0.1.8) --- textproc/Makefile | 1 + textproc/R-cran-openxlsx/Makefile | 21 +++++++++++++++++++++ textproc/R-cran-openxlsx/distinfo | 3 +++ textproc/R-cran-openxlsx/pkg-descr | 6 ++++++ 4 files changed, 31 insertions(+) create mode 100644 textproc/R-cran-openxlsx/Makefile create mode 100644 textproc/R-cran-openxlsx/distinfo create mode 100644 textproc/R-cran-openxlsx/pkg-descr diff --git a/textproc/Makefile b/textproc/Makefile index fa2928abf4c9..75a285226819 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -14,6 +14,7 @@ SUBDIR += R-cran-highr SUBDIR += R-cran-htmltools SUBDIR += R-cran-markdown + SUBDIR += R-cran-openxlsx SUBDIR += R-cran-pystr SUBDIR += R-cran-readr SUBDIR += R-cran-rmarkdown diff --git a/textproc/R-cran-openxlsx/Makefile b/textproc/R-cran-openxlsx/Makefile new file mode 100644 index 000000000000..7367a67a6fb1 --- /dev/null +++ b/textproc/R-cran-openxlsx/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= openxlsx +DISTVERSION= 4.1.0 +CATEGORIES= textproc +DISTNAME= ${PORTNAME}_${DISTVERSION} + +MAINTAINER= dbn@FreeBSD.org +COMMENT= Read, Write and Edit XLSX Files + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= R-cran-knitr>0:print/R-cran-knitr +RUN_DEPENDS= R-cran-zip>0:archivers/R-cran-zip \ + R-cran-Rcpp>0:devel/R-cran-Rcpp +TEST_DEPENDS= R-cran-knitr>0:print/R-cran-knitr + +USES= cran:auto-plist,compiles + +.include diff --git a/textproc/R-cran-openxlsx/distinfo b/textproc/R-cran-openxlsx/distinfo new file mode 100644 index 000000000000..9e5b67f82b20 --- /dev/null +++ b/textproc/R-cran-openxlsx/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537771429 +SHA256 (openxlsx_4.1.0.tar.gz) = ab7b127353061a0e1cd621783366ffdd7c858c6df31cbbdd39aaa353af10ffd8 +SIZE (openxlsx_4.1.0.tar.gz) = 1474393 diff --git a/textproc/R-cran-openxlsx/pkg-descr b/textproc/R-cran-openxlsx/pkg-descr new file mode 100644 index 000000000000..984d81936ebc --- /dev/null +++ b/textproc/R-cran-openxlsx/pkg-descr @@ -0,0 +1,6 @@ +Simplifies the creation of Excel .xlsx files by providing a high level +interface to writing, styling and editing worksheets. Through the use of +'Rcpp', read/write times are comparable to the 'xlsx' and 'XLConnect' packages +with the added benefit of removing the dependency on Java. + +WWW: https://github.com/awalker89/openxlsx -- cgit From 48a6f0e3c3f37e7256560b2be073f3af74eaa8fe Mon Sep 17 00:00:00 2001 From: dbn Date: Mon, 24 Sep 2018 07:04:15 +0000 Subject: textproc/R-cran-rematch: Match Regular Expressions with a Nicer 'API' Generated by: portcran (0.1.8) --- textproc/Makefile | 1 + textproc/R-cran-rematch/Makefile | 16 ++++++++++++++++ textproc/R-cran-rematch/distinfo | 3 +++ textproc/R-cran-rematch/pkg-descr | 4 ++++ 4 files changed, 24 insertions(+) create mode 100644 textproc/R-cran-rematch/Makefile create mode 100644 textproc/R-cran-rematch/distinfo create mode 100644 textproc/R-cran-rematch/pkg-descr diff --git a/textproc/Makefile b/textproc/Makefile index 75a285226819..36bc2e3c9ef9 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -17,6 +17,7 @@ SUBDIR += R-cran-openxlsx SUBDIR += R-cran-pystr SUBDIR += R-cran-readr + SUBDIR += R-cran-rematch SUBDIR += R-cran-rmarkdown SUBDIR += R-cran-stringi SUBDIR += R-cran-stringr diff --git a/textproc/R-cran-rematch/Makefile b/textproc/R-cran-rematch/Makefile new file mode 100644 index 000000000000..54ea63fdd367 --- /dev/null +++ b/textproc/R-cran-rematch/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PORTNAME= rematch +DISTVERSION= 1.0.1 +CATEGORIES= textproc +DISTNAME= ${PORTNAME}_${DISTVERSION} + +MAINTAINER= dbn@FreeBSD.org +COMMENT= Match Regular Expressions with a Nicer 'API' + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cran:auto-plist + +.include diff --git a/textproc/R-cran-rematch/distinfo b/textproc/R-cran-rematch/distinfo new file mode 100644 index 000000000000..a23f9f4703e3 --- /dev/null +++ b/textproc/R-cran-rematch/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537772530 +SHA256 (rematch_1.0.1.tar.gz) = a409dec978cd02914cdddfedc974d9b45bd2975a124d8870d52cfd7d37d47578 +SIZE (rematch_1.0.1.tar.gz) = 3719 diff --git a/textproc/R-cran-rematch/pkg-descr b/textproc/R-cran-rematch/pkg-descr new file mode 100644 index 000000000000..e4582cb8f13d --- /dev/null +++ b/textproc/R-cran-rematch/pkg-descr @@ -0,0 +1,4 @@ +A small wrapper on 'regexpr' to extract the matches and captured groups from +the match of a regular expression to a character vector. + +WWW: https://github.com/MangoTheCat/rematch -- cgit From 99d7cad463114ab6a18f969e1fc2178222dce2cc Mon Sep 17 00:00:00 2001 From: dbn Date: Mon, 24 Sep 2018 07:12:05 +0000 Subject: math/R-cran-forcats: Tools for Working with Categorical Variables (Factors) Generated by: portcran (0.1.8) --- math/Makefile | 1 + math/R-cran-forcats/Makefile | 20 ++++++++++++++++++++ math/R-cran-forcats/distinfo | 3 +++ math/R-cran-forcats/pkg-descr | 6 ++++++ 4 files changed, 30 insertions(+) create mode 100644 math/R-cran-forcats/Makefile create mode 100644 math/R-cran-forcats/distinfo create mode 100644 math/R-cran-forcats/pkg-descr diff --git a/math/Makefile b/math/Makefile index f3e60b9e72bd..df48d78003e2 100644 --- a/math/Makefile +++ b/math/Makefile @@ -46,6 +46,7 @@ SUBDIR += R-cran-dlmodeler SUBDIR += R-cran-dplyr SUBDIR += R-cran-expm + SUBDIR += R-cran-forcats SUBDIR += R-cran-forecast SUBDIR += R-cran-fracdiff SUBDIR += R-cran-geepack diff --git a/math/R-cran-forcats/Makefile b/math/R-cran-forcats/Makefile new file mode 100644 index 000000000000..7ec8ae8be215 --- /dev/null +++ b/math/R-cran-forcats/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= forcats +DISTVERSION= 0.3.0 +CATEGORIES= math +DISTNAME= ${PORTNAME}_${DISTVERSION} + +MAINTAINER= dbn@FreeBSD.org +COMMENT= Tools for Working with Categorical Variables (Factors) + +LICENSE= GPLv3 + +RUN_DEPENDS= R-cran-magrittr>0:devel/R-cran-magrittr \ + R-cran-rlang>0:devel/R-cran-rlang \ + R-cran-tibble>0:devel/R-cran-tibble +TEST_DEPENDS= R-cran-ggplot2>0:graphics/R-cran-ggplot2 + +USES= cran:auto-plist + +.include diff --git a/math/R-cran-forcats/distinfo b/math/R-cran-forcats/distinfo new file mode 100644 index 000000000000..a2b0e3c8bb9b --- /dev/null +++ b/math/R-cran-forcats/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537772928 +SHA256 (forcats_0.3.0.tar.gz) = 95814610ec18b8a8830eba63751954387f9d21400d6ab40394ed0ff22c0cb657 +SIZE (forcats_0.3.0.tar.gz) = 127229 diff --git a/math/R-cran-forcats/pkg-descr b/math/R-cran-forcats/pkg-descr new file mode 100644 index 000000000000..6100ef8d2e4f --- /dev/null +++ b/math/R-cran-forcats/pkg-descr @@ -0,0 +1,6 @@ +Helpers for reordering factor levels (including moving specified levels to +front, ordering by first appearance, reversing, and randomly shuffling), and +tools for modifying factor levels (including collapsing rare levels into other, +'anonymising', and manually 'recoding'). + +WWW: http://forcats.tidyverse.org -- cgit From 76527bec7f8a49cb4e3d84f822040a45859e1c40 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 08:09:56 +0000 Subject: Add p5-Spreadsheet-GenerateXLSX 0.04 Spreadsheet::GenerateXLSX provides a function generate_xlsx which takes an array of Perl data and generates a simple Excel spreadsheet in the XLSX format. The generated sheets have the first row frozen, and auto filters enabled for every column. Each sheet in the spreadsheet is generated from an array of rows, where each row is an arrayref. The first row is treated as a header row. The generated spreadsheet can have any numbers of sheets. If you just pass arrayrefs, the sheets will be named Sheet1, Sheet2, etc. WWW: https://metacpan.org/release/Spreadsheet-GenerateXLSX --- textproc/Makefile | 1 + textproc/p5-Spreadsheet-GenerateXLSX/Makefile | 27 ++++++++++++++++++++++++++ textproc/p5-Spreadsheet-GenerateXLSX/distinfo | 3 +++ textproc/p5-Spreadsheet-GenerateXLSX/pkg-descr | 12 ++++++++++++ textproc/p5-Spreadsheet-GenerateXLSX/pkg-plist | 2 ++ 5 files changed, 45 insertions(+) create mode 100644 textproc/p5-Spreadsheet-GenerateXLSX/Makefile create mode 100644 textproc/p5-Spreadsheet-GenerateXLSX/distinfo create mode 100644 textproc/p5-Spreadsheet-GenerateXLSX/pkg-descr create mode 100644 textproc/p5-Spreadsheet-GenerateXLSX/pkg-plist diff --git a/textproc/Makefile b/textproc/Makefile index 36bc2e3c9ef9..8be938411675 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -796,6 +796,7 @@ SUBDIR += p5-Sphinx-Config SUBDIR += p5-Sphinx-Manager SUBDIR += p5-Sphinx-Search + SUBDIR += p5-Spreadsheet-GenerateXLSX SUBDIR += p5-Spreadsheet-ParseExcel SUBDIR += p5-Spreadsheet-Read SUBDIR += p5-Spreadsheet-ReadSXC diff --git a/textproc/p5-Spreadsheet-GenerateXLSX/Makefile b/textproc/p5-Spreadsheet-GenerateXLSX/Makefile new file mode 100644 index 000000000000..031177f2e5fc --- /dev/null +++ b/textproc/p5-Spreadsheet-GenerateXLSX/Makefile @@ -0,0 +1,27 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= Spreadsheet-GenerateXLSX +PORTVERSION= 0.04 +CATEGORIES= textproc perl5 +MASTER_SITES= CPAN +PKGNAMEPREFIX= p5- + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Generate XLSX spreadsheet from array ref(s) + +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= p5-Excel-Writer-XLSX>=0:textproc/p5-Excel-Writer-XLSX \ + p5-Ref-Util>=0:devel/p5-Ref-Util +TEST_DEPENDS= p5-Test-Needs>=0:devel/p5-Test-Needs + +USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes + +.include diff --git a/textproc/p5-Spreadsheet-GenerateXLSX/distinfo b/textproc/p5-Spreadsheet-GenerateXLSX/distinfo new file mode 100644 index 000000000000..6a7455f9d1c1 --- /dev/null +++ b/textproc/p5-Spreadsheet-GenerateXLSX/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537768197 +SHA256 (Spreadsheet-GenerateXLSX-0.04.tar.gz) = 1a1bb88115b712648291429c636fe7ce56a269007acf2912c9d0d3cbd40278af +SIZE (Spreadsheet-GenerateXLSX-0.04.tar.gz) = 12520 diff --git a/textproc/p5-Spreadsheet-GenerateXLSX/pkg-descr b/textproc/p5-Spreadsheet-GenerateXLSX/pkg-descr new file mode 100644 index 000000000000..c0c11a139491 --- /dev/null +++ b/textproc/p5-Spreadsheet-GenerateXLSX/pkg-descr @@ -0,0 +1,12 @@ +Spreadsheet::GenerateXLSX provides a function generate_xlsx which takes an array +of Perl data and generates a simple Excel spreadsheet in the XLSX format. The +generated sheets have the first row frozen, and auto filters enabled for every +column. + +Each sheet in the spreadsheet is generated from an array of rows, where each row +is an arrayref. The first row is treated as a header row. + +The generated spreadsheet can have any numbers of sheets. If you just pass +arrayrefs, the sheets will be named Sheet1, Sheet2, etc. + +WWW: https://metacpan.org/release/Spreadsheet-GenerateXLSX diff --git a/textproc/p5-Spreadsheet-GenerateXLSX/pkg-plist b/textproc/p5-Spreadsheet-GenerateXLSX/pkg-plist new file mode 100644 index 000000000000..6cda28e39ae2 --- /dev/null +++ b/textproc/p5-Spreadsheet-GenerateXLSX/pkg-plist @@ -0,0 +1,2 @@ +%%SITE_PERL%%/Spreadsheet/GenerateXLSX.pm +%%PERL5_MAN3%%/Spreadsheet::GenerateXLSX.3.gz -- cgit From d8510889d62f82dbe5742a386534a3101879b495 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 08:10:19 +0000 Subject: Add p5-Text-Table-XLSX 0.001 Text::Table::XLSX provides a single function, table, which takes a two-dimensional array of data and generate an XLSX data stream from it. It's basically a very thin wrapper for Spreadsheet::GenerateXLSX. WWW: https://metacpan.org/release/Text-Table-XLSX --- textproc/Makefile | 1 + textproc/p5-Text-Table-XLSX/Makefile | 25 +++++++++++++++++++++++++ textproc/p5-Text-Table-XLSX/distinfo | 3 +++ textproc/p5-Text-Table-XLSX/pkg-descr | 5 +++++ textproc/p5-Text-Table-XLSX/pkg-plist | 2 ++ 5 files changed, 36 insertions(+) create mode 100644 textproc/p5-Text-Table-XLSX/Makefile create mode 100644 textproc/p5-Text-Table-XLSX/distinfo create mode 100644 textproc/p5-Text-Table-XLSX/pkg-descr create mode 100644 textproc/p5-Text-Table-XLSX/pkg-plist diff --git a/textproc/Makefile b/textproc/Makefile index 8be938411675..b01ccd1caa6f 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -958,6 +958,7 @@ SUBDIR += p5-Text-Table-Any SUBDIR += p5-Text-Table-Manifold SUBDIR += p5-Text-Table-Tiny + SUBDIR += p5-Text-Table-XLSX SUBDIR += p5-Text-Tabs+Wrap SUBDIR += p5-Text-TabularDisplay SUBDIR += p5-Text-Tags diff --git a/textproc/p5-Text-Table-XLSX/Makefile b/textproc/p5-Text-Table-XLSX/Makefile new file mode 100644 index 000000000000..fd1a84fc229f --- /dev/null +++ b/textproc/p5-Text-Table-XLSX/Makefile @@ -0,0 +1,25 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= Text-Table-XLSX +PORTVERSION= 0.001 +CATEGORIES= textproc perl5 +MASTER_SITES= CPAN +PKGNAMEPREFIX= p5- + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Generate XLSX worksheet + +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= p5-Spreadsheet-GenerateXLSX>=0:textproc/p5-Spreadsheet-GenerateXLSX + +USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes + +.include diff --git a/textproc/p5-Text-Table-XLSX/distinfo b/textproc/p5-Text-Table-XLSX/distinfo new file mode 100644 index 000000000000..59d53336aaee --- /dev/null +++ b/textproc/p5-Text-Table-XLSX/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1537768691 +SHA256 (Text-Table-XLSX-0.001.tar.gz) = 43af63a3b8366f3a79c020da4d272d974f21e76dd5755097c9e3920ce95a80b1 +SIZE (Text-Table-XLSX-0.001.tar.gz) = 14183 diff --git a/textproc/p5-Text-Table-XLSX/pkg-descr b/textproc/p5-Text-Table-XLSX/pkg-descr new file mode 100644 index 000000000000..2d16268964c1 --- /dev/null +++ b/textproc/p5-Text-Table-XLSX/pkg-descr @@ -0,0 +1,5 @@ +Text::Table::XLSX provides a single function, table, which takes a +two-dimensional array of data and generate an XLSX data stream from it. It's +basically a very thin wrapper for Spreadsheet::GenerateXLSX. + +WWW: https://metacpan.org/release/Text-Table-XLSX diff --git a/textproc/p5-Text-Table-XLSX/pkg-plist b/textproc/p5-Text-Table-XLSX/pkg-plist new file mode 100644 index 000000000000..4f2526d09487 --- /dev/null +++ b/textproc/p5-Text-Table-XLSX/pkg-plist @@ -0,0 +1,2 @@ +%%SITE_PERL%%/Text/Table/XLSX.pm +%%PERL5_MAN3%%/Text::Table::XLSX.3.gz -- cgit From 136f2c3b79016d2db5ccb6b7b25266293daa451e Mon Sep 17 00:00:00 2001 From: romain Date: Mon, 24 Sep 2018 08:29:47 +0000 Subject: Fix build on powerpc64 PR: 231593 Submitted by: pkubaj@anongoth.pl --- devel/leatherman/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile index ab5cf34e9258..fb8b94a5603b 100644 --- a/devel/leatherman/Makefile +++ b/devel/leatherman/Makefile @@ -9,12 +9,10 @@ COMMENT= Leatherman C++ Tool library LICENSE= APACHE20 -BROKEN_powerpc64= fails to compile: cc1plus: error: unrecognized command line option "-std=c++11" - LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libcurl.so:ftp/curl -USES= cmake:outsource gettext +USES= compiler:c++11-lang cmake:outsource gettext USE_GITHUB= yes GH_ACCOUNT= puppetlabs -- cgit From 19af7c909c31674396ed4ec72643ae63dffe6e69 Mon Sep 17 00:00:00 2001 From: gahr Date: Mon, 24 Sep 2018 08:30:36 +0000 Subject: devel/fossil: update to 2.7 Changes: https://fossil-scm.org/index.html/doc/version-2.7/www/changes.wiki --- devel/fossil/Makefile | 4 ++-- devel/fossil/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index c1339fd1f9f4..a85de4344705 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= fossil -PORTVERSION= 2.6 +PORTVERSION= 2.7 DISTVERSIONPREFIX= src- -PORTREVISION= 1 +PORTREVISION= 0 PORTEPOCH= 2 CATEGORIES= devel www MASTER_SITES= http://fossil-scm.org/index.html/uv/ diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo index 7ec6a3cbf178..800dce79dbac 100644 --- a/devel/fossil/distinfo +++ b/devel/fossil/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525683503 -SHA256 (fossil-src-2.6.tar.gz) = 76a794555918be179850739a90f157de0edb8568ad552b4c40ce186c79ff6ed9 -SIZE (fossil-src-2.6.tar.gz) = 5083119 +TIMESTAMP = 1537775822 +SHA256 (fossil-src-2.7.tar.gz) = 2c24359131d7495e47dc95021eb35f1ba408ded9087e36370d94742a4011033c +SIZE (fossil-src-2.7.tar.gz) = 5276161 -- cgit From adf215ced3c437e6c6b5d9847640a0d4e3a87a85 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 24 Sep 2018 08:44:44 +0000 Subject: sysutils/s-tui: Update 0.6.7.4 -> 0.8.2 Reported by: upstream --- sysutils/s-tui/Makefile | 13 ++++++++----- sysutils/s-tui/distinfo | 6 +++--- sysutils/s-tui/pkg-message | 7 +++++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sysutils/s-tui/Makefile b/sysutils/s-tui/Makefile index 79cfda12cdc0..c8f3f61ac650 100644 --- a/sysutils/s-tui/Makefile +++ b/sysutils/s-tui/Makefile @@ -1,19 +1,22 @@ # $FreeBSD$ PORTNAME= s-tui -DISTVERSION= 0.6.7.4 +DISTVERSION= 0.8.2 CATEGORIES= sysutils python -MASTER_SITES= CHEESESHOP MAINTAINER= freebsd_ports@k-worx.org -COMMENT= Stress Terminal UI - stress test and monitoring tool +COMMENT= Stress Terminal UI: stress test and monitoring tool LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.2.0:sysutils/py-psutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.1:devel/py-urwid@${PY_FLAVOR} USES= python +USE_GITHUB= yes +GH_ACCOUNT= amanusk +GH_TAGNAME= 200c8f1 # experimental free_bsd branch USE_PYTHON= distutils noflavors autoplist NO_ARCH= yes diff --git a/sysutils/s-tui/distinfo b/sysutils/s-tui/distinfo index e689f2b94568..e20755f583bb 100644 --- a/sysutils/s-tui/distinfo +++ b/sysutils/s-tui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523639127 -SHA256 (s-tui-0.6.7.4.tar.gz) = e9fdfafa2653237beb0f52a598de504087afd3d1255e22f5c55a59df2272d2f9 -SIZE (s-tui-0.6.7.4.tar.gz) = 25666 +TIMESTAMP = 1537778341 +SHA256 (amanusk-s-tui-0.8.2-200c8f1_GH0.tar.gz) = 9b364b8b42b214ffab46f591940e836a9762dfae08990afffe8ee8a222779539 +SIZE (amanusk-s-tui-0.8.2-200c8f1_GH0.tar.gz) = 2232192 diff --git a/sysutils/s-tui/pkg-message b/sysutils/s-tui/pkg-message index b7dce213f7eb..1d3c386de256 100644 --- a/sysutils/s-tui/pkg-message +++ b/sysutils/s-tui/pkg-message @@ -1,6 +1,9 @@ ====================================================================== -If you want to enable CPU stress testing you'll need to install additionally one -of the following ports: +You installed s-tui, stress test and monitoring tool. +s-tui is experimental on FreeBSD. Please help testing it. + +If you want to enable CPU stress testing you'll need to install +additionally one of the following ports: - benchmarks/stress-ng - sysutils/stress -- cgit From a3409a941377f581a1cbde5da863b88924fe78fd Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Mon, 24 Sep 2018 09:08:28 +0000 Subject: - Add LICENSE - Add NO_ARCH Approved by: portmgr blanket --- math/p5-Set-IntSpan/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/math/p5-Set-IntSpan/Makefile b/math/p5-Set-IntSpan/Makefile index b068fedff075..1c5c99d817fd 100644 --- a/math/p5-Set-IntSpan/Makefile +++ b/math/p5-Set-IntSpan/Makefile @@ -11,7 +11,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= danilo@FreeBSD.org COMMENT= Manages sets of integers +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual + USES= perl5 USE_PERL5= configure +NO_ARCH= yes .include -- cgit From a66ca18f685b7550d353963b0086a729b6887a5c Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 24 Sep 2018 09:29:45 +0000 Subject: Update to v5.29.3-15-ga9dc86432e. --- lang/perl5-devel/Makefile | 2 +- lang/perl5-devel/distinfo | 6 +++--- lang/perl5-devel/pkg-plist | 2 ++ lang/perl5-devel/version.mk | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 1ce02b6e658d..34a8e8a47a9a 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -35,7 +35,7 @@ TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.29.2-62-g5feab405f7 +GH_TAGNAME= v5.29.3-15-ga9dc86432e OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE DOT_INC diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index 4b02779be978..1dc104f757ca 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537178609 -SHA256 (perl/Perl-perl5-v5.29.2-62-g5feab405f7_GH0.tar.gz) = c42434fb2f073136e5100d216d6e942709225964a0b75b38c559df90ed7af9bb -SIZE (perl/Perl-perl5-v5.29.2-62-g5feab405f7_GH0.tar.gz) = 19113795 +TIMESTAMP = 1537779285 +SHA256 (perl/Perl-perl5-v5.29.3-15-ga9dc86432e_GH0.tar.gz) = 65b19b42a2c624b4ca6916655ca6e0fef4ec7b9380c3f91396cc4356305dc3c3 +SIZE (perl/Perl-perl5-v5.29.3-15-ga9dc86432e_GH0.tar.gz) = 19114600 diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist index 22c342dff671..0786c27d2d90 100644 --- a/lang/perl5-devel/pkg-plist +++ b/lang/perl5-devel/pkg-plist @@ -965,6 +965,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5291delta.1.gz %%MAN1%%/perl5292delta.1.gz %%MAN1%%/perl5293delta.1.gz +%%MAN1%%/perl5294delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz @@ -1756,6 +1757,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5291delta.pod %%PRIV_LIB%%/pod/perl5292delta.pod %%PRIV_LIB%%/pod/perl5293delta.pod +%%PRIV_LIB%%/pod/perl5294delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod diff --git a/lang/perl5-devel/version.mk b/lang/perl5-devel/version.mk index 8df3e71b373a..5bc05a68466e 100644 --- a/lang/perl5-devel/version.mk +++ b/lang/perl5-devel/version.mk @@ -1,2 +1,2 @@ -PERL_VERSION= 5.29.3 +PERL_VERSION= 5.29.4 PERL5_DEPEND= perl5>=5.29<5.30 -- cgit From 5f493d1245de5b446be64e10ed27f0addfcadf4a Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 24 Sep 2018 09:31:05 +0000 Subject: Update to latest commit. --- dns/bind9-devel/Makefile | 4 ++-- dns/bind9-devel/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index c89c2dcefb3b..61d08801f43f 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -40,13 +40,13 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 # XXX: remove tar:bz2 USES= cpe libedit ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.1a0.2018.09.11 +ISCVERSION= 9.13.1a0.2018.09.20 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 5cf8fc4bba6f61d493ed20e86037d799e20a43db +GL_COMMIT= eb74f2ee683e1ab344ebab8c4ddce902ec935be6 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index de254d5af668..c6f14cb4a1c4 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537183338 -SHA256 (isc-projects-bind9-5cf8fc4bba6f61d493ed20e86037d799e20a43db_GL0.tar.gz) = f9d6889803fc277d696f794a617456bbdfc97f8bd93b4f483d141bc1885a6c15 -SIZE (isc-projects-bind9-5cf8fc4bba6f61d493ed20e86037d799e20a43db_GL0.tar.gz) = 7263466 +TIMESTAMP = 1537779431 +SHA256 (isc-projects-bind9-eb74f2ee683e1ab344ebab8c4ddce902ec935be6_GL0.tar.gz) = cb029dc0dcb4f7075b44cde66e4d00fd8902f6cef55e6929b32a0939417193c0 +SIZE (isc-projects-bind9-eb74f2ee683e1ab344ebab8c4ddce902ec935be6_GL0.tar.gz) = 7263248 -- cgit From 80dc58086f6eaa0c2fec754da462291ed0b547cb Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 24 Sep 2018 09:31:09 +0000 Subject: Update to 2.0.42. --- sysutils/munin-common/distinfo | 6 +++--- sysutils/munin-common/files/patch-Makefile | 6 +++--- .../munin-common/files/patch-plugins_node.d_bind9__rndc.in | 4 ++-- .../munin-common/files/patch-plugins_node.d_multips__memory.in | 4 ++-- .../munin-common/files/patch-plugins_node.d_squeezebox__.in | 10 +++++----- sysutils/munin-common/munin.mk | 2 +- sysutils/munin-node/Makefile | 1 - 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo index 365c8a995ffb..1eb4b35a3010 100644 --- a/sysutils/munin-common/distinfo +++ b/sysutils/munin-common/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535967877 -SHA256 (munin-2.0.40.tar.gz) = e05c23ddada2a37ece2d6cd02202c88c981f31f64eba39392eb0d99a793dd28d -SIZE (munin-2.0.40.tar.gz) = 2252288 +TIMESTAMP = 1537780253 +SHA256 (munin-2.0.42.tar.gz) = 0f1b72e5339944b53a01867cdd09d6b399bfe470ea3b16017914e00b4d4ed110 +SIZE (munin-2.0.42.tar.gz) = 2252959 diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile index 4fd291b64cf0..af88a5dd9a56 100644 --- a/sysutils/munin-common/files/patch-Makefile +++ b/sysutils/munin-common/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2018-08-15 03:16:09 UTC +--- Makefile.orig 2018-09-21 02:11:11 UTC +++ Makefile @@ -93,60 +93,47 @@ install: install-master-prime install-co @@ -155,7 +155,7 @@ install-common-prime: build-common install-common -@@ -515,7 +496,7 @@ t/install: +@@ -516,7 +497,7 @@ t/install: # This builds */Build from Build.PL %/Build: %/Build.PL @@ -164,7 +164,7 @@ build-%: %/Build cd $* && $(PERL) Build -@@ -531,6 +512,7 @@ install-%: %/Build +@@ -532,6 +513,7 @@ install-%: %/Build --install_path script=$(BINDIR) \ --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ diff --git a/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in b/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in index 73813b7e92a6..2540dd9b0428 100644 --- a/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in +++ b/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in @@ -1,4 +1,4 @@ ---- plugins/node.d/bind9_rndc.in.orig 2018-03-25 14:01:24 UTC +--- plugins/node.d/bind9_rndc.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/bind9_rndc.in @@ -65,6 +65,7 @@ my $rndc = defined($ENV{rndc}) ? $ENV{rn my $rndc_options = defined($ENV{rndc_options}) ? $ENV{rndc_options} : ''; @@ -38,7 +38,7 @@ while ($line ne '++ Name Server Statistics ++') { @@ -199,11 +193,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq ' print "graph_vlabel queries / \${graph_period}\n"; - print "graph_category BIND\n"; + print "graph_category dns\n"; - for my $key (keys %IN) { + for my $key (@IN_KEYS) { diff --git a/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in b/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in index 36ee11318ea5..35f8ca323051 100644 --- a/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in +++ b/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in @@ -1,4 +1,4 @@ ---- plugins/node.d/multips_memory.in.orig 2018-07-24 11:34:38 UTC +--- plugins/node.d/multips_memory.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/multips_memory.in @@ -137,7 +137,7 @@ fi for name in $names; do @@ -6,6 +6,6 @@ - ps -eo "$monitor,comm" | gawk ' + ps -eo "$monitor,comm" | awk ' - BEGIN { total = "U"; } # U = Unknown. + BEGIN { total = "U"; } # U = Unknown. /grep/ { next; } $2 ~ /^'"$name"'$/ { total = total + ($1*1024); } diff --git a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in b/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in index 7779df0b42c6..9d8f65ea1ec7 100644 --- a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in +++ b/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in @@ -1,6 +1,6 @@ ---- plugins/node.d/squeezebox_.in.orig 2018-07-24 11:34:38 UTC +--- plugins/node.d/squeezebox_.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/squeezebox_.in -@@ -152,7 +152,7 @@ if [ "$CMD" = "years" ]; then +@@ -153,7 +153,7 @@ if [ "$CMD" = "years" ]; then printf "graph_order y" echo "${years_array// / y}" @@ -9,7 +9,7 @@ year=${arr1[$i]} if [ "$year" = 0 ]; then echo "y0.label No year" -@@ -167,7 +167,7 @@ if [ "$CMD" = "years" ]; then +@@ -168,7 +168,7 @@ if [ "$CMD" = "years" ]; then done exit 0 fi @@ -18,7 +18,7 @@ year=${arr1[$i]} printf "y%s.value " "$year" printf "%b" "albums 0 0 year:${year}\\nexit\\n" | "$NC" "$HOST" "$PORT" | sed 's/%3A/:/g' | cut -d ':' -f 3 -@@ -178,7 +178,7 @@ elif [ "$CMD" = "signalstrength" ] || [ +@@ -180,7 +180,7 @@ elif [ "$CMD" = "signalstrength" ] || [ echo "graph_category radio" COUNT=$(printf "%b" 'player count ?\nexit\n' | "$NC" "$HOST" "$PORT" | cut -d " " -f 3) (( COUNT-- )) @@ -27,7 +27,7 @@ MAC=$(printf "%b" "player id $ID ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%3A/:/g') NAME=$(printf "%b" "player name $MAC ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%20/ /g') MAC2=${MAC//:/} -@@ -189,7 +189,7 @@ elif [ "$CMD" = "signalstrength" ] || [ +@@ -191,7 +191,7 @@ elif [ "$CMD" = "signalstrength" ] || [ fi COUNT=$(printf "%b" 'player count ?\nexit\n' | "$NC" "$HOST" "$PORT" | cut -d " " -f 3) (( COUNT-- )) diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk index e647f853d404..358c056eb378 100644 --- a/sysutils/munin-common/munin.mk +++ b/sysutils/munin-common/munin.mk @@ -1,6 +1,6 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.40 +MUNIN_VERSION= 2.0.42 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 7570f115774e..b15526ddd539 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -3,7 +3,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node -- cgit From fd897734b335b75c80a5b9f1646e59e473828dc4 Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Mon, 24 Sep 2018 09:38:27 +0000 Subject: - Update WWW Approved by: portmgr blanket --- www/mod_mono/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/mod_mono/pkg-descr b/www/mod_mono/pkg-descr index 6bb0698c2e55..c8201b689d4e 100644 --- a/www/mod_mono/pkg-descr +++ b/www/mod_mono/pkg-descr @@ -1,3 +1,3 @@ An Apache module that ties Mono's XSP and Apache together. -WWW: http://www.mono-project.com +WWW: https://www.mono-project.com/ -- cgit From 39f9d5f1b3ccbd0435e9db4fef5d36484d968220 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 24 Sep 2018 09:49:21 +0000 Subject: These options seem to also install files that are not documentation, so remove their dependency on DOCS. --- databases/mariadb100-server/Makefile | 1 - databases/mariadb101-server/Makefile | 2 +- databases/mariadb102-server/Makefile | 2 +- databases/mariadb103-server/Makefile | 2 +- games/yadex/Makefile | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 2418d36db9c9..db41d1b16e70 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -123,7 +123,6 @@ OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= PATENTS README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi -TOKUDB_IMPLIES= DOCS post-install: # Remove programs to avoid conflict with mariadb100-client diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index 00d0176e3271..9ee7f430b688 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -149,7 +149,7 @@ OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=${LOCALBASE}/lib SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy -TOKUDB_IMPLIES= SNAPPY DOCS +TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile index c551e97e4536..d1066ec74ee7 100644 --- a/databases/mariadb102-server/Makefile +++ b/databases/mariadb102-server/Makefile @@ -156,7 +156,7 @@ ROCKSDB_USES= python SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy -TOKUDB_IMPLIES= SNAPPY DOCS +TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 37fc6d3dfdaa..31a491f66341 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -158,7 +158,7 @@ ROCKSDB_USES= python SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy -TOKUDB_IMPLIES= SNAPPY DOCS +TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_OFF= -DWITH_WSREP=OFF diff --git a/games/yadex/Makefile b/games/yadex/Makefile index 46cf8a168c85..e3e4e6f5e1a8 100644 --- a/games/yadex/Makefile +++ b/games/yadex/Makefile @@ -44,7 +44,6 @@ PATCHFILES= ${PATCH_PREFIX}_Depend${PATCH_SUFFIX} 3D_RENDER_PATCHFILES= ${PATCH_PREFIX}_Render3D${PATCH_SUFFIX} 3D_RENDER_PORTDOCS= preview.html -3D_RENDER_IMPLIES= DOCS SEARCH_PATCHFILES= ${PATCH_PREFIX}_Find${PATCH_SUFFIX} EXTRA_TOOLS_PATCHFILES= ${PATCH_PREFIX}_Tools${PATCH_SUFFIX} LAPTOP_KEYS_PATCHFILES= ${PATCH_PREFIX}_Keys${PATCH_SUFFIX} -- cgit From 382618e8aa03bc86c2f676a62fb78ff333bae1fe Mon Sep 17 00:00:00 2001 From: tz Date: Mon, 24 Sep 2018 09:59:42 +0000 Subject: Improve UPDATING notice for switch of PHP default version to PHP 7.1. The port mod_php56 was not handled by the upgrade instruction. PR: 231486 --- UPDATING | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UPDATING b/UPDATING index e7c55d5ee2e0..405a2f4fabb3 100644 --- a/UPDATING +++ b/UPDATING @@ -38,6 +38,8 @@ you update your ports collection, before attempting any port upgrades. After the upgrade, check with such list if all your php extensions are still installed, and reinstall them if needed. + If you use mod_php56 you need to deinstall it and install mod_php71. + 20180901: AFFECTS: net/samba48 AUTHOR: timur@FreeBSD.org -- cgit From 13f0ecd698f0a8399fc9d21fece20dad93d30002 Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Mon, 24 Sep 2018 10:57:55 +0000 Subject: - Update to 1.08 --- games/flare-game/Makefile | 4 ++-- games/flare-game/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/games/flare-game/Makefile b/games/flare-game/Makefile index 9f96333ea798..acf4c1154693 100644 --- a/games/flare-game/Makefile +++ b/games/flare-game/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flare -PORTVERSION= 1.07 +PORTVERSION= 1.08 DISTVERSIONPREFIX= v CATEGORIES= games PKGNAMESUFFIX= -game @@ -27,7 +27,7 @@ CMAKE_ARGS= -DBINDIR="bin" -DDATADIR="share/flare" PORTDOCS= * PORTDATA= * -PLIST_FILES= share/appdata/org.flarerpg.Flare.appdata.xml +PLIST_FILES= share/metainfo/org.flarerpg.Flare.appdata.xml OPTIONS_DEFINE= DOCS diff --git a/games/flare-game/distinfo b/games/flare-game/distinfo index adf0d2071f2a..badf26972864 100644 --- a/games/flare-game/distinfo +++ b/games/flare-game/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536078620 -SHA256 (clintbellanger-flare-game-v1.07_GH0.tar.gz) = 72ef156d2a38b6bd302b98ff652da800f29bc9764222c2bd515f186665acd7fe -SIZE (clintbellanger-flare-game-v1.07_GH0.tar.gz) = 146392335 +TIMESTAMP = 1537474855 +SHA256 (clintbellanger-flare-game-v1.08_GH0.tar.gz) = 425e1b8c85f53a666139051ffc97b3fec3811f3c15bbc353795b41dc609585a8 +SIZE (clintbellanger-flare-game-v1.08_GH0.tar.gz) = 146392429 -- cgit From 93d5a03bc0bd682c198058bdf5787e37bf2c2307 Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Mon, 24 Sep 2018 10:58:00 +0000 Subject: - Update to 1.08 --- games/flare-engine/Makefile | 2 +- games/flare-engine/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games/flare-engine/Makefile b/games/flare-engine/Makefile index 9018f50e81a9..37d6f858d8c2 100644 --- a/games/flare-engine/Makefile +++ b/games/flare-engine/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flare -PORTVERSION= 1.07 +PORTVERSION= 1.08 DISTVERSIONPREFIX= v CATEGORIES= games PKGNAMESUFFIX= -engine diff --git a/games/flare-engine/distinfo b/games/flare-engine/distinfo index 580b41d75c45..3cf506b1deca 100644 --- a/games/flare-engine/distinfo +++ b/games/flare-engine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536078588 -SHA256 (clintbellanger-flare-engine-v1.07_GH0.tar.gz) = f1270ae8f09f6538c0a7036c60d4d22012ec835197b3dce7c3e1541beb22a09c -SIZE (clintbellanger-flare-engine-v1.07_GH0.tar.gz) = 5637495 +TIMESTAMP = 1537474810 +SHA256 (clintbellanger-flare-engine-v1.08_GH0.tar.gz) = b482be902a68628f75391d9d2376c71b86f7709d077ad4503d15a3ea475f617c +SIZE (clintbellanger-flare-engine-v1.08_GH0.tar.gz) = 5637042 -- cgit From 7998d6c89170521729d8d3166d9d6b593ff06dea Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:11:39 +0000 Subject: Update MASTER_SITES and WWW --- graphics/geos/Makefile | 2 +- graphics/geos/pkg-descr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile index 7949b07cebcd..c466a46846cd 100644 --- a/graphics/geos/Makefile +++ b/graphics/geos/Makefile @@ -5,7 +5,7 @@ PORTNAME= geos PORTVERSION= 3.6.3 PORTREVISION= 1 CATEGORIES= graphics geography -MASTER_SITES= http://download.osgeo.org/geos/ \ +MASTER_SITES= https://download.osgeo.org/geos/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org diff --git a/graphics/geos/pkg-descr b/graphics/geos/pkg-descr index 91b59fd37449..b2f9fa6241bd 100644 --- a/graphics/geos/pkg-descr +++ b/graphics/geos/pkg-descr @@ -4,4 +4,4 @@ functionality of JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial predicate functions and spatial operators, as well as specific JTS topology functions such as IsValid(). -WWW: http://trac.osgeo.org/geos/ +WWW: https://trac.osgeo.org/geos/ -- cgit From 5fca07604b2f90e9eab1837c3edbd67dd4eaebad Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:11:44 +0000 Subject: Update to 1.47.7 - Remove trailing spaces from changelog [lintian]. - Update years in debian/copyright. - Reference version-specific /usr/share/common-licenses/GPL-3 in copyright rather than the unversioned GPL symlink [lintian]. - Add Swedish translation of info page (thanks to Sebastian Rasmussen). --- misc/help2man/Makefile | 7 ++++--- misc/help2man/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/misc/help2man/Makefile b/misc/help2man/Makefile index 43277ca6571f..0ee9ebd4a7ab 100644 --- a/misc/help2man/Makefile +++ b/misc/help2man/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= help2man -PORTVERSION= 1.47.6 +PORTVERSION= 1.47.7 CATEGORIES= misc MASTER_SITES= GNU @@ -14,9 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= NLS -GNU_CONFIGURE= yes USES= gmake localbase perl5 tar:xz +GNU_CONFIGURE= yes + INFO= ${PORTNAME} PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz @@ -28,7 +29,7 @@ NLS_RUN_DEPENDS= p5-Locale-gettext>=0:devel/p5-Locale-gettext NLS_USES= gettext NLS_VARS= CONFIGURE_FAIL_MESSAGE="Rebuild lang/${PERL_PORT} and devel/p5-Locale-gettext manually before contacting maintainer." -.for lang in de es fr pl pt_BR uk zh_CN +.for lang in de es fr pl pt_BR sv uk zh_CN NLS_INFO+= ${PORTNAME}-${lang} .endfor diff --git a/misc/help2man/distinfo b/misc/help2man/distinfo index f33dd2d4f242..0179d46eada6 100644 --- a/misc/help2man/distinfo +++ b/misc/help2man/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519911577 -SHA256 (help2man-1.47.6.tar.xz) = d91b0295b72a638e4a564f643e4e6d1928779131f628c00f356c13bf336de46f -SIZE (help2man-1.47.6.tar.xz) = 192980 +TIMESTAMP = 1537781669 +SHA256 (help2man-1.47.7.tar.xz) = 585b8e88ed04bdb426403cf7d9b0c0bb9c7630755b0096c2b018a024b29bec0d +SIZE (help2man-1.47.7.tar.xz) = 200128 -- cgit From b842283bb6b9bf68b64ef77c84d3bffb87037f6d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:11:49 +0000 Subject: Cosmetic change --- dns/p5-Mozilla-PublicSuffix/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dns/p5-Mozilla-PublicSuffix/Makefile b/dns/p5-Mozilla-PublicSuffix/Makefile index 8079c3532af9..871f27307f1e 100644 --- a/dns/p5-Mozilla-PublicSuffix/Makefile +++ b/dns/p5-Mozilla-PublicSuffix/Makefile @@ -15,13 +15,14 @@ COMMENT= Get public suffix of domain name via Mozilla Public Suffix List LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= p5-URI>=0:net/p5-URI +BUILD_DEPENDS= ${RUN_DEPENDS} PATCH_DEPENDS= public_suffix_list>=0:dns/public_suffix_list -RUN_DEPENDS:= ${BUILD_DEPENDS} +RUN_DEPENDS= p5-URI>=0:net/p5-URI -NO_ARCH= yes -USE_PERL5= modbuild USES= perl5 +USE_PERL5= modbuild + +NO_ARCH= yes post-patch: @${CP} ${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat ${WRKSRC}/effective_tld_names.dat -- cgit From 19d9a6ec5f457964868f0f4421669b081c42fdd7 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:11:54 +0000 Subject: Take maintainership --- textproc/p5-Text-Table/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/textproc/p5-Text-Table/Makefile b/textproc/p5-Text-Table/Makefile index 24d7eb15699c..916a6bb30d21 100644 --- a/textproc/p5-Text-Table/Makefile +++ b/textproc/p5-Text-Table/Makefile @@ -7,17 +7,18 @@ CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= perl@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Organize Data in Tables LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= p5-Text-Aligner>=0:textproc/p5-Text-Aligner -RUN_DEPENDS:= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= p5-Text-Aligner>=0:textproc/p5-Text-Aligner -NO_ARCH= yes USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include -- cgit From 30ecb8c8734bd40f0a40272726612b5793c20d56 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:11:59 +0000 Subject: Update to 0.093 Changes: https://metacpan.org/changes/distribution/Text-Table-Any --- textproc/p5-Text-Table-Any/Makefile | 10 ++++++---- textproc/p5-Text-Table-Any/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/textproc/p5-Text-Table-Any/Makefile b/textproc/p5-Text-Table-Any/Makefile index bda7cbd472f6..22341d5e49cf 100644 --- a/textproc/p5-Text-Table-Any/Makefile +++ b/textproc/p5-Text-Table-Any/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Text-Table-Any -PORTVERSION= 0.092 +PORTVERSION= 0.093 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,10 +16,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Text-Table-ASV>=0:textproc/p5-Text-Table-ASV \ - p5-Text-Table-Tiny>=0:textproc/p5-Text-Table-Tiny + p5-Text-Table-Tiny>=0:textproc/p5-Text-Table-Tiny \ + p5-Text-Table-XLSX>=0:textproc/p5-Text-Table-XLSX -NO_ARCH= yes -USE_PERL5= configure USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes .include diff --git a/textproc/p5-Text-Table-Any/distinfo b/textproc/p5-Text-Table-Any/distinfo index fafac59e1da3..0dd444eae5e2 100644 --- a/textproc/p5-Text-Table-Any/distinfo +++ b/textproc/p5-Text-Table-Any/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532770421 -SHA256 (Text-Table-Any-0.092.tar.gz) = d73511acfdb60decf8cfd2a5c9273e3b9a28464545df5efe0b27b64ab7c89fb7 -SIZE (Text-Table-Any-0.092.tar.gz) = 17038 +TIMESTAMP = 1537767565 +SHA256 (Text-Table-Any-0.093.tar.gz) = 282abcb23d55e3416337d1fa0da7530c504537efcd0a9630071afae33e25bc75 +SIZE (Text-Table-Any-0.093.tar.gz) = 17341 -- cgit From cad8527e158f8272308a02376b674818b7a180cc Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:04 +0000 Subject: Cosmetic change --- textproc/p5-Text-Table-ASV/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/textproc/p5-Text-Table-ASV/Makefile b/textproc/p5-Text-Table-ASV/Makefile index 5cab1aca141c..2a088a399808 100644 --- a/textproc/p5-Text-Table-ASV/Makefile +++ b/textproc/p5-Text-Table-ASV/Makefile @@ -14,8 +14,9 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE -NO_ARCH= yes -USE_PERL5= configure USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes .include -- cgit From 57d4f7dc636401d0813f3b28c6f8e23c2e7b0802 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:09 +0000 Subject: Cosmetic change --- textproc/p5-Text-Table-Tiny/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/textproc/p5-Text-Table-Tiny/Makefile b/textproc/p5-Text-Table-Tiny/Makefile index fd173f29bfbc..b4c21ea5bca7 100644 --- a/textproc/p5-Text-Table-Tiny/Makefile +++ b/textproc/p5-Text-Table-Tiny/Makefile @@ -14,8 +14,9 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE -NO_ARCH= yes -USE_PERL5= configure USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes .include -- cgit From 941a4b0be0036377bac79d8f302da3d08cb152b8 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:14 +0000 Subject: Use USES=localbase:ldflags --- graphics/php-geos/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/graphics/php-geos/Makefile b/graphics/php-geos/Makefile index 4741161b251a..17a1cf606744 100644 --- a/graphics/php-geos/Makefile +++ b/graphics/php-geos/Makefile @@ -21,8 +21,7 @@ LICENSE_FILE_MIT= ${WRKSRC}/MIT-LICENSE BUILD_DEPENDS= swig3.0:devel/swig30 LIB_DEPENDS= libgeos_c.so:graphics/geos -LDFLAGS+= -L${PREFIX}/lib -USES= php:ext +USES= localbase:ldflags php:ext WRKSRC= ${WRKDIR}/php-${PORTNAME} -- cgit From 94eed49ce9691ab517f556594e0afa7509ec66da Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:19 +0000 Subject: Update to 1.0.9 Changes: https://github.com/Pylons/pylons-sphinx-themes/blob/master/CHANGES.txt --- textproc/py-pylons-sphinx-themes/Makefile | 2 +- textproc/py-pylons-sphinx-themes/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/py-pylons-sphinx-themes/Makefile b/textproc/py-pylons-sphinx-themes/Makefile index d25058be4138..eb33ac889a0f 100644 --- a/textproc/py-pylons-sphinx-themes/Makefile +++ b/textproc/py-pylons-sphinx-themes/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pylons-sphinx-themes -PORTVERSION= 1.0.8 +PORTVERSION= 1.0.9 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pylons-sphinx-themes/distinfo b/textproc/py-pylons-sphinx-themes/distinfo index d85d74cec4c2..5a606354f1c9 100644 --- a/textproc/py-pylons-sphinx-themes/distinfo +++ b/textproc/py-pylons-sphinx-themes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537690103 -SHA256 (pylons-sphinx-themes-1.0.8.tar.gz) = dbaa4301b36a8992c99441fea341490e06d8ffec36738aad494e3cf468754b5e -SIZE (pylons-sphinx-themes-1.0.8.tar.gz) = 141562 +TIMESTAMP = 1537787350 +SHA256 (pylons-sphinx-themes-1.0.9.tar.gz) = b2cc0771dc28e959e1b0789d09c8c9d0ee3549f32683b49af405ae21c1a65642 +SIZE (pylons-sphinx-themes-1.0.9.tar.gz) = 142080 -- cgit From 08233a6aebb7d946e83ea5fe27ed3a333c37fa8f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:24 +0000 Subject: Update to 2.11.135 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 2ef476fa004a..4da7d4df7c26 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.134 +DISTVERSION= 2.11.135 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index 9d0e17d0645a..9bf082765d78 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537690048 -SHA256 (rubygem/aws-sdk-core-2.11.134.gem) = a5d38a4f7d5d83c496962f721316143e0dd67dd8fa4ede47947d30b7684e4f5b -SIZE (rubygem/aws-sdk-core-2.11.134.gem) = 1357824 +TIMESTAMP = 1537767582 +SHA256 (rubygem/aws-sdk-core-2.11.135.gem) = 7d42e5d535c0a5f599a29b51f3ab6ff27ad6a3f6b8a327f7a56ef27dc43c2504 +SIZE (rubygem/aws-sdk-core-2.11.135.gem) = 1357824 -- cgit From a4026721c8a9c6aba037a46e472f1fc155ebcf7b Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:29 +0000 Subject: Update to 2.11.135 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index 2c968e6a7a67..3abdc9a292ac 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.134 +DISTVERSION= 2.11.135 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index d5dd2be3a451..8e84abb4e248 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537690059 -SHA256 (rubygem/aws-sdk-resources-2.11.134.gem) = d21c01384bc41a2bc9c7ba0931d4bbcae2a780c41d7e3f57848dd23599e7e214 -SIZE (rubygem/aws-sdk-resources-2.11.134.gem) = 48640 +TIMESTAMP = 1537767593 +SHA256 (rubygem/aws-sdk-resources-2.11.135.gem) = d8a975402867eea775b4230853534297f544fd47c0160cd2972d94ccc1926544 +SIZE (rubygem/aws-sdk-resources-2.11.135.gem) = 48640 -- cgit From e4b73aca6d26f4c9c6165a94849d3dee2554dd23 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:35 +0000 Subject: Update to 2.11.135 Changes: https://github.com/aws/aws-sdk-ruby/releases --- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index a3c70bc7921d..05520fded6af 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.134 +DISTVERSION= 2.11.135 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index 4da2c331c036..47b406c7d209 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537690070 -SHA256 (rubygem/aws-sdk-2.11.134.gem) = 267cdb5090c2541c48ed348f1b4caf5db6a52fd7ec6c72104ea32c8d1c9ab8c6 -SIZE (rubygem/aws-sdk-2.11.134.gem) = 4608 +TIMESTAMP = 1537767604 +SHA256 (rubygem/aws-sdk-2.11.135.gem) = b2bbef2c055082a12f63569c44fc16bf8b88141f1e210c78b1d3661478847868 +SIZE (rubygem/aws-sdk-2.11.135.gem) = 4608 -- cgit From e69b03e3aeb938fd1f63375d03fffe00f8283ddb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:41 +0000 Subject: Update to 0.24.1 Changes: https://github.com/googleapis/google-api-ruby-client/blob/master/CHANGELOG.md --- devel/rubygem-google-api-client/Makefile | 2 +- devel/rubygem-google-api-client/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-google-api-client/Makefile b/devel/rubygem-google-api-client/Makefile index 151acea5e639..5bcd16d8e23c 100644 --- a/devel/rubygem-google-api-client/Makefile +++ b/devel/rubygem-google-api-client/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= google-api-client -PORTVERSION= 0.24.0 +PORTVERSION= 0.24.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-api-client/distinfo b/devel/rubygem-google-api-client/distinfo index 5f6331b8629d..ba8b35ebf0e8 100644 --- a/devel/rubygem-google-api-client/distinfo +++ b/devel/rubygem-google-api-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537211615 -SHA256 (rubygem/google-api-client-0.24.0.gem) = 2cf41bd7a25336ce9be72d249ca8500e593c6fcff66b155f9c0c6312fc770463 -SIZE (rubygem/google-api-client-0.24.0.gem) = 4438016 +TIMESTAMP = 1537781703 +SHA256 (rubygem/google-api-client-0.24.1.gem) = 8e14ade8757b8b59862f91e2ad9d37e56b8cd480b507fcba1ec4cb6249426808 +SIZE (rubygem/google-api-client-0.24.1.gem) = 4471808 -- cgit From 0eeadacba40c0e459b8e15d7e43c6dc0f4486b04 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:46 +0000 Subject: Cosmetic change --- dns/rubygem-public_suffix/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dns/rubygem-public_suffix/Makefile b/dns/rubygem-public_suffix/Makefile index a13efd913ee0..e19040e2b70c 100644 --- a/dns/rubygem-public_suffix/Makefile +++ b/dns/rubygem-public_suffix/Makefile @@ -15,9 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt PATCH_DEPENDS= public_suffix_list>=0:dns/public_suffix_list -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes post-patch: @${CP} ${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat ${WRKSRC}/data/definitions.txt -- cgit From 1fa3c6b834474caac8c98c418892c402e7aaf13f Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:50 +0000 Subject: Cosmetic change --- dns/rubygem-public_suffix_service/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dns/rubygem-public_suffix_service/Makefile b/dns/rubygem-public_suffix_service/Makefile index f7d0aa02c69f..593775955c3d 100644 --- a/dns/rubygem-public_suffix_service/Makefile +++ b/dns/rubygem-public_suffix_service/Makefile @@ -15,9 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PATCH_DEPENDS= public_suffix_list>=0:dns/public_suffix_list -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes post-patch: @${CP} ${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat ${WRKSRC}/lib/public_suffix/definitions.txt -- cgit From d339a0ec3e86a275b3456fe076690712dbab84fb Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:12:55 +0000 Subject: Rename gemspec patch to patch-gemspec --- .../files/patch-fog-google.gemspec | 29 ---------------------- net/rubygem-fog-google/files/patch-gemspec | 29 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 net/rubygem-fog-google/files/patch-fog-google.gemspec create mode 100644 net/rubygem-fog-google/files/patch-gemspec diff --git a/net/rubygem-fog-google/files/patch-fog-google.gemspec b/net/rubygem-fog-google/files/patch-fog-google.gemspec deleted file mode 100644 index 6b29e723a013..000000000000 --- a/net/rubygem-fog-google/files/patch-fog-google.gemspec +++ /dev/null @@ -1,29 +0,0 @@ ---- fog-google.gemspec.orig 2018-09-21 22:25:33 UTC -+++ fog-google.gemspec -@@ -26,7 +26,7 @@ Gem::Specification.new do |s| - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) -- s.add_runtime_dependency(%q.freeze, ["~> 0.23.0"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 0.23"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) -@@ -41,7 +41,7 @@ Gem::Specification.new do |s| - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) -- s.add_dependency(%q.freeze, ["~> 0.23.0"]) -+ s.add_dependency(%q.freeze, ["~> 0.23"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) -@@ -57,7 +57,7 @@ Gem::Specification.new do |s| - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) -- s.add_dependency(%q.freeze, ["~> 0.23.0"]) -+ s.add_dependency(%q.freeze, ["~> 0.23"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) diff --git a/net/rubygem-fog-google/files/patch-gemspec b/net/rubygem-fog-google/files/patch-gemspec new file mode 100644 index 000000000000..6b29e723a013 --- /dev/null +++ b/net/rubygem-fog-google/files/patch-gemspec @@ -0,0 +1,29 @@ +--- fog-google.gemspec.orig 2018-09-21 22:25:33 UTC ++++ fog-google.gemspec +@@ -26,7 +26,7 @@ Gem::Specification.new do |s| + s.add_runtime_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, [">= 0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 0.23.0"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 0.23"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + s.add_development_dependency(%q.freeze, [">= 0"]) +@@ -41,7 +41,7 @@ Gem::Specification.new do |s| + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) +- s.add_dependency(%q.freeze, ["~> 0.23.0"]) ++ s.add_dependency(%q.freeze, ["~> 0.23"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) +@@ -57,7 +57,7 @@ Gem::Specification.new do |s| + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) +- s.add_dependency(%q.freeze, ["~> 0.23.0"]) ++ s.add_dependency(%q.freeze, ["~> 0.23"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) + s.add_dependency(%q.freeze, [">= 0"]) -- cgit From a7f9866c598dfb416d6bccb4423956c34e86a307 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:01 +0000 Subject: Update to 2018.09.23 --- german/mythes/Makefile | 2 +- german/mythes/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/german/mythes/Makefile b/german/mythes/Makefile index b461e6228dcb..652fd7f30aea 100644 --- a/german/mythes/Makefile +++ b/german/mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2018.09.16 +PORTVERSION= 2018.09.23 CATEGORIES= german textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/ DISTNAME= Deutscher-Thesaurus-${PORTVERSION:C/\.//g} diff --git a/german/mythes/distinfo b/german/mythes/distinfo index 3f73f30f40cc..b67c22771778 100644 --- a/german/mythes/distinfo +++ b/german/mythes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537210845 -SHA256 (mythes/Deutscher-Thesaurus-20180916.oxt) = 3dc831bc289005a5cb8386082f1bfe6ebc345538ba54a0516b393eeec30e2840 -SIZE (mythes/Deutscher-Thesaurus-20180916.oxt) = 8989549 +TIMESTAMP = 1537766800 +SHA256 (mythes/Deutscher-Thesaurus-20180923.oxt) = 967a331839c2f4ea84d617076e2c023cbfba951ab5e6d3b65d8a1e38d42cedad +SIZE (mythes/Deutscher-Thesaurus-20180923.oxt) = 8998326 -- cgit From d8bbc12cc59ea507392fab1a190394355d05d829 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:06 +0000 Subject: Update to 20180919 --- polish/hunspell/Makefile | 2 +- polish/hunspell/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/polish/hunspell/Makefile b/polish/hunspell/Makefile index f90a9ab0da4d..11377c848054 100644 --- a/polish/hunspell/Makefile +++ b/polish/hunspell/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hunspell -PORTVERSION= 20180915 +PORTVERSION= 20180919 CATEGORIES= polish textproc MASTER_SITES= https://sjp.pl/slownik/ort/ \ LOCAL/sunpoet/${PORTNAME} diff --git a/polish/hunspell/distinfo b/polish/hunspell/distinfo index 786754d6dd59..f5fad4f9084f 100644 --- a/polish/hunspell/distinfo +++ b/polish/hunspell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537211371 -SHA256 (hunspell/sjp-myspell-pl-20180915.zip) = b68d20e6c0fe43ab6b2de6670a5b9a0e0168f6c71d7e971a54b43cf43c9223cf -SIZE (hunspell/sjp-myspell-pl-20180915.zip) = 1208452 +TIMESTAMP = 1537766890 +SHA256 (hunspell/sjp-myspell-pl-20180919.zip) = 6415566b8ee61f7739900f9016efd3306cb7960ee3416f838545020edbffaf74 +SIZE (hunspell/sjp-myspell-pl-20180919.zip) = 1208418 -- cgit From c3bc551aedc5409ee07dcd1b05d861179be0a566 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:11 +0000 Subject: Update to 2018.09.23 --- textproc/sk-mythes/Makefile | 2 +- textproc/sk-mythes/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile index 03a9513bd8e1..2257d5b872d2 100644 --- a/textproc/sk-mythes/Makefile +++ b/textproc/sk-mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2018.09.16 +PORTVERSION= 2018.09.23 CATEGORIES= textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/ PKGNAMEPREFIX= sk- diff --git a/textproc/sk-mythes/distinfo b/textproc/sk-mythes/distinfo index 1b0659a807f0..d7e785a1cfb7 100644 --- a/textproc/sk-mythes/distinfo +++ b/textproc/sk-mythes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537210862 -SHA256 (mythes/OOo-Thesaurus2-sk_SK-20180916.zip) = 38c25176c3cf95f3f8feb9864244234ad9fc72f463d05b2fca73a2a5b1ebdb2b -SIZE (mythes/OOo-Thesaurus2-sk_SK-20180916.zip) = 239453 +TIMESTAMP = 1537766817 +SHA256 (mythes/OOo-Thesaurus2-sk_SK-20180923.zip) = 2508ac6715409c52967795bc1c16da9de0072d5b2119af8a628db5fb89b6c4c5 +SIZE (mythes/OOo-Thesaurus2-sk_SK-20180923.zip) = 239453 -- cgit From 5eeb5b780478bcdfb33013296f7738ce3c479808 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:16 +0000 Subject: Add LICENSE_FILE --- converters/p5-Text-Bidi/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/converters/p5-Text-Bidi/Makefile b/converters/p5-Text-Bidi/Makefile index 607d0f51a367..5fd285eeba8a 100644 --- a/converters/p5-Text-Bidi/Makefile +++ b/converters/p5-Text-Bidi/Makefile @@ -12,13 +12,14 @@ COMMENT= Perl interface to the libfribidi LICENSE= ART10 GPLv1+ LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \ swig3.0:devel/swig30 LIB_DEPENDS= libfribidi.so:converters/fribidi -USE_PERL5= configure USES= perl5 +USE_PERL5= configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Text/Bidi/private/private.so -- cgit From 6cd4c1fba8f56b58baa1132330702fd96d72a189 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:21 +0000 Subject: Update WWW --- devel/py-pyopencl/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/py-pyopencl/pkg-descr b/devel/py-pyopencl/pkg-descr index 086d4b7a5795..5bb543ecbc2b 100644 --- a/devel/py-pyopencl/pkg-descr +++ b/devel/py-pyopencl/pkg-descr @@ -14,4 +14,4 @@ API. What makes PyOpenCL special? - Liberal license. PyOpenCL is open-source under the MIT license and free for commercial, academic, and private use. -WWW: http://mathema.tician.de/software/pyopencl +WWW: https://mathema.tician.de/software/pyopencl/ -- cgit From e7fab318252065305896a1d841c5692b426d8462 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:26 +0000 Subject: Update to 4.4.2 Changes: https://github.com/binarylogic/authlogic/blob/master/CHANGELOG.md --- devel/rubygem-authlogic/Makefile | 2 +- devel/rubygem-authlogic/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/rubygem-authlogic/Makefile b/devel/rubygem-authlogic/Makefile index 6ea06ebbe8a8..6d174ec4eb11 100644 --- a/devel/rubygem-authlogic/Makefile +++ b/devel/rubygem-authlogic/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= authlogic -PORTVERSION= 4.4.1 +PORTVERSION= 4.4.2 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-authlogic/distinfo b/devel/rubygem-authlogic/distinfo index 4c133d3fed75..9908d3746cc6 100644 --- a/devel/rubygem-authlogic/distinfo +++ b/devel/rubygem-authlogic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537690161 -SHA256 (rubygem/authlogic-4.4.1.gem) = 39aca3f9461e4295b910cb149761cdab86f42004bc30ff09b08244abfbd5a100 -SIZE (rubygem/authlogic-4.4.1.gem) = 88064 +TIMESTAMP = 1537767638 +SHA256 (rubygem/authlogic-4.4.2.gem) = 88c573b801c5f21b33af453c7694f894d62925b7d2ae4814a497e6d5315bb7c6 +SIZE (rubygem/authlogic-4.4.2.gem) = 89088 -- cgit From 9c910529b83a2e667626ea2e7b1582b9660d9ea2 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:31 +0000 Subject: Update to 4.9.1 Changes: https://github.com/minimagick/minimagick/releases --- graphics/rubygem-mini_magick/Makefile | 2 +- graphics/rubygem-mini_magick/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile index ff7f1b9f11b0..674eb56ecd4a 100644 --- a/graphics/rubygem-mini_magick/Makefile +++ b/graphics/rubygem-mini_magick/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mini_magick -PORTVERSION= 4.9.0 +PORTVERSION= 4.9.1 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/rubygem-mini_magick/distinfo b/graphics/rubygem-mini_magick/distinfo index 5d9a73fc4ba8..3f061c86a3fa 100644 --- a/graphics/rubygem-mini_magick/distinfo +++ b/graphics/rubygem-mini_magick/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537547702 -SHA256 (rubygem/mini_magick-4.9.0.gem) = 15fa2425aeeb519b8dcf74c7f2514bb193e076b2b37ad9a0fc811f48780cead1 -SIZE (rubygem/mini_magick-4.9.0.gem) = 17920 +TIMESTAMP = 1537767649 +SHA256 (rubygem/mini_magick-4.9.1.gem) = 025b693df030ca7aaa07b90551f163cc531563e8d78b9dd9041285da30c8c967 +SIZE (rubygem/mini_magick-4.9.1.gem) = 18432 -- cgit From 2afde3a64df39cdde0f2b53bb04686e0f8f4225a Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:36 +0000 Subject: Add shared MPICH description --- Mk/bsd.options.desc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk index 61c19901985b..fc3f439b2317 100644 --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -338,7 +338,8 @@ MP4_DESC?= MP4 media format support MPEG2_DESC?= MPEG-2 video support via libmpeg2 MPG123_DESC?= MP3 decoding support via mpg123 MPI_DESC?= MPI (Message Passing Interface) support -MPICH2_DESC?= Parallel processing support via MPICH2 +MPICH_DESC?= Parallel processing support via MPICH 3 +MPICH2_DESC?= Parallel processing support via MPICH 2 MPLAYER_DESC?= MPlayer media player support MPLS_DESC?= MPLS support MPP_DESC?= Musepack audio format support -- cgit From 47bf9d9bf0239b13fb953bf1e4b739a5ab79ae23 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:41 +0000 Subject: Fix RUN_DEPENDS - Bump PORTREVISION for dependency change PR: 228769 Submitted by: Kai --- devel/py-fixtures/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/devel/py-fixtures/Makefile b/devel/py-fixtures/Makefile index d0852430393f..5e56e117e388 100644 --- a/devel/py-fixtures/Makefile +++ b/devel/py-fixtures/Makefile @@ -3,6 +3,7 @@ PORTNAME= fixtures PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,11 +17,13 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/Apache-2.0 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/BSD BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}testtools>=0.9.22:devel/py-testtools@${PY_FLAVOR} -NO_ARCH= yes USES= python USE_PYTHON= autoplist concurrent distutils +NO_ARCH= yes + .include -- cgit From 2589b260d3c6aa35b3a70cca381fdcaddf5748bf Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:13:46 +0000 Subject: Fix RUN_DEPENDS - While I'm here, add TEST_DEPENDS - Bump PORTREVISION for dependency change PR: 228769 Submitted by: Kai (maintainer) --- devel/py-python-subunit/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devel/py-python-subunit/Makefile b/devel/py-python-subunit/Makefile index 2b3e2c72ab3b..ba8edb89ad5f 100644 --- a/devel/py-python-subunit/Makefile +++ b/devel/py-python-subunit/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-subunit DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,9 +13,10 @@ COMMENT= Python implementation of subunit test streaming protocol LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=0:devel/py-extras@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mimeparse>=0:devel/py-mimeparse@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}testtools>=0.9.34:devel/py-testtools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}unittest2>=1.0.0:devel/py-unittest2@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}testtools>=0.9.34:devel/py-testtools@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fixtures>=0:devel/py-fixtures@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}testscenarios>=0:devel/py-testscenarios@${PY_FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist -- cgit From 2403902dbb6fd595d42fe9eff4311dd6aafb6188 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:14:13 +0000 Subject: Fix RUN_DEPENDS - Add LICENSE_FILE - Bump PORTREVISION for dependency change PR: 228769 Submitted by: Kai --- devel/py-testtools/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile index 8987a0b4e28c..6788f2f9671b 100644 --- a/devel/py-testtools/Makefile +++ b/devel/py-testtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= testtools PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,20 +12,29 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Extensions to the Python standard library unit testing framework LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=1.0.0:devel/py-extras@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}traceback2>=0:devel/py-traceback2@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}mimeparse>=0:devel/py-mimeparse@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traceback2>=0:devel/py-traceback2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unittest2>=1.0.0:devel/py-unittest2@${PY_FLAVOR} -NO_ARCH= yes USES= python USE_PYTHON= autoplist concurrent distutils +NO_ARCH= yes + PORTDOCS= api.rst for-framework-folk.rst for-test-authors.rst hacking.rst \ index.rst overview.rst twisted-support.rst OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e '/^fixtures/d' ${WRKSRC}/requirements.txt + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.rst ${STAGEDIR}${DOCSDIR} -- cgit From a5d40e7069a4069462b4f9bc90bfa67375fd7021 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:14:18 +0000 Subject: Fix build with OpenSSL 1.1.* PR: 229019 Reported by: brnrd Obtained by: Viktor Dukhovni Reference: https://lists.freebsd.org/pipermail/freebsd-python/2018-September/015429.html --- security/py-m2crypto/Makefile | 3 --- security/py-m2crypto/files/patch-SWIG-_m2crypto.i | 11 +++++++++++ security/py-m2crypto/files/patch-setup.py | 11 +++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 security/py-m2crypto/files/patch-SWIG-_m2crypto.i create mode 100644 security/py-m2crypto/files/patch-setup.py diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile index e6f32ac47f7e..98d4b9203ea9 100644 --- a/security/py-m2crypto/Makefile +++ b/security/py-m2crypto/Makefile @@ -14,9 +14,6 @@ COMMENT= Crypto and SSL toolkit for Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= Error: Syntax error in input(1). - BUILD_DEPENDS= swig3.0:devel/swig30 PYDISTUTILS_BUILDARGS= build_ext --include=${OPENSSLINC} --openssl=${OPENSSLBASE} --swig=${LOCALBASE}/bin/swig3.0 diff --git a/security/py-m2crypto/files/patch-SWIG-_m2crypto.i b/security/py-m2crypto/files/patch-SWIG-_m2crypto.i new file mode 100644 index 000000000000..d3301a0dedae --- /dev/null +++ b/security/py-m2crypto/files/patch-SWIG-_m2crypto.i @@ -0,0 +1,11 @@ +--- SWIG/_m2crypto.i.orig 2018-02-24 13:54:59 UTC ++++ SWIG/_m2crypto.i +@@ -57,7 +57,8 @@ static PyObject *x509_store_verify_cb_fu + #ifdef _WIN32 + %include + #endif ++%include + %include + + /* Bring in LHASH_OF macro definition */ + /* XXX Can't include lhash.h where LHASH_OF is defined, because it includes diff --git a/security/py-m2crypto/files/patch-setup.py b/security/py-m2crypto/files/patch-setup.py new file mode 100644 index 000000000000..2b5d7b62fd49 --- /dev/null +++ b/security/py-m2crypto/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2018-04-29 18:47:25 UTC ++++ setup.py +@@ -196,7 +196,7 @@ class _M2CryptoBuildExt(build_ext.build_ + + # swig seems to need the default header file directories + self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) +- self.swig_opts.append('-includeall') ++ #self.swig_opts.append('-includeall') + self.swig_opts.append('-modern') + self.swig_opts.append('-builtin') + -- cgit From 56c20cd9edc8a421c58c7158cfdfeec0a6812b0d Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:14:24 +0000 Subject: Change from MPICH2 to MPICH option - Bump PORTREVISION for dependency and package change PR: 231634 Submitted by: yuri --- science/pnetcdf/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile index c2f0f406769c..e6331e78e80c 100644 --- a/science/pnetcdf/Makefile +++ b/science/pnetcdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= pnetcdf PORTVERSION= 1.8.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science parallel MASTER_SITES= http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/ \ LOCAL/sunpoet @@ -14,7 +14,7 @@ COMMENT= Library providing high-performance I/O OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= MPI -OPTIONS_SINGLE_MPI= OPENMPI OPENMPI2 OPENMPI3 MPICH2 +OPTIONS_SINGLE_MPI= OPENMPI OPENMPI2 OPENMPI3 MPICH OPTIONS_DEFAULT=OPENMPI3 OPENMPI_DESC= Parallel processing support via Open MPI 1.x OPENMPI2_DESC= Parallel processing support via Open MPI 2.x @@ -31,8 +31,8 @@ USES= fortran gmake pathfix perl5 tar:bzip2 PORTDOCS= COPYRIGHT INSTALL README -MPICH2_CONFIGURE_ON= --with-mpi=${LOCALBASE} -MPICH2_LIB_DEPENDS= libmpich.so:net/mpich2 +MPICH_CONFIGURE_ON= --with-mpi=${LOCALBASE} +MPICH_LIB_DEPENDS= libmpich.so:net/mpich OPENMPI_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/openmpi OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi OPENMPI2_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/openmpi2 -- cgit From eebc198a348c981d2995d8e88098e840aad1ab85 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:14:28 +0000 Subject: Update WWW --- games/simutrans/pkg-descr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/simutrans/pkg-descr b/games/simutrans/pkg-descr index a3e8b192f971..529caef1a771 100644 --- a/games/simutrans/pkg-descr +++ b/games/simutrans/pkg-descr @@ -3,4 +3,4 @@ goods by land, air and water. Interconnect cities, districts, public buildings, industries and tourist attractions. Control and watch your finances and the traffic of your vehicles and goods. -WWW: http://www.simutrans.com/ +WWW: https://www.simutrans.com/ -- cgit From ecc769daa47394b39e1d8d3ccbd0d636bc78456c Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 24 Sep 2018 11:14:33 +0000 Subject: Use USES=localbase --- net/pktanon/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/pktanon/Makefile b/net/pktanon/Makefile index 9ce3d5364c59..644a7852a084 100644 --- a/net/pktanon/Makefile +++ b/net/pktanon/Makefile @@ -13,13 +13,13 @@ COMMENT= Network trace anonymizer LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libxerces-c.so.3:textproc/xerces-c3 -USES= compiler:c++0x dos2unix +USES= compiler:c++0x dos2unix localbase + GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lboost_system +LDFLAGS+= -lboost_system post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/profiles - (cd ${WRKSRC}/profiles/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/profiles) + (cd ${WRKSRC}/profiles/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/profiles) .include -- cgit From cf9c7b097bc2619bb1512eb198f25a6277fbfe0a Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Mon, 24 Sep 2018 11:14:41 +0000 Subject: - Update to 10.4t --- games/hyperrogue/Makefile | 6 ++++-- games/hyperrogue/distinfo | 6 +++--- games/hyperrogue/files/patch-Makefile.am | 11 +++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 games/hyperrogue/files/patch-Makefile.am diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile index da3343d28a95..13e328e68f3b 100644 --- a/games/hyperrogue/Makefile +++ b/games/hyperrogue/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hyperrogue -PORTVERSION= 10.4j -DISTVERSIONPREFIX= v +PORTVERSION= 10.4t CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -39,6 +38,9 @@ DESKTOP_ENTRIES="HyperRogue" \ OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e 's|isnumber|is_number|' ${WRKSRC}/archimedean.cpp + post-install: ${INSTALL_DATA} ${WRKSRC}/hr-icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo index 171d2950993f..e7c5afccce70 100644 --- a/games/hyperrogue/distinfo +++ b/games/hyperrogue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531684718 -SHA256 (zenorogue-hyperrogue-v10.4j_GH0.tar.gz) = 16be68ab5f811a74c0eb4b5225723dfdd72892b44df7e8878260d0c39c765b87 -SIZE (zenorogue-hyperrogue-v10.4j_GH0.tar.gz) = 57537691 +TIMESTAMP = 1537632456 +SHA256 (zenorogue-hyperrogue-10.4t_GH0.tar.gz) = 83aea78095b65dfeaa27e1c2465fc3dc78c92dc0a6a550aaed61196e42ba0360 +SIZE (zenorogue-hyperrogue-10.4t_GH0.tar.gz) = 56912670 diff --git a/games/hyperrogue/files/patch-Makefile.am b/games/hyperrogue/files/patch-Makefile.am new file mode 100644 index 000000000000..b3601b8c674d --- /dev/null +++ b/games/hyperrogue/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2018-08-31 18:59:58 UTC ++++ Makefile.am +@@ -2,7 +2,7 @@ bin_PROGRAMS = hyperrogue + hyperroguedir = $(datadir)/hyperrogue + hyperrogue_SOURCES = hyper.cpp savepng.cpp + hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\" +-hyperrogue_CXXFLAGS = -O2 -std=c++11 ${AM_CXXFLAGS} ++hyperrogue_CXXFLAGS = -std=c++11 ${AM_CXXFLAGS} + dist_hyperrogue_DATA = hyperrogue-music.txt DejaVuSans-Bold.ttf + + # docdir -- cgit From 2f08e81a589fbb0825d05933d337f53e9e430172 Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 24 Sep 2018 11:31:35 +0000 Subject: games/openra: update to 20180923 Changes: https://github.com/OpenRA/OpenRA/wiki/Changelog#release-20180923 MFH: 2018Q3 (for multiplayer, mostly bug fixes otherwise) --- games/openra/Makefile | 5 ++--- games/openra/distinfo | 10 +++++----- games/openra/pkg-plist | 7 +++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/games/openra/Makefile b/games/openra/Makefile index 6fa15bf2c6b5..94faa6255532 100644 --- a/games/openra/Makefile +++ b/games/openra/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= openra -PORTVERSION= 20180307 +PORTVERSION= 20180923 DISTVERSIONPREFIX= release- -PORTREVISION= 4 CATEGORIES= games MASTER_SITES= https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20161223/:SDL2_CS \ https://github.com/${GH_ACCOUNT}/OpenAL-CS/releases/download/20151227/:OpenAL_CS \ @@ -14,7 +13,7 @@ DISTFILES= SDL2-CS.dll:SDL2_CS \ OpenAL-CS.dll:OpenAL_CS \ OpenAL-CS.dll.config:OpenAL_CS \ Eluant.dll:Eluant \ - GeoLite2-Country_20180605${EXTRACT_SUFX}:GeoLite2 + GeoLite2-Country_20180911${EXTRACT_SUFX}:GeoLite2 EXTRACT_ONLY= ${DISTFILES:C/:.*//:N*.config:N*.dll:N*.nupkg} MAINTAINER= jbeich@FreeBSD.org diff --git a/games/openra/distinfo b/games/openra/distinfo index 2a0d1e3a61a3..935802bfaf41 100644 --- a/games/openra/distinfo +++ b/games/openra/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1520458210 +TIMESTAMP = 1537635642 SHA256 (SDL2-CS.dll) = b06c14a771d14cb37210f476dfd973d4e7d80d97f90566bd5bc78996ade4f7a0 SIZE (SDL2-CS.dll) = 80896 SHA256 (SDL2-CS.dll.config) = eff0594f7e86d40a94c1b28f8db87478f3de1cf0857f3d46e384bcc6744ce094 @@ -9,8 +9,8 @@ SHA256 (OpenAL-CS.dll.config) = 58eaf46a749e466fce0a0ec43184073b0153aa8eb24c8652 SIZE (OpenAL-CS.dll.config) = 301 SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31 SIZE (Eluant.dll) = 71168 -SHA256 (GeoLite2-Country_20180605.tar.gz) = 6977a408a4f3eca76523b5bf39780fd2c8529f263ce8cc94c1da208dc9be678b -SIZE (GeoLite2-Country_20180605.tar.gz) = 1730717 +SHA256 (GeoLite2-Country_20180911.tar.gz) = 64e54ec6327989fa60be32638f49e139f7c1878e40f98413e0aeb5bc3550054f +SIZE (GeoLite2-Country_20180911.tar.gz) = 1740865 SHA256 (fuzzylogiclibrary.1.2.0.nupkg) = b464509236260f53d963771ed99410a7e1cdbd268a2bde43b189e7d15044a174 SIZE (fuzzylogiclibrary.1.2.0.nupkg) = 70571 SHA256 (maxmind.db.2.0.0.nupkg) = 095d62c6ecda38c1e8fe79935b4eaf228d2637f9498caec48b8b48a0aba6d5aa @@ -31,5 +31,5 @@ SHA256 (stylecopplus.msbuild.4.7.49.5.nupkg) = b98a8ed20c5e82ff5fe6c2a52ecd45bff SIZE (stylecopplus.msbuild.4.7.49.5.nupkg) = 124724 SHA256 (rix0rrr.beaconlib.1.0.1.nupkg) = e8e126b98ae7676cb0434455aa8a41c17a927c1b40c4cf368f9527af6bc251f2 SIZE (rix0rrr.beaconlib.1.0.1.nupkg) = 8421 -SHA256 (openra-OpenRA-release-20180307_GH0.tar.gz) = b775fd4845df3fdbf89c136c7267bacc57e213eedbecc31c599a8b80c3e26544 -SIZE (openra-OpenRA-release-20180307_GH0.tar.gz) = 23223873 +SHA256 (openra-OpenRA-release-20180923_GH0.tar.gz) = 85943a229a8f927727614055a58200f4a0d4df4ae7a71d7b2443de22abb2d688 +SIZE (openra-OpenRA-release-20180923_GH0.tar.gz) = 24048724 diff --git a/games/openra/pkg-plist b/games/openra/pkg-plist index 134e5609ad44..4eee56c4d6a6 100644 --- a/games/openra/pkg-plist +++ b/games/openra/pkg-plist @@ -5,11 +5,8 @@ bin/openra-d2k-server bin/openra-ra bin/openra-ra-server man/man6/openra.6.gz -share/applications/openra-cnc-join-servers.desktop share/applications/openra-cnc.desktop -share/applications/openra-d2k-join-servers.desktop share/applications/openra-d2k.desktop -share/applications/openra-ra-join-servers.desktop share/applications/openra-ra.desktop share/icons/hicolor/128x128/apps/openra-cnc.png share/icons/hicolor/128x128/apps/openra-d2k.png @@ -28,4 +25,6 @@ share/icons/hicolor/64x64/apps/openra-d2k.png share/icons/hicolor/64x64/apps/openra-ra.png share/icons/hicolor/scalable/apps/openra-cnc.svg share/icons/hicolor/scalable/apps/openra-ra.svg -share/mime/packages/openra.xml +share/mime/packages/openra-cnc.xml +share/mime/packages/openra-d2k.xml +share/mime/packages/openra-ra.xml -- cgit From 11ff000c314d803a0f289ace7cec234df0d02946 Mon Sep 17 00:00:00 2001 From: dumbbell Date: Mon, 24 Sep 2018 11:38:55 +0000 Subject: net/cf: Update to 6.39.1 Release notes: * https://github.com/cloudfoundry/cli/releases/tag/v6.39.0 * https://github.com/cloudfoundry/cli/releases/tag/v6.39.1 Sponsored by: Pivotal Software, Inc. --- net/cf/Makefile | 2 +- net/cf/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/cf/Makefile b/net/cf/Makefile index 100a492c1ff5..80de86d5be54 100644 --- a/net/cf/Makefile +++ b/net/cf/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cf -PORTVERSION= 6.38.0 +PORTVERSION= 6.39.1 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/cf/distinfo b/net/cf/distinfo index c31037bbcc5c..5ccc245f3b02 100644 --- a/net/cf/distinfo +++ b/net/cf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533824001 -SHA256 (cloudfoundry-cli-v6.38.0_GH0.tar.gz) = f127fece83d1b3a46e1ae70bb3569f9bf91703fd20b59c665fc21c4b2f974d42 -SIZE (cloudfoundry-cli-v6.38.0_GH0.tar.gz) = 8475067 +TIMESTAMP = 1537782778 +SHA256 (cloudfoundry-cli-v6.39.1_GH0.tar.gz) = 438896e161f1651a04ce095a8611cf620829d9e4322390d5dd5b952a9c302ea3 +SIZE (cloudfoundry-cli-v6.39.1_GH0.tar.gz) = 8508567 -- cgit From df4183d950e47c158c4add3afb9d6f3df74f264a Mon Sep 17 00:00:00 2001 From: dumbbell Date: Mon, 24 Sep 2018 11:39:38 +0000 Subject: net/bosh-bootloader: Update to 6.10.3 Release notes: * https://github.com/cloudfoundry/bosh-bootloader/releases/tag/v6.10.3 Sponsored by: Pivotal Software, Inc. --- net/bosh-bootloader/Makefile | 2 +- net/bosh-bootloader/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/bosh-bootloader/Makefile b/net/bosh-bootloader/Makefile index a826cd3530c8..ac0c28cb41d3 100644 --- a/net/bosh-bootloader/Makefile +++ b/net/bosh-bootloader/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bosh-bootloader -PORTVERSION= 6.10.0 +PORTVERSION= 6.10.3 CATEGORIES= net sysutils MAINTAINER= dumbbell@FreeBSD.org diff --git a/net/bosh-bootloader/distinfo b/net/bosh-bootloader/distinfo index 1d18a795f434..8dbdb77fcc84 100644 --- a/net/bosh-bootloader/distinfo +++ b/net/bosh-bootloader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536842806 -SHA256 (cloudfoundry-bosh-bootloader-6.10.0-v6.10.0_GH0.tar.gz) = 4dd379d579ddb16c98d184105343a058ad802a1dfc34797acc119a556f3d9e1d -SIZE (cloudfoundry-bosh-bootloader-6.10.0-v6.10.0_GH0.tar.gz) = 8562018 +TIMESTAMP = 1537782591 +SHA256 (cloudfoundry-bosh-bootloader-6.10.3-v6.10.3_GH0.tar.gz) = 3aef810ec7db101d0639acff9f1fd39023d0f583dfa351f7a8def0febae45b43 +SIZE (cloudfoundry-bosh-bootloader-6.10.3-v6.10.3_GH0.tar.gz) = 8558569 -- cgit From 25abc905c9c98db6a95df77e777c425205b99a36 Mon Sep 17 00:00:00 2001 From: ale Date: Mon, 24 Sep 2018 12:01:39 +0000 Subject: Update to 5.6.38 release. --- databases/php56-interbase/Makefile | 1 - databases/php56-pdo_firebird/Makefile | 1 - lang/php56/Makefile | 2 +- lang/php56/distinfo | 8 +++----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/databases/php56-interbase/Makefile b/databases/php56-interbase/Makefile index 0e3b08162ee9..894e1d5df5a0 100644 --- a/databases/php56-interbase/Makefile +++ b/databases/php56-interbase/Makefile @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php56 diff --git a/databases/php56-pdo_firebird/Makefile b/databases/php56-pdo_firebird/Makefile index b1ffc489be6f..d9d727bc9043 100644 --- a/databases/php56-pdo_firebird/Makefile +++ b/databases/php56-pdo_firebird/Makefile @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php56 diff --git a/lang/php56/Makefile b/lang/php56/Makefile index 74333118f465..ea5e0e0f2f9b 100644 --- a/lang/php56/Makefile +++ b/lang/php56/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.37 +PORTVERSION= 5.6.38 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php56/distinfo b/lang/php56/distinfo index 026a2a918bbe..ac1f85edc965 100644 --- a/lang/php56/distinfo +++ b/lang/php56/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1532435002 -SHA256 (php-5.6.37.tar.xz) = 5000d82610f9134aaedef28854ec3591f68dedf26a17b8935727dac2843bd256 -SIZE (php-5.6.37.tar.xz) = 12467912 -SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed -SIZE (php-5.5.x-mail-header.patch) = 4426 +TIMESTAMP = 1537790285 +SHA256 (php-5.6.38.tar.xz) = c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e +SIZE (php-5.6.38.tar.xz) = 12467408 -- cgit From b5e00f8305c58077141e6a3cb401a416646db2dd Mon Sep 17 00:00:00 2001 From: ale Date: Mon, 24 Sep 2018 12:15:09 +0000 Subject: Update to 2.0.23 release. --- security/trezord/Makefile | 5 +- security/trezord/distinfo | 6 +- security/trezord/files/extra-patch-usb_webusb.go | 12 +- security/trezord/files/patch-freebsd | 192 ----------------------- 4 files changed, 10 insertions(+), 205 deletions(-) delete mode 100644 security/trezord/files/patch-freebsd diff --git a/security/trezord/Makefile b/security/trezord/Makefile index c5ef542fae4b..3f0cf27595fa 100644 --- a/security/trezord/Makefile +++ b/security/trezord/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= trezord -PORTVERSION= 2.0.21 +PORTVERSION= 2.0.23 DISTVERSIONPREFIX= v CATEGORIES= security @@ -18,8 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= trezor GH_PROJECT= ${PORTNAME}-go GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} - -PATCH_STRIP= -p1 +GH_TAGNAME= 0e82873 PLIST_FILES= bin/${GH_PROJECT} diff --git a/security/trezord/distinfo b/security/trezord/distinfo index ab33214cf4f2..c1268bc18e35 100644 --- a/security/trezord/distinfo +++ b/security/trezord/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535444563 -SHA256 (trezor-trezord-go-v2.0.21_GH0.tar.gz) = e8987e2f998555d354297d0c00a79f0f3eb8343cff8e96241646638d7350f52a -SIZE (trezor-trezord-go-v2.0.21_GH0.tar.gz) = 953365 +TIMESTAMP = 1537790982 +SHA256 (trezor-trezord-go-v2.0.23-0e82873_GH0.tar.gz) = 87f359982952429d4f8303966ce750985fb1be484e3ee22ed636594b0dcc4345 +SIZE (trezor-trezord-go-v2.0.23-0e82873_GH0.tar.gz) = 954886 diff --git a/security/trezord/files/extra-patch-usb_webusb.go b/security/trezord/files/extra-patch-usb_webusb.go index d934907da9f5..ac3f2ae34e10 100644 --- a/security/trezord/files/extra-patch-usb_webusb.go +++ b/security/trezord/files/extra-patch-usb_webusb.go @@ -1,8 +1,6 @@ -diff --git a/usb/webusb.go b/usb/webusb.go -index eb8cadd..1366074 100644 ---- a/usb/webusb.go -+++ b/usb/webusb.go -@@ -226,13 +232,21 @@ func (b *WebUSB) matchVidPid(vid uint16, pid uint16) bool { +--- usb/webusb.go.orig 2018-09-21 13:31:27 UTC ++++ usb/webusb.go +@@ -274,13 +274,21 @@ func (b *WebUSB) matchVidPid(vid uint16, } func (b *WebUSB) identify(dev lowlevel.Device) string { @@ -30,7 +28,7 @@ index eb8cadd..1366074 100644 } type WUD struct { -@@ -279,6 +293,12 @@ func (d *WUD) finishReadQueue() { +@@ -331,6 +339,12 @@ func (d *WUD) finishReadQueue() { } func (d *WUD) readWrite(buf []byte, endpoint uint8) (int, error) { @@ -43,7 +41,7 @@ index eb8cadd..1366074 100644 d.mw.Println("webusb - rw - start") for { d.mw.Println("webusb - rw - checking closed") -@@ -291,7 +311,7 @@ func (d *WUD) readWrite(buf []byte, endpoint uint8) (int, error) { +@@ -343,7 +357,7 @@ func (d *WUD) readWrite(buf []byte, endp d.mw.Println("webusb - rw - lock transfer mutex") d.transferMutex.Lock() d.mw.Println("webusb - rw - actual interrupt transport") diff --git a/security/trezord/files/patch-freebsd b/security/trezord/files/patch-freebsd deleted file mode 100644 index 3b4ed3420101..000000000000 --- a/security/trezord/files/patch-freebsd +++ /dev/null @@ -1,192 +0,0 @@ -diff --git a/trezord.go b/trezord.go -index 91fb4b9..f8c545e 100644 ---- a/trezord.go -+++ b/trezord.go -@@ -6,6 +6,7 @@ import ( - "io" - "log" - "os" -+ "runtime" - "strconv" - - "github.com/trezor/trezord-go/core" -@@ -83,7 +84,11 @@ func main() { - if err != nil { - stderrLogger.Fatalf("hidapi: %s", err) - } -- bus = append(bus, w, h) -+ if runtime.GOOS != "freebsd" { -+ bus = append(bus, w, h) -+ } else { -+ bus = append(bus, w) -+ } - } - - longMemoryWriter.Println(fmt.Sprintf("UDP port count - %d", len(ports))) -diff --git a/usb/lowlevel/hid.go b/usb/lowlevel/hid.go -index 32ad167..c847c73 100644 ---- a/usb/lowlevel/hid.go -+++ b/usb/lowlevel/hid.go -@@ -6,7 +6,7 @@ - - // Package hid provides an interface for USB HID devices. - --// +build linux,cgo darwin,!ios,cgo windows,cgo -+// +build linux,cgo freebsd,cgo darwin,!ios,cgo windows,cgo - - package lowlevel - -@@ -21,6 +21,8 @@ extern void goLog(const char *s); - - #cgo linux CFLAGS: -DDEFAULT_VISIBILITY="" -DOS_LINUX -D_GNU_SOURCE -DPOLL_NFDS_TYPE=int - #cgo linux,!android LDFLAGS: -lrt -+#cgo freebsd CFLAGS: -DOS_FREEBSD -+#cgo freebsd LDFLAGS: -lusb - #cgo darwin CFLAGS: -DOS_DARWIN -DDEFAULT_VISIBILITY="" -DPOLL_NFDS_TYPE="unsigned int" - #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit -lobjc - #cgo windows CFLAGS: -DOS_WINDOWS -DDEFAULT_VISIBILITY="" -DPOLL_NFDS_TYPE="unsigned int" -@@ -34,6 +36,8 @@ extern void goLog(const char *s); - #include "os/poll_posix.c" - #include "os/linux_usbfs.c" - #include "os/linux_netlink.c" -+#elif OS_FREEBSD -+ #include - #elif OS_DARWIN - #include - -@@ -50,15 +54,21 @@ extern void goLog(const char *s); - #include "os/threads_windows.c" - #endif - --#include "core.c" --#include "descriptor.c" --#include "hotplug.c" --#include "io.c" --#include "strerror.c" --#include "sync.c" -+#ifndef OS_FREEBSD -+ #include "core.c" -+ #include "descriptor.c" -+ #include "hotplug.c" -+ #include "io.c" -+ #include "strerror.c" -+ #include "sync.c" -+#else -+ #include -+#endif - - #ifdef OS_LINUX - #include "linux/hid.c" -+#elif OS_FREEBSD -+ #include "linux/hid.c" - #elif OS_DARWIN - #include "mac/hid.c" - #elif OS_WINDOWS -diff --git a/usb/lowlevel/libusb.go b/usb/lowlevel/libusb.go -index 454c95c..acda2c6 100644 ---- a/usb/lowlevel/libusb.go -+++ b/usb/lowlevel/libusb.go -@@ -1,4 +1,4 @@ --// +build linux,cgo darwin,!ios,cgo windows,cgo -+// +build linux,cgo freebsd,cgo darwin,!ios,cgo windows,cgo - - //----------------------------------------------------------------------------- - /* -@@ -14,7 +14,13 @@ Copyright (c) 2017 Jason T. Harris - package lowlevel - - /* -+#cgo freebsd LDFLAGS: -lusb -+ -+#ifndef __FreeBSD__ - #include "./c/libusb/libusb.h" -+#else -+#include -+#endif - - // When a C struct ends with a zero-sized field, but the struct itself is not zero-sized, - // Go code can no longer refer to the zero-sized field. Any such references will have to be rewritten. -@@ -921,9 +927,11 @@ func Get_Port_Numbers(dev Device, ports []byte) ([]byte, error) { - return ports[:rc], nil - } - -+/* - func Get_Parent(dev Device) Device { - return C.libusb_get_parent(dev) - } -+*/ - - func Get_Device_Address(dev Device) uint8 { - return uint8(C.libusb_get_device_address(dev)) -@@ -1066,10 +1074,12 @@ func Set_Auto_Detach_Kernel_Driver(hdl Device_Handle, enable bool) error { - //----------------------------------------------------------------------------- - // Miscellaneous - -+/* - func Has_Capability(capability uint32) bool { - rc := int(C.libusb_has_capability((C.uint32_t)(capability))) - return rc != 0 - } -+*/ - - func Error_Name(code int) string { - return C.GoString(C.libusb_error_name(C.int(code))) -@@ -1084,6 +1094,7 @@ func CPU_To_LE16(x uint16) uint16 { - return uint16(C.libusb_cpu_to_le16((C.uint16_t)(x))) - } - -+/* - func Setlocale(locale string) error { - cstr := C.CString(locale) - rc := int(C.libusb_setlocale(cstr)) -@@ -1092,6 +1103,7 @@ func Setlocale(locale string) error { - } - return nil - } -+*/ - - func Strerror(errcode int) string { - return C.GoString(C.libusb_strerror(int32(errcode))) -diff --git a/usb/lowlevel/wchar.go b/usb/lowlevel/wchar.go -index a85a143..8448510 100644 ---- a/usb/lowlevel/wchar.go -+++ b/usb/lowlevel/wchar.go -@@ -7,7 +7,7 @@ - // https://github.com/orofarne/gowchar/blob/master/LICENSE - - // +build !ios --// +build linux darwin windows -+// +build linux freebsd darwin windows - - package lowlevel - -diff --git a/usb/webusb.go b/usb/webusb.go -index eb8cadd..1366074 100644 ---- a